Changeset 11879 in webkit for trunk/JavaScriptCore/kjs/function_object.cpp

Timestamp:

Jan 4, 2006, 1:44:25 PM (19 years ago)

Author:

ggaren

Message:

Patch by ​[email protected], reviewed by darin, tweaked by me.

• Fixed ​http://bugzilla.opendarwin.org/show_bug.cgi?id=4921 \u escape sequences in JavaScript identifiers

• kjs/function_object.cpp: (FunctionObjectImp::construct):
• kjs/lexer.cpp: (Lexer::shift): (Lexer::lex): (Lexer::isWhiteSpace): (Lexer::isLineTerminator): (Lexer::isIdentStart): (Lexer::isIdentPart): (isDecimalDigit): (Lexer::scanRegExp):
• kjs/lexer.h: (KJS::Lexer::):

• tests/mozilla/expected.html: Updated test results.

File:

• trunk/JavaScriptCore/kjs/function_object.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/function_object.cpp

@@ -222 +222 @@
   FunctionBodyNode *bodyNode = progNode.get();
 
-  FunctionImp *fimp = new DeclaredFunctionImp(exec, Identifier::null(), bodyNode,
-                                              scopeChain);
-
+  FunctionImp *fimp = new DeclaredFunctionImp(exec, Identifier::null(), bodyNode, scopeChain);
+  
   // parse parameter list. throw syntax error on illegal identifiers
   int len = p.size();
@@ -232 +231 @@
   while (i < len) {
       while (*c == ' ' && i < len)
-          c++, i++;
-      if (Lexer::isIdentLetter(c->uc)) {  // else error
-          param = UString(c, 1);
-          c++, i++;
-          while (i < len && (Lexer::isIdentLetter(c->uc) ||
-                             Lexer::isDecimalDigit(c->uc))) {
-              param += UString(c, 1);
-              c++, i++;
-          }
-          while (i < len && *c == ' ')
-              c++, i++;
-          if (i == len) {
-              fimp->addParameter(Identifier(param));
-              params++;
-              break;
-          } else if (*c == ',') {
-              fimp->addParameter(Identifier(param));
-              params++;
-              c++, i++;
-              continue;
-          } // else error
+          c++, i++;
+      if (Lexer::isIdentStart(c->uc)) {  // else error
+          param = UString(c, 1);
+          c++, i++;
+          while (i < len && (Lexer::isIdentPart(c->uc))) {
+              param += UString(c, 1);
+              c++, i++;
+          }
+          while (i < len && *c == ' ')
+              c++, i++;
+          if (i == len) {
+              fimp->addParameter(Identifier(param));
+              params++;
+              break;
+          } else if (*c == ',') {
+              fimp->addParameter(Identifier(param));
+              params++;
+              c++, i++;
+              continue;
+          } // else error
       }
       return throwError(exec, SyntaxError, "Syntax error in parameter list");
   }
-
+  
   List consArgs;