From f3d9f34537779e2ed3d29519c6a29346b74409d7 Mon Sep 17 00:00:00 2001 From: why Date: Sat, 17 Sep 2005 17:22:49 +0000 Subject: * lib/yaml/rubytypes.rb: remove comments that are bungling up the rdoc and ri output. output symbols as plain scalars. * ext/syck/rubyext.c (syck_emitter_reset): emit headless documents always. * ext/syck/emitter.c (syck_scan_scalar): quote scalars with any kind of surrounding line space, tabs or spaces alike. * ext/syck/token.c: accept tabs as whitespace, not for indentation, but strip from plain scalars. * test/yaml/test_yaml.rb: remove outdated tests. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9207 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/syck/emitter.c | 63 ++-- ext/syck/rubyext.c | 12 +- ext/syck/syck.h | 1 - ext/syck/token.c | 939 +++++++++++++++++++++++++++-------------------------- 4 files changed, 508 insertions(+), 507 deletions(-) (limited to 'ext/syck') diff --git a/ext/syck/emitter.c b/ext/syck/emitter.c index a4b78b6bb6..6a5e43c9ee 100644 --- a/ext/syck/emitter.c +++ b/ext/syck/emitter.c @@ -338,27 +338,6 @@ syck_emitter_flush( SyckEmitter *e, long check_room ) check_room = e->bufsize; } - /* - * Determine headers. - */ - if ( ( e->stage == doc_open && ( e->headless == 0 || e->use_header == 1 ) ) || - e->stage == doc_need_header ) - { - if ( e->use_version == 1 ) - { - char *header = S_ALLOC_N( char, 64 ); - S_MEMZERO( header, char, 64 ); - sprintf( header, "--- %%YAML:%d.%d ", SYCK_YAML_MAJOR, SYCK_YAML_MINOR ); - (e->output_handler)( e, header, strlen( header ) ); - S_FREE( header ); - } - else - { - (e->output_handler)( e, "--- ", 4 ); - } - e->stage = doc_processing; - } - /* * Commit buffer. */ @@ -383,6 +362,26 @@ syck_emit( SyckEmitter *e, st_data_t n ) int indent = 0, x = 0; SyckLevel *lvl = syck_emitter_current_level( e ); + /* + * Determine headers. + */ + if ( e->stage == doc_open && ( e->headless == 0 || e->use_header == 1 ) ) + { + if ( e->use_version == 1 ) + { + char *header = S_ALLOC_N( char, 64 ); + S_MEMZERO( header, char, 64 ); + sprintf( header, "--- %%YAML:%d.%d ", SYCK_YAML_MAJOR, SYCK_YAML_MINOR ); + syck_emitter_write( e, header, strlen( header ) ); + S_FREE( header ); + } + else + { + syck_emitter_write( e, "--- ", 4 ); + } + e->stage = doc_processing; + } + /* Add new level */ if ( lvl->spaces >= 0 ) { indent = lvl->spaces + e->indent; @@ -429,6 +428,7 @@ end_emit: syck_emitter_pop_level( e ); if ( e->lvl_idx == 1 ) { syck_emitter_write( e, "\n", 1 ); + e->headless = 0; e->stage = doc_open; } } @@ -493,6 +493,7 @@ void syck_emit_indent( SyckEmitter *e ) { int i; SyckLevel *lvl = syck_emitter_current_level( e ); + if ( e->bufpos == 0 && ( e->marker - e->buffer ) == 0 ) return; if ( lvl->spaces >= 0 ) { char *spcs = S_ALLOC_N( char, lvl->spaces + 2 ); @@ -511,8 +512,8 @@ void syck_emit_indent( SyckEmitter *e ) #define SCAN_INDENTED 2 /* Larger than the requested width? */ #define SCAN_WIDE 4 -/* Opens with whitespace? */ -#define SCAN_WHITESTART 8 +/* Opens or closes with whitespace? */ +#define SCAN_WHITEEDGE 8 /* Contains a newline */ #define SCAN_NEWLINE 16 /* Contains a single quote */ @@ -562,12 +563,18 @@ syck_scan_scalar( int req_width, char *cursor, long len ) flags |= SCAN_INDIC_S; } - /* ending newlines */ + /* whitespace edges */ if ( cursor[len-1] != '\n' ) { flags |= SCAN_NONL_E; } else if ( len > 1 && cursor[len-2] == '\n' ) { flags |= SCAN_MANYNL_E; } + if ( + ( len > 0 && ( cursor[0] == ' ' || cursor[0] == '\t' ) ) || + ( len > 1 && ( cursor[len-1] == ' ' || cursor[len-1] == '\t' ) ) + ) { + flags |= SCAN_WHITEEDGE; + } /* opening doc sep */ if ( len >= 3 && strncmp( cursor, "---", 3 ) == 0 ) @@ -620,12 +627,6 @@ syck_scan_scalar( int req_width, char *cursor, long len ) flags |= SCAN_FLOWMAP; flags |= SCAN_FLOWSEQ; } - - if ( i == 0 && - ( cursor[i] == ' ' || cursor[i] == '\t' ) - ) { - flags |= SCAN_WHITESTART; - } } /* printf( "---STR---\n%s\nFLAGS: %d\n", cursor, flags ); */ @@ -682,7 +683,7 @@ void syck_emit_scalar( SyckEmitter *e, char *tag, enum scalar_style force_style, /* Determine block style */ if ( scan & SCAN_NONPRINT ) { force_style = scalar_2quote; - } else if ( scan & SCAN_WHITESTART ) { + } else if ( scan & SCAN_WHITEEDGE ) { force_style = scalar_2quote; } else if ( force_style != scalar_fold && ( scan & SCAN_INDENTED ) ) { force_style = scalar_literal; diff --git a/ext/syck/rubyext.c b/ext/syck/rubyext.c index 878f326803..2be6217d2d 100644 --- a/ext/syck/rubyext.c +++ b/ext/syck/rubyext.c @@ -46,13 +46,6 @@ typedef struct { #define RUBY_DOMAIN "ruby.yaml.org,2002" -#ifndef StringValue -#define StringValue(v) (v) -#endif -#ifndef rb_attr_get -#define rb_attr_get(o, i) rb_ivar_get(o, i) -#endif - /* * symbols and constants */ @@ -1120,10 +1113,6 @@ syck_resolver_transfer( self, type, val ) } else if ( rb_cObject == target_class && subclass_v == Qnil ) { - /* - StringValue(subclass); - printf( "No class: %s\n", RSTRING(subclass)->ptr ); - */ target_class = cYObject; type = subclass; subclass = cYObject; @@ -2030,6 +2019,7 @@ syck_emitter_reset( argc, argv, self ) rb_ivar_set(self, s_options, options); } + emitter->headless = 1; emitter->bonus = (void *)bonus; rb_ivar_set(self, s_level, INT2FIX(0)); rb_ivar_set(self, s_resolver, Qnil); diff --git a/ext/syck/syck.h b/ext/syck/syck.h index ec3eed0956..02ffe240f8 100644 --- a/ext/syck/syck.h +++ b/ext/syck/syck.h @@ -274,7 +274,6 @@ typedef void (*SyckEmitterHandler)(SyckEmitter *, st_data_t); enum doc_stage { doc_open, - doc_need_header, doc_processing }; diff --git a/ext/syck/token.c b/ext/syck/token.c index fd41a6138d..8644058bd5 100644 --- a/ext/syck/token.c +++ b/ext/syck/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.10 on Sat Sep 17 00:51:29 2005 */ #line 1 "token.re" /* * token.re @@ -143,7 +143,7 @@ /* trim spaces off the end in case of indent */ #define PLAIN_IS_INL() \ char *walker = qstr + qidx - 1; \ - while ( walker > qstr && ( *walker == '\n' || *walker == ' ' ) ) \ + while ( walker > qstr && ( *walker == '\n' || *walker == ' ' || *walker == '\t' ) ) \ { \ qidx--; \ walker[0] = '\0'; \ @@ -290,7 +290,7 @@ sycklex_yaml_utf8( YYSTYPE *sycklval, SyckParser *parser ) return t; } -#line 312 "token.re" +#line 314 "token.re" if ( YYLINEPTR != YYCURSOR ) @@ -303,20 +303,20 @@ Header: YYTOKEN = YYCURSOR; -#line 7 "" +#line 306 "" { YYCTYPE yych; unsigned int yyaccept; 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 ' ': goto yy12; + case 0x00: goto yy7; + case 0x09: case ' ': goto yy12; + case 0x0A: goto yy9; + case 0x0D: goto yy11; case '#': goto yy5; case '-': goto yy2; case '.': goto yy4; @@ -329,11 +329,11 @@ yy2: yyaccept = 0; default: goto yy3; } yy3: -#line 371 "token.re" +#line 373 "token.re" { YYPOS(0); goto Document; } -#line 37 "" +#line 336 "" yy4: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ @@ -343,44 +343,44 @@ yy4: yyaccept = 0; yy5: ++YYCURSOR; goto yy6; yy6: -#line 353 "token.re" +#line 355 "token.re" { eat_comments( parser ); goto Header; } -#line 51 "" +#line 350 "" 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 "" +#line 360 "" 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 "" +#line 369 "" 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 "" +#line 383 "" yy14: yych = *++YYCURSOR; goto yy3; yy15: ++YYCURSOR; @@ -388,7 +388,7 @@ yy15: ++YYCURSOR; yych = *YYCURSOR; goto yy16; yy16: switch(yych){ - case ' ': goto yy15; + case 0x09: case ' ': goto yy15; default: goto yy13; } yy17: yyaccept = 1; @@ -397,15 +397,15 @@ yy17: yyaccept = 1; 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; @@ -420,15 +420,15 @@ yy21: yych = *++YYCURSOR; } 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 ) { @@ -442,7 +442,7 @@ yy24: } return 0; } -#line 147 "" +#line 445 "" yy25: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -453,7 +453,7 @@ yy26: switch(yych){ } yy27: yych = *++YYCURSOR; switch(yych){ - case '\n': goto yy23; + case 0x0A: goto yy23; default: goto yy20; } yy28: yych = *++YYCURSOR; @@ -463,15 +463,15 @@ yy28: yych = *++YYCURSOR; } 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 ) { @@ -485,7 +485,7 @@ yy31: return 0; } } -#line 191 "" +#line 488 "" yy32: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -496,11 +496,11 @@ yy33: switch(yych){ } 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: @@ -514,20 +514,20 @@ Document: YYTOKEN = YYCURSOR; -#line 209 "" +#line 517 "" { YYCTYPE yych; unsigned int yyaccept; 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 ' ': goto yy60; + case 0x00: goto yy62; + case 0x09: case ' ': goto yy60; + case 0x0A: goto yy37; + case 0x0D: goto yy39; case '!': goto yy51; case '"': goto yy55; case '#': goto yy58; @@ -546,7 +546,7 @@ yy37: yyaccept = 0; 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 ); @@ -574,59 +574,59 @@ yy38: } return YAML_INDENT; } -#line 269 "" +#line 577 "" 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 "" +#line 588 "" 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 "" +#line 598 "" 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 "" +#line 608 "" yy45: ++YYCURSOR; goto yy46; yy46: -#line 429 "token.re" +#line 431 "token.re" { POP_LEVEL(); return YYTOKEN[0]; } -#line 308 "" +#line 616 "" 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; } @@ -761,28 +761,28 @@ yy50: yych = *++YYCURSOR; yy51: ++YYCURSOR; goto yy52; yy52: -#line 467 "token.re" +#line 469 "token.re" { goto TransferMethod; } -#line 458 "" +#line 766 "" yy53: ++YYCURSOR; goto yy54; yy54: -#line 469 "token.re" +#line 471 "token.re" { ENSURE_YAML_IOPEN(lvl, doc_level, 1); goto SingleQuote; } -#line 465 "" +#line 773 "" yy55: ++YYCURSOR; goto yy56; yy56: -#line 472 "token.re" +#line 474 "token.re" { ENSURE_YAML_IOPEN(lvl, doc_level, 1); goto DoubleQuote; } -#line 472 "" +#line 780 "" 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': @@ -799,27 +799,27 @@ yy57: yyaccept = 1; yy58: ++YYCURSOR; goto yy59; yy59: -#line 482 "token.re" +#line 484 "token.re" { eat_comments( parser ); goto Document; } -#line 498 "" +#line 806 "" yy60: ++YYCURSOR; yych = *YYCURSOR; goto yy66; yy61: -#line 486 "token.re" +#line 488 "token.re" { goto Document; } -#line 504 "" +#line 813 "" yy62: ++YYCURSOR; goto yy63; yy63: -#line 488 "token.re" +#line 490 "token.re" { ENSURE_YAML_IEND(lvl, -1); YYPOS(0); return 0; } -#line 513 "" +#line 822 "" yy64: yych = *++YYCURSOR; goto yy40; yy65: ++YYCURSOR; @@ -827,16 +827,16 @@ yy65: ++YYCURSOR; yych = *YYCURSOR; goto yy66; yy66: switch(yych){ - case ' ': goto yy65; + case 0x09: case ' ': goto yy65; 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': @@ -858,14 +858,14 @@ yy69: YYCURSOR = YYMARKER; yy70: ++YYCURSOR; goto yy71; yy71: -#line 475 "token.re" +#line 477 "token.re" { if ( is_newline( YYCURSOR - 1 ) ) { YYCURSOR--; } goto ScalarBlock; } -#line 561 "" +#line 868 "" yy72: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -876,7 +876,7 @@ yy73: switch(yych){ } yy74: yych = *++YYCURSOR; switch(yych){ - case '\n': goto yy70; + case 0x0A: goto yy70; default: goto yy69; } yy75: ++YYCURSOR; @@ -947,12 +947,12 @@ yy76: switch(yych){ 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 "" +#line 955 "" yy78: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -1021,7 +1021,7 @@ yy79: switch(yych){ default: goto yy80; } yy80: -#line 451 "token.re" +#line 453 "token.re" { sycklval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 ); /* @@ -1032,11 +1032,11 @@ yy80: syck_hdlr_remove_anchor(parser, sycklval->name); return YAML_ANCHOR; } -#line 731 "" +#line 1035 "" 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 ) ) @@ -1050,7 +1050,7 @@ yy82: } return YYTOKEN[0]; } -#line 749 "" +#line 1053 "" yy83: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -1061,17 +1061,17 @@ yy84: switch(yych){ } 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 "" +#line 1074 "" yy88: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -1082,7 +1082,7 @@ yy89: switch(yych){ } yy90: yych = *++YYCURSOR; switch(yych){ - case '\n': goto yy86; + case 0x0A: goto yy86; default: goto yy69; } yy91: yyaccept = 0; @@ -1091,19 +1091,19 @@ yy91: yyaccept = 0; 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" } @@ -1112,18 +1112,18 @@ Directive: YYTOKTMP = YYCURSOR; -#line 807 "" +#line 1115 "" { YYCTYPE yych; unsigned int yyaccept; goto yy94; -yy95: ++YYCURSOR; + ++YYCURSOR; yy94: if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; switch(yych){ - case '\000': goto yy96; - case ' ': goto yy99; + case 0x00: goto yy96; + case 0x09: case ' ': goto yy99; case '%': goto yy97; default: goto yy101; } @@ -1212,18 +1212,18 @@ yy97: yyaccept = 0; default: goto yy98; } yy98: -#line 510 "token.re" +#line 512 "token.re" { YYCURSOR = YYTOKTMP; return YAML_DOCSEP; } -#line 911 "" +#line 1219 "" yy99: ++YYCURSOR; yych = *YYCURSOR; goto yy103; yy100: -#line 508 "token.re" +#line 510 "token.re" { goto Directive; } -#line 917 "" +#line 1226 "" yy101: yych = *++YYCURSOR; goto yy98; yy102: ++YYCURSOR; @@ -1231,11 +1231,11 @@ yy102: ++YYCURSOR; yych = *YYCURSOR; goto yy103; yy103: switch(yych){ - case ' ': goto yy102; + case 0x09: case ' ': goto yy102; default: goto yy100; } yy104: ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); + if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; goto yy105; yy105: switch(yych){ @@ -1477,11 +1477,11 @@ yy108: switch(yych){ default: goto yy109; } yy109: -#line 506 "token.re" +#line 508 "token.re" { goto Directive; } -#line 1176 "" +#line 1482 "" } -#line 513 "token.re" +#line 515 "token.re" } @@ -1504,31 +1504,32 @@ Plain2: Plain3: -#line 1180 "" +#line 1507 "" { YYCTYPE yych; unsigned int yyaccept; 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 0x09: goto yy126; + case 0x0A: goto yy112; + case 0x0D: goto yy114; case ' ': goto yy122; case ',': goto yy117; case ':': goto yy116; case ']': goto yy120; case '}': goto yy118; - default: goto yy126; + default: goto yy127; } yy112: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); - goto yy141; + goto yy142; yy113: -#line 536 "token.re" +#line 538 "token.re" { int indt_len, nl_count = 0; SyckLevel *lvl; char *tok = YYTOKEN; @@ -1564,38 +1565,38 @@ yy113: goto Plain2; } -#line 1240 "" +#line 1568 "" yy114: ++YYCURSOR; switch((yych = *YYCURSOR)) { - case '\n': goto yy140; + case 0x0A: goto yy141; default: goto yy115; } yy115: -#line 615 "token.re" +#line 625 "token.re" { QUOTECATS(qstr, qcapa, qidx, YYTOKEN, YYCURSOR - YYTOKEN); goto Plain2; } -#line 1251 "" +#line 1579 "" yy116: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ - case '\n': goto yy135; - case '\r': goto yy139; - case ' ': goto yy137; + case 0x0A: goto yy136; + case 0x0D: goto yy140; + case ' ': goto yy138; default: goto yy115; } yy117: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ - case '\n': goto yy129; - case '\r': goto yy133; - case ' ': goto yy131; + case 0x0A: goto yy130; + case 0x0D: goto yy134; + case ' ': goto yy132; 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(); @@ -1606,11 +1607,11 @@ yy119: } RETURN_IMPLICIT(); } -#line 1282 "" +#line 1610 "" yy120: ++YYCURSOR; goto yy121; yy121: -#line 596 "token.re" +#line 598 "token.re" { if ( plvl->status != syck_lvl_iseq ) { PLAIN_NOT_INL(); @@ -1621,36 +1622,46 @@ yy121: } RETURN_IMPLICIT(); } -#line 1297 "" +#line 1625 "" yy122: ++YYCURSOR; switch((yych = *YYCURSOR)) { - case '#': goto yy127; + case '#': goto yy128; default: goto yy123; } yy123: -#line 613 "token.re" -{ goto Plain3; } -#line 1306 "" +#line 615 "token.re" +{ if ( qidx == 0 ) + { + goto Plain2; + } + else + { + goto Plain3; + } + } +#line 1642 "" yy124: ++YYCURSOR; goto yy125; yy125: -#line 611 "token.re" +#line 613 "token.re" { RETURN_IMPLICIT(); } -#line 1312 "" +#line 1648 "" yy126: yych = *++YYCURSOR; + goto yy123; +yy127: yych = *++YYCURSOR; goto yy115; -yy127: ++YYCURSOR; - goto yy128; -yy128: -#line 607 "token.re" +yy128: ++YYCURSOR; + goto yy129; +yy129: +#line 609 "token.re" { eat_comments( parser ); RETURN_IMPLICIT(); } -#line 1322 "" -yy129: ++YYCURSOR; - goto yy130; -yy130: -#line 574 "token.re" +#line 1660 "" +yy130: ++YYCURSOR; + goto yy131; +yy131: +#line 576 "token.re" { if ( plvl->status != syck_lvl_iseq && plvl->status != syck_lvl_imap ) { PLAIN_NOT_INL(); @@ -1661,63 +1672,63 @@ yy130: } RETURN_IMPLICIT(); } -#line 1337 "" -yy131: ++YYCURSOR; +#line 1675 "" +yy132: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; - goto yy132; -yy132: switch(yych){ - case ' ': goto yy131; - default: goto yy130; + goto yy133; +yy133: switch(yych){ + case ' ': goto yy132; + default: goto yy131; } -yy133: yych = *++YYCURSOR; +yy134: yych = *++YYCURSOR; switch(yych){ - case '\n': goto yy129; - default: goto yy134; + case 0x0A: goto yy130; + default: goto yy135; } -yy134: YYCURSOR = YYMARKER; +yy135: YYCURSOR = YYMARKER; switch(yyaccept){ case 0: goto yy113; case 1: goto yy115; } -yy135: ++YYCURSOR; - goto yy136; -yy136: -#line 572 "token.re" +yy136: ++YYCURSOR; + goto yy137; +yy137: +#line 574 "token.re" { RETURN_IMPLICIT(); } -#line 1362 "" -yy137: ++YYCURSOR; +#line 1699 "" +yy138: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; - goto yy138; -yy138: switch(yych){ - case ' ': goto yy137; - default: goto yy136; + goto yy139; +yy139: switch(yych){ + case ' ': goto yy138; + default: goto yy137; } -yy139: yych = *++YYCURSOR; +yy140: yych = *++YYCURSOR; switch(yych){ - case '\n': goto yy135; - default: goto yy134; + case 0x0A: goto yy136; + default: goto yy135; } -yy140: yyaccept = 0; +yy141: yyaccept = 0; YYMARKER = ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; - goto yy141; -yy141: switch(yych){ - case '\n': case ' ': goto yy140; - case '\r': goto yy142; + goto yy142; +yy142: switch(yych){ + case 0x0A: case ' ': goto yy141; + case 0x0D: goto yy143; default: goto yy113; } -yy142: ++YYCURSOR; +yy143: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych){ - case '\n': goto yy140; - default: goto yy134; + case 0x0A: goto yy141; + default: goto yy135; } } -#line 619 "token.re" +#line 629 "token.re" } @@ -1731,27 +1742,27 @@ SingleQuote2: YYTOKEN = YYCURSOR; -#line 1398 "" +#line 1745 "" { YYCTYPE yych; unsigned int yyaccept; - goto yy143; -yy144: ++YYCURSOR; -yy143: + goto yy144; + ++YYCURSOR; +yy144: if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; switch(yych){ - case '\000': goto yy151; - case '\n': goto yy145; - case '\r': goto yy147; - case '\'': goto yy149; - default: goto yy152; + case 0x00: goto yy152; + case 0x0A: goto yy146; + case 0x0D: goto yy148; + case '\'': goto yy150; + default: goto yy153; } -yy145: yyaccept = 0; +yy146: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); - goto yy156; -yy146: -#line 633 "token.re" + goto yy157; +yy147: +#line 643 "token.re" { int indt_len; int nl_count = 0; SyckLevel *lvl; @@ -1791,25 +1802,25 @@ yy146: goto SingleQuote2; } -#line 1458 "" -yy147: ++YYCURSOR; +#line 1805 "" +yy148: ++YYCURSOR; switch((yych = *YYCURSOR)) { - case '\n': goto yy155; - default: goto yy148; + case 0x0A: goto yy156; + default: goto yy149; } -yy148: -#line 700 "token.re" +yy149: +#line 710 "token.re" { QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); goto SingleQuote2; } -#line 1469 "" -yy149: ++YYCURSOR; +#line 1816 "" +yy150: ++YYCURSOR; switch((yych = *YYCURSOR)) { - case '\'': goto yy153; - default: goto yy150; + case '\'': goto yy154; + default: goto yy151; } -yy150: -#line 677 "token.re" +yy151: +#line 687 "token.re" { SyckLevel *lvl; SyckNode *n = syck_alloc_str(); lvl = CURRENT_LEVEL(); @@ -1832,42 +1843,42 @@ yy150: sycklval->nodeData = n; return YAML_PLAIN; } -#line 1499 "" -yy151: yych = *++YYCURSOR; - goto yy150; +#line 1846 "" yy152: yych = *++YYCURSOR; - goto yy148; -yy153: ++YYCURSOR; - goto yy154; -yy154: -#line 673 "token.re" + goto yy151; +yy153: yych = *++YYCURSOR; + goto yy149; +yy154: ++YYCURSOR; + goto yy155; +yy155: +#line 683 "token.re" { QUOTECAT(qstr, qcapa, qidx, '\''); goto SingleQuote2; } -#line 1511 "" -yy155: yyaccept = 0; +#line 1858 "" +yy156: 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; - default: goto yy146; + goto yy157; +yy157: switch(yych){ + case 0x0A: case ' ': goto yy156; + case 0x0D: goto yy158; + default: goto yy147; } -yy157: ++YYCURSOR; +yy158: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych){ - case '\n': goto yy155; - default: goto yy158; + case 0x0A: goto yy156; + default: goto yy159; } -yy158: YYCURSOR = YYMARKER; +yy159: YYCURSOR = YYMARKER; switch(yyaccept){ - case 0: goto yy146; + case 0: goto yy147; } } -#line 704 "token.re" +#line 714 "token.re" } @@ -1885,28 +1896,28 @@ DoubleQuote2: -#line 1537 "" +#line 1899 "" { YYCTYPE yych; unsigned int yyaccept; - goto yy159; -yy160: ++YYCURSOR; -yy159: + goto yy160; + ++YYCURSOR; +yy160: if((YYLIMIT - YYCURSOR) < 4) YYFILL(4); yych = *YYCURSOR; switch(yych){ - case '\000': goto yy166; - case '\n': goto yy161; - case '\r': goto yy163; - case '"': goto yy168; - case '\\': goto yy165; - default: goto yy169; - } -yy161: yyaccept = 0; + case 0x00: goto yy167; + case 0x0A: goto yy162; + case 0x0D: goto yy164; + case '"': goto yy169; + case '\\': goto yy166; + default: goto yy170; + } +yy162: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); - goto yy183; -yy162: -#line 722 "token.re" + goto yy184; +yy163: +#line 732 "token.re" { int indt_len; int nl_count = 0; SyckLevel *lvl; @@ -1950,34 +1961,34 @@ yy162: keep_nl = 1; goto DoubleQuote2; } -#line 1602 "" -yy163: ++YYCURSOR; +#line 1964 "" +yy164: ++YYCURSOR; switch((yych = *YYCURSOR)) { - case '\n': goto yy182; - default: goto yy164; + case 0x0A: goto yy183; + default: goto yy165; } -yy164: -#line 808 "token.re" +yy165: +#line 818 "token.re" { QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); goto DoubleQuote2; } -#line 1613 "" -yy165: yyaccept = 1; +#line 1975 "" +yy166: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ - case '\n': goto yy173; - case '\r': goto yy175; - case ' ': goto yy170; + case 0x0A: goto yy174; + case 0x0D: goto yy176; + case ' ': goto yy171; case '"': case '0': case '\\': case 'a': case 'b': case 'e': - case 'f': case 'n': case 'r': case 't': case 'v': goto yy177; - case 'x': goto yy176; - default: goto yy164; - } -yy166: ++YYCURSOR; - goto yy167; -yy167: -#line 785 "token.re" + case 'f': case 'n': case 'r': case 't': case 'v': goto yy178; + case 'x': goto yy177; + default: goto yy165; + } +yy167: ++YYCURSOR; + goto yy168; +yy168: +#line 795 "token.re" { SyckLevel *lvl; SyckNode *n = syck_alloc_str(); lvl = CURRENT_LEVEL(); @@ -2000,41 +2011,41 @@ yy167: sycklval->nodeData = n; return YAML_PLAIN; } -#line 1652 "" -yy168: yych = *++YYCURSOR; - goto yy167; +#line 2014 "" yy169: yych = *++YYCURSOR; - goto yy164; -yy170: ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); + goto yy168; +yy170: yych = *++YYCURSOR; + goto yy165; +yy171: ++YYCURSOR; + if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; - goto yy171; -yy171: switch(yych){ - case '\n': goto yy173; - case '\r': goto yy175; - case ' ': goto yy170; - default: goto yy172; - } -yy172: YYCURSOR = YYMARKER; + goto yy172; +yy172: switch(yych){ + case 0x0A: goto yy174; + case 0x0D: goto yy176; + case ' ': goto yy171; + default: goto yy173; + } +yy173: YYCURSOR = YYMARKER; switch(yyaccept){ - case 0: goto yy162; - case 1: goto yy164; + case 0: goto yy163; + case 1: goto yy165; } -yy173: ++YYCURSOR; - goto yy174; -yy174: -#line 780 "token.re" +yy174: ++YYCURSOR; + goto yy175; +yy175: +#line 790 "token.re" { keep_nl = 0; YYCURSOR--; goto DoubleQuote2; } -#line 1681 "" -yy175: yych = *++YYCURSOR; +#line 2042 "" +yy176: yych = *++YYCURSOR; switch(yych){ - case '\n': goto yy173; - default: goto yy172; + case 0x0A: goto yy174; + default: goto yy173; } -yy176: yych = *++YYCURSOR; +yy177: yych = *++YYCURSOR; switch(yych){ case '0': case '1': @@ -2055,19 +2066,19 @@ yy176: yych = *++YYCURSOR; case 'c': case 'd': case 'e': - case 'f': goto yy179; - default: goto yy172; + case 'f': goto yy180; + default: goto yy173; } -yy177: ++YYCURSOR; - goto yy178; -yy178: -#line 766 "token.re" +yy178: ++YYCURSOR; + goto yy179; +yy179: +#line 776 "token.re" { char ch = *( YYCURSOR - 1 ); QUOTECAT(qstr, qcapa, qidx, escape_seq( ch )); goto DoubleQuote2; } -#line 1719 "" -yy179: yych = *++YYCURSOR; +#line 2080 "" +yy180: yych = *++YYCURSOR; switch(yych){ case '0': case '1': @@ -2088,13 +2099,13 @@ yy179: yych = *++YYCURSOR; case 'c': case 'd': case 'e': - case 'f': goto yy180; - default: goto yy172; + case 'f': goto yy181; + default: goto yy173; } -yy180: ++YYCURSOR; - goto yy181; -yy181: -#line 771 "token.re" +yy181: ++YYCURSOR; + goto yy182; +yy182: +#line 781 "token.re" { long ch; char *chr_text = syck_strndup( YYTOKEN, 4 ); chr_text[0] = '0'; @@ -2103,26 +2114,26 @@ yy181: QUOTECAT(qstr, qcapa, qidx, ch); goto DoubleQuote2; } -#line 1756 "" -yy182: yyaccept = 0; +#line 2117 "" +yy183: 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; - default: goto yy162; + goto yy184; +yy184: switch(yych){ + case 0x0A: case ' ': goto yy183; + case 0x0D: goto yy185; + default: goto yy163; } -yy184: ++YYCURSOR; +yy185: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych){ - case '\n': goto yy182; - default: goto yy172; + case 0x0A: goto yy183; + default: goto yy173; } } -#line 812 "token.re" +#line 822 "token.re" } @@ -2136,27 +2147,27 @@ TransferMethod2: YYTOKTMP = YYCURSOR; -#line 1778 "" +#line 2150 "" { YYCTYPE yych; unsigned int yyaccept; - goto yy185; -yy186: ++YYCURSOR; -yy185: + goto yy186; + ++YYCURSOR; +yy186: if((YYLIMIT - YYCURSOR) < 4) YYFILL(4); yych = *YYCURSOR; switch(yych){ - case '\000': goto yy187; - case '\n': goto yy189; - case '\r': goto yy191; - case ' ': goto yy190; - case '\\': goto yy193; - default: goto yy194; - } -yy187: ++YYCURSOR; - goto yy188; -yy188: -#line 826 "token.re" + case 0x00: goto yy188; + case 0x0A: goto yy190; + case 0x0D: goto yy192; + case ' ': goto yy191; + case '\\': goto yy194; + default: goto yy195; + } +yy188: ++YYCURSOR; + goto yy189; +yy189: +#line 836 "token.re" { SyckLevel *lvl; YYCURSOR = YYTOKTMP; if ( YYCURSOR == YYTOKEN + 1 ) @@ -2206,34 +2217,34 @@ yy188: return YAML_TRANSFER; } -#line 1848 "" -yy189: yych = *++YYCURSOR; - goto yy188; +#line 2220 "" yy190: yych = *++YYCURSOR; - goto yy203; -yy191: ++YYCURSOR; + goto yy189; +yy191: yych = *++YYCURSOR; + goto yy204; +yy192: ++YYCURSOR; switch((yych = *YYCURSOR)) { - case '\n': goto yy187; - default: goto yy192; + case 0x0A: goto yy188; + default: goto yy193; } -yy192: -#line 893 "token.re" +yy193: +#line 903 "token.re" { QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); goto TransferMethod2; } -#line 1863 "" -yy193: yyaccept = 0; +#line 2235 "" +yy194: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ case '"': case '0': case '\\': case 'a': case 'b': case 'e': - case 'f': case 'n': case 'r': case 't': case 'v': goto yy197; - case 'x': goto yy195; - default: goto yy192; + case 'f': case 'n': case 'r': case 't': case 'v': goto yy198; + case 'x': goto yy196; + default: goto yy193; } -yy194: yych = *++YYCURSOR; - goto yy192; yy195: yych = *++YYCURSOR; + goto yy193; +yy196: yych = *++YYCURSOR; switch(yych){ case '0': case '1': @@ -2254,23 +2265,23 @@ yy195: yych = *++YYCURSOR; case 'c': case 'd': case 'e': - case 'f': goto yy199; - default: goto yy196; + case 'f': goto yy200; + default: goto yy197; } -yy196: YYCURSOR = YYMARKER; +yy197: YYCURSOR = YYMARKER; switch(yyaccept){ - case 0: goto yy192; + case 0: goto yy193; } -yy197: ++YYCURSOR; - goto yy198; -yy198: -#line 879 "token.re" +yy198: ++YYCURSOR; + goto yy199; +yy199: +#line 889 "token.re" { char ch = *( YYCURSOR - 1 ); QUOTECAT(qstr, qcapa, qidx, escape_seq( ch )); goto TransferMethod2; } -#line 1911 "" -yy199: yych = *++YYCURSOR; +#line 2283 "" +yy200: yych = *++YYCURSOR; switch(yych){ case '0': case '1': @@ -2291,13 +2302,13 @@ yy199: yych = *++YYCURSOR; case 'c': case 'd': case 'e': - case 'f': goto yy200; - default: goto yy196; + case 'f': goto yy201; + default: goto yy197; } -yy200: ++YYCURSOR; - goto yy201; -yy201: -#line 884 "token.re" +yy201: ++YYCURSOR; + goto yy202; +yy202: +#line 894 "token.re" { long ch; char *chr_text = syck_strndup( YYTOKTMP, 4 ); chr_text[0] = '0'; @@ -2306,17 +2317,17 @@ yy201: QUOTECAT(qstr, qcapa, qidx, ch); goto TransferMethod2; } -#line 1948 "" -yy202: ++YYCURSOR; +#line 2320 "" +yy203: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; - goto yy203; -yy203: switch(yych){ - case ' ': goto yy202; - default: goto yy188; + goto yy204; +yy204: switch(yych){ + case ' ': goto yy203; + default: goto yy189; } } -#line 898 "token.re" +#line 908 "token.re" } @@ -2363,28 +2374,28 @@ ScalarBlock2: YYTOKEN = YYCURSOR; -#line 1961 "" +#line 2377 "" { YYCTYPE yych; unsigned int yyaccept; - goto yy204; -yy205: ++YYCURSOR; -yy204: + goto yy205; + ++YYCURSOR; +yy205: if((YYLIMIT - YYCURSOR) < 5) YYFILL(5); yych = *YYCURSOR; switch(yych){ - case '\000': goto yy212; - case '\n': goto yy206; - case '\r': goto yy208; - case '#': goto yy210; - case '-': goto yy214; - default: goto yy215; - } -yy206: yyaccept = 0; + case 0x00: goto yy213; + case 0x0A: goto yy207; + case 0x0D: goto yy209; + case '#': goto yy211; + case '-': goto yy215; + default: goto yy216; + } +yy207: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); - goto yy225; -yy207: -#line 945 "token.re" + goto yy226; +yy208: +#line 955 "token.re" { char *pacer; char *tok = YYTOKEN; int indt_len = 0, nl_count = 0, fold_nl = 0, nl_begin = 0; @@ -2454,22 +2465,22 @@ yy207: } goto ScalarBlock2; } -#line 2052 "" -yy208: ++YYCURSOR; +#line 2468 "" +yy209: ++YYCURSOR; switch((yych = *YYCURSOR)) { - case '\n': goto yy224; - default: goto yy209; + case 0x0A: goto yy225; + default: goto yy210; } -yy209: -#line 1054 "token.re" +yy210: +#line 1064 "token.re" { QUOTECAT(qstr, qcapa, qidx, *YYTOKEN); goto ScalarBlock2; } -#line 2063 "" -yy210: ++YYCURSOR; - goto yy211; -yy211: -#line 1016 "token.re" +#line 2479 "" +yy211: ++YYCURSOR; + goto yy212; +yy212: +#line 1026 "token.re" { lvl = CURRENT_LEVEL(); if ( lvl->status != syck_lvl_block ) { @@ -2482,45 +2493,45 @@ yy211: } goto ScalarBlock2; } -#line 2080 "" -yy212: ++YYCURSOR; - goto yy213; -yy213: -#line 1030 "token.re" +#line 2496 "" +yy213: ++YYCURSOR; + goto yy214; +yy214: +#line 1040 "token.re" { YYCURSOR--; POP_LEVEL(); RETURN_YAML_BLOCK(); } -#line 2089 "" -yy214: yyaccept = 1; +#line 2505 "" +yy215: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ - case '-': goto yy216; - default: goto yy209; + case '-': goto yy217; + default: goto yy210; } -yy215: yych = *++YYCURSOR; - goto yy209; yy216: yych = *++YYCURSOR; + goto yy210; +yy217: yych = *++YYCURSOR; switch(yych){ - case '-': goto yy218; - default: goto yy217; + case '-': goto yy219; + default: goto yy218; } -yy217: YYCURSOR = YYMARKER; +yy218: YYCURSOR = YYMARKER; switch(yyaccept){ - case 0: goto yy207; - case 1: goto yy209; + case 0: goto yy208; + case 1: goto yy210; } -yy218: yych = *++YYCURSOR; +yy219: yych = *++YYCURSOR; switch(yych){ - case '\n': goto yy219; - case '\r': goto yy223; - case ' ': goto yy221; - default: goto yy217; - } -yy219: ++YYCURSOR; - goto yy220; -yy220: -#line 1035 "token.re" + case 0x0A: goto yy220; + case 0x0D: goto yy224; + case ' ': goto yy222; + default: goto yy218; + } +yy220: ++YYCURSOR; + goto yy221; +yy221: +#line 1045 "token.re" { if ( YYTOKEN == YYLINEPTR ) { if ( blockType == BLOCK_FOLD && qidx > 0 ) @@ -2539,39 +2550,39 @@ yy220: goto ScalarBlock2; } } -#line 2137 "" -yy221: ++YYCURSOR; +#line 2553 "" +yy222: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; - goto yy222; -yy222: switch(yych){ - case ' ': goto yy221; - default: goto yy220; + goto yy223; +yy223: switch(yych){ + case ' ': goto yy222; + default: goto yy221; } -yy223: yych = *++YYCURSOR; +yy224: yych = *++YYCURSOR; switch(yych){ - case '\n': goto yy219; - default: goto yy217; + case 0x0A: goto yy220; + default: goto yy218; } -yy224: yyaccept = 0; +yy225: yyaccept = 0; YYMARKER = ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; - goto yy225; -yy225: switch(yych){ - case '\n': case ' ': goto yy224; - case '\r': goto yy226; - default: goto yy207; + goto yy226; +yy226: switch(yych){ + case 0x0A: case ' ': goto yy225; + case 0x0D: goto yy227; + default: goto yy208; } -yy226: ++YYCURSOR; +yy227: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych){ - case '\n': goto yy224; - default: goto yy217; + case 0x0A: goto yy225; + default: goto yy218; } } -#line 1059 "token.re" +#line 1069 "token.re" } @@ -2587,67 +2598,67 @@ Comment: YYTOKEN = YYCURSOR; -#line 2173 "" +#line 2601 "" { YYCTYPE yych; unsigned int yyaccept; - goto yy227; -yy228: ++YYCURSOR; -yy227: + goto yy228; + ++YYCURSOR; +yy228: if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; switch(yych){ - case '\000': goto yy229; - case '\n': goto yy231; - case '\r': goto yy232; - default: goto yy234; - } -yy229: ++YYCURSOR; - goto yy230; -yy230: -#line 1075 "token.re" + case 0x00: goto yy230; + case 0x0A: goto yy232; + case 0x0D: goto yy233; + default: goto yy235; + } +yy230: ++YYCURSOR; + goto yy231; +yy231: +#line 1085 "token.re" { YYCURSOR = YYTOKEN; return; } -#line 2195 "" -yy231: yyaccept = 0; +#line 2623 "" +yy232: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); - goto yy236; -yy232: ++YYCURSOR; + goto yy237; +yy233: ++YYCURSOR; switch((yych = *YYCURSOR)) { - case '\n': goto yy235; - default: goto yy233; + case 0x0A: goto yy236; + default: goto yy234; } -yy233: -#line 1079 "token.re" +yy234: +#line 1089 "token.re" { goto Comment; } -#line 2208 "" -yy234: yych = *++YYCURSOR; - goto yy233; -yy235: yyaccept = 0; +#line 2636 "" +yy235: yych = *++YYCURSOR; + goto yy234; +yy236: yyaccept = 0; YYMARKER = ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; - goto yy236; -yy236: switch(yych){ - case '\n': goto yy235; - case '\r': goto yy237; - default: goto yy230; + goto yy237; +yy237: switch(yych){ + case 0x0A: goto yy236; + case 0x0D: goto yy238; + default: goto yy231; } -yy237: ++YYCURSOR; +yy238: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych){ - case '\n': goto yy235; - default: goto yy238; + case 0x0A: goto yy236; + default: goto yy239; } -yy238: YYCURSOR = YYMARKER; +yy239: YYCURSOR = YYMARKER; switch(yyaccept){ - case 0: goto yy230; + case 0: goto yy231; } } -#line 1082 "token.re" +#line 1092 "token.re" } -- cgit v1.2.3