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

Timestamp:

Mar 6, 2015, 2:31:28 PM (10 years ago)

Author:

[email protected]

Message:

ES6: Object Literal Extensions - Methods
​https://bugs.webkit.org/show_bug.cgi?id=142390

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2015-03-06
Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

Support method syntax in object literals.

• parser/Parser.h:
• parser/Parser.cpp:

(JSC::stringForFunctionMode):
(JSC::Parser<LexerType>::parseProperty):
Methods are allowed for identifier, string, and numeric names,
and computed property names.

(JSC::Parser<LexerType>::parsePropertyMethod):
Helper for parsing a property method.

LayoutTests:

• js/object-literal-computed-methods-expected.txt: Added.
• js/object-literal-computed-methods.html: Added.
• js/object-literal-methods-expected.txt: Added.
• js/object-literal-methods.html: Added.
• js/script-tests/object-literal-computed-methods.js: Added.
• js/script-tests/object-literal-methods.js: Added.

File:

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

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -1283 +1283 @@
     case FunctionMode:
         return "function";
-#if ENABLE(ES6_CLASS_SYNTAX)
     case MethodMode:
         return "method";
-#endif
     }
     RELEASE_ASSERT_NOT_REACHED();
@@ -1937 +1935 @@
         }
 
+        if (match(OPENPAREN)) {
+            auto method = parsePropertyMethod(context, ident);
+            propagateError();
+            return context.createProperty(ident, method, PropertyNode::Constant, PropertyNode::KnownDirect, complete);
+        }
+
         failIfFalse(wasIdent, "Expected an identifier as property name");
 
@@ -1960 +1964 @@
         double propertyName = m_token.m_data.doubleValue;
         next();
+
+        if (match(OPENPAREN)) {
+            const Identifier& ident = m_parserArena.identifierArena().makeNumericIdentifier(const_cast<VM*>(m_vm), propertyName);
+            auto method = parsePropertyMethod(context, &ident);
+            propagateError();
+            return context.createProperty(&ident, method, PropertyNode::Constant, PropertyNode::Unknown, complete);
+        }
+
         consumeOrFail(COLON, "Expected ':' after property name");
         TreeExpression node = parseAssignmentExpression(context);
@@ -1970 +1982 @@
         auto propertyName = parseExpression(context);
         failIfFalse(propertyName, "Cannot parse computed property name");
-        
         handleProductionOrFail(CLOSEBRACKET, "]", "end", "computed property name");
+
+        if (match(OPENPAREN)) {
+            auto method = parsePropertyMethod(context, &m_vm->propertyNames->nullIdentifier);
+            propagateError();
+            return context.createProperty(propertyName, method, PropertyNode::Constant, PropertyNode::KnownDirect, complete);
+        }
+
         consumeOrFail(COLON, "Expected ':' after property name");
         TreeExpression node = parseAssignmentExpression(context);
@@ -1982 +2000 @@
         goto namedProperty;
     }
+}
+
+template <typename LexerType>
+template <class TreeBuilder> TreeExpression Parser<LexerType>::parsePropertyMethod(TreeBuilder& context, const Identifier* methodName)
+{
+    JSTokenLocation methodLocation(tokenLocation());
+    unsigned methodStart = tokenStart();
+    ParserFunctionInfo<TreeBuilder> methodInfo;
+    failIfFalse((parseFunctionInfo(context, FunctionNoRequirements, MethodMode, false, methodInfo)), "Cannot parse this method");
+    methodInfo.name = methodName;
+    return context.createFunctionExpr(methodLocation, methodInfo, methodStart);
 }