Changeset 62995 in webkit

Timestamp:

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

Author:

oliver@apple.com

Message:

2010-07-09 Oliver Hunt <​oliver@apple.com>

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):

Location:

trunk/JavaScriptCore

Files:

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

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-07-09  Oliver Hunt  <oliver@apple.com>
+
+        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):
+
 2010-07-08  Oliver Hunt  <oliver@apple.com>
 

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;
     }
 

trunk/JavaScriptCore/parser/JSParser.h

@@ -106 +106 @@
 
 struct JSTokenInfo {
-    JSTokenInfo() : last_line(0) {}
-    int first_line;
-    int last_line;
-    int first_column;
-    int last_column;
+    JSTokenInfo() : line(0) {}
+    int line;
+    int startOffset;
+    int endOffset;
 };
 

trunk/JavaScriptCore/parser/Lexer.cpp

@@ -994 +994 @@
 returnToken: {
     int lineNumber = m_lineNumber;
-    llocp->first_line = lineNumber;
-    llocp->last_line = lineNumber;
-    llocp->first_column = startOffset;
-    llocp->last_column = currentOffset();
+    llocp->line = lineNumber;
+    llocp->startOffset = startOffset;
+    llocp->endOffset = currentOffset();
     m_lastToken = token;
     return token;