* ext/syck/rubyext.c: refactoring of the transfer method

  dispatch.  added yaml_org_handler for faster dispatch of
  transfers to base types.

* lib/yaml/rubytypes.rb: removed handling of builtins from
  Ruby library.

* ext/syck/token.c: quoted and block scalars are now implicit !str

* ext/syck/implicit.c: empty string detected as !null.


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

1 files changed, 526 insertions, 525 deletions

diff --git a/ext/syck/implicit.c b/ext/syck/implicit.c
index 4ab61c5539..d872c83fd2 100644
--- a/ext/syck/implicit.c
+++ b/ext/syck/implicit.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.5 on Mon Jul 28 11:21:48 2003 */
+/* Generated by re2c 0.5 on Thu Aug 21 14:06:39 2003 */
 #line 1 "implicit.re"
 /*
  * implicit.re
@@ -59,11 +59,11 @@ yy0:
 	if((YYLIMIT - YYCURSOR) < 26) YYFILL(26);
 	yych = *YYCURSOR;
 	switch(yych){
-	case '\000':	goto yy2;
-	case '+':	goto yy15;
-	case '-':	goto yy16;
-	case '.':	goto yy19;
-	case '0':	goto yy17;
+	case '\000':	goto yy6;
+	case '+':	goto yy16;
+	case '-':	goto yy17;
+	case '.':	goto yy20;
+	case '0':	goto yy18;
 	case '1':
 	case '2':
 	case '3':
@@ -72,105 +72,105 @@ yy0:
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy18;
-	case '<':	goto yy21;
-	case '=':	goto yy20;
-	case 'F':	goto yy14;
-	case 'N':	goto yy6;
-	case 'O':	goto yy12;
-	case 'T':	goto yy8;
-	case 'Y':	goto yy10;
-	case 'f':	goto yy13;
-	case 'n':	goto yy5;
-	case 'o':	goto yy11;
-	case 't':	goto yy7;
-	case 'y':	goto yy9;
-	case '~':	goto yy3;
-	default:	goto yy22;
+	case '9':	goto yy19;
+	case '<':	goto yy22;
+	case '=':	goto yy21;
+	case 'F':	goto yy15;
+	case 'N':	goto yy5;
+	case 'O':	goto yy13;
+	case 'T':	goto yy9;
+	case 'Y':	goto yy11;
+	case 'f':	goto yy14;
+	case 'n':	goto yy4;
+	case 'o':	goto yy12;
+	case 't':	goto yy8;
+	case 'y':	goto yy10;
+	case '~':	goto yy2;
+	default:	goto yy23;
 	}
-yy2:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy4;
-	}
-yy3:	yych = *++YYCURSOR;
-	if(yych <= '\000')	goto yy188;
-yy4:
+yy2:	yych = *++YYCURSOR;
+	if(yych <= '\000')	goto yy6;
+yy3:
 #line 116
 	{   return "str"; }
-yy5:	yyaccept = 0;
+yy4:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case 'o':	goto yy161;
+	case 'o':	goto yy163;
 	case 'u':	goto yy191;
-	default:	goto yy4;
-	}
-yy6:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'O':	case 'o':	goto yy161;
-	case 'U':	goto yy184;
-	case 'u':	goto yy185;
-	default:	goto yy4;
+	default:	goto yy3;
 	}
-yy7:	yyaccept = 0;
+yy5:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case 'r':	goto yy182;
-	default:	goto yy4;
+	case 'O':	case 'o':	goto yy163;
+	case 'U':	goto yy186;
+	case 'u':	goto yy187;
+	default:	goto yy3;
 	}
+yy6:	yych = *++YYCURSOR;
+yy7:
+#line 82
+	{   return "null"; }
 yy8:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case 'R':	goto yy178;
-	case 'r':	goto yy179;
-	default:	goto yy4;
+	case 'r':	goto yy184;
+	default:	goto yy3;
 	}
 yy9:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case 'e':	goto yy177;
-	default:	goto yy4;
+	case 'R':	goto yy180;
+	case 'r':	goto yy181;
+	default:	goto yy3;
 	}
 yy10:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case 'E':	goto yy175;
-	case 'e':	goto yy176;
-	default:	goto yy4;
+	case 'e':	goto yy179;
+	default:	goto yy3;
 	}
 yy11:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case 'f':	goto yy174;
-	case 'n':	goto yy171;
-	default:	goto yy4;
+	case 'E':	goto yy177;
+	case 'e':	goto yy178;
+	default:	goto yy3;
 	}
 yy12:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case 'F':	goto yy169;
-	case 'N':	case 'n':	goto yy171;
-	case 'f':	goto yy170;
-	default:	goto yy4;
+	case 'f':	goto yy176;
+	case 'n':	goto yy173;
+	default:	goto yy3;
 	}
 yy13:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case 'a':	goto yy166;
-	default:	goto yy4;
+	case 'F':	goto yy171;
+	case 'N':	case 'n':	goto yy173;
+	case 'f':	goto yy172;
+	default:	goto yy3;
 	}
 yy14:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case 'A':	goto yy157;
-	case 'a':	goto yy158;
-	default:	goto yy4;
+	case 'a':	goto yy168;
+	default:	goto yy3;
 	}
 yy15:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case '.':	goto yy156;
-	case '0':	goto yy147;
+	case 'A':	goto yy159;
+	case 'a':	goto yy160;
+	default:	goto yy3;
+	}
+yy16:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case '.':	goto yy158;
+	case '0':	goto yy149;
 	case '1':
 	case '2':
 	case '3':
@@ -179,14 +179,14 @@ yy15:	yyaccept = 0;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy45;
-	default:	goto yy4;
+	case '9':	goto yy47;
+	default:	goto yy3;
 	}
-yy16:	yyaccept = 0;
+yy17:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case '.':	goto yy146;
-	case '0':	goto yy147;
+	case '.':	goto yy148;
+	case '0':	goto yy149;
 	case '1':
 	case '2':
 	case '3':
@@ -195,15 +195,15 @@ yy16:	yyaccept = 0;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy45;
-	default:	goto yy4;
+	case '9':	goto yy47;
+	default:	goto yy3;
 	}
-yy17:	yyaccept = 0;
+yy18:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case '\000':	goto yy49;
-	case ',':	goto yy131;
-	case '.':	goto yy47;
+	case '\000':	goto yy51;
+	case ',':	goto yy133;
+	case '.':	goto yy49;
 	case '0':
 	case '1':
 	case '2':
@@ -211,18 +211,18 @@ yy17:	yyaccept = 0;
 	case '4':
 	case '5':
 	case '6':
-	case '7':	goto yy129;
+	case '7':	goto yy131;
 	case '8':
-	case '9':	goto yy130;
-	case 'x':	goto yy133;
-	default:	goto yy4;
+	case '9':	goto yy132;
+	case 'x':	goto yy135;
+	default:	goto yy3;
 	}
-yy18:	yyaccept = 0;
+yy19:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case '\000':	goto yy49;
-	case ',':	goto yy45;
-	case '.':	goto yy47;
+	case '\000':	goto yy51;
+	case ',':	goto yy47;
+	case '.':	goto yy49;
 	case '0':
 	case '1':
 	case '2':
@@ -232,104 +232,108 @@ yy18:	yyaccept = 0;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy44;
-	default:	goto yy4;
+	case '9':	goto yy46;
+	default:	goto yy3;
 	}
-yy19:	yyaccept = 0;
+yy20:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case 'I':	goto yy31;
-	case 'N':	goto yy29;
-	case 'i':	goto yy30;
-	case 'n':	goto yy28;
-	default:	goto yy4;
+	case 'I':	goto yy33;
+	case 'N':	goto yy31;
+	case 'i':	goto yy32;
+	case 'n':	goto yy30;
+	default:	goto yy3;
 	}
-yy20:	yych = *++YYCURSOR;
-	if(yych <= '\000')	goto yy26;
-	goto yy4;
-yy21:	yyaccept = 0;
+yy21:	yych = *++YYCURSOR;
+	if(yych <= '\000')	goto yy28;
+	goto yy3;
+yy22:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case '<':	goto yy23;
-	default:	goto yy4;
+	case '<':	goto yy24;
+	default:	goto yy3;
 	}
-yy22:	yych = *++YYCURSOR;
-	goto yy4;
 yy23:	yych = *++YYCURSOR;
-	if(yych >= '\001')	goto yy2;
+	goto yy3;
 yy24:	yych = *++YYCURSOR;
-yy25:
-#line 114
-	{   return "merge"; }
+	if(yych <= '\000')	goto yy26;
+yy25:	YYCURSOR = YYMARKER;
+	switch(yyaccept){
+	case 0:	goto yy3;
+	}
 yy26:	yych = *++YYCURSOR;
 yy27:
+#line 114
+	{   return "merge"; }
+yy28:	yych = *++YYCURSOR;
+yy29:
 #line 112
 	{   return "default"; }
-yy28:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'a':	goto yy43;
-	default:	goto yy2;
-	}
-yy29:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'A':	goto yy38;
-	case 'a':	goto yy39;
-	default:	goto yy2;
-	}
 yy30:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'n':	goto yy37;
-	default:	goto yy2;
+	case 'a':	goto yy45;
+	default:	goto yy25;
 	}
 yy31:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'N':	goto yy32;
-	case 'n':	goto yy33;
-	default:	goto yy2;
+	case 'A':	goto yy40;
+	case 'a':	goto yy41;
+	default:	goto yy25;
 	}
 yy32:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'F':	goto yy34;
-	default:	goto yy2;
+	case 'n':	goto yy39;
+	default:	goto yy25;
 	}
 yy33:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'f':	goto yy34;
-	default:	goto yy2;
+	case 'N':	goto yy34;
+	case 'n':	goto yy35;
+	default:	goto yy25;
 	}
 yy34:	yych = *++YYCURSOR;
-	if(yych >= '\001')	goto yy2;
-yy35:	yych = *++YYCURSOR;
-yy36:
-#line 98
-	{   return "float#inf"; }
-yy37:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'f':	goto yy34;
-	default:	goto yy2;
+	case 'F':	goto yy36;
+	default:	goto yy25;
 	}
-yy38:	yych = *++YYCURSOR;
+yy35:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'N':	goto yy40;
-	default:	goto yy2;
+	case 'f':	goto yy36;
+	default:	goto yy25;
 	}
+yy36:	yych = *++YYCURSOR;
+	if(yych >= '\001')	goto yy25;
+yy37:	yych = *++YYCURSOR;
+yy38:
+#line 98
+	{   return "float#inf"; }
 yy39:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'N':	goto yy40;
-	default:	goto yy2;
+	case 'f':	goto yy36;
+	default:	goto yy25;
 	}
 yy40:	yych = *++YYCURSOR;
-	if(yych >= '\001')	goto yy2;
+	switch(yych){
+	case 'N':	goto yy42;
+	default:	goto yy25;
+	}
 yy41:	yych = *++YYCURSOR;
-yy42:
+	switch(yych){
+	case 'N':	goto yy42;
+	default:	goto yy25;
+	}
+yy42:	yych = *++YYCURSOR;
+	if(yych >= '\001')	goto yy25;
+yy43:	yych = *++YYCURSOR;
+yy44:
 #line 102
 	{   return "float#nan"; }
-yy43:	yych = *++YYCURSOR;
+yy45:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'n':	goto yy40;
-	default:	goto yy2;
+	case 'n':	goto yy42;
+	default:	goto yy25;
 	}
-yy44:	yych = *++YYCURSOR;
+yy46:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -340,14 +344,14 @@ yy44:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy63;
-	default:	goto yy46;
+	case '9':	goto yy65;
+	default:	goto yy48;
 	}
-yy45:	++YYCURSOR;
+yy47:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy46:	switch(yych){
-	case '\000':	goto yy49;
+yy48:	switch(yych){
+	case '\000':	goto yy51;
 	case ',':	case '0':
 	case '1':
 	case '2':
@@ -357,17 +361,17 @@ yy46:	switch(yych){
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy45;
-	case '.':	goto yy47;
-	default:	goto yy2;
+	case '9':	goto yy47;
+	case '.':	goto yy49;
+	default:	goto yy25;
 	}
-yy47:	++YYCURSOR;
+yy49:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy48:	switch(yych){
-	case '\000':	goto yy53;
-	case ',':	goto yy51;
-	case '.':	goto yy55;
+yy50:	switch(yych){
+	case '\000':	goto yy55;
+	case ',':	goto yy53;
+	case '.':	goto yy57;
 	case '0':
 	case '1':
 	case '2':
@@ -377,19 +381,19 @@ yy48:	switch(yych){
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy47;
-	case 'E':	case 'e':	goto yy57;
-	default:	goto yy2;
+	case '9':	goto yy49;
+	case 'E':	case 'e':	goto yy59;
+	default:	goto yy25;
 	}
-yy49:	yych = *++YYCURSOR;
-yy50:
+yy51:	yych = *++YYCURSOR;
+yy52:
 #line 92
 	{   return "int"; }
-yy51:	++YYCURSOR;
+yy53:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy52:	switch(yych){
-	case '\000':	goto yy53;
+yy54:	switch(yych){
+	case '\000':	goto yy55;
 	case ',':	case '0':
 	case '1':
 	case '2':
@@ -399,17 +403,17 @@ yy52:	switch(yych){
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy51;
-	default:	goto yy2;
+	case '9':	goto yy53;
+	default:	goto yy25;
 	}
-yy53:	yych = *++YYCURSOR;
-yy54:
+yy55:	yych = *++YYCURSOR;
+yy56:
 #line 94
 	{   return "float#fix"; }
-yy55:	++YYCURSOR;
+yy57:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy56:	switch(yych){
+yy58:	switch(yych){
 	case '.':	case '0':
 	case '1':
 	case '2':
@@ -419,23 +423,23 @@ yy56:	switch(yych){
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy55;
-	case 'E':	case 'e':	goto yy57;
-	default:	goto yy2;
+	case '9':	goto yy57;
+	case 'E':	case 'e':	goto yy59;
+	default:	goto yy25;
 	}
-yy57:	yych = *++YYCURSOR;
+yy59:	yych = *++YYCURSOR;
 	switch(yych){
-	case '+':	case '-':	goto yy58;
-	default:	goto yy2;
+	case '+':	case '-':	goto yy60;
+	default:	goto yy25;
 	}
-yy58:	yych = *++YYCURSOR;
-	if(yych <= '\000')	goto yy2;
-	goto yy60;
-yy59:	++YYCURSOR;
+yy60:	yych = *++YYCURSOR;
+	if(yych <= '\000')	goto yy25;
+	goto yy62;
+yy61:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy60:	switch(yych){
-	case '\000':	goto yy61;
+yy62:	switch(yych){
+	case '\000':	goto yy63;
 	case '0':
 	case '1':
 	case '2':
@@ -445,14 +449,14 @@ yy60:	switch(yych){
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy59;
-	default:	goto yy2;
+	case '9':	goto yy61;
+	default:	goto yy25;
 	}
-yy61:	yych = *++YYCURSOR;
-yy62:
+yy63:	yych = *++YYCURSOR;
+yy64:
 #line 96
 	{   return "float#exp"; }
-yy63:	yych = *++YYCURSOR;
+yy65:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -463,15 +467,15 @@ yy63:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy64;
-	default:	goto yy46;
+	case '9':	goto yy66;
+	default:	goto yy48;
 	}
-yy64:	yych = *++YYCURSOR;
+yy66:	yych = *++YYCURSOR;
 	switch(yych){
-	case '-':	goto yy65;
-	default:	goto yy46;
+	case '-':	goto yy67;
+	default:	goto yy48;
 	}
-yy65:	yych = *++YYCURSOR;
+yy67:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -482,10 +486,10 @@ yy65:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy66;
-	default:	goto yy2;
+	case '9':	goto yy68;
+	default:	goto yy25;
 	}
-yy66:	yych = *++YYCURSOR;
+yy68:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -496,15 +500,15 @@ yy66:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy67;
-	default:	goto yy2;
+	case '9':	goto yy69;
+	default:	goto yy25;
 	}
-yy67:	yych = *++YYCURSOR;
+yy69:	yych = *++YYCURSOR;
 	switch(yych){
-	case '-':	goto yy68;
-	default:	goto yy2;
+	case '-':	goto yy70;
+	default:	goto yy25;
 	}
-yy68:	yych = *++YYCURSOR;
+yy70:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -515,10 +519,10 @@ yy68:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy69;
-	default:	goto yy2;
+	case '9':	goto yy71;
+	default:	goto yy25;
 	}
-yy69:	yych = *++YYCURSOR;
+yy71:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -529,12 +533,12 @@ yy69:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy70;
-	default:	goto yy2;
+	case '9':	goto yy72;
+	default:	goto yy25;
 	}
-yy70:	yych = *++YYCURSOR;
+yy72:	yych = *++YYCURSOR;
 	switch(yych){
-	case '\000':	goto yy71;
+	case '\000':	goto yy73;
 	case '0':
 	case '1':
 	case '2':
@@ -544,16 +548,16 @@ yy70:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy2;
-	case 'T':	goto yy73;
-	case 't':	goto yy74;
-	default:	goto yy76;
+	case '9':	goto yy25;
+	case 'T':	goto yy75;
+	case 't':	goto yy76;
+	default:	goto yy78;
 	}
-yy71:	yych = *++YYCURSOR;
-yy72:
+yy73:	yych = *++YYCURSOR;
+yy74:
 #line 104
 	{   return "timestamp#ymd"; }
-yy73:	yych = *++YYCURSOR;
+yy75:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -564,10 +568,10 @@ yy73:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy115;
-	default:	goto yy2;
+	case '9':	goto yy117;
+	default:	goto yy25;
 	}
-yy74:	yych = *++YYCURSOR;
+yy76:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -578,14 +582,14 @@ yy74:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy97;
-	default:	goto yy2;
+	case '9':	goto yy99;
+	default:	goto yy25;
 	}
-yy75:	++YYCURSOR;
+yy77:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy76:	switch(yych){
-	case '\t':	case ' ':	goto yy75;
+yy78:	switch(yych){
+	case '\t':	case ' ':	goto yy77;
 	case '0':
 	case '1':
 	case '2':
@@ -595,10 +599,10 @@ yy76:	switch(yych){
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy77;
-	default:	goto yy2;
+	case '9':	goto yy79;
+	default:	goto yy25;
 	}
-yy77:	yych = *++YYCURSOR;
+yy79:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -609,15 +613,15 @@ yy77:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy78;
-	default:	goto yy2;
+	case '9':	goto yy80;
+	default:	goto yy25;
 	}
-yy78:	yych = *++YYCURSOR;
+yy80:	yych = *++YYCURSOR;
 	switch(yych){
-	case ':':	goto yy79;
-	default:	goto yy2;
+	case ':':	goto yy81;
+	default:	goto yy25;
 	}
-yy79:	yych = *++YYCURSOR;
+yy81:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -628,10 +632,10 @@ yy79:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy80;
-	default:	goto yy2;
+	case '9':	goto yy82;
+	default:	goto yy25;
 	}
-yy80:	yych = *++YYCURSOR;
+yy82:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -642,15 +646,15 @@ yy80:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy81;
-	default:	goto yy2;
+	case '9':	goto yy83;
+	default:	goto yy25;
 	}
-yy81:	yych = *++YYCURSOR;
+yy83:	yych = *++YYCURSOR;
 	switch(yych){
-	case ':':	goto yy82;
-	default:	goto yy2;
+	case ':':	goto yy84;
+	default:	goto yy25;
 	}
-yy82:	yych = *++YYCURSOR;
+yy84:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -661,10 +665,10 @@ yy82:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy83;
-	default:	goto yy2;
+	case '9':	goto yy85;
+	default:	goto yy25;
 	}
-yy83:	yych = *++YYCURSOR;
+yy85:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -675,20 +679,20 @@ yy83:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy84;
-	default:	goto yy2;
+	case '9':	goto yy86;
+	default:	goto yy25;
 	}
-yy84:	yych = *++YYCURSOR;
+yy86:	yych = *++YYCURSOR;
 	switch(yych){
-	case '\t':	case ' ':	goto yy87;
-	case '.':	goto yy85;
-	default:	goto yy2;
+	case '\t':	case ' ':	goto yy89;
+	case '.':	goto yy87;
+	default:	goto yy25;
 	}
-yy85:	++YYCURSOR;
+yy87:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy86:	switch(yych){
-	case '\t':	case ' ':	goto yy87;
+yy88:	switch(yych){
+	case '\t':	case ' ':	goto yy89;
 	case '0':
 	case '1':
 	case '2':
@@ -698,22 +702,22 @@ yy86:	switch(yych){
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy85;
-	default:	goto yy2;
+	case '9':	goto yy87;
+	default:	goto yy25;
 	}
-yy87:	++YYCURSOR;
+yy89:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy88:	switch(yych){
-	case '\t':	case ' ':	goto yy87;
-	case '+':	case '-':	goto yy90;
-	case 'Z':	goto yy89;
-	default:	goto yy2;
+yy90:	switch(yych){
+	case '\t':	case ' ':	goto yy89;
+	case '+':	case '-':	goto yy92;
+	case 'Z':	goto yy91;
+	default:	goto yy25;
 	}
-yy89:	yych = *++YYCURSOR;
-	if(yych <= '\000')	goto yy94;
-	goto yy2;
-yy90:	yych = *++YYCURSOR;
+yy91:	yych = *++YYCURSOR;
+	if(yych <= '\000')	goto yy96;
+	goto yy25;
+yy92:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -724,10 +728,10 @@ yy90:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy91;
-	default:	goto yy2;
+	case '9':	goto yy93;
+	default:	goto yy25;
 	}
-yy91:	yych = *++YYCURSOR;
+yy93:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -738,16 +742,16 @@ yy91:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy92;
-	default:	goto yy2;
+	case '9':	goto yy94;
+	default:	goto yy25;
 	}
-yy92:	yych = *++YYCURSOR;
+yy94:	yych = *++YYCURSOR;
 	switch(yych){
-	case '\000':	goto yy94;
-	case ':':	goto yy93;
-	default:	goto yy2;
+	case '\000':	goto yy96;
+	case ':':	goto yy95;
+	default:	goto yy25;
 	}
-yy93:	yych = *++YYCURSOR;
+yy95:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -758,14 +762,14 @@ yy93:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy96;
-	default:	goto yy2;
+	case '9':	goto yy98;
+	default:	goto yy25;
 	}
-yy94:	yych = *++YYCURSOR;
-yy95:
+yy96:	yych = *++YYCURSOR;
+yy97:
 #line 108
 	{   return "timestamp#spaced"; }
-yy96:	yych = *++YYCURSOR;
+yy98:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -776,10 +780,10 @@ yy96:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy89;
-	default:	goto yy2;
+	case '9':	goto yy91;
+	default:	goto yy25;
 	}
-yy97:	yych = *++YYCURSOR;
+yy99:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -790,15 +794,15 @@ yy97:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy98;
-	default:	goto yy2;
+	case '9':	goto yy100;
+	default:	goto yy25;
 	}
-yy98:	yych = *++YYCURSOR;
+yy100:	yych = *++YYCURSOR;
 	switch(yych){
-	case ':':	goto yy99;
-	default:	goto yy2;
+	case ':':	goto yy101;
+	default:	goto yy25;
 	}
-yy99:	yych = *++YYCURSOR;
+yy101:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -809,10 +813,10 @@ yy99:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy100;
-	default:	goto yy2;
+	case '9':	goto yy102;
+	default:	goto yy25;
 	}
-yy100:	yych = *++YYCURSOR;
+yy102:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -823,15 +827,15 @@ yy100:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy101;
-	default:	goto yy2;
+	case '9':	goto yy103;
+	default:	goto yy25;
 	}
-yy101:	yych = *++YYCURSOR;
+yy103:	yych = *++YYCURSOR;
 	switch(yych){
-	case ':':	goto yy102;
-	default:	goto yy2;
+	case ':':	goto yy104;
+	default:	goto yy25;
 	}
-yy102:	yych = *++YYCURSOR;
+yy104:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -842,10 +846,10 @@ yy102:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy103;
-	default:	goto yy2;
+	case '9':	goto yy105;
+	default:	goto yy25;
 	}
-yy103:	yych = *++YYCURSOR;
+yy105:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -856,12 +860,12 @@ yy103:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy104;
-	default:	goto yy2;
+	case '9':	goto yy106;
+	default:	goto yy25;
 	}
-yy104:	yych = *++YYCURSOR;
+yy106:	yych = *++YYCURSOR;
 	switch(yych){
-	case '.':	goto yy105;
+	case '.':	goto yy107;
 	case '0':
 	case '1':
 	case '2':
@@ -871,14 +875,14 @@ yy104:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy2;
-	default:	goto yy106;
+	case '9':	goto yy25;
+	default:	goto yy108;
 	}
-yy105:	++YYCURSOR;
+yy107:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy106:	switch(yych){
-	case '+':	case '-':	goto yy108;
+yy108:	switch(yych){
+	case '+':	case '-':	goto yy110;
 	case '0':
 	case '1':
 	case '2':
@@ -888,14 +892,14 @@ yy106:	switch(yych){
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy105;
-	case 'Z':	goto yy107;
-	default:	goto yy2;
+	case '9':	goto yy107;
+	case 'Z':	goto yy109;
+	default:	goto yy25;
 	}
-yy107:	yych = *++YYCURSOR;
-	if(yych <= '\000')	goto yy112;
-	goto yy2;
-yy108:	yych = *++YYCURSOR;
+yy109:	yych = *++YYCURSOR;
+	if(yych <= '\000')	goto yy114;
+	goto yy25;
+yy110:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -906,10 +910,10 @@ yy108:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy109;
-	default:	goto yy2;
+	case '9':	goto yy111;
+	default:	goto yy25;
 	}
-yy109:	yych = *++YYCURSOR;
+yy111:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -920,16 +924,16 @@ yy109:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy110;
-	default:	goto yy2;
+	case '9':	goto yy112;
+	default:	goto yy25;
 	}
-yy110:	yych = *++YYCURSOR;
+yy112:	yych = *++YYCURSOR;
 	switch(yych){
-	case '\000':	goto yy112;
-	case ':':	goto yy111;
-	default:	goto yy2;
+	case '\000':	goto yy114;
+	case ':':	goto yy113;
+	default:	goto yy25;
 	}
-yy111:	yych = *++YYCURSOR;
+yy113:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -940,14 +944,14 @@ yy111:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy114;
-	default:	goto yy2;
+	case '9':	goto yy116;
+	default:	goto yy25;
 	}
-yy112:	yych = *++YYCURSOR;
-yy113:
+yy114:	yych = *++YYCURSOR;
+yy115:
 #line 106
 	{   return "timestamp#iso8601"; }
-yy114:	yych = *++YYCURSOR;
+yy116:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -958,10 +962,10 @@ yy114:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy107;
-	default:	goto yy2;
+	case '9':	goto yy109;
+	default:	goto yy25;
 	}
-yy115:	yych = *++YYCURSOR;
+yy117:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -972,15 +976,15 @@ yy115:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy116;
-	default:	goto yy2;
+	case '9':	goto yy118;
+	default:	goto yy25;
 	}
-yy116:	yych = *++YYCURSOR;
+yy118:	yych = *++YYCURSOR;
 	switch(yych){
-	case ':':	goto yy117;
-	default:	goto yy2;
+	case ':':	goto yy119;
+	default:	goto yy25;
 	}
-yy117:	yych = *++YYCURSOR;
+yy119:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -991,10 +995,10 @@ yy117:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy118;
-	default:	goto yy2;
+	case '9':	goto yy120;
+	default:	goto yy25;
 	}
-yy118:	yych = *++YYCURSOR;
+yy120:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -1005,15 +1009,15 @@ yy118:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy119;
-	default:	goto yy2;
+	case '9':	goto yy121;
+	default:	goto yy25;
 	}
-yy119:	yych = *++YYCURSOR;
+yy121:	yych = *++YYCURSOR;
 	switch(yych){
-	case ':':	goto yy120;
-	default:	goto yy2;
+	case ':':	goto yy122;
+	default:	goto yy25;
 	}
-yy120:	yych = *++YYCURSOR;
+yy122:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -1024,10 +1028,10 @@ yy120:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy121;
-	default:	goto yy2;
+	case '9':	goto yy123;
+	default:	goto yy25;
 	}
-yy121:	yych = *++YYCURSOR;
+yy123:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -1038,12 +1042,12 @@ yy121:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy122;
-	default:	goto yy2;
+	case '9':	goto yy124;
+	default:	goto yy25;
 	}
-yy122:	yych = *++YYCURSOR;
+yy124:	yych = *++YYCURSOR;
 	switch(yych){
-	case '.':	goto yy123;
+	case '.':	goto yy125;
 	case '0':
 	case '1':
 	case '2':
@@ -1053,16 +1057,16 @@ yy122:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy2;
-	case 'Z':	goto yy125;
-	default:	goto yy124;
+	case '9':	goto yy25;
+	case 'Z':	goto yy127;
+	default:	goto yy126;
 	}
-yy123:	++YYCURSOR;
+yy125:	++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
 	yych = *YYCURSOR;
-yy124:	switch(yych){
-	case '+':	case '-':	goto yy108;
-	case '0':	goto yy123;
+yy126:	switch(yych){
+	case '+':	case '-':	goto yy110;
+	case '0':	goto yy125;
 	case '1':
 	case '2':
 	case '3':
@@ -1071,20 +1075,20 @@ yy124:	switch(yych){
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy127;
-	case 'Z':	goto yy107;
-	default:	goto yy2;
+	case '9':	goto yy129;
+	case 'Z':	goto yy109;
+	default:	goto yy25;
 	}
-yy125:	yych = *++YYCURSOR;
-	if(yych >= '\001')	goto yy2;
-yy126:	yych = *++YYCURSOR;
-	goto yy113;
-yy127:	++YYCURSOR;
+yy127:	yych = *++YYCURSOR;
+	if(yych >= '\001')	goto yy25;
+yy128:	yych = *++YYCURSOR;
+	goto yy115;
+yy129:	++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
 	yych = *YYCURSOR;
-yy128:	switch(yych){
-	case '+':	case '-':	goto yy108;
-	case '0':	goto yy123;
+yy130:	switch(yych){
+	case '+':	case '-':	goto yy110;
+	case '0':	goto yy125;
 	case '1':
 	case '2':
 	case '3':
@@ -1093,11 +1097,11 @@ yy128:	switch(yych){
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy127;
-	case 'Z':	goto yy125;
-	default:	goto yy2;
+	case '9':	goto yy129;
+	case 'Z':	goto yy127;
+	default:	goto yy25;
 	}
-yy129:	yych = *++YYCURSOR;
+yy131:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -1106,12 +1110,12 @@ yy129:	yych = *++YYCURSOR;
 	case '4':
 	case '5':
 	case '6':
-	case '7':	goto yy144;
+	case '7':	goto yy146;
 	case '8':
-	case '9':	goto yy142;
-	default:	goto yy132;
+	case '9':	goto yy144;
+	default:	goto yy134;
 	}
-yy130:	yych = *++YYCURSOR;
+yy132:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -1122,14 +1126,14 @@ yy130:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy142;
-	default:	goto yy141;
+	case '9':	goto yy144;
+	default:	goto yy143;
 	}
-yy131:	++YYCURSOR;
+yy133:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy132:	switch(yych){
-	case '\000':	goto yy138;
+yy134:	switch(yych){
+	case '\000':	goto yy140;
 	case ',':	case '0':
 	case '1':
 	case '2':
@@ -1137,20 +1141,20 @@ yy132:	switch(yych){
 	case '4':
 	case '5':
 	case '6':
-	case '7':	goto yy131;
-	case '.':	goto yy47;
+	case '7':	goto yy133;
+	case '.':	goto yy49;
 	case '8':
-	case '9':	goto yy140;
-	default:	goto yy2;
+	case '9':	goto yy142;
+	default:	goto yy25;
 	}
-yy133:	yych = *++YYCURSOR;
-	if(yych <= '\000')	goto yy2;
-	goto yy135;
-yy134:	++YYCURSOR;
+yy135:	yych = *++YYCURSOR;
+	if(yych <= '\000')	goto yy25;
+	goto yy137;
+yy136:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy135:	switch(yych){
-	case '\000':	goto yy136;
+yy137:	switch(yych){
+	case '\000':	goto yy138;
 	case ',':	case '0':
 	case '1':
 	case '2':
@@ -1170,21 +1174,21 @@ yy135:	switch(yych){
 	case 'c':
 	case 'd':
 	case 'e':
-	case 'f':	goto yy134;
-	default:	goto yy2;
+	case 'f':	goto yy136;
+	default:	goto yy25;
 	}
-yy136:	yych = *++YYCURSOR;
-yy137:
-#line 88
-	{   return "int#hex"; }
 yy138:	yych = *++YYCURSOR;
 yy139:
+#line 88
+	{   return "int#hex"; }
+yy140:	yych = *++YYCURSOR;
+yy141:
 #line 90
 	{   return "int#oct"; }
-yy140:	++YYCURSOR;
+yy142:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy141:	switch(yych){
+yy143:	switch(yych){
 	case ',':	case '0':
 	case '1':
 	case '2':
@@ -1194,11 +1198,11 @@ yy141:	switch(yych){
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy140;
-	case '.':	goto yy47;
-	default:	goto yy2;
+	case '9':	goto yy142;
+	case '.':	goto yy49;
+	default:	goto yy25;
 	}
-yy142:	yych = *++YYCURSOR;
+yy144:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -1209,15 +1213,15 @@ yy142:	yych = *++YYCURSOR;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy143;
-	default:	goto yy141;
+	case '9':	goto yy145;
+	default:	goto yy143;
 	}
-yy143:	yych = *++YYCURSOR;
+yy145:	yych = *++YYCURSOR;
 	switch(yych){
-	case '-':	goto yy65;
-	default:	goto yy141;
+	case '-':	goto yy67;
+	default:	goto yy143;
 	}
-yy144:	yych = *++YYCURSOR;
+yy146:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -1226,218 +1230,215 @@ yy144:	yych = *++YYCURSOR;
 	case '4':
 	case '5':
 	case '6':
-	case '7':	goto yy145;
+	case '7':	goto yy147;
 	case '8':
-	case '9':	goto yy143;
-	default:	goto yy132;
-	}
-yy145:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy65;
-	default:	goto yy132;
-	}
-yy146:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'I':	goto yy149;
-	case 'i':	goto yy148;
-	default:	goto yy2;
+	case '9':	goto yy145;
+	default:	goto yy134;
 	}
 yy147:	yych = *++YYCURSOR;
 	switch(yych){
-	case '\000':	goto yy49;
-	case 'x':	goto yy133;
-	default:	goto yy132;
+	case '-':	goto yy67;
+	default:	goto yy134;
 	}
 yy148:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'n':	goto yy155;
-	default:	goto yy2;
+	case 'I':	goto yy151;
+	case 'i':	goto yy150;
+	default:	goto yy25;
 	}
 yy149:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'N':	goto yy150;
-	case 'n':	goto yy151;
-	default:	goto yy2;
+	case '\000':	goto yy51;
+	case 'x':	goto yy135;
+	default:	goto yy134;
 	}
 yy150:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'F':	goto yy152;
-	default:	goto yy2;
+	case 'n':	goto yy157;
+	default:	goto yy25;
 	}
 yy151:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'f':	goto yy152;
-	default:	goto yy2;
+	case 'N':	goto yy152;
+	case 'n':	goto yy153;
+	default:	goto yy25;
 	}
 yy152:	yych = *++YYCURSOR;
-	if(yych >= '\001')	goto yy2;
-yy153:	yych = *++YYCURSOR;
-yy154:
-#line 100
-	{   return "float#neginf"; }
-yy155:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'f':	goto yy152;
-	default:	goto yy2;
+	case 'F':	goto yy154;
+	default:	goto yy25;
 	}
-yy156:	yych = *++YYCURSOR;
+yy153:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'I':	goto yy31;
-	case 'i':	goto yy30;
-	default:	goto yy2;
+	case 'f':	goto yy154;
+	default:	goto yy25;
 	}
+yy154:	yych = *++YYCURSOR;
+	if(yych >= '\001')	goto yy25;
+yy155:	yych = *++YYCURSOR;
+yy156:
+#line 100
+	{   return "float#neginf"; }
 yy157:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'L':	goto yy164;
-	default:	goto yy2;
+	case 'f':	goto yy154;
+	default:	goto yy25;
 	}
 yy158:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'l':	goto yy159;
-	default:	goto yy2;
+	case 'I':	goto yy33;
+	case 'i':	goto yy32;
+	default:	goto yy25;
 	}
 yy159:	yych = *++YYCURSOR;
 	switch(yych){
-	case 's':	goto yy160;
-	default:	goto yy2;
+	case 'L':	goto yy166;
+	default:	goto yy25;
 	}
 yy160:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'e':	goto yy161;
-	default:	goto yy2;
+	case 'l':	goto yy161;
+	default:	goto yy25;
 	}
 yy161:	yych = *++YYCURSOR;
-	if(yych >= '\001')	goto yy2;
-yy162:	yych = *++YYCURSOR;
-yy163:
-#line 86
-	{   return "bool#no"; }
-yy164:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'S':	goto yy165;
-	default:	goto yy2;
+	case 's':	goto yy162;
+	default:	goto yy25;
 	}
-yy165:	yych = *++YYCURSOR;
+yy162:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'E':	goto yy161;
-	default:	goto yy2;
+	case 'e':	goto yy163;
+	default:	goto yy25;
 	}
+yy163:	yych = *++YYCURSOR;
+	if(yych >= '\001')	goto yy25;
+yy164:	yych = *++YYCURSOR;
+yy165:
+#line 86
+	{   return "bool#no"; }
 yy166:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'l':	goto yy167;
-	default:	goto yy2;
+	case 'S':	goto yy167;
+	default:	goto yy25;
 	}
 yy167:	yych = *++YYCURSOR;
 	switch(yych){
-	case 's':	goto yy168;
-	default:	goto yy2;
+	case 'E':	goto yy163;
+	default:	goto yy25;
 	}
 yy168:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'e':	goto yy161;
-	default:	goto yy2;
+	case 'l':	goto yy169;
+	default:	goto yy25;
 	}
 yy169:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'F':	goto yy161;
-	default:	goto yy2;
+	case 's':	goto yy170;
+	default:	goto yy25;
 	}
 yy170:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'f':	goto yy161;
-	default:	goto yy2;
+	case 'e':	goto yy163;
+	default:	goto yy25;
 	}
 yy171:	yych = *++YYCURSOR;
-	if(yych >= '\001')	goto yy2;
-yy172:	yych = *++YYCURSOR;
-yy173:
-#line 84
-	{   return "bool#yes"; }
-yy174:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'f':	goto yy161;
-	default:	goto yy2;
+	case 'F':	goto yy163;
+	default:	goto yy25;
 	}
-yy175:	yych = *++YYCURSOR;
+yy172:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'S':	goto yy171;
-	default:	goto yy2;
+	case 'f':	goto yy163;
+	default:	goto yy25;
 	}
+yy173:	yych = *++YYCURSOR;
+	if(yych >= '\001')	goto yy25;
+yy174:	yych = *++YYCURSOR;
+yy175:
+#line 84
+	{   return "bool#yes"; }
 yy176:	yych = *++YYCURSOR;
 	switch(yych){
-	case 's':	goto yy171;
-	default:	goto yy2;
+	case 'f':	goto yy163;
+	default:	goto yy25;
 	}
 yy177:	yych = *++YYCURSOR;
 	switch(yych){
-	case 's':	goto yy171;
-	default:	goto yy2;
+	case 'S':	goto yy173;
+	default:	goto yy25;
 	}
 yy178:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'U':	goto yy181;
-	default:	goto yy2;
+	case 's':	goto yy173;
+	default:	goto yy25;
 	}
 yy179:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'u':	goto yy180;
-	default:	goto yy2;
+	case 's':	goto yy173;
+	default:	goto yy25;
 	}
 yy180:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'e':	goto yy171;
-	default:	goto yy2;
+	case 'U':	goto yy183;
+	default:	goto yy25;
 	}
 yy181:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'E':	goto yy171;
-	default:	goto yy2;
+	case 'u':	goto yy182;
+	default:	goto yy25;
 	}
 yy182:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'u':	goto yy183;
-	default:	goto yy2;
+	case 'e':	goto yy173;
+	default:	goto yy25;
 	}
 yy183:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'e':	goto yy171;
-	default:	goto yy2;
+	case 'E':	goto yy173;
+	default:	goto yy25;
 	}
 yy184:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'L':	goto yy190;
-	default:	goto yy2;
+	case 'u':	goto yy185;
+	default:	goto yy25;
 	}
 yy185:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'l':	goto yy186;
-	default:	goto yy2;
+	case 'e':	goto yy173;
+	default:	goto yy25;
 	}
 yy186:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'l':	goto yy187;
-	default:	goto yy2;
+	case 'L':	goto yy190;
+	default:	goto yy25;
 	}
 yy187:	yych = *++YYCURSOR;
-	if(yych >= '\001')	goto yy2;
+	switch(yych){
+	case 'l':	goto yy188;
+	default:	goto yy25;
+	}
 yy188:	yych = *++YYCURSOR;
-yy189:
-#line 82
-	{   return "null"; }
+	switch(yych){
+	case 'l':	goto yy189;
+	default:	goto yy25;
+	}
+yy189:	yych = *++YYCURSOR;
+	if(yych <= '\000')	goto yy6;
+	goto yy25;
 yy190:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'L':	goto yy187;
-	default:	goto yy2;
+	case 'L':	goto yy189;
+	default:	goto yy25;
 	}
 yy191:	yych = *++YYCURSOR;
 	switch(yych){
 	case 'l':	goto yy192;
-	default:	goto yy2;
+	default:	goto yy25;
 	}
 yy192:	yych = *++YYCURSOR;
 	switch(yych){
-	case 'l':	goto yy187;
-	default:	goto yy2;
+	case 'l':	goto yy189;
+	default:	goto yy25;
 	}
 }
 #line 118