* ext/syck/rubyext.c (syck_parser_load): root-level false was returning

  nil.

* ext/syck/token.c: root-level transfer method bug.

* ext/syck/gram.c: root-level empty gave a parse error.

* lib/yaml/rubytypes.rb: Symbol#to_yaml generating method call error.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3850 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 45 insertions, 44 deletions

diff --git a/ext/syck/token.c b/ext/syck/token.c
index 9801d936c6..62499ecbaf 100644
--- a/ext/syck/token.c
+++ b/ext/syck/token.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.5 on Mon May 19 12:39:17 2003 */
+/* Generated by re2c 0.5 on Wed May 21 13:04:00 2003 */
 #line 1 "token.re"
 /*
  * token.re
@@ -388,7 +388,7 @@ yy31:	yych = *++YYCURSOR;
 	default:	goto yy32;
 	}
 yy32:
-#line 335
+#line 336
 	{   ENSURE_IOPEN(lvl, 0, 1);
                         goto Plain; 
                     }
@@ -559,14 +559,15 @@ yy35:	yych = *++YYCURSOR;
 yy36:	yych = *++YYCURSOR;
 yy37:
 #line 312
-	{   goto TransferMethod; }
+	{   ENSURE_IOPEN(lvl, 0, 1);
+                        goto TransferMethod; }
 yy38:	yych = *++YYCURSOR;
 yy39:
-#line 314
+#line 315
 	{   goto SingleQuote; }
 yy40:	yych = *++YYCURSOR;
 yy41:
-#line 316
+#line 317
 	{   goto DoubleQuote; }
 yy42:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -587,18 +588,18 @@ yy42:	yyaccept = 0;
 	}
 yy43:	yych = *++YYCURSOR;
 yy44:
-#line 325
+#line 326
 	{   eat_comments( parser ); 
                         goto Document;
                     }
 yy45:	yych = *++YYCURSOR;
 	goto yy51;
 yy46:
-#line 329
+#line 330
 	{   goto Document; }
 yy47:	yych = *++YYCURSOR;
 yy48:
-#line 331
+#line 332
 	{   ENSURE_IEND(lvl, -1);
                         return 0; 
                     }
@@ -641,7 +642,7 @@ yy56:	switch(yych){
 	default:	goto yy57;
 	}
 yy57:
-#line 318
+#line 319
 	{   if ( *( YYCURSOR - 1 ) == '\n' ) 
                         {
                             YYCURSOR--;
@@ -887,7 +888,7 @@ yy79:	switch(yych){
 	default:	goto yy26;
 	}
 }
-#line 339
+#line 340
 
     }
 
@@ -994,14 +995,14 @@ yy83:	yyaccept = 0;
 	default:	goto yy84;
 	}
 yy84:
-#line 352
+#line 353
 	{   YYCURSOR = YYTOKTMP;
                         return DOCSEP;
                     }
 yy85:	yych = *++YYCURSOR;
 	goto yy89;
 yy86:
-#line 350
+#line 351
 	{   goto Directive; }
 yy87:	yych = *++YYCURSOR;
 	goto yy84;
@@ -1253,10 +1254,10 @@ yy94:	switch(yych){
 	default:	goto yy95;
 	}
 yy95:
-#line 348
+#line 349
 	{   goto Directive; }
 }
-#line 355
+#line 356
 
 
     }
@@ -1295,7 +1296,7 @@ yy96:
 yy98:	yych = *++YYCURSOR;
 	goto yy122;
 yy99:
-#line 375
+#line 376
 	{   int indt_len;
                         SyckLevel *lvl;
                         char *tok = YYTOKTMP;
@@ -1317,11 +1318,11 @@ yy100:	yych = *++YYCURSOR;
 	default:	goto yy101;
 	}
 yy101:
-#line 404
+#line 405
 	{   goto Plain2; }
 yy102:	yych = *++YYCURSOR;
 yy103:
-#line 392
+#line 393
 	{   if ( plvl->status != syck_lvl_inline ) goto Plain2;
                         RETURN_IMPLICIT(multiLine);
                     }
@@ -1333,7 +1334,7 @@ yy104:	yych = *++YYCURSOR;
 	}
 yy105:	yych = *++YYCURSOR;
 yy106:
-#line 396
+#line 397
 	{   RETURN_IMPLICIT(multiLine); }
 yy107:	yych = *++YYCURSOR;
 	switch(yych){
@@ -1341,13 +1342,13 @@ yy107:	yych = *++YYCURSOR;
 	default:	goto yy108;
 	}
 yy108:
-#line 402
+#line 403
 	{   goto Plain3; }
 yy109:	yych = *++YYCURSOR;
 	goto yy101;
 yy110:	yych = *++YYCURSOR;
 yy111:
-#line 398
+#line 399
 	{   eat_comments( parser ); 
                         RETURN_IMPLICIT(multiLine);
                     }
@@ -1373,7 +1374,7 @@ yy117:	switch(yych){
 	default:	goto yy118;
 	}
 yy118:
-#line 390
+#line 391
 	{   RETURN_IMPLICIT(multiLine); }
 yy119:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -1398,7 +1399,7 @@ yy124:	switch(yych){
 	default:	goto yy99;
 	}
 }
-#line 406
+#line 407
 
     }
 
@@ -1428,7 +1429,7 @@ yy125:
 yy127:	yych = *++YYCURSOR;
 	goto yy137;
 yy128:
-#line 420
+#line 421
 	{   int indt_len;
                         int nl_count = 0;
                         SyckLevel *lvl;
@@ -1470,7 +1471,7 @@ yy129:	yych = *++YYCURSOR;
 	default:	goto yy130;
 	}
 yy130:
-#line 460
+#line 461
 	{   SyckLevel *lvl;
                         SyckNode *n = syck_alloc_str();
                         lvl = CURRENT_LEVEL();
@@ -1488,13 +1489,13 @@ yy131:	yych = *++YYCURSOR;
 	goto yy130;
 yy132:	yych = *++YYCURSOR;
 yy133:
-#line 474
+#line 475
 	{   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); 
                         goto SingleQuote2; 
                     }
 yy134:	yych = *++YYCURSOR;
 yy135:
-#line 456
+#line 457
 	{   QUOTECAT(qstr, qcapa, qidx, '\'');
                         goto SingleQuote2; 
                     }
@@ -1514,7 +1515,7 @@ yy139:	switch(yych){
 	default:	goto yy128;
 	}
 }
-#line 478
+#line 479
 
 
     }
@@ -1549,7 +1550,7 @@ yy140:
 yy142:	yych = *++YYCURSOR;
 	goto yy158;
 yy143:
-#line 496
+#line 497
 	{   int indt_len;
                         int nl_count = 0;
                         SyckLevel *lvl;
@@ -1600,13 +1601,13 @@ yy144:	yyaccept = 0;
 	default:	goto yy145;
 	}
 yy145:
-#line 571
+#line 572
 	{   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); 
                         goto DoubleQuote2; 
                     }
 yy146:	yych = *++YYCURSOR;
 yy147:
-#line 557
+#line 558
 	{   SyckLevel *lvl;
                         SyckNode *n = syck_alloc_str();
                         lvl = CURRENT_LEVEL();
@@ -1638,14 +1639,14 @@ yy152:	YYCURSOR = YYMARKER;
 	}
 yy153:	yych = *++YYCURSOR;
 yy154:
-#line 552
+#line 553
 	{   keep_nl = 0;
                         YYCURSOR--;
                         goto DoubleQuote2; 
                     }
 yy155:	yych = *++YYCURSOR;
 yy156:
-#line 536
+#line 537
 	{   char ch = *( YYCURSOR - 1 );
                         switch ( ch )
                         {
@@ -1677,7 +1678,7 @@ yy160:	switch(yych){
 	default:	goto yy143;
 	}
 }
-#line 575
+#line 576
 
     }
 
@@ -1702,7 +1703,7 @@ yy161:
 yy163:yy164:	yych = *++YYCURSOR;
 	goto yy172;
 yy165:
-#line 584
+#line 585
 	{   SyckLevel *lvl;
                         YYCURSOR = YYTOKTMP;
                         if ( YYCURSOR == YYTOKEN + 1 )
@@ -1752,7 +1753,7 @@ yy166:	yych = *++YYCURSOR;
 	goto yy170;
 yy167:	yych = *++YYCURSOR;
 yy168:
-#line 630
+#line 631
 	{   goto TransferMethod; }
 yy169:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -1769,7 +1770,7 @@ yy172:	switch(yych){
 	default:	goto yy165;
 	}
 }
-#line 632
+#line 633
 
     }
 
@@ -1827,7 +1828,7 @@ yy173:
 yy175:	yych = *++YYCURSOR;
 	goto yy184;
 yy176:
-#line 674
+#line 675
 	{   int indt_len;
                         GOBBLE_UP_INDENT( indt_len, YYTOKTMP );
                         lvl = CURRENT_LEVEL();
@@ -1860,7 +1861,7 @@ yy176:
                     }
 yy177:	yych = *++YYCURSOR;
 yy178:
-#line 706
+#line 707
 	{   lvl = CURRENT_LEVEL();
                         YYCURSOR--;
                         yylval->nodeData = syck_new_str2( YYTOKEN, YYCURSOR - YYTOKEN );  
@@ -1870,7 +1871,7 @@ yy178:
                     }
 yy179:	yych = *++YYCURSOR;
 yy180:
-#line 714
+#line 715
 	{   lvl = CURRENT_LEVEL();
                         if ( lvl->status != syck_lvl_block )
                         {
@@ -1881,7 +1882,7 @@ yy180:
                     }
 yy181:	yych = *++YYCURSOR;
 yy182:
-#line 723
+#line 724
 	{   goto ScalarBlock2; }
 yy183:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -1899,7 +1900,7 @@ yy186:	switch(yych){
 	default:	goto yy176;
 	}
 }
-#line 725
+#line 726
 
     }
 
@@ -1929,7 +1930,7 @@ yy187:
 	}
 yy189:	yych = *++YYCURSOR;
 yy190:
-#line 741
+#line 742
 	{   SyckLevel *lvl = CURRENT_LEVEL();
                         YYCURSOR = tok;
                         return;
@@ -1938,7 +1939,7 @@ yy191:	yych = *++YYCURSOR;
 	goto yy195;
 yy192:	yych = *++YYCURSOR;
 yy193:
-#line 746
+#line 747
 	{   goto Comment; 
                     }
 yy194:	++YYCURSOR;
@@ -1949,7 +1950,7 @@ yy195:	switch(yych){
 	default:	goto yy190;
 	}
 }
-#line 749
+#line 750
 
 
     }