1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/syck.c, lib/syck.h, lib/token.c, lib/gram.c: count line numbers

Browse Source 
only if line pointer has increased.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3829 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
why 2003-05-19 16:37:20 +00:00
parent 6f55b68681
commit f5b2e6b149
5 changed files with 77 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon May 19 16:47:00 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
* lib/syck.c, lib/syck.h, lib/token.c, lib/gram.c: count line numbers
only if line pointer has increased.
Tue May 20 00:45:40 2003 Yukihiro Matsumoto <matz@ruby-lang.org> Tue May 20 00:45:40 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* dir.c (push_braces): do not push_braces() unless rbrace is found. * dir.c (push_braces): do not push_braces() unless rbrace is found.

17
ext/syck/gram.c
View File

@ -319,8 +319,8 @@ static const unsigned short yyrline[] =
83, 84, 102, 103, 106, 109, 112, 113, 121, 126, 83, 84, 102, 103, 106, 109, 112, 113, 121, 126,
134, 147, 154, 159, 160, 161, 162, 163, 169, 173, 134, 147, 154, 159, 160, 161, 162, 163, 169, 173,
180, 186, 190, 195, 204, 208, 214, 218, 228, 233, 180, 186, 190, 195, 204, 208, 214, 218, 228, 233,
241, 256, 257, 265, 266, 278, 285, 295, 303, 307, 241, 256, 257, 265, 266, 278, 285, 294, 302, 306,
313, 314 312, 313
}; };
#endif #endif
@ -1286,13 +1286,12 @@ yyreduce:
case 46: case 46:
#line 286 "gram.y" #line 286 "gram.y"
{ {
apply_seq_in_map( (SyckParser *)parser, yyvsp[-1].nodeData );
yyval.nodeData = yyvsp[-1].nodeData; yyval.nodeData = yyvsp[-1].nodeData;
} }
break; break;
case 47: case 47:
#line 296 "gram.y" #line 295 "gram.y"
{ {
yyval.nodeData = syck_new_map( yyval.nodeData = syck_new_map(
syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-2].nodeData ), syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-2].nodeData ),
@ -1301,21 +1300,21 @@ yyreduce:
break; break;
case 48: case 48:
#line 304 "gram.y" #line 303 "gram.y"
{ {
yyval.nodeData = yyvsp[-1].nodeData; yyval.nodeData = yyvsp[-1].nodeData;
} }
break; break;
case 49: case 49:
#line 308 "gram.y" #line 307 "gram.y"
{ {
yyval.nodeData = syck_alloc_map(); yyval.nodeData = syck_alloc_map();
} }
break; break;
case 51: case 51:
#line 315 "gram.y" #line 314 "gram.y"
{ {
syck_map_update( yyvsp[-2].nodeData, yyvsp[0].nodeData ); syck_map_update( yyvsp[-2].nodeData, yyvsp[0].nodeData );
syck_free_node( yyvsp[0].nodeData ); syck_free_node( yyvsp[0].nodeData );
@ -1327,7 +1326,7 @@ yyreduce:
} }
/* Line 1016 of /usr/local/share/bison/yacc.c. */ /* Line 1016 of /usr/local/share/bison/yacc.c. */
#line 1331 "y.tab.c" #line 1330 "y.tab.c"
yyvsp -= yylen; yyvsp -= yylen;
yyssp -= yylen; yyssp -= yylen;
@ -1546,7 +1545,7 @@ yyreturn:
} }
#line 322 "gram.y" #line 321 "gram.y"
void void

3
ext/syck/syck.c
View File

@ -136,6 +136,7 @@ syck_parser_reset_cursor( SyckParser *p )
p->cursor = NULL; p->cursor = NULL;
p->lineptr = NULL; p->lineptr = NULL;
p->linectptr = NULL;
p->token = NULL; p->token = NULL;
p->toktmp = NULL; p->toktmp = NULL;
p->marker = NULL; p->marker = NULL;
@ -397,6 +398,7 @@ syck_move_tokens( SyckParser *p )
p->toktmp -= count; p->toktmp -= count;
p->limit -= count; p->limit -= count;
p->lineptr -= count; p->lineptr -= count;
p->linectptr -= count;
} }
return skip; return skip;
} }
@ -408,6 +410,7 @@ syck_check_limit( SyckParser *p, long len )
{ {
p->cursor = p->buffer; p->cursor = p->buffer;
p->lineptr = p->buffer; p->lineptr = p->buffer;
p->linectptr = p->buffer;
p->marker = p->buffer; p->marker = p->buffer;
} }
p->limit = p->buffer + len; p->limit = p->buffer + len;

2
ext/syck/syck.h
View File

@ -155,7 +155,7 @@ struct _syck_parser {
// Custom buffer size // Custom buffer size
size_t bufsize; size_t bufsize;
// Buffer pointers // Buffer pointers
char *buffer, *lineptr, *toktmp, *token, *cursor, *marker, *limit; char *buffer, *linectptr, *lineptr, *toktmp, *token, *cursor, *marker, *limit;
// Line counter // Line counter
int linect; int linect;
// Last token from yylex() // Last token from yylex()

119
ext/syck/token.c
View File

@ -1,4 +1,4 @@
/* Generated by re2c 0.5 on Thu May 15 15:42:01 2003 */ /* Generated by re2c 0.5 on Mon May 19 10:41:31 2003 */
#line 1 "token.re" #line 1 "token.re"
/* /*
* token.re * token.re
@ -26,6 +26,7 @@
#define YYTOKEN parser->token #define YYTOKEN parser->token
#define YYTOKTMP parser->toktmp #define YYTOKTMP parser->toktmp
#define YYLINEPTR parser->lineptr #define YYLINEPTR parser->lineptr
#define YYLINECTPTR parser->linectptr
#define YYLINE parser->linect #define YYLINE parser->linect
#define YYFILL(n) syck_parser_read(parser) #define YYFILL(n) syck_parser_read(parser)
@ -38,7 +39,7 @@
/* /*
* Track line numbers * Track line numbers
*/ */
#define NEWLINE(ptr) YYLINE++; YYLINEPTR = ptr + 1 #define NEWLINE(ptr) YYLINEPTR = ptr + 1; if ( YYLINEPTR > YYLINECTPTR ) { YYLINE++; YYLINECTPTR = YYLINEPTR; }
/* /*
* I like seeing the level operations as macros... * I like seeing the level operations as macros...
@ -189,7 +190,7 @@ yylex( YYSTYPE *yylval, SyckParser *parser )
return t; return t;
} }
#line 205 #line 206
if ( YYLINEPTR != YYCURSOR ) if ( YYLINEPTR != YYCURSOR )
@ -255,19 +256,19 @@ yy2: yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR); yych = *(YYMARKER = ++YYCURSOR);
if(yych == '-') goto yy15; if(yych == '-') goto yy15;
yy3: yy3:
#line 246 #line 247
{ YYPOS(0); { YYPOS(0);
goto Document; goto Document;
} }
yy4: yych = *++YYCURSOR; yy4: yych = *++YYCURSOR;
yy5: yy5:
#line 232 #line 233
{ eat_comments( parser ); { eat_comments( parser );
goto Header; goto Header;
} }
yy6: yych = *++YYCURSOR; yy6: yych = *++YYCURSOR;
yy7: yy7:
#line 236 #line 237
{ SyckLevel *lvl = CURRENT_LEVEL(); { SyckLevel *lvl = CURRENT_LEVEL();
ENSURE_IEND(lvl, -1); ENSURE_IEND(lvl, -1);
return 0; return 0;
@ -275,7 +276,7 @@ yy7:
yy8: yych = *++YYCURSOR; yy8: yych = *++YYCURSOR;
goto yy12; goto yy12;
yy9: yy9:
#line 241 #line 242
{ int indt_len; { int indt_len;
GOBBLE_UP_INDENT( indt_len, YYTOKEN ); GOBBLE_UP_INDENT( indt_len, YYTOKEN );
goto Header; goto Header;
@ -307,7 +308,7 @@ yy18: ++YYCURSOR;
yych = *YYCURSOR; yych = *YYCURSOR;
yy19: if(yybm[0+yych] & 128) goto yy18; yy19: if(yybm[0+yych] & 128) goto yy18;
yy20: yy20:
#line 218 #line 219
{ SyckLevel *lvl = CURRENT_LEVEL(); { SyckLevel *lvl = CURRENT_LEVEL();
if ( lvl->status == syck_lvl_header ) if ( lvl->status == syck_lvl_header )
{ {
@ -327,7 +328,7 @@ yy21: ++YYCURSOR;
yy22: if(yych == '\n') goto yy21; yy22: if(yych == '\n') goto yy21;
goto yy20; goto yy20;
} }
#line 250 #line 251
Document: Document:
@ -433,7 +434,7 @@ yy23:
yy25: yych = *++YYCURSOR; yy25: yych = *++YYCURSOR;
goto yy77; goto yy77;
yy26: yy26:
#line 264 #line 265
{ // Isolate spaces { // Isolate spaces
int indt_len; int indt_len;
GOBBLE_UP_INDENT( indt_len, YYTOKEN ); GOBBLE_UP_INDENT( indt_len, YYTOKEN );
@ -450,7 +451,7 @@ yy26:
} }
yy27: yych = *++YYCURSOR; yy27: yych = *++YYCURSOR;
yy28: yy28:
#line 279 #line 280
{ ENSURE_IOPEN(lvl, 0, 1); { ENSURE_IOPEN(lvl, 0, 1);
lvl = CURRENT_LEVEL(); lvl = CURRENT_LEVEL();
ADD_LEVEL(lvl->spaces + 1, syck_lvl_inline); ADD_LEVEL(lvl->spaces + 1, syck_lvl_inline);
@ -458,7 +459,7 @@ yy28:
} }
yy29: yych = *++YYCURSOR; yy29: yych = *++YYCURSOR;
yy30: yy30:
#line 285 #line 286
{ POP_LEVEL(); { POP_LEVEL();
return YYTOKEN[0]; return YYTOKEN[0];
} }
@ -466,7 +467,7 @@ yy31: yych = *++YYCURSOR;
if(yych == '\n') goto yy74; if(yych == '\n') goto yy74;
if(yych == ' ') goto yy71; if(yych == ' ') goto yy71;
yy32: yy32:
#line 334 #line 335
{ ENSURE_IOPEN(lvl, 0, 1); { ENSURE_IOPEN(lvl, 0, 1);
goto Plain; goto Plain;
} }
@ -484,15 +485,15 @@ yy35: yych = *++YYCURSOR;
goto yy32; goto yy32;
yy36: yych = *++YYCURSOR; yy36: yych = *++YYCURSOR;
yy37: yy37:
#line 311 #line 312
{ goto TransferMethod; } { goto TransferMethod; }
yy38: yych = *++YYCURSOR; yy38: yych = *++YYCURSOR;
yy39: yy39:
#line 313 #line 314
{ goto SingleQuote; } { goto SingleQuote; }
yy40: yych = *++YYCURSOR; yy40: yych = *++YYCURSOR;
yy41: yy41:
#line 315 #line 316
{ goto DoubleQuote; } { goto DoubleQuote; }
yy42: yyaccept = 0; yy42: yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR); yych = *(YYMARKER = ++YYCURSOR);
@ -513,18 +514,18 @@ yy42: yyaccept = 0;
} }
yy43: yych = *++YYCURSOR; yy43: yych = *++YYCURSOR;
yy44: yy44:
#line 324 #line 325
{ eat_comments( parser ); { eat_comments( parser );
goto Document; goto Document;
} }
yy45: yych = *++YYCURSOR; yy45: yych = *++YYCURSOR;
goto yy51; goto yy51;
yy46: yy46:
#line 328 #line 329
{ goto Document; } { goto Document; }
yy47: yych = *++YYCURSOR; yy47: yych = *++YYCURSOR;
yy48: yy48:
#line 330 #line 331
{ ENSURE_IEND(lvl, -1); { ENSURE_IEND(lvl, -1);
return 0; return 0;
} }
@ -559,7 +560,7 @@ yy55: ++YYCURSOR;
yych = *YYCURSOR; yych = *YYCURSOR;
yy56: if(yych == ' ') goto yy55; yy56: if(yych == ' ') goto yy55;
yy57: yy57:
#line 317 #line 318
{ if ( *( YYCURSOR - 1 ) == '\n' ) { if ( *( YYCURSOR - 1 ) == '\n' )
{ {
YYCURSOR--; YYCURSOR--;
@ -576,7 +577,7 @@ yy60: ++YYCURSOR;
yych = *YYCURSOR; yych = *YYCURSOR;
yy61: if(yybm[0+yych] & 64) goto yy60; yy61: if(yybm[0+yych] & 64) goto yy60;
yy62: yy62:
#line 307 #line 308
{ yylval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 ); { yylval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 );
return ALIAS; return ALIAS;
} }
@ -587,7 +588,7 @@ yy64: if(yych <= '-') goto yy65;
if(yych == '`') goto yy65; if(yych == '`') goto yy65;
if(yych <= 'z') goto yy63; if(yych <= 'z') goto yy63;
yy65: yy65:
#line 303 #line 304
{ yylval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 ); { yylval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 );
return ANCHOR; return ANCHOR;
} }
@ -596,7 +597,7 @@ yy66: ++YYCURSOR;
yych = *YYCURSOR; yych = *YYCURSOR;
yy67: if(yych == ' ') goto yy66; yy67: if(yych == ' ') goto yy66;
yy68: yy68:
#line 293 #line 294
{ ENSURE_IOPEN(lvl, YYTOKEN - YYLINEPTR, 1); { ENSURE_IOPEN(lvl, YYTOKEN - YYLINEPTR, 1);
FORCE_NEXT_TOKEN(IOPEN); FORCE_NEXT_TOKEN(IOPEN);
if ( *( YYCURSOR - 1 ) == '\n' ) if ( *( YYCURSOR - 1 ) == '\n' )
@ -616,7 +617,7 @@ yy71: ++YYCURSOR;
yych = *YYCURSOR; yych = *YYCURSOR;
yy72: if(yych == ' ') goto yy71; yy72: if(yych == ' ') goto yy71;
yy73: yy73:
#line 289 #line 290
{ YYPOS(1); { YYPOS(1);
return YYTOKEN[0]; return YYTOKEN[0];
} }
@ -636,7 +637,7 @@ yy78: ++YYCURSOR;
yy79: if(yybm[0+yych] & 128) goto yy78; yy79: if(yybm[0+yych] & 128) goto yy78;
goto yy26; goto yy26;
} }
#line 338 #line 339
} }
@ -704,14 +705,14 @@ yy83: yyaccept = 0;
if(yych == '`') goto yy84; if(yych == '`') goto yy84;
if(yych <= 'z') goto yy90; if(yych <= 'z') goto yy90;
yy84: yy84:
#line 351 #line 352
{ YYCURSOR = YYTOKTMP; { YYCURSOR = YYTOKTMP;
return DOCSEP; return DOCSEP;
} }
yy85: yych = *++YYCURSOR; yy85: yych = *++YYCURSOR;
goto yy89; goto yy89;
yy86: yy86:
#line 349 #line 350
{ goto Directive; } { goto Directive; }
yy87: yych = *++YYCURSOR; yy87: yych = *++YYCURSOR;
goto yy84; goto yy84;
@ -733,10 +734,10 @@ yy93: ++YYCURSOR;
yych = *YYCURSOR; yych = *YYCURSOR;
yy94: if(yybm[0+yych] & 128) goto yy93; yy94: if(yybm[0+yych] & 128) goto yy93;
yy95: yy95:
#line 347 #line 348
{ goto Directive; } { goto Directive; }
} }
#line 354 #line 355
} }
@ -819,7 +820,7 @@ yy96:
yy98: yych = *++YYCURSOR; yy98: yych = *++YYCURSOR;
goto yy122; goto yy122;
yy99: yy99:
#line 374 #line 375
{ int indt_len; { int indt_len;
SyckLevel *lvl; SyckLevel *lvl;
char *tok = YYTOKTMP; char *tok = YYTOKTMP;
@ -838,11 +839,11 @@ yy100: yych = *++YYCURSOR;
if(yych == '\n') goto yy119; if(yych == '\n') goto yy119;
if(yych == ' ') goto yy116; if(yych == ' ') goto yy116;
yy101: yy101:
#line 403 #line 404
{ goto Plain2; } { goto Plain2; }
yy102: yych = *++YYCURSOR; yy102: yych = *++YYCURSOR;
yy103: yy103:
#line 391 #line 392
{ if ( plvl->status != syck_lvl_inline ) goto Plain2; { if ( plvl->status != syck_lvl_inline ) goto Plain2;
RETURN_IMPLICIT(multiLine); RETURN_IMPLICIT(multiLine);
} }
@ -852,18 +853,18 @@ yy104: yych = *++YYCURSOR;
goto yy101; goto yy101;
yy105: yych = *++YYCURSOR; yy105: yych = *++YYCURSOR;
yy106: yy106:
#line 395 #line 396
{ RETURN_IMPLICIT(multiLine); } { RETURN_IMPLICIT(multiLine); }
yy107: yych = *++YYCURSOR; yy107: yych = *++YYCURSOR;
if(yych == '#') goto yy110; if(yych == '#') goto yy110;
yy108: yy108:
#line 401 #line 402
{ goto Plain3; } { goto Plain3; }
yy109: yych = *++YYCURSOR; yy109: yych = *++YYCURSOR;
goto yy101; goto yy101;
yy110: yych = *++YYCURSOR; yy110: yych = *++YYCURSOR;
yy111: yy111:
#line 397 #line 398
{ eat_comments( parser ); { eat_comments( parser );
RETURN_IMPLICIT(multiLine); RETURN_IMPLICIT(multiLine);
} }
@ -882,7 +883,7 @@ yy116: ++YYCURSOR;
yych = *YYCURSOR; yych = *YYCURSOR;
yy117: if(yych == ' ') goto yy116; yy117: if(yych == ' ') goto yy116;
yy118: yy118:
#line 389 #line 390
{ RETURN_IMPLICIT(multiLine); } { RETURN_IMPLICIT(multiLine); }
yy119: ++YYCURSOR; yy119: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1); if(YYLIMIT == YYCURSOR) YYFILL(1);
@ -900,7 +901,7 @@ yy123: ++YYCURSOR;
yy124: if(yybm[0+yych] & 128) goto yy123; yy124: if(yybm[0+yych] & 128) goto yy123;
goto yy99; goto yy99;
} }
#line 405 #line 406
} }
@ -965,7 +966,7 @@ yy125:
yy127: yych = *++YYCURSOR; yy127: yych = *++YYCURSOR;
goto yy137; goto yy137;
yy128: yy128:
#line 419 #line 420
{ int indt_len; { int indt_len;
int nl_count = 0; int nl_count = 0;
SyckLevel *lvl; SyckLevel *lvl;
@ -1004,7 +1005,7 @@ yy128:
yy129: yych = *++YYCURSOR; yy129: yych = *++YYCURSOR;
if(yych == '\'') goto yy134; if(yych == '\'') goto yy134;
yy130: yy130:
#line 459 #line 460
{ SyckLevel *lvl; { SyckLevel *lvl;
SyckNode *n = syck_alloc_str(); SyckNode *n = syck_alloc_str();
lvl = CURRENT_LEVEL(); lvl = CURRENT_LEVEL();
@ -1022,13 +1023,13 @@ yy131: yych = *++YYCURSOR;
goto yy130; goto yy130;
yy132: yych = *++YYCURSOR; yy132: yych = *++YYCURSOR;
yy133: yy133:
#line 473 #line 474
{ QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); { QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1));
goto SingleQuote2; goto SingleQuote2;
} }
yy134: yych = *++YYCURSOR; yy134: yych = *++YYCURSOR;
yy135: yy135:
#line 455 #line 456
{ QUOTECAT(qstr, qcapa, qidx, '\''); { QUOTECAT(qstr, qcapa, qidx, '\'');
goto SingleQuote2; goto SingleQuote2;
} }
@ -1043,7 +1044,7 @@ yy138: ++YYCURSOR;
yy139: if(yybm[0+yych] & 128) goto yy138; yy139: if(yybm[0+yych] & 128) goto yy138;
goto yy128; goto yy128;
} }
#line 477 #line 478
} }
@ -1113,7 +1114,7 @@ yy140:
yy142: yych = *++YYCURSOR; yy142: yych = *++YYCURSOR;
goto yy158; goto yy158;
yy143: yy143:
#line 495 #line 496
{ int indt_len; { int indt_len;
int nl_count = 0; int nl_count = 0;
SyckLevel *lvl; SyckLevel *lvl;
@ -1185,13 +1186,13 @@ yy144: yyaccept = 0;
} }
} }
yy145: yy145:
#line 570 #line 571
{ QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); { QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1));
goto DoubleQuote2; goto DoubleQuote2;
} }
yy146: yych = *++YYCURSOR; yy146: yych = *++YYCURSOR;
yy147: yy147:
#line 556 #line 557
{ SyckLevel *lvl; { SyckLevel *lvl;
SyckNode *n = syck_alloc_str(); SyckNode *n = syck_alloc_str();
lvl = CURRENT_LEVEL(); lvl = CURRENT_LEVEL();
@ -1220,14 +1221,14 @@ yy152: YYCURSOR = YYMARKER;
} }
yy153: yych = *++YYCURSOR; yy153: yych = *++YYCURSOR;
yy154: yy154:
#line 551 #line 552
{ keep_nl = 0; { keep_nl = 0;
YYCURSOR--; YYCURSOR--;
goto DoubleQuote2; goto DoubleQuote2;
} }
yy155: yych = *++YYCURSOR; yy155: yych = *++YYCURSOR;
yy156: yy156:
#line 535 #line 536
{ char ch = *( YYCURSOR - 1 ); { char ch = *( YYCURSOR - 1 );
switch ( ch ) switch ( ch )
{ {
@ -1254,7 +1255,7 @@ yy159: ++YYCURSOR;
yy160: if(yybm[0+yych] & 128) goto yy159; yy160: if(yybm[0+yych] & 128) goto yy159;
goto yy143; goto yy143;
} }
#line 574 #line 575
} }
@ -1315,7 +1316,7 @@ yy161:
yy163:yy164: yych = *++YYCURSOR; yy163:yy164: yych = *++YYCURSOR;
goto yy172; goto yy172;
yy165: yy165:
#line 583 #line 584
{ SyckLevel *lvl; { SyckLevel *lvl;
YYCURSOR = YYTOKTMP; YYCURSOR = YYTOKTMP;
if ( YYCURSOR == YYTOKEN + 1 ) if ( YYCURSOR == YYTOKEN + 1 )
@ -1365,7 +1366,7 @@ yy166: yych = *++YYCURSOR;
goto yy170; goto yy170;
yy167: yych = *++YYCURSOR; yy167: yych = *++YYCURSOR;
yy168: yy168:
#line 629 #line 630
{ goto TransferMethod; } { goto TransferMethod; }
yy169: ++YYCURSOR; yy169: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1); if(YYLIMIT == YYCURSOR) YYFILL(1);
@ -1378,7 +1379,7 @@ yy171: ++YYCURSOR;
yy172: if(yybm[0+yych] & 128) goto yy171; yy172: if(yybm[0+yych] & 128) goto yy171;
goto yy165; goto yy165;
} }
#line 631 #line 632
} }
@ -1471,7 +1472,7 @@ yy173:
yy175: yych = *++YYCURSOR; yy175: yych = *++YYCURSOR;
goto yy184; goto yy184;
yy176: yy176:
#line 673 #line 674
{ int indt_len; { int indt_len;
GOBBLE_UP_INDENT( indt_len, YYTOKTMP ); GOBBLE_UP_INDENT( indt_len, YYTOKTMP );
lvl = CURRENT_LEVEL(); lvl = CURRENT_LEVEL();
@ -1504,7 +1505,7 @@ yy176:
} }
yy177: yych = *++YYCURSOR; yy177: yych = *++YYCURSOR;
yy178: yy178:
#line 705 #line 706
{ lvl = CURRENT_LEVEL(); { lvl = CURRENT_LEVEL();
YYCURSOR--; YYCURSOR--;
yylval->nodeData = syck_new_str2( YYTOKEN, YYCURSOR - YYTOKEN ); yylval->nodeData = syck_new_str2( YYTOKEN, YYCURSOR - YYTOKEN );
@ -1514,7 +1515,7 @@ yy178:
} }
yy179: yych = *++YYCURSOR; yy179: yych = *++YYCURSOR;
yy180: yy180:
#line 713 #line 714
{ lvl = CURRENT_LEVEL(); { lvl = CURRENT_LEVEL();
if ( lvl->status != syck_lvl_block ) if ( lvl->status != syck_lvl_block )
{ {
@ -1525,7 +1526,7 @@ yy180:
} }
yy181: yych = *++YYCURSOR; yy181: yych = *++YYCURSOR;
yy182: yy182:
#line 722 #line 723
{ goto ScalarBlock2; } { goto ScalarBlock2; }
yy183: ++YYCURSOR; yy183: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1); if(YYLIMIT == YYCURSOR) YYFILL(1);
@ -1538,7 +1539,7 @@ yy185: ++YYCURSOR;
yy186: if(yybm[0+yych] & 128) goto yy185; yy186: if(yybm[0+yych] & 128) goto yy185;
goto yy176; goto yy176;
} }
#line 724 #line 725
} }
@ -1600,7 +1601,7 @@ yy187:
goto yy192; goto yy192;
yy189: yych = *++YYCURSOR; yy189: yych = *++YYCURSOR;
yy190: yy190:
#line 740 #line 741
{ SyckLevel *lvl = CURRENT_LEVEL(); { SyckLevel *lvl = CURRENT_LEVEL();
YYCURSOR = tok; YYCURSOR = tok;
return; return;
@ -1609,7 +1610,7 @@ yy191: yych = *++YYCURSOR;
goto yy195; goto yy195;
yy192: yych = *++YYCURSOR; yy192: yych = *++YYCURSOR;
yy193: yy193:
#line 745 #line 746
{ goto Comment; { goto Comment;
} }
yy194: ++YYCURSOR; yy194: ++YYCURSOR;
@ -1618,7 +1619,7 @@ yy194: ++YYCURSOR;
yy195: if(yybm[0+yych] & 128) goto yy194; yy195: if(yybm[0+yych] & 128) goto yy194;
goto yy190; goto yy190;
} }
#line 748 #line 749
} }