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

Timestamp:

Nov 24, 2015, 5:43:14 PM (10 years ago)

Author:

[email protected]

Message:

[JSC] support Computed Property Names in destructuring Patterns
​https://bugs.webkit.org/show_bug.cgi?id=151494

Patch by Caitlin Potter <​[email protected]> on 2015-11-24
Reviewed by Saam Barati.

Add support for computed property names in destructuring BindingPatterns
and AssignmentPatterns.

Productions BindingProperty(1) and AssignmentProperty(2) allow for any valid
PropertName(3), including ComputedPropertyName(4)

1: ​http://tc39.github.io/ecma262/#prod-BindingProperty
2: ​http://tc39.github.io/ecma262/#prod-AssignmentProperty
3: ​http://tc39.github.io/ecma262/#prod-PropertyName
4: ​http://tc39.github.io/ecma262/#prod-ComputedPropertyName

• bytecompiler/NodesCodegen.cpp:

(JSC::ObjectPatternNode::bindValue):

• parser/ASTBuilder.h:

(JSC::ASTBuilder::appendObjectPatternEntry):

• parser/Nodes.h:

(JSC::ObjectPatternNode::appendEntry):

• parser/Parser.cpp:

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

• parser/SyntaxChecker.h:

(JSC::SyntaxChecker::operatorStackPop):

• tests/es6.yaml:
• tests/es6/destructuring_assignment_computed_properties.js: Added.

(test):
(test.computeName):
(test.loadValue):
(test.out.get a):
(test.out.set a):
(test.out.get b):
(test.out.set b):
(test.out.get c):
(test.out.set c):
(test.get var):

File:

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

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -862 +862 @@
 
             const Identifier* propertyName = nullptr;
+            TreeExpression propertyExpression = 0;
             TreeDestructuringPattern innerPattern = 0;
             JSTokenLocation location = m_token.m_location;
@@ -883 +884 @@
                     propertyName = m_token.m_data.ident;
                     wasString = true;
+                    break;
+                case OPENBRACKET:
+                    next();
+                    propertyExpression = parseAssignmentExpression(context);
+                    failIfFalse(propertyExpression, "Cannot parse computed property name");
+                    matchOrFail(CLOSEBRACKET, "Expected ']' to end end a computed property name");
                     break;
                 default:
@@ -909 +916 @@
             failIfFalse(innerPattern, "Cannot parse this destructuring pattern");
             TreeExpression defaultValue = parseDefaultValueForDestructuringPattern(context);
-            ASSERT(propertyName);
-            context.appendObjectPatternEntry(objectPattern, location, wasString, *propertyName, innerPattern, defaultValue);
+            if (propertyExpression)
+                context.appendObjectPatternEntry(objectPattern, location, propertyExpression, innerPattern, defaultValue);
+            else {
+                ASSERT(propertyName);
+                context.appendObjectPatternEntry(objectPattern, location, wasString, *propertyName, innerPattern, defaultValue);
+            }
         } while (consume(COMMA));