Changeset 108935 in webkit

Timestamp:

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

Author:

commit-queue@webkit.org

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:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/js/property-getters-and-setters-expected.txt (modified) (1 diff)
• LayoutTests/fast/js/script-tests/property-getters-and-setters.js (modified) (1 diff)
• LayoutTests/platform/chromium/fast/js/property-getters-and-setters-expected.txt (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/parser/ASTBuilder.h (modified) (1 diff)
• Source/JavaScriptCore/parser/Parser.cpp (modified) (2 diffs)
• Source/JavaScriptCore/parser/SyntaxChecker.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-26  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        StringLiteral and NumericLiteral are allowed as ObjectLiteral getter / setter name
+        https://bugs.webkit.org/show_bug.cgi?id=79571
+
+        Reviewed by Gavin Barraclough.
+
+        * 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:
+
 2012-02-26  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/LayoutTests/fast/js/property-getters-and-setters-expected.txt

@@ -31 +31 @@
 PASS o8.numSets is 0
 PASS typeof testObj.getter is 'string'
+the get set with string property name
+PASS o9.b is 8
+PASS o9.b is 11
+the get set with numeric property name
+PASS o10[42] is 8
+PASS o10[42] is 11
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/js/script-tests/property-getters-and-setters.js

@@ -68 +68 @@
 testObj=({get getter(){return 'getter was called.'}, b: 'bar'})
 shouldBe("typeof testObj.getter", "'string'");
+
+debug("the get set with string property name");
+var o9 = { 'a':7, get 'b'() { return this.a + 1 }, set 'b'(x) { this.a = x } }
+shouldBe("o9.b", "8");
+o9.b = 10;
+shouldBe("o9.b", "11");
+
+debug("the get set with numeric property name");
+var o10 = { 'a':7, get 42() { return this.a + 1 }, set 42(x) { this.a = x } }
+shouldBe("o10[42]", "8");
+o10[42] = 10;
+shouldBe("o10[42]", "11");

trunk/LayoutTests/platform/chromium/fast/js/property-getters-and-setters-expected.txt

@@ -31 +31 @@
 PASS o8.numSets is 0
 PASS typeof testObj.getter is 'string'
+the get set with string property name
+PASS o9.b is 8
+PASS o9.b is 11
+the get set with numeric property name
+PASS o10[42] is 8
+PASS o10[42] is 11
 PASS successfullyParsed is true
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-02-26  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        StringLiteral and NumericLiteral are allowed as ObjectLiteral getter / setter name
+        https://bugs.webkit.org/show_bug.cgi?id=79571
+
+        Reviewed by Gavin Barraclough.
+
+        * parser/ASTBuilder.h:
+        (JSC::ASTBuilder::createGetterOrSetterProperty):
+        * parser/Parser.cpp:
+        (JSC::::parseProperty):
+        * parser/SyntaxChecker.h:
+        (JSC::SyntaxChecker::createGetterOrSetterProperty):
+
 2012-02-26  Mark Hahnenberg  <mhahnenberg@apple.com>
 

trunk/Source/JavaScriptCore/parser/ASTBuilder.h

@@ -277 +277 @@
     }
     
+    template <bool> PropertyNode* createGetterOrSetterProperty(JSGlobalData*, int lineNumber, PropertyNode::Type type, double name, ParameterNode* params, FunctionBodyNode* body, int openBracePos, int closeBracePos, int bodyStartLine, int bodyEndLine)
+    {
+        body->setLoc(bodyStartLine, bodyEndLine);
+        return new (m_globalData) PropertyNode(m_globalData, name, new (m_globalData) FuncExprNode(lineNumber, m_globalData->propertyNames->nullIdentifier, body, m_sourceCode->subExpression(openBracePos, closeBracePos, bodyStartLine), params), type);
+    }
 
     ArgumentsNode* createArguments() { return new (m_globalData) ArgumentsNode(); }

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: {

trunk/Source/JavaScriptCore/parser/SyntaxChecker.h

@@ -211 +211 @@
         return Property(name, type);
     }
+    template <bool strict> Property createGetterOrSetterProperty(JSGlobalData* globalData, int, PropertyNode::Type type, double name, int, int, int, int, int, int)
+    {
+        if (!strict)
+            return Property(type);
+        return Property(&globalData->parserArena->identifierArena().makeNumericIdentifier(globalData, name), type);
+    }
 
     void appendStatement(int, int) { }