summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/rpm/rpm-syck-fix-gram.patch
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2016-02-23 11:28:21 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-09 17:00:27 +0000
commit007c284cb83cf5d98f3e4f605244ca6f1d46caea (patch)
tree32efe1a38e908bdc64ac59cad5f7b5e6b2d99ecf /meta/recipes-devtools/rpm/rpm/rpm-syck-fix-gram.patch
parenta27ca6da59e6939a5bbab641236f7f792c03694f (diff)
downloadpoky-007c284cb83cf5d98f3e4f605244ca6f1d46caea.tar.gz
rpm: Uprev to rpm-5.4.16 (pre) and rpm-5.4+cvs to current CVS head
meta/lib/oe/package_manager.py was also updated. This ensures that any diagnostic messages are ignored from the output of rpmresolve. The patches have been split into bug fixes (things that belong upstream) and local changes that are OE specific. The following patches are obsolete and have been removed: rpm-remove-sykcparse-decl.patch fstack-protector-configure-check.patch rpm-disable-Wno-override-init.patch rpm-lua-fix-print.patch rpm-rpmpgp-fix.patch verify-fix-broken-logic-for-ghost-avoidance-Mark-Hat.patch (From OE-Core rev: ee97e53fcceabc6ef4ddc68f38c5fa0e05c5d9a8) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-syck-fix-gram.patch')
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-syck-fix-gram.patch1081
1 files changed, 1081 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-syck-fix-gram.patch b/meta/recipes-devtools/rpm/rpm/rpm-syck-fix-gram.patch
new file mode 100644
index 0000000000..d6493c197e
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-syck-fix-gram.patch
@@ -0,0 +1,1081 @@
1Fix the syck/lib/gram.y
2
3This resolves a problem during compilation:
4
5../../../rpm/syck/lib/gram.y:66:27: error: 'parser' undeclared (first use in this function)
6 ((SyckParser *)parser)->root = syck_hdlr_add_node( (SyckParser *)parser, $1 );
7 ^
8../../../rpm/syck/lib/gram.y:66:27: note: each undeclared identifier is reported only once for each function it appears in
9../../../rpm/syck/lib/syck.c: In function 'syck_parse':
10../../../rpm/syck/lib/syck.c:516:5: warning: implicit declaration of function 'syckparse' [-Wimplicit-function-declaration]
11 syckparse( p );
12 ^
13
14This patch was generated by reverting the grammer back to a previous
15version.
16
17Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
18
19Index: rpm/syck/lib/gram.y
20===================================================================
21--- rpm.orig/syck/lib/gram.y
22+++ rpm/syck/lib/gram.y
23@@ -9,18 +9,10 @@
24
25 %start doc
26 %pure-parser
27-%parse-param {void* parser}
28-%lex-param {void* parser}
29
30
31 %{
32
33-#define YYDEBUG 1
34-#define YYERROR_VERBOSE 1
35-#ifndef YYSTACK_USE_ALLOCA
36-#define YYSTACK_USE_ALLOCA 0
37-#endif
38-
39 #include "system.h"
40 #include "syck.h"
41 #include "debug.h"
42@@ -28,6 +20,9 @@
43 void apply_seq_in_map( SyckParser *parser, SyckNode *n )
44 /*@*/;
45
46+#define YYPARSE_PARAM parser
47+#define YYLEX_PARAM parser
48+
49 #define NULL_NODE(parser, node) \
50 SyckNode *node = syck_new_str( "", scalar_plain ); \
51 if ( ((SyckParser *)parser)->taguri_expansion == 1 ) \
52Index: rpm/syck/lib/Makefile.am
53===================================================================
54--- rpm.orig/syck/lib/Makefile.am
55+++ rpm/syck/lib/Makefile.am
56@@ -49,25 +49,25 @@ SYCK_SPLINT_SRCS = \
57 token.c \
58 implicit.c
59
60-#gram.c: gram.y
61-# $(YACC) -d -t -v -p syck -o $@ $<
62-# -@if test -f gram.c; then \
63-# { echo "/*@-globs -mods -modnomods -moduncon -modunconnomods @*/";\
64-# echo "/*@-noeffect -noeffectuncon @*/";\
65-# echo "/*@-nullassign @*/";\
66-# echo "/*@-readonlytrans @*/";\
67-# echo "/*@-uniondef @*/";\
68-# echo "/*@-warnlintcomments @*/";\
69-# cat gram.c;\
70-# echo "/*@=warnlintcomments @*/";\
71-# echo "/*@=uniondef @*/";\
72-# echo "/*@=readonlytrans @*/";\
73-# echo "/*@=nullassign @*/";\
74-# echo "/*@=noeffect =noeffectuncon @*/";\
75-# echo "/*@=globs =mods =modnomods =moduncon =modunconnomods @*/";\
76-# } > _gram.c ;\
77-# mv -f _gram.c gram.c; \
78-# fi
79+gram.c: gram.y
80+ $(YACC) -d -t -v -p syck -o $@ $<
81+ -@if test -f gram.c; then \
82+ { echo "/*@-globs -mods -modnomods -moduncon -modunconnomods @*/";\
83+ echo "/*@-noeffect -noeffectuncon @*/";\
84+ echo "/*@-nullassign @*/";\
85+ echo "/*@-readonlytrans @*/";\
86+ echo "/*@-uniondef @*/";\
87+ echo "/*@-warnlintcomments @*/";\
88+ cat gram.c;\
89+ echo "/*@=warnlintcomments @*/";\
90+ echo "/*@=uniondef @*/";\
91+ echo "/*@=readonlytrans @*/";\
92+ echo "/*@=nullassign @*/";\
93+ echo "/*@=noeffect =noeffectuncon @*/";\
94+ echo "/*@=globs =mods =modnomods =moduncon =modunconnomods @*/";\
95+ } > _gram.c ;\
96+ mv -f _gram.c gram.c; \
97+ fi
98
99 BUILT_SOURCES = gram.c gram.h
100
101Index: rpm/syck/lib/implicit.c
102===================================================================
103--- rpm.orig/syck/lib/implicit.c
104+++ rpm/syck/lib/implicit.c
105@@ -19,11 +19,6 @@
106 #define YYLIMIT limit
107 #define YYFILL(n)
108
109-#ifdef __clang__
110-#pragma clang diagnostic push
111-#pragma clang diagnostic ignored "-Wempty-body"
112-#endif
113-
114 void
115 try_tag_implicit( SyckNode *n, int taguri )
116 {
117@@ -3000,8 +2995,4 @@ yy270: ++YYCURSOR;
118
119 }
120
121-#ifdef __clang__
122-#pragma clang diagnostic pop
123-#endif
124-
125 /*@=noret@*/
126Index: rpm/syck/lib/syck.c
127===================================================================
128--- rpm.orig/syck/lib/syck.c
129+++ rpm/syck/lib/syck.c
130@@ -519,7 +519,7 @@ syck_parse( SyckParser *p )
131 }
132
133 void
134-syck_default_error_handler( SyckParser *p, const char *msg )
135+syck_default_error_handler( SyckParser *p, char *msg )
136 {
137 printf( "Error at [Line %d, Col %ld]: %s\n",
138 p->linect,
139Index: rpm/syck/lib/syck.h
140===================================================================
141--- rpm.orig/syck/lib/syck.h
142+++ rpm/syck/lib/syck.h
143@@ -175,7 +175,7 @@ typedef struct _syck_str SyckIoStr;
144 typedef struct _syck_level SyckLevel;
145
146 typedef SYMID (*SyckNodeHandler)(SyckParser *p, SyckNode *n);
147-typedef void (*SyckErrorHandler)(SyckParser *p, const char *);
148+typedef void (*SyckErrorHandler)(SyckParser *p, char *);
149 typedef SyckNode * (*SyckBadAnchorHandler)(SyckParser *p, char *);
150 typedef long (*SyckIoFileRead)(char *, SyckIoFile *, long, long);
151 typedef long (*SyckIoStrRead)(char *, SyckIoStr *, long, long);
152@@ -546,7 +546,7 @@ long syck_parser_readlen( SyckParser *p,
153 SYMID syck_parse( SyckParser *p )
154 /*@globals fileSystem @*/
155 /*@modifies p, fileSystem @*/;
156-void syck_default_error_handler( SyckParser *p, const char * )
157+void syck_default_error_handler( SyckParser *p, char * )
158 /*@globals fileSystem @*/
159 /*@modifies p, fileSystem @*/;
160 SYMID syck_yaml2byte_handler( SyckParser *p, SyckNode *n )
161@@ -619,7 +619,7 @@ long syck_seq_count( SyckNode *seq )
162 /*
163 * Lexer prototypes
164 */
165-void syckerror( void *, const char *msg )
166+void syckerror( char *msg )
167 /*@*/;
168 /* XXX union YYSTYPE *sycklval has issues on Mac OS X. */
169 int sycklex( void *_sycklval, SyckParser *parser )
170Index: rpm/syck/lib/token.c
171===================================================================
172--- rpm.orig/syck/lib/token.c
173+++ rpm/syck/lib/token.c
174@@ -270,11 +270,11 @@ sycklex( void * _sycklval, SyckParser *p
175 return sycklex_yaml_utf8( sycklval, parser );
176
177 case syck_yaml_utf16:
178- syckerror( parser, "UTF-16 is not currently supported in Syck.\nPlease contribute code to help this happen!" );
179+ syckerror( "UTF-16 is not currently supported in Syck.\nPlease contribute code to help this happen!" );
180 break;
181
182 case syck_yaml_utf32:
183- syckerror( parser, "UTF-32 is not currently supported in Syck.\nPlease contribute code to help this happen!" );
184+ syckerror( "UTF-32 is not currently supported in Syck.\nPlease contribute code to help this happen!" );
185 break;
186
187 case syck_bytecode_utf8:
188@@ -2739,15 +2739,14 @@ syckwrap(void)
189 }
190
191 void
192-syckerror( void *p, const char *msg )
193+syckerror( char *msg )
194 {
195- SyckParser * parser = (SyckParser *)p;
196 /*@-mods@*/
197- if ( parser->error_handler == NULL )
198- parser->error_handler = syck_default_error_handler;
199+ if ( syck_parser_ptr->error_handler == NULL )
200+ syck_parser_ptr->error_handler = syck_default_error_handler;
201
202- parser->root = parser->root_on_error;
203+ syck_parser_ptr->root = syck_parser_ptr->root_on_error;
204 /*@=mods@*/
205- (parser->error_handler)(parser, msg);
206+ (syck_parser_ptr->error_handler)(syck_parser_ptr, msg);
207 }
208
209Index: rpm/syck/lib/bytecode.c
210===================================================================
211--- rpm.orig/syck/lib/bytecode.c
212+++ rpm/syck/lib/bytecode.c
213@@ -1,10 +1,10 @@
214-/* Generated by re2c 0.9.12 on Tue Mar 14 00:14:53 2006 */
215+/* Generated by re2c 0.13.5 on Tue Feb 23 12:04:00 2016 */
216 #line 1 "bytecode.re"
217 /*
218 * bytecode.re
219 *
220 * $Author: why $
221- * $Date: 2005-09-20 08:21:06 +0300 (Tue, 20 Sep 2005) $
222+ * $Date: 2005/09/20 05:21:06 $
223 *
224 * Copyright (C) 2003 why the lucky stiff
225 */
226@@ -27,14 +27,11 @@
227 #define YYLINEPTR parser->lineptr
228 #define YYLINECTPTR parser->linectptr
229 #define YYLINE parser->linect
230-#define YYFILL(n) (void) syck_parser_read(parser)
231+#define YYFILL(n) syck_parser_read(parser)
232
233-/*@unchecked@*/ /*@null@*/
234 extern SyckParser *syck_parser_ptr;
235
236-/*@null@*/
237-char *get_inline( SyckParser *parser )
238- /*@modifies parser @*/;
239+char *get_inline( SyckParser *parser );
240
241 /*
242 * Repositions the cursor at `n' offset from the token start.
243@@ -137,14 +134,12 @@ char *get_inline( SyckParser *parser )
244 */
245 int
246 sycklex_bytecode_utf8( YYSTYPE *sycklval, SyckParser *parser )
247- /*@globals syck_parser_ptr @*/
248- /*@modifies sycklval, parser, syck_parser_ptr @*/
249 {
250 SyckLevel *lvl;
251 syck_parser_ptr = parser;
252 if ( YYCURSOR == NULL )
253 {
254- (void) syck_parser_read( parser );
255+ syck_parser_read( parser );
256 }
257
258 if ( parser->force_token != 0 )
259@@ -171,42 +166,37 @@ sycklex_bytecode_utf8( YYSTYPE *sycklval
260 #line 165 "<stdout>"
261 {
262 YYCTYPE yych;
263- unsigned int yyaccept = 0;
264- goto yy0;
265- /*@notreached@*/
266- ++YYCURSOR;
267-yy0:
268- if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
269+
270+ if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
271 yych = *YYCURSOR;
272- switch(yych){
273+ switch (yych) {
274 case 0x00: goto yy2;
275 case 'D': goto yy3;
276 default: goto yy5;
277 }
278-yy2: YYCURSOR = YYMARKER;
279- switch(yyaccept){
280- case 0: goto yy4;
281- }
282-yy3: yyaccept = 0;
283+yy2:
284+ YYCURSOR = YYMARKER;
285+ goto yy4;
286+yy3:
287 yych = *(YYMARKER = ++YYCURSOR);
288- switch(yych){
289- case 0x0A: goto yy6;
290- case 0x0D: goto yy8;
291+ switch (yych) {
292+ case '\n': goto yy6;
293+ case '\r': goto yy8;
294 default: goto yy4;
295 }
296 yy4:
297 #line 199 "bytecode.re"
298-{ YYPOS(0);
299+ { YYPOS(0);
300 goto Document;
301 }
302-#line 195 "<stdout>"
303-yy5: yych = *++YYCURSOR;
304+#line 191 "<stdout>"
305+yy5:
306+ yych = *++YYCURSOR;
307 goto yy4;
308-yy6: ++YYCURSOR;
309- goto yy7;
310-yy7:
311+yy6:
312+ ++YYCURSOR;
313 #line 186 "bytecode.re"
314-{ if ( lvl->status == syck_lvl_header )
315+ { if ( lvl->status == syck_lvl_header )
316 {
317 CHK_NL(YYCURSOR);
318 goto Directive;
319@@ -218,10 +208,11 @@ yy7:
320 return 0;
321 }
322 }
323-#line 214 "<stdout>"
324-yy8: ++YYCURSOR;
325- switch((yych = *YYCURSOR)) {
326- case 0x0A: goto yy6;
327+#line 210 "<stdout>"
328+yy8:
329+ ++YYCURSOR;
330+ switch ((yych = *YYCURSOR)) {
331+ case '\n': goto yy6;
332 default: goto yy2;
333 }
334 }
335@@ -239,19 +230,15 @@ Document:
336 YYTOKEN = YYCURSOR;
337
338
339-#line 235 "<stdout>"
340+#line 232 "<stdout>"
341 {
342 YYCTYPE yych;
343- goto yy9;
344- /*@notreached@*/
345- ++YYCURSOR;
346-yy9:
347- if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
348+ if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
349 yych = *YYCURSOR;
350- switch(yych){
351+ switch (yych) {
352 case 0x00: goto yy30;
353- case 0x0A: goto yy27;
354- case 0x0D: goto yy29;
355+ case '\n': goto yy27;
356+ case '\r': goto yy29;
357 case 'A': goto yy19;
358 case 'D': goto yy12;
359 case 'E': goto yy16;
360@@ -264,71 +251,73 @@ yy9:
361 case 'c': goto yy25;
362 default: goto yy11;
363 }
364-yy11:yy12: yych = *++YYCURSOR;
365- switch(yych){
366- case 0x0A: goto yy41;
367- case 0x0D: goto yy44;
368+yy11:
369+yy12:
370+ yych = *++YYCURSOR;
371+ switch (yych) {
372+ case '\n': goto yy41;
373+ case '\r': goto yy44;
374 default: goto yy11;
375 }
376-yy13: yych = *++YYCURSOR;
377- switch(yych){
378- case 0x0A: goto yy41;
379- case 0x0D: goto yy43;
380+yy13:
381+ yych = *++YYCURSOR;
382+ switch (yych) {
383+ case '\n': goto yy41;
384+ case '\r': goto yy43;
385 default: goto yy11;
386 }
387-yy14: yych = *++YYCURSOR;
388- switch(yych){
389- case 0x0A: goto yy38;
390- case 0x0D: goto yy40;
391+yy14:
392+ yych = *++YYCURSOR;
393+ switch (yych) {
394+ case '\n': goto yy38;
395+ case '\r': goto yy40;
396 default: goto yy11;
397 }
398-yy15: yych = *++YYCURSOR;
399- switch(yych){
400- case 0x0A: goto yy35;
401- case 0x0D: goto yy37;
402+yy15:
403+ yych = *++YYCURSOR;
404+ switch (yych) {
405+ case '\n': goto yy35;
406+ case '\r': goto yy37;
407 default: goto yy11;
408 }
409-yy16: yych = *++YYCURSOR;
410- switch(yych){
411- case 0x0A: goto yy32;
412- case 0x0D: goto yy34;
413+yy16:
414+ yych = *++YYCURSOR;
415+ switch (yych) {
416+ case '\n': goto yy32;
417+ case '\r': goto yy34;
418 default: goto yy11;
419 }
420-yy17: ++YYCURSOR;
421- goto yy18;
422-yy18:
423+yy17:
424+ ++YYCURSOR;
425 #line 288 "bytecode.re"
426-{ ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_str);
427+ { ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_str);
428 goto Scalar;
429 }
430-#line 296 "<stdout>"
431-yy19: ++YYCURSOR;
432- goto yy20;
433-yy20:
434+#line 295 "<stdout>"
435+yy19:
436+ ++YYCURSOR;
437 #line 292 "bytecode.re"
438-{ ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_open);
439+ { ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_open);
440 sycklval->name = get_inline( parser );
441 syck_hdlr_remove_anchor( parser, sycklval->name );
442 CHK_NL(YYCURSOR);
443 return YAML_ANCHOR;
444 }
445-#line 307 "<stdout>"
446-yy21: ++YYCURSOR;
447- goto yy22;
448-yy22:
449+#line 305 "<stdout>"
450+yy21:
451+ ++YYCURSOR;
452 #line 299 "bytecode.re"
453-{ ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_str);
454+ { ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_str);
455 sycklval->name = get_inline( parser );
456 POP_LEVEL();
457 if ( *( YYCURSOR - 1 ) == '\n' ) YYCURSOR--;
458 return YAML_ALIAS;
459 }
460-#line 318 "<stdout>"
461-yy23: ++YYCURSOR;
462- goto yy24;
463-yy24:
464+#line 315 "<stdout>"
465+yy23:
466+ ++YYCURSOR;
467 #line 306 "bytecode.re"
468-{ char *qstr;
469+ { char *qstr;
470 ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_open);
471 qstr = get_inline( parser );
472 CHK_NL(YYCURSOR);
473@@ -387,18 +376,16 @@ yy24:
474 sycklval->name = qstr;
475 return YAML_TAGURI;
476 }
477-#line 382 "<stdout>"
478-yy25: ++YYCURSOR;
479- goto yy26;
480-yy26:
481+#line 378 "<stdout>"
482+yy25:
483+ ++YYCURSOR;
484 #line 366 "bytecode.re"
485-{ goto Comment; }
486-#line 388 "<stdout>"
487-yy27: ++YYCURSOR;
488- goto yy28;
489-yy28:
490+ { goto Comment; }
491+#line 383 "<stdout>"
492+yy27:
493+ ++YYCURSOR;
494 #line 368 "bytecode.re"
495-{ CHK_NL(YYCURSOR);
496+ { CHK_NL(YYCURSOR);
497 if ( lvl->status == syck_lvl_seq )
498 {
499 return YAML_INDENT;
500@@ -410,26 +397,25 @@ yy28:
501 }
502 goto Document;
503 }
504-#line 405 "<stdout>"
505-yy29: yych = *++YYCURSOR;
506- switch(yych){
507- case 0x0A: goto yy27;
508+#line 399 "<stdout>"
509+yy29:
510+ yych = *++YYCURSOR;
511+ switch (yych) {
512+ case '\n': goto yy27;
513 default: goto yy11;
514 }
515-yy30: ++YYCURSOR;
516- goto yy31;
517-yy31:
518+yy30:
519+ ++YYCURSOR;
520 #line 381 "bytecode.re"
521-{ ENSURE_YAML_IEND(lvl, -1);
522+ { ENSURE_YAML_IEND(lvl, -1);
523 YYPOS(0);
524 return 0;
525 }
526-#line 419 "<stdout>"
527-yy32: ++YYCURSOR;
528- goto yy33;
529-yy33:
530+#line 413 "<stdout>"
531+yy32:
532+ ++YYCURSOR;
533 #line 252 "bytecode.re"
534-{ if ( lvl->status == syck_lvl_seq && lvl->ncount == 0 )
535+ { if ( lvl->status == syck_lvl_seq && lvl->ncount == 0 )
536 {
537 lvl->ncount++;
538 YYPOS(0);
539@@ -464,17 +450,17 @@ yy33:
540 CHK_NL(YYCURSOR);
541 return YAML_IEND;
542 }
543-#line 459 "<stdout>"
544-yy34: yych = *++YYCURSOR;
545- switch(yych){
546- case 0x0A: goto yy32;
547+#line 452 "<stdout>"
548+yy34:
549+ yych = *++YYCURSOR;
550+ switch (yych) {
551+ case '\n': goto yy32;
552 default: goto yy11;
553 }
554-yy35: ++YYCURSOR;
555- goto yy36;
556-yy36:
557+yy35:
558+ ++YYCURSOR;
559 #line 237 "bytecode.re"
560-{ int complex = 0;
561+ { int complex = 0;
562 if ( lvl->ncount % 2 == 0 && ( lvl->status == syck_lvl_map || lvl->status == syck_lvl_seq ) )
563 {
564 complex = 1;
565@@ -488,17 +474,17 @@ yy36:
566 }
567 return YAML_IOPEN;
568 }
569-#line 483 "<stdout>"
570-yy37: yych = *++YYCURSOR;
571- switch(yych){
572- case 0x0A: goto yy35;
573+#line 476 "<stdout>"
574+yy37:
575+ yych = *++YYCURSOR;
576+ switch (yych) {
577+ case '\n': goto yy35;
578 default: goto yy11;
579 }
580-yy38: ++YYCURSOR;
581- goto yy39;
582-yy39:
583+yy38:
584+ ++YYCURSOR;
585 #line 222 "bytecode.re"
586-{ int complex = 0;
587+ { int complex = 0;
588 if ( lvl->ncount % 2 == 0 && ( lvl->status == syck_lvl_map || lvl->status == syck_lvl_seq ) )
589 {
590 complex = 1;
591@@ -512,29 +498,31 @@ yy39:
592 }
593 return YAML_IOPEN;
594 }
595-#line 507 "<stdout>"
596-yy40: yych = *++YYCURSOR;
597- switch(yych){
598- case 0x0A: goto yy38;
599+#line 500 "<stdout>"
600+yy40:
601+ yych = *++YYCURSOR;
602+ switch (yych) {
603+ case '\n': goto yy38;
604 default: goto yy11;
605 }
606-yy41: ++YYCURSOR;
607- goto yy42;
608-yy42:
609+yy41:
610+ ++YYCURSOR;
611 #line 217 "bytecode.re"
612-{ ENSURE_YAML_IEND(lvl, -1);
613+ { ENSURE_YAML_IEND(lvl, -1);
614 YYPOS(0);
615 return 0;
616 }
617-#line 521 "<stdout>"
618-yy43: yych = *++YYCURSOR;
619- switch(yych){
620- case 0x0A: goto yy41;
621+#line 514 "<stdout>"
622+yy43:
623+ yych = *++YYCURSOR;
624+ switch (yych) {
625+ case '\n': goto yy41;
626 default: goto yy11;
627 }
628-yy44: ++YYCURSOR;
629- switch((yych = *YYCURSOR)) {
630- case 0x0A: goto yy41;
631+yy44:
632+ ++YYCURSOR;
633+ switch ((yych = *YYCURSOR)) {
634+ case '\n': goto yy41;
635 default: goto yy11;
636 }
637 }
638@@ -548,28 +536,22 @@ Directive:
639 YYTOKEN = YYCURSOR;
640
641
642-#line 543 "<stdout>"
643+#line 538 "<stdout>"
644 {
645 YYCTYPE yych;
646- unsigned int yyaccept = 0;
647- goto yy45;
648- /*@notreached@*/
649- ++YYCURSOR;
650-yy45:
651- if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
652+ if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
653 yych = *YYCURSOR;
654- switch(yych){
655+ switch (yych) {
656 case 0x00: goto yy47;
657 case 'V': goto yy48;
658 default: goto yy50;
659 }
660-yy47: YYCURSOR = YYMARKER;
661- switch(yyaccept){
662- case 0: goto yy49;
663- }
664-yy48: yyaccept = 0;
665+yy47:
666+ YYCURSOR = YYMARKER;
667+ goto yy49;
668+yy48:
669 yych = *(YYMARKER = ++YYCURSOR);
670- switch(yych){
671+ switch (yych) {
672 case '.':
673 case '/':
674 case '0':
675@@ -619,7 +601,8 @@ yy48: yyaccept = 0;
676 case '\\':
677 case ']':
678 case '^':
679- case '_': case 'a':
680+ case '_':
681+ case 'a':
682 case 'b':
683 case 'c':
684 case 'd':
685@@ -649,17 +632,18 @@ yy48: yyaccept = 0;
686 }
687 yy49:
688 #line 399 "bytecode.re"
689-{ YYCURSOR = YYTOKEN;
690+ { YYCURSOR = YYTOKEN;
691 return YAML_DOCSEP;
692 }
693-#line 646 "<stdout>"
694-yy50: yych = *++YYCURSOR;
695+#line 637 "<stdout>"
696+yy50:
697+ yych = *++YYCURSOR;
698 goto yy49;
699-yy51: ++YYCURSOR;
700- if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
701+yy51:
702+ ++YYCURSOR;
703+ if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
704 yych = *YYCURSOR;
705- goto yy52;
706-yy52: switch(yych){
707+ switch (yych) {
708 case '.':
709 case '/':
710 case '0':
711@@ -671,7 +655,8 @@ yy52: switch(yych){
712 case '6':
713 case '7':
714 case '8':
715- case '9': case ';':
716+ case '9':
717+ case ';':
718 case '<':
719 case '=':
720 case '>':
721@@ -707,7 +692,8 @@ yy52: switch(yych){
722 case '\\':
723 case ']':
724 case '^':
725- case '_': case 'a':
726+ case '_':
727+ case 'a':
728 case 'b':
729 case 'c':
730 case 'd':
731@@ -736,8 +722,9 @@ yy52: switch(yych){
732 case ':': goto yy53;
733 default: goto yy47;
734 }
735-yy53: yych = *++YYCURSOR;
736- switch(yych){
737+yy53:
738+ yych = *++YYCURSOR;
739+ switch (yych) {
740 case '.':
741 case '/':
742 case '0':
743@@ -787,7 +774,8 @@ yy53: yych = *++YYCURSOR;
744 case '\\':
745 case ']':
746 case '^':
747- case '_': case 'a':
748+ case '_':
749+ case 'a':
750 case 'b':
751 case 'c':
752 case 'd':
753@@ -815,13 +803,13 @@ yy53: yych = *++YYCURSOR;
754 case 'z': goto yy54;
755 default: goto yy47;
756 }
757-yy54: ++YYCURSOR;
758- if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
759+yy54:
760+ ++YYCURSOR;
761+ if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
762 yych = *YYCURSOR;
763- goto yy55;
764-yy55: switch(yych){
765- case 0x0A: goto yy56;
766- case 0x0D: goto yy58;
767+ switch (yych) {
768+ case '\n': goto yy56;
769+ case '\r': goto yy58;
770 case '.':
771 case '/':
772 case '0':
773@@ -871,7 +859,8 @@ yy55: switch(yych){
774 case '\\':
775 case ']':
776 case '^':
777- case '_': case 'a':
778+ case '_':
779+ case 'a':
780 case 'b':
781 case 'c':
782 case 'd':
783@@ -899,16 +888,16 @@ yy55: switch(yych){
784 case 'z': goto yy54;
785 default: goto yy47;
786 }
787-yy56: ++YYCURSOR;
788- goto yy57;
789-yy57:
790+yy56:
791+ ++YYCURSOR;
792 #line 396 "bytecode.re"
793-{ CHK_NL(YYCURSOR);
794+ { CHK_NL(YYCURSOR);
795 goto Directive; }
796-#line 899 "<stdout>"
797-yy58: ++YYCURSOR;
798- switch((yych = *YYCURSOR)) {
799- case 0x0A: goto yy56;
800+#line 895 "<stdout>"
801+yy58:
802+ ++YYCURSOR;
803+ switch ((yych = *YYCURSOR)) {
804+ case '\n': goto yy56;
805 default: goto yy47;
806 }
807 }
808@@ -922,40 +911,40 @@ Comment:
809 YYTOKEN = YYCURSOR;
810
811
812-#line 916 "<stdout>"
813+#line 913 "<stdout>"
814 {
815 YYCTYPE yych;
816- goto yy59;
817- /*@notreached@*/
818- ++YYCURSOR;
819-yy59:
820- if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
821+ if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
822 yych = *YYCURSOR;
823- switch(yych){
824+ switch (yych) {
825 case 0x00: goto yy61;
826- case 0x0A: goto yy62;
827- case 0x0D: goto yy64;
828+ case '\n': goto yy62;
829+ case '\r': goto yy64;
830 default: goto yy66;
831 }
832-yy61:yy62: ++YYCURSOR;
833- goto yy63;
834+yy61:
835+yy62:
836+ ++YYCURSOR;
837 yy63:
838 #line 412 "bytecode.re"
839-{ CHK_NL(YYCURSOR);
840+ { CHK_NL(YYCURSOR);
841 goto Document; }
842-#line 936 "<stdout>"
843-yy64: ++YYCURSOR;
844- switch((yych = *YYCURSOR)) {
845- case 0x0A: goto yy67;
846+#line 931 "<stdout>"
847+yy64:
848+ ++YYCURSOR;
849+ switch ((yych = *YYCURSOR)) {
850+ case '\n': goto yy67;
851 default: goto yy65;
852 }
853 yy65:
854 #line 415 "bytecode.re"
855-{ goto Comment; }
856-#line 945 "<stdout>"
857-yy66: yych = *++YYCURSOR;
858+ { goto Comment; }
859+#line 941 "<stdout>"
860+yy66:
861+ yych = *++YYCURSOR;
862 goto yy65;
863-yy67: ++YYCURSOR;
864+yy67:
865+ ++YYCURSOR;
866 yych = *YYCURSOR;
867 goto yy63;
868 }
869@@ -977,23 +966,20 @@ Scalar2:
870 tok = YYCURSOR;
871
872
873-#line 970 "<stdout>"
874+#line 968 "<stdout>"
875 {
876 YYCTYPE yych;
877- goto yy68;
878- /*@notreached@*/
879- ++YYCURSOR;
880-yy68:
881- if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
882+ if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
883 yych = *YYCURSOR;
884- switch(yych){
885+ switch (yych) {
886 case 0x00: goto yy74;
887- case 0x0A: goto yy70;
888- case 0x0D: goto yy72;
889+ case '\n': goto yy70;
890+ case '\r': goto yy72;
891 default: goto yy76;
892 }
893-yy70: ++YYCURSOR;
894- switch((yych = *YYCURSOR)) {
895+yy70:
896+ ++YYCURSOR;
897+ switch ((yych = *YYCURSOR)) {
898 case 'C': goto yy78;
899 case 'N': goto yy80;
900 case 'Z': goto yy83;
901@@ -1001,50 +987,51 @@ yy70: ++YYCURSOR;
902 }
903 yy71:
904 #line 461 "bytecode.re"
905-{ YYCURSOR = tok;
906+ { YYCURSOR = tok;
907 goto ScalarEnd;
908 }
909-#line 996 "<stdout>"
910-yy72: ++YYCURSOR;
911- switch((yych = *YYCURSOR)) {
912- case 0x0A: goto yy77;
913+#line 992 "<stdout>"
914+yy72:
915+ ++YYCURSOR;
916+ switch ((yych = *YYCURSOR)) {
917+ case '\n': goto yy77;
918 default: goto yy73;
919 }
920 yy73:
921 #line 469 "bytecode.re"
922-{ CAT(str, cap, idx, tok[0]);
923+ { CAT(str, cap, idx, tok[0]);
924 goto Scalar2;
925 }
926-#line 1007 "<stdout>"
927-yy74: ++YYCURSOR;
928- goto yy75;
929-yy75:
930+#line 1004 "<stdout>"
931+yy74:
932+ ++YYCURSOR;
933 #line 465 "bytecode.re"
934-{ YYCURSOR = tok;
935+ { YYCURSOR = tok;
936 goto ScalarEnd;
937 }
938-#line 1015 "<stdout>"
939-yy76: yych = *++YYCURSOR;
940+#line 1011 "<stdout>"
941+yy76:
942+ yych = *++YYCURSOR;
943 goto yy73;
944-yy77: yych = *++YYCURSOR;
945- switch(yych){
946+yy77:
947+ yych = *++YYCURSOR;
948+ switch (yych) {
949 case 'C': goto yy78;
950 case 'N': goto yy80;
951 case 'Z': goto yy83;
952 default: goto yy71;
953 }
954-yy78: ++YYCURSOR;
955- goto yy79;
956-yy79:
957+yy78:
958+ ++YYCURSOR;
959 #line 435 "bytecode.re"
960-{ CHK_NL(tok+1);
961+ { CHK_NL(tok+1);
962 goto Scalar2; }
963-#line 1031 "<stdout>"
964-yy80: ++YYCURSOR;
965- if(YYLIMIT == YYCURSOR) YYFILL(1);
966+#line 1028 "<stdout>"
967+yy80:
968+ ++YYCURSOR;
969+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
970 yych = *YYCURSOR;
971- goto yy81;
972-yy81: switch(yych){
973+ switch (yych) {
974 case '0':
975 case '1':
976 case '2':
977@@ -1059,7 +1046,7 @@ yy81: switch(yych){
978 }
979 yy82:
980 #line 438 "bytecode.re"
981-{ CHK_NL(tok+1);
982+ { CHK_NL(tok+1);
983 if ( tok + 2 < YYCURSOR )
984 {
985 char *count = tok + 2;
986@@ -1076,16 +1063,15 @@ yy82:
987 }
988 goto Scalar2;
989 }
990-#line 1068 "<stdout>"
991-yy83: ++YYCURSOR;
992- goto yy84;
993-yy84:
994+#line 1065 "<stdout>"
995+yy83:
996+ ++YYCURSOR;
997 #line 456 "bytecode.re"
998-{ CHK_NL(tok+1);
999+ { CHK_NL(tok+1);
1000 CAT(str, cap, idx, '\0');
1001 goto Scalar2;
1002 }
1003-#line 1077 "<stdout>"
1004+#line 1073 "<stdout>"
1005 }
1006 #line 473 "bytecode.re"
1007
1008@@ -1122,50 +1108,48 @@ Inline:
1009 tok = YYCURSOR;
1010
1011
1012-#line 1114 "<stdout>"
1013+#line 1110 "<stdout>"
1014 {
1015 YYCTYPE yych;
1016- goto yy85;
1017- /*@notreached@*/
1018- ++YYCURSOR;
1019-yy85:
1020- if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
1021+ if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
1022 yych = *YYCURSOR;
1023- switch(yych){
1024+ switch (yych) {
1025 case 0x00: goto yy91;
1026- case 0x0A: goto yy87;
1027- case 0x0D: goto yy89;
1028+ case '\n': goto yy87;
1029+ case '\r': goto yy89;
1030 default: goto yy93;
1031 }
1032-yy87: ++YYCURSOR;
1033- goto yy88;
1034+yy87:
1035+ ++YYCURSOR;
1036 yy88:
1037 #line 508 "bytecode.re"
1038-{ CHK_NL(YYCURSOR);
1039+ { CHK_NL(YYCURSOR);
1040 return str; }
1041-#line 1134 "<stdout>"
1042-yy89: ++YYCURSOR;
1043- switch((yych = *YYCURSOR)) {
1044- case 0x0A: goto yy94;
1045+#line 1127 "<stdout>"
1046+yy89:
1047+ ++YYCURSOR;
1048+ switch ((yych = *YYCURSOR)) {
1049+ case '\n': goto yy94;
1050 default: goto yy90;
1051 }
1052 yy90:
1053 #line 515 "bytecode.re"
1054-{ CAT(str, cap, idx, tok[0]);
1055+ { CAT(str, cap, idx, tok[0]);
1056 goto Inline;
1057 }
1058-#line 1145 "<stdout>"
1059-yy91: ++YYCURSOR;
1060- goto yy92;
1061-yy92:
1062+#line 1139 "<stdout>"
1063+yy91:
1064+ ++YYCURSOR;
1065 #line 511 "bytecode.re"
1066-{ YYCURSOR = tok;
1067+ { YYCURSOR = tok;
1068 return str;
1069 }
1070-#line 1153 "<stdout>"
1071-yy93: yych = *++YYCURSOR;
1072+#line 1146 "<stdout>"
1073+yy93:
1074+ yych = *++YYCURSOR;
1075 goto yy90;
1076-yy94: ++YYCURSOR;
1077+yy94:
1078+ ++YYCURSOR;
1079 yych = *YYCURSOR;
1080 goto yy88;
1081 }
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-30 10:42:13 +0000