diff -r 4f2f89ce4247 -r 303757a437d3 WebCore/generated/XPathGrammar.cpp --- a/WebCore/generated/XPathGrammar.cpp Fri Sep 17 09:02:29 2010 +0300 +++ b/WebCore/generated/XPathGrammar.cpp Mon Oct 04 01:32:07 2010 +0300 @@ -76,7 +76,7 @@ /* Copy the first part of user declarations. */ /* Line 189 of yacc.c */ -#line 28 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 28 "xml/XPathGrammar.y" #include "config.h" @@ -162,7 +162,7 @@ { /* Line 214 of yacc.c */ -#line 60 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 60 "xml/XPathGrammar.y" Step::Axis axis; Step::NodeTest* nodeTest; @@ -189,7 +189,7 @@ /* Copy the second part of user declarations. */ /* Line 264 of yacc.c */ -#line 73 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 73 "xml/XPathGrammar.y" static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); } @@ -1483,7 +1483,7 @@ case 2: /* Line 1455 of yacc.c */ -#line 122 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 122 "xml/XPathGrammar.y" { PARSER->m_topExpr = (yyvsp[(1) - (1)].expr); ;} @@ -1492,7 +1492,7 @@ case 3: /* Line 1455 of yacc.c */ -#line 129 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 129 "xml/XPathGrammar.y" { (yyval.locationPath)->setAbsolute(false); ;} @@ -1501,7 +1501,7 @@ case 4: /* Line 1455 of yacc.c */ -#line 134 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 134 "xml/XPathGrammar.y" { (yyval.locationPath)->setAbsolute(true); ;} @@ -1510,7 +1510,7 @@ case 5: /* Line 1455 of yacc.c */ -#line 141 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 141 "xml/XPathGrammar.y" { (yyval.locationPath) = new LocationPath; PARSER->registerParseNode((yyval.locationPath)); @@ -1520,7 +1520,7 @@ case 6: /* Line 1455 of yacc.c */ -#line 147 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 147 "xml/XPathGrammar.y" { (yyval.locationPath) = (yyvsp[(2) - (2)].locationPath); ;} @@ -1529,7 +1529,7 @@ case 7: /* Line 1455 of yacc.c */ -#line 152 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 152 "xml/XPathGrammar.y" { (yyval.locationPath) = (yyvsp[(2) - (2)].locationPath); (yyval.locationPath)->insertFirstStep((yyvsp[(1) - (2)].step)); @@ -1540,7 +1540,7 @@ case 8: /* Line 1455 of yacc.c */ -#line 161 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 161 "xml/XPathGrammar.y" { (yyval.locationPath) = new LocationPath; (yyval.locationPath)->appendStep((yyvsp[(1) - (1)].step)); @@ -1552,7 +1552,7 @@ case 9: /* Line 1455 of yacc.c */ -#line 169 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 169 "xml/XPathGrammar.y" { (yyval.locationPath)->appendStep((yyvsp[(3) - (3)].step)); PARSER->unregisterParseNode((yyvsp[(3) - (3)].step)); @@ -1562,7 +1562,7 @@ case 10: /* Line 1455 of yacc.c */ -#line 175 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 175 "xml/XPathGrammar.y" { (yyval.locationPath)->appendStep((yyvsp[(2) - (3)].step)); (yyval.locationPath)->appendStep((yyvsp[(3) - (3)].step)); @@ -1574,7 +1574,7 @@ case 11: /* Line 1455 of yacc.c */ -#line 185 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 185 "xml/XPathGrammar.y" { if ((yyvsp[(2) - (2)].predList)) { (yyval.step) = new Step(Step::ChildAxis, *(yyvsp[(1) - (2)].nodeTest), *(yyvsp[(2) - (2)].predList)); @@ -1589,7 +1589,7 @@ case 12: /* Line 1455 of yacc.c */ -#line 196 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 196 "xml/XPathGrammar.y" { String localName; String namespaceURI; @@ -1611,7 +1611,7 @@ case 13: /* Line 1455 of yacc.c */ -#line 214 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 214 "xml/XPathGrammar.y" { if ((yyvsp[(3) - (3)].predList)) { (yyval.step) = new Step((yyvsp[(1) - (3)].axis), *(yyvsp[(2) - (3)].nodeTest), *(yyvsp[(3) - (3)].predList)); @@ -1626,7 +1626,7 @@ case 14: /* Line 1455 of yacc.c */ -#line 225 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 225 "xml/XPathGrammar.y" { String localName; String namespaceURI; @@ -1648,7 +1648,7 @@ case 17: /* Line 1455 of yacc.c */ -#line 249 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 249 "xml/XPathGrammar.y" { (yyval.axis) = Step::AttributeAxis; ;} @@ -1657,7 +1657,7 @@ case 18: /* Line 1455 of yacc.c */ -#line 256 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 256 "xml/XPathGrammar.y" { if (*(yyvsp[(1) - (3)].str) == "node") (yyval.nodeTest) = new Step::NodeTest(Step::NodeTest::AnyNodeTest); @@ -1674,7 +1674,7 @@ case 19: /* Line 1455 of yacc.c */ -#line 269 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 269 "xml/XPathGrammar.y" { (yyval.nodeTest) = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest); PARSER->deleteString((yyvsp[(1) - (3)].str)); @@ -1685,7 +1685,7 @@ case 20: /* Line 1455 of yacc.c */ -#line 276 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 276 "xml/XPathGrammar.y" { (yyval.nodeTest) = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, (yyvsp[(3) - (4)].str)->stripWhiteSpace()); PARSER->deleteString((yyvsp[(1) - (4)].str)); @@ -1697,7 +1697,7 @@ case 21: /* Line 1455 of yacc.c */ -#line 286 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 286 "xml/XPathGrammar.y" { (yyval.predList) = 0; ;} @@ -1706,7 +1706,7 @@ case 23: /* Line 1455 of yacc.c */ -#line 295 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 295 "xml/XPathGrammar.y" { (yyval.predList) = new Vector; (yyval.predList)->append(new Predicate((yyvsp[(1) - (1)].expr))); @@ -1718,7 +1718,7 @@ case 24: /* Line 1455 of yacc.c */ -#line 303 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 303 "xml/XPathGrammar.y" { (yyval.predList)->append(new Predicate((yyvsp[(2) - (2)].expr))); PARSER->unregisterParseNode((yyvsp[(2) - (2)].expr)); @@ -1728,7 +1728,7 @@ case 25: /* Line 1455 of yacc.c */ -#line 311 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 311 "xml/XPathGrammar.y" { (yyval.expr) = (yyvsp[(2) - (3)].expr); ;} @@ -1737,7 +1737,7 @@ case 26: /* Line 1455 of yacc.c */ -#line 318 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 318 "xml/XPathGrammar.y" { (yyval.step) = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); PARSER->registerParseNode((yyval.step)); @@ -1747,7 +1747,7 @@ case 27: /* Line 1455 of yacc.c */ -#line 326 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 326 "xml/XPathGrammar.y" { (yyval.step) = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); PARSER->registerParseNode((yyval.step)); @@ -1757,7 +1757,7 @@ case 28: /* Line 1455 of yacc.c */ -#line 332 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 332 "xml/XPathGrammar.y" { (yyval.step) = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); PARSER->registerParseNode((yyval.step)); @@ -1767,7 +1767,7 @@ case 29: /* Line 1455 of yacc.c */ -#line 340 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 340 "xml/XPathGrammar.y" { (yyval.expr) = new VariableReference(*(yyvsp[(1) - (1)].str)); PARSER->deleteString((yyvsp[(1) - (1)].str)); @@ -1778,7 +1778,7 @@ case 30: /* Line 1455 of yacc.c */ -#line 347 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 347 "xml/XPathGrammar.y" { (yyval.expr) = (yyvsp[(2) - (3)].expr); ;} @@ -1787,7 +1787,7 @@ case 31: /* Line 1455 of yacc.c */ -#line 352 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 352 "xml/XPathGrammar.y" { (yyval.expr) = new StringExpression(*(yyvsp[(1) - (1)].str)); PARSER->deleteString((yyvsp[(1) - (1)].str)); @@ -1798,7 +1798,7 @@ case 32: /* Line 1455 of yacc.c */ -#line 359 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 359 "xml/XPathGrammar.y" { (yyval.expr) = new Number((yyvsp[(1) - (1)].str)->toDouble()); PARSER->deleteString((yyvsp[(1) - (1)].str)); @@ -1809,7 +1809,7 @@ case 34: /* Line 1455 of yacc.c */ -#line 370 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 370 "xml/XPathGrammar.y" { (yyval.expr) = createFunction(*(yyvsp[(1) - (3)].str)); if (!(yyval.expr)) @@ -1822,7 +1822,7 @@ case 35: /* Line 1455 of yacc.c */ -#line 379 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 379 "xml/XPathGrammar.y" { (yyval.expr) = createFunction(*(yyvsp[(1) - (4)].str), *(yyvsp[(3) - (4)].argList)); if (!(yyval.expr)) @@ -1836,7 +1836,7 @@ case 36: /* Line 1455 of yacc.c */ -#line 391 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 391 "xml/XPathGrammar.y" { (yyval.argList) = new Vector; (yyval.argList)->append((yyvsp[(1) - (1)].expr)); @@ -1848,7 +1848,7 @@ case 37: /* Line 1455 of yacc.c */ -#line 399 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 399 "xml/XPathGrammar.y" { (yyval.argList)->append((yyvsp[(3) - (3)].expr)); PARSER->unregisterParseNode((yyvsp[(3) - (3)].expr)); @@ -1858,7 +1858,7 @@ case 40: /* Line 1455 of yacc.c */ -#line 413 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 413 "xml/XPathGrammar.y" { (yyval.expr) = new Union; (yyval.expr)->addSubExpression((yyvsp[(1) - (3)].expr)); @@ -1872,7 +1872,7 @@ case 41: /* Line 1455 of yacc.c */ -#line 425 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 425 "xml/XPathGrammar.y" { (yyval.expr) = (yyvsp[(1) - (1)].locationPath); ;} @@ -1881,7 +1881,7 @@ case 43: /* Line 1455 of yacc.c */ -#line 432 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 432 "xml/XPathGrammar.y" { (yyvsp[(3) - (3)].locationPath)->setAbsolute(true); (yyval.expr) = new Path(static_cast((yyvsp[(1) - (3)].expr)), (yyvsp[(3) - (3)].locationPath)); @@ -1894,7 +1894,7 @@ case 44: /* Line 1455 of yacc.c */ -#line 441 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 441 "xml/XPathGrammar.y" { (yyvsp[(3) - (3)].locationPath)->insertFirstStep((yyvsp[(2) - (3)].step)); (yyvsp[(3) - (3)].locationPath)->setAbsolute(true); @@ -1909,7 +1909,7 @@ case 46: /* Line 1455 of yacc.c */ -#line 456 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 456 "xml/XPathGrammar.y" { (yyval.expr) = new Filter((yyvsp[(1) - (2)].expr), *(yyvsp[(2) - (2)].predList)); PARSER->unregisterParseNode((yyvsp[(1) - (2)].expr)); @@ -1921,7 +1921,7 @@ case 48: /* Line 1455 of yacc.c */ -#line 468 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 468 "xml/XPathGrammar.y" { (yyval.expr) = new LogicalOp(LogicalOp::OP_Or, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); PARSER->unregisterParseNode((yyvsp[(1) - (3)].expr)); @@ -1933,7 +1933,7 @@ case 50: /* Line 1455 of yacc.c */ -#line 480 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 480 "xml/XPathGrammar.y" { (yyval.expr) = new LogicalOp(LogicalOp::OP_And, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); PARSER->unregisterParseNode((yyvsp[(1) - (3)].expr)); @@ -1945,7 +1945,7 @@ case 52: /* Line 1455 of yacc.c */ -#line 492 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 492 "xml/XPathGrammar.y" { (yyval.expr) = new EqTestOp((yyvsp[(2) - (3)].eqop), (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); PARSER->unregisterParseNode((yyvsp[(1) - (3)].expr)); @@ -1957,7 +1957,7 @@ case 54: /* Line 1455 of yacc.c */ -#line 504 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 504 "xml/XPathGrammar.y" { (yyval.expr) = new EqTestOp((yyvsp[(2) - (3)].eqop), (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); PARSER->unregisterParseNode((yyvsp[(1) - (3)].expr)); @@ -1969,7 +1969,7 @@ case 56: /* Line 1455 of yacc.c */ -#line 516 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 516 "xml/XPathGrammar.y" { (yyval.expr) = new NumericOp(NumericOp::OP_Add, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); PARSER->unregisterParseNode((yyvsp[(1) - (3)].expr)); @@ -1981,7 +1981,7 @@ case 57: /* Line 1455 of yacc.c */ -#line 524 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 524 "xml/XPathGrammar.y" { (yyval.expr) = new NumericOp(NumericOp::OP_Sub, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); PARSER->unregisterParseNode((yyvsp[(1) - (3)].expr)); @@ -1993,7 +1993,7 @@ case 59: /* Line 1455 of yacc.c */ -#line 536 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 536 "xml/XPathGrammar.y" { (yyval.expr) = new NumericOp((yyvsp[(2) - (3)].numop), (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); PARSER->unregisterParseNode((yyvsp[(1) - (3)].expr)); @@ -2005,7 +2005,7 @@ case 61: /* Line 1455 of yacc.c */ -#line 548 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 548 "xml/XPathGrammar.y" { (yyval.expr) = new Negative; (yyval.expr)->addSubExpression((yyvsp[(2) - (2)].expr)); @@ -2229,7 +2229,7 @@ /* Line 1675 of yacc.c */ -#line 556 "u:\\yaels-qtwebkit\\WebCore\\xml\\XPathGrammar.y" +#line 556 "xml/XPathGrammar.y" #endif