From d578f9d32e4c13df9ebf51873ae335c5e5a795ce Mon Sep 17 00:00:00 2001 From: why Date: Tue, 20 Sep 2005 06:50:20 +0000 Subject: * ext/syck/emitter.c (syck_scan_scalar): prevent indicators from appearing alone or at the end of plain scalars. [ruby-core:5826] * ext/syck/emitter.c (syck_emit_scalar): treat typed scalar nodes as complex keys. * lib/syck.h: version 0.60. * lib/yaml/basenode.rb (YAML::BaseNode#at): transform keys during key searches. * ext/syck/rubyext.c: loading of binary-typed nodes. prevent emission of plain strings that look like symbols, but which aren't. * ext/syck/emitter.c (syck_emit): passing an int* value to the long* parameter causes unaligned access on LP64 systems. [ruby-dev:27161] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9242 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/syck/token.c | 281 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 141 insertions(+), 140 deletions(-) (limited to 'ext/syck/token.c') diff --git a/ext/syck/token.c b/ext/syck/token.c index 8644058bd5..57a7910168 100644 --- a/ext/syck/token.c +++ b/ext/syck/token.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.9.10 on Sat Sep 17 00:51:29 2005 */ +/* Generated by re2c 0.9.10 on Mon Sep 19 23:23:24 2005 */ #line 1 "token.re" /* * token.re @@ -268,6 +268,7 @@ sycklex( YYSTYPE *sycklval, SyckParser *parser ) case syck_bytecode_utf8: return sycklex_bytecode_utf8( sycklval, parser ); } + return YAML_DOCSEP; } /* @@ -290,7 +291,7 @@ sycklex_yaml_utf8( YYSTYPE *sycklval, SyckParser *parser ) return t; } -#line 314 "token.re" +#line 315 "token.re" if ( YYLINEPTR != YYCURSOR ) @@ -303,7 +304,7 @@ Header: YYTOKEN = YYCURSOR; -#line 306 "" +#line 307 "" { YYCTYPE yych; unsigned int yyaccept; @@ -329,11 +330,11 @@ yy2: yyaccept = 0; default: goto yy3; } yy3: -#line 373 "token.re" +#line 374 "token.re" { YYPOS(0); goto Document; } -#line 336 "" +#line 337 "" yy4: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ @@ -343,30 +344,30 @@ yy4: yyaccept = 0; yy5: ++YYCURSOR; goto yy6; yy6: -#line 355 "token.re" +#line 356 "token.re" { eat_comments( parser ); goto Header; } -#line 350 "" +#line 351 "" yy7: ++YYCURSOR; goto yy8; yy8: -#line 359 "token.re" +#line 360 "token.re" { SyckLevel *lvl = CURRENT_LEVEL(); ENSURE_YAML_IEND(lvl, -1); YYPOS(0); return 0; } -#line 360 "" +#line 361 "" yy9: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); goto yy18; yy10: -#line 365 "token.re" +#line 366 "token.re" { GOBBLE_UP_YAML_INDENT( doc_level, YYTOKEN ); goto Header; } -#line 369 "" +#line 370 "" yy11: yych = *++YYCURSOR; switch(yych){ case 0x0A: goto yy17; @@ -376,11 +377,11 @@ yy12: ++YYCURSOR; yych = *YYCURSOR; goto yy16; yy13: -#line 369 "token.re" +#line 370 "token.re" { doc_level = YYCURSOR - YYLINEPTR; goto Header; } -#line 383 "" +#line 384 "" yy14: yych = *++YYCURSOR; goto yy3; yy15: ++YYCURSOR; @@ -428,7 +429,7 @@ yy22: yych = *++YYCURSOR; yy23: ++YYCURSOR; goto yy24; yy24: -#line 341 "token.re" +#line 342 "token.re" { SyckLevel *lvl = CURRENT_LEVEL(); if ( lvl->status == syck_lvl_header ) { @@ -442,7 +443,7 @@ yy24: } return 0; } -#line 445 "" +#line 446 "" yy25: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -471,7 +472,7 @@ yy29: yych = *++YYCURSOR; yy30: ++YYCURSOR; goto yy31; yy31: -#line 327 "token.re" +#line 328 "token.re" { SyckLevel *lvl = CURRENT_LEVEL(); if ( lvl->status == syck_lvl_header ) { @@ -485,7 +486,7 @@ yy31: return 0; } } -#line 488 "" +#line 489 "" yy32: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -500,7 +501,7 @@ yy34: ++YYCURSOR; default: goto yy20; } } -#line 377 "token.re" +#line 378 "token.re" Document: @@ -514,7 +515,7 @@ Document: YYTOKEN = YYCURSOR; -#line 517 "" +#line 518 "" { YYCTYPE yych; unsigned int yyaccept; @@ -546,7 +547,7 @@ yy37: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); goto yy92; yy38: -#line 391 "token.re" +#line 392 "token.re" { /* Isolate spaces */ int indt_len; GOBBLE_UP_YAML_INDENT( indt_len, YYTOKEN ); @@ -574,46 +575,46 @@ yy38: } return YAML_INDENT; } -#line 577 "" +#line 578 "" yy39: ++YYCURSOR; switch((yych = *YYCURSOR)) { case 0x0A: goto yy91; default: goto yy40; } yy40: -#line 495 "token.re" +#line 496 "token.re" { ENSURE_YAML_IOPEN(lvl, doc_level, 1); goto Plain; } -#line 588 "" +#line 589 "" yy41: ++YYCURSOR; goto yy42; yy42: -#line 419 "token.re" +#line 420 "token.re" { ENSURE_YAML_IOPEN(lvl, doc_level, 1); lvl = CURRENT_LEVEL(); ADD_LEVEL(lvl->spaces + 1, syck_lvl_iseq); return YYTOKEN[0]; } -#line 598 "" +#line 599 "" yy43: ++YYCURSOR; goto yy44; yy44: -#line 425 "token.re" +#line 426 "token.re" { ENSURE_YAML_IOPEN(lvl, doc_level, 1); lvl = CURRENT_LEVEL(); ADD_LEVEL(lvl->spaces + 1, syck_lvl_imap); return YYTOKEN[0]; } -#line 608 "" +#line 609 "" yy45: ++YYCURSOR; goto yy46; yy46: -#line 431 "token.re" +#line 432 "token.re" { POP_LEVEL(); return YYTOKEN[0]; } -#line 616 "" +#line 617 "" yy47: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ @@ -761,23 +762,23 @@ yy50: yych = *++YYCURSOR; yy51: ++YYCURSOR; goto yy52; yy52: -#line 469 "token.re" +#line 470 "token.re" { goto TransferMethod; } -#line 766 "" +#line 767 "" yy53: ++YYCURSOR; goto yy54; yy54: -#line 471 "token.re" +#line 472 "token.re" { ENSURE_YAML_IOPEN(lvl, doc_level, 1); goto SingleQuote; } -#line 773 "" +#line 774 "" yy55: ++YYCURSOR; goto yy56; yy56: -#line 474 "token.re" +#line 475 "token.re" { ENSURE_YAML_IOPEN(lvl, doc_level, 1); goto DoubleQuote; } -#line 780 "" +#line 781 "" yy57: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ @@ -799,27 +800,27 @@ yy57: yyaccept = 1; yy58: ++YYCURSOR; goto yy59; yy59: -#line 484 "token.re" +#line 485 "token.re" { eat_comments( parser ); goto Document; } -#line 806 "" +#line 807 "" yy60: ++YYCURSOR; yych = *YYCURSOR; goto yy66; yy61: -#line 488 "token.re" +#line 489 "token.re" { goto Document; } -#line 813 "" +#line 814 "" yy62: ++YYCURSOR; goto yy63; yy63: -#line 490 "token.re" +#line 491 "token.re" { ENSURE_YAML_IEND(lvl, -1); YYPOS(0); return 0; } -#line 822 "" +#line 823 "" yy64: yych = *++YYCURSOR; goto yy40; yy65: ++YYCURSOR; @@ -858,14 +859,14 @@ yy69: YYCURSOR = YYMARKER; yy70: ++YYCURSOR; goto yy71; yy71: -#line 477 "token.re" +#line 478 "token.re" { if ( is_newline( YYCURSOR - 1 ) ) { YYCURSOR--; } goto ScalarBlock; } -#line 868 "" +#line 869 "" yy72: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -947,12 +948,12 @@ yy76: switch(yych){ default: goto yy77; } yy77: -#line 464 "token.re" +#line 465 "token.re" { ENSURE_YAML_IOPEN(lvl, doc_level, 1); sycklval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 ); return YAML_ALIAS; } -#line 955 "" +#line 956 "" yy78: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -1021,7 +1022,7 @@ yy79: switch(yych){ default: goto yy80; } yy80: -#line 453 "token.re" +#line 454 "token.re" { sycklval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 ); /* @@ -1032,11 +1033,11 @@ yy80: syck_hdlr_remove_anchor(parser, sycklval->name); return YAML_ANCHOR; } -#line 1035 "" +#line 1036 "" yy81: ++YYCURSOR; goto yy82; yy82: -#line 439 "token.re" +#line 440 "token.re" { ENSURE_YAML_IOPEN(lvl, YYTOKEN - YYLINEPTR, 1); FORCE_NEXT_TOKEN(YAML_IOPEN); if ( *YYCURSOR == '#' || is_newline( YYCURSOR ) || is_newline( YYCURSOR - 1 ) ) @@ -1050,7 +1051,7 @@ yy82: } return YYTOKEN[0]; } -#line 1053 "" +#line 1054 "" yy83: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -1067,11 +1068,11 @@ yy85: yych = *++YYCURSOR; yy86: ++YYCURSOR; goto yy87; yy87: -#line 435 "token.re" +#line 436 "token.re" { YYPOS(1); return YYTOKEN[0]; } -#line 1074 "" +#line 1075 "" yy88: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -1103,7 +1104,7 @@ yy93: ++YYCURSOR; default: goto yy69; } } -#line 499 "token.re" +#line 500 "token.re" } @@ -1112,7 +1113,7 @@ Directive: YYTOKTMP = YYCURSOR; -#line 1115 "" +#line 1116 "" { YYCTYPE yych; unsigned int yyaccept; @@ -1212,18 +1213,18 @@ yy97: yyaccept = 0; default: goto yy98; } yy98: -#line 512 "token.re" +#line 513 "token.re" { YYCURSOR = YYTOKTMP; return YAML_DOCSEP; } -#line 1219 "" +#line 1220 "" yy99: ++YYCURSOR; yych = *YYCURSOR; goto yy103; yy100: -#line 510 "token.re" +#line 511 "token.re" { goto Directive; } -#line 1226 "" +#line 1227 "" yy101: yych = *++YYCURSOR; goto yy98; yy102: ++YYCURSOR; @@ -1477,11 +1478,11 @@ yy108: switch(yych){ default: goto yy109; } yy109: -#line 508 "token.re" +#line 509 "token.re" { goto Directive; } -#line 1482 "" +#line 1483 "" } -#line 515 "token.re" +#line 516 "token.re" } @@ -1504,7 +1505,7 @@ Plain2: Plain3: -#line 1507 "" +#line 1508 "" { YYCTYPE yych; unsigned int yyaccept; @@ -1529,7 +1530,7 @@ yy112: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); goto yy142; yy113: -#line 538 "token.re" +#line 539 "token.re" { int indt_len, nl_count = 0; SyckLevel *lvl; char *tok = YYTOKEN; @@ -1543,8 +1544,8 @@ yy113: while ( YYTOKEN < YYCURSOR ) { - int nl_len = 0; - if ( nl_len = newline_len( YYTOKEN++ ) ) + int nl_len = newline_len( YYTOKEN++ ); + if ( nl_len ) { nl_count++; YYTOKEN += nl_len - 1; @@ -1565,18 +1566,18 @@ yy113: goto Plain2; } -#line 1568 "" +#line 1569 "" yy114: ++YYCURSOR; switch((yych = *YYCURSOR)) { case 0x0A: goto yy141; default: goto yy115; } yy115: -#line 625 "token.re" +#line 626 "token.re" { QUOTECATS(qstr, qcapa, qidx, YYTOKEN, YYCURSOR - YYTOKEN); goto Plain2; } -#line 1579 "" +#line 1580 "" yy116: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ @@ -1596,7 +1597,7 @@ yy117: yyaccept = 1; yy118: ++YYCURSOR; goto yy119; yy119: -#line 587 "token.re" +#line 588 "token.re" { if ( plvl->status != syck_lvl_imap ) { PLAIN_NOT_INL(); @@ -1607,11 +1608,11 @@ yy119: } RETURN_IMPLICIT(); } -#line 1610 "" +#line 1611 "" yy120: ++YYCURSOR; goto yy121; yy121: -#line 598 "token.re" +#line 599 "token.re" { if ( plvl->status != syck_lvl_iseq ) { PLAIN_NOT_INL(); @@ -1622,14 +1623,14 @@ yy121: } RETURN_IMPLICIT(); } -#line 1625 "" +#line 1626 "" yy122: ++YYCURSOR; switch((yych = *YYCURSOR)) { case '#': goto yy128; default: goto yy123; } yy123: -#line 615 "token.re" +#line 616 "token.re" { if ( qidx == 0 ) { goto Plain2; @@ -1639,13 +1640,13 @@ yy123: goto Plain3; } } -#line 1642 "" +#line 1643 "" yy124: ++YYCURSOR; goto yy125; yy125: -#line 613 "token.re" +#line 614 "token.re" { RETURN_IMPLICIT(); } -#line 1648 "" +#line 1649 "" yy126: yych = *++YYCURSOR; goto yy123; yy127: yych = *++YYCURSOR; @@ -1653,15 +1654,15 @@ yy127: yych = *++YYCURSOR; yy128: ++YYCURSOR; goto yy129; yy129: -#line 609 "token.re" +#line 610 "token.re" { eat_comments( parser ); RETURN_IMPLICIT(); } -#line 1660 "" +#line 1661 "" yy130: ++YYCURSOR; goto yy131; yy131: -#line 576 "token.re" +#line 577 "token.re" { if ( plvl->status != syck_lvl_iseq && plvl->status != syck_lvl_imap ) { PLAIN_NOT_INL(); @@ -1672,7 +1673,7 @@ yy131: } RETURN_IMPLICIT(); } -#line 1675 "" +#line 1676 "" yy132: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -1694,9 +1695,9 @@ yy135: YYCURSOR = YYMARKER; yy136: ++YYCURSOR; goto yy137; yy137: -#line 574 "token.re" +#line 575 "token.re" { RETURN_IMPLICIT(); } -#line 1699 "" +#line 1700 "" yy138: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -1728,7 +1729,7 @@ yy143: ++YYCURSOR; default: goto yy135; } } -#line 629 "token.re" +#line 630 "token.re" } @@ -1742,7 +1743,7 @@ SingleQuote2: YYTOKEN = YYCURSOR; -#line 1745 "" +#line 1746 "" { YYCTYPE yych; unsigned int yyaccept; @@ -1762,7 +1763,7 @@ yy146: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); goto yy157; yy147: -#line 643 "token.re" +#line 644 "token.re" { int indt_len; int nl_count = 0; SyckLevel *lvl; @@ -1780,8 +1781,8 @@ yy147: while ( YYTOKEN < YYCURSOR ) { - int nl_len = 0; - if ( nl_len = newline_len( YYTOKEN++ ) ) + int nl_len = newline_len( YYTOKEN++ ); + if ( nl_len ) { nl_count++; YYTOKEN += nl_len - 1; @@ -1802,25 +1803,25 @@ yy147: goto SingleQuote2; } -#line 1805 "" +#line 1806 "" yy148: ++YYCURSOR; switch((yych = *YYCURSOR)) { case 0x0A: goto yy156; default: goto yy149; } yy149: -#line 710 "token.re" +#line 711 "token.re" { QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); goto SingleQuote2; } -#line 1816 "" +#line 1817 "" yy150: ++YYCURSOR; switch((yych = *YYCURSOR)) { case '\'': goto yy154; default: goto yy151; } yy151: -#line 687 "token.re" +#line 688 "token.re" { SyckLevel *lvl; SyckNode *n = syck_alloc_str(); lvl = CURRENT_LEVEL(); @@ -1843,7 +1844,7 @@ yy151: sycklval->nodeData = n; return YAML_PLAIN; } -#line 1846 "" +#line 1847 "" yy152: yych = *++YYCURSOR; goto yy151; yy153: yych = *++YYCURSOR; @@ -1851,11 +1852,11 @@ yy153: yych = *++YYCURSOR; yy154: ++YYCURSOR; goto yy155; yy155: -#line 683 "token.re" +#line 684 "token.re" { QUOTECAT(qstr, qcapa, qidx, '\''); goto SingleQuote2; } -#line 1858 "" +#line 1859 "" yy156: yyaccept = 0; YYMARKER = ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -1878,7 +1879,7 @@ yy159: YYCURSOR = YYMARKER; case 0: goto yy147; } } -#line 714 "token.re" +#line 715 "token.re" } @@ -1896,7 +1897,7 @@ DoubleQuote2: -#line 1899 "" +#line 1900 "" { YYCTYPE yych; unsigned int yyaccept; @@ -1917,7 +1918,7 @@ yy162: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); goto yy184; yy163: -#line 732 "token.re" +#line 733 "token.re" { int indt_len; int nl_count = 0; SyckLevel *lvl; @@ -1937,8 +1938,8 @@ yy163: { while ( YYTOKEN < YYCURSOR ) { - int nl_len = 0; - if ( nl_len = newline_len( YYTOKEN++ ) ) + int nl_len = newline_len( YYTOKEN++ ); + if ( nl_len ) { nl_count++; YYTOKEN += nl_len - 1; @@ -1961,18 +1962,18 @@ yy163: keep_nl = 1; goto DoubleQuote2; } -#line 1964 "" +#line 1965 "" yy164: ++YYCURSOR; switch((yych = *YYCURSOR)) { case 0x0A: goto yy183; default: goto yy165; } yy165: -#line 818 "token.re" +#line 819 "token.re" { QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); goto DoubleQuote2; } -#line 1975 "" +#line 1976 "" yy166: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ @@ -1988,7 +1989,7 @@ yy166: yyaccept = 1; yy167: ++YYCURSOR; goto yy168; yy168: -#line 795 "token.re" +#line 796 "token.re" { SyckLevel *lvl; SyckNode *n = syck_alloc_str(); lvl = CURRENT_LEVEL(); @@ -2011,7 +2012,7 @@ yy168: sycklval->nodeData = n; return YAML_PLAIN; } -#line 2014 "" +#line 2015 "" yy169: yych = *++YYCURSOR; goto yy168; yy170: yych = *++YYCURSOR; @@ -2034,12 +2035,12 @@ yy173: YYCURSOR = YYMARKER; yy174: ++YYCURSOR; goto yy175; yy175: -#line 790 "token.re" +#line 791 "token.re" { keep_nl = 0; YYCURSOR--; goto DoubleQuote2; } -#line 2042 "" +#line 2043 "" yy176: yych = *++YYCURSOR; switch(yych){ case 0x0A: goto yy174; @@ -2072,12 +2073,12 @@ yy177: yych = *++YYCURSOR; yy178: ++YYCURSOR; goto yy179; yy179: -#line 776 "token.re" +#line 777 "token.re" { char ch = *( YYCURSOR - 1 ); QUOTECAT(qstr, qcapa, qidx, escape_seq( ch )); goto DoubleQuote2; } -#line 2080 "" +#line 2081 "" yy180: yych = *++YYCURSOR; switch(yych){ case '0': @@ -2105,7 +2106,7 @@ yy180: yych = *++YYCURSOR; yy181: ++YYCURSOR; goto yy182; yy182: -#line 781 "token.re" +#line 782 "token.re" { long ch; char *chr_text = syck_strndup( YYTOKEN, 4 ); chr_text[0] = '0'; @@ -2114,7 +2115,7 @@ yy182: QUOTECAT(qstr, qcapa, qidx, ch); goto DoubleQuote2; } -#line 2117 "" +#line 2118 "" yy183: yyaccept = 0; YYMARKER = ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -2133,7 +2134,7 @@ yy185: ++YYCURSOR; default: goto yy173; } } -#line 822 "token.re" +#line 823 "token.re" } @@ -2147,7 +2148,7 @@ TransferMethod2: YYTOKTMP = YYCURSOR; -#line 2150 "" +#line 2151 "" { YYCTYPE yych; unsigned int yyaccept; @@ -2167,7 +2168,7 @@ yy186: yy188: ++YYCURSOR; goto yy189; yy189: -#line 836 "token.re" +#line 837 "token.re" { SyckLevel *lvl; YYCURSOR = YYTOKTMP; if ( YYCURSOR == YYTOKEN + 1 ) @@ -2217,7 +2218,7 @@ yy189: return YAML_TRANSFER; } -#line 2220 "" +#line 2221 "" yy190: yych = *++YYCURSOR; goto yy189; yy191: yych = *++YYCURSOR; @@ -2228,11 +2229,11 @@ yy192: ++YYCURSOR; default: goto yy193; } yy193: -#line 903 "token.re" +#line 904 "token.re" { QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); goto TransferMethod2; } -#line 2235 "" +#line 2236 "" yy194: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ @@ -2275,12 +2276,12 @@ yy197: YYCURSOR = YYMARKER; yy198: ++YYCURSOR; goto yy199; yy199: -#line 889 "token.re" +#line 890 "token.re" { char ch = *( YYCURSOR - 1 ); QUOTECAT(qstr, qcapa, qidx, escape_seq( ch )); goto TransferMethod2; } -#line 2283 "" +#line 2284 "" yy200: yych = *++YYCURSOR; switch(yych){ case '0': @@ -2308,7 +2309,7 @@ yy200: yych = *++YYCURSOR; yy201: ++YYCURSOR; goto yy202; yy202: -#line 894 "token.re" +#line 895 "token.re" { long ch; char *chr_text = syck_strndup( YYTOKTMP, 4 ); chr_text[0] = '0'; @@ -2317,7 +2318,7 @@ yy202: QUOTECAT(qstr, qcapa, qidx, ch); goto TransferMethod2; } -#line 2320 "" +#line 2321 "" yy203: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -2327,7 +2328,7 @@ yy204: switch(yych){ default: goto yy189; } } -#line 908 "token.re" +#line 909 "token.re" } @@ -2374,7 +2375,7 @@ ScalarBlock2: YYTOKEN = YYCURSOR; -#line 2377 "" +#line 2378 "" { YYCTYPE yych; unsigned int yyaccept; @@ -2395,7 +2396,7 @@ yy207: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); goto yy226; yy208: -#line 955 "token.re" +#line 956 "token.re" { char *pacer; char *tok = YYTOKEN; int indt_len = 0, nl_count = 0, fold_nl = 0, nl_begin = 0; @@ -2428,8 +2429,8 @@ yy208: pacer = YYTOKEN; while ( pacer < YYCURSOR ) { - int nl_len = 0; - if ( nl_len = newline_len( pacer++ ) ) + int nl_len = newline_len( pacer++ ); + if ( nl_len ) { nl_count++; pacer += nl_len - 1; @@ -2465,22 +2466,22 @@ yy208: } goto ScalarBlock2; } -#line 2468 "" +#line 2469 "" yy209: ++YYCURSOR; switch((yych = *YYCURSOR)) { case 0x0A: goto yy225; default: goto yy210; } yy210: -#line 1064 "token.re" +#line 1065 "token.re" { QUOTECAT(qstr, qcapa, qidx, *YYTOKEN); goto ScalarBlock2; } -#line 2479 "" +#line 2480 "" yy211: ++YYCURSOR; goto yy212; yy212: -#line 1026 "token.re" +#line 1027 "token.re" { lvl = CURRENT_LEVEL(); if ( lvl->status != syck_lvl_block ) { @@ -2493,16 +2494,16 @@ yy212: } goto ScalarBlock2; } -#line 2496 "" +#line 2497 "" yy213: ++YYCURSOR; goto yy214; yy214: -#line 1040 "token.re" +#line 1041 "token.re" { YYCURSOR--; POP_LEVEL(); RETURN_YAML_BLOCK(); } -#line 2505 "" +#line 2506 "" yy215: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ @@ -2531,7 +2532,7 @@ yy219: yych = *++YYCURSOR; yy220: ++YYCURSOR; goto yy221; yy221: -#line 1045 "token.re" +#line 1046 "token.re" { if ( YYTOKEN == YYLINEPTR ) { if ( blockType == BLOCK_FOLD && qidx > 0 ) @@ -2550,7 +2551,7 @@ yy221: goto ScalarBlock2; } } -#line 2553 "" +#line 2554 "" yy222: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -2582,7 +2583,7 @@ yy227: ++YYCURSOR; default: goto yy218; } } -#line 1069 "token.re" +#line 1070 "token.re" } @@ -2598,7 +2599,7 @@ Comment: YYTOKEN = YYCURSOR; -#line 2601 "" +#line 2602 "" { YYCTYPE yych; unsigned int yyaccept; @@ -2616,11 +2617,11 @@ yy228: yy230: ++YYCURSOR; goto yy231; yy231: -#line 1085 "token.re" +#line 1086 "token.re" { YYCURSOR = YYTOKEN; return; } -#line 2623 "" +#line 2624 "" yy232: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); goto yy237; @@ -2630,10 +2631,10 @@ yy233: ++YYCURSOR; default: goto yy234; } yy234: -#line 1089 "token.re" +#line 1090 "token.re" { goto Comment; } -#line 2636 "" +#line 2637 "" yy235: yych = *++YYCURSOR; goto yy234; yy236: yyaccept = 0; @@ -2658,7 +2659,7 @@ yy239: YYCURSOR = YYMARKER; case 0: goto yy231; } } -#line 1092 "token.re" +#line 1093 "token.re" } -- cgit v1.2.3