Changeset 192661 in webkit for trunk/Source/JavaScriptCore/parser/Nodes.h

Timestamp:

Nov 19, 2015, 2:54:46 PM (10 years ago)

Author:

[email protected]

Message:

[JSC] Fix AssignmentElement parsing
​https://bugs.webkit.org/show_bug.cgi?id=151026

Patch by Caitlin Potter <​[email protected]> on 2015-11-19
Reviewed by Geoffrey Garen.

When parsing an AssignmentPattern, any LeftHandSideExpression which
is a valid assignment target is acceptable.

Additionally, this change minimizes the amount of time spent
re-parsing ObjectLiteral and ArrayLiterals, by parsing as an
Expression first (the common case), and re-parsing only if the
result is a valid ObjectLiteral or ArrayLiteral followed by an =,
or if an error specifically indicates that the expression could
have been parsed as an AssignmentPattern.

• bytecompiler/NodesCodegen.cpp:

(JSC::AssignmentElementNode::collectBoundIdentifiers):
(JSC::AssignmentElementNode::bindValue):
(JSC::AssignmentElementNode::toString):

• parser/ASTBuilder.h:

(JSC::ASTBuilder::isAssignmentLocation):
(JSC::ASTBuilder::isObjectLiteral):
(JSC::ASTBuilder::isArrayLiteral):
(JSC::ASTBuilder::isObjectOrArrayLiteral):
(JSC::ASTBuilder::createAssignmentElement):

• parser/NodeConstructors.h:

(JSC::AssignmentElementNode::AssignmentElementNode):

• parser/Nodes.h:

(JSC::ExpressionNode::isObjectLiteral):
(JSC::ExpressionNode::isArrayLiteral):
(JSC::AssignmentElementNode::assignmentTarget):
(JSC::AssignmentElementNode::divotStart):
(JSC::AssignmentElementNode::divotEnd):

• parser/Parser.cpp:

(JSC::Parser<LexerType>::Parser):
(JSC::Parser<LexerType>::createAssignmentElement):
(JSC::Parser<LexerType>::parseBindingOrAssignmentElement):
(JSC::Parser<LexerType>::parseAssignmentElement):
(JSC::Parser<LexerType>::parseDestructuringPattern):
(JSC::Parser<LexerType>::parseAssignmentExpression):
(JSC::Parser<LexerType>::parseProperty):

• parser/Parser.h:

(JSC::Parser::ExpressionErrorClassifier::ExpressionErrorClassifier):
(JSC::Parser::ExpressionErrorClassifier::~ExpressionErrorClassifier):
(JSC::Parser::ExpressionErrorClassifier::classifyExpressionError):
(JSC::Parser::ExpressionErrorClassifier::indicatesPossiblePattern):
(JSC::Parser::classifyExpressionError):

• parser/SyntaxChecker.h:

(JSC::SyntaxChecker::operatorStackPop):

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

(test.):
(test):

• tests/es6/destructuring_initializer_scoping.js: Added.

(test.tester):

• tests/stress/destructuring-assignment-syntax.js: Added.

(testSyntax):
(testSyntaxError):

• tests/stress/rest-elements.js:

(shouldThrow): Deleted.

File:

• trunk/Source/JavaScriptCore/parser/Nodes.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/parser/Nodes.h

@@ -154 +154 @@
         virtual bool isNumber() const { return false; }
         virtual bool isString() const { return false; }
+        virtual bool isObjectLiteral() const { return false; }
+        virtual bool isArrayLiteral() const { return false; }
         virtual bool isNull() const { return false; }
         virtual bool isPure(BytecodeGenerator&) const { return false; }        
@@ -593 +595 @@
         ArrayNode(const JSTokenLocation&, int elision, ElementNode*);
 
+        virtual bool isArrayLiteral() const override { return true; }
+
         ArgumentListNode* toArgumentList(ParserArena&, int, int) const;
 
@@ -648 +652 @@
         ObjectLiteralNode(const JSTokenLocation&);
         ObjectLiteralNode(const JSTokenLocation&, PropertyListNode*);
+        virtual bool isObjectLiteral() const override { return true; }
 
     private:
@@ -2049 +2054 @@
     };
 
+    class AssignmentElementNode : public DestructuringPatternNode {
+    public:
+        AssignmentElementNode(ExpressionNode* assignmentTarget, const JSTextPosition& start, const JSTextPosition& end);
+        const ExpressionNode* assignmentTarget() { return m_assignmentTarget; }
+
+        const JSTextPosition& divotStart() const { return m_divotStart; }
+        const JSTextPosition& divotEnd() const { return m_divotEnd; }
+
+    private:
+        virtual void collectBoundIdentifiers(Vector<Identifier>&) const override;
+        virtual void bindValue(BytecodeGenerator&, RegisterID*) const override;
+        virtual void toString(StringBuilder&) const override;
+
+        JSTextPosition m_divotStart;
+        JSTextPosition m_divotEnd;
+        ExpressionNode* m_assignmentTarget;
+    };
+
     class DestructuringAssignmentNode : public ExpressionNode {
     public: