From 822a11d47edcb410c67839c035d3010007cc07a5 Mon Sep 17 00:00:00 2001 From: why Date: Tue, 26 Aug 2003 07:02:19 +0000 Subject: * implicit.c (syck_type_id_to_taguri): corrected detection of x-private types. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4440 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/syck/emitter.c | 2 +- ext/syck/implicit.c | 161 +++++++++++++++++++++++++++------------------------- 2 files changed, 84 insertions(+), 79 deletions(-) (limited to 'ext') diff --git a/ext/syck/emitter.c b/ext/syck/emitter.c index 62f1b57f48..2be1a688e8 100644 --- a/ext/syck/emitter.c +++ b/ext/syck/emitter.c @@ -102,7 +102,7 @@ syck_base64dec( char *s, long len ) } } *end = '\0'; - //RSTRING(buf)->len = ptr - RSTRING(buf)->ptr; + /* RSTRING(buf)->len = ptr - RSTRING(buf)->ptr; */ return ptr; } diff --git a/ext/syck/implicit.c b/ext/syck/implicit.c index d872c83fd2..80703a5297 100644 --- a/ext/syck/implicit.c +++ b/ext/syck/implicit.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.5 on Thu Aug 21 14:06:39 2003 */ +/* Generated by re2c 0.5 on Tue Aug 26 00:28:27 2003 */ #line 1 "implicit.re" /* * implicit.re @@ -1460,7 +1460,7 @@ syck_type_id_to_uri( char *type_id ) goto yy193; yy194: ++YYCURSOR; yy193: - if((YYLIMIT - YYCURSOR) < 20) YYFILL(20); + if((YYLIMIT - YYCURSOR) < 21) YYFILL(21); yych = *YYCURSOR; switch(yych){ case '\000': goto yy195; @@ -1595,7 +1595,7 @@ yy196: yyaccept = 0; case 'x': case 'y': case 'z': goto yy205; - case 'a': goto yy236; + case 'a': goto yy237; default: goto yy197; } yy197: @@ -1604,10 +1604,8 @@ yy197: yy198: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ - case ',': goto yy207; - case '-': goto yy203; - case '.': goto yy208; - case '/': goto yy209; + case ',': case '.': + case '/': case '0': case '1': case '2': @@ -1656,7 +1654,9 @@ yy198: yyaccept = 0; case 'l': case 'm': case 'n': - case 'o': case 'q': + case 'o': + case 'p': + case 'q': case 'r': case 's': case 't': @@ -1665,8 +1665,8 @@ yy198: yyaccept = 0; case 'w': case 'x': case 'y': - case 'z': goto yy205; - case 'p': goto yy227; + case 'z': goto yy206; + case '-': goto yy227; default: goto yy197; } yy199: yych = *++YYCURSOR; @@ -2243,10 +2243,7 @@ yy226: yych = *++YYCURSOR; } yy227: yych = *++YYCURSOR; switch(yych){ - case ',': goto yy207; - case '.': goto yy208; - case '/': goto yy209; - case 'r': goto yy228; + case 'p': goto yy228; default: goto yy204; } yy228: yych = *++YYCURSOR; @@ -2254,7 +2251,7 @@ yy228: yych = *++YYCURSOR; case ',': goto yy207; case '.': goto yy208; case '/': goto yy209; - case 'i': goto yy229; + case 'r': goto yy229; default: goto yy204; } yy229: yych = *++YYCURSOR; @@ -2262,7 +2259,7 @@ yy229: yych = *++YYCURSOR; case ',': goto yy207; case '.': goto yy208; case '/': goto yy209; - case 'v': goto yy230; + case 'i': goto yy230; default: goto yy204; } yy230: yych = *++YYCURSOR; @@ -2270,7 +2267,7 @@ yy230: yych = *++YYCURSOR; case ',': goto yy207; case '.': goto yy208; case '/': goto yy209; - case 'a': goto yy231; + case 'v': goto yy231; default: goto yy204; } yy231: yych = *++YYCURSOR; @@ -2278,7 +2275,7 @@ yy231: yych = *++YYCURSOR; case ',': goto yy207; case '.': goto yy208; case '/': goto yy209; - case 't': goto yy232; + case 'a': goto yy232; default: goto yy204; } yy232: yych = *++YYCURSOR; @@ -2286,7 +2283,7 @@ yy232: yych = *++YYCURSOR; case ',': goto yy207; case '.': goto yy208; case '/': goto yy209; - case 'e': goto yy233; + case 't': goto yy233; default: goto yy204; } yy233: yych = *++YYCURSOR; @@ -2294,27 +2291,27 @@ yy233: yych = *++YYCURSOR; case ',': goto yy207; case '.': goto yy208; case '/': goto yy209; - case ':': goto yy234; + case 'e': goto yy234; default: goto yy204; } yy234: yych = *++YYCURSOR; -yy235: -#line 142 - { return type_id; } -yy236: yych = *++YYCURSOR; switch(yych){ case ',': goto yy207; case '.': goto yy208; case '/': goto yy209; - case 'g': goto yy237; + case ':': goto yy235; default: goto yy204; } +yy235: yych = *++YYCURSOR; +yy236: +#line 142 + { return type_id; } yy237: yych = *++YYCURSOR; switch(yych){ case ',': goto yy207; case '.': goto yy208; case '/': goto yy209; - case 'u': goto yy238; + case 'g': goto yy238; default: goto yy204; } yy238: yych = *++YYCURSOR; @@ -2322,7 +2319,7 @@ yy238: yych = *++YYCURSOR; case ',': goto yy207; case '.': goto yy208; case '/': goto yy209; - case 'r': goto yy239; + case 'u': goto yy239; default: goto yy204; } yy239: yych = *++YYCURSOR; @@ -2330,7 +2327,7 @@ yy239: yych = *++YYCURSOR; case ',': goto yy207; case '.': goto yy208; case '/': goto yy209; - case 'i': goto yy240; + case 'r': goto yy240; default: goto yy204; } yy240: yych = *++YYCURSOR; @@ -2338,23 +2335,31 @@ yy240: yych = *++YYCURSOR; case ',': goto yy207; case '.': goto yy208; case '/': goto yy209; - case ':': goto yy241; + case 'i': goto yy241; default: goto yy204; } yy241: yych = *++YYCURSOR; + switch(yych){ + case ',': goto yy207; + case '.': goto yy208; + case '/': goto yy209; + case ':': goto yy242; + default: goto yy204; + } +yy242: yych = *++YYCURSOR; switch(yych){ case ',': case '-': case '.': goto yy195; - default: goto yy243; + default: goto yy244; } -yy242: ++YYCURSOR; +yy243: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; -yy243: switch(yych){ - case ',': goto yy246; - case '-': goto yy244; - case '.': goto yy247; +yy244: switch(yych){ + case ',': goto yy247; + case '-': goto yy245; + case '.': goto yy248; case '0': case '1': case '2': @@ -2414,14 +2419,14 @@ yy243: switch(yych){ case 'w': case 'x': case 'y': - case 'z': goto yy242; + case 'z': goto yy243; default: goto yy195; } -yy244: ++YYCURSOR; +yy245: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; -yy245: switch(yych){ - case '-': goto yy244; +yy246: switch(yych){ + case '-': goto yy245; case '0': case '1': case '2': @@ -2481,10 +2486,10 @@ yy245: switch(yych){ case 'w': case 'x': case 'y': - case 'z': goto yy242; + case 'z': goto yy243; default: goto yy195; } -yy246: yych = *++YYCURSOR; +yy247: yych = *++YYCURSOR; switch(yych){ case '0': case '1': @@ -2495,10 +2500,10 @@ yy246: yych = *++YYCURSOR; case '6': case '7': case '8': - case '9': goto yy252; + case '9': goto yy253; default: goto yy195; } -yy247: ++YYCURSOR; +yy248: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych){ @@ -2561,16 +2566,16 @@ yy247: ++YYCURSOR; case 'w': case 'x': case 'y': - case 'z': goto yy248; + case 'z': goto yy249; default: goto yy195; } -yy248: ++YYCURSOR; +yy249: ++YYCURSOR; if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; -yy249: switch(yych){ - case ',': goto yy246; - case '-': goto yy250; - case '.': goto yy247; +yy250: switch(yych){ + case ',': goto yy247; + case '-': goto yy251; + case '.': goto yy248; case '0': case '1': case '2': @@ -2630,14 +2635,14 @@ yy249: switch(yych){ case 'w': case 'x': case 'y': - case 'z': goto yy248; + case 'z': goto yy249; default: goto yy195; } -yy250: ++YYCURSOR; +yy251: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; -yy251: switch(yych){ - case '-': goto yy250; +yy252: switch(yych){ + case '-': goto yy251; case '0': case '1': case '2': @@ -2697,10 +2702,10 @@ yy251: switch(yych){ case 'w': case 'x': case 'y': - case 'z': goto yy248; + case 'z': goto yy249; default: goto yy195; } -yy252: yych = *++YYCURSOR; +yy253: yych = *++YYCURSOR; switch(yych){ case '0': case '1': @@ -2711,10 +2716,10 @@ yy252: yych = *++YYCURSOR; case '6': case '7': case '8': - case '9': goto yy253; + case '9': goto yy254; default: goto yy195; } -yy253: yych = *++YYCURSOR; +yy254: yych = *++YYCURSOR; switch(yych){ case '0': case '1': @@ -2725,10 +2730,10 @@ yy253: yych = *++YYCURSOR; case '6': case '7': case '8': - case '9': goto yy254; + case '9': goto yy255; default: goto yy195; } -yy254: yych = *++YYCURSOR; +yy255: yych = *++YYCURSOR; switch(yych){ case '0': case '1': @@ -2739,16 +2744,16 @@ yy254: yych = *++YYCURSOR; case '6': case '7': case '8': - case '9': goto yy255; + case '9': goto yy256; default: goto yy195; } -yy255: yych = *++YYCURSOR; +yy256: yych = *++YYCURSOR; switch(yych){ - case '-': goto yy256; - case ':': goto yy257; + case '-': goto yy257; + case ':': goto yy258; default: goto yy195; } -yy256: yych = *++YYCURSOR; +yy257: yych = *++YYCURSOR; switch(yych){ case '0': case '1': @@ -2759,14 +2764,14 @@ yy256: yych = *++YYCURSOR; case '6': case '7': case '8': - case '9': goto yy259; + case '9': goto yy260; default: goto yy195; } -yy257: yych = *++YYCURSOR; -yy258: +yy258: yych = *++YYCURSOR; +yy259: #line 140 { return type_id; } -yy259: yych = *++YYCURSOR; +yy260: yych = *++YYCURSOR; switch(yych){ case '0': case '1': @@ -2777,16 +2782,16 @@ yy259: yych = *++YYCURSOR; case '6': case '7': case '8': - case '9': goto yy260; + case '9': goto yy261; default: goto yy195; } -yy260: yych = *++YYCURSOR; +yy261: yych = *++YYCURSOR; switch(yych){ - case '-': goto yy261; - case ':': goto yy257; + case '-': goto yy262; + case ':': goto yy258; default: goto yy195; } -yy261: yych = *++YYCURSOR; +yy262: yych = *++YYCURSOR; switch(yych){ case '0': case '1': @@ -2797,10 +2802,10 @@ yy261: yych = *++YYCURSOR; case '6': case '7': case '8': - case '9': goto yy262; + case '9': goto yy263; default: goto yy195; } -yy262: yych = *++YYCURSOR; +yy263: yych = *++YYCURSOR; switch(yych){ case '0': case '1': @@ -2811,12 +2816,12 @@ yy262: yych = *++YYCURSOR; case '6': case '7': case '8': - case '9': goto yy263; + case '9': goto yy264; default: goto yy195; } -yy263: yych = *++YYCURSOR; +yy264: yych = *++YYCURSOR; switch(yych){ - case ':': goto yy257; + case ':': goto yy258; default: goto yy195; } } -- cgit v1.2.3