Changeset 31809 in webkit for trunk/JavaScriptCore/kjs/lexer.cpp

Timestamp:

Apr 11, 2008, 1:14:45 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Geoff.

Generate a pure (re-entrant) parser with Bison.

No change on SunSpider.

• kjs/Parser.cpp: (KJS::Parser::parse):
• kjs/grammar.y:
• kjs/lexer.cpp: (kjsyylex): (KJS::Lexer::lex):
• kjs/lexer.h: Pass state as function arguments, instead of global data. Don't call lexer() as often as before, as this function is about to become slower due to thread-specific storage.

• kjs/function.cpp: (KJS::isStrWhiteSpace): Don't call isSeparatorSpace() for 8-bit characters, as these are already taken care of. This is a small speedup, compensating for a small slowdown caused by switching Bison mode.

File:

• trunk/JavaScriptCore/kjs/lexer.cpp (modified) (5 diffs)

trunk/JavaScriptCore/kjs/lexer.cpp

@@ -48 +48 @@
 #include "lexer.lut.h"
 
-extern YYLTYPE kjsyylloc; // global bison variable holding token info
-
 // a bridge for yacc from the C world to C++
-int kjsyylex()
-{
-  return lexer().lex();
+int kjsyylex(YYSTYPE* lvalp, YYLTYPE* llocp, void* lexer)
+{
+  return static_cast<Lexer*>(lexer)->lex(lvalp, llocp);
 }
 
@@ -144 +142 @@
 }
 
-int Lexer::lex()
+int Lexer::lex(YYSTYPE* lvalp, YYLTYPE* llocp)
 {
   int token = 0;
@@ -529 +527 @@
   restrKeyword = false;
   delimited = false;
-  kjsyylloc.first_line = yylineno; // ???
-  kjsyylloc.last_line = yylineno;
+  llocp->first_line = yylineno; // ???
+  llocp->last_line = yylineno;
 
   switch (state) {
@@ -544 +542 @@
     if (eatNextIdentifier) {
       eatNextIdentifier = false;
-      token = lex();
+      token = lex(lvalp, llocp);
       break;
     }
-    kjsyylval.ident = makeIdentifier(m_buffer16);
+    lvalp->ident = makeIdentifier(m_buffer16);
     token = IDENT;
     break;
   case IdentifierOrKeyword:
-    kjsyylval.ident = makeIdentifier(m_buffer16);
-    if ((token = mainTable.value(*kjsyylval.ident)) < 0) {
+    lvalp->ident = makeIdentifier(m_buffer16);
+    if ((token = mainTable.value(*lvalp->ident)) < 0) {
       // Lookup for keyword failed, means this is an identifier.
       token = IDENT;
@@ -563 +561 @@
     break;
   case String:
-    kjsyylval.string = makeUString(m_buffer16);
+    lvalp->string = makeUString(m_buffer16);
     token = STRING;
     break;
   case Number:
-    kjsyylval.doubleValue = dval;
+    lvalp->doubleValue = dval;
     token = NUMBER;
     break;