Changeset 69963 in webkit

Timestamp:

Oct 18, 2010 9:30:12 AM (14 years ago)

Author:

zherczeg@webkit.org

Message:

2010-10-18 Zoltan Herczeg <​zherczeg@webkit.org>

Reviewed by Oliver Hunt.

if (0) throw "x" ; else { } throws parse error after r69906
​https://bugs.webkit.org/show_bug.cgi?id=47807

r69906 introduced a bug: the semicolon is not parsed after a throw
expression anymore. Thus, the semicolon terminates the "if" parsing
in the example above, and the else token results a parse error.

• parser/JSParser.cpp: (JSC::JSParser::parseThrowStatement):

2010-10-18 Zoltan Herczeg <​zherczeg@webkit.org>

Reviewed by Oliver Hunt.

if (0) throw "x" ; else { } throws parse error after r69906
​https://bugs.webkit.org/show_bug.cgi?id=47807

Adding a new test case to break-ASI.js

• fast/js/break-ASI-expected.txt:
• fast/js/script-tests/break-ASI.js:

Location:

trunk

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/parser/JSParser.cpp (modified) (1 diff)
• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/js/break-ASI-expected.txt (modified) (1 diff)
• LayoutTests/fast/js/script-tests/break-ASI.js (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-10-18  Zoltan Herczeg  <zherczeg@webkit.org>
+
+        Reviewed by Oliver Hunt.
+
+        if (0) throw "x" ; else { } throws parse error after r69906
+        https://bugs.webkit.org/show_bug.cgi?id=47807
+
+        r69906 introduced a bug: the semicolon is not parsed after a throw
+        expression anymore. Thus, the semicolon terminates the "if" parsing
+        in the example above, and the else token results a parse error.
+
+        * parser/JSParser.cpp:
+        (JSC::JSParser::parseThrowStatement):
+
 2010-10-18  Peter Varga  <pvarga@inf.u-szeged.hu>
 

trunk/JavaScriptCore/parser/JSParser.cpp

@@ -901 +901 @@
     int eEnd = lastTokenEnd();
     int endLine = tokenLine();
+    failIfFalse(autoSemiColon());
 
     return context.createThrowStatement(expr, eStart, eEnd, startLine, endLine);

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-18  Zoltan Herczeg  <zherczeg@webkit.org>
+
+        Reviewed by Oliver Hunt.
+
+        if (0) throw "x" ; else { } throws parse error after r69906
+        https://bugs.webkit.org/show_bug.cgi?id=47807
+
+        Adding a new test case to break-ASI.js
+
+        * fast/js/break-ASI-expected.txt:
+        * fast/js/script-tests/break-ASI.js:
+
 2010-10-18  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/LayoutTests/fast/js/break-ASI-expected.txt

@@ -10 +10 @@
 PASS (function(){if (0) return
 ;else return true;})() is true
+PASS do { if(0) throw 'x';else true; } while (0) is true
 PASS if (0) throw
 'Shouldn't have parsed this.'; threw exception SyntaxError: Parse error.

trunk/LayoutTests/fast/js/script-tests/break-ASI.js

@@ -4 +4 @@
 shouldBeTrue("do { if(0) continue\n;else true; } while (0)")
 shouldBeTrue("(function(){if (0) return\n;else return true;})()")
+shouldBeTrue("do { if(0) throw 'x';else true; } while (0)")
 shouldThrow("if (0) throw\n'Shouldn\'t have parsed this.';")