Re: Steffen Joeris 2006-05-16 <[EMAIL PROTECTED]> > Argh, I love this php stuff. You find the fixed NMU-version under > http://www.formorer.de/~white/debian/nmu/syck/
Ok, here's the correct patch now. Uploading to unstable, thanks to Robert. Christoph
debdiff syck_0.55-3.dsc ./syck_0.55-3.1.dsc syck-0.55/debian/control | 2 syck-0.55/debian/rules | 1 syck-0.55/debian/changelog | 8 lib/implicit.c | 207 +++++++++---------- lib/token.c | 478 ++++++++++++++++++++++----------------------- 5 files changed, 354 insertions(+), 342 deletions(-) diff -u syck-0.55/debian/control syck-0.55/debian/control --- syck-0.55/debian/control +++ syck-0.55/debian/control @@ -2,7 +2,7 @@ Priority: optional Section: devel Maintainer: Robert Jordens <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 4.1.67), cdbs, dh-buildinfo, flex, python2.3-dev, python-dev, php4-dev (>= 4:4.4.0-1), re2c, bison +Build-Depends: debhelper (>= 4.1.67), cdbs, dh-buildinfo, flex, python2.3-dev, python-dev, php4-dev (>= 4:4.4.0-1), re2c, bison, chrpath Standards-Version: 3.6.1 Package: libsyck0-dev diff -u syck-0.55/debian/rules syck-0.55/debian/rules --- syck-0.55/debian/rules +++ syck-0.55/debian/rules @@ -48,6 +48,7 @@ binary-predeb/php4-syck:: echo "php:Depends=phpapi-$(phpapiver)" >> debian/php4-syck.substvars + chrpath -d $(CURDIR)/debian/php4-syck$(shell php-config --extension-dir)/syck.so clean:: -(cd ext/python; python2.3 setup.py clean -a) diff -u syck-0.55/debian/changelog syck-0.55/debian/changelog --- syck-0.55/debian/changelog +++ syck-0.55/debian/changelog @@ -1,3 +1,11 @@ +syck (0.55-3.1) unstable; urgency=low + + * Non-maintainer upload + * Remove rpath on /usr/lib/php5/20051025/syck.so (Closes: #359245) + * Add chrpath to build-dependencies + + -- Steffen Joeris <[EMAIL PROTECTED]> Sat, 29 Apr 2006 19:06:09 +0200 + syck (0.55-3) unstable; urgency=low * debian/{control,rules}: use output from php4-config --phpapi instead of only in patch2: unchanged: --- syck-0.55.orig/lib/implicit.c +++ syck-0.55/lib/implicit.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.9.3 on Wed Mar 30 08:27:25 2005 */ +/* Generated by re2c 0.9.12 on Sat Apr 29 18:56:51 2006 */ #line 1 "implicit.re" /* * implicit.re @@ -9,6 +9,7 @@ * Copyright (C) 2003 why the lucky stiff */ +#include <stdlib.h> #include "syck.h" #define YYCTYPE char @@ -51,17 +52,17 @@ limit = str + len; -#line 6 "<stdout>" +#line 56 "<stdout>" { YYCTYPE yych; - unsigned int yyaccept; + unsigned int yyaccept = 0; goto yy0; -yy1: ++YYCURSOR; + ++YYCURSOR; yy0: if((YYLIMIT - YYCURSOR) < 26) YYFILL(26); yych = *YYCURSOR; switch(yych){ - case '\000': goto yy6; + case 0x00: goto yy6; case '+': goto yy16; case '-': goto yy17; case '.': goto yy20; @@ -91,12 +92,12 @@ default: goto yy23; } yy2: ++YYCURSOR; - if((yych = *YYCURSOR) <= '\000') goto yy6; + if((yych = *YYCURSOR) <= 0x00) goto yy6; goto yy3; yy3: -#line 123 "implicit.re" +#line 124 "implicit.re" { return "str"; } -#line 51 "<stdout>" +#line 101 "<stdout>" yy4: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ @@ -115,9 +116,9 @@ yy6: ++YYCURSOR; goto yy7; yy7: -#line 85 "implicit.re" +#line 86 "implicit.re" { return "null"; } -#line 72 "<stdout>" +#line 122 "<stdout>" yy8: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ @@ -207,7 +208,7 @@ yy18: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ - case '\000': goto yy52; + case 0x00: goto yy52; case ',': goto yy142; case '.': goto yy50; case '0': @@ -227,7 +228,7 @@ yy19: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ - case '\000': goto yy52; + case 0x00: goto yy52; case ',': goto yy47; case '.': goto yy50; case '0': @@ -253,7 +254,7 @@ default: goto yy3; } yy21: yych = *++YYCURSOR; - if(yych <= '\000') goto yy28; + if(yych <= 0x00) goto yy28; goto yy3; yy22: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -264,7 +265,7 @@ yy23: yych = *++YYCURSOR; goto yy3; yy24: yych = *++YYCURSOR; - if(yych <= '\000') goto yy26; + if(yych <= 0x00) goto yy26; goto yy25; yy25: YYCURSOR = YYMARKER; switch(yyaccept){ @@ -273,15 +274,15 @@ yy26: ++YYCURSOR; goto yy27; yy27: -#line 121 "implicit.re" +#line 122 "implicit.re" { return "merge"; } -#line 230 "<stdout>" +#line 280 "<stdout>" yy28: ++YYCURSOR; goto yy29; yy29: -#line 119 "implicit.re" +#line 120 "implicit.re" { return "default"; } -#line 236 "<stdout>" +#line 286 "<stdout>" yy30: yych = *++YYCURSOR; switch(yych){ case 'a': goto yy45; @@ -315,14 +316,14 @@ default: goto yy25; } yy36: yych = *++YYCURSOR; - if(yych >= '\001') goto yy25; + if(yych >= 0x01) goto yy25; goto yy37; yy37: ++YYCURSOR; goto yy38; yy38: -#line 105 "implicit.re" +#line 106 "implicit.re" { return "float#inf"; } -#line 277 "<stdout>" +#line 327 "<stdout>" yy39: yych = *++YYCURSOR; switch(yych){ case 'f': goto yy36; @@ -339,14 +340,14 @@ default: goto yy25; } yy42: yych = *++YYCURSOR; - if(yych >= '\001') goto yy25; + if(yych >= 0x01) goto yy25; goto yy43; yy43: ++YYCURSOR; goto yy44; yy44: -#line 109 "implicit.re" +#line 110 "implicit.re" { return "float#nan"; } -#line 301 "<stdout>" +#line 351 "<stdout>" yy45: yych = *++YYCURSOR; switch(yych){ case 'n': goto yy42; @@ -371,7 +372,7 @@ yych = *YYCURSOR; goto yy48; yy48: switch(yych){ - case '\000': goto yy52; + case 0x00: goto yy52; case ',': case '0': case '1': case '2': @@ -403,11 +404,11 @@ default: goto yy25; } yy50: ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); + if((YYLIMIT - YYCURSOR) < 3) YYFILL(3); yych = *YYCURSOR; goto yy51; yy51: switch(yych){ - case '\000': goto yy56; + case 0x00: goto yy56; case ',': goto yy54; case '.': goto yy58; case '0': @@ -426,15 +427,15 @@ yy52: ++YYCURSOR; goto yy53; yy53: -#line 97 "implicit.re" +#line 98 "implicit.re" { return "int"; } -#line 386 "<stdout>" +#line 433 "<stdout>" yy54: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; goto yy55; yy55: switch(yych){ - case '\000': goto yy56; + case 0x00: goto yy56; case ',': case '0': case '1': case '2': @@ -450,11 +451,11 @@ yy56: ++YYCURSOR; goto yy57; yy57: -#line 99 "implicit.re" +#line 100 "implicit.re" { return "float#fix"; } -#line 411 "<stdout>" +#line 457 "<stdout>" yy58: ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); + if((YYLIMIT - YYCURSOR) < 3) YYFILL(3); yych = *YYCURSOR; goto yy59; yy59: switch(yych){ @@ -477,14 +478,14 @@ default: goto yy25; } yy61: yych = *++YYCURSOR; - if(yych <= '\000') goto yy25; + if(yych <= 0x00) goto yy25; goto yy63; yy62: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; goto yy63; yy63: switch(yych){ - case '\000': goto yy64; + case 0x00: goto yy64; case '0': case '1': case '2': @@ -500,14 +501,14 @@ yy64: ++YYCURSOR; goto yy65; yy65: -#line 101 "implicit.re" +#line 102 "implicit.re" { return "float#exp"; } -#line 463 "<stdout>" +#line 507 "<stdout>" yy66: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych){ - case '\000': goto yy70; + case 0x00: goto yy70; case '.': goto yy68; case '0': case '1': @@ -526,7 +527,7 @@ if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych){ - case '\000': goto yy70; + case 0x00: goto yy70; case '.': goto yy68; case ':': goto yy49; default: goto yy25; @@ -536,7 +537,7 @@ yych = *YYCURSOR; goto yy69; yy69: switch(yych){ - case '\000': goto yy72; + case 0x00: goto yy72; case ',': case '0': case '1': case '2': @@ -552,15 +553,15 @@ yy70: ++YYCURSOR; goto yy71; yy71: -#line 95 "implicit.re" +#line 96 "implicit.re" { return "int#base60"; } -#line 518 "<stdout>" +#line 559 "<stdout>" yy72: ++YYCURSOR; goto yy73; yy73: -#line 103 "implicit.re" +#line 104 "implicit.re" { return "float#base60"; } -#line 524 "<stdout>" +#line 565 "<stdout>" yy74: yych = *++YYCURSOR; switch(yych){ case '0': @@ -643,7 +644,7 @@ } yy81: yych = *++YYCURSOR; switch(yych){ - case '\000': goto yy82; + case 0x00: goto yy82; case '0': case '1': case '2': @@ -661,9 +662,9 @@ yy82: ++YYCURSOR; goto yy83; yy83: -#line 111 "implicit.re" +#line 112 "implicit.re" { return "timestamp#ymd"; } -#line 627 "<stdout>" +#line 668 "<stdout>" yy84: yych = *++YYCURSOR; switch(yych){ case '0': @@ -693,11 +694,11 @@ default: goto yy25; } yy86: ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); + if((YYLIMIT - YYCURSOR) < 9) YYFILL(9); yych = *YYCURSOR; goto yy87; yy87: switch(yych){ - case '\t': case ' ': goto yy86; + case 0x09: case ' ': goto yy86; case '0': case '1': case '2': @@ -792,7 +793,7 @@ } yy95: yych = *++YYCURSOR; switch(yych){ - case '\t': case ' ': goto yy98; + case 0x09: case ' ': goto yy98; case '.': goto yy96; default: goto yy25; } @@ -801,7 +802,7 @@ yych = *YYCURSOR; goto yy97; yy97: switch(yych){ - case '\t': case ' ': goto yy98; + case 0x09: case ' ': goto yy98; case '0': case '1': case '2': @@ -815,17 +816,17 @@ default: goto yy25; } yy98: ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); + if((YYLIMIT - YYCURSOR) < 7) YYFILL(7); yych = *YYCURSOR; goto yy99; yy99: switch(yych){ - case '\t': case ' ': goto yy98; + case 0x09: case ' ': goto yy98; case '+': case '-': goto yy101; case 'Z': goto yy100; default: goto yy25; } yy100: yych = *++YYCURSOR; - if(yych <= '\000') goto yy105; + if(yych <= 0x00) goto yy105; goto yy25; yy101: yych = *++YYCURSOR; switch(yych){ @@ -857,7 +858,7 @@ } yy103: yych = *++YYCURSOR; switch(yych){ - case '\000': goto yy105; + case 0x00: goto yy105; case ':': goto yy104; default: goto yy25; } @@ -878,9 +879,9 @@ yy105: ++YYCURSOR; goto yy106; yy106: -#line 115 "implicit.re" +#line 116 "implicit.re" { return "timestamp#spaced"; } -#line 847 "<stdout>" +#line 885 "<stdout>" yy107: yych = *++YYCURSOR; switch(yych){ case '0': @@ -991,7 +992,7 @@ default: goto yy117; } yy116: ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); + if((YYLIMIT - YYCURSOR) < 7) YYFILL(7); yych = *YYCURSOR; goto yy117; yy117: switch(yych){ @@ -1010,7 +1011,7 @@ default: goto yy25; } yy118: yych = *++YYCURSOR; - if(yych <= '\000') goto yy123; + if(yych <= 0x00) goto yy123; goto yy25; yy119: yych = *++YYCURSOR; switch(yych){ @@ -1042,7 +1043,7 @@ } yy121: yych = *++YYCURSOR; switch(yych){ - case '\000': goto yy123; + case 0x00: goto yy123; case ':': goto yy122; default: goto yy25; } @@ -1063,9 +1064,9 @@ yy123: ++YYCURSOR; goto yy124; yy124: -#line 113 "implicit.re" +#line 114 "implicit.re" { return "timestamp#iso8601"; } -#line 1033 "<stdout>" +#line 1070 "<stdout>" yy125: yych = *++YYCURSOR; switch(yych){ case '0': @@ -1196,7 +1197,7 @@ default: goto yy25; } yy136: yych = *++YYCURSOR; - if(yych >= '\001') goto yy25; + if(yych >= 0x01) goto yy25; goto yy137; yy137: yych = *++YYCURSOR; goto yy124; @@ -1252,7 +1253,7 @@ yych = *YYCURSOR; goto yy143; yy143: switch(yych){ - case '\000': goto yy149; + case 0x00: goto yy149; case ',': case '0': case '1': case '2': @@ -1268,14 +1269,14 @@ default: goto yy25; } yy144: yych = *++YYCURSOR; - if(yych <= '\000') goto yy25; + if(yych <= 0x00) goto yy25; goto yy146; yy145: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; goto yy146; yy146: switch(yych){ - case '\000': goto yy147; + case 0x00: goto yy147; case ',': case '0': case '1': case '2': @@ -1301,15 +1302,15 @@ yy147: ++YYCURSOR; goto yy148; yy148: -#line 91 "implicit.re" +#line 92 "implicit.re" { return "int#hex"; } -#line 1275 "<stdout>" +#line 1308 "<stdout>" yy149: ++YYCURSOR; goto yy150; yy150: -#line 93 "implicit.re" +#line 94 "implicit.re" { return "int#oct"; } -#line 1281 "<stdout>" +#line 1314 "<stdout>" yy151: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -1375,7 +1376,7 @@ } yy158: yych = *++YYCURSOR; switch(yych){ - case '\000': goto yy52; + case 0x00: goto yy52; case 'x': goto yy144; default: goto yy143; } @@ -1401,14 +1402,14 @@ default: goto yy25; } yy163: yych = *++YYCURSOR; - if(yych >= '\001') goto yy25; + if(yych >= 0x01) goto yy25; goto yy164; yy164: ++YYCURSOR; goto yy165; yy165: -#line 107 "implicit.re" +#line 108 "implicit.re" { return "float#neginf"; } -#line 1381 "<stdout>" +#line 1413 "<stdout>" yy166: yych = *++YYCURSOR; switch(yych){ case 'f': goto yy163; @@ -1441,14 +1442,14 @@ default: goto yy25; } yy172: yych = *++YYCURSOR; - if(yych >= '\001') goto yy25; + if(yych >= 0x01) goto yy25; goto yy173; yy173: ++YYCURSOR; goto yy174; yy174: -#line 89 "implicit.re" +#line 90 "implicit.re" { return "bool#no"; } -#line 1421 "<stdout>" +#line 1453 "<stdout>" yy175: yych = *++YYCURSOR; switch(yych){ case 'S': goto yy176; @@ -1485,14 +1486,14 @@ default: goto yy25; } yy182: yych = *++YYCURSOR; - if(yych >= '\001') goto yy25; + if(yych >= 0x01) goto yy25; goto yy183; yy183: ++YYCURSOR; goto yy184; yy184: -#line 87 "implicit.re" +#line 88 "implicit.re" { return "bool#yes"; } -#line 1465 "<stdout>" +#line 1497 "<stdout>" yy185: yych = *++YYCURSOR; switch(yych){ case 'f': goto yy172; @@ -1559,7 +1560,7 @@ default: goto yy25; } yy198: yych = *++YYCURSOR; - if(yych <= '\000') goto yy6; + if(yych <= 0x00) goto yy6; goto yy25; yy199: yych = *++YYCURSOR; switch(yych){ @@ -1577,7 +1578,7 @@ default: goto yy25; } } -#line 125 "implicit.re" +#line 126 "implicit.re" } @@ -1616,17 +1617,17 @@ limit = type_id + strlen( type_id ); -#line 1552 "<stdout>" +#line 1621 "<stdout>" { YYCTYPE yych; - unsigned int yyaccept; + unsigned int yyaccept = 0; goto yy202; -yy203: ++YYCURSOR; + ++YYCURSOR; yy202: if((YYLIMIT - YYCURSOR) < 21) YYFILL(21); yych = *YYCURSOR; switch(yych){ - case '\000': goto yy204; + case 0x00: goto yy204; case '!': goto yy208; case '0': case '1': @@ -1762,9 +1763,9 @@ default: goto yy206; } yy206: -#line 202 "implicit.re" +#line 203 "implicit.re" { return syck_taguri( YAML_DOMAIN, type_id, strlen( type_id ) ); } -#line 1700 "<stdout>" +#line 1769 "<stdout>" yy207: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ @@ -1836,9 +1837,9 @@ yy208: ++YYCURSOR; goto yy209; yy209: -#line 176 "implicit.re" +#line 177 "implicit.re" { return syck_xprivate( type_id + 1, strlen( type_id ) - 1 ); } -#line 1774 "<stdout>" +#line 1843 "<stdout>" yy210: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ @@ -1979,7 +1980,7 @@ default: goto yy204; } yy214: ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); + if((YYLIMIT - YYCURSOR) < 12) YYFILL(12); yych = *YYCURSOR; goto yy215; yy215: switch(yych){ @@ -2132,7 +2133,7 @@ yy218: ++YYCURSOR; goto yy219; yy219: -#line 178 "implicit.re" +#line 179 "implicit.re" { char *domain = S_ALLOC_N( char, ( YYCURSOR - type_id ) + 15 ); char *uri; @@ -2145,9 +2146,9 @@ S_FREE( domain ); return uri; } -#line 2084 "<stdout>" +#line 2150 "<stdout>" yy220: ++YYCURSOR; - if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); + if((YYLIMIT - YYCURSOR) < 12) YYFILL(12); yych = *YYCURSOR; goto yy221; yy221: switch(yych){ @@ -2350,7 +2351,7 @@ yy229: ++YYCURSOR; goto yy230; yy230: -#line 191 "implicit.re" +#line 192 "implicit.re" { char *domain = S_ALLOC_N( char, YYCURSOR - type_id ); char *uri; @@ -2361,7 +2362,7 @@ S_FREE( domain ); return uri; } -#line 2302 "<stdout>" +#line 2366 "<stdout>" yy231: yych = *++YYCURSOR; switch(yych){ case '0': @@ -2479,9 +2480,9 @@ yy244: ++YYCURSOR; goto yy245; yy245: -#line 174 "implicit.re" +#line 175 "implicit.re" { return type_id; } -#line 2422 "<stdout>" +#line 2486 "<stdout>" yy246: yych = *++YYCURSOR; switch(yych){ case ',': goto yy216; @@ -2506,7 +2507,7 @@ default: goto yy250; } yy249: ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); + if((YYLIMIT - YYCURSOR) < 12) YYFILL(12); yych = *YYCURSOR; goto yy250; yy250: switch(yych){ @@ -2724,7 +2725,7 @@ default: goto yy204; } yy255: ++YYCURSOR; - if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); + if((YYLIMIT - YYCURSOR) < 12) YYFILL(12); yych = *YYCURSOR; goto yy256; yy256: switch(yych){ @@ -2926,9 +2927,9 @@ yy264: ++YYCURSOR; goto yy265; yy265: -#line 172 "implicit.re" +#line 173 "implicit.re" { return type_id; } -#line 2874 "<stdout>" +#line 2933 "<stdout>" yy266: yych = *++YYCURSOR; switch(yych){ case '0': @@ -2983,7 +2984,7 @@ default: goto yy204; } } -#line 204 "implicit.re" +#line 205 "implicit.re" } only in patch2: unchanged: --- syck-0.55.orig/lib/token.c +++ syck-0.55/lib/token.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.9.3 on Tue Apr 12 21:11:14 2005 */ +/* Generated by re2c 0.9.12 on Sat Apr 29 18:56:50 2006 */ #line 1 "token.re" /* * token.re @@ -8,6 +8,8 @@ * * Copyright (C) 2003 why the lucky stiff */ +#include <stdlib.h> +#include <string.h> #include "syck.h" #include "gram.h" @@ -289,7 +291,7 @@ return t; } -#line 312 "token.re" +#line 314 "token.re" if ( YYLINEPTR != YYCURSOR ) @@ -302,19 +304,19 @@ YYTOKEN = YYCURSOR; -#line 7 "<stdout>" +#line 308 "<stdout>" { YYCTYPE yych; - unsigned int yyaccept; + unsigned int yyaccept = 0; goto yy0; -yy1: ++YYCURSOR; + ++YYCURSOR; yy0: if((YYLIMIT - YYCURSOR) < 5) YYFILL(5); yych = *YYCURSOR; switch(yych){ - case '\000': goto yy7; - case '\n': goto yy9; - case '\r': goto yy11; + case 0x00: goto yy7; + case 0x0A: goto yy9; + case 0x0D: goto yy11; case ' ': goto yy12; case '#': goto yy5; case '-': goto yy2; @@ -328,11 +330,11 @@ default: goto yy3; } yy3: -#line 371 "token.re" +#line 373 "token.re" { YYPOS(0); goto Document; } -#line 37 "<stdout>" +#line 338 "<stdout>" yy4: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ @@ -342,44 +344,44 @@ yy5: ++YYCURSOR; goto yy6; yy6: -#line 353 "token.re" +#line 355 "token.re" { eat_comments( parser ); goto Header; } -#line 51 "<stdout>" +#line 352 "<stdout>" yy7: ++YYCURSOR; goto yy8; yy8: -#line 357 "token.re" +#line 359 "token.re" { SyckLevel *lvl = CURRENT_LEVEL(); ENSURE_YAML_IEND(lvl, -1); YYPOS(0); return 0; } -#line 61 "<stdout>" +#line 362 "<stdout>" yy9: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); goto yy18; yy10: -#line 363 "token.re" +#line 365 "token.re" { GOBBLE_UP_YAML_INDENT( doc_level, YYTOKEN ); goto Header; } -#line 70 "<stdout>" +#line 371 "<stdout>" yy11: yych = *++YYCURSOR; switch(yych){ - case '\n': goto yy17; + case 0x0A: goto yy17; default: goto yy3; } yy12: ++YYCURSOR; yych = *YYCURSOR; goto yy16; yy13: -#line 367 "token.re" +#line 369 "token.re" { doc_level = YYCURSOR - YYLINEPTR; goto Header; } -#line 83 "<stdout>" +#line 385 "<stdout>" yy14: yych = *++YYCURSOR; goto yy3; yy15: ++YYCURSOR; @@ -396,15 +398,15 @@ yych = *YYCURSOR; goto yy18; yy18: switch(yych){ - case '\n': case ' ': goto yy17; - case '\r': goto yy19; + case 0x0A: case ' ': goto yy17; + case 0x0D: goto yy19; default: goto yy10; } yy19: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych){ - case '\n': goto yy17; + case 0x0A: goto yy17; default: goto yy20; } yy20: YYCURSOR = YYMARKER; @@ -419,15 +421,15 @@ } yy22: yych = *++YYCURSOR; switch(yych){ - case '\n': goto yy23; - case '\r': goto yy27; + case 0x0A: goto yy23; + case 0x0D: goto yy27; case ' ': goto yy25; default: goto yy20; } yy23: ++YYCURSOR; goto yy24; yy24: -#line 339 "token.re" +#line 341 "token.re" { SyckLevel *lvl = CURRENT_LEVEL(); if ( lvl->status == syck_lvl_header ) { @@ -441,7 +443,7 @@ } return 0; } -#line 147 "<stdout>" +#line 447 "<stdout>" yy25: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -452,7 +454,7 @@ } yy27: yych = *++YYCURSOR; switch(yych){ - case '\n': goto yy23; + case 0x0A: goto yy23; default: goto yy20; } yy28: yych = *++YYCURSOR; @@ -462,15 +464,15 @@ } yy29: yych = *++YYCURSOR; switch(yych){ - case '\n': goto yy30; - case '\r': goto yy34; + case 0x0A: goto yy30; + case 0x0D: goto yy34; case ' ': goto yy32; default: goto yy20; } yy30: ++YYCURSOR; goto yy31; yy31: -#line 325 "token.re" +#line 327 "token.re" { SyckLevel *lvl = CURRENT_LEVEL(); if ( lvl->status == syck_lvl_header ) { @@ -484,7 +486,7 @@ return 0; } } -#line 191 "<stdout>" +#line 490 "<stdout>" yy32: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -495,11 +497,11 @@ } yy34: ++YYCURSOR; switch((yych = *YYCURSOR)) { - case '\n': goto yy30; + case 0x0A: goto yy30; default: goto yy20; } } -#line 375 "token.re" +#line 377 "token.re" Document: @@ -513,19 +515,19 @@ YYTOKEN = YYCURSOR; -#line 209 "<stdout>" +#line 519 "<stdout>" { YYCTYPE yych; - unsigned int yyaccept; + unsigned int yyaccept = 0; goto yy35; -yy36: ++YYCURSOR; + ++YYCURSOR; yy35: if((YYLIMIT - YYCURSOR) < 3) YYFILL(3); yych = *YYCURSOR; switch(yych){ - case '\000': goto yy62; - case '\n': goto yy37; - case '\r': goto yy39; + case 0x00: goto yy62; + case 0x0A: goto yy37; + case 0x0D: goto yy39; case ' ': goto yy60; case '!': goto yy51; case '"': goto yy55; @@ -545,7 +547,7 @@ yych = *(YYMARKER = ++YYCURSOR); goto yy92; yy38: -#line 389 "token.re" +#line 391 "token.re" { /* Isolate spaces */ int indt_len; GOBBLE_UP_YAML_INDENT( indt_len, YYTOKEN ); @@ -573,59 +575,59 @@ } return YAML_INDENT; } -#line 269 "<stdout>" +#line 579 "<stdout>" yy39: ++YYCURSOR; switch((yych = *YYCURSOR)) { - case '\n': goto yy91; + case 0x0A: goto yy91; default: goto yy40; } yy40: -#line 493 "token.re" +#line 495 "token.re" { ENSURE_YAML_IOPEN(lvl, doc_level, 1); goto Plain; } -#line 280 "<stdout>" +#line 590 "<stdout>" yy41: ++YYCURSOR; goto yy42; yy42: -#line 417 "token.re" +#line 419 "token.re" { ENSURE_YAML_IOPEN(lvl, doc_level, 1); lvl = CURRENT_LEVEL(); ADD_LEVEL(lvl->spaces + 1, syck_lvl_iseq); return YYTOKEN[0]; } -#line 290 "<stdout>" +#line 600 "<stdout>" yy43: ++YYCURSOR; goto yy44; yy44: -#line 423 "token.re" +#line 425 "token.re" { ENSURE_YAML_IOPEN(lvl, doc_level, 1); lvl = CURRENT_LEVEL(); ADD_LEVEL(lvl->spaces + 1, syck_lvl_imap); return YYTOKEN[0]; } -#line 300 "<stdout>" +#line 610 "<stdout>" yy45: ++YYCURSOR; goto yy46; yy46: -#line 429 "token.re" +#line 431 "token.re" { POP_LEVEL(); return YYTOKEN[0]; } -#line 308 "<stdout>" +#line 618 "<stdout>" yy47: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ - case '\n': goto yy86; - case '\r': goto yy90; + case 0x0A: goto yy86; + case 0x0D: goto yy90; case ' ': goto yy88; default: goto yy40; } yy48: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ - case '\n': goto yy81; - case '\r': goto yy85; + case 0x0A: goto yy81; + case 0x0D: goto yy85; case ' ': goto yy83; default: goto yy40; } @@ -760,28 +762,28 @@ yy51: ++YYCURSOR; goto yy52; yy52: -#line 467 "token.re" +#line 469 "token.re" { goto TransferMethod; } -#line 458 "<stdout>" +#line 768 "<stdout>" yy53: ++YYCURSOR; goto yy54; yy54: -#line 469 "token.re" +#line 471 "token.re" { ENSURE_YAML_IOPEN(lvl, doc_level, 1); goto SingleQuote; } -#line 465 "<stdout>" +#line 775 "<stdout>" yy55: ++YYCURSOR; goto yy56; yy56: -#line 472 "token.re" +#line 474 "token.re" { ENSURE_YAML_IOPEN(lvl, doc_level, 1); goto DoubleQuote; } -#line 472 "<stdout>" +#line 782 "<stdout>" yy57: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ - case '\n': goto yy70; - case '\r': goto yy74; + case 0x0A: goto yy70; + case 0x0D: goto yy74; case ' ': goto yy72; case '+': case '-': case '0': case '1': @@ -798,27 +800,27 @@ yy58: ++YYCURSOR; goto yy59; yy59: -#line 482 "token.re" +#line 484 "token.re" { eat_comments( parser ); goto Document; } -#line 498 "<stdout>" +#line 808 "<stdout>" yy60: ++YYCURSOR; yych = *YYCURSOR; goto yy66; yy61: -#line 486 "token.re" +#line 488 "token.re" { goto Document; } -#line 504 "<stdout>" +#line 815 "<stdout>" yy62: ++YYCURSOR; goto yy63; yy63: -#line 488 "token.re" +#line 490 "token.re" { ENSURE_YAML_IEND(lvl, -1); YYPOS(0); return 0; } -#line 513 "<stdout>" +#line 824 "<stdout>" yy64: yych = *++YYCURSOR; goto yy40; yy65: ++YYCURSOR; @@ -830,12 +832,12 @@ default: goto yy61; } yy67: ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); + if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; goto yy68; yy68: switch(yych){ - case '\n': goto yy70; - case '\r': goto yy74; + case 0x0A: goto yy70; + case 0x0D: goto yy74; case ' ': goto yy72; case '+': case '-': case '0': case '1': @@ -857,14 +859,14 @@ yy70: ++YYCURSOR; goto yy71; yy71: -#line 475 "token.re" +#line 477 "token.re" { if ( is_newline( YYCURSOR - 1 ) ) { YYCURSOR--; } goto ScalarBlock; } -#line 561 "<stdout>" +#line 870 "<stdout>" yy72: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -875,7 +877,7 @@ } yy74: yych = *++YYCURSOR; switch(yych){ - case '\n': goto yy70; + case 0x0A: goto yy70; default: goto yy69; } yy75: ++YYCURSOR; @@ -946,12 +948,12 @@ default: goto yy77; } yy77: -#line 462 "token.re" +#line 464 "token.re" { ENSURE_YAML_IOPEN(lvl, doc_level, 1); sycklval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 ); return YAML_ALIAS; } -#line 650 "<stdout>" +#line 957 "<stdout>" yy78: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -1020,7 +1022,7 @@ default: goto yy80; } yy80: -#line 451 "token.re" +#line 453 "token.re" { sycklval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 ); /* @@ -1031,11 +1033,11 @@ syck_hdlr_remove_anchor(parser, sycklval->name); return YAML_ANCHOR; } -#line 731 "<stdout>" +#line 1037 "<stdout>" yy81: ++YYCURSOR; goto yy82; yy82: -#line 437 "token.re" +#line 439 "token.re" { ENSURE_YAML_IOPEN(lvl, YYTOKEN - YYLINEPTR, 1); FORCE_NEXT_TOKEN(YAML_IOPEN); if ( *YYCURSOR == '#' || is_newline( YYCURSOR ) || is_newline( YYCURSOR - 1 ) ) @@ -1049,7 +1051,7 @@ } return YYTOKEN[0]; } -#line 749 "<stdout>" +#line 1055 "<stdout>" yy83: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -1060,17 +1062,17 @@ } yy85: yych = *++YYCURSOR; switch(yych){ - case '\n': goto yy81; + case 0x0A: goto yy81; default: goto yy69; } yy86: ++YYCURSOR; goto yy87; yy87: -#line 433 "token.re" +#line 435 "token.re" { YYPOS(1); return YYTOKEN[0]; } -#line 771 "<stdout>" +#line 1076 "<stdout>" yy88: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -1081,7 +1083,7 @@ } yy90: yych = *++YYCURSOR; switch(yych){ - case '\n': goto yy86; + case 0x0A: goto yy86; default: goto yy69; } yy91: yyaccept = 0; @@ -1090,19 +1092,19 @@ yych = *YYCURSOR; goto yy92; yy92: switch(yych){ - case '\n': case ' ': goto yy91; - case '\r': goto yy93; + case 0x0A: case ' ': goto yy91; + case 0x0D: goto yy93; default: goto yy38; } yy93: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych){ - case '\n': goto yy91; + case 0x0A: goto yy91; default: goto yy69; } } -#line 497 "token.re" +#line 499 "token.re" } @@ -1111,17 +1113,17 @@ YYTOKTMP = YYCURSOR; -#line 807 "<stdout>" +#line 1117 "<stdout>" { YYCTYPE yych; - unsigned int yyaccept; + unsigned int yyaccept = 0; goto yy94; -yy95: ++YYCURSOR; + ++YYCURSOR; yy94: if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; switch(yych){ - case '\000': goto yy96; + case 0x00: goto yy96; case ' ': goto yy99; case '%': goto yy97; default: goto yy101; @@ -1211,18 +1213,18 @@ default: goto yy98; } yy98: -#line 510 "token.re" +#line 512 "token.re" { YYCURSOR = YYTOKTMP; return YAML_DOCSEP; } -#line 911 "<stdout>" +#line 1221 "<stdout>" yy99: ++YYCURSOR; yych = *YYCURSOR; goto yy103; yy100: -#line 508 "token.re" +#line 510 "token.re" { goto Directive; } -#line 917 "<stdout>" +#line 1228 "<stdout>" yy101: yych = *++YYCURSOR; goto yy98; yy102: ++YYCURSOR; @@ -1234,7 +1236,7 @@ default: goto yy100; } yy104: ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); + if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; goto yy105; yy105: switch(yych){ @@ -1476,11 +1478,11 @@ default: goto yy109; } yy109: -#line 506 "token.re" +#line 508 "token.re" { goto Directive; } -#line 1176 "<stdout>" +#line 1484 "<stdout>" } -#line 513 "token.re" +#line 515 "token.re" } @@ -1503,19 +1505,19 @@ Plain3: -#line 1180 "<stdout>" +#line 1509 "<stdout>" { YYCTYPE yych; - unsigned int yyaccept; + unsigned int yyaccept = 0; goto yy110; -yy111: ++YYCURSOR; + ++YYCURSOR; yy110: if((YYLIMIT - YYCURSOR) < 3) YYFILL(3); yych = *YYCURSOR; switch(yych){ - case '\000': goto yy124; - case '\n': goto yy112; - case '\r': goto yy114; + case 0x00: goto yy124; + case 0x0A: goto yy112; + case 0x0D: goto yy114; case ' ': goto yy122; case ',': goto yy117; case ':': goto yy116; @@ -1527,7 +1529,7 @@ yych = *(YYMARKER = ++YYCURSOR); goto yy141; yy113: -#line 536 "token.re" +#line 538 "token.re" { int indt_len, nl_count = 0; SyckLevel *lvl; char *tok = YYTOKEN; @@ -1563,38 +1565,38 @@ goto Plain2; } -#line 1240 "<stdout>" +#line 1569 "<stdout>" yy114: ++YYCURSOR; switch((yych = *YYCURSOR)) { - case '\n': goto yy140; + case 0x0A: goto yy140; default: goto yy115; } yy115: -#line 615 "token.re" +#line 617 "token.re" { QUOTECATS(qstr, qcapa, qidx, YYTOKEN, YYCURSOR - YYTOKEN); goto Plain2; } -#line 1251 "<stdout>" +#line 1580 "<stdout>" yy116: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ - case '\n': goto yy135; - case '\r': goto yy139; + case 0x0A: goto yy135; + case 0x0D: goto yy139; case ' ': goto yy137; default: goto yy115; } yy117: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ - case '\n': goto yy129; - case '\r': goto yy133; + case 0x0A: goto yy129; + case 0x0D: goto yy133; case ' ': goto yy131; default: goto yy115; } yy118: ++YYCURSOR; goto yy119; yy119: -#line 585 "token.re" +#line 587 "token.re" { if ( plvl->status != syck_lvl_imap ) { PLAIN_NOT_INL(); @@ -1605,11 +1607,11 @@ } RETURN_IMPLICIT(); } -#line 1282 "<stdout>" +#line 1611 "<stdout>" yy120: ++YYCURSOR; goto yy121; yy121: -#line 596 "token.re" +#line 598 "token.re" { if ( plvl->status != syck_lvl_iseq ) { PLAIN_NOT_INL(); @@ -1620,36 +1622,36 @@ } RETURN_IMPLICIT(); } -#line 1297 "<stdout>" +#line 1626 "<stdout>" yy122: ++YYCURSOR; switch((yych = *YYCURSOR)) { case '#': goto yy127; default: goto yy123; } yy123: -#line 613 "token.re" +#line 615 "token.re" { goto Plain3; } -#line 1306 "<stdout>" +#line 1635 "<stdout>" yy124: ++YYCURSOR; goto yy125; yy125: -#line 611 "token.re" +#line 613 "token.re" { RETURN_IMPLICIT(); } -#line 1312 "<stdout>" +#line 1641 "<stdout>" yy126: yych = *++YYCURSOR; goto yy115; yy127: ++YYCURSOR; goto yy128; yy128: -#line 607 "token.re" +#line 609 "token.re" { eat_comments( parser ); RETURN_IMPLICIT(); } -#line 1322 "<stdout>" +#line 1651 "<stdout>" yy129: ++YYCURSOR; goto yy130; yy130: -#line 574 "token.re" +#line 576 "token.re" { if ( plvl->status != syck_lvl_iseq && plvl->status != syck_lvl_imap ) { PLAIN_NOT_INL(); @@ -1660,7 +1662,7 @@ } RETURN_IMPLICIT(); } -#line 1337 "<stdout>" +#line 1666 "<stdout>" yy131: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -1671,7 +1673,7 @@ } yy133: yych = *++YYCURSOR; switch(yych){ - case '\n': goto yy129; + case 0x0A: goto yy129; default: goto yy134; } yy134: YYCURSOR = YYMARKER; @@ -1682,9 +1684,9 @@ yy135: ++YYCURSOR; goto yy136; yy136: -#line 572 "token.re" +#line 574 "token.re" { RETURN_IMPLICIT(); } -#line 1362 "<stdout>" +#line 1690 "<stdout>" yy137: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -1695,7 +1697,7 @@ } yy139: yych = *++YYCURSOR; switch(yych){ - case '\n': goto yy135; + case 0x0A: goto yy135; default: goto yy134; } yy140: yyaccept = 0; @@ -1704,19 +1706,19 @@ yych = *YYCURSOR; goto yy141; yy141: switch(yych){ - case '\n': case ' ': goto yy140; - case '\r': goto yy142; + case 0x0A: case ' ': goto yy140; + case 0x0D: goto yy142; default: goto yy113; } yy142: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych){ - case '\n': goto yy140; + case 0x0A: goto yy140; default: goto yy134; } } -#line 619 "token.re" +#line 621 "token.re" } @@ -1730,19 +1732,19 @@ YYTOKEN = YYCURSOR; -#line 1398 "<stdout>" +#line 1736 "<stdout>" { YYCTYPE yych; - unsigned int yyaccept; + unsigned int yyaccept = 0; goto yy143; -yy144: ++YYCURSOR; + ++YYCURSOR; yy143: if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; switch(yych){ - case '\000': goto yy151; - case '\n': goto yy145; - case '\r': goto yy147; + case 0x00: goto yy151; + case 0x0A: goto yy145; + case 0x0D: goto yy147; case '\'': goto yy149; default: goto yy152; } @@ -1750,7 +1752,7 @@ yych = *(YYMARKER = ++YYCURSOR); goto yy156; yy146: -#line 633 "token.re" +#line 635 "token.re" { int indt_len; int nl_count = 0; SyckLevel *lvl; @@ -1790,25 +1792,25 @@ goto SingleQuote2; } -#line 1458 "<stdout>" +#line 1796 "<stdout>" yy147: ++YYCURSOR; switch((yych = *YYCURSOR)) { - case '\n': goto yy155; + case 0x0A: goto yy155; default: goto yy148; } yy148: -#line 700 "token.re" +#line 702 "token.re" { QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); goto SingleQuote2; } -#line 1469 "<stdout>" +#line 1807 "<stdout>" yy149: ++YYCURSOR; switch((yych = *YYCURSOR)) { case '\'': goto yy153; default: goto yy150; } yy150: -#line 677 "token.re" +#line 679 "token.re" { SyckLevel *lvl; SyckNode *n = syck_alloc_str(); lvl = CURRENT_LEVEL(); @@ -1831,7 +1833,7 @@ sycklval->nodeData = n; return YAML_PLAIN; } -#line 1499 "<stdout>" +#line 1837 "<stdout>" yy151: yych = *++YYCURSOR; goto yy150; yy152: yych = *++YYCURSOR; @@ -1839,26 +1841,26 @@ yy153: ++YYCURSOR; goto yy154; yy154: -#line 673 "token.re" +#line 675 "token.re" { QUOTECAT(qstr, qcapa, qidx, '\''); goto SingleQuote2; } -#line 1511 "<stdout>" +#line 1849 "<stdout>" yy155: yyaccept = 0; YYMARKER = ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; goto yy156; yy156: switch(yych){ - case '\n': case ' ': goto yy155; - case '\r': goto yy157; + case 0x0A: case ' ': goto yy155; + case 0x0D: goto yy157; default: goto yy146; } yy157: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych){ - case '\n': goto yy155; + case 0x0A: goto yy155; default: goto yy158; } yy158: YYCURSOR = YYMARKER; @@ -1866,7 +1868,7 @@ case 0: goto yy146; } } -#line 704 "token.re" +#line 706 "token.re" } @@ -1884,19 +1886,19 @@ -#line 1537 "<stdout>" +#line 1890 "<stdout>" { YYCTYPE yych; - unsigned int yyaccept; + unsigned int yyaccept = 0; goto yy159; -yy160: ++YYCURSOR; + ++YYCURSOR; yy159: if((YYLIMIT - YYCURSOR) < 4) YYFILL(4); yych = *YYCURSOR; switch(yych){ - case '\000': goto yy166; - case '\n': goto yy161; - case '\r': goto yy163; + case 0x00: goto yy166; + case 0x0A: goto yy161; + case 0x0D: goto yy163; case '"': goto yy168; case '\\': goto yy165; default: goto yy169; @@ -1905,7 +1907,7 @@ yych = *(YYMARKER = ++YYCURSOR); goto yy183; yy162: -#line 722 "token.re" +#line 724 "token.re" { int indt_len; int nl_count = 0; SyckLevel *lvl; @@ -1949,23 +1951,23 @@ keep_nl = 1; goto DoubleQuote2; } -#line 1602 "<stdout>" +#line 1955 "<stdout>" yy163: ++YYCURSOR; switch((yych = *YYCURSOR)) { - case '\n': goto yy182; + case 0x0A: goto yy182; default: goto yy164; } yy164: -#line 808 "token.re" +#line 810 "token.re" { QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); goto DoubleQuote2; } -#line 1613 "<stdout>" +#line 1966 "<stdout>" yy165: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ - case '\n': goto yy173; - case '\r': goto yy175; + case 0x0A: goto yy173; + case 0x0D: goto yy175; case ' ': goto yy170; case '"': case '0': case '\\': case 'a': case 'b': case 'e': @@ -1976,7 +1978,7 @@ yy166: ++YYCURSOR; goto yy167; yy167: -#line 785 "token.re" +#line 787 "token.re" { SyckLevel *lvl; SyckNode *n = syck_alloc_str(); lvl = CURRENT_LEVEL(); @@ -1999,18 +2001,18 @@ sycklval->nodeData = n; return YAML_PLAIN; } -#line 1652 "<stdout>" +#line 2005 "<stdout>" yy168: yych = *++YYCURSOR; goto yy167; yy169: yych = *++YYCURSOR; goto yy164; yy170: ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); + if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; goto yy171; yy171: switch(yych){ - case '\n': goto yy173; - case '\r': goto yy175; + case 0x0A: goto yy173; + case 0x0D: goto yy175; case ' ': goto yy170; default: goto yy172; } @@ -2022,15 +2024,15 @@ yy173: ++YYCURSOR; goto yy174; yy174: -#line 780 "token.re" +#line 782 "token.re" { keep_nl = 0; YYCURSOR--; goto DoubleQuote2; } -#line 1681 "<stdout>" +#line 2033 "<stdout>" yy175: yych = *++YYCURSOR; switch(yych){ - case '\n': goto yy173; + case 0x0A: goto yy173; default: goto yy172; } yy176: yych = *++YYCURSOR; @@ -2060,12 +2062,12 @@ yy177: ++YYCURSOR; goto yy178; yy178: -#line 766 "token.re" +#line 768 "token.re" { char ch = *( YYCURSOR - 1 ); QUOTECAT(qstr, qcapa, qidx, escape_seq( ch )); goto DoubleQuote2; } -#line 1719 "<stdout>" +#line 2071 "<stdout>" yy179: yych = *++YYCURSOR; switch(yych){ case '0': @@ -2093,7 +2095,7 @@ yy180: ++YYCURSOR; goto yy181; yy181: -#line 771 "token.re" +#line 773 "token.re" { long ch; char *chr_text = syck_strndup( YYTOKEN, 4 ); chr_text[0] = '0'; @@ -2102,26 +2104,26 @@ QUOTECAT(qstr, qcapa, qidx, ch); goto DoubleQuote2; } -#line 1756 "<stdout>" +#line 2108 "<stdout>" yy182: yyaccept = 0; YYMARKER = ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; goto yy183; yy183: switch(yych){ - case '\n': case ' ': goto yy182; - case '\r': goto yy184; + case 0x0A: case ' ': goto yy182; + case 0x0D: goto yy184; default: goto yy162; } yy184: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych){ - case '\n': goto yy182; + case 0x0A: goto yy182; default: goto yy172; } } -#line 812 "token.re" +#line 814 "token.re" } @@ -2135,19 +2137,19 @@ YYTOKTMP = YYCURSOR; -#line 1778 "<stdout>" +#line 2141 "<stdout>" { YYCTYPE yych; - unsigned int yyaccept; + unsigned int yyaccept = 0; goto yy185; -yy186: ++YYCURSOR; + ++YYCURSOR; yy185: if((YYLIMIT - YYCURSOR) < 4) YYFILL(4); yych = *YYCURSOR; switch(yych){ - case '\000': goto yy187; - case '\n': goto yy189; - case '\r': goto yy191; + case 0x00: goto yy187; + case 0x0A: goto yy189; + case 0x0D: goto yy191; case ' ': goto yy190; case '\\': goto yy193; default: goto yy194; @@ -2155,7 +2157,7 @@ yy187: ++YYCURSOR; goto yy188; yy188: -#line 826 "token.re" +#line 828 "token.re" { SyckLevel *lvl; YYCURSOR = YYTOKTMP; if ( YYCURSOR == YYTOKEN + 1 ) @@ -2205,22 +2207,22 @@ return YAML_TRANSFER; } -#line 1848 "<stdout>" +#line 2211 "<stdout>" yy189: yych = *++YYCURSOR; goto yy188; yy190: yych = *++YYCURSOR; goto yy203; yy191: ++YYCURSOR; switch((yych = *YYCURSOR)) { - case '\n': goto yy187; + case 0x0A: goto yy187; default: goto yy192; } yy192: -#line 893 "token.re" +#line 895 "token.re" { QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); goto TransferMethod2; } -#line 1863 "<stdout>" +#line 2226 "<stdout>" yy193: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ @@ -2263,12 +2265,12 @@ yy197: ++YYCURSOR; goto yy198; yy198: -#line 879 "token.re" +#line 881 "token.re" { char ch = *( YYCURSOR - 1 ); QUOTECAT(qstr, qcapa, qidx, escape_seq( ch )); goto TransferMethod2; } -#line 1911 "<stdout>" +#line 2274 "<stdout>" yy199: yych = *++YYCURSOR; switch(yych){ case '0': @@ -2296,7 +2298,7 @@ yy200: ++YYCURSOR; goto yy201; yy201: -#line 884 "token.re" +#line 886 "token.re" { long ch; char *chr_text = syck_strndup( YYTOKTMP, 4 ); chr_text[0] = '0'; @@ -2305,7 +2307,7 @@ QUOTECAT(qstr, qcapa, qidx, ch); goto TransferMethod2; } -#line 1948 "<stdout>" +#line 2311 "<stdout>" yy202: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -2315,7 +2317,7 @@ default: goto yy188; } } -#line 898 "token.re" +#line 900 "token.re" } @@ -2362,19 +2364,19 @@ YYTOKEN = YYCURSOR; -#line 1961 "<stdout>" +#line 2368 "<stdout>" { YYCTYPE yych; - unsigned int yyaccept; + unsigned int yyaccept = 0; goto yy204; -yy205: ++YYCURSOR; + ++YYCURSOR; yy204: if((YYLIMIT - YYCURSOR) < 5) YYFILL(5); yych = *YYCURSOR; switch(yych){ - case '\000': goto yy212; - case '\n': goto yy206; - case '\r': goto yy208; + case 0x00: goto yy212; + case 0x0A: goto yy206; + case 0x0D: goto yy208; case '#': goto yy210; case '-': goto yy214; default: goto yy215; @@ -2383,7 +2385,7 @@ yych = *(YYMARKER = ++YYCURSOR); goto yy225; yy207: -#line 945 "token.re" +#line 947 "token.re" { char *pacer; char *tok = YYTOKEN; int indt_len = 0, nl_count = 0, fold_nl = 0, nl_begin = 0; @@ -2453,22 +2455,22 @@ } goto ScalarBlock2; } -#line 2052 "<stdout>" +#line 2459 "<stdout>" yy208: ++YYCURSOR; switch((yych = *YYCURSOR)) { - case '\n': goto yy224; + case 0x0A: goto yy224; default: goto yy209; } yy209: -#line 1054 "token.re" +#line 1056 "token.re" { QUOTECAT(qstr, qcapa, qidx, *YYTOKEN); goto ScalarBlock2; } -#line 2063 "<stdout>" +#line 2470 "<stdout>" yy210: ++YYCURSOR; goto yy211; yy211: -#line 1016 "token.re" +#line 1018 "token.re" { lvl = CURRENT_LEVEL(); if ( lvl->status != syck_lvl_block ) { @@ -2481,16 +2483,16 @@ } goto ScalarBlock2; } -#line 2080 "<stdout>" +#line 2487 "<stdout>" yy212: ++YYCURSOR; goto yy213; yy213: -#line 1030 "token.re" +#line 1032 "token.re" { YYCURSOR--; POP_LEVEL(); RETURN_YAML_BLOCK(); } -#line 2089 "<stdout>" +#line 2496 "<stdout>" yy214: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ @@ -2511,15 +2513,15 @@ } yy218: yych = *++YYCURSOR; switch(yych){ - case '\n': goto yy219; - case '\r': goto yy223; + case 0x0A: goto yy219; + case 0x0D: goto yy223; case ' ': goto yy221; default: goto yy217; } yy219: ++YYCURSOR; goto yy220; yy220: -#line 1035 "token.re" +#line 1037 "token.re" { if ( YYTOKEN == YYLINEPTR ) { if ( blockType == BLOCK_FOLD && qidx > 0 ) @@ -2538,7 +2540,7 @@ goto ScalarBlock2; } } -#line 2137 "<stdout>" +#line 2544 "<stdout>" yy221: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -2549,7 +2551,7 @@ } yy223: yych = *++YYCURSOR; switch(yych){ - case '\n': goto yy219; + case 0x0A: goto yy219; default: goto yy217; } yy224: yyaccept = 0; @@ -2558,19 +2560,19 @@ yych = *YYCURSOR; goto yy225; yy225: switch(yych){ - case '\n': case ' ': goto yy224; - case '\r': goto yy226; + case 0x0A: case ' ': goto yy224; + case 0x0D: goto yy226; default: goto yy207; } yy226: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych){ - case '\n': goto yy224; + case 0x0A: goto yy224; default: goto yy217; } } -#line 1059 "token.re" +#line 1061 "token.re" } @@ -2586,42 +2588,42 @@ YYTOKEN = YYCURSOR; -#line 2173 "<stdout>" +#line 2592 "<stdout>" { YYCTYPE yych; - unsigned int yyaccept; + unsigned int yyaccept = 0; goto yy227; -yy228: ++YYCURSOR; + ++YYCURSOR; yy227: if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; switch(yych){ - case '\000': goto yy229; - case '\n': goto yy231; - case '\r': goto yy232; + case 0x00: goto yy229; + case 0x0A: goto yy231; + case 0x0D: goto yy232; default: goto yy234; } yy229: ++YYCURSOR; goto yy230; yy230: -#line 1075 "token.re" +#line 1077 "token.re" { YYCURSOR = YYTOKEN; return; } -#line 2195 "<stdout>" +#line 2614 "<stdout>" yy231: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); goto yy236; yy232: ++YYCURSOR; switch((yych = *YYCURSOR)) { - case '\n': goto yy235; + case 0x0A: goto yy235; default: goto yy233; } yy233: -#line 1079 "token.re" +#line 1081 "token.re" { goto Comment; } -#line 2208 "<stdout>" +#line 2627 "<stdout>" yy234: yych = *++YYCURSOR; goto yy233; yy235: yyaccept = 0; @@ -2630,15 +2632,15 @@ yych = *YYCURSOR; goto yy236; yy236: switch(yych){ - case '\n': goto yy235; - case '\r': goto yy237; + case 0x0A: goto yy235; + case 0x0D: goto yy237; default: goto yy230; } yy237: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych){ - case '\n': goto yy235; + case 0x0A: goto yy235; default: goto yy238; } yy238: YYCURSOR = YYMARKER; @@ -2646,7 +2648,7 @@ case 0: goto yy230; } } -#line 1082 "token.re" +#line 1084 "token.re" }