wok-next diff libwebkit/stuff/WebCore_xml_XPathGrammar.y_124099.diff @ rev 18497
libfm: define tar.xz for xarchiver
author | Xander Ziiryanoff <psychomaniak@xakep.ru> |
---|---|
date | Sun Oct 11 13:59:02 2015 +0200 (2015-10-11) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/libwebkit/stuff/WebCore_xml_XPathGrammar.y_124099.diff Sun Oct 11 13:59:02 2015 +0200 1.3 @@ -0,0 +1,407 @@ 1.4 +Index: trunk/Source/WebCore/xml/XPathGrammar.y 1.5 +=================================================================== 1.6 +--- trunk/Source/WebCore/xml/XPathGrammar.y (revision 97771) 1.7 ++++ trunk/Source/WebCore/xml/XPathGrammar.y (revision 124099) 1.8 +@@ -35,4 +35,5 @@ 1.9 + #include "XPathPath.h" 1.10 + #include "XPathPredicate.h" 1.11 ++#include "XPathStep.h" 1.12 + #include "XPathVariableReference.h" 1.13 + #include <wtf/FastMalloc.h> 1.14 +@@ -45,6 +46,4 @@ 1.15 + #define YYDEBUG 0 1.16 + #define YYMAXDEPTH 10000 1.17 +-#define YYPARSE_PARAM parserParameter 1.18 +-#define PARSER static_cast<Parser*>(parserParameter) 1.19 + 1.20 + using namespace WebCore; 1.21 +@@ -54,4 +53,5 @@ 1.22 + 1.23 + %pure_parser 1.24 ++%parse-param { WebCore::XPath::Parser* parser } 1.25 + 1.26 + %union 1.27 +@@ -72,5 +72,5 @@ 1.28 + 1.29 + static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); } 1.30 +-static void xpathyyerror(const char*) { } 1.31 ++static void xpathyyerror(void*, const char*) { } 1.32 + 1.33 + %} 1.34 +@@ -119,5 +119,5 @@ 1.35 + OrExpr 1.36 + { 1.37 +- PARSER->m_topExpr = $1; 1.38 ++ parser->m_topExpr = $1; 1.39 + } 1.40 + ; 1.41 +@@ -139,5 +139,5 @@ 1.42 + { 1.43 + $$ = new LocationPath; 1.44 +- PARSER->registerParseNode($$); 1.45 ++ parser->registerParseNode($$); 1.46 + } 1.47 + | 1.48 +@@ -151,5 +151,5 @@ 1.49 + $$ = $2; 1.50 + $$->insertFirstStep($1); 1.51 +- PARSER->unregisterParseNode($1); 1.52 ++ parser->unregisterParseNode($1); 1.53 + } 1.54 + ; 1.55 +@@ -160,6 +160,6 @@ 1.56 + $$ = new LocationPath; 1.57 + $$->appendStep($1); 1.58 +- PARSER->unregisterParseNode($1); 1.59 +- PARSER->registerParseNode($$); 1.60 ++ parser->unregisterParseNode($1); 1.61 ++ parser->registerParseNode($$); 1.62 + } 1.63 + | 1.64 +@@ -167,5 +167,5 @@ 1.65 + { 1.66 + $$->appendStep($3); 1.67 +- PARSER->unregisterParseNode($3); 1.68 ++ parser->unregisterParseNode($3); 1.69 + } 1.70 + | 1.71 +@@ -174,6 +174,6 @@ 1.72 + $$->appendStep($2); 1.73 + $$->appendStep($3); 1.74 +- PARSER->unregisterParseNode($2); 1.75 +- PARSER->unregisterParseNode($3); 1.76 ++ parser->unregisterParseNode($2); 1.77 ++ parser->unregisterParseNode($3); 1.78 + } 1.79 + ; 1.80 +@@ -184,9 +184,9 @@ 1.81 + if ($2) { 1.82 + $$ = new Step(Step::ChildAxis, *$1, *$2); 1.83 +- PARSER->deletePredicateVector($2); 1.84 ++ parser->deletePredicateVector($2); 1.85 + } else 1.86 + $$ = new Step(Step::ChildAxis, *$1); 1.87 +- PARSER->deleteNodeTest($1); 1.88 +- PARSER->registerParseNode($$); 1.89 ++ parser->deleteNodeTest($1); 1.90 ++ parser->registerParseNode($$); 1.91 + } 1.92 + | 1.93 +@@ -195,6 +195,6 @@ 1.94 + String localName; 1.95 + String namespaceURI; 1.96 +- if (!PARSER->expandQName(*$1, localName, namespaceURI)) { 1.97 +- PARSER->m_gotNamespaceError = true; 1.98 ++ if (!parser->expandQName(*$1, localName, namespaceURI)) { 1.99 ++ parser->m_gotNamespaceError = true; 1.100 + YYABORT; 1.101 + } 1.102 +@@ -202,9 +202,9 @@ 1.103 + if ($2) { 1.104 + $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2); 1.105 +- PARSER->deletePredicateVector($2); 1.106 ++ parser->deletePredicateVector($2); 1.107 + } else 1.108 + $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); 1.109 +- PARSER->deleteString($1); 1.110 +- PARSER->registerParseNode($$); 1.111 ++ parser->deleteString($1); 1.112 ++ parser->registerParseNode($$); 1.113 + } 1.114 + | 1.115 +@@ -213,9 +213,9 @@ 1.116 + if ($3) { 1.117 + $$ = new Step($1, *$2, *$3); 1.118 +- PARSER->deletePredicateVector($3); 1.119 ++ parser->deletePredicateVector($3); 1.120 + } else 1.121 + $$ = new Step($1, *$2); 1.122 +- PARSER->deleteNodeTest($2); 1.123 +- PARSER->registerParseNode($$); 1.124 ++ parser->deleteNodeTest($2); 1.125 ++ parser->registerParseNode($$); 1.126 + } 1.127 + | 1.128 +@@ -224,6 +224,6 @@ 1.129 + String localName; 1.130 + String namespaceURI; 1.131 +- if (!PARSER->expandQName(*$2, localName, namespaceURI)) { 1.132 +- PARSER->m_gotNamespaceError = true; 1.133 ++ if (!parser->expandQName(*$2, localName, namespaceURI)) { 1.134 ++ parser->m_gotNamespaceError = true; 1.135 + YYABORT; 1.136 + } 1.137 +@@ -231,9 +231,9 @@ 1.138 + if ($3) { 1.139 + $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3); 1.140 +- PARSER->deletePredicateVector($3); 1.141 ++ parser->deletePredicateVector($3); 1.142 + } else 1.143 + $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); 1.144 +- PARSER->deleteString($2); 1.145 +- PARSER->registerParseNode($$); 1.146 ++ parser->deleteString($2); 1.147 ++ parser->registerParseNode($$); 1.148 + } 1.149 + | 1.150 +@@ -260,6 +260,6 @@ 1.151 + $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest); 1.152 + 1.153 +- PARSER->deleteString($1); 1.154 +- PARSER->registerNodeTest($$); 1.155 ++ parser->deleteString($1); 1.156 ++ parser->registerNodeTest($$); 1.157 + } 1.158 + | 1.159 +@@ -267,6 +267,6 @@ 1.160 + { 1.161 + $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest); 1.162 +- PARSER->deleteString($1); 1.163 +- PARSER->registerNodeTest($$); 1.164 ++ parser->deleteString($1); 1.165 ++ parser->registerNodeTest($$); 1.166 + } 1.167 + | 1.168 +@@ -274,7 +274,7 @@ 1.169 + { 1.170 + $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace()); 1.171 +- PARSER->deleteString($1); 1.172 +- PARSER->deleteString($3); 1.173 +- PARSER->registerNodeTest($$); 1.174 ++ parser->deleteString($1); 1.175 ++ parser->deleteString($3); 1.176 ++ parser->registerNodeTest($$); 1.177 + } 1.178 + ; 1.179 +@@ -294,6 +294,6 @@ 1.180 + $$ = new Vector<Predicate*>; 1.181 + $$->append(new Predicate($1)); 1.182 +- PARSER->unregisterParseNode($1); 1.183 +- PARSER->registerPredicateVector($$); 1.184 ++ parser->unregisterParseNode($1); 1.185 ++ parser->registerPredicateVector($$); 1.186 + } 1.187 + | 1.188 +@@ -301,5 +301,5 @@ 1.189 + { 1.190 + $$->append(new Predicate($2)); 1.191 +- PARSER->unregisterParseNode($2); 1.192 ++ parser->unregisterParseNode($2); 1.193 + } 1.194 + ; 1.195 +@@ -316,5 +316,5 @@ 1.196 + { 1.197 + $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 1.198 +- PARSER->registerParseNode($$); 1.199 ++ parser->registerParseNode($$); 1.200 + } 1.201 + ; 1.202 +@@ -324,5 +324,5 @@ 1.203 + { 1.204 + $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 1.205 +- PARSER->registerParseNode($$); 1.206 ++ parser->registerParseNode($$); 1.207 + } 1.208 + | 1.209 +@@ -330,5 +330,5 @@ 1.210 + { 1.211 + $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 1.212 +- PARSER->registerParseNode($$); 1.213 ++ parser->registerParseNode($$); 1.214 + } 1.215 + ; 1.216 +@@ -338,6 +338,6 @@ 1.217 + { 1.218 + $$ = new VariableReference(*$1); 1.219 +- PARSER->deleteString($1); 1.220 +- PARSER->registerParseNode($$); 1.221 ++ parser->deleteString($1); 1.222 ++ parser->registerParseNode($$); 1.223 + } 1.224 + | 1.225 +@@ -350,6 +350,6 @@ 1.226 + { 1.227 + $$ = new StringExpression(*$1); 1.228 +- PARSER->deleteString($1); 1.229 +- PARSER->registerParseNode($$); 1.230 ++ parser->deleteString($1); 1.231 ++ parser->registerParseNode($$); 1.232 + } 1.233 + | 1.234 +@@ -357,6 +357,6 @@ 1.235 + { 1.236 + $$ = new Number($1->toDouble()); 1.237 +- PARSER->deleteString($1); 1.238 +- PARSER->registerParseNode($$); 1.239 ++ parser->deleteString($1); 1.240 ++ parser->registerParseNode($$); 1.241 + } 1.242 + | 1.243 +@@ -370,6 +370,6 @@ 1.244 + if (!$$) 1.245 + YYABORT; 1.246 +- PARSER->deleteString($1); 1.247 +- PARSER->registerParseNode($$); 1.248 ++ parser->deleteString($1); 1.249 ++ parser->registerParseNode($$); 1.250 + } 1.251 + | 1.252 +@@ -379,7 +379,7 @@ 1.253 + if (!$$) 1.254 + YYABORT; 1.255 +- PARSER->deleteString($1); 1.256 +- PARSER->deleteExpressionVector($3); 1.257 +- PARSER->registerParseNode($$); 1.258 ++ parser->deleteString($1); 1.259 ++ parser->deleteExpressionVector($3); 1.260 ++ parser->registerParseNode($$); 1.261 + } 1.262 + ; 1.263 +@@ -390,6 +390,6 @@ 1.264 + $$ = new Vector<Expression*>; 1.265 + $$->append($1); 1.266 +- PARSER->unregisterParseNode($1); 1.267 +- PARSER->registerExpressionVector($$); 1.268 ++ parser->unregisterParseNode($1); 1.269 ++ parser->registerExpressionVector($$); 1.270 + } 1.271 + | 1.272 +@@ -397,5 +397,5 @@ 1.273 + { 1.274 + $$->append($3); 1.275 +- PARSER->unregisterParseNode($3); 1.276 ++ parser->unregisterParseNode($3); 1.277 + } 1.278 + ; 1.279 +@@ -413,7 +413,7 @@ 1.280 + $$->addSubExpression($1); 1.281 + $$->addSubExpression($3); 1.282 +- PARSER->unregisterParseNode($1); 1.283 +- PARSER->unregisterParseNode($3); 1.284 +- PARSER->registerParseNode($$); 1.285 ++ parser->unregisterParseNode($1); 1.286 ++ parser->unregisterParseNode($3); 1.287 ++ parser->registerParseNode($$); 1.288 + } 1.289 + ; 1.290 +@@ -431,7 +431,7 @@ 1.291 + $3->setAbsolute(true); 1.292 + $$ = new Path(static_cast<Filter*>($1), $3); 1.293 +- PARSER->unregisterParseNode($1); 1.294 +- PARSER->unregisterParseNode($3); 1.295 +- PARSER->registerParseNode($$); 1.296 ++ parser->unregisterParseNode($1); 1.297 ++ parser->unregisterParseNode($3); 1.298 ++ parser->registerParseNode($$); 1.299 + } 1.300 + | 1.301 +@@ -441,8 +441,8 @@ 1.302 + $3->setAbsolute(true); 1.303 + $$ = new Path(static_cast<Filter*>($1), $3); 1.304 +- PARSER->unregisterParseNode($1); 1.305 +- PARSER->unregisterParseNode($2); 1.306 +- PARSER->unregisterParseNode($3); 1.307 +- PARSER->registerParseNode($$); 1.308 ++ parser->unregisterParseNode($1); 1.309 ++ parser->unregisterParseNode($2); 1.310 ++ parser->unregisterParseNode($3); 1.311 ++ parser->registerParseNode($$); 1.312 + } 1.313 + ; 1.314 +@@ -454,7 +454,7 @@ 1.315 + { 1.316 + $$ = new Filter($1, *$2); 1.317 +- PARSER->unregisterParseNode($1); 1.318 +- PARSER->deletePredicateVector($2); 1.319 +- PARSER->registerParseNode($$); 1.320 ++ parser->unregisterParseNode($1); 1.321 ++ parser->deletePredicateVector($2); 1.322 ++ parser->registerParseNode($$); 1.323 + } 1.324 + ; 1.325 +@@ -466,7 +466,7 @@ 1.326 + { 1.327 + $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3); 1.328 +- PARSER->unregisterParseNode($1); 1.329 +- PARSER->unregisterParseNode($3); 1.330 +- PARSER->registerParseNode($$); 1.331 ++ parser->unregisterParseNode($1); 1.332 ++ parser->unregisterParseNode($3); 1.333 ++ parser->registerParseNode($$); 1.334 + } 1.335 + ; 1.336 +@@ -478,7 +478,7 @@ 1.337 + { 1.338 + $$ = new LogicalOp(LogicalOp::OP_And, $1, $3); 1.339 +- PARSER->unregisterParseNode($1); 1.340 +- PARSER->unregisterParseNode($3); 1.341 +- PARSER->registerParseNode($$); 1.342 ++ parser->unregisterParseNode($1); 1.343 ++ parser->unregisterParseNode($3); 1.344 ++ parser->registerParseNode($$); 1.345 + } 1.346 + ; 1.347 +@@ -490,7 +490,7 @@ 1.348 + { 1.349 + $$ = new EqTestOp($2, $1, $3); 1.350 +- PARSER->unregisterParseNode($1); 1.351 +- PARSER->unregisterParseNode($3); 1.352 +- PARSER->registerParseNode($$); 1.353 ++ parser->unregisterParseNode($1); 1.354 ++ parser->unregisterParseNode($3); 1.355 ++ parser->registerParseNode($$); 1.356 + } 1.357 + ; 1.358 +@@ -502,7 +502,7 @@ 1.359 + { 1.360 + $$ = new EqTestOp($2, $1, $3); 1.361 +- PARSER->unregisterParseNode($1); 1.362 +- PARSER->unregisterParseNode($3); 1.363 +- PARSER->registerParseNode($$); 1.364 ++ parser->unregisterParseNode($1); 1.365 ++ parser->unregisterParseNode($3); 1.366 ++ parser->registerParseNode($$); 1.367 + } 1.368 + ; 1.369 +@@ -514,7 +514,7 @@ 1.370 + { 1.371 + $$ = new NumericOp(NumericOp::OP_Add, $1, $3); 1.372 +- PARSER->unregisterParseNode($1); 1.373 +- PARSER->unregisterParseNode($3); 1.374 +- PARSER->registerParseNode($$); 1.375 ++ parser->unregisterParseNode($1); 1.376 ++ parser->unregisterParseNode($3); 1.377 ++ parser->registerParseNode($$); 1.378 + } 1.379 + | 1.380 +@@ -522,7 +522,7 @@ 1.381 + { 1.382 + $$ = new NumericOp(NumericOp::OP_Sub, $1, $3); 1.383 +- PARSER->unregisterParseNode($1); 1.384 +- PARSER->unregisterParseNode($3); 1.385 +- PARSER->registerParseNode($$); 1.386 ++ parser->unregisterParseNode($1); 1.387 ++ parser->unregisterParseNode($3); 1.388 ++ parser->registerParseNode($$); 1.389 + } 1.390 + ; 1.391 +@@ -534,7 +534,7 @@ 1.392 + { 1.393 + $$ = new NumericOp($2, $1, $3); 1.394 +- PARSER->unregisterParseNode($1); 1.395 +- PARSER->unregisterParseNode($3); 1.396 +- PARSER->registerParseNode($$); 1.397 ++ parser->unregisterParseNode($1); 1.398 ++ parser->unregisterParseNode($3); 1.399 ++ parser->registerParseNode($$); 1.400 + } 1.401 + ; 1.402 +@@ -547,6 +547,6 @@ 1.403 + $$ = new Negative; 1.404 + $$->addSubExpression($2); 1.405 +- PARSER->unregisterParseNode($2); 1.406 +- PARSER->registerParseNode($$); 1.407 ++ parser->unregisterParseNode($2); 1.408 ++ parser->registerParseNode($$); 1.409 + } 1.410 + ;