Changeset 62995 in webkit for trunk/JavaScriptCore/parser/JSParser.cpp

Timestamp:

Jul 9, 2010, 2:24:07 PM (15 years ago)

Author:

[email protected]

Message:

2010-07-09 Oliver Hunt <​[email protected]>

Reviewed by Geoffrey Garen.

Remove a couple of excess writes from the lexer
​https://bugs.webkit.org/show_bug.cgi?id=41981

Remove a couple of fields from JSTokenInfo, and rename the remaining ones
to something more accurate

• parser/JSParser.cpp: (JSC::JSParser::next): (JSC::JSParser::tokenStart): (JSC::JSParser::tokenLine): (JSC::JSParser::tokenEnd):
• parser/JSParser.h: (JSC::JSTokenInfo::JSTokenInfo):
• parser/Lexer.cpp: (JSC::Lexer::lex):

File:

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

trunk/JavaScriptCore/parser/JSParser.cpp

@@ -86 +86 @@
     void next()
     {
-        m_lastLine = token().m_info.last_line;
-        m_lastTokenEnd = token().m_info.last_column;
+        m_lastLine = token().m_info.line;
+        m_lastTokenEnd = token().m_info.endOffset;
         m_lexer->setLastLineNumber(m_lastLine);
         m_token.m_type = m_lexer->lex(&m_token.m_data, &m_token.m_info);
@@ -108 +108 @@
     int tokenStart()
     {
-        return token().m_info.first_column;
+        return token().m_info.startOffset;
     }
 
     int tokenLine()
     {
-        return token().m_info.first_line;
+        return token().m_info.line;
     }
 
     int tokenEnd()
     {
-        return token().m_info.last_column;
+        return token().m_info.endOffset;
     }