Changeset 106297 in webkit

Timestamp:

Jan 30, 2012 3:59:20 PM (12 years ago)

Author:

oliver@apple.com

Message:

Unexpected syntax error
​https://bugs.webkit.org/show_bug.cgi?id=77340

Reviewed by Gavin Barraclough.

Source/JavaScriptCore:

Function calls and new expressions have the same semantics for
assignment, so should simply share their lhs handling.

• parser/Parser.cpp:

(JSC::::parseMemberExpression):

LayoutTests:

Add new tests for correct parsing of new expressions

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

(runTest):
(invalid):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/js/parser-syntax-check-expected.txt (modified) (1 diff)
• LayoutTests/fast/js/script-tests/parser-syntax-check.js (modified) (4 diffs)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/parser/Parser.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-01-30  Oliver Hunt  <oliver@apple.com>
+
+        Unexpected syntax error
+        https://bugs.webkit.org/show_bug.cgi?id=77340
+
+        Reviewed by Gavin Barraclough.
+
+        Add new tests for correct parsing of new expressions
+
+        * fast/js/parser-syntax-check-expected.txt:
+        * fast/js/script-tests/parser-syntax-check.js:
+        (runTest):
+        (invalid):
+
 2012-01-30  Tony Chang  <tony@chromium.org>
 

trunk/LayoutTests/fast/js/parser-syntax-check-expected.txt

@@ -568 +568 @@
 PASS Valid:   "if (0) obj.foo\u03bb; "
 PASS Valid:   "function f() { if (0) obj.foo\u03bb;  }"
+PASS Valid:   "if (0) new a(b+c).d = 5"
+PASS Valid:   "function f() { if (0) new a(b+c).d = 5 }"
+PASS Valid:   "if (0) new a(b+c) = 5"
+PASS Valid:   "function f() { if (0) new a(b+c) = 5 }"
 PASS e.line is 1
 PASS foo is 'PASS'

trunk/LayoutTests/fast/js/script-tests/parser-syntax-check.js

@@ -3 +3 @@
 );
 
-function runTest(_a, throws)
+function runTest(_a, errorType)
 {
     var success;
@@ -14 +14 @@
         success = !(e instanceof SyntaxError);
     }
-    if (throws == !success) {
-        if (throws)
+    if ((!!errorType) == !success) {
+        if (errorType)
             testPassed('Invalid: "' + _a + '"');
         else
             testPassed('Valid:   "' + _a + '"');
     } else {
-        if (throws)
-            testFailed('Invalid: "' + _a + '" should throw SyntaxError: Parse error');
+        if (errorType)
+            testFailed('Invalid: "' + _a + '" should throw ' + errorType.name);
         else
-            testFailed('Valid:   "' + _a + '" should NOT throw SyntaxError: Parse error');
+            testFailed('Valid:   "' + _a + '" should NOT throw ');
     }
 }
@@ -34 +34 @@
 }
 
-function invalid(_a)
+function invalid(_a, _type)
 {
+    _type = _type || SyntaxError;
     // Test both the grammar and the syntax checker
     runTest(_a, true);
@@ -361 +362 @@
 valid("if (0) obj.foo_; ")
 valid("if (0) obj.foo\\u03bb; ")
+valid("if (0) new a(b+c).d = 5");
+valid("if (0) new a(b+c) = 5");
 
 try { eval("a.b.c = {};"); } catch(e1) { e=e1; shouldBe("e.line", "1") }

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-01-30  Oliver Hunt  <oliver@apple.com>
+
+        Unexpected syntax error
+        https://bugs.webkit.org/show_bug.cgi?id=77340
+
+        Reviewed by Gavin Barraclough.
+
+        Function calls and new expressions have the same semantics for
+        assignment, so should simply share their lhs handling.
+
+        * parser/Parser.cpp:
+        (JSC::::parseMemberExpression):
+
 2012-01-30  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -1513 +1513 @@
         case OPENPAREN: {
             m_nonTrivialExpressionCount++;
+            int nonLHSCount = m_nonLHSCount;
             if (newCount) {
                 newCount--;
-                if (match(OPENPAREN)) {
-                    int exprEnd = lastTokenEnd();
-                    TreeArguments arguments = parseArguments(context);
-                    failIfFalse(arguments);
-                    base = context.createNewExpr(m_lexer->lastLineNumber(), base, arguments, start, exprEnd, lastTokenEnd());
-                } else
-                    base = context.createNewExpr(m_lexer->lastLineNumber(), base, start, lastTokenEnd());               
+                int exprEnd = lastTokenEnd();
+                TreeArguments arguments = parseArguments(context);
+                failIfFalse(arguments);
+                base = context.createNewExpr(m_lexer->lastLineNumber(), base, arguments, start, exprEnd, lastTokenEnd());           
             } else {
-                int nonLHSCount = m_nonLHSCount;
                 int expressionEnd = lastTokenEnd();
                 TreeArguments arguments = parseArguments(context);
                 failIfFalse(arguments);
                 base = context.makeFunctionCallNode(m_lexer->lastLineNumber(), base, arguments, expressionStart, expressionEnd, lastTokenEnd());
-                m_nonLHSCount = nonLHSCount;
             }
+            m_nonLHSCount = nonLHSCount;
             break;
         }