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

Timestamp:

Apr 4, 2012, 5:56:54 PM (13 years ago)

Author:

[email protected]

Message:

Parser fails to revert some state after parsing expression and object literals.
​https://bugs.webkit.org/show_bug.cgi?id=83236

Reviewed by Gavin Barraclough.

Source/JavaScriptCore:

Reset left hand side counter after parsing the literals.

• parser/Parser.cpp:

(JSC::::parseObjectLiteral):
(JSC::::parseStrictObjectLiteral):
(JSC::::parseArrayLiteral):

LayoutTests:

Add more parser test cases.

• fast/js/parser-syntax-check-expected.txt:
• fast/js/script-tests/parser-syntax-check.js:

File:

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

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -1257 +1257 @@
     consumeOrFailWithFlags(OPENBRACE, TreeBuilder::DontBuildStrings);
     
+    int oldNonLHSCount = m_nonLHSCount;
+    
     if (match(CLOSEBRACE)) {
         next();
@@ -1292 +1294 @@
     consumeOrFail(CLOSEBRACE);
     
+    m_nonLHSCount = oldNonLHSCount;
+    
     return context.createObjectLiteral(m_lexer->lastLineNumber(), propertyList);
 }
@@ -1300 +1304 @@
     consumeOrFail(OPENBRACE);
     
+    int oldNonLHSCount = m_nonLHSCount;
+
     if (match(CLOSEBRACE)) {
         next();
@@ -1336 +1342 @@
     
     consumeOrFail(CLOSEBRACE);
-    
+
+    m_nonLHSCount = oldNonLHSCount;
+
     return context.createObjectLiteral(m_lexer->lastLineNumber(), propertyList);
 }
@@ -1344 +1352 @@
 {
     consumeOrFailWithFlags(OPENBRACKET, TreeBuilder::DontBuildStrings);
+    
+    int oldNonLHSCount = m_nonLHSCount;
     
     int elisions = 0;
@@ -1379 +1389 @@
     
     consumeOrFail(CLOSEBRACKET);
+    
+    m_nonLHSCount = oldNonLHSCount;
     
     return context.createArray(m_lexer->lastLineNumber(), elementList);