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

Timestamp:

Mar 21, 2013, 1:06:26 PM (12 years ago)

Author:

[email protected]

Message:

Fix lexer charPosition computation when "rewind"ing the lexer.
​https://bugs.webkit.org/show_bug.cgi?id=112952.

Reviewed by Michael Saboff.

Changed the Lexer to no longer keep a m_charPosition. Instead, we compute
currentCharPosition() from m_code and m_codeStartPlusOffset, where
m_codeStartPlusOffset is the SourceProvider m_codeStart + the SourceCode
start offset. This ensures that the charPosition is always in sync with
m_code.

• parser/Lexer.cpp:

(JSC::::setCode):
(JSC::::internalShift):
(JSC::::shift):
(JSC::::lex):

• parser/Lexer.h:

(JSC::Lexer::currentCharPosition):
(JSC::::lexExpectIdentifier):

File:

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

trunk/Source/JavaScriptCore/parser/Lexer.cpp

@@ -547 +547 @@
 
     m_source = &source;
-    m_code = m_codeStart + source.startOffset();
+    m_codeStartPlusOffset = m_codeStart + source.startOffset();
+    m_code = m_codeStartPlusOffset;
     m_codeEnd = m_codeStart + source.endOffset();
     m_error = false;
     m_atLineStart = true;
-    m_charPosition = 0;
     m_lexErrorMessage = String();
     
@@ -568 +568 @@
 {
     m_code += shiftAmount;
-    m_charPosition += shiftAmount;
     m_current = *m_code;
 }
@@ -580 +579 @@
     if (LIKELY(m_code < m_codeEnd))
         m_current = *m_code;
-    ++m_charPosition;
 }
 
@@ -1320 +1318 @@
     
     tokenLocation->startOffset = currentOffset();
-    tokenLocation->charPosition = m_charPosition;
+    tokenLocation->charPosition = currentCharPosition();
 
     CharacterType type;