Changeset 39554 in webkit


Ignore:
Timestamp:
Jan 2, 2009, 12:59:17 PM (17 years ago)
Author:
[email protected]
Message:

Bug 23080: Remove last vestiges of KJS references

<​https://bugs.webkit.org/show_bug.cgi?id=23080>

Reviewed by Darin Adler.

Also updated Apple copyright statements.

  • DerivedSources.make: Changed bison "kjsyy" prefix to "jscyy".
  • GNUmakefile.am: Ditto.
  • JavaScriptCore.pri: Ditto. Also changed KJSBISON to JSCBISON and kjsbison to jscbison.
  • JavaScriptCoreSources.bkl: Changed JSCORE_KJS_SOURCES to JSCORE_JSC_SOURCES.
  • jscore.bkl: Ditto.
  • create_hash_table: Updated copyright and removed old comment.
  • parser/Grammar.y: Changed "kjsyy" prefix to "jscyy" prefix.
  • parser/Lexer.cpp: Ditto. Also changed KJS_DEBUG_LEX to JSC_DEBUG_LEX. (jscyylex): (JSC::Lexer::lex):
  • parser/Parser.cpp: Ditto. (JSC::Parser::parse):
  • pcre/dftables: Changed "kjs_pcre_" prefix to "jsc_pcre_".
  • pcre/pcre_compile.cpp: Ditto. (getOthercaseRange): (encodeUTF8): (compileBranch): (calculateCompiledPatternLength):
  • pcre/pcre_exec.cpp: Ditto. (matchRef): (getUTF8CharAndIncrementLength): (match):
  • pcre/pcre_internal.h: Ditto. (toLowerCase): (flipCase): (classBitmapForChar): (charTypeForChar):
  • pcre/pcre_tables.cpp: Ditto.
  • pcre/pcre_ucp_searchfuncs.cpp: Ditto. (jsc_pcre_ucp_othercase):
  • pcre/pcre_xclass.cpp: Ditto. (getUTF8CharAndAdvancePointer): (jsc_pcre_xclass):
  • runtime/Collector.h: Updated header guards using the clean-header-guards script.
  • runtime/CollectorHeapIterator.h: Added missing header guard.
  • runtime/Identifier.h: Updated header guards.
  • runtime/JSFunction.h: Fixed end-of-namespace comment.
  • runtime/JSGlobalObject.cpp: (JSC::JSGlobalObject::reset): Renamed "kjsprint" debug function to "jscprint". Changed implementation method from globalFuncKJSPrint() to globalFuncJSCPrint().
  • runtime/JSGlobalObjectFunctions.cpp: (JSC::globalFuncJSCPrint): Renamed from globalFuncKJSPrint().
  • runtime/JSGlobalObjectFunctions.h: Ditto.
  • runtime/JSImmediate.h: Updated header guards.
  • runtime/JSLock.h: Ditto.
  • runtime/JSType.h: Ditto.
  • runtime/JSWrapperObject.h: Ditto.
  • runtime/Lookup.h: Ditto.
  • runtime/Operations.h: Ditto.
  • runtime/Protect.h: Ditto.
  • runtime/RegExp.h: Ditto.
  • runtime/UString.h: Ditto.
  • tests/mozilla/js1_5/Array/regress-157652.js: Changed "KJS" reference in comment to "JSC".
  • wrec/CharacterClassConstructor.cpp: Change "kjs_pcre_" function prefixes to "jsc_pcre_". (JSC::WREC::CharacterClassConstructor::put): (JSC::WREC::CharacterClassConstructor::flush):
  • wtf/unicode/Unicode.h: Change "KJS_" header guard to "WTF_".
  • wtf/unicode/icu/UnicodeIcu.h: Ditto.
  • wtf/unicode/qt4/UnicodeQt4.h: Ditto.
Location:
trunk/JavaScriptCore
Files:
38 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/ChangeLog

    r39553 r39554  
     12009-01-02  David Kilzer  <[email protected]>
     2
     3        Bug 23080: Remove last vestiges of KJS references
     4
     5        <https://bugs.webkit.org/show_bug.cgi?id=23080>
     6
     7        Reviewed by Darin Adler.
     8
     9        Also updated Apple copyright statements.
     10
     11        * DerivedSources.make: Changed bison "kjsyy" prefix to "jscyy".
     12        * GNUmakefile.am: Ditto.
     13        * JavaScriptCore.pri: Ditto.  Also changed KJSBISON to JSCBISON
     14        and kjsbison to jscbison.
     15
     16        * JavaScriptCoreSources.bkl: Changed JSCORE_KJS_SOURCES to
     17        JSCORE_JSC_SOURCES.
     18        * jscore.bkl: Ditto.
     19
     20        * create_hash_table: Updated copyright and removed old comment.
     21
     22        * parser/Grammar.y: Changed "kjsyy" prefix to "jscyy" prefix.
     23        * parser/Lexer.cpp: Ditto.  Also changed KJS_DEBUG_LEX to
     24        JSC_DEBUG_LEX.
     25        (jscyylex):
     26        (JSC::Lexer::lex):
     27        * parser/Parser.cpp: Ditto.
     28        (JSC::Parser::parse):
     29
     30        * pcre/dftables: Changed "kjs_pcre_" prefix to "jsc_pcre_".
     31        * pcre/pcre_compile.cpp: Ditto.
     32        (getOthercaseRange):
     33        (encodeUTF8):
     34        (compileBranch):
     35        (calculateCompiledPatternLength):
     36        * pcre/pcre_exec.cpp: Ditto.
     37        (matchRef):
     38        (getUTF8CharAndIncrementLength):
     39        (match):
     40        * pcre/pcre_internal.h: Ditto.
     41        (toLowerCase):
     42        (flipCase):
     43        (classBitmapForChar):
     44        (charTypeForChar):
     45        * pcre/pcre_tables.cpp: Ditto.
     46        * pcre/pcre_ucp_searchfuncs.cpp: Ditto.
     47        (jsc_pcre_ucp_othercase):
     48        * pcre/pcre_xclass.cpp: Ditto.
     49        (getUTF8CharAndAdvancePointer):
     50        (jsc_pcre_xclass):
     51
     52        * runtime/Collector.h: Updated header guards using the
     53        clean-header-guards script.
     54        * runtime/CollectorHeapIterator.h: Added missing header guard.
     55        * runtime/Identifier.h: Updated header guards.
     56        * runtime/JSFunction.h: Fixed end-of-namespace comment.
     57
     58        * runtime/JSGlobalObject.cpp:
     59        (JSC::JSGlobalObject::reset): Renamed "kjsprint" debug function
     60        to "jscprint".  Changed implementation method from
     61        globalFuncKJSPrint() to globalFuncJSCPrint().
     62        * runtime/JSGlobalObjectFunctions.cpp:
     63        (JSC::globalFuncJSCPrint): Renamed from globalFuncKJSPrint().
     64        * runtime/JSGlobalObjectFunctions.h: Ditto.
     65
     66        * runtime/JSImmediate.h: Updated header guards.
     67        * runtime/JSLock.h: Ditto.
     68        * runtime/JSType.h: Ditto.
     69        * runtime/JSWrapperObject.h: Ditto.
     70        * runtime/Lookup.h: Ditto.
     71        * runtime/Operations.h: Ditto.
     72        * runtime/Protect.h: Ditto.
     73        * runtime/RegExp.h: Ditto.
     74        * runtime/UString.h: Ditto.
     75
     76        * tests/mozilla/js1_5/Array/regress-157652.js: Changed "KJS"
     77        reference in comment to "JSC".
     78
     79        * wrec/CharacterClassConstructor.cpp: Change "kjs_pcre_" function
     80        prefixes to "jsc_pcre_".
     81        (JSC::WREC::CharacterClassConstructor::put):
     82        (JSC::WREC::CharacterClassConstructor::flush):
     83
     84        * wtf/unicode/Unicode.h: Change "KJS_" header guard to "WTF_".
     85        * wtf/unicode/icu/UnicodeIcu.h: Ditto.
     86        * wtf/unicode/qt4/UnicodeQt4.h: Ditto.
     87
    1882009-01-02  Oliver Hunt  <[email protected]>
    289

  • trunk/JavaScriptCore/DerivedSources.make

    r38531 r39554  
    1 # Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
     1# Copyright (C) 2006, 2007, 2008 2009 Apple Inc. All rights reserved.
    22#
    33# Redistribution and use in source and binary forms, with or without
    … …  
    6060
    6161Grammar.cpp: Grammar.y
    62         bison -d -p kjsyy $< -o $@ > bison_out.txt 2>&1
     62        bison -d -p jscyy $< -o $@ > bison_out.txt 2>&1
    6363        perl -p -e 'END { if ($$conflict) { unlink "Grammar.cpp"; die; } } $$conflict ||= /conflict/' < bison_out.txt
    6464        touch Grammar.cpp.h

  • trunk/JavaScriptCore/GNUmakefile.am

    r39487 r39554  
    431431
    432432DerivedSources/Grammar.cpp: $(srcdir)/JavaScriptCore/parser/Grammar.y
    433         $(BISON) -d -p kjsyy $(srcdir)/JavaScriptCore/parser/Grammar.y -o $@ > bison_out.txt 2>&1
     433        $(BISON) -d -p jscyy $(srcdir)/JavaScriptCore/parser/Grammar.y -o $@ > bison_out.txt 2>&1
    434434        $(PERL) -p -e 'END { if ($$conflict) { unlink "Grammar.cpp"; die; } } $$conflict ||= /conflict/' < bison_out.txt
    435435        cat $(GENSOURCES)/Grammar.hpp > $(GENSOURCES)/Grammar.h

  • trunk/JavaScriptCore/JavaScriptCore.pri

    r39487 r39554  
    4242    parser/Keywords.table
    4343
    44 KJSBISON += \
     44JSCBISON += \
    4545    parser/Grammar.y
    4646
    … …  
    196196
    197197# GENERATOR 2: bison grammar
    198 kjsbison.output = $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.cpp
    199 kjsbison.commands = bison -d -p kjsyy ${QMAKE_FILE_NAME} -o ${QMAKE_FILE_BASE}.tab.c && $(MOVE) ${QMAKE_FILE_BASE}.tab.c ${QMAKE_FILE_OUT} && $(MOVE) ${QMAKE_FILE_BASE}.tab.h $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.h
    200 kjsbison.depend = ${QMAKE_FILE_NAME}
    201 kjsbison.input = KJSBISON
    202 kjsbison.variable_out = GENERATED_SOURCES
    203 kjsbison.dependency_type = TYPE_C
    204 kjsbison.CONFIG = target_predeps
    205 addExtraCompilerWithHeader(kjsbison)
    206 
     198jscbison.output = $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.cpp
     199jscbison.commands = bison -d -p jscyy ${QMAKE_FILE_NAME} -o ${QMAKE_FILE_BASE}.tab.c && $(MOVE) ${QMAKE_FILE_BASE}.tab.c ${QMAKE_FILE_OUT} && $(MOVE) ${QMAKE_FILE_BASE}.tab.h $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.h
     200jscbison.depend = ${QMAKE_FILE_NAME}
     201jscbison.input = JSCBISON
     202jscbison.variable_out = GENERATED_SOURCES
     203jscbison.dependency_type = TYPE_C
     204jscbison.CONFIG = target_predeps
     205addExtraCompilerWithHeader(jscbison)
     206

  • trunk/JavaScriptCore/JavaScriptCoreSources.bkl

    r39487 r39554  
    4949        debugger/DebuggerCallFrame.cpp
    5050    </set>
    51     <set append="1" var="JSCORE_KJS_SOURCES">
     51    <set append="1" var="JSCORE_JSC_SOURCES">
    5252        DerivedSources/JavaScriptCore/Grammar.cpp
    5353        wtf/dtoa.cpp

  • trunk/JavaScriptCore/create_hash_table

    r39056 r39554  
    66#                  David Faure <[email protected]>
    77# Modified (c) 2004 by Nikolas Zimmermann <[email protected]>
    8 # Copyright (C) 2007 Apple Inc. All rights reserved.
    9 #
    10 # Part of the KJS library.
     8# Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved.
    119#
    1210# This library is free software; you can redistribute it and/or

  • trunk/JavaScriptCore/jscore.bkl

    r38531 r39554  
    4141            $(JSCORE_BYTECOMPILER_SOURCES)
    4242            $(JSCORE_DEBUGGER_SOURCES)
    43             $(JSCORE_KJS_SOURCES)
     43            $(JSCORE_JSC_SOURCES)
    4444            $(JSCORE_PCRE_SOURCES)
    4545            $(JSCORE_PARSER_SOURCES)

  • trunk/JavaScriptCore/parser/Grammar.y

    r39534 r39554  
    55/*
    66 *  Copyright (C) 1999-2000 Harri Porten ([email protected])
    7  *  Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
     7 *  Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    88 *  Copyright (C) 2007 Eric Seidel <[email protected]>
    99 *
    … …  
    4444/* default values for bison */
    4545#define YYDEBUG 0 // Set to 1 to debug a parse error.
    46 #define kjsyydebug 0 // Set to 1 to debug a parse error.
     46#define jscyydebug 0 // Set to 1 to debug a parse error.
    4747#if !PLATFORM(DARWIN)
    4848    // avoid triggering warnings in older bison
    … …  
    5050#endif
    5151
    52 int kjsyylex(void* lvalp, void* llocp, void* globalPtr);
    53 int kjsyyerror(const char*);
     52int jscyylex(void* lvalp, void* llocp, void* globalPtr);
     53int jscyyerror(const char*);
    5454static inline bool allowAutomaticSemicolon(JSC::Lexer&, int);
    5555

  • trunk/JavaScriptCore/parser/Lexer.cpp

    r39521 r39554  
    11/*
    22 *  Copyright (C) 1999-2000 Harri Porten ([email protected])
    3  *  Copyright (C) 2006, 2007, 2008 Apple Inc. All Rights Reserved.
     3 *  Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All Rights Reserved.
    44 *  Copyright (C) 2007 Cameron Zwarich ([email protected])
    55 *
    … …  
    5050
    5151// a bridge for yacc from the C world to C++
    52 int kjsyylex(void* lvalp, void* llocp, void* globalData)
     52int jscyylex(void* lvalp, void* llocp, void* globalData)
    5353{
    5454    return static_cast<JSGlobalData*>(globalData)->lexer->lex(lvalp, llocp);
    … …  
    467467    m_buffer8.append('\0');
    468468
    469 #ifdef KJS_DEBUG_LEX
     469#ifdef JSC_DEBUG_LEX
    470470    fprintf(stderr, "line: %d ", lineNo());
    471471    fprintf(stderr, "yytext (%x): ", m_buffer8[0]);
    … …  
    500500    }
    501501
    502 #ifdef KJS_DEBUG_LEX
     502#ifdef JSC_DEBUG_LEX
    503503    switch (m_state) {
    504504        case Eof:
    … …  
    574574            break;
    575575        case Bad:
    576 #ifdef KJS_DEBUG_LEX
     576#ifdef JSC_DEBUG_LEX
    577577            fprintf(stderr, "yylex: ERROR.\n");
    578578#endif

  • trunk/JavaScriptCore/parser/Parser.cpp

    r39521 r39554  
    22 *  Copyright (C) 1999-2001 Harri Porten ([email protected])
    33 *  Copyright (C) 2001 Peter Kelly ([email protected])
    4  *  Copyright (C) 2003, 2006, 2007, 2008 Apple Inc. All rights reserved.
     4 *  Copyright (C) 2003, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    55 *
    66 *  This library is free software; you can redistribute it and/or
    … …  
    3232using std::auto_ptr;
    3333
    34 extern int kjsyyparse(void*);
     34extern int jscyyparse(void*);
    3535
    3636namespace JSC {
    … …  
    5454    lexer.setCode(*m_source);
    5555
    56     int parseError = kjsyyparse(globalData);
     56    int parseError = jscyyparse(globalData);
    5757    bool lexError = lexer.sawError();
    5858    lexer.clear();

  • trunk/JavaScriptCore/pcre/dftables

    r37832 r39554  
    99#                  Originally written by Philip Hazel
    1010#            Copyright (c) 1997-2006 University of Cambridge
    11 #  Copyright (C) 2002, 2004, 2006, 2007, 2008 Apple Inc.  All rights reserved.
     11#  Copyright (C) 2002, 2004, 2006, 2007, 2008, 2009 Apple Inc.  All rights reserved.
    1212#
    1313# -----------------------------------------------------------------------------
    … …  
    8585    "128 (ASCII characters). These tables are used when no external tables are\n" .
    8686    "passed to PCRE. */\n\n" .
    87     "const unsigned char kjs_pcre_default_tables[%d] = {\n\n" .
     87    "const unsigned char jsc_pcre_default_tables[%d] = {\n\n" .
    8888    "/* This table is a lower casing table. */\n\n", $pcre_internal{tables_length});
    8989

  • trunk/JavaScriptCore/pcre/pcre_compile.cpp

    r39164 r39554  
    77                 Originally written by Philip Hazel
    88           Copyright (c) 1997-2006 University of Cambridge
    9     Copyright (C) 2002, 2004, 2006, 2007 Apple Inc. All rights reserved.
     9    Copyright (C) 2002, 2004, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    1010    Copyright (C) 2007 Eric Seidel <[email protected]>
    1111
    … …  
    487487   
    488488    for (c = *cptr; c <= d; c++) {
    489         if ((othercase = kjs_pcre_ucp_othercase(c)) >= 0)
     489        if ((othercase = jsc_pcre_ucp_othercase(c)) >= 0)
    490490            break;
    491491    }
    … …  
    498498   
    499499    for (++c; c <= d; c++) {
    500         if (kjs_pcre_ucp_othercase(c) != next)
     500        if (jsc_pcre_ucp_othercase(c) != next)
    501501            break;
    502502        next++;
    … …  
    526526{
    527527    int i;
    528     for (i = 0; i < kjs_pcre_utf8_table1_size; i++)
    529         if (cvalue <= kjs_pcre_utf8_table1[i])
     528    for (i = 0; i < jsc_pcre_utf8_table1_size; i++)
     529        if (cvalue <= jsc_pcre_utf8_table1[i])
    530530            break;
    531531    buffer += i;
    … …  
    534534        cvalue >>= 6;
    535535    }
    536     *buffer = kjs_pcre_utf8_table2[i] | cvalue;
     536    *buffer = jsc_pcre_utf8_table2[i] | cvalue;
    537537    return i + 1;
    538538}
    … …  
    910910                        if (options & IgnoreCaseOption) {
    911911                            int othercase;
    912                             if ((othercase = kjs_pcre_ucp_othercase(c)) >= 0) {
     912                            if ((othercase = jsc_pcre_ucp_othercase(c)) >= 0) {
    913913                                *class_utf8data++ = XCL_SINGLE;
    914914                                class_utf8data += encodeUTF8(othercase, class_utf8data);
    … …  
    20562056                    if (c > 127) {
    20572057                        int i;
    2058                         for (i = 0; i < kjs_pcre_utf8_table1_size; i++)
    2059                             if (c <= kjs_pcre_utf8_table1[i]) break;
     2058                        for (i = 0; i < jsc_pcre_utf8_table1_size; i++)
     2059                            if (c <= jsc_pcre_utf8_table1[i]) break;
    20602060                        length += i;
    20612061                        lastitemlength += i;
    … …  
    25102510                if (c > 127) {
    25112511                    int i;
    2512                     for (i = 0; i < kjs_pcre_utf8_table1_size; i++)
    2513                         if (c <= kjs_pcre_utf8_table1[i])
     2512                    for (i = 0; i < jsc_pcre_utf8_table1_size; i++)
     2513                        if (c <= jsc_pcre_utf8_table1[i])
    25142514                            break;
    25152515                    length += i;

  • trunk/JavaScriptCore/pcre/pcre_exec.cpp

    r38205 r39554  
    77                 Originally written by Philip Hazel
    88           Copyright (c) 1997-2006 University of Cambridge
    9     Copyright (C) 2002, 2004, 2006, 2007 Apple Inc. All rights reserved.
     9    Copyright (C) 2002, 2004, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    1010    Copyright (C) 2007 Eric Seidel <[email protected]>
    1111
    … …  
    251251        while (length-- > 0) {
    252252            UChar c = *p++;
    253             int othercase = kjs_pcre_ucp_othercase(c);
     253            int othercase = jsc_pcre_ucp_othercase(c);
    254254            UChar d = *subjectPtr++;
    255255            if (c != d && othercase != d)
    … …  
    404404    c = *subjectPtr;
    405405    if ((c & 0xc0) == 0xc0) {
    406         int gcaa = kjs_pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */
     406        int gcaa = jsc_pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */
    407407        int gcss = 6 * gcaa;
    408         c = (c & kjs_pcre_utf8_table3[gcaa]) << gcss;
     408        c = (c & jsc_pcre_utf8_table3[gcaa]) << gcss;
    409409        for (int gcii = 1; gcii <= gcaa; gcii++) {
    410410            gcss -= 6;
    … …  
    10491049                        RRETURN_NO_MATCH;
    10501050                    int c = *stack.currentFrame->args.subjectPtr++;
    1051                     if (!kjs_pcre_xclass(c, stack.currentFrame->locals.data))
     1051                    if (!jsc_pcre_xclass(c, stack.currentFrame->locals.data))
    10521052                        RRETURN_NO_MATCH;
    10531053                }
    … …  
    10701070                            RRETURN;
    10711071                        int c = *stack.currentFrame->args.subjectPtr++;
    1072                         if (!kjs_pcre_xclass(c, stack.currentFrame->locals.data))
     1072                        if (!jsc_pcre_xclass(c, stack.currentFrame->locals.data))
    10731073                            RRETURN;
    10741074                    }
    … …  
    10841084                            break;
    10851085                        int c = *stack.currentFrame->args.subjectPtr;
    1086                         if (!kjs_pcre_xclass(c, stack.currentFrame->locals.data))
     1086                        if (!jsc_pcre_xclass(c, stack.currentFrame->locals.data))
    10871087                            break;
    10881088                        ++stack.currentFrame->args.subjectPtr;
    … …  
    11231123                    RRETURN_NO_MATCH;
    11241124                int dc = *stack.currentFrame->args.subjectPtr++;
    1125                 if (stack.currentFrame->locals.fc != dc && kjs_pcre_ucp_othercase(stack.currentFrame->locals.fc) != dc)
     1125                if (stack.currentFrame->locals.fc != dc && jsc_pcre_ucp_othercase(stack.currentFrame->locals.fc) != dc)
    11261126                    RRETURN_NO_MATCH;
    11271127                NEXT_OPCODE;
    … …  
    11871187               
    11881188                if (stack.currentFrame->locals.fc <= 0xFFFF) {
    1189                     int othercase = md.ignoreCase ? kjs_pcre_ucp_othercase(stack.currentFrame->locals.fc) : -1;
     1189                    int othercase = md.ignoreCase ? jsc_pcre_ucp_othercase(stack.currentFrame->locals.fc) : -1;
    11901190                   
    11911191                    for (int i = 1; i <= min; i++) {

  • trunk/JavaScriptCore/pcre/pcre_internal.h

    r36612 r39554  
    77                 Originally written by Philip Hazel
    88           Copyright (c) 1997-2006 University of Cambridge
    9     Copyright (C) 2002, 2004, 2006, 2007 Apple Inc. All rights reserved.
     9    Copyright (C) 2002, 2004, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    1010
    1111-----------------------------------------------------------------------------
    … …  
    341341 pcre_tables.c module. */
    342342
    343 #define kjs_pcre_utf8_table1_size 6
    344 
    345 extern const int    kjs_pcre_utf8_table1[6];
    346 extern const int    kjs_pcre_utf8_table2[6];
    347 extern const int    kjs_pcre_utf8_table3[6];
    348 extern const unsigned char kjs_pcre_utf8_table4[0x40];
    349 
    350 extern const unsigned char kjs_pcre_default_tables[tables_length];
     343#define jsc_pcre_utf8_table1_size 6
     344
     345extern const int    jsc_pcre_utf8_table1[6];
     346extern const int    jsc_pcre_utf8_table2[6];
     347extern const int    jsc_pcre_utf8_table3[6];
     348extern const unsigned char jsc_pcre_utf8_table4[0x40];
     349
     350extern const unsigned char jsc_pcre_default_tables[tables_length];
    351351
    352352static inline unsigned char toLowerCase(unsigned char c)
    353353{
    354     static const unsigned char* lowerCaseChars = kjs_pcre_default_tables + lcc_offset;
     354    static const unsigned char* lowerCaseChars = jsc_pcre_default_tables + lcc_offset;
    355355    return lowerCaseChars[c];
    356356}
    … …  
    358358static inline unsigned char flipCase(unsigned char c)
    359359{
    360     static const unsigned char* flippedCaseChars = kjs_pcre_default_tables + fcc_offset;
     360    static const unsigned char* flippedCaseChars = jsc_pcre_default_tables + fcc_offset;
    361361    return flippedCaseChars[c];
    362362}
    … …  
    364364static inline unsigned char classBitmapForChar(unsigned char c)
    365365{
    366     static const unsigned char* charClassBitmaps = kjs_pcre_default_tables + cbits_offset;
     366    static const unsigned char* charClassBitmaps = jsc_pcre_default_tables + cbits_offset;
    367367    return charClassBitmaps[c];
    368368}
    … …  
    370370static inline unsigned char charTypeForChar(unsigned char c)
    371371{
    372     const unsigned char* charTypeMap = kjs_pcre_default_tables + ctypes_offset;
     372    const unsigned char* charTypeMap = jsc_pcre_default_tables + ctypes_offset;
    373373    return charTypeMap[c];
    374374}
    … …  
    414414but are not part of the public API and so not exported from the library. */
    415415
    416 extern int kjs_pcre_ucp_othercase(unsigned);
    417 extern bool kjs_pcre_xclass(int, const unsigned char*);
     416extern int jsc_pcre_ucp_othercase(unsigned);
     417extern bool jsc_pcre_xclass(int, const unsigned char*);
    418418
    419419#endif

  • trunk/JavaScriptCore/pcre/pcre_tables.cpp

    r34858 r39554  
    77                 Originally written by Philip Hazel
    88           Copyright (c) 1997-2006 University of Cambridge
    9     Copyright (C) 2002, 2004, 2006, 2007 Apple Inc. All rights reserved.
     9    Copyright (C) 2002, 2004, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    1010
    1111-----------------------------------------------------------------------------
    … …  
    5151character. */
    5252
    53 const int kjs_pcre_utf8_table1[6] =
     53const int jsc_pcre_utf8_table1[6] =
    5454  { 0x7f, 0x7ff, 0xffff, 0x1fffff, 0x3ffffff, 0x7fffffff};
    5555
    … …  
    5757first byte of a character, indexed by the number of additional bytes. */
    5858
    59 const int kjs_pcre_utf8_table2[6] = { 0,    0xc0, 0xe0, 0xf0, 0xf8, 0xfc};
    60 const int kjs_pcre_utf8_table3[6] = { 0xff, 0x1f, 0x0f, 0x07, 0x03, 0x01};
     59const int jsc_pcre_utf8_table2[6] = { 0,    0xc0, 0xe0, 0xf0, 0xf8, 0xfc};
     60const int jsc_pcre_utf8_table3[6] = { 0xff, 0x1f, 0x0f, 0x07, 0x03, 0x01};
    6161
    6262/* Table of the number of extra characters, indexed by the first character
    … …  
    64640x3d. */
    6565
    66 const unsigned char kjs_pcre_utf8_table4[0x40] = {
     66const unsigned char jsc_pcre_utf8_table4[0x40] = {
    6767  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
    6868  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,

  • trunk/JavaScriptCore/pcre/pcre_ucp_searchfuncs.cpp

    r34858 r39554  
    77                 Originally written by Philip Hazel
    88           Copyright (c) 1997-2006 University of Cambridge
    9     Copyright (C) 2002, 2004, 2006, 2007 Apple Inc. All rights reserved.
     9    Copyright (C) 2002, 2004, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    1010
    1111-----------------------------------------------------------------------------
    … …  
    6161*/
    6262
    63 int kjs_pcre_ucp_othercase(unsigned c)
     63int jsc_pcre_ucp_othercase(unsigned c)
    6464{
    6565    int bot = 0;

  • trunk/JavaScriptCore/pcre/pcre_xclass.cpp

    r34858 r39554  
    77                 Originally written by Philip Hazel
    88           Copyright (c) 1997-2006 University of Cambridge
    9     Copyright (C) 2002, 2004, 2006, 2007 Apple Inc. All rights reserved.
     9    Copyright (C) 2002, 2004, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    1010
    1111-----------------------------------------------------------------------------
    … …  
    6565    c = *subjectPtr++;
    6666    if ((c & 0xc0) == 0xc0) {
    67         int gcaa = kjs_pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */
     67        int gcaa = jsc_pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */
    6868        int gcss = 6 * gcaa;
    69         c = (c & kjs_pcre_utf8_table3[gcaa]) << gcss;
     69        c = (c & jsc_pcre_utf8_table3[gcaa]) << gcss;
    7070        while (gcaa-- > 0) {
    7171            gcss -= 6;
    … …  
    7575}
    7676
    77 bool kjs_pcre_xclass(int c, const unsigned char* data)
     77bool jsc_pcre_xclass(int c, const unsigned char* data)
    7878{
    7979    bool negated = (*data & XCL_NOT);

  • trunk/JavaScriptCore/runtime/Collector.h

    r38849 r39554  
    22 *  Copyright (C) 1999-2000 Harri Porten ([email protected])
    33 *  Copyright (C) 2001 Peter Kelly ([email protected])
    4  *  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
     4 *  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    55 *
    66 *  This library is free software; you can redistribute it and/or
    … …  
    2020 */
    2121
    22 #ifndef KJSCOLLECTOR_H_
    23 #define KJSCOLLECTOR_H_
     22#ifndef Collector_h
     23#define Collector_h
    2424
    2525#include "JSImmediate.h"
    … …  
    285285} // namespace JSC
    286286
    287 #endif /* KJSCOLLECTOR_H_ */
     287#endif /* Collector_h */

  • trunk/JavaScriptCore/runtime/CollectorHeapIterator.h

    r38137 r39554  
    11/*
    2  * Copyright (C) 2008 Apple Inc. All rights reserved.
     2 * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2626#include "config.h"
    2727#include "Collector.h"
     28
     29#ifndef CollectorHeapIterator_h
     30#define CollectorHeapIterator_h
    2831
    2932namespace JSC {
    … …  
    8487
    8588} // namespace JSC
     89
     90#endif // CollectorHeapIterator_h

  • trunk/JavaScriptCore/runtime/Identifier.h

    r39551 r39554  
    11/*
    2  *  Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved.
     2 *  Copyright (C) 2003, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    33 *
    44 *  This library is free software; you can redistribute it and/or
    … …  
    1919 */
    2020
    21 #ifndef KJS_IDENTIFIER_H
    22 #define KJS_IDENTIFIER_H
     21#ifndef Identifier_h
     22#define Identifier_h
    2323
    2424#include "JSGlobalData.h"
    … …  
    142142} // namespace JSC
    143143
    144 #endif // KJS_IDENTIFIER_H
     144#endif // Identifier_h

  • trunk/JavaScriptCore/runtime/JSFunction.h

    r38826 r39554  
    11/*
    22 *  Copyright (C) 1999-2000 Harri Porten ([email protected])
    3  *  Copyright (C) 2003, 2006, 2007, 2008 Apple Inc. All rights reserved.
     3 *  Copyright (C) 2003, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    44 *  Copyright (C) 2007 Cameron Zwarich ([email protected])
    55 *  Copyright (C) 2007 Maks Orlovich
    … …  
    9999    }
    100100
    101 } // namespace kJS
     101} // namespace JSC
    102102
    103103#endif // JSFunction_h

  • trunk/JavaScriptCore/runtime/JSGlobalObject.cpp

    r39320 r39554  
    11/*
    2  * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
     2 * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved.
    33 * Copyright (C) 2008 Cameron Zwarich ([email protected])
    44 *
    … …  
    331331    putDirectFunctionWithoutTransition(exec, new (exec) PrototypeFunction(exec, d()->prototypeFunctionStructure.get(), 1, Identifier(exec, "encodeURIComponent"), globalFuncEncodeURIComponent), DontEnum);
    332332#ifndef NDEBUG
    333     putDirectFunctionWithoutTransition(exec, new (exec) PrototypeFunction(exec, d()->prototypeFunctionStructure.get(), 1, Identifier(exec, "kjsprint"), globalFuncKJSPrint), DontEnum);
     333    putDirectFunctionWithoutTransition(exec, new (exec) PrototypeFunction(exec, d()->prototypeFunctionStructure.get(), 1, Identifier(exec, "jscprint"), globalFuncJSCPrint), DontEnum);
    334334#endif
    335335

  • trunk/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp

    r39320 r39554  
    22 *  Copyright (C) 1999-2002 Harri Porten ([email protected])
    33 *  Copyright (C) 2001 Peter Kelly ([email protected])
    4  *  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
     4 *  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    55 *  Copyright (C) 2007 Cameron Zwarich ([email protected])
    66 *  Copyright (C) 2007 Maks Orlovich
    … …  
    421421
    422422#ifndef NDEBUG
    423 JSValue* globalFuncKJSPrint(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
     423JSValue* globalFuncJSCPrint(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
    424424{
    425425    CStringBuffer string;

  • trunk/JavaScriptCore/runtime/JSGlobalObjectFunctions.h

    r37938 r39554  
    11/*
    22 *  Copyright (C) 1999-2000 Harri Porten ([email protected])
    3  *  Copyright (C) 2003, 2006, 2007, 2008 Apple Inc. All rights reserved.
     3 *  Copyright (C) 2003, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    44 *  Copyright (C) 2007 Cameron Zwarich ([email protected])
    55 *  Copyright (C) 2007 Maks Orlovich
    … …  
    4848    JSValue* globalFuncUnescape(ExecState*, JSObject*, JSValue*, const ArgList&);
    4949#ifndef NDEBUG
    50     JSValue* globalFuncKJSPrint(ExecState*, JSObject*, JSValue*, const ArgList&);
     50    JSValue* globalFuncJSCPrint(ExecState*, JSObject*, JSValue*, const ArgList&);
    5151#endif
    5252

  • trunk/JavaScriptCore/runtime/JSImmediate.h

    r39540 r39554  
    11/*
    2  *  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
     2 *  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    33 *  Copyright (C) 2006 Alexey Proskuryakov ([email protected])
    44 *
    … …  
    2020 */
    2121
    22 #ifndef KJS_JS_IMMEDIATE_H
    23 #define KJS_JS_IMMEDIATE_H
     22#ifndef JSImmediate_h
     23#define JSImmediate_h
    2424
    2525#include <wtf/Assertions.h>
    … …  
    478478} // namespace JSC
    479479
    480 #endif
     480#endif // JSImmediate_h

  • trunk/JavaScriptCore/runtime/JSLock.h

    r38087 r39554  
    11/*
    2  * Copyright (C) 2005, 2008 Apple Inc. All rights reserved.
     2 * Copyright (C) 2005, 2008, 2009 Apple Inc. All rights reserved.
    33 *
    44 * This library is free software; you can redistribute it and/or
    … …  
    1919 */
    2020
    21 #ifndef KJS_JSLock_h
    22 #define KJS_JSLock_h
     21#ifndef JSLock_h
     22#define JSLock_h
    2323
    2424#include <wtf/Assertions.h>
    … …  
    100100} // namespace
    101101
    102 #endif // KJS_JSLock_h
     102#endif // JSLock_h

  • trunk/JavaScriptCore/runtime/JSType.h

    r38087 r39554  
    11/*
    2  *  This file is part of the KDE libraries
    3  *  Copyright (C) 2006 Apple Computer, Inc
     2 *  Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    43 *
    54 *  This library is free software; you can redistribute it and/or
    … …  
    2019 */
    2120
    22 #ifndef KJS_JSTYPE_H
    23 #define KJS_JSTYPE_H
     21#ifndef JSType_h
     22#define JSType_h
    2423
    2524namespace JSC {

  • trunk/JavaScriptCore/runtime/JSWrapperObject.h

    r38440 r39554  
    11/*
    22 *  Copyright (C) 2006 Maks Orlovich
    3  *  Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
     3 *  Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    44 *
    55 *  This library is free software; you can redistribute it and/or
    … …  
    2020 */
    2121
    22 #ifndef KJS_JSWrapperObject_h
    23 #define KJS_JSWrapperObject_h
     22#ifndef JSWrapperObject_h
     23#define JSWrapperObject_h
    2424
    2525#include "JSObject.h"
    … …  
    5858} // namespace JSC
    5959
    60 #endif // KJS_JSWrapperObject_h
     60#endif // JSWrapperObject_h

  • trunk/JavaScriptCore/runtime/Lookup.h

    r39056 r39554  
    11/*
    22 *  Copyright (C) 1999-2000 Harri Porten ([email protected])
    3  *  Copyright (C) 2003, 2006, 2007, 2008 Apple Inc. All rights reserved.
     3 *  Copyright (C) 2003, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    44 *
    55 *  This library is free software; you can redistribute it and/or
    … …  
    1919 */
    2020
    21 #ifndef KJS_lookup_h
    22 #define KJS_lookup_h
     21#ifndef Lookup_h
     22#define Lookup_h
    2323
    2424#include "CallFrame.h"
    … …  
    274274} // namespace JSC
    275275
    276 #endif // KJS_lookup_h
     276#endif // Lookup_h

  • trunk/JavaScriptCore/runtime/Operations.h

    r38440 r39554  
    11/*
    2  *  This file is part of the KDE libraries
    32 *  Copyright (C) 1999-2000 Harri Porten ([email protected])
     3 *  Copyright (C) 2002, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    44 *
    55 *  This library is free software; you can redistribute it and/or
    … …  
    2020 */
    2121
    22 #ifndef _KJS_OPERATIONS_H_
    23 #define _KJS_OPERATIONS_H_
     22#ifndef Operations_h
     23#define Operations_h
    2424
    2525#include "JSImmediate.h"

  • trunk/JavaScriptCore/runtime/Protect.h

    r38137 r39554  
    11/*
    2  *  Copyright (C) 2004, 2008 Apple Inc. All rights reserved.
     2 *  Copyright (C) 2004, 2008, 2009 Apple Inc. All rights reserved.
    33 *
    44 *  This library is free software; you can redistribute it and/or
    … …  
    2020
    2121
    22 #ifndef protect_h
    23 #define protect_h
     22#ifndef Protect_h
     23#define Protect_h
    2424
    2525#include "JSCell.h"
    … …  
    152152} // namespace JSC
    153153
    154 #endif // protect_h
     154#endif // Protect_h

  • trunk/JavaScriptCore/runtime/RegExp.h

    r39083 r39554  
    11/*
    22 *  Copyright (C) 1999-2000 Harri Porten ([email protected])
    3  *  Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
     3 *  Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved.
    44 *
    55 *  This library is free software; you can redistribute it and/or
    … …  
    1919 */
    2020
    21 #ifndef KJS_REGEXP_H
    22 #define KJS_REGEXP_H
     21#ifndef RegExp_h
     22#define RegExp_h
    2323
    2424#include "UString.h"
    … …  
    7676} // namespace JSC
    7777
    78 #endif // KJS_REGEXP_H
     78#endif // RegExp_h

  • trunk/JavaScriptCore/runtime/UString.h

    r38473 r39554  
    11/*
    22 *  Copyright (C) 1999-2000 Harri Porten ([email protected])
    3  *  Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
     3 *  Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    44 *
    55 *  This library is free software; you can redistribute it and/or
    … …  
    2020 */
    2121
    22 #ifndef _KJS_USTRING_H_
    23 #define _KJS_USTRING_H_
     22#ifndef UString_h
     23#define UString_h
    2424
    2525#include "Collector.h"

  • trunk/JavaScriptCore/tests/mozilla/js1_5/Array/regress-157652.js

    r11995 r39554  
    117117printStatus(summary);
    118118
    119 // KJS doesn't run out of memory, so we don't expect an abnormal exit code
     119// JSC doesn't run out of memory, so we don't expect an abnormal exit code
    120120//expectExitCode(3);
    121121var IN_RHINO = inRhino();

  • trunk/JavaScriptCore/wrec/CharacterClassConstructor.cpp

    r38544 r39554  
    11/*
    2  * Copyright (C) 2008 Apple Inc. All rights reserved.
     2 * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    158158                    while (unicodeCurr <= hi) {
    159159                        // Spin forwards over any characters that don't have two cases.
    160                         for (; kjs_pcre_ucp_othercase(unicodeCurr) == -1; ++unicodeCurr) {
     160                        for (; jsc_pcre_ucp_othercase(unicodeCurr) == -1; ++unicodeCurr) {
    161161                            // if this was the last character in the range, we're done.
    162162                            if (unicodeCurr == hi)
    … …  
    165165                        // if we fall through to here, unicodeCurr <= hi & has another case. Get the other case.
    166166                        UChar rangeStart = unicodeCurr;
    167                         UChar otherCurr = kjs_pcre_ucp_othercase(unicodeCurr);
     167                        UChar otherCurr = jsc_pcre_ucp_othercase(unicodeCurr);
    168168                       
    169169                        // If unicodeCurr is not yet hi, check the next char in the range.  If it also has another case,
    170170                        // and if it's other case value is one greater then the othercase value for the current last
    171171                        // character included in the range, we can include next into the range.
    172                         while ((unicodeCurr < hi) && (kjs_pcre_ucp_othercase(unicodeCurr + 1) == (otherCurr + 1))) {
     172                        while ((unicodeCurr < hi) && (jsc_pcre_ucp_othercase(unicodeCurr + 1) == (otherCurr + 1))) {
    173173                            // increment unicodeCurr; it points to the end of the range.
    174174                            // increment otherCurr, due to the check above other for next must be 1 greater than the currrent other value.
    … …  
    215215            addSorted(m_matchesUnicode, m_charBuffer);
    216216            if (m_isCaseInsensitive) {
    217                 int other = kjs_pcre_ucp_othercase(m_charBuffer);
     217                int other = jsc_pcre_ucp_othercase(m_charBuffer);
    218218                if (other != -1)
    219219                    addSorted(m_matchesUnicode, other);

  • trunk/JavaScriptCore/wtf/unicode/Unicode.h

    r35900 r39554  
    11/*
    2  *  This file is part of the KDE libraries
    32 *  Copyright (C) 2006 George Staikos <[email protected]>
     3 *  Copyright (C) 2006, 2008, 2009 Apple Inc. All rights reserved.
    44 *
    55 *  This library is free software; you can redistribute it and/or
    … …  
    2020 */
    2121
    22 #ifndef KJS_UNICODE_H
    23 #define KJS_UNICODE_H
     22#ifndef WTF_UNICODE_H
     23#define WTF_UNICODE_H
    2424
    2525#include <wtf/Platform.h>
    … …  
    3333#endif
    3434
    35 #endif
    36 // vim: ts=2 sw=2 et
     35#endif // WTF_UNICODE_H

  • trunk/JavaScriptCore/wtf/unicode/icu/UnicodeIcu.h

    r37532 r39554  
    22 *  Copyright (C) 2006 George Staikos <[email protected]>
    33 *  Copyright (C) 2006 Alexey Proskuryakov <[email protected]>
    4  *  Copyright (C) 2007 Apple Inc. All rights reserved.
     4 *  Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    55 *
    66 *  This library is free software; you can redistribute it and/or
    … …  
    2121 */
    2222
    23 #ifndef KJS_UNICODE_ICU_H
    24 #define KJS_UNICODE_ICU_H
     23#ifndef WTF_UNICODE_ICU_H
     24#define WTF_UNICODE_ICU_H
    2525
    2626#include <stdlib.h>
    … …  
    217217} }
    218218
    219 #endif
     219#endif // WTF_UNICODE_ICU_H

  • trunk/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h

    r38594 r39554  
    22 *  Copyright (C) 2006 George Staikos <[email protected]>
    33 *  Copyright (C) 2006 Alexey Proskuryakov <[email protected]>
     4 *  Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    45 *
    56 *  This library is free software; you can redistribute it and/or
    … …  
    2021 */
    2122
    22 #ifndef KJS_UNICODE_QT4_H
    23 #define KJS_UNICODE_QT4_H
     23#ifndef WTF_UNICODE_QT4_H
     24#define WTF_UNICODE_QT4_H
    2425
    2526#include <QChar>
    … …  
    523524} }
    524525
    525 #endif
     526#endif // WTF_UNICODE_QT4_H
Note: See TracChangeset for help on using the changeset viewer.