Changeset 189371 in webkit for trunk/Source/JavaScriptCore/parser/Parser.h

Timestamp:

Sep 4, 2015, 12:48:54 PM (10 years ago)

Author:

[email protected]

Message:

Web Inspector: Test RuntimeAgent.parse, detecting if a script parse error is recoverable
​https://bugs.webkit.org/show_bug.cgi?id=148790

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2015-09-04
Reviewed by Timothy Hatcher.

Source/JavaScriptCore:

• parser/Lexer.cpp:

(JSC::Lexer<T>::lex):

• parser/Parser.cpp:

(JSC::Parser<LexerType>::printUnexpectedTokenText):

• parser/ParserTokens.h:

More consistently name and treat unterminated numeric literals.

• parser/Parser.h:

(JSC::Parser<LexerType>::parse):
Treat multiline capable unterminated literals as recoverable.

LayoutTests:

• inspector/runtime/parse-expected.txt: Added.
• inspector/runtime/parse.html: Added.

File:

• trunk/Source/JavaScriptCore/parser/Parser.h (modified) (1 diff)

trunk/Source/JavaScriptCore/parser/Parser.h

@@ -1341 +1341 @@
             if (m_token.m_type == EOFTOK)
                 errorType = ParserError::SyntaxErrorRecoverable;
-            else if (m_token.m_type & UnterminatedErrorTokenFlag)
-                errorType = ParserError::SyntaxErrorUnterminatedLiteral;
+            else if (m_token.m_type & UnterminatedErrorTokenFlag) {
+                // Treat multiline capable unterminated literals as recoverable.
+                if (m_token.m_type == UNTERMINATED_MULTILINE_COMMENT_ERRORTOK || m_token.m_type == UNTERMINATED_TEMPLATE_LITERAL_ERRORTOK)
+                    errorType = ParserError::SyntaxErrorRecoverable;
+                else
+                    errorType = ParserError::SyntaxErrorUnterminatedLiteral;
+            }
             
             if (isEvalNode<ParsedNode>())