wok annotate libwebkit-video/stuff/WebCore_xml_XPathGrammar.y_124099.diff @ rev 19159

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