Changeset 31809 in webkit for trunk/JavaScriptCore/kjs

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.

Location:

trunk/JavaScriptCore/kjs

Files:

• Parser.cpp (modified) (2 diffs)
• function.cpp (modified) (1 diff)
• grammar.y (modified) (7 diffs)
• lexer.cpp (modified) (5 diffs)
• lexer.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/Parser.cpp

@@ -30 +30 @@
 #include <wtf/Vector.h>
 
-extern int kjsyyparse();
+extern int kjsyyparse(void*);
 
 namespace KJS {
@@ -57 +57 @@
         *sourceId = m_sourceId;
 
-    int parseError = kjsyyparse();
+    int parseError = kjsyyparse(&lexer);
     bool lexError = lexer.sawError();
     lexer.clear();

trunk/JavaScriptCore/kjs/function.cpp

@@ -587 +587 @@
             return true;
         default:
-            return isSeparatorSpace(c);
+            return c > 0xff && isSeparatorSpace(c);
     }
 }

trunk/JavaScriptCore/kjs/grammar.y

@@ +1 @@
+%pure_parser
+
 %{
 
@@ -37 +39 @@
 #include <wtf/MathExtras.h>
 
-// Not sure why, but yacc doesn't add this define along with the others.
-#define yylloc kjsyylloc
-
 #define YYMAXDEPTH 10000
 #define YYENABLE_NLS 0
@@ -51 +50 @@
 #endif
 
-extern int kjsyylex();
-int kjsyyerror(const char *);
-static bool allowAutomaticSemicolon();
-
-#define AUTO_SEMICOLON do { if (!allowAutomaticSemicolon()) YYABORT; } while (0)
+extern int kjsyylex(YYSTYPE* lvalp, YYLTYPE* llocp, void* lexer);
+int kjsyyerror(const char*);
+static inline bool allowAutomaticSemicolon(Lexer&, int);
+
+#define AUTO_SEMICOLON do { if (!allowAutomaticSemicolon(*static_cast<Lexer*>(lexer), yychar)) YYABORT; } while (0)
 #define DBG(l, s, e) (l)->setLoc((s).first_line, (e).last_line)
 
@@ -89 +88 @@
 
 #endif
+
+#define YYPARSE_PARAM lexer
+#define YYLEX_PARAM lexer
 
 template <typename T> NodeDeclarationInfo<T> createNodeDeclarationInfo(T node, ParserRefCountedData<DeclarationStacks::VarStack>* varDecls, 
@@ -280 +282 @@
   | STRING                              { $$ = createNodeFeatureInfo<ExpressionNode*>(new StringNode($1), 0); }
   | '/' /* regexp */                    {
-                                            Lexer& l = lexer();
+                                            Lexer& l = *static_cast<Lexer*>(lexer);
                                             if (!l.scanRegExp())
                                                 YYABORT;
@@ -286 +288 @@
                                         }
   | DIVEQUAL /* regexp with /= */       {
-                                            Lexer& l = lexer();
+                                            Lexer& l = *static_cast<Lexer*>(lexer);
                                             if (!l.scanRegExp())
                                                 YYABORT;
@@ -1287 +1289 @@
 
 /* may we automatically insert a semicolon ? */
-static bool allowAutomaticSemicolon()
-{
-    return yychar == '}' || yychar == 0 || lexer().prevTerminator();
+static bool allowAutomaticSemicolon(Lexer& lexer, int yychar)
+{
+    return yychar == '}' || yychar == 0 || lexer.prevTerminator();
 }
 

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;

trunk/JavaScriptCore/kjs/lexer.h

@@ -28 +28 @@
 #include <wtf/Vector.h>
 
+union YYSTYPE;
+struct YYLTYPE;
+
 namespace KJS {
 
@@ -36 +39 @@
   public:
     void setCode(int startingLineNumber, const UChar *c, unsigned int len);
-    int lex();
+    int lex(YYSTYPE* lvalp, YYLTYPE* llocp);
 
     int lineNo() const { return yylineno; }