Changeset 188018 in webkit

Timestamp:

Aug 5, 2015 9:01:00 PM (9 years ago)

Author:

rniwa@webkit.org

Message:

[ES6] Class parser does not allow methods named set and get.
​https://bugs.webkit.org/show_bug.cgi?id=147150

Reviewed by Oliver Hunt.

Source/JavaScriptCore:

The bug was caused by parseClass assuming identifiers "get" and "set" could only appear
as the leading token for getter and setter methods. Fixed the bug by generalizing the code
so that we only treat them as such when it's followed by another token that could be a method name.

• parser/Parser.cpp:

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

LayoutTests:

Added a regression test and rebaselined a test.

• js/class-syntax-method-names-expected.txt: Added.
• js/class-syntax-method-names.html: Added.
• js/class-syntax-semicolon-expected.txt: Rebaselined as the error message got improved.
• js/script-tests/class-syntax-method-names.js: Added.
• js/script-tests/class-syntax-semicolon.js:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/js/class-syntax-method-names-expected.txt (added)
• LayoutTests/js/class-syntax-method-names.html (added)
• LayoutTests/js/class-syntax-semicolon-expected.txt (modified) (1 diff)
• LayoutTests/js/script-tests/class-syntax-method-names.js (added)
• LayoutTests/js/script-tests/class-syntax-semicolon.js (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/parser/Parser.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-08-05  Ryosuke Niwa  <rniwa@webkit.org>
+
+        [ES6] Class parser does not allow methods named set and get.
+        https://bugs.webkit.org/show_bug.cgi?id=147150
+
+        Reviewed by Oliver Hunt.
+
+        Added a regression test and rebaselined a test.
+
+        * js/class-syntax-method-names-expected.txt: Added.
+        * js/class-syntax-method-names.html: Added.
+        * js/class-syntax-semicolon-expected.txt: Rebaselined as the error message got improved.
+        * js/script-tests/class-syntax-method-names.js: Added.
+        * js/script-tests/class-syntax-semicolon.js:
+
 2015-08-05  Nikita Vasilyev  <nvasilyev@apple.com>
 

trunk/LayoutTests/js/class-syntax-semicolon-expected.txt

@@ -6 +6 @@
 PASS class A { foo;() { } } threw exception SyntaxError: Unexpected token ';'. Expected an opening '(' before a method's parameter list..
 PASS class A { foo() ; { } } threw exception SyntaxError: Unexpected token ';'. Expected an opening '{' at the start of a method body..
-PASS class A { get ; foo() { } } threw exception SyntaxError: Unexpected token ';'.
+PASS class A { get ; foo() { } } threw exception SyntaxError: Unexpected token ';'. Expected an opening '(' before a method's parameter list..
 PASS class A { get foo;() { } } threw exception SyntaxError: Unexpected token ';'. Expected a parameter list for getter definition..
 PASS class A { get foo() ; { } } threw exception SyntaxError: Unexpected token ';'. Expected an opening '{' at the start of a getter body..
-PASS class A { set ; foo(x) { } } threw exception SyntaxError: Unexpected token ';'.
+PASS class A { set ; foo(x) { } } threw exception SyntaxError: Unexpected token ';'. Expected an opening '(' before a method's parameter list..
 PASS class A { set foo;(x) { } } threw exception SyntaxError: Unexpected token ';'. Expected a parameter list for setter definition..
 PASS class A { set foo(x) ; { } } threw exception SyntaxError: Unexpected token ';'. Expected an opening '{' at the start of a setter body..

trunk/LayoutTests/js/script-tests/class-syntax-semicolon.js

@@ -5 +5 @@
 shouldThrow("class A { foo;() { } }", "'SyntaxError: Unexpected token \\';\\'. Expected an opening \\'(\\' before a method\\'s parameter list.'");
 shouldThrow("class A { foo() ; { } }", "'SyntaxError: Unexpected token \\\';\\'. Expected an opening \\'{\\' at the start of a method body.'");
-shouldThrow("class A { get ; foo() { } }", "'SyntaxError: Unexpected token \\';\\''");
+shouldThrow("class A { get ; foo() { } }", "'SyntaxError: Unexpected token \\';\\'. Expected an opening \\'(\\' before a method\\'s parameter list.'");
 shouldThrow("class A { get foo;() { } }", "'SyntaxError: Unexpected token \\\';\\'. Expected a parameter list for getter definition.'");
 shouldThrow("class A { get foo() ; { } }", "'SyntaxError: Unexpected token \\\';\\'. Expected an opening \\'{\\' at the start of a getter body.'");
-shouldThrow("class A { set ; foo(x) { } }", "'SyntaxError: Unexpected token \\';\\''");
+shouldThrow("class A { set ; foo(x) { } }", "'SyntaxError: Unexpected token \\';\\'. Expected an opening \\'(\\' before a method\\'s parameter list.'");
 shouldThrow("class A { set foo;(x) { } }", "'SyntaxError: Unexpected token \\\';\\'. Expected a parameter list for setter definition.'");
 shouldThrow("class A { set foo(x) ; { } }", "'SyntaxError: Unexpected token \\\';\\'. Expected an opening \\'{\\' at the start of a setter body.'");

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-08-05  Ryosuke Niwa  <rniwa@webkit.org>
+
+        [ES6] Class parser does not allow methods named set and get.
+        https://bugs.webkit.org/show_bug.cgi?id=147150
+
+        Reviewed by Oliver Hunt.
+
+        The bug was caused by parseClass assuming identifiers "get" and "set" could only appear
+        as the leading token for getter and setter methods. Fixed the bug by generalizing the code
+        so that we only treat them as such when it's followed by another token that could be a method name.
+
+        * parser/Parser.cpp:
+        (JSC::Parser<LexerType>::parseClass):
+
 2015-08-05  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -1951 +1951 @@
         case IDENT:
             ident = m_token.m_data.ident;
-            isGetter = *ident == propertyNames.get;
-            isSetter = *ident == propertyNames.set;
             ASSERT(ident);
+            next();
+            if (match(IDENT) || match(STRING) || match(DOUBLE) || match(INTEGER)) {
+                isGetter = *ident == propertyNames.get;
+                isSetter = *ident == propertyNames.set;
+            }
             break;
         case DOUBLE:
@@ -1968 +1971 @@
         const bool alwaysStrictInsideClass = true;
         if (isGetter || isSetter) {
-            nextExpectIdentifier(LexerFlagsIgnoreReservedWords);
             property = parseGetterSetter(context, alwaysStrictInsideClass, isGetter ? PropertyNode::Getter : PropertyNode::Setter, methodStart,
                 ConstructorKind::None, SuperBinding::Needed);