wok-next annotate libwebkit/stuff/WebCore_xml_XPathGrammar.y_124099.diff @ rev 18887

Up firefox-official(44.0.2)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Feb 12 15:47:40 2016 +0200 (2016-02-12)
parents
children
rev   line source
domcox@14105 1 Index: trunk/Source/WebCore/xml/XPathGrammar.y
domcox@14105 2 ===================================================================
domcox@14105 3 --- trunk/Source/WebCore/xml/XPathGrammar.y (revision 97771)
domcox@14105 4 +++ trunk/Source/WebCore/xml/XPathGrammar.y (revision 124099)
domcox@14105 5 @@ -35,4 +35,5 @@
domcox@14105 6 #include "XPathPath.h"
domcox@14105 7 #include "XPathPredicate.h"
domcox@14105 8 +#include "XPathStep.h"
domcox@14105 9 #include "XPathVariableReference.h"
domcox@14105 10 #include <wtf/FastMalloc.h>
domcox@14105 11 @@ -45,6 +46,4 @@
domcox@14105 12 #define YYDEBUG 0
domcox@14105 13 #define YYMAXDEPTH 10000
domcox@14105 14 -#define YYPARSE_PARAM parserParameter
domcox@14105 15 -#define PARSER static_cast<Parser*>(parserParameter)
domcox@14105 16
domcox@14105 17 using namespace WebCore;
domcox@14105 18 @@ -54,4 +53,5 @@
domcox@14105 19
domcox@14105 20 %pure_parser
domcox@14105 21 +%parse-param { WebCore::XPath::Parser* parser }
domcox@14105 22
domcox@14105 23 %union
domcox@14105 24 @@ -72,5 +72,5 @@
domcox@14105 25
domcox@14105 26 static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); }
domcox@14105 27 -static void xpathyyerror(const char*) { }
domcox@14105 28 +static void xpathyyerror(void*, const char*) { }
domcox@14105 29
domcox@14105 30 %}
domcox@14105 31 @@ -119,5 +119,5 @@
domcox@14105 32 OrExpr
domcox@14105 33 {
domcox@14105 34 - PARSER->m_topExpr = $1;
domcox@14105 35 + parser->m_topExpr = $1;
domcox@14105 36 }
domcox@14105 37 ;
domcox@14105 38 @@ -139,5 +139,5 @@
domcox@14105 39 {
domcox@14105 40 $$ = new LocationPath;
domcox@14105 41 - PARSER->registerParseNode($$);
domcox@14105 42 + parser->registerParseNode($$);
domcox@14105 43 }
domcox@14105 44 |
domcox@14105 45 @@ -151,5 +151,5 @@
domcox@14105 46 $$ = $2;
domcox@14105 47 $$->insertFirstStep($1);
domcox@14105 48 - PARSER->unregisterParseNode($1);
domcox@14105 49 + parser->unregisterParseNode($1);
domcox@14105 50 }
domcox@14105 51 ;
domcox@14105 52 @@ -160,6 +160,6 @@
domcox@14105 53 $$ = new LocationPath;
domcox@14105 54 $$->appendStep($1);
domcox@14105 55 - PARSER->unregisterParseNode($1);
domcox@14105 56 - PARSER->registerParseNode($$);
domcox@14105 57 + parser->unregisterParseNode($1);
domcox@14105 58 + parser->registerParseNode($$);
domcox@14105 59 }
domcox@14105 60 |
domcox@14105 61 @@ -167,5 +167,5 @@
domcox@14105 62 {
domcox@14105 63 $$->appendStep($3);
domcox@14105 64 - PARSER->unregisterParseNode($3);
domcox@14105 65 + parser->unregisterParseNode($3);
domcox@14105 66 }
domcox@14105 67 |
domcox@14105 68 @@ -174,6 +174,6 @@
domcox@14105 69 $$->appendStep($2);
domcox@14105 70 $$->appendStep($3);
domcox@14105 71 - PARSER->unregisterParseNode($2);
domcox@14105 72 - PARSER->unregisterParseNode($3);
domcox@14105 73 + parser->unregisterParseNode($2);
domcox@14105 74 + parser->unregisterParseNode($3);
domcox@14105 75 }
domcox@14105 76 ;
domcox@14105 77 @@ -184,9 +184,9 @@
domcox@14105 78 if ($2) {
domcox@14105 79 $$ = new Step(Step::ChildAxis, *$1, *$2);
domcox@14105 80 - PARSER->deletePredicateVector($2);
domcox@14105 81 + parser->deletePredicateVector($2);
domcox@14105 82 } else
domcox@14105 83 $$ = new Step(Step::ChildAxis, *$1);
domcox@14105 84 - PARSER->deleteNodeTest($1);
domcox@14105 85 - PARSER->registerParseNode($$);
domcox@14105 86 + parser->deleteNodeTest($1);
domcox@14105 87 + parser->registerParseNode($$);
domcox@14105 88 }
domcox@14105 89 |
domcox@14105 90 @@ -195,6 +195,6 @@
domcox@14105 91 String localName;
domcox@14105 92 String namespaceURI;
domcox@14105 93 - if (!PARSER->expandQName(*$1, localName, namespaceURI)) {
domcox@14105 94 - PARSER->m_gotNamespaceError = true;
domcox@14105 95 + if (!parser->expandQName(*$1, localName, namespaceURI)) {
domcox@14105 96 + parser->m_gotNamespaceError = true;
domcox@14105 97 YYABORT;
domcox@14105 98 }
domcox@14105 99 @@ -202,9 +202,9 @@
domcox@14105 100 if ($2) {
domcox@14105 101 $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2);
domcox@14105 102 - PARSER->deletePredicateVector($2);
domcox@14105 103 + parser->deletePredicateVector($2);
domcox@14105 104 } else
domcox@14105 105 $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
domcox@14105 106 - PARSER->deleteString($1);
domcox@14105 107 - PARSER->registerParseNode($$);
domcox@14105 108 + parser->deleteString($1);
domcox@14105 109 + parser->registerParseNode($$);
domcox@14105 110 }
domcox@14105 111 |
domcox@14105 112 @@ -213,9 +213,9 @@
domcox@14105 113 if ($3) {
domcox@14105 114 $$ = new Step($1, *$2, *$3);
domcox@14105 115 - PARSER->deletePredicateVector($3);
domcox@14105 116 + parser->deletePredicateVector($3);
domcox@14105 117 } else
domcox@14105 118 $$ = new Step($1, *$2);
domcox@14105 119 - PARSER->deleteNodeTest($2);
domcox@14105 120 - PARSER->registerParseNode($$);
domcox@14105 121 + parser->deleteNodeTest($2);
domcox@14105 122 + parser->registerParseNode($$);
domcox@14105 123 }
domcox@14105 124 |
domcox@14105 125 @@ -224,6 +224,6 @@
domcox@14105 126 String localName;
domcox@14105 127 String namespaceURI;
domcox@14105 128 - if (!PARSER->expandQName(*$2, localName, namespaceURI)) {
domcox@14105 129 - PARSER->m_gotNamespaceError = true;
domcox@14105 130 + if (!parser->expandQName(*$2, localName, namespaceURI)) {
domcox@14105 131 + parser->m_gotNamespaceError = true;
domcox@14105 132 YYABORT;
domcox@14105 133 }
domcox@14105 134 @@ -231,9 +231,9 @@
domcox@14105 135 if ($3) {
domcox@14105 136 $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3);
domcox@14105 137 - PARSER->deletePredicateVector($3);
domcox@14105 138 + parser->deletePredicateVector($3);
domcox@14105 139 } else
domcox@14105 140 $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
domcox@14105 141 - PARSER->deleteString($2);
domcox@14105 142 - PARSER->registerParseNode($$);
domcox@14105 143 + parser->deleteString($2);
domcox@14105 144 + parser->registerParseNode($$);
domcox@14105 145 }
domcox@14105 146 |
domcox@14105 147 @@ -260,6 +260,6 @@
domcox@14105 148 $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest);
domcox@14105 149
domcox@14105 150 - PARSER->deleteString($1);
domcox@14105 151 - PARSER->registerNodeTest($$);
domcox@14105 152 + parser->deleteString($1);
domcox@14105 153 + parser->registerNodeTest($$);
domcox@14105 154 }
domcox@14105 155 |
domcox@14105 156 @@ -267,6 +267,6 @@
domcox@14105 157 {
domcox@14105 158 $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest);
domcox@14105 159 - PARSER->deleteString($1);
domcox@14105 160 - PARSER->registerNodeTest($$);
domcox@14105 161 + parser->deleteString($1);
domcox@14105 162 + parser->registerNodeTest($$);
domcox@14105 163 }
domcox@14105 164 |
domcox@14105 165 @@ -274,7 +274,7 @@
domcox@14105 166 {
domcox@14105 167 $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace());
domcox@14105 168 - PARSER->deleteString($1);
domcox@14105 169 - PARSER->deleteString($3);
domcox@14105 170 - PARSER->registerNodeTest($$);
domcox@14105 171 + parser->deleteString($1);
domcox@14105 172 + parser->deleteString($3);
domcox@14105 173 + parser->registerNodeTest($$);
domcox@14105 174 }
domcox@14105 175 ;
domcox@14105 176 @@ -294,6 +294,6 @@
domcox@14105 177 $$ = new Vector<Predicate*>;
domcox@14105 178 $$->append(new Predicate($1));
domcox@14105 179 - PARSER->unregisterParseNode($1);
domcox@14105 180 - PARSER->registerPredicateVector($$);
domcox@14105 181 + parser->unregisterParseNode($1);
domcox@14105 182 + parser->registerPredicateVector($$);
domcox@14105 183 }
domcox@14105 184 |
domcox@14105 185 @@ -301,5 +301,5 @@
domcox@14105 186 {
domcox@14105 187 $$->append(new Predicate($2));
domcox@14105 188 - PARSER->unregisterParseNode($2);
domcox@14105 189 + parser->unregisterParseNode($2);
domcox@14105 190 }
domcox@14105 191 ;
domcox@14105 192 @@ -316,5 +316,5 @@
domcox@14105 193 {
domcox@14105 194 $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
domcox@14105 195 - PARSER->registerParseNode($$);
domcox@14105 196 + parser->registerParseNode($$);
domcox@14105 197 }
domcox@14105 198 ;
domcox@14105 199 @@ -324,5 +324,5 @@
domcox@14105 200 {
domcox@14105 201 $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
domcox@14105 202 - PARSER->registerParseNode($$);
domcox@14105 203 + parser->registerParseNode($$);
domcox@14105 204 }
domcox@14105 205 |
domcox@14105 206 @@ -330,5 +330,5 @@
domcox@14105 207 {
domcox@14105 208 $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
domcox@14105 209 - PARSER->registerParseNode($$);
domcox@14105 210 + parser->registerParseNode($$);
domcox@14105 211 }
domcox@14105 212 ;
domcox@14105 213 @@ -338,6 +338,6 @@
domcox@14105 214 {
domcox@14105 215 $$ = new VariableReference(*$1);
domcox@14105 216 - PARSER->deleteString($1);
domcox@14105 217 - PARSER->registerParseNode($$);
domcox@14105 218 + parser->deleteString($1);
domcox@14105 219 + parser->registerParseNode($$);
domcox@14105 220 }
domcox@14105 221 |
domcox@14105 222 @@ -350,6 +350,6 @@
domcox@14105 223 {
domcox@14105 224 $$ = new StringExpression(*$1);
domcox@14105 225 - PARSER->deleteString($1);
domcox@14105 226 - PARSER->registerParseNode($$);
domcox@14105 227 + parser->deleteString($1);
domcox@14105 228 + parser->registerParseNode($$);
domcox@14105 229 }
domcox@14105 230 |
domcox@14105 231 @@ -357,6 +357,6 @@
domcox@14105 232 {
domcox@14105 233 $$ = new Number($1->toDouble());
domcox@14105 234 - PARSER->deleteString($1);
domcox@14105 235 - PARSER->registerParseNode($$);
domcox@14105 236 + parser->deleteString($1);
domcox@14105 237 + parser->registerParseNode($$);
domcox@14105 238 }
domcox@14105 239 |
domcox@14105 240 @@ -370,6 +370,6 @@
domcox@14105 241 if (!$$)
domcox@14105 242 YYABORT;
domcox@14105 243 - PARSER->deleteString($1);
domcox@14105 244 - PARSER->registerParseNode($$);
domcox@14105 245 + parser->deleteString($1);
domcox@14105 246 + parser->registerParseNode($$);
domcox@14105 247 }
domcox@14105 248 |
domcox@14105 249 @@ -379,7 +379,7 @@
domcox@14105 250 if (!$$)
domcox@14105 251 YYABORT;
domcox@14105 252 - PARSER->deleteString($1);
domcox@14105 253 - PARSER->deleteExpressionVector($3);
domcox@14105 254 - PARSER->registerParseNode($$);
domcox@14105 255 + parser->deleteString($1);
domcox@14105 256 + parser->deleteExpressionVector($3);
domcox@14105 257 + parser->registerParseNode($$);
domcox@14105 258 }
domcox@14105 259 ;
domcox@14105 260 @@ -390,6 +390,6 @@
domcox@14105 261 $$ = new Vector<Expression*>;
domcox@14105 262 $$->append($1);
domcox@14105 263 - PARSER->unregisterParseNode($1);
domcox@14105 264 - PARSER->registerExpressionVector($$);
domcox@14105 265 + parser->unregisterParseNode($1);
domcox@14105 266 + parser->registerExpressionVector($$);
domcox@14105 267 }
domcox@14105 268 |
domcox@14105 269 @@ -397,5 +397,5 @@
domcox@14105 270 {
domcox@14105 271 $$->append($3);
domcox@14105 272 - PARSER->unregisterParseNode($3);
domcox@14105 273 + parser->unregisterParseNode($3);
domcox@14105 274 }
domcox@14105 275 ;
domcox@14105 276 @@ -413,7 +413,7 @@
domcox@14105 277 $$->addSubExpression($1);
domcox@14105 278 $$->addSubExpression($3);
domcox@14105 279 - PARSER->unregisterParseNode($1);
domcox@14105 280 - PARSER->unregisterParseNode($3);
domcox@14105 281 - PARSER->registerParseNode($$);
domcox@14105 282 + parser->unregisterParseNode($1);
domcox@14105 283 + parser->unregisterParseNode($3);
domcox@14105 284 + parser->registerParseNode($$);
domcox@14105 285 }
domcox@14105 286 ;
domcox@14105 287 @@ -431,7 +431,7 @@
domcox@14105 288 $3->setAbsolute(true);
domcox@14105 289 $$ = new Path(static_cast<Filter*>($1), $3);
domcox@14105 290 - PARSER->unregisterParseNode($1);
domcox@14105 291 - PARSER->unregisterParseNode($3);
domcox@14105 292 - PARSER->registerParseNode($$);
domcox@14105 293 + parser->unregisterParseNode($1);
domcox@14105 294 + parser->unregisterParseNode($3);
domcox@14105 295 + parser->registerParseNode($$);
domcox@14105 296 }
domcox@14105 297 |
domcox@14105 298 @@ -441,8 +441,8 @@
domcox@14105 299 $3->setAbsolute(true);
domcox@14105 300 $$ = new Path(static_cast<Filter*>($1), $3);
domcox@14105 301 - PARSER->unregisterParseNode($1);
domcox@14105 302 - PARSER->unregisterParseNode($2);
domcox@14105 303 - PARSER->unregisterParseNode($3);
domcox@14105 304 - PARSER->registerParseNode($$);
domcox@14105 305 + parser->unregisterParseNode($1);
domcox@14105 306 + parser->unregisterParseNode($2);
domcox@14105 307 + parser->unregisterParseNode($3);
domcox@14105 308 + parser->registerParseNode($$);
domcox@14105 309 }
domcox@14105 310 ;
domcox@14105 311 @@ -454,7 +454,7 @@
domcox@14105 312 {
domcox@14105 313 $$ = new Filter($1, *$2);
domcox@14105 314 - PARSER->unregisterParseNode($1);
domcox@14105 315 - PARSER->deletePredicateVector($2);
domcox@14105 316 - PARSER->registerParseNode($$);
domcox@14105 317 + parser->unregisterParseNode($1);
domcox@14105 318 + parser->deletePredicateVector($2);
domcox@14105 319 + parser->registerParseNode($$);
domcox@14105 320 }
domcox@14105 321 ;
domcox@14105 322 @@ -466,7 +466,7 @@
domcox@14105 323 {
domcox@14105 324 $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3);
domcox@14105 325 - PARSER->unregisterParseNode($1);
domcox@14105 326 - PARSER->unregisterParseNode($3);
domcox@14105 327 - PARSER->registerParseNode($$);
domcox@14105 328 + parser->unregisterParseNode($1);
domcox@14105 329 + parser->unregisterParseNode($3);
domcox@14105 330 + parser->registerParseNode($$);
domcox@14105 331 }
domcox@14105 332 ;
domcox@14105 333 @@ -478,7 +478,7 @@
domcox@14105 334 {
domcox@14105 335 $$ = new LogicalOp(LogicalOp::OP_And, $1, $3);
domcox@14105 336 - PARSER->unregisterParseNode($1);
domcox@14105 337 - PARSER->unregisterParseNode($3);
domcox@14105 338 - PARSER->registerParseNode($$);
domcox@14105 339 + parser->unregisterParseNode($1);
domcox@14105 340 + parser->unregisterParseNode($3);
domcox@14105 341 + parser->registerParseNode($$);
domcox@14105 342 }
domcox@14105 343 ;
domcox@14105 344 @@ -490,7 +490,7 @@
domcox@14105 345 {
domcox@14105 346 $$ = new EqTestOp($2, $1, $3);
domcox@14105 347 - PARSER->unregisterParseNode($1);
domcox@14105 348 - PARSER->unregisterParseNode($3);
domcox@14105 349 - PARSER->registerParseNode($$);
domcox@14105 350 + parser->unregisterParseNode($1);
domcox@14105 351 + parser->unregisterParseNode($3);
domcox@14105 352 + parser->registerParseNode($$);
domcox@14105 353 }
domcox@14105 354 ;
domcox@14105 355 @@ -502,7 +502,7 @@
domcox@14105 356 {
domcox@14105 357 $$ = new EqTestOp($2, $1, $3);
domcox@14105 358 - PARSER->unregisterParseNode($1);
domcox@14105 359 - PARSER->unregisterParseNode($3);
domcox@14105 360 - PARSER->registerParseNode($$);
domcox@14105 361 + parser->unregisterParseNode($1);
domcox@14105 362 + parser->unregisterParseNode($3);
domcox@14105 363 + parser->registerParseNode($$);
domcox@14105 364 }
domcox@14105 365 ;
domcox@14105 366 @@ -514,7 +514,7 @@
domcox@14105 367 {
domcox@14105 368 $$ = new NumericOp(NumericOp::OP_Add, $1, $3);
domcox@14105 369 - PARSER->unregisterParseNode($1);
domcox@14105 370 - PARSER->unregisterParseNode($3);
domcox@14105 371 - PARSER->registerParseNode($$);
domcox@14105 372 + parser->unregisterParseNode($1);
domcox@14105 373 + parser->unregisterParseNode($3);
domcox@14105 374 + parser->registerParseNode($$);
domcox@14105 375 }
domcox@14105 376 |
domcox@14105 377 @@ -522,7 +522,7 @@
domcox@14105 378 {
domcox@14105 379 $$ = new NumericOp(NumericOp::OP_Sub, $1, $3);
domcox@14105 380 - PARSER->unregisterParseNode($1);
domcox@14105 381 - PARSER->unregisterParseNode($3);
domcox@14105 382 - PARSER->registerParseNode($$);
domcox@14105 383 + parser->unregisterParseNode($1);
domcox@14105 384 + parser->unregisterParseNode($3);
domcox@14105 385 + parser->registerParseNode($$);
domcox@14105 386 }
domcox@14105 387 ;
domcox@14105 388 @@ -534,7 +534,7 @@
domcox@14105 389 {
domcox@14105 390 $$ = new NumericOp($2, $1, $3);
domcox@14105 391 - PARSER->unregisterParseNode($1);
domcox@14105 392 - PARSER->unregisterParseNode($3);
domcox@14105 393 - PARSER->registerParseNode($$);
domcox@14105 394 + parser->unregisterParseNode($1);
domcox@14105 395 + parser->unregisterParseNode($3);
domcox@14105 396 + parser->registerParseNode($$);
domcox@14105 397 }
domcox@14105 398 ;
domcox@14105 399 @@ -547,6 +547,6 @@
domcox@14105 400 $$ = new Negative;
domcox@14105 401 $$->addSubExpression($2);
domcox@14105 402 - PARSER->unregisterParseNode($2);
domcox@14105 403 - PARSER->registerParseNode($$);
domcox@14105 404 + parser->unregisterParseNode($2);
domcox@14105 405 + parser->registerParseNode($$);
domcox@14105 406 }
domcox@14105 407 ;