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

Timestamp:

Jul 30, 2003, 4:54:41 PM (22 years ago)

Author:

darin

Message:

Reviewed by Dave.

• fixed problem where some JavaScriptCore symbols had no namespace or prefix

• kjs/grammar.y: Added a define for yylloc to make it use the kjs prefix. This is the same thing done for the rest of the symbols automatically by yacc, but for some reason it's not done for yyloc. Also make automatic() function static.
• kjs/grammar.cpp: Regenerated.
• kjs/lexer.cpp: Use kjsyylloc instead of yyloc.

• pcre/pcre.h: Add defines to prepend kjs prefixes for all the PCRE functions.

File:

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

trunk/JavaScriptCore/kjs/lexer.cpp

@@ -52 +52 @@
 #include "lexer.lut.h"
 
-extern YYLTYPE yylloc; // global bison variable holding token info
+extern YYLTYPE kjsyylloc; // global bison variable holding token info
 
 // a bridge for yacc from the C world to C++
@@ -482 +482 @@
   restrKeyword = false;
   delimited = false;
-  yylloc.first_line = yylineno; // ???
-  yylloc.last_line = yylineno;
+  kjsyylloc.first_line = yylineno; // ???
+  kjsyylloc.last_line = yylineno;
 
   switch (state) {