Changeset 62849 in webkit for trunk/JavaScriptCore/parser/Lexer.cpp

Timestamp:

Jul 8, 2010, 3:07:50 PM (15 years ago)

Author:

[email protected]

Message:

Tidy up the lexer

Reviewed by Anders Carlson.

Remove some of the old yacc/lex-isms still present in the lexer

• parser/JSParser.h:

(JSC::):

• parser/Lexer.cpp:

(JSC::Lexer::parseString):
(JSC::Lexer::lex):

• parser/Lexer.h:

File:

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

trunk/JavaScriptCore/parser/Lexer.cpp

@@ -388 +388 @@
 }
 
-ALWAYS_INLINE bool Lexer::parseString(void* lvalp)
+ALWAYS_INLINE bool Lexer::parseString(JSTokenData* lvalp)
 {
     int stringQuoteCharacter = m_current;
@@ -461 +461 @@
     if (currentCharacter() != stringStart)
         m_buffer16.append(stringStart, currentCharacter() - stringStart);
-    reinterpret_cast<YYSTYPE*>(lvalp)->ident = makeIdentifier(m_buffer16.data(), m_buffer16.size());
+    lvalp->ident = makeIdentifier(m_buffer16.data(), m_buffer16.size());
     m_buffer16.resize(0);
     return true;
 }
 
-int Lexer::lex(void* p1, void* p2)
+int Lexer::lex(JSTokenData* lvalp, JSTokenInfo* llocp)
 {
     ASSERT(!m_error);
@@ -472 +472 @@
     ASSERT(m_buffer16.isEmpty());
 
-    YYSTYPE* lvalp = static_cast<YYSTYPE*>(p1);
-    YYLTYPE* llocp = static_cast<YYLTYPE*>(p2);
     int token = 0;
     m_terminator = false;