Changeset 181419 in webkit

Timestamp:

Mar 11, 2015, 5:35:28 PM (11 years ago)

Author:

rniwa@webkit.org

Message:

"static" should not be a reserved keyword in non-strict mode even when ES6 class is enabled
​https://bugs.webkit.org/show_bug.cgi?id=142600

Reviewed by Mark Lam.

Make "static" RESERVED_IF_STRICT and manually detect it in parseClass.

No new tests. This is already checked by js/reserved-words.html and js/keywords-and-reserved_words.html

• parser/Keywords.table:
• parser/Parser.cpp:

(JSC::Parser<LexerType>::parseClass):

• parser/ParserTokens.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• parser/Keywords.table (modified) (2 diffs)
• parser/Parser.cpp (modified) (1 diff)
• parser/ParserTokens.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-03-11  Ryosuke Niwa  <rniwa@webkit.org>
+
+        "static" should not be a reserved keyword in non-strict mode even when ES6 class is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=142600
+
+        Reviewed by Mark Lam.
+
+        Make "static" RESERVED_IF_STRICT and manually detect it in parseClass.
+
+        No new tests. This is already checked by js/reserved-words.html and js/keywords-and-reserved_words.html
+
+        * parser/Keywords.table:
+        * parser/Parser.cpp:
+        (JSC::Parser<LexerType>::parseClass):
+        * parser/ParserTokens.h:
+
 2015-03-11  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/JavaScriptCore/parser/Keywords.table

@@ -31 +31 @@
 else            ELSE
 in              INTOKEN
-static          STATICTOKEN
 super           SUPER
 switch          SWITCH
@@ -53 +52 @@
 protected       RESERVED_IF_STRICT
 public          RESERVED_IF_STRICT
+static          RESERVED_IF_STRICT
 yield           RESERVED_IF_STRICT
 

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -1492 +1492 @@
         unsigned methodStart = tokenStart();
 
-        bool isStaticMethod = match(STATICTOKEN);
+        // For backwards compatibility, "static" is a non-reserved keyword in non-strict mode.
+        bool isStaticMethod = match(RESERVED_IF_STRICT) && *m_token.m_data.ident == m_vm->propertyNames->staticKeyword;
         if (isStaticMethod)
             next();

trunk/Source/JavaScriptCore/parser/ParserTokens.h

@@ -79 +79 @@
     CLASSTOKEN,
     EXTENDS,
-    STATICTOKEN,
     SUPER,
 #else
     CLASSTOKEN = RESERVED,
     EXTENDS = RESERVED,
-    STATICTOKEN = RESERVED_IF_STRICT,
     SUPER = RESERVED,
 #endif