Changeset 29537 in webkit for trunk/JavaScriptCore

Timestamp:

Jan 16, 2008, 1:50:19 PM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Geoffrey Garen and Anders Carlsson.

Remove uses of KJS_PURE_ECMA as we don't ever build with it defined,
and we have many features that are not included in the ECMA spec.

• kjs/lexer.cpp: (KJS::Lexer::Lexer): (KJS::Lexer::setCode): (KJS::Lexer::nextLine): (KJS::Lexer::lex):
• kjs/lexer.h:
• kjs/string_object.cpp:
• kjs/string_object.h:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/lexer.cpp (modified) (6 diffs)
• kjs/lexer.h (modified) (1 diff)
• kjs/string_object.cpp (modified) (3 diffs)
• kjs/string_object.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-01-16  Sam Weinig  <[email protected]>
+
+        Reviewed by Geoffrey Garen and Anders Carlsson.
+
+        Remove uses of KJS_PURE_ECMA as we don't ever build with it defined,
+        and we have many features that are not included in the ECMA spec.
+
+        * kjs/lexer.cpp:
+        (KJS::Lexer::Lexer):
+        (KJS::Lexer::setCode):
+        (KJS::Lexer::nextLine):
+        (KJS::Lexer::lex):
+        * kjs/lexer.h:
+        * kjs/string_object.cpp:
+        * kjs/string_object.h:
+
 2008-01-15  Sam Weinig  <[email protected]>
 

trunk/JavaScriptCore/kjs/lexer.cpp

@@ -83 +83 @@
   , code(0)
   , length(0)
-#ifndef KJS_PURE_ECMA
   , bol(true)
-#endif
   , current(0)
   , next1(0)
@@ -111 +109 @@
   skipCR = false;
   error = false;
-#ifndef KJS_PURE_ECMA
   bol = true;
-#endif
 
   // read first characters
@@ -139 +135 @@
 {
   yylineno++;
-#ifndef KJS_PURE_ECMA
   bol = true;
-#endif
 }
 
@@ -223 +217 @@
         record8(current);
         state = InDecimal;
-#ifndef KJS_PURE_ECMA
         // <!-- marks the beginning of a line comment (for www usage)
       } else if (current == '<' && next1 == '!' &&
@@ -233 +226 @@
         shift(2);
         state = InSingleLineComment;
-#endif
       } else {
         token = matchPunctuator(current, next1, next2, next3);
@@ -466 +458 @@
     if (!done)
       shift(1);
-#ifndef KJS_PURE_ECMA
     if (state != Start && state != InSingleLineComment)
       bol = false;
-#endif
   }
 

trunk/JavaScriptCore/kjs/lexer.h

@@ -130 +130 @@
     unsigned int length;
     int yycolumn;
-#ifndef KJS_PURE_ECMA
     int bol;     // begin of line
-#endif
     bool error;
 

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -154 +154 @@
   toLocaleUpperCase     &stringProtoFuncToLocaleUpperCase DontEnum|Function       0
   localeCompare         &stringProtoFuncLocaleCompare     DontEnum|Function       1
-#
-# Under here: html extension, should only exist if KJS_PURE_ECMA is not defined
-# I guess we need to generate two hashtables in the .lut.h file, and use #ifdef
-# to select the right one... TODO. #####
+
   big                   &stringProtoFuncBig               DontEnum|Function       0
   small                 &stringProtoFuncSmall             DontEnum|Function       0
@@ -894 +891 @@
 }
 
-#ifndef KJS_PURE_ECMA
-
 JSValue* stringProtoFuncBig(ExecState* exec, JSObject* thisObj, const List&)
 {
@@ -990 +985 @@
     return jsString("<a href=\"" + a0->toString(exec) + "\">" + s + "</a>");
 }
-
-#endif // KJS_PURE_ECMA
 
 // ------------------------------ StringObjectImp ------------------------------

trunk/JavaScriptCore/kjs/string_object.h

@@ -106 +106 @@
   JSValue* stringProtoFuncLocaleCompare(ExecState*, JSObject*, const List&);
 
-#ifndef KJS_PURE_ECMA
   JSValue* stringProtoFuncBig(ExecState*, JSObject*, const List&);
   JSValue* stringProtoFuncSmall(ExecState*, JSObject*, const List&);
@@ -120 +119 @@
   JSValue* stringProtoFuncAnchor(ExecState*, JSObject*, const List&);
   JSValue* stringProtoFuncLink(ExecState*, JSObject*, const List&);
-#endif // KJS_PURE_ECMA
 
   /**