Changeset 85456 in webkit

Timestamp:

May 1, 2011 10:21:50 PM (13 years ago)

Author:

oliver@apple.com

Message:

2011-05-01 Oliver Hunt <​oliver@apple.com>

Reviewed by Gavin Barraclough.

Strict-mode only reserved words not reserved
​https://bugs.webkit.org/show_bug.cgi?id=55342

Fix line number tracking when we rollback the lexer.

• parser/JSParser.cpp: (JSC::JSParser::parseSourceElements):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• parser/JSParser.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-05-01  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Gavin Barraclough.
+
+        Strict-mode only reserved words not reserved
+        https://bugs.webkit.org/show_bug.cgi?id=55342
+
+        Fix line number tracking when we rollback the lexer.
+
+        * parser/JSParser.cpp:
+        (JSC::JSParser::parseSourceElements):
+
 2011-05-01  Oliver Hunt  <oliver@apple.com>
 

trunk/Source/JavaScriptCore/parser/JSParser.cpp

@@ -683 +683 @@
     const Identifier* directive = 0;
     unsigned startOffset = m_token.m_info.startOffset;
+    unsigned oldLastLineNumber = m_lexer->lastLineNumber();
+    unsigned oldLineNumber = m_lexer->lineNumber();
     bool hasSetStrict = false;
     while (TreeStatement statement = parseStatement(context, directive)) {
@@ -693 +695 @@
                     m_lexer->setOffset(startOffset);
                     next();
+                    m_lexer->setLastLineNumber(oldLastLineNumber);
+                    m_lexer->setLineNumber(oldLineNumber);
                     failIfTrue(m_error);
                     continue;