Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Mike Gilbert (floppym)" <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/chromium/files: chromium-bison-2.6-r0.patch
Date: Wed, 01 Aug 2012 00:43:43
Message-Id: 20120801004329.2DD742004C@flycatcher.gentoo.org
1 floppym 12/08/01 00:43:29
2
3 Added: chromium-bison-2.6-r0.patch
4 Log:
5 Fix build with bison-2.6, bug 427438 by Mark Nowiasz.
6
7 (Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 www-client/chromium/files/chromium-bison-2.6-r0.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-bison-2.6-r0.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-bison-2.6-r0.patch?rev=1.1&content-type=text/plain
14
15 Index: chromium-bison-2.6-r0.patch
16 ===================================================================
17 Build fix with newer bison 2.6.
18 http://trac.webkit.org/changeset/124099
19 https://bugs.gentoo.org/show_bug.cgi?id=427438
20 --- third_party/WebKit/Source/WebCore/css/CSSParser.cpp
21 +++ third_party/WebKit/Source/WebCore/css/CSSParser.cpp
22 @@ -114,7 +114,7 @@
23 extern int cssyydebug;
24 #endif
25
26 -extern int cssyyparse(void* parser);
27 +extern int cssyyparse(WebCore::CSSParser*);
28
29 using namespace std;
30 using namespace WTF;
31 --- third_party/WebKit/Source/WebCore/css/CSSGrammar.y
32 +++ third_party/WebKit/Source/WebCore/css/CSSGrammar.y
33 @@ -53,14 +53,13 @@
34 #define YYMAXDEPTH 10000
35 #define YYDEBUG 0
36
37 -// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x
38 -#define YYPARSE_PARAM parser
39 -#define YYLEX_PARAM parser
40 -
41 %}
42
43 %pure_parser
44
45 +%parse-param { CSSParser* parser }
46 +%lex-param { CSSParser* parser }
47 +
48 %union {
49 bool boolean;
50 char character;
51 @@ -89,7 +88,7 @@
52
53 %{
54
55 -static inline int cssyyerror(const char*)
56 +static inline int cssyyerror(void*, const char*)
57 {
58 return 1;
59 }
60 --- third_party/WebKit/Source/WebCore/xml/XPathParser.cpp
61 +++ third_party/WebKit/Source/WebCore/xml/XPathParser.cpp
62 @@ -32,24 +32,21 @@
63 #include "XPathEvaluator.h"
64 #include "XPathException.h"
65 #include "XPathNSResolver.h"
66 +#include "XPathPath.h"
67 #include "XPathStep.h"
68 #include <wtf/StdLibExtras.h>
69 #include <wtf/text/StringHash.h>
70
71 -int xpathyyparse(void*);
72 -
73 +using namespace WebCore;
74 using namespace WTF;
75 using namespace Unicode;
76 +using namespace XPath;
77
78 -namespace WebCore {
79 -namespace XPath {
80 +extern int xpathyyparse(WebCore::XPath::Parser*);
81 +#include "XPathGrammar.h"
82
83 -class LocationPath;
84 +Parser* Parser::currentParser = 0;
85
86 -#include "XPathGrammar.h"
87 -
88 -Parser* Parser::currentParser = 0;
89 -
90 enum XMLCat { NameStart, NameCont, NotPartOfName };
91
92 typedef HashMap<String, Step::Axis> AxisNamesMap;
93 @@ -630,5 +627,3 @@
94 delete t;
95 }
96
97 -}
98 -}
99 --- third_party/WebKit/Source/WebCore/xml/XPathGrammar.y
100 +++ third_party/WebKit/Source/WebCore/xml/XPathGrammar.y
101 @@ -34,6 +34,7 @@
102 #include "XPathParser.h"
103 #include "XPathPath.h"
104 #include "XPathPredicate.h"
105 +#include "XPathStep.h"
106 #include "XPathVariableReference.h"
107 #include <wtf/FastMalloc.h>
108
109 @@ -44,8 +45,6 @@
110 #define YYLTYPE_IS_TRIVIAL 1
111 #define YYDEBUG 0
112 #define YYMAXDEPTH 10000
113 -#define YYPARSE_PARAM parserParameter
114 -#define PARSER static_cast<Parser*>(parserParameter)
115
116 using namespace WebCore;
117 using namespace XPath;
118 @@ -53,6 +52,7 @@
119 %}
120
121 %pure_parser
122 +%parse-param { WebCore::XPath::Parser* parser }
123
124 %union
125 {
126 @@ -71,7 +71,7 @@
127 %{
128
129 static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); }
130 -static void xpathyyerror(const char*) { }
131 +static void xpathyyerror(void*, const char*) { }
132
133 %}
134
135 @@ -118,7 +118,7 @@
136 Expr:
137 OrExpr
138 {
139 - PARSER->m_topExpr = $1;
140 + parser->m_topExpr = $1;
141 }
142 ;
143
144 @@ -138,7 +138,7 @@
145 '/'
146 {
147 $$ = new LocationPath;
148 - PARSER->registerParseNode($$);
149 + parser->registerParseNode($$);
150 }
151 |
152 '/' RelativeLocationPath
153 @@ -150,7 +150,7 @@
154 {
155 $$ = $2;
156 $$->insertFirstStep($1);
157 - PARSER->unregisterParseNode($1);
158 + parser->unregisterParseNode($1);
159 }
160 ;
161
162 @@ -159,22 +159,22 @@
163 {
164 $$ = new LocationPath;
165 $$->appendStep($1);
166 - PARSER->unregisterParseNode($1);
167 - PARSER->registerParseNode($$);
168 + parser->unregisterParseNode($1);
169 + parser->registerParseNode($$);
170 }
171 |
172 RelativeLocationPath '/' Step
173 {
174 $$->appendStep($3);
175 - PARSER->unregisterParseNode($3);
176 + parser->unregisterParseNode($3);
177 }
178 |
179 RelativeLocationPath DescendantOrSelf Step
180 {
181 $$->appendStep($2);
182 $$->appendStep($3);
183 - PARSER->unregisterParseNode($2);
184 - PARSER->unregisterParseNode($3);
185 + parser->unregisterParseNode($2);
186 + parser->unregisterParseNode($3);
187 }
188 ;
189
190 @@ -183,58 +183,58 @@
191 {
192 if ($2) {
193 $$ = new Step(Step::ChildAxis, *$1, *$2);
194 - PARSER->deletePredicateVector($2);
195 + parser->deletePredicateVector($2);
196 } else
197 $$ = new Step(Step::ChildAxis, *$1);
198 - PARSER->deleteNodeTest($1);
199 - PARSER->registerParseNode($$);
200 + parser->deleteNodeTest($1);
201 + parser->registerParseNode($$);
202 }
203 |
204 NAMETEST OptionalPredicateList
205 {
206 String localName;
207 String namespaceURI;
208 - if (!PARSER->expandQName(*$1, localName, namespaceURI)) {
209 - PARSER->m_gotNamespaceError = true;
210 + if (!parser->expandQName(*$1, localName, namespaceURI)) {
211 + parser->m_gotNamespaceError = true;
212 YYABORT;
213 }
214
215 if ($2) {
216 $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2);
217 - PARSER->deletePredicateVector($2);
218 + parser->deletePredicateVector($2);
219 } else
220 $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
221 - PARSER->deleteString($1);
222 - PARSER->registerParseNode($$);
223 + parser->deleteString($1);
224 + parser->registerParseNode($$);
225 }
226 |
227 AxisSpecifier NodeTest OptionalPredicateList
228 {
229 if ($3) {
230 $$ = new Step($1, *$2, *$3);
231 - PARSER->deletePredicateVector($3);
232 + parser->deletePredicateVector($3);
233 } else
234 $$ = new Step($1, *$2);
235 - PARSER->deleteNodeTest($2);
236 - PARSER->registerParseNode($$);
237 + parser->deleteNodeTest($2);
238 + parser->registerParseNode($$);
239 }
240 |
241 AxisSpecifier NAMETEST OptionalPredicateList
242 {
243 String localName;
244 String namespaceURI;
245 - if (!PARSER->expandQName(*$2, localName, namespaceURI)) {
246 - PARSER->m_gotNamespaceError = true;
247 + if (!parser->expandQName(*$2, localName, namespaceURI)) {
248 + parser->m_gotNamespaceError = true;
249 YYABORT;
250 }
251
252 if ($3) {
253 $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3);
254 - PARSER->deletePredicateVector($3);
255 + parser->deletePredicateVector($3);
256 } else
257 $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
258 - PARSER->deleteString($2);
259 - PARSER->registerParseNode($$);
260 + parser->deleteString($2);
261 + parser->registerParseNode($$);
262 }
263 |
264 AbbreviatedStep
265 @@ -259,23 +259,23 @@
266 else if (*$1 == "comment")
267 $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest);
268
269 - PARSER->deleteString($1);
270 - PARSER->registerNodeTest($$);
271 + parser->deleteString($1);
272 + parser->registerNodeTest($$);
273 }
274 |
275 PI '(' ')'
276 {
277 $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest);
278 - PARSER->deleteString($1);
279 - PARSER->registerNodeTest($$);
280 + parser->deleteString($1);
281 + parser->registerNodeTest($$);
282 }
283 |
284 PI '(' LITERAL ')'
285 {
286 $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace());
287 - PARSER->deleteString($1);
288 - PARSER->deleteString($3);
289 - PARSER->registerNodeTest($$);
290 + parser->deleteString($1);
291 + parser->deleteString($3);
292 + parser->registerNodeTest($$);
293 }
294 ;
295
296 @@ -293,14 +293,14 @@
297 {
298 $$ = new Vector<Predicate*>;
299 $$->append(new Predicate($1));
300 - PARSER->unregisterParseNode($1);
301 - PARSER->registerPredicateVector($$);
302 + parser->unregisterParseNode($1);
303 + parser->registerPredicateVector($$);
304 }
305 |
306 PredicateList Predicate
307 {
308 $$->append(new Predicate($2));
309 - PARSER->unregisterParseNode($2);
310 + parser->unregisterParseNode($2);
311 }
312 ;
313
314 @@ -315,7 +315,7 @@
315 SLASHSLASH
316 {
317 $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
318 - PARSER->registerParseNode($$);
319 + parser->registerParseNode($$);
320 }
321 ;
322
323 @@ -323,13 +323,13 @@
324 '.'
325 {
326 $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
327 - PARSER->registerParseNode($$);
328 + parser->registerParseNode($$);
329 }
330 |
331 DOTDOT
332 {
333 $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
334 - PARSER->registerParseNode($$);
335 + parser->registerParseNode($$);
336 }
337 ;
338
339 @@ -337,8 +337,8 @@
340 VARIABLEREFERENCE
341 {
342 $$ = new VariableReference(*$1);
343 - PARSER->deleteString($1);
344 - PARSER->registerParseNode($$);
345 + parser->deleteString($1);
346 + parser->registerParseNode($$);
347 }
348 |
349 '(' Expr ')'
350 @@ -349,15 +349,15 @@
351 LITERAL
352 {
353 $$ = new StringExpression(*$1);
354 - PARSER->deleteString($1);
355 - PARSER->registerParseNode($$);
356 + parser->deleteString($1);
357 + parser->registerParseNode($$);
358 }
359 |
360 NUMBER
361 {
362 $$ = new Number($1->toDouble());
363 - PARSER->deleteString($1);
364 - PARSER->registerParseNode($$);
365 + parser->deleteString($1);
366 + parser->registerParseNode($$);
367 }
368 |
369 FunctionCall
370 @@ -369,8 +369,8 @@
371 $$ = createFunction(*$1);
372 if (!$$)
373 YYABORT;
374 - PARSER->deleteString($1);
375 - PARSER->registerParseNode($$);
376 + parser->deleteString($1);
377 + parser->registerParseNode($$);
378 }
379 |
380 FUNCTIONNAME '(' ArgumentList ')'
381 @@ -378,9 +378,9 @@
382 $$ = createFunction(*$1, *$3);
383 if (!$$)
384 YYABORT;
385 - PARSER->deleteString($1);
386 - PARSER->deleteExpressionVector($3);
387 - PARSER->registerParseNode($$);
388 + parser->deleteString($1);
389 + parser->deleteExpressionVector($3);
390 + parser->registerParseNode($$);
391 }
392 ;
393
394 @@ -389,14 +389,14 @@
395 {
396 $$ = new Vector<Expression*>;
397 $$->append($1);
398 - PARSER->unregisterParseNode($1);
399 - PARSER->registerExpressionVector($$);
400 + parser->unregisterParseNode($1);
401 + parser->registerExpressionVector($$);
402 }
403 |
404 ArgumentList ',' Argument
405 {
406 $$->append($3);
407 - PARSER->unregisterParseNode($3);
408 + parser->unregisterParseNode($3);
409 }
410 ;
411
412 @@ -412,9 +412,9 @@
413 $$ = new Union;
414 $$->addSubExpression($1);
415 $$->addSubExpression($3);
416 - PARSER->unregisterParseNode($1);
417 - PARSER->unregisterParseNode($3);
418 - PARSER->registerParseNode($$);
419 + parser->unregisterParseNode($1);
420 + parser->unregisterParseNode($3);
421 + parser->registerParseNode($$);
422 }
423 ;
424
425 @@ -430,9 +430,9 @@
426 {
427 $3->setAbsolute(true);
428 $$ = new Path(static_cast<Filter*>($1), $3);
429 - PARSER->unregisterParseNode($1);
430 - PARSER->unregisterParseNode($3);
431 - PARSER->registerParseNode($$);
432 + parser->unregisterParseNode($1);
433 + parser->unregisterParseNode($3);
434 + parser->registerParseNode($$);
435 }
436 |
437 FilterExpr DescendantOrSelf RelativeLocationPath
438 @@ -440,10 +440,10 @@
439 $3->insertFirstStep($2);
440 $3->setAbsolute(true);
441 $$ = new Path(static_cast<Filter*>($1), $3);
442 - PARSER->unregisterParseNode($1);
443 - PARSER->unregisterParseNode($2);
444 - PARSER->unregisterParseNode($3);
445 - PARSER->registerParseNode($$);
446 + parser->unregisterParseNode($1);
447 + parser->unregisterParseNode($2);
448 + parser->unregisterParseNode($3);
449 + parser->registerParseNode($$);
450 }
451 ;
452
453 @@ -453,9 +453,9 @@
454 PrimaryExpr PredicateList
455 {
456 $$ = new Filter($1, *$2);
457 - PARSER->unregisterParseNode($1);
458 - PARSER->deletePredicateVector($2);
459 - PARSER->registerParseNode($$);
460 + parser->unregisterParseNode($1);
461 + parser->deletePredicateVector($2);
462 + parser->registerParseNode($$);
463 }
464 ;
465
466 @@ -465,9 +465,9 @@
467 OrExpr OR AndExpr
468 {
469 $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3);
470 - PARSER->unregisterParseNode($1);
471 - PARSER->unregisterParseNode($3);
472 - PARSER->registerParseNode($$);
473 + parser->unregisterParseNode($1);
474 + parser->unregisterParseNode($3);
475 + parser->registerParseNode($$);
476 }
477 ;
478
479 @@ -477,9 +477,9 @@
480 AndExpr AND EqualityExpr
481 {
482 $$ = new LogicalOp(LogicalOp::OP_And, $1, $3);
483 - PARSER->unregisterParseNode($1);
484 - PARSER->unregisterParseNode($3);
485 - PARSER->registerParseNode($$);
486 + parser->unregisterParseNode($1);
487 + parser->unregisterParseNode($3);
488 + parser->registerParseNode($$);
489 }
490 ;
491
492 @@ -489,9 +489,9 @@
493 EqualityExpr EQOP RelationalExpr
494 {
495 $$ = new EqTestOp($2, $1, $3);
496 - PARSER->unregisterParseNode($1);
497 - PARSER->unregisterParseNode($3);
498 - PARSER->registerParseNode($$);
499 + parser->unregisterParseNode($1);
500 + parser->unregisterParseNode($3);
501 + parser->registerParseNode($$);
502 }
503 ;
504
505 @@ -501,9 +501,9 @@
506 RelationalExpr RELOP AdditiveExpr
507 {
508 $$ = new EqTestOp($2, $1, $3);
509 - PARSER->unregisterParseNode($1);
510 - PARSER->unregisterParseNode($3);
511 - PARSER->registerParseNode($$);
512 + parser->unregisterParseNode($1);
513 + parser->unregisterParseNode($3);
514 + parser->registerParseNode($$);
515 }
516 ;
517
518 @@ -513,17 +513,17 @@
519 AdditiveExpr PLUS MultiplicativeExpr
520 {
521 $$ = new NumericOp(NumericOp::OP_Add, $1, $3);
522 - PARSER->unregisterParseNode($1);
523 - PARSER->unregisterParseNode($3);
524 - PARSER->registerParseNode($$);
525 + parser->unregisterParseNode($1);
526 + parser->unregisterParseNode($3);
527 + parser->registerParseNode($$);
528 }
529 |
530 AdditiveExpr MINUS MultiplicativeExpr
531 {
532 $$ = new NumericOp(NumericOp::OP_Sub, $1, $3);
533 - PARSER->unregisterParseNode($1);
534 - PARSER->unregisterParseNode($3);
535 - PARSER->registerParseNode($$);
536 + parser->unregisterParseNode($1);
537 + parser->unregisterParseNode($3);
538 + parser->registerParseNode($$);
539 }
540 ;
541
542 @@ -533,9 +533,9 @@
543 MultiplicativeExpr MULOP UnaryExpr
544 {
545 $$ = new NumericOp($2, $1, $3);
546 - PARSER->unregisterParseNode($1);
547 - PARSER->unregisterParseNode($3);
548 - PARSER->registerParseNode($$);
549 + parser->unregisterParseNode($1);
550 + parser->unregisterParseNode($3);
551 + parser->registerParseNode($$);
552 }
553 ;
554
555 @@ -546,8 +546,8 @@
556 {
557 $$ = new Negative;
558 $$->addSubExpression($2);
559 - PARSER->unregisterParseNode($2);
560 - PARSER->registerParseNode($$);
561 + parser->unregisterParseNode($2);
562 + parser->registerParseNode($$);
563 }
564 ;
Report Message
Find on MARC Find on Google Groups