Changeset 188018 in webkit for trunk/Source/JavaScriptCore/parser/Parser.cpp

Timestamp:

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

Author:

[email protected]

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:

File:

• trunk/Source/JavaScriptCore/parser/Parser.cpp (modified) (2 diffs)

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);