<!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>[203028] trunk/Source/JavaScriptCore</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/203028">203028</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-09 00:33:28 -0700 (Sat, 09 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Fix the Template Raw Value of \ (escape) + LineTerminatorSequence
https://bugs.webkit.org/show_bug.cgi?id=159595
Patch by Benjamin Poulain <bpoulain@apple.com> on 2016-07-09
Reviewed by Yusuke Suzuki.
The spec (https://tc39.github.io/ecma262/#sec-static-semantics-tv-and-trv)
says:
"The TRV of LineContinuation::\LineTerminatorSequence is the sequence
consisting of the code unit value 0x005C followed by the code units
of TRV of LineTerminatorSequence."
We were not normalizing the LineTerminatorSequence in that case, but it should
be as it is the TRV of LineTerminatorSequence.
* parser/Lexer.cpp:
(JSC::Lexer<T>::parseTemplateLiteral):
* tests/stress/tagged-templates-raw-strings.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserLexercpp">trunk/Source/JavaScriptCore/parser/Lexer.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstresstaggedtemplatesrawstringsjs">trunk/Source/JavaScriptCore/tests/stress/tagged-templates-raw-strings.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (203027 => 203028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-07-09 06:37:38 UTC (rev 203027)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-07-09 07:33:28 UTC (rev 203028)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-07-09 Benjamin Poulain <bpoulain@apple.com>
+
+ [JSC] Fix the Template Raw Value of \ (escape) + LineTerminatorSequence
+ https://bugs.webkit.org/show_bug.cgi?id=159595
+
+ Reviewed by Yusuke Suzuki.
+
+ The spec (https://tc39.github.io/ecma262/#sec-static-semantics-tv-and-trv)
+ says:
+ "The TRV of LineContinuation::\LineTerminatorSequence is the sequence
+ consisting of the code unit value 0x005C followed by the code units
+ of TRV of LineTerminatorSequence."
+
+ We were not normalizing the LineTerminatorSequence in that case, but it should
+ be as it is the TRV of LineTerminatorSequence.
+
+ * parser/Lexer.cpp:
+ (JSC::Lexer<T>::parseTemplateLiteral):
+ * tests/stress/tagged-templates-raw-strings.js:
+
</ins><span class="cx"> 2016-07-08 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> We may add a ReadOnly property without setting the corresponding bit on Structure
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserLexercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Lexer.cpp (203027 => 203028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Lexer.cpp 2016-07-09 06:37:38 UTC (rev 203027)
+++ trunk/Source/JavaScriptCore/parser/Lexer.cpp 2016-07-09 07:33:28 UTC (rev 203028)
</span><span class="lines">@@ -1393,7 +1393,17 @@
</span><span class="cx"> record16(escape);
</span><span class="cx"> shift();
</span><span class="cx"> } else if (UNLIKELY(isLineTerminator(m_current))) {
</span><ins>+ // Normalize <CR>, <CR><LF> to <LF>.
</ins><span class="cx"> if (m_current == '\r') {
</span><ins>+ if (shouldBuildStrings) {
+ ASSERT_WITH_MESSAGE(rawStringStart != currentSourcePtr(), "We should have at least shifted the escape.");
+
+ if (rawStringsBuildMode == RawStringsBuildMode::BuildRawStrings) {
+ m_bufferForRawTemplateString16.append(rawStringStart, currentSourcePtr() - rawStringStart);
+ m_bufferForRawTemplateString16.append('\n');
+ }
+ }
+
</ins><span class="cx"> lineNumberAdder.add(m_current);
</span><span class="cx"> shift();
</span><span class="cx"> if (m_current == '\n') {
</span><span class="lines">@@ -1400,6 +1410,8 @@
</span><span class="cx"> lineNumberAdder.add(m_current);
</span><span class="cx"> shift();
</span><span class="cx"> }
</span><ins>+
+ rawStringStart = currentSourcePtr();
</ins><span class="cx"> } else {
</span><span class="cx"> lineNumberAdder.add(m_current);
</span><span class="cx"> shift();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresstaggedtemplatesrawstringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/tagged-templates-raw-strings.js (203027 => 203028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/tagged-templates-raw-strings.js 2016-07-09 06:37:38 UTC (rev 203027)
+++ trunk/Source/JavaScriptCore/tests/stress/tagged-templates-raw-strings.js 2016-07-09 07:33:28 UTC (rev 203028)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> testEval("Hello\r\n\n\nWorld", [ "Hello\n\n\nWorld" ]);
</span><span class="cx">
</span><span class="cx"> testEval("Hello\\\n\r\rWorld", [ "Hello\\\n\n\nWorld" ]);
</span><del>-testEval("Hello\\\r\n\n\nWorld", [ "Hello\\\r\n\n\nWorld" ]);
</del><ins>+testEval("Hello\\\r\n\n\nWorld", [ "Hello\\\n\n\nWorld" ]);
</ins><span class="cx"> testEval("Hello\\\n\r\n\nWorld", [ "Hello\\\n\n\nWorld" ]);
</span><span class="cx"> testEval("Hello\\\n\r\r\nWorld", [ "Hello\\\n\n\nWorld" ]);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>