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

Timestamp:

Feb 26, 2012, 2:51:38 PM (13 years ago)

Author:

[email protected]

Message:

StringLiteral and NumericLiteral are allowed as ObjectLiteral getter / setter name
​https://bugs.webkit.org/show_bug.cgi?id=79571

Patch by Yusuke Suzuki <Yusuke Suzuki> on 2012-02-26
Reviewed by Gavin Barraclough.

Source/JavaScriptCore:

• parser/ASTBuilder.h:

(JSC::ASTBuilder::createGetterOrSetterProperty):

• parser/Parser.cpp:

(JSC::::parseProperty):

• parser/SyntaxChecker.h:

(JSC::SyntaxChecker::createGetterOrSetterProperty):

LayoutTests:

• fast/js/property-getters-and-setters-expected.txt:
• fast/js/script-tests/property-getters-and-setters.js:

(o9.string_appeared_here.7.get string_appeared_here):
(o9.set string_appeared_here):
(get shouldBe):
(o10.string_appeared_here.7.get 42):
(o10.set 42):

• platform/chromium/fast/js/property-getters-and-setters-expected.txt:

File:

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

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -1205 +1205 @@
         }
         failIfFalse(wasIdent);
-        matchOrFail(IDENT);
         const Identifier* accessorName = 0;
         TreeFormalParameterList parameters = 0;
@@ -1219 +1218 @@
         else
             fail();
-        failIfFalse((parseFunctionInfo<FunctionNeedsName, false>(context, accessorName, parameters, body, openBracePos, closeBracePos, bodyStartLine)));
-        return context.template createGetterOrSetterProperty<complete>(m_lexer->lastLineNumber(), type, accessorName, parameters, body, openBracePos, closeBracePos, bodyStartLine, m_lastLine);
+        const Identifier* stringPropertyName = 0;
+        double numericPropertyName = 0;
+        if (m_token.m_type == IDENT || m_token.m_type == STRING)
+            stringPropertyName = m_token.m_data.ident;
+        else if (m_token.m_type == NUMBER)
+            numericPropertyName = m_token.m_data.doubleValue;
+        else
+            fail();
+        next();
+        failIfFalse((parseFunctionInfo<FunctionNoRequirements, false>(context, accessorName, parameters, body, openBracePos, closeBracePos, bodyStartLine)));
+        if (stringPropertyName)
+            return context.template createGetterOrSetterProperty<complete>(m_lexer->lastLineNumber(), type, stringPropertyName, parameters, body, openBracePos, closeBracePos, bodyStartLine, m_lastLine);
+        return context.template createGetterOrSetterProperty<complete>(const_cast<JSGlobalData*>(m_globalData), m_lexer->lastLineNumber(), type, numericPropertyName, parameters, body, openBracePos, closeBracePos, bodyStartLine, m_lastLine);
     }
     case NUMBER: {