<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[183383] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/183383">183383</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-26 21:20:32 -0700 (Sun, 26 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Class body ending with a semicolon throws a SyntaxError
https://bugs.webkit.org/show_bug.cgi?id=144244
Reviewed by Darin Adler.
Source/JavaScriptCore:
The bug was caused by parseClass's inner loop for method definitions not moving onto the next iteration
it encounters a semicolon. As a result, we always expected a method to appear after a semicolon. Fixed
it by continue'ing when it encounters a semicolon.
* parser/Parser.cpp:
(JSC::Parser<LexerType>::parseClass):
LayoutTests:
Added a regression test for having a semicolon inside the class definition.
* js/class-syntax-semicolon-expected.txt: Added.
* js/class-syntax-semicolon.html: Added.
* js/script-tests/class-syntax-semicolon.js: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParsercpp">trunk/Source/JavaScriptCore/parser/Parser.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsclasssyntaxsemicolonexpectedtxt">trunk/LayoutTests/js/class-syntax-semicolon-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsclasssyntaxsemicolonhtml">trunk/LayoutTests/js/class-syntax-semicolon.html</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsclasssyntaxsemicolonjs">trunk/LayoutTests/js/script-tests/class-syntax-semicolon.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (183382 => 183383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-04-27 04:18:18 UTC (rev 183382)
+++ trunk/LayoutTests/ChangeLog 2015-04-27 04:20:32 UTC (rev 183383)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-04-26 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><ins>+ Class body ending with a semicolon throws a SyntaxError
+ https://bugs.webkit.org/show_bug.cgi?id=144244
+
+ Reviewed by Darin Adler.
+
+ Added a regression test for having a semicolon inside the class definition.
+
+ * js/class-syntax-semicolon-expected.txt: Added.
+ * js/class-syntax-semicolon.html: Added.
+ * js/script-tests/class-syntax-semicolon.js: Added.
+
+2015-04-26 Ryosuke Niwa <rniwa@webkit.org>
+
</ins><span class="cx"> Getter or setter method named "prototype" or "constrcutor" should throw SyntaxError
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=144243
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsjsclasssyntaxsemicolonexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/class-syntax-semicolon-expected.txt (0 => 183383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/class-syntax-semicolon-expected.txt (rev 0)
+++ trunk/LayoutTests/js/class-syntax-semicolon-expected.txt 2015-04-27 04:20:32 UTC (rev 183383)
</span><span class="lines">@@ -0,0 +1,66 @@
</span><ins>+Tests for ES6 class syntax containing semicolon in the class body
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS class A { foo;() { } } threw exception SyntaxError: Unexpected token ';'. Expected an opening '(' before a method's parameter list..
+PASS class A { foo() ; { } } threw exception SyntaxError: Unexpected token ';'. Expected an opening '{' at the start of a method body..
+PASS class A { get ; foo() { } } threw exception SyntaxError: Unexpected token ';'.
+PASS class A { get foo;() { } } threw exception SyntaxError: Unexpected token ';'. Expected a parameter list for getter definition..
+PASS class A { get foo() ; { } } threw exception SyntaxError: Unexpected token ';'. Expected an opening '{' at the start of a getter body..
+PASS class A { set ; foo(x) { } } threw exception SyntaxError: Unexpected token ';'.
+PASS class A { set foo;(x) { } } threw exception SyntaxError: Unexpected token ';'. Expected a parameter list for setter definition..
+PASS class A { set foo(x) ; { } } threw exception SyntaxError: Unexpected token ';'. Expected an opening '{' at the start of a setter body..
+PASS class A { ; } did not throw exception.
+PASS class A { foo() { } ; } did not throw exception.
+PASS class A { get foo() { } ; } did not throw exception.
+PASS class A { set foo(x) { } ; } did not throw exception.
+PASS class A { static foo() { } ; } did not throw exception.
+PASS class A { static get foo() { } ; } did not throw exception.
+PASS class A { static set foo(x) { } ; } did not throw exception.
+PASS class A { ; foo() { } } did not throw exception.
+PASS class A { ; get foo() { } } did not throw exception.
+PASS class A { ; set foo(x) { } } did not throw exception.
+PASS class A { ; static foo() { } } did not throw exception.
+PASS class A { ; static get foo() { } } did not throw exception.
+PASS class A { ; static set foo(x) { } } did not throw exception.
+PASS class A { foo() { } ; foo() {} } did not throw exception.
+PASS class A { foo() { } ; get foo() {} } did not throw exception.
+PASS class A { foo() { } ; set foo(x) {} } did not throw exception.
+PASS class A { foo() { } ; static foo() {} } did not throw exception.
+PASS class A { foo() { } ; static get foo() {} } did not throw exception.
+PASS class A { foo() { } ; static set foo(x) {} } did not throw exception.
+PASS class A { get foo() { } ; foo() {} } did not throw exception.
+PASS class A { get foo() { } ; get foo() {} } did not throw exception.
+PASS class A { get foo() { } ; set foo(x) {} } did not throw exception.
+PASS class A { get foo() { } ; static foo() {} } did not throw exception.
+PASS class A { get foo() { } ; static get foo() {} } did not throw exception.
+PASS class A { get foo() { } ; static set foo(x) {} } did not throw exception.
+PASS class A { set foo(x) { } ; foo() {} } did not throw exception.
+PASS class A { set foo(x) { } ; get foo() {} } did not throw exception.
+PASS class A { set foo(x) { } ; set foo(x) {} } did not throw exception.
+PASS class A { set foo(x) { } ; static foo() {} } did not throw exception.
+PASS class A { set foo(x) { } ; static get foo() {} } did not throw exception.
+PASS class A { set foo(x) { } ; static set foo(x) {} } did not throw exception.
+PASS class A { static foo() { } ; foo() {} } did not throw exception.
+PASS class A { static foo() { } ; get foo() {} } did not throw exception.
+PASS class A { static foo() { } ; set foo(x) {} } did not throw exception.
+PASS class A { static foo() { } ; static foo() {} } did not throw exception.
+PASS class A { static foo() { } ; static get foo() {} } did not throw exception.
+PASS class A { static foo() { } ; static set foo(x) {} } did not throw exception.
+PASS class A { static get foo() { } ; foo() {} } did not throw exception.
+PASS class A { static get foo() { } ; get foo() {} } did not throw exception.
+PASS class A { static get foo() { } ; set foo(x) {} } did not throw exception.
+PASS class A { static get foo() { } ; static foo() {} } did not throw exception.
+PASS class A { static get foo() { } ; static get foo() {} } did not throw exception.
+PASS class A { static get foo() { } ; static set foo(x) {} } did not throw exception.
+PASS class A { static set foo(x) { } ; foo() {} } did not throw exception.
+PASS class A { static set foo(x) { } ; get foo() {} } did not throw exception.
+PASS class A { static set foo(x) { } ; set foo(x) {} } did not throw exception.
+PASS class A { static set foo(x) { } ; static foo() {} } did not throw exception.
+PASS class A { static set foo(x) { } ; static get foo() {} } did not throw exception.
+PASS class A { static set foo(x) { } ; static set foo(x) {} } did not throw exception.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsclasssyntaxsemicolonhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/class-syntax-semicolon.html (0 => 183383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/class-syntax-semicolon.html (rev 0)
+++ trunk/LayoutTests/js/class-syntax-semicolon.html 2015-04-27 04:20:32 UTC (rev 183383)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src="../resources/js-test-pre.js"></script>
+<script src="script-tests/class-syntax-semicolon.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsclasssyntaxsemicolonjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/script-tests/class-syntax-semicolon.js (0 => 183383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/class-syntax-semicolon.js (rev 0)
+++ trunk/LayoutTests/js/script-tests/class-syntax-semicolon.js 2015-04-27 04:20:32 UTC (rev 183383)
</span><span class="lines">@@ -0,0 +1,70 @@
</span><ins>+
+description('Tests for ES6 class syntax containing semicolon in the class body');
+
+shouldThrow("class A { foo;() { } }", "'SyntaxError: Unexpected token \\';\\'. Expected an opening \\'(\\' before a method\\'s parameter list.'");
+shouldThrow("class A { foo() ; { } }", "'SyntaxError: Unexpected token \\\';\\'. Expected an opening \\'{\\' at the start of a method body.'");
+shouldThrow("class A { get ; foo() { } }", "'SyntaxError: Unexpected token \\';\\''");
+shouldThrow("class A { get foo;() { } }", "'SyntaxError: Unexpected token \\\';\\'. Expected a parameter list for getter definition.'");
+shouldThrow("class A { get foo() ; { } }", "'SyntaxError: Unexpected token \\\';\\'. Expected an opening \\'{\\' at the start of a getter body.'");
+shouldThrow("class A { set ; foo(x) { } }", "'SyntaxError: Unexpected token \\';\\''");
+shouldThrow("class A { set foo;(x) { } }", "'SyntaxError: Unexpected token \\\';\\'. Expected a parameter list for setter definition.'");
+shouldThrow("class A { set foo(x) ; { } }", "'SyntaxError: Unexpected token \\\';\\'. Expected an opening \\'{\\' at the start of a setter body.'");
+
+shouldNotThrow("class A { ; }");
+shouldNotThrow("class A { foo() { } ; }");
+shouldNotThrow("class A { get foo() { } ; }");
+shouldNotThrow("class A { set foo(x) { } ; }");
+shouldNotThrow("class A { static foo() { } ; }");
+shouldNotThrow("class A { static get foo() { } ; }");
+shouldNotThrow("class A { static set foo(x) { } ; }");
+
+shouldNotThrow("class A { ; foo() { } }");
+shouldNotThrow("class A { ; get foo() { } }");
+shouldNotThrow("class A { ; set foo(x) { } }");
+shouldNotThrow("class A { ; static foo() { } }");
+shouldNotThrow("class A { ; static get foo() { } }");
+shouldNotThrow("class A { ; static set foo(x) { } }");
+
+shouldNotThrow("class A { foo() { } ; foo() {} }");
+shouldNotThrow("class A { foo() { } ; get foo() {} }");
+shouldNotThrow("class A { foo() { } ; set foo(x) {} }");
+shouldNotThrow("class A { foo() { } ; static foo() {} }");
+shouldNotThrow("class A { foo() { } ; static get foo() {} }");
+shouldNotThrow("class A { foo() { } ; static set foo(x) {} }");
+
+shouldNotThrow("class A { get foo() { } ; foo() {} }");
+shouldNotThrow("class A { get foo() { } ; get foo() {} }");
+shouldNotThrow("class A { get foo() { } ; set foo(x) {} }");
+shouldNotThrow("class A { get foo() { } ; static foo() {} }");
+shouldNotThrow("class A { get foo() { } ; static get foo() {} }");
+shouldNotThrow("class A { get foo() { } ; static set foo(x) {} }");
+
+shouldNotThrow("class A { set foo(x) { } ; foo() {} }");
+shouldNotThrow("class A { set foo(x) { } ; get foo() {} }");
+shouldNotThrow("class A { set foo(x) { } ; set foo(x) {} }");
+shouldNotThrow("class A { set foo(x) { } ; static foo() {} }");
+shouldNotThrow("class A { set foo(x) { } ; static get foo() {} }");
+shouldNotThrow("class A { set foo(x) { } ; static set foo(x) {} }");
+
+shouldNotThrow("class A { static foo() { } ; foo() {} }");
+shouldNotThrow("class A { static foo() { } ; get foo() {} }");
+shouldNotThrow("class A { static foo() { } ; set foo(x) {} }");
+shouldNotThrow("class A { static foo() { } ; static foo() {} }");
+shouldNotThrow("class A { static foo() { } ; static get foo() {} }");
+shouldNotThrow("class A { static foo() { } ; static set foo(x) {} }");
+
+shouldNotThrow("class A { static get foo() { } ; foo() {} }");
+shouldNotThrow("class A { static get foo() { } ; get foo() {} }");
+shouldNotThrow("class A { static get foo() { } ; set foo(x) {} }");
+shouldNotThrow("class A { static get foo() { } ; static foo() {} }");
+shouldNotThrow("class A { static get foo() { } ; static get foo() {} }");
+shouldNotThrow("class A { static get foo() { } ; static set foo(x) {} }");
+
+shouldNotThrow("class A { static set foo(x) { } ; foo() {} }");
+shouldNotThrow("class A { static set foo(x) { } ; get foo() {} }");
+shouldNotThrow("class A { static set foo(x) { } ; set foo(x) {} }");
+shouldNotThrow("class A { static set foo(x) { } ; static foo() {} }");
+shouldNotThrow("class A { static set foo(x) { } ; static get foo() {} }");
+shouldNotThrow("class A { static set foo(x) { } ; static set foo(x) {} }");
+
+var successfullyParsed = true;
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (183382 => 183383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-04-27 04:18:18 UTC (rev 183382)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-04-27 04:20:32 UTC (rev 183383)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2015-04-26 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><ins>+ Class body ending with a semicolon throws a SyntaxError
+ https://bugs.webkit.org/show_bug.cgi?id=144244
+
+ Reviewed by Darin Adler.
+
+ The bug was caused by parseClass's inner loop for method definitions not moving onto the next iteration
+ it encounters a semicolon. As a result, we always expected a method to appear after a semicolon. Fixed
+ it by continue'ing when it encounters a semicolon.
+
+ * parser/Parser.cpp:
+ (JSC::Parser<LexerType>::parseClass):
+
+2015-04-26 Ryosuke Niwa <rniwa@webkit.org>
+
</ins><span class="cx"> Getter or setter method named "prototype" or "constrcutor" should throw SyntaxError
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=144243
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.cpp (183382 => 183383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.cpp 2015-04-27 04:18:18 UTC (rev 183382)
+++ trunk/Source/JavaScriptCore/parser/Parser.cpp 2015-04-27 04:20:32 UTC (rev 183383)
</span><span class="lines">@@ -1537,8 +1537,10 @@
</span><span class="cx"> TreePropertyList instanceMethodsTail = 0;
</span><span class="cx"> TreePropertyList staticMethodsTail = 0;
</span><span class="cx"> while (!match(CLOSEBRACE)) {
</span><del>- if (match(SEMICOLON))
</del><ins>+ if (match(SEMICOLON)) {
</ins><span class="cx"> next();
</span><ins>+ continue;
+ }
</ins><span class="cx">
</span><span class="cx"> JSTokenLocation methodLocation(tokenLocation());
</span><span class="cx"> unsigned methodStart = tokenStart();
</span></span></pre>
</div>
</div>
</body>
</html>