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

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.h (modified) (4 diffs)

trunk/JavaScriptCore/parser/Lexer.h

@@ -35 +35 @@
 namespace JSC {
 
+    union JSTokenData;
+    struct JSTokenInfo;
     class RegExp;
 
@@ -50 +52 @@
 
         // Functions for the parser itself.
-        int lex(void* lvalp, void* llocp);
+        int lex(JSTokenData* lvalp, JSTokenInfo* llocp);
         int lineNumber() const { return m_lineNumber; }
         void setLastLineNumber(int lastLineNumber) { m_lastLineNumber = lastLineNumber; }
@@ -93 +95 @@
         ALWAYS_INLINE bool lastTokenWasRestrKeyword() const;
 
-        ALWAYS_INLINE bool parseString(void* lvalp);
+        ALWAYS_INLINE bool parseString(JSTokenData* lvalp);
 
         static const size_t initialReadBufferCapacity = 32;
@@ -144 +146 @@
     }
 
-    // A bridge for yacc from the C world to the C++ world.
-    inline int jscyylex(void* lvalp, void* llocp, void* globalData)
-    {
-        return static_cast<JSGlobalData*>(globalData)->lexer->lex(lvalp, llocp);
-    }
-
 } // namespace JSC