[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:49:32 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit c99e5054452a5ba4f4008976e521f8a9a0aa84d2
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jul 30 23:54:41 2003 +0000
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.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4739 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index b58dc2c..cf008fd 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,19 @@
2003-07-30 Darin Adler <darin at apple.com>
+ 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.
+
+2003-07-30 Darin Adler <darin at apple.com>
+
* Makefile.am: Include the subdirectory with the PCRE code in it.
2003-07-30 John Sullivan <sullivan at apple.com>
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index b58dc2c..cf008fd 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,5 +1,19 @@
2003-07-30 Darin Adler <darin at apple.com>
+ 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.
+
+2003-07-30 Darin Adler <darin at apple.com>
+
* Makefile.am: Include the subdirectory with the PCRE code in it.
2003-07-30 John Sullivan <sullivan at apple.com>
diff --git a/JavaScriptCore/kjs/grammar.cpp b/JavaScriptCore/kjs/grammar.cpp
index bf19faa..7c2392f 100644
--- a/JavaScriptCore/kjs/grammar.cpp
+++ b/JavaScriptCore/kjs/grammar.cpp
@@ -108,6 +108,9 @@
#include "lexer.h"
#include "internal.h"
+// Not sure why, but yacc doesn't add this define along with the others.
+#define yylloc kjsyylloc
+
/* default values for bison */
#define YYDEBUG 0
#define YYMAXDEPTH 0
@@ -116,14 +119,14 @@
#endif
#define DBG(l, s, e) { l->setLoc(s.first_line, e.last_line, Parser::sid); } // location
-extern int yylex();
-int yyerror (const char *);
-bool automatic();
+extern int kjsyylex();
+int kjsyyerror(const char *);
+static bool automatic();
using namespace KJS;
-#line 52 "grammar.y"
+#line 55 "grammar.y"
typedef union {
int ival;
double dval;
@@ -314,26 +317,26 @@ static const short yyrhs[] = { 3,
#if YYDEBUG != 0
static const short yyrline[] = { 0,
- 162, 164, 165, 166, 167, 168, 171, 177, 179, 181,
- 182, 183, 184, 185, 188, 190, 191, 194, 196, 200,
- 202, 205, 207, 210, 212, 216, 218, 219, 222, 224,
- 225, 226, 227, 230, 232, 235, 237, 238, 239, 243,
- 245, 248, 250, 253, 255, 258, 260, 261, 264, 266,
- 267, 268, 269, 270, 271, 272, 273, 274, 275, 276,
- 279, 281, 282, 283, 286, 288, 289, 292, 294, 295,
- 296, 299, 301, 303, 305, 307, 309, 311, 315, 317,
- 318, 319, 320, 323, 325, 328, 330, 333, 335, 338,
- 340, 344, 346, 350, 352, 356, 358, 362, 364, 365,
- 366, 367, 368, 369, 370, 371, 372, 373, 374, 377,
- 379, 382, 384, 385, 386, 387, 388, 389, 390, 391,
- 392, 393, 394, 395, 396, 399, 401, 404, 406, 409,
- 412, 421, 423, 427, 429, 432, 436, 440, 443, 450,
- 452, 456, 458, 459, 462, 465, 468, 472, 478, 480,
- 483, 485, 489, 491, 498, 500, 504, 506, 514, 516,
- 520, 521, 527, 532, 537, 539, 543, 545, 548, 550,
- 553, 555, 558, 560, 563, 569, 573, 575, 576, 579,
- 583, 587, 590, 594, 596, 601, 603, 606, 609, 613,
- 616, 620, 622, 625, 627
+ 165, 167, 168, 169, 170, 171, 174, 180, 182, 184,
+ 185, 186, 187, 188, 191, 193, 194, 197, 199, 203,
+ 205, 208, 210, 213, 215, 219, 221, 222, 225, 227,
+ 228, 229, 230, 233, 235, 238, 240, 241, 242, 246,
+ 248, 251, 253, 256, 258, 261, 263, 264, 267, 269,
+ 270, 271, 272, 273, 274, 275, 276, 277, 278, 279,
+ 282, 284, 285, 286, 289, 291, 292, 295, 297, 298,
+ 299, 302, 304, 306, 308, 310, 312, 314, 318, 320,
+ 321, 322, 323, 326, 328, 331, 333, 336, 338, 341,
+ 343, 347, 349, 353, 355, 359, 361, 365, 367, 368,
+ 369, 370, 371, 372, 373, 374, 375, 376, 377, 380,
+ 382, 385, 387, 388, 389, 390, 391, 392, 393, 394,
+ 395, 396, 397, 398, 399, 402, 404, 407, 409, 412,
+ 415, 424, 426, 430, 432, 435, 439, 443, 446, 453,
+ 455, 459, 461, 462, 465, 468, 471, 475, 481, 483,
+ 486, 488, 492, 494, 501, 503, 507, 509, 517, 519,
+ 523, 524, 530, 535, 540, 542, 546, 548, 551, 553,
+ 556, 558, 561, 563, 566, 572, 576, 578, 579, 582,
+ 586, 590, 593, 597, 599, 604, 606, 609, 612, 616,
+ 619, 623, 625, 628, 630
};
#endif
@@ -1328,386 +1331,386 @@ yyreduce:
switch (yyn) {
case 1:
-#line 163 "grammar.y"
+#line 166 "grammar.y"
{ yyval.node = new NullNode(); ;
break;}
case 2:
-#line 164 "grammar.y"
+#line 167 "grammar.y"
{ yyval.node = new BooleanNode(true); ;
break;}
case 3:
-#line 165 "grammar.y"
+#line 168 "grammar.y"
{ yyval.node = new BooleanNode(false); ;
break;}
case 4:
-#line 166 "grammar.y"
+#line 169 "grammar.y"
{ yyval.node = new NumberNode(yyvsp[0].dval); ;
break;}
case 5:
-#line 167 "grammar.y"
+#line 170 "grammar.y"
{ yyval.node = new StringNode(yyvsp[0].ustr); delete yyvsp[0].ustr; ;
break;}
case 6:
-#line 168 "grammar.y"
+#line 171 "grammar.y"
{ Lexer *l = Lexer::curr();
if (!l->scanRegExp()) YYABORT;
yyval.node = new RegExpNode(l->pattern,l->flags);;
break;}
case 7:
-#line 172 "grammar.y"
+#line 175 "grammar.y"
{ Lexer *l = Lexer::curr();
if (!l->scanRegExp()) YYABORT;
yyval.node = new RegExpNode(UString('=')+l->pattern,l->flags);;
break;}
case 8:
-#line 178 "grammar.y"
+#line 181 "grammar.y"
{ yyval.node = new ThisNode(); ;
break;}
case 9:
-#line 179 "grammar.y"
+#line 182 "grammar.y"
{ yyval.node = new ResolveNode(*yyvsp[0].ident);
delete yyvsp[0].ident; ;
break;}
case 12:
-#line 183 "grammar.y"
+#line 186 "grammar.y"
{ yyval.node = new GroupNode(yyvsp[-1].node); ;
break;}
case 13:
-#line 184 "grammar.y"
+#line 187 "grammar.y"
{ yyval.node = new ObjectLiteralNode(0L); ;
break;}
case 14:
-#line 185 "grammar.y"
+#line 188 "grammar.y"
{ yyval.node = new ObjectLiteralNode(yyvsp[-1].plist); ;
break;}
case 15:
-#line 189 "grammar.y"
+#line 192 "grammar.y"
{ yyval.node = new ArrayNode(yyvsp[-1].ival); ;
break;}
case 16:
-#line 190 "grammar.y"
+#line 193 "grammar.y"
{ yyval.node = new ArrayNode(yyvsp[-1].elm); ;
break;}
case 17:
-#line 191 "grammar.y"
+#line 194 "grammar.y"
{ yyval.node = new ArrayNode(yyvsp[-1].ival, yyvsp[-3].elm); ;
break;}
case 18:
-#line 195 "grammar.y"
+#line 198 "grammar.y"
{ yyval.elm = new ElementNode(yyvsp[-1].ival, yyvsp[0].node); ;
break;}
case 19:
-#line 197 "grammar.y"
+#line 200 "grammar.y"
{ yyval.elm = new ElementNode(yyvsp[-3].elm, yyvsp[-1].ival, yyvsp[0].node); ;
break;}
case 20:
-#line 201 "grammar.y"
+#line 204 "grammar.y"
{ yyval.ival = 0; ;
break;}
case 22:
-#line 206 "grammar.y"
+#line 209 "grammar.y"
{ yyval.ival = 1; ;
break;}
case 23:
-#line 207 "grammar.y"
+#line 210 "grammar.y"
{ yyval.ival = yyvsp[-1].ival + 1; ;
break;}
case 24:
-#line 211 "grammar.y"
+#line 214 "grammar.y"
{ yyval.plist = new PropertyValueNode(yyvsp[-2].pnode, yyvsp[0].node); ;
break;}
case 25:
-#line 213 "grammar.y"
+#line 216 "grammar.y"
{ yyval.plist = new PropertyValueNode(yyvsp[-2].pnode, yyvsp[0].node, yyvsp[-4].plist); ;
break;}
case 26:
-#line 217 "grammar.y"
+#line 220 "grammar.y"
{ yyval.pnode = new PropertyNode(*yyvsp[0].ident); delete yyvsp[0].ident; ;
break;}
case 27:
-#line 218 "grammar.y"
+#line 221 "grammar.y"
{ yyval.pnode = new PropertyNode(Identifier(*yyvsp[0].ustr)); delete yyvsp[0].ustr; ;
break;}
case 28:
-#line 219 "grammar.y"
+#line 222 "grammar.y"
{ yyval.pnode = new PropertyNode(yyvsp[0].dval); ;
break;}
case 31:
-#line 225 "grammar.y"
+#line 228 "grammar.y"
{ yyval.node = new AccessorNode1(yyvsp[-3].node, yyvsp[-1].node); ;
break;}
case 32:
-#line 226 "grammar.y"
+#line 229 "grammar.y"
{ yyval.node = new AccessorNode2(yyvsp[-2].node, *yyvsp[0].ident); delete yyvsp[0].ident; ;
break;}
case 33:
-#line 227 "grammar.y"
+#line 230 "grammar.y"
{ yyval.node = new NewExprNode(yyvsp[-1].node, yyvsp[0].args); ;
break;}
case 35:
-#line 232 "grammar.y"
+#line 235 "grammar.y"
{ yyval.node = new NewExprNode(yyvsp[0].node); ;
break;}
case 36:
-#line 236 "grammar.y"
+#line 239 "grammar.y"
{ yyval.node = new FunctionCallNode(yyvsp[-1].node, yyvsp[0].args); ;
break;}
case 37:
-#line 237 "grammar.y"
+#line 240 "grammar.y"
{ yyval.node = new FunctionCallNode(yyvsp[-1].node, yyvsp[0].args); ;
break;}
case 38:
-#line 238 "grammar.y"
+#line 241 "grammar.y"
{ yyval.node = new AccessorNode1(yyvsp[-3].node, yyvsp[-1].node); ;
break;}
case 39:
-#line 239 "grammar.y"
+#line 242 "grammar.y"
{ yyval.node = new AccessorNode2(yyvsp[-2].node, *yyvsp[0].ident);
delete yyvsp[0].ident; ;
break;}
case 40:
-#line 244 "grammar.y"
+#line 247 "grammar.y"
{ yyval.args = new ArgumentsNode(0L); ;
break;}
case 41:
-#line 245 "grammar.y"
+#line 248 "grammar.y"
{ yyval.args = new ArgumentsNode(yyvsp[-1].alist); ;
break;}
case 42:
-#line 249 "grammar.y"
+#line 252 "grammar.y"
{ yyval.alist = new ArgumentListNode(yyvsp[0].node); ;
break;}
case 43:
-#line 250 "grammar.y"
+#line 253 "grammar.y"
{ yyval.alist = new ArgumentListNode(yyvsp[-2].alist, yyvsp[0].node); ;
break;}
case 47:
-#line 260 "grammar.y"
+#line 263 "grammar.y"
{ yyval.node = new PostfixNode(yyvsp[-1].node, OpPlusPlus); ;
break;}
case 48:
-#line 261 "grammar.y"
+#line 264 "grammar.y"
{ yyval.node = new PostfixNode(yyvsp[-1].node, OpMinusMinus); ;
break;}
case 50:
-#line 266 "grammar.y"
+#line 269 "grammar.y"
{ yyval.node = new DeleteNode(yyvsp[0].node); ;
break;}
case 51:
-#line 267 "grammar.y"
+#line 270 "grammar.y"
{ yyval.node = new VoidNode(yyvsp[0].node); ;
break;}
case 52:
-#line 268 "grammar.y"
+#line 271 "grammar.y"
{ yyval.node = new TypeOfNode(yyvsp[0].node); ;
break;}
case 53:
-#line 269 "grammar.y"
+#line 272 "grammar.y"
{ yyval.node = new PrefixNode(OpPlusPlus, yyvsp[0].node); ;
break;}
case 54:
-#line 270 "grammar.y"
+#line 273 "grammar.y"
{ yyval.node = new PrefixNode(OpPlusPlus, yyvsp[0].node); ;
break;}
case 55:
-#line 271 "grammar.y"
+#line 274 "grammar.y"
{ yyval.node = new PrefixNode(OpMinusMinus, yyvsp[0].node); ;
break;}
case 56:
-#line 272 "grammar.y"
+#line 275 "grammar.y"
{ yyval.node = new PrefixNode(OpMinusMinus, yyvsp[0].node); ;
break;}
case 57:
-#line 273 "grammar.y"
+#line 276 "grammar.y"
{ yyval.node = new UnaryPlusNode(yyvsp[0].node); ;
break;}
case 58:
-#line 274 "grammar.y"
+#line 277 "grammar.y"
{ yyval.node = new NegateNode(yyvsp[0].node); ;
break;}
case 59:
-#line 275 "grammar.y"
+#line 278 "grammar.y"
{ yyval.node = new BitwiseNotNode(yyvsp[0].node); ;
break;}
case 60:
-#line 276 "grammar.y"
+#line 279 "grammar.y"
{ yyval.node = new LogicalNotNode(yyvsp[0].node); ;
break;}
case 62:
-#line 281 "grammar.y"
+#line 284 "grammar.y"
{ yyval.node = new MultNode(yyvsp[-2].node, yyvsp[0].node, '*'); ;
break;}
case 63:
-#line 282 "grammar.y"
+#line 285 "grammar.y"
{ yyval.node = new MultNode(yyvsp[-2].node, yyvsp[0].node, '/'); ;
break;}
case 64:
-#line 283 "grammar.y"
+#line 286 "grammar.y"
{ yyval.node = new MultNode(yyvsp[-2].node,yyvsp[0].node,'%'); ;
break;}
case 66:
-#line 288 "grammar.y"
+#line 291 "grammar.y"
{ yyval.node = new AddNode(yyvsp[-2].node, yyvsp[0].node, '+'); ;
break;}
case 67:
-#line 289 "grammar.y"
+#line 292 "grammar.y"
{ yyval.node = new AddNode(yyvsp[-2].node, yyvsp[0].node, '-'); ;
break;}
case 69:
-#line 294 "grammar.y"
+#line 297 "grammar.y"
{ yyval.node = new ShiftNode(yyvsp[-2].node, OpLShift, yyvsp[0].node); ;
break;}
case 70:
-#line 295 "grammar.y"
+#line 298 "grammar.y"
{ yyval.node = new ShiftNode(yyvsp[-2].node, OpRShift, yyvsp[0].node); ;
break;}
case 71:
-#line 296 "grammar.y"
+#line 299 "grammar.y"
{ yyval.node = new ShiftNode(yyvsp[-2].node, OpURShift, yyvsp[0].node); ;
break;}
case 73:
-#line 302 "grammar.y"
+#line 305 "grammar.y"
{ yyval.node = new RelationalNode(yyvsp[-2].node, OpLess, yyvsp[0].node); ;
break;}
case 74:
-#line 304 "grammar.y"
+#line 307 "grammar.y"
{ yyval.node = new RelationalNode(yyvsp[-2].node, OpGreater, yyvsp[0].node); ;
break;}
case 75:
-#line 306 "grammar.y"
+#line 309 "grammar.y"
{ yyval.node = new RelationalNode(yyvsp[-2].node, OpLessEq, yyvsp[0].node); ;
break;}
case 76:
-#line 308 "grammar.y"
+#line 311 "grammar.y"
{ yyval.node = new RelationalNode(yyvsp[-2].node, OpGreaterEq, yyvsp[0].node); ;
break;}
case 77:
-#line 310 "grammar.y"
+#line 313 "grammar.y"
{ yyval.node = new RelationalNode(yyvsp[-2].node, OpInstanceOf, yyvsp[0].node); ;
break;}
case 78:
-#line 312 "grammar.y"
+#line 315 "grammar.y"
{ yyval.node = new RelationalNode(yyvsp[-2].node, OpIn, yyvsp[0].node); ;
break;}
case 80:
-#line 317 "grammar.y"
+#line 320 "grammar.y"
{ yyval.node = new EqualNode(yyvsp[-2].node, OpEqEq, yyvsp[0].node); ;
break;}
case 81:
-#line 318 "grammar.y"
+#line 321 "grammar.y"
{ yyval.node = new EqualNode(yyvsp[-2].node, OpNotEq, yyvsp[0].node); ;
break;}
case 82:
-#line 319 "grammar.y"
+#line 322 "grammar.y"
{ yyval.node = new EqualNode(yyvsp[-2].node, OpStrEq, yyvsp[0].node); ;
break;}
case 83:
-#line 320 "grammar.y"
+#line 323 "grammar.y"
{ yyval.node = new EqualNode(yyvsp[-2].node, OpStrNEq, yyvsp[0].node);;
break;}
case 85:
-#line 325 "grammar.y"
+#line 328 "grammar.y"
{ yyval.node = new BitOperNode(yyvsp[-2].node, OpBitAnd, yyvsp[0].node); ;
break;}
case 87:
-#line 330 "grammar.y"
+#line 333 "grammar.y"
{ yyval.node = new BitOperNode(yyvsp[-2].node, OpBitXOr, yyvsp[0].node); ;
break;}
case 89:
-#line 335 "grammar.y"
+#line 338 "grammar.y"
{ yyval.node = new BitOperNode(yyvsp[-2].node, OpBitOr, yyvsp[0].node); ;
break;}
case 91:
-#line 341 "grammar.y"
+#line 344 "grammar.y"
{ yyval.node = new BinaryLogicalNode(yyvsp[-2].node, OpAnd, yyvsp[0].node); ;
break;}
case 93:
-#line 347 "grammar.y"
+#line 350 "grammar.y"
{ yyval.node = new BinaryLogicalNode(yyvsp[-2].node, OpOr, yyvsp[0].node); ;
break;}
case 95:
-#line 353 "grammar.y"
+#line 356 "grammar.y"
{ yyval.node = new ConditionalNode(yyvsp[-4].node, yyvsp[-2].node, yyvsp[0].node); ;
break;}
case 97:
-#line 359 "grammar.y"
+#line 362 "grammar.y"
{ yyval.node = new AssignNode(yyvsp[-2].node, yyvsp[-1].op, yyvsp[0].node);;
break;}
case 98:
-#line 363 "grammar.y"
+#line 366 "grammar.y"
{ yyval.op = OpEqual; ;
break;}
case 99:
-#line 364 "grammar.y"
+#line 367 "grammar.y"
{ yyval.op = OpPlusEq; ;
break;}
case 100:
-#line 365 "grammar.y"
+#line 368 "grammar.y"
{ yyval.op = OpMinusEq; ;
break;}
case 101:
-#line 366 "grammar.y"
+#line 369 "grammar.y"
{ yyval.op = OpMultEq; ;
break;}
case 102:
-#line 367 "grammar.y"
+#line 370 "grammar.y"
{ yyval.op = OpDivEq; ;
break;}
case 103:
-#line 368 "grammar.y"
+#line 371 "grammar.y"
{ yyval.op = OpLShift; ;
break;}
case 104:
-#line 369 "grammar.y"
+#line 372 "grammar.y"
{ yyval.op = OpRShift; ;
break;}
case 105:
-#line 370 "grammar.y"
+#line 373 "grammar.y"
{ yyval.op = OpURShift; ;
break;}
case 106:
-#line 371 "grammar.y"
+#line 374 "grammar.y"
{ yyval.op = OpAndEq; ;
break;}
case 107:
-#line 372 "grammar.y"
+#line 375 "grammar.y"
{ yyval.op = OpXOrEq; ;
break;}
case 108:
-#line 373 "grammar.y"
+#line 376 "grammar.y"
{ yyval.op = OpOrEq; ;
break;}
case 109:
-#line 374 "grammar.y"
+#line 377 "grammar.y"
{ yyval.op = OpModEq; ;
break;}
case 111:
-#line 379 "grammar.y"
+#line 382 "grammar.y"
{ yyval.node = new CommaNode(yyvsp[-2].node, yyvsp[0].node); ;
break;}
case 126:
-#line 400 "grammar.y"
+#line 403 "grammar.y"
{ yyval.stat = new BlockNode(0L); DBG(yyval.stat, yylsp[0], yylsp[0]); ;
break;}
case 127:
-#line 401 "grammar.y"
+#line 404 "grammar.y"
{ yyval.stat = new BlockNode(yyvsp[-1].srcs); DBG(yyval.stat, yylsp[0], yylsp[0]); ;
break;}
case 128:
-#line 405 "grammar.y"
+#line 408 "grammar.y"
{ yyval.slist = new StatListNode(yyvsp[0].stat); ;
break;}
case 129:
-#line 406 "grammar.y"
+#line 409 "grammar.y"
{ yyval.slist = new StatListNode(yyvsp[-1].slist, yyvsp[0].stat); ;
break;}
case 130:
-#line 410 "grammar.y"
+#line 413 "grammar.y"
{ yyval.stat = new VarStatementNode(yyvsp[-1].vlist);
DBG(yyval.stat, yylsp[-2], yylsp[0]); ;
break;}
case 131:
-#line 412 "grammar.y"
+#line 415 "grammar.y"
{ if (automatic()) {
yyval.stat = new VarStatementNode(yyvsp[-1].vlist);
DBG(yyval.stat, yylsp[-2], yylsp[-1]);
@@ -1717,36 +1720,36 @@ case 131:
;
break;}
case 132:
-#line 422 "grammar.y"
+#line 425 "grammar.y"
{ yyval.vlist = new VarDeclListNode(yyvsp[0].decl); ;
break;}
case 133:
-#line 424 "grammar.y"
+#line 427 "grammar.y"
{ yyval.vlist = new VarDeclListNode(yyvsp[-2].vlist, yyvsp[0].decl); ;
break;}
case 134:
-#line 428 "grammar.y"
+#line 431 "grammar.y"
{ yyval.decl = new VarDeclNode(*yyvsp[0].ident, 0); delete yyvsp[0].ident; ;
break;}
case 135:
-#line 429 "grammar.y"
+#line 432 "grammar.y"
{ yyval.decl = new VarDeclNode(*yyvsp[-1].ident, yyvsp[0].init); delete yyvsp[-1].ident; ;
break;}
case 136:
-#line 433 "grammar.y"
+#line 436 "grammar.y"
{ yyval.init = new AssignExprNode(yyvsp[0].node); ;
break;}
case 137:
-#line 437 "grammar.y"
+#line 440 "grammar.y"
{ yyval.stat = new EmptyStatementNode(); ;
break;}
case 138:
-#line 441 "grammar.y"
+#line 444 "grammar.y"
{ yyval.stat = new ExprStatementNode(yyvsp[-1].node);
DBG(yyval.stat, yylsp[-1], yylsp[0]); ;
break;}
case 139:
-#line 443 "grammar.y"
+#line 446 "grammar.y"
{ if (automatic()) {
yyval.stat = new ExprStatementNode(yyvsp[-1].node);
DBG(yyval.stat, yylsp[-1], yylsp[-1]);
@@ -1754,70 +1757,70 @@ case 139:
YYABORT; ;
break;}
case 140:
-#line 451 "grammar.y"
+#line 454 "grammar.y"
{ yyval.stat = new IfNode(yyvsp[-2].node,yyvsp[0].stat,0L);DBG(yyval.stat,yylsp[-4],yylsp[-1]); ;
break;}
case 141:
-#line 453 "grammar.y"
+#line 456 "grammar.y"
{ yyval.stat = new IfNode(yyvsp[-4].node,yyvsp[-2].stat,yyvsp[0].stat);DBG(yyval.stat,yylsp[-6],yylsp[-3]); ;
break;}
case 142:
-#line 457 "grammar.y"
+#line 460 "grammar.y"
{ yyval.stat=new DoWhileNode(yyvsp[-4].stat,yyvsp[-1].node);DBG(yyval.stat,yylsp[-5],yylsp[-3]);;
break;}
case 143:
-#line 458 "grammar.y"
+#line 461 "grammar.y"
{ yyval.stat = new WhileNode(yyvsp[-2].node,yyvsp[0].stat);DBG(yyval.stat,yylsp[-4],yylsp[-1]); ;
break;}
case 144:
-#line 460 "grammar.y"
+#line 463 "grammar.y"
{ yyval.stat = new ForNode(yyvsp[-6].node,yyvsp[-4].node,yyvsp[-2].node,yyvsp[0].stat);
DBG(yyval.stat,yylsp[-8],yylsp[-1]); ;
break;}
case 145:
-#line 463 "grammar.y"
+#line 466 "grammar.y"
{ yyval.stat = new ForNode(yyvsp[-6].vlist,yyvsp[-4].node,yyvsp[-2].node,yyvsp[0].stat);
DBG(yyval.stat,yylsp[-9],yylsp[-1]); ;
break;}
case 146:
-#line 466 "grammar.y"
+#line 469 "grammar.y"
{ yyval.stat = new ForInNode(yyvsp[-4].node, yyvsp[-2].node, yyvsp[0].stat);
DBG(yyval.stat,yylsp[-6],yylsp[-1]); ;
break;}
case 147:
-#line 469 "grammar.y"
+#line 472 "grammar.y"
{ yyval.stat = new ForInNode(*yyvsp[-4].ident,0L,yyvsp[-2].node,yyvsp[0].stat);
DBG(yyval.stat,yylsp[-7],yylsp[-1]);
delete yyvsp[-4].ident; ;
break;}
case 148:
-#line 473 "grammar.y"
+#line 476 "grammar.y"
{ yyval.stat = new ForInNode(*yyvsp[-5].ident,yyvsp[-4].init,yyvsp[-2].node,yyvsp[0].stat);
DBG(yyval.stat,yylsp[-8],yylsp[-1]);
delete yyvsp[-5].ident; ;
break;}
case 149:
-#line 479 "grammar.y"
+#line 482 "grammar.y"
{ yyval.node = 0L; ;
break;}
case 151:
-#line 484 "grammar.y"
+#line 487 "grammar.y"
{ yyval.stat = new ContinueNode(); DBG(yyval.stat,yylsp[-1],yylsp[0]); ;
break;}
case 152:
-#line 485 "grammar.y"
+#line 488 "grammar.y"
{ if (automatic()) {
yyval.stat = new ContinueNode(); DBG(yyval.stat,yylsp[-1],yylsp[0]);
} else
YYABORT; ;
break;}
case 153:
-#line 489 "grammar.y"
+#line 492 "grammar.y"
{ yyval.stat = new ContinueNode(*yyvsp[-1].ident); DBG(yyval.stat,yylsp[-2],yylsp[0]);
delete yyvsp[-1].ident; ;
break;}
case 154:
-#line 491 "grammar.y"
+#line 494 "grammar.y"
{ if (automatic()) {
yyval.stat = new ContinueNode(*yyvsp[-1].ident);DBG(yyval.stat,yylsp[-2],yylsp[-1]);
delete yyvsp[-1].ident;
@@ -1825,23 +1828,23 @@ case 154:
YYABORT; ;
break;}
case 155:
-#line 499 "grammar.y"
+#line 502 "grammar.y"
{ yyval.stat = new BreakNode();DBG(yyval.stat,yylsp[-1],yylsp[0]); ;
break;}
case 156:
-#line 500 "grammar.y"
+#line 503 "grammar.y"
{ if (automatic()) {
yyval.stat = new BreakNode(); DBG(yyval.stat,yylsp[-1],yylsp[-1]);
} else
YYABORT; ;
break;}
case 157:
-#line 504 "grammar.y"
+#line 507 "grammar.y"
{ yyval.stat = new BreakNode(*yyvsp[-1].ident); DBG(yyval.stat,yylsp[-2],yylsp[0]);
delete yyvsp[-1].ident; ;
break;}
case 158:
-#line 506 "grammar.y"
+#line 509 "grammar.y"
{ if (automatic()) {
yyval.stat = new BreakNode(*yyvsp[-1].ident); DBG(yyval.stat,yylsp[-2],yylsp[-1]);
delete yyvsp[-1].ident;
@@ -1850,163 +1853,163 @@ case 158:
;
break;}
case 159:
-#line 515 "grammar.y"
+#line 518 "grammar.y"
{ yyval.stat = new ReturnNode(0L); DBG(yyval.stat,yylsp[-1],yylsp[0]); ;
break;}
case 160:
-#line 516 "grammar.y"
+#line 519 "grammar.y"
{ if (automatic()) {
yyval.stat = new ReturnNode(0L); DBG(yyval.stat,yylsp[-1],yylsp[-1]);
} else
YYABORT; ;
break;}
case 161:
-#line 520 "grammar.y"
+#line 523 "grammar.y"
{ yyval.stat = new ReturnNode(yyvsp[-1].node); ;
break;}
case 162:
-#line 521 "grammar.y"
+#line 524 "grammar.y"
{ if (automatic())
yyval.stat = new ReturnNode(yyvsp[-1].node);
else
YYABORT; ;
break;}
case 163:
-#line 528 "grammar.y"
+#line 531 "grammar.y"
{ yyval.stat = new WithNode(yyvsp[-2].node,yyvsp[0].stat);
DBG(yyval.stat, yylsp[-4], yylsp[-1]); ;
break;}
case 164:
-#line 533 "grammar.y"
+#line 536 "grammar.y"
{ yyval.stat = new SwitchNode(yyvsp[-2].node, yyvsp[0].cblk);
DBG(yyval.stat, yylsp[-4], yylsp[-1]); ;
break;}
case 165:
-#line 538 "grammar.y"
+#line 541 "grammar.y"
{ yyval.cblk = new CaseBlockNode(yyvsp[-1].clist, 0L, 0L); ;
break;}
case 166:
-#line 540 "grammar.y"
+#line 543 "grammar.y"
{ yyval.cblk = new CaseBlockNode(yyvsp[-3].clist, yyvsp[-2].ccl, yyvsp[-1].clist); ;
break;}
case 167:
-#line 544 "grammar.y"
+#line 547 "grammar.y"
{ yyval.clist = 0L; ;
break;}
case 169:
-#line 549 "grammar.y"
+#line 552 "grammar.y"
{ yyval.clist = new ClauseListNode(yyvsp[0].ccl); ;
break;}
case 170:
-#line 550 "grammar.y"
+#line 553 "grammar.y"
{ yyval.clist = new ClauseListNode(yyvsp[-1].clist, yyvsp[0].ccl); ;
break;}
case 171:
-#line 554 "grammar.y"
+#line 557 "grammar.y"
{ yyval.ccl = new CaseClauseNode(yyvsp[-1].node, 0L); ;
break;}
case 172:
-#line 555 "grammar.y"
+#line 558 "grammar.y"
{ yyval.ccl = new CaseClauseNode(yyvsp[-2].node, yyvsp[0].slist); ;
break;}
case 173:
-#line 559 "grammar.y"
+#line 562 "grammar.y"
{ yyval.ccl = new CaseClauseNode(0L, 0L);; ;
break;}
case 174:
-#line 560 "grammar.y"
+#line 563 "grammar.y"
{ yyval.ccl = new CaseClauseNode(0L, yyvsp[0].slist); ;
break;}
case 175:
-#line 564 "grammar.y"
+#line 567 "grammar.y"
{ yyvsp[0].stat->pushLabel(*yyvsp[-2].ident);
yyval.stat = new LabelNode(*yyvsp[-2].ident, yyvsp[0].stat);
delete yyvsp[-2].ident; ;
break;}
case 176:
-#line 570 "grammar.y"
+#line 573 "grammar.y"
{ yyval.stat = new ThrowNode(yyvsp[-1].node); ;
break;}
case 177:
-#line 574 "grammar.y"
+#line 577 "grammar.y"
{ yyval.stat = new TryNode(yyvsp[-1].stat, yyvsp[0].node); ;
break;}
case 178:
-#line 575 "grammar.y"
+#line 578 "grammar.y"
{ yyval.stat = new TryNode(yyvsp[-1].stat, 0L, yyvsp[0].node); ;
break;}
case 179:
-#line 576 "grammar.y"
+#line 579 "grammar.y"
{ yyval.stat = new TryNode(yyvsp[-2].stat, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 180:
-#line 580 "grammar.y"
+#line 583 "grammar.y"
{ yyval.node = new CatchNode(*yyvsp[-2].ident, yyvsp[0].stat); delete yyvsp[-2].ident; ;
break;}
case 181:
-#line 584 "grammar.y"
+#line 587 "grammar.y"
{ yyval.node = new FinallyNode(yyvsp[0].stat); ;
break;}
case 182:
-#line 588 "grammar.y"
+#line 591 "grammar.y"
{ yyval.func = new FuncDeclNode(*yyvsp[-3].ident, 0L, yyvsp[0].body);
delete yyvsp[-3].ident; ;
break;}
case 183:
-#line 591 "grammar.y"
+#line 594 "grammar.y"
{ yyval.func = new FuncDeclNode(*yyvsp[-4].ident, yyvsp[-2].param, yyvsp[0].body);
delete yyvsp[-4].ident; ;
break;}
case 184:
-#line 595 "grammar.y"
+#line 598 "grammar.y"
{ yyval.node = new FuncExprNode(0L, yyvsp[0].body); ;
break;}
case 185:
-#line 597 "grammar.y"
+#line 600 "grammar.y"
{ yyval.node = new FuncExprNode(yyvsp[-2].param, yyvsp[0].body); ;
break;}
case 186:
-#line 602 "grammar.y"
+#line 605 "grammar.y"
{ yyval.param = new ParameterNode(*yyvsp[0].ident); delete yyvsp[0].ident; ;
break;}
case 187:
-#line 603 "grammar.y"
+#line 606 "grammar.y"
{ yyval.param = new ParameterNode(yyvsp[-2].param, *yyvsp[0].ident); delete yyvsp[0].ident; ;
break;}
case 188:
-#line 607 "grammar.y"
+#line 610 "grammar.y"
{ yyval.body = new FunctionBodyNode(0L);
DBG(yyval.body, yylsp[-1], yylsp[0]);;
break;}
case 189:
-#line 609 "grammar.y"
+#line 612 "grammar.y"
{ yyval.body = new FunctionBodyNode(yyvsp[-1].srcs);
DBG(yyval.body, yylsp[-2], yylsp[0]);;
break;}
case 190:
-#line 614 "grammar.y"
+#line 617 "grammar.y"
{ yyval.prog = new ProgramNode(0L);
Parser::progNode = yyval.prog; ;
break;}
case 191:
-#line 616 "grammar.y"
+#line 619 "grammar.y"
{ yyval.prog = new ProgramNode(yyvsp[0].srcs);
Parser::progNode = yyval.prog; ;
break;}
case 192:
-#line 621 "grammar.y"
+#line 624 "grammar.y"
{ yyval.srcs = new SourceElementsNode(yyvsp[0].stat); ;
break;}
case 193:
-#line 622 "grammar.y"
+#line 625 "grammar.y"
{ yyval.srcs = new SourceElementsNode(yyvsp[-1].srcs, yyvsp[0].stat); ;
break;}
case 194:
-#line 626 "grammar.y"
+#line 629 "grammar.y"
{ yyval.stat = yyvsp[0].stat; ;
break;}
case 195:
-#line 627 "grammar.y"
+#line 630 "grammar.y"
{ yyval.stat = yyvsp[0].func; ;
break;}
}
@@ -2231,7 +2234,7 @@ yyerrhandle:
}
return 1;
}
-#line 630 "grammar.y"
+#line 633 "grammar.y"
int yyerror (const char *) /* Called by yyparse on error */
diff --git a/JavaScriptCore/kjs/grammar.y b/JavaScriptCore/kjs/grammar.y
index 656414c..a5e416c 100644
--- a/JavaScriptCore/kjs/grammar.y
+++ b/JavaScriptCore/kjs/grammar.y
@@ -33,6 +33,9 @@
#include "lexer.h"
#include "internal.h"
+// Not sure why, but yacc doesn't add this define along with the others.
+#define yylloc kjsyylloc
+
/* default values for bison */
#define YYDEBUG 0
#define YYMAXDEPTH 0
@@ -41,9 +44,9 @@
#endif
#define DBG(l, s, e) { l->setLoc(s.first_line, e.last_line, Parser::sid); } // location
-extern int yylex();
-int yyerror (const char *);
-bool automatic();
+extern int kjsyylex();
+int kjsyyerror(const char *);
+static bool automatic();
using namespace KJS;
diff --git a/JavaScriptCore/kjs/lexer.cpp b/JavaScriptCore/kjs/lexer.cpp
index 926c7c0..5b19a20 100644
--- a/JavaScriptCore/kjs/lexer.cpp
+++ b/JavaScriptCore/kjs/lexer.cpp
@@ -51,7 +51,7 @@ static Lexer *currLexer = 0;
#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++
int kjsyylex()
@@ -481,8 +481,8 @@ int Lexer::lex()
restrKeyword = false;
delimited = false;
- yylloc.first_line = yylineno; // ???
- yylloc.last_line = yylineno;
+ kjsyylloc.first_line = yylineno; // ???
+ kjsyylloc.last_line = yylineno;
switch (state) {
case Eof:
diff --git a/JavaScriptCore/pcre/pcre.h b/JavaScriptCore/pcre/pcre.h
index 718d07f..886c14b 100644
--- a/JavaScriptCore/pcre/pcre.h
+++ b/JavaScriptCore/pcre/pcre.h
@@ -7,6 +7,21 @@
#ifndef _PCRE_H
#define _PCRE_H
+#define pcre_compile kjs_pcre_compile
+#define pcre_copy_substring kjs_pcre_copy_substring
+#define pcre_exec kjs_pcre_exec
+#define pcre_free kjs_pcre_free
+#define pcre_free_substring kjs_pcre_free_substring
+#define pcre_free_substring_list kjs_pcre_free_substring_list
+#define pcre_fullinfo kjs_pcre_fullinfo
+#define pcre_get_substring kjs_pcre_get_substring
+#define pcre_get_substring_list kjs_pcre_get_substring_list
+#define pcre_info kjs_pcre_info
+#define pcre_maketables kjs_pcre_maketables
+#define pcre_malloc kjs_pcre_malloc
+#define pcre_study kjs_pcre_study
+#define pcre_version kjs_pcre_version
+
#define PCRE_MAJOR 3
#define PCRE_MINOR 9
#define PCRE_DATE 02-Jan-2002
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list