Changeset 31811 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Apr 11, 2008, 9:18:23 AM (17 years ago)

Author:

[email protected]

Message:

Tiger build fix. Forward declaring a union didn't work for whatever reason, make the
parameters void*.

• kjs/grammar.y:
• kjs/lexer.cpp: (kjsyylex): (KJS::Lexer::lex):
• kjs/lexer.h:

Location:

trunk/JavaScriptCore/kjs

Files:

• grammar.y (modified) (1 diff)
• lexer.cpp (modified) (2 diffs)
• lexer.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/grammar.y

@@ -50 +50 @@
 #endif
 
-extern int kjsyylex(YYSTYPE* lvalp, YYLTYPE* llocp, void* lexer);
+int kjsyylex(void* lvalp, void* llocp, void* lexer);
 int kjsyyerror(const char*);
 static inline bool allowAutomaticSemicolon(Lexer&, int);

trunk/JavaScriptCore/kjs/lexer.cpp

@@ -49 +49 @@
 
 // a bridge for yacc from the C world to C++
-int kjsyylex(YYSTYPE* lvalp, YYLTYPE* llocp, void* lexer)
+int kjsyylex(void* lvalp, void* llocp, void* lexer)
 {
   return static_cast<Lexer*>(lexer)->lex(lvalp, llocp);
@@ -142 +142 @@
 }
 
-int Lexer::lex(YYSTYPE* lvalp, YYLTYPE* llocp)
-{
+int Lexer::lex(void* p1, void* p2)
+{
+  YYSTYPE* lvalp = static_cast<YYSTYPE*>(p1);
+  YYLTYPE* llocp = static_cast<YYLTYPE*>(p2);
   int token = 0;
   state = Start;

trunk/JavaScriptCore/kjs/lexer.h

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