Changeset 203028 in webkit for trunk/Source/JavaScriptCore/parser/Lexer.cpp

Timestamp:

Jul 9, 2016, 12:33:28 AM (9 years ago)

Author:

[email protected]

Message:

[JSC] Fix the Template Raw Value of \ (escape) + LineTerminatorSequence
​https://bugs.webkit.org/show_bug.cgi?id=159595

Patch by Benjamin Poulain <​[email protected]> 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:

File:

• trunk/Source/JavaScriptCore/parser/Lexer.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/parser/Lexer.cpp

@@ -1394 +1394 @@
                 shift();
             } else if (UNLIKELY(isLineTerminator(m_current))) {
+                // Normalize <CR>, <CR><LF> to <LF>.
                 if (m_current == '\r') {
+                    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');
+                        }
+                    }
+
                     lineNumberAdder.add(m_current);
                     shift();
@@ -1401 +1411 @@
                         shift();
                     }
+
+                    rawStringStart = currentSourcePtr();
                 } else {
                     lineNumberAdder.add(m_current);