<!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>[215235] 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/215235">215235</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-04-11 09:54:49 -0700 (Tue, 11 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>test262: test262/test/annexB/language/comments/multi-line-html-close.js
https://bugs.webkit.org/show_bug.cgi?id=170648
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2017-04-11
Reviewed by Keith Miller.
JSTests:
* test262.yaml:
Source/JavaScriptCore:
* parser/Lexer.cpp:
(JSC::Lexer<T>::lex):
A multi-line comment that contains a line terminator is itself treated
like a line terminator. An HTML Close Comment that comes after it can
therefore treat it like it is at the start of a line, because it was
immediately preceeded by the equivalent of a line terminator.
LayoutTests:
* js/parser-xml-close-comment-expected.txt:
* js/script-tests/parser-xml-close-comment.js:
Update test coverage for JavaScript HTML comments.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkJSTeststest262yaml">trunk/JSTests/test262.yaml</a></li>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsparserxmlclosecommentexpectedtxt">trunk/LayoutTests/js/parser-xml-close-comment-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsparserxmlclosecommentjs">trunk/LayoutTests/js/script-tests/parser-xml-close-comment.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserLexercpp">trunk/Source/JavaScriptCore/parser/Lexer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (215234 => 215235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2017-04-11 16:38:43 UTC (rev 215234)
+++ trunk/JSTests/ChangeLog 2017-04-11 16:54:49 UTC (rev 215235)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2017-04-11 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ test262: test262/test/annexB/language/comments/multi-line-html-close.js
+ https://bugs.webkit.org/show_bug.cgi?id=170648
+
+ Reviewed by Keith Miller.
+
+ * test262.yaml:
+
+2017-04-11 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> test262: test262/test/built-ins/Array/S15.4.3_A2.2.js
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=170652
</span><span class="cx">
</span></span></pre></div>
<a id="trunkJSTeststest262yaml"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/test262.yaml (215234 => 215235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/test262.yaml 2017-04-11 16:38:43 UTC (rev 215234)
+++ trunk/JSTests/test262.yaml 2017-04-11 16:54:49 UTC (rev 215235)
</span><span class="lines">@@ -892,9 +892,9 @@
</span><span class="cx"> - path: test262/test/annexB/built-ins/unescape/two.js
</span><span class="cx"> cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</span><span class="cx"> - path: test262/test/annexB/language/comments/multi-line-html-close.js
</span><del>- cmd: runTest262 :fail, "Test262Error", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
</del><ins>+ cmd: runTest262 :normal, "Test262Error", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
</ins><span class="cx"> - path: test262/test/annexB/language/comments/multi-line-html-close.js
</span><del>- cmd: runTest262 :fail, "Test262Error", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</del><ins>+ cmd: runTest262 :normal, "Test262Error", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</ins><span class="cx"> - path: test262/test/annexB/language/comments/single-line-html-close-asi.js
</span><span class="cx"> cmd: runTest262 :normal, "Test262Error", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
</span><span class="cx"> - path: test262/test/annexB/language/comments/single-line-html-close-asi.js
</span></span></pre></div>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (215234 => 215235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-04-11 16:38:43 UTC (rev 215234)
+++ trunk/LayoutTests/ChangeLog 2017-04-11 16:54:49 UTC (rev 215235)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2017-04-11 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ test262: test262/test/annexB/language/comments/multi-line-html-close.js
+ https://bugs.webkit.org/show_bug.cgi?id=170648
+
+ Reviewed by Keith Miller.
+
+ * js/parser-xml-close-comment-expected.txt:
+ * js/script-tests/parser-xml-close-comment.js:
+ Update test coverage for JavaScript HTML comments.
+
+2017-04-11 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> test262: test262/test/built-ins/Array/S15.4.3_A2.2.js
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=170652
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsjsparserxmlclosecommentexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/parser-xml-close-comment-expected.txt (215234 => 215235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/parser-xml-close-comment-expected.txt 2017-04-11 16:38:43 UTC (rev 215234)
+++ trunk/LayoutTests/js/parser-xml-close-comment-expected.txt 2017-04-11 16:54:49 UTC (rev 215235)
</span><span class="lines">@@ -1,14 +1,25 @@
</span><del>-Test to ensure correct handling of --> as a single line comment when at the beginning of a line
</del><ins>+Test to ensure correct handling of --> as a single line comment when at the beginning of a line or preceeded by a multi-line comment
</ins><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> PASS 'should be a syntax error' --> threw exception SyntaxError: Unexpected end of script.
</span><ins>+PASS /**/ 1--> threw exception SyntaxError: Unexpected end of script.
</ins><span class="cx"> PASS /**/ 1 --> threw exception SyntaxError: Unexpected end of script.
</span><ins>+PASS 1 /**/--> threw exception SyntaxError: Unexpected end of script.
</ins><span class="cx"> PASS 1 /**/ --> threw exception SyntaxError: Unexpected end of script.
</span><span class="cx"> PASS 1/*
</span><del>-*/--> threw exception SyntaxError: Unexpected token '>'.
</del><ins>+*/--> is 1
+PASS 1/*
+*/
+--> is 1
+PASS 2/*
+*/ --> is 2
+PASS 2/*
+*/
+ --> is 2
</ins><span class="cx"> PASS --> is undefined.
</span><ins>+PASS --> is undefined.
</ins><span class="cx"> PASS /**/--> is undefined.
</span><span class="cx"> PASS /*
</span><span class="cx"> */--> is undefined.
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsparserxmlclosecommentjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/parser-xml-close-comment.js (215234 => 215235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/parser-xml-close-comment.js 2017-04-11 16:38:43 UTC (rev 215234)
+++ trunk/LayoutTests/js/script-tests/parser-xml-close-comment.js 2017-04-11 16:54:49 UTC (rev 215235)
</span><span class="lines">@@ -1,10 +1,17 @@
</span><del>-description("Test to ensure correct handling of --> as a single line comment when at the beginning of a line");
</del><ins>+description("Test to ensure correct handling of --> as a single line comment when at the beginning of a line or preceeded by a multi-line comment");
</ins><span class="cx">
</span><span class="cx"> shouldThrow("'should be a syntax error' -->");
</span><ins>+shouldThrow("/**/ 1-->");
</ins><span class="cx"> shouldThrow("/**/ 1 -->");
</span><ins>+shouldThrow("1 /**/-->");
</ins><span class="cx"> shouldThrow("1 /**/ -->");
</span><del>-shouldThrow("1/*\n*/-->");
</del><span class="cx">
</span><ins>+shouldBe("1/*\n*/-->", `1`);
+shouldBe("1/*\n*/\n-->", `1`);
+shouldBe("2/*\n*/ -->", `2`);
+shouldBe("2/*\n*/\n -->", `2`);
+
</ins><span class="cx"> shouldBeUndefined("-->");
</span><ins>+shouldBeUndefined(" -->");
</ins><span class="cx"> shouldBeUndefined("/**/-->");
</span><span class="cx"> shouldBeUndefined("/*\n*/-->");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (215234 => 215235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-04-11 16:38:43 UTC (rev 215234)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-04-11 16:54:49 UTC (rev 215235)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2017-04-11 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ test262: test262/test/annexB/language/comments/multi-line-html-close.js
+ https://bugs.webkit.org/show_bug.cgi?id=170648
+
+ Reviewed by Keith Miller.
+
+ * parser/Lexer.cpp:
+ (JSC::Lexer<T>::lex):
+ A multi-line comment that contains a line terminator is itself treated
+ like a line terminator. An HTML Close Comment that comes after it can
+ therefore treat it like it is at the start of a line, because it was
+ immediately preceeded by the equivalent of a line terminator.
+
+2017-04-11 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> test262: test262/test/built-ins/Array/S15.4.3_A2.2.js
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=170652
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserLexercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Lexer.cpp (215234 => 215235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Lexer.cpp 2017-04-11 16:38:43 UTC (rev 215234)
+++ trunk/Source/JavaScriptCore/parser/Lexer.cpp 2017-04-11 16:54:49 UTC (rev 215235)
</span><span class="lines">@@ -1991,7 +1991,7 @@
</span><span class="cx"> shift();
</span><span class="cx"> if (m_current == '-') {
</span><span class="cx"> shift();
</span><del>- if (m_atLineStart && m_current == '>') {
</del><ins>+ if ((m_atLineStart || m_terminator) && m_current == '>') {
</ins><span class="cx"> if (m_scriptMode == JSParserScriptMode::Classic) {
</span><span class="cx"> shift();
</span><span class="cx"> goto inSingleLineComment;
</span></span></pre>
</div>
</div>
</body>
</html>