quickstep-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jianq...@apache.org
Subject [46/51] [abbrv] incubator-quickstep git commit: Type as first class citizen
Date Thu, 05 Oct 2017 22:03:41 GMT
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/7a048ee6/parser/preprocessed/SqlLexer_gen.cpp
----------------------------------------------------------------------
diff --git a/parser/preprocessed/SqlLexer_gen.cpp b/parser/preprocessed/SqlLexer_gen.cpp
index 05d2d3c..eef10d4 100644
--- a/parser/preprocessed/SqlLexer_gen.cpp
+++ b/parser/preprocessed/SqlLexer_gen.cpp
@@ -592,8 +592,8 @@ static void yynoreturn yy_fatal_error ( const char* msg , yyscan_t yyscanner );
 	yyg->yy_hold_char = *yy_cp; \
 	*yy_cp = '\0'; \
 	yyg->yy_c_buf_p = yy_cp;
-#define YY_NUM_RULES 168
-#define YY_END_OF_BUFFER 169
+#define YY_NUM_RULES 151
+#define YY_END_OF_BUFFER 152
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -601,74 +601,67 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static const flex_int16_t yy_accept[594] =
+static const flex_int16_t yy_accept[534] =
     {   0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  169,    2,    2,  167,  167,  166,  165,  167,
-      144,  140,  143,  140,  140,  163,  167,  133,  130,  134,
-      162,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,  141,  138,  139,    4,    5,
-        5,    3,  159,  159,  156,  160,  160,  154,  161,  161,
-      158,    1,  166,  131,  164,  163,  163,  163,    0,  137,
-      135,  132,  136,  162,  162,  162,  162,   10,  162,  162,
-      162,   23,  162,  162,  162,  162,  162,  162,  162,  162,
-
-      162,  162,  162,  142,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,  162,   59,   68,  162,  162,
-      162,  162,  162,  162,  162,  162,  162,  162,  162,   82,
-       83,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,  162,  162,  162,  114,  162,
-      162,  162,  162,  162,  162,  162,  162,  162,    4,    5,
-        3,  159,  155,  160,  153,  153,  145,  147,  148,  149,
-      150,  151,  152,  153,  161,  157,  164,  163,    0,  163,
-        6,    7,  162,    9,   11,  162,  162,   15,  162,  162,
-      162,  162,  162,  162,  162,  162,  162,  162,  162,   34,
-
-      162,  162,  162,  162,  162,  162,  162,  162,   44,  162,
-      162,  162,  162,  162,  162,   51,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,   63,  162,   70,  162,  162,
-      162,  162,  162,  162,  162,   78,  162,   81,  162,  162,
-      162,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,   99,  162,  162,  104,  105,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  145,  147,  146,  162,  162,  162,  162,
-      162,  162,  162,   20,   21,   24,  162,  162,  162,   29,
-      162,  162,  162,   32,  162,  162,  162,   38,  162,  162,
-
-       42,   43,  162,  162,  162,  162,  162,  162,  162,   53,
-       54,  162,   56,  162,   58,  162,  162,  162,  162,   67,
-       69,   71,   72,   73,  162,   75,  162,  162,   79,  162,
-      162,   86,  162,  162,  162,  162,  162,   93,  162,   95,
-      162,  162,  162,  101,  162,  162,  162,  162,  162,  162,
-      162,  162,  111,  112,  115,  162,  162,  162,  162,  162,
-      162,  162,  162,  124,  162,  162,  127,  128,  145,  146,
-        8,  162,  162,  162,  162,  162,  162,  162,   26,  162,
-      162,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,   47,   48,   49,  162,  162,   55,  162,
-
-       60,   61,  162,  162,  162,   74,  162,   77,   80,   84,
-       85,  162,  162,  162,  162,  162,   94,  162,  162,   98,
-      162,  162,  162,  162,  162,  162,  162,  110,  162,  162,
-      162,  118,  162,  162,  121,  162,  162,  125,  162,  162,
-      162,  162,   14,  162,  162,  162,  162,  162,   27,  162,
-       30,  162,  162,  162,  162,  162,   37,  162,  162,   41,
-       45,  162,  162,  162,   57,   62,  162,  162,  162,   76,
-      162,  162,  162,  162,  162,  162,   97,  162,  102,  103,
-      162,  107,  108,  162,  162,  162,  162,  119,  120,  122,
-      162,  126,  162,  162,   13,  162,  162,  162,  162,  162,
-
-      162,   22,   31,  162,   35,   36,  162,  162,   46,  162,
-       52,   64,  162,  162,  162,   89,  162,   91,  162,  162,
-      162,  162,  162,  162,  162,  162,  123,  162,  162,  162,
-      162,  162,  162,  162,  162,   33,  162,   40,  162,  162,
-       66,  162,  162,   92,  162,  162,  106,  162,  162,  162,
-      162,  162,   12,  162,  162,  162,  162,   25,  162,  162,
-       50,   65,   87,   90,  162,  162,  109,  113,  162,  117,
-      129,   16,  162,  162,  162,   28,   39,   88,   96,  162,
-      162,  162,   18,   19,  162,  116,  162,  162,  162,  100,
-      162,   17,    0
-
+        0,    0,  152,    2,    2,  150,  150,  149,  148,  150,
+      127,  123,  126,  123,  123,  146,  150,  116,  113,  117,
+      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
+      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
+      145,  145,  145,  145,  145,  124,  121,  122,    4,    5,
+        5,    3,  142,  142,  139,  143,  143,  137,  144,  144,
+      141,    1,  149,  114,  147,  146,  146,  146,    0,  120,
+      118,  115,  119,  145,  145,  145,  145,   10,  145,  145,
+      145,   21,  145,  145,  145,  145,  145,  145,  145,  145,
+
+      145,  145,  125,  145,  145,  145,  145,  145,  145,  145,
+      145,  145,  145,  145,   50,   57,  145,  145,  145,  145,
+      145,  145,  145,  145,  145,  145,   70,   71,  145,  145,
+      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
+      145,  145,  145,  145,   99,  145,  145,  145,  145,  145,
+      145,  145,  145,  145,    4,    5,    3,  142,  138,  143,
+      136,  136,  128,  130,  131,  132,  133,  134,  135,  136,
+      144,  140,  147,  146,    0,  146,    6,    7,  145,    9,
+       11,  145,  145,  145,  145,  145,  145,  145,  145,  145,
+      145,  145,   28,  145,  145,  145,  145,  145,  145,   36,
+
+      145,  145,  145,  145,  145,   42,  145,  145,  145,  145,
+      145,  145,  145,  145,  145,  145,  145,   59,  145,  145,
+      145,  145,  145,  145,   66,  145,   69,  145,  145,  145,
+      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
+       87,  145,  145,   92,   93,  145,  145,  145,  145,  145,
+      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
+      128,  130,  129,  145,  145,  145,  145,  145,  145,   18,
+       19,  145,  145,  145,   25,  145,  145,  145,  145,  145,
+       31,  145,   34,   35,  145,  145,  145,  145,  145,  145,
+       44,   45,  145,   47,  145,   49,  145,  145,  145,  145,
+
+       56,   58,   60,   61,   62,  145,  145,  145,   67,  145,
+      145,   74,  145,  145,  145,  145,  145,   81,  145,   83,
+      145,  145,  145,   89,  145,  145,  145,  145,  145,  145,
+      145,   98,  100,  145,  145,  145,  145,  145,  145,  145,
+      108,  145,  145,  111,  112,  128,  129,    8,  145,  145,
+      145,  145,  145,   22,  145,  145,  145,  145,  145,  145,
+      145,  145,  145,  145,  145,   39,   40,  145,  145,   46,
+      145,   51,   52,  145,  145,   63,  145,   65,   68,   72,
+       73,  145,  145,  145,  145,  145,   82,  145,  145,   86,
+      145,  145,  145,  145,  145,  145,   97,  145,  145,  103,
+
+      145,  145,  106,  145,  109,  145,  145,  145,  145,  145,
+      145,  145,   23,  145,   26,  145,  145,  145,   30,  145,
+      145,   37,  145,  145,  145,   48,   53,  145,  145,   64,
+      145,  145,  145,  145,  145,  145,   85,  145,   90,   91,
+       94,   95,  145,  145,  145,  104,  105,  107,  110,  145,
+       13,  145,  145,  145,  145,  145,   20,   27,   29,  145,
+      145,   38,  145,   43,  145,  145,  145,   77,  145,   79,
+      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
+      145,  145,  145,   33,  145,  145,   55,  145,  145,   80,
+      145,  145,  145,  145,  145,   12,  145,  145,  145,  145,
+
+      145,  145,   41,   54,   75,   78,  145,  145,   96,  145,
+      102,   14,  145,  145,  145,   24,   32,   76,   84,  145,
+      145,  145,   16,   17,  145,  101,  145,  145,  145,   88,
+      145,   15,    0
     } ;
 
 static const YY_CHAR yy_ec[256] =
@@ -715,155 +708,141 @@ static const YY_CHAR yy_meta[74] =
         8,    1,    1
     } ;
 
-static const flex_int16_t yy_base[609] =
+static const flex_int16_t yy_base[549] =
     {   0,
         0,    1,   46,    0,  119,  192,    2,    3,  129,  130,
-        6,   10,  231, 1299, 1299,    0, 1299,   13, 1299,  151,
-     1299, 1299, 1299,  152,    6,  118,  132,    4, 1299,   28,
-      118,  131,  248,  188,  197,  298,  106,  124,  112,  118,
-      129,  193,  126,  123,  237,  194,  121,  195,  240,  348,
-      238,  185,  256,    0,  182, 1299, 1299, 1299,   27,    4,
-       19,    0,    0,    0,   17,    0,    0,  412,    0,    0,
-        8,    0,   22, 1299,    0,  306,  309,  326,   18, 1299,
-     1299, 1299, 1299,    0,  197,  193,  203,  214,  224,  305,
-      247,    0,  249,  325,  359,  266,  275,  261,  298,  355,
-
-      284,  288,  300, 1299,  298,  320,  342,  323,  332,  350,
-      364,  353,  360,  362,  362,  362,  405,    0,  379,  368,
-      396,  410,  410,  406,  413,  414,  409,  419,  427,    0,
-      430,  415,  432,  421,  422,  437,  432,  437,  466,  467,
-      453,  474,  477,  475,  479,  480,  478,  471,    0,  464,
-      471,  486,  485,  481,  479,  487,  479,  497,    0,   29,
-        0,    0, 1299,    0, 1299, 1299,   22,   24, 1299, 1299,
-     1299, 1299, 1299,    0,    0, 1299,    0,  534,   26,   28,
-        0,    0,  499,    0,  504,  502,  522,  509,  531,  530,
-      518,  534,  519,  522,  517,  542,  524,  527,  542,    0,
-
-      539,  548,  546,  549,  533,  553,  540,  552,    0,  539,
-      541,  543,  548,  582,  577,  585,  579,  581,  573,  587,
-      588,  580,  594,  595,  596,  598,  588,    0,  584,  585,
-      601,  598,  601,  588,  590,    0,  599,    0,  609,  610,
-      598,  597,  617,  622,  635,  621,  640,  639,  647,  648,
-      647,  637,  642,  653,    0,  647,  656,  641,  650,  649,
-      659,  660,  655,  653,  657,  668,  659,  654,  675,  681,
-      679,  697,  688,   30,  132,    0,  690,  695,  705,  697,
-      708,  703,  702,    0,    0,  715,  706,  705,  699,    0,
-      700,  703,  717,  703,  712,  705,  707,  724,  721,  719,
-
-        0,    0,  712,  732,  731,  721,  733,  742,  754,    0,
-        0,  748,    0,  752,    0,  743,  750,  751,  765,    0,
-        0,    0,    0,    0,  751,    0,  753,  766,  756,  758,
-      759,    0,  769,  774,  775,  780,  766,    0,  780,    0,
-      769,  764,  769,    0,  786,  777,  791,  787,  793,  794,
-      801,  817,    0,  805,    0,  820,  805,  813,  808,  810,
-      824,  827,  825,    0,  829,  820,    0,  823,  153, 1299,
-        0,  833,  833,  819,  840,  826,  837,  843,    0,  833,
-      830,  844,  847,  843,  860,  872,  867,  875,  868,  869,
-      879,  866,  884,    0,    0,    0,  865,  882,    0,  883,
-
-        0,    0,  871,  887,  874,    0,  889,    0,    0,    0,
-        0,  875,  883,  895,  882,  892,    0,  898,  888,    0,
-      900,  902,  887,  901,  897,  907,  913,    0,  917,  919,
-      926,    0,  936,  937,    0,  924,  944,    0,  923,  932,
-      939,  935,    0,  928,  933,  951,  944,  934,    0,  954,
-        0,  952,  938,  946,  949,  942,    0,  959,  961,    0,
-        0,  945,  959,  959,    0,    0,  967,  984,  994,    0,
-      987,  978,  990,  975,  981,  989,    0,  992,    0,    0,
-      991,    0,    0,  997, 1006, 1007, 1005,    0,    0,    0,
-      992,    0,  997,  998,    0, 1004, 1000, 1003, 1005, 1014,
-
-     1011,    0,    0, 1016,    0,    0, 1013, 1003,    0, 1012,
-        0,    0, 1028, 1031, 1032,    0, 1039,    0, 1029, 1053,
-     1048, 1038, 1045, 1048, 1049, 1058,    0, 1044, 1058, 1052,
-     1051, 1052, 1049, 1052, 1057,    0, 1059,    0, 1067, 1055,
-        0, 1063, 1071,    0, 1074, 1067,    0, 1074, 1068, 1073,
-     1097, 1097,    0, 1104, 1107, 1102, 1110,    0, 1096, 1110,
-        0,    0, 1100,    0, 1101, 1112,    0,    0, 1110,    0,
-        0,    0, 1105, 1119, 1107,    0,    0,    0,    0, 1106,
-     1122, 1108,    0,    0, 1124,    0, 1122, 1114, 1128,    0,
-     1116,    0, 1299, 1181, 1191, 1201, 1211, 1221, 1225, 1228,
-
-     1234, 1244, 1254, 1264, 1274, 1284, 1289, 1291
+        6,   10,  231, 1182, 1182,    0, 1182,   13, 1182,  151,
+     1182, 1182, 1182,  152,    6,  118,  132,    4, 1182,   28,
+      118,  131,  248,  188,  197,  186,  106,  124,  112,  118,
+      129,  193,  126,  123,  237,  195,  121,  256,  255,  298,
+      189,  185,  236,    0,  194, 1182, 1182, 1182,   27,    4,
+       19,    0,    0,    0,   17,    0,    0,  362,    0,    0,
+        8,    0,   22, 1182,    0,  257,  306,  313,   18, 1182,
+     1182, 1182, 1182,    0,  206,  302,  208,  214,  234,  244,
+      266,    0,  284,  307,  309,  310,  315,  306,  301,  350,
+
+      311,  316, 1182,  315,  332,  352,  325,  320,  359,  355,
+      361,  359,  356,  358,  406,    0,  374,  359,  368,  382,
+      381,  375,  381,  394,  407,  416,    0,  423,  408,  424,
+      412,  413,  427,  424,  420,  434,  430,  415,  465,  441,
+      440,  443,  444,  442,    0,  429,  436,  478,  449,  463,
+      466,  478,  470,  485,    0,   29,    0,    0, 1182,    0,
+     1182, 1182,   22,   24, 1182, 1182, 1182, 1182, 1182,    0,
+        0, 1182,    0,  493,   26,   28,    0,    0,  486,    0,
+      487,  470,  471,  493,  490,  496,  479,  483,  478,  503,
+      485,  493,    0,  516,  513,  523,  510,  519,  531,    0,
+
+      519,  523,  523,  524,  532,  540,  535,  537,  529,  543,
+      543,  535,  549,  551,  552,  553,  546,    0,  541,  542,
+      558,  557,  548,  555,    0,  564,    0,  579,  583,  575,
+      574,  593,  596,  587,  581,  596,  594,  602,  603,  601,
+      591,  596,  607,    0,    0,  609,  596,  604,  604,  614,
+      609,  611,  634,  626,  619,  613,  628,  648,  646,  639,
+       30,  132,    0,  640,  645,  655,  656,  653,  652,    0,
+        0,  655,  654,  648,    0,  649,  652,  667,  652,  654,
+      671,  668,    0,    0,  659,  681,  679,  665,  676,  683,
+        0,    0,  684,    0,  690,    0,  683,  691,  692,  694,
+
+        0,    0,    0,    0,    0,  695,  696,  709,  699,  701,
+      704,    0,  714,  719,  720,  725,  709,    0,  723,    0,
+      712,  707,  712,    0,  730,  721,  734,  722,  721,  723,
+      744,    0,    0,  745,  737,  748,  744,  747,  761,  765,
+        0,  768,  759,    0,    0,  153, 1182,    0,  771,  771,
+      776,  764,  775,    0,  768,  766,  780,  781,  774,  777,
+      785,  778,  779,  776,  795,    0,    0,  777,  794,    0,
+      800,    0,    0,  788,  801,    0,  811,    0,    0,    0,
+        0,  805,  812,  824,  813,  823,    0,  828,  818,    0,
+      830,  834,  819,  822,  821,  824,    0,  824,  830,    0,
+
+      841,  842,    0,  829,    0,  827,  842,  839,  834,  840,
+      858,  856,    0,  865,    0,  869,  858,  861,    0,  879,
+      881,    0,  866,  880,  876,    0,    0,  886,  891,    0,
+      884,  876,  888,  873,  879,  886,    0,  889,    0,    0,
+        0,    0,  893,  903,  901,    0,    0,    0,    0,  892,
+        0,  899,  894,  898,  902,  907,    0,    0,    0,  908,
+      903,    0,  910,    0,  929,  924,  924,    0,  927,    0,
+      917,  941,  938,  934,  936,  945,  944,  940,  939,  940,
+      937,  944,  945,    0,  953,  942,    0,  949,  957,    0,
+      961,  954,  962,  956,  970,    0,  968,  976,  970,  985,
+
+      974,  990,    0,    0,  980,    0,  981,  993,    0,  993,
+        0,    0,  988, 1002,  990,    0,    0,    0,    0,  989,
+     1007,  993,    0,    0, 1009,    0, 1006,  998, 1012,    0,
+      999,    0, 1182, 1064, 1074, 1084, 1094, 1104, 1108, 1111,
+     1117, 1127, 1137, 1147, 1157, 1167, 1172, 1174
     } ;
 
-static const flex_int16_t yy_def[609] =
+static const flex_int16_t yy_def[549] =
     {   0,
-      594,  594,  593,    3,  595,  595,  596,  596,  597,  597,
-      598,  598,  593,  593,  593,  599,  593,  593,  593,  593,
-      593,  593,  593,  593,  593,  593,  593,  593,  593,  593,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  593,  593,  593,  593,  593,
-      593,  601,  602,  602,  593,  603,  603,  604,  605,  605,
-      593,  599,  593,  593,  606,  593,  593,  593,  593,  593,
-      593,  593,  593,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-
-      600,  600,  600,  593,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  593,  593,
-      601,  602,  593,  603,  593,  593,  593,  593,  593,  593,
-      593,  593,  593,  607,  605,  593,  606,  593,  593,  593,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  593,  593,  608,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  593,  593,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,    0,  593,  593,  593,  593,  593,  593,  593,
-
-      593,  593,  593,  593,  593,  593,  593,  593
+      534,  534,  533,    3,  535,  535,  536,  536,  537,  537,
+      538,  538,  533,  533,  533,  539,  533,  533,  533,  533,
+      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  533,  533,  533,  533,  533,
+      533,  541,  542,  542,  533,  543,  543,  544,  545,  545,
+      533,  539,  533,  533,  546,  533,  533,  533,  533,  533,
+      533,  533,  533,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+
+      540,  540,  533,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  533,  533,  541,  542,  533,  543,
+      533,  533,  533,  533,  533,  533,  533,  533,  533,  547,
+      545,  533,  546,  533,  533,  533,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      533,  533,  548,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  533,  533,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,    0,  533,  533,  533,  533,  533,  533,  533,
+      533,  533,  533,  533,  533,  533,  533,  533
     } ;
 
-static const flex_int16_t yy_nxt[1373] =
+static const flex_int16_t yy_nxt[1256] =
     {   0,
-      593,  159,   15,   15,   64,   64,  160,  160,   70,   65,
-       65,   71,   70,  176,   73,   71,   73,   76,   76,   81,
-       82,  160,  160,   73,  163,   73,  179,  179,  159,  180,
-      180,  160,  160,  274,  275,  275,  275,  180,  180,  180,
-      180,  369,  275,   83,   16,   16,   17,   18,   19,   18,
+      533,  155,   15,   15,   64,   64,  156,  156,   70,   65,
+       65,   71,   70,  172,   73,   71,   73,   76,   76,   81,
+       82,  156,  156,   73,  159,   73,  175,  175,  155,  176,
+      176,  156,  156,  261,  262,  262,  262,  176,  176,  176,
+      176,  346,  262,   83,   16,   16,   17,   18,   19,   18,
        20,   21,   22,   23,   22,   24,   25,   26,   26,   27,
        28,   29,   30,   31,   32,   33,   34,   35,   36,   37,
        38,   39,   40,   41,   42,   43,   44,   45,   46,   47,
@@ -874,151 +853,138 @@ static const flex_int16_t yy_nxt[1373] =
        49,   50,   51,   52,   53,   54,   55,   57,   58,   17,
        59,   60,   61,   17,   17,   17,   17,   17,   77,   78,
        78,   67,   67,   17,   17,   17,   65,   65,   85,   79,
-      114,  115,  117,  275,  275,   80,   86,  118,   87,  119,
-      120,  125,   89,   88,  127,  116,   90,  126,  137,   91,
-      128,   75,   17,   17,  275,  275,   74,   85,   79,  114,
-      115,  117,   92,   68,   68,   86,  118,   87,  119,  120,
-      125,   89,   88,  127,  116,   90,  126,  137,   91,  128,
+      112,  113,  115,  262,  262,   80,   86,  116,   87,  117,
+      118,  122,   89,   88,  124,  114,   90,  123,  134,   91,
+      125,   75,   17,   17,  262,  262,   74,   85,   79,  112,
+      113,  115,   92,   68,   68,   86,  116,   87,  117,  118,
+      122,   89,   88,  124,  114,   90,  123,  134,   91,  125,
        17,   17,   17,   59,   60,   61,   17,   17,   17,   17,
 
-       17,   92,  155,  158,  104,   99,   17,   17,   17,  100,
-      121,  134,  138,  101,  122,  135,  139,  181,  123,  102,
-      140,  182,  103,  184,  124,  105,  141,  106,  136,  183,
-      593,  155,  158,  185,   99,   17,   17,  107,  100,  121,
-      134,  138,  101,  122,  135,  139,  181,  123,  102,  140,
-      182,  103,  184,  124,  105,  141,  106,  136,  183,  129,
-      186,  142,  185,   17,   17,   93,  107,  130,  152,  143,
-      153,  131,   94,  154,  132,  133,  144,  145,  189,   95,
-      156,  157,   96,   97,  190,   98,  593,  196,  129,  186,
-      142,  593,  593,  197,   93,  198,  130,  152,  143,  153,
-
-      131,   94,  154,  132,  133,  144,  145,  189,   95,  156,
-      157,   96,   97,  190,   98,  108,  196,   76,   76,  205,
-      178,  178,  197,  109,  198,  206,  110,   79,  187,  111,
-       79,  207,  112,  208,  199,  113,   77,   78,   78,  200,
-      209,  188,  191,  593,  108,  593,  192,   79,  205,  593,
-      593,  212,  109,  593,  206,  110,   79,  187,  111,   79,
-      207,  112,  208,  199,  113,  146,  213,  210,  200,  209,
-      188,  191,  147,  148,  201,  192,   79,  202,  211,  149,
-      212,  214,  150,  203,  217,  151,  593,  193,  218,  194,
-      204,  195,  215,  219,  146,  213,  210,  220,  216,  222,
-
-      221,  147,  148,  201,  227,  593,  202,  211,  149,  228,
-      214,  150,  203,  217,  151,  166,  193,  218,  194,  204,
-      195,  215,  219,  167,  168,  223,  220,  216,  222,  221,
-      169,  229,  230,  227,  170,  224,  233,  231,  228,  232,
-      225,  226,  171,  234,  235,  236,  172,  237,  173,  238,
-      239,  240,  174,  241,  223,  242,  243,  246,  244,  169,
-      229,  230,  245,  170,  224,  233,  231,  247,  232,  225,
-      226,  171,  234,  235,  236,  172,  237,  173,  238,  239,
-      240,  174,  241,  248,  242,  243,  246,  244,  249,  250,
-      251,  245,  252,  253,  256,  257,  247,  258,  259,  260,
-
-      261,  262,  254,  263,  264,  266,  267,  268,  270,  271,
-      255,  265,  248,  269,  273,  272,  593,  249,  250,  251,
-      277,  252,  253,  256,  257,  278,  258,  259,  260,  261,
-      262,  254,  263,  264,  266,  267,  268,  270,  271,  255,
-      265,  279,  269,  273,  272,  178,  178,  280,  281,  277,
-      282,  284,  286,  287,  278,   79,  288,  289,  290,  291,
-      292,  293,  283,  294,  295,  296,  285,  297,  298,  299,
-      279,  300,  301,  302,  303,  304,  280,  281,  305,  282,
-      284,  286,  287,  306,   79,  288,  289,  290,  291,  292,
-      293,  283,  294,  295,  296,  285,  297,  298,  299,  307,
-
-      300,  301,  302,  303,  304,  308,  309,  305,  310,  311,
-      312,  313,  306,  314,  315,  316,  317,  318,  321,  319,
-      322,  323,  324,  325,  326,  327,  328,  329,  307,  320,
-      330,  331,  332,  333,  308,  309,  334,  310,  311,  312,
-      313,  335,  314,  315,  316,  317,  318,  321,  319,  322,
-      323,  324,  325,  326,  327,  328,  329,  338,  320,  330,
-      331,  332,  333,  339,  336,  334,  337,  340,  341,  342,
-      335,  343,  344,  346,  347,  348,  351,  349,  352,  353,
-      354,  355,  345,  356,  357,  360,  338,  350,  358,  361,
-      359,  362,  339,  336,  363,  337,  340,  341,  342,  366,
-
-      343,  344,  346,  347,  348,  351,  349,  352,  353,  354,
-      355,  364,  356,  357,  360,  365,  350,  358,  361,  359,
-      362,  367,  368,  363,  371,  372,  373,  374,  366,  375,
-      376,  377,  378,  379,  380,  381,  382,  383,  384,  385,
-      364,  386,  387,  388,  365,  389,  390,  391,  392,  393,
-      367,  368,  394,  371,  372,  373,  374,  395,  375,  376,
-      377,  378,  379,  380,  381,  382,  383,  384,  385,  396,
-      386,  387,  388,  397,  389,  390,  391,  392,  393,  398,
-      399,  394,  400,  401,  402,  403,  395,  406,  404,  407,
-      408,  409,  410,  411,  412,  413,  414,  415,  396,  405,
-
-      416,  417,  397,  418,  419,  420,  421,  422,  398,  399,
-      423,  400,  401,  402,  403,  424,  406,  404,  407,  408,
-      409,  410,  411,  412,  413,  414,  415,  425,  405,  416,
-      417,  426,  418,  419,  420,  421,  422,  427,  428,  423,
-      429,  430,  431,  432,  424,  433,  434,  435,  436,  437,
-      438,  439,  440,  441,  442,  443,  425,  444,  445,  447,
-      426,  446,  448,  449,  450,  451,  427,  428,  452,  429,
-      430,  431,  432,  453,  433,  434,  435,  436,  437,  438,
-      439,  440,  441,  442,  443,  454,  444,  445,  447,  455,
-      446,  448,  449,  450,  451,  456,  457,  452,  458,  459,
-
-      460,  461,  453,  462,  463,  464,  465,  466,  467,  468,
-      470,  471,  469,  472,  454,  473,  474,  475,  455,  476,
-      477,  478,  479,  480,  456,  457,  481,  458,  459,  460,
-      461,  482,  462,  463,  464,  465,  466,  467,  468,  470,
-      471,  469,  472,  483,  473,  474,  475,  484,  476,  477,
-      478,  479,  480,  485,  486,  481,  487,  488,  489,  490,
-      482,  491,  492,  493,  494,  495,  496,  497,  498,  499,
-      500,  501,  483,  502,  503,  504,  484,  505,  506,  507,
-      508,  509,  485,  486,  510,  487,  488,  489,  490,  511,
-      491,  492,  493,  494,  495,  496,  497,  498,  499,  500,
-
-      501,  512,  502,  503,  504,  513,  505,  506,  507,  508,
-      509,  514,  515,  510,  516,  517,  518,  519,  511,  520,
-      521,  522,  523,  524,  525,  526,  527,  528,  529,  530,
-      512,  531,  532,  533,  513,  534,  535,  536,  537,  538,
-      514,  515,  539,  516,  517,  518,  519,  540,  520,  521,
-      522,  523,  524,  525,  526,  527,  528,  529,  530,  541,
-      531,  532,  533,  542,  534,  535,  536,  537,  538,  543,
-      544,  539,  545,  546,  547,  548,  540,  549,  550,  551,
-      552,  553,  554,  555,  556,  557,  558,  559,  541,  560,
-      561,  562,  542,  563,  564,  565,  566,  567,  543,  544,
-
-      568,  545,  546,  547,  548,  569,  549,  550,  551,  552,
-      553,  554,  555,  556,  557,  558,  559,  570,  560,  561,
-      562,  571,  563,  564,  565,  566,  567,  572,  573,  568,
-      574,  575,  576,  577,  569,  578,  579,  580,  581,  582,
-      583,  584,  585,  586,  587,  588,  570,  589,  590,  591,
-      571,  592,  593,  593,  593,  593,  572,  573,  593,  574,
-      575,  576,  577,  593,  578,  579,  580,  581,  582,  583,
-      584,  585,  586,  587,  588,  593,  589,  590,  591,  593,
-      592,   14,   14,   14,   14,   14,   14,   14,   14,   14,
-       14,   62,   62,   62,   62,   62,   62,   62,   62,   62,
-
-       62,   63,   63,   63,   63,   63,   63,   63,   63,   63,
-       63,   66,   66,   66,   66,   66,   66,   66,   66,   66,
-       66,   69,   69,   69,   69,   69,   69,   69,   69,   69,
-       69,   72,   72,   84,   84,   84,  593,   84,  161,  161,
-      161,  161,  593,  161,  162,  162,  162,  593,  162,  162,
-      162,  162,  162,  162,  164,  164,  164,  593,  164,  164,
-      164,  164,  593,  164,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  175,  175,  593,  175,  175,  175,
-      175,  175,  175,  175,  177,  593,  177,  177,  177,  177,
-      177,  177,  177,  177,  276,  276,  370,  370,   13,  593,
-
-      593,  593,  593,  593,  593,  593,  593,  593,  593,  593,
-      593,  593,  593,  593,  593,  593,  593,  593,  593,  593,
-      593,  593,  593,  593,  593,  593,  593,  593,  593,  593,
-      593,  593,  593,  593,  593,  593,  593,  593,  593,  593,
-      593,  593,  593,  593,  593,  593,  593,  593,  593,  593,
-      593,  593,  593,  593,  593,  593,  593,  593,  593,  593,
-      593,  593,  593,  593,  593,  593,  593,  593,  593,  593,
-      593,  593
+       17,   92,  151,  107,  103,   99,   17,   17,   17,  100,
+      119,  108,  131,  101,  120,  154,  132,  109,  121,  148,
+      110,  149,  102,  111,  150,  104,  177,  105,  180,  133,
+      533,  151,  107,  181,   99,   17,   17,  106,  100,  119,
+      108,  131,  101,  120,  154,  132,  109,  121,  148,  110,
+      149,  102,  111,  150,  104,  177,  105,  180,  133,  126,
+      152,  153,  181,   17,   17,   93,  106,  127,   76,   76,
+      182,  128,   94,  135,  129,  130,  139,  136,   79,   95,
+      183,  137,   96,   97,  140,   98,  533,  138,  126,  152,
+      153,  141,  142,  533,   93,  533,  127,  184,  533,  182,
+
+      128,   94,  135,  129,  130,  139,  136,   79,   95,  183,
+      137,   96,   97,  140,   98,  143,  138,  174,  174,  185,
+      141,  142,  144,   77,   78,   78,  184,   79,  186,  145,
+      178,  190,  146,  191,   79,  147,  533,  187,  179,  188,
+      192,  189,  193,  533,  143,  533,  197,  198,  185,  533,
+      199,  144,  200,  203,  204,  533,   79,  186,  145,  178,
+      190,  146,  191,   79,  147,  162,  187,  179,  188,  192,
+      189,  193,  194,  163,  164,  197,  198,  201,  195,  199,
+      165,  200,  203,  204,  166,  196,  207,  205,  202,  208,
+      209,  210,  167,  206,  211,  212,  168,  533,  169,  217,
+
+      218,  194,  170,  219,  220,  223,  201,  195,  221,  165,
+      222,  224,  533,  166,  196,  207,  205,  202,  208,  209,
+      210,  167,  206,  211,  212,  168,  213,  169,  217,  218,
+      225,  170,  219,  220,  223,  226,  214,  221,  227,  222,
+      224,  215,  216,  228,  229,  230,  231,  232,  233,  235,
+      236,  237,  234,  240,  241,  213,  238,  239,  245,  225,
+      246,  247,  248,  249,  226,  214,  250,  227,  251,  254,
+      215,  216,  228,  229,  230,  231,  232,  233,  235,  236,
+      237,  234,  240,  241,  242,  238,  239,  245,  255,  246,
+      247,  248,  249,  243,  256,  250,  252,  251,  254,  257,
+
+      258,  244,  260,  253,  174,  174,  259,  264,  265,  266,
+      267,  270,  268,  242,   79,  272,  273,  255,  274,  275,
+      276,  277,  243,  256,  269,  252,  271,  278,  257,  258,
+      244,  260,  253,  279,  280,  259,  264,  265,  266,  267,
+      270,  268,  281,   79,  272,  273,  282,  274,  275,  276,
+      277,  283,  284,  269,  285,  271,  278,  286,  287,  288,
+      289,  290,  279,  280,  291,  292,  293,  294,  295,  296,
+      297,  281,  298,  299,  300,  282,  302,  303,  304,  305,
+      283,  284,  306,  285,  301,  307,  286,  287,  288,  289,
+      290,  308,  309,  291,  292,  293,  294,  295,  296,  297,
+
+      310,  298,  299,  300,  311,  302,  303,  304,  305,  312,
+      313,  306,  314,  301,  307,  315,  316,  318,  317,  319,
+      308,  309,  320,  321,  322,  323,  324,  326,  327,  310,
+      328,  330,  331,  311,  332,  333,  325,  334,  312,  313,
+      329,  314,  335,  338,  315,  316,  318,  317,  319,  339,
+      340,  320,  321,  322,  323,  324,  326,  327,  341,  328,
+      330,  331,  342,  332,  333,  336,  334,  337,  343,  329,
+      344,  335,  338,  345,  348,  349,  350,  351,  339,  340,
+      352,  353,  354,  355,  356,  357,  358,  341,  359,  360,
+      361,  342,  362,  363,  336,  364,  337,  343,  365,  344,
+
+      366,  367,  345,  348,  349,  350,  351,  368,  369,  352,
+      353,  354,  355,  356,  357,  358,  370,  359,  360,  361,
+      371,  362,  363,  372,  364,  373,  374,  365,  375,  366,
+      367,  376,  377,  378,  379,  380,  368,  369,  381,  382,
+      383,  384,  385,  386,  387,  370,  388,  389,  390,  371,
+      391,  392,  372,  393,  373,  374,  394,  375,  395,  396,
+      376,  377,  378,  379,  380,  397,  398,  381,  382,  383,
+      384,  385,  386,  387,  399,  388,  389,  390,  400,  391,
+      392,  401,  393,  402,  403,  394,  404,  395,  396,  405,
+      406,  407,  408,  409,  397,  398,  410,  412,  413,  411,
+
+      414,  415,  416,  399,  417,  418,  419,  400,  420,  421,
+      401,  422,  402,  403,  423,  404,  424,  425,  405,  406,
+      407,  408,  409,  426,  427,  410,  412,  413,  411,  414,
+      415,  416,  430,  417,  418,  419,  428,  420,  421,  429,
+      422,  431,  432,  423,  433,  424,  425,  434,  435,  436,
+      437,  438,  426,  427,  439,  440,  441,  442,  443,  444,
+      445,  430,  446,  447,  448,  428,  449,  450,  429,  451,
+      431,  432,  452,  433,  453,  454,  434,  435,  436,  437,
+      438,  455,  456,  439,  440,  441,  442,  443,  444,  445,
+      457,  446,  447,  448,  458,  449,  450,  459,  451,  460,
+
+      461,  452,  462,  453,  454,  463,  464,  465,  466,  467,
+      455,  456,  468,  469,  470,  471,  472,  473,  474,  457,
+      475,  476,  477,  458,  478,  479,  459,  480,  460,  461,
+      481,  462,  482,  483,  463,  464,  465,  466,  467,  484,
+      485,  468,  469,  470,  471,  472,  473,  474,  486,  475,
+      476,  477,  487,  478,  479,  488,  480,  489,  490,  481,
+      491,  482,  483,  492,  493,  494,  495,  496,  484,  485,
+      497,  498,  499,  500,  501,  502,  503,  486,  504,  505,
+      506,  487,  507,  508,  488,  509,  489,  490,  510,  491,
+      511,  512,  492,  493,  494,  495,  496,  513,  514,  497,
+
+      498,  499,  500,  501,  502,  503,  515,  504,  505,  506,
+      516,  507,  508,  517,  509,  518,  519,  510,  520,  511,
+      512,  521,  522,  523,  524,  525,  513,  514,  526,  527,
+      528,  529,  530,  531,  532,  515,  533,  533,  533,  516,
+      533,  533,  517,  533,  518,  519,  533,  520,  533,  533,
+      521,  522,  523,  524,  525,  533,  533,  526,  527,  528,
+      529,  530,  531,  532,   14,   14,   14,   14,   14,   14,
+       14,   14,   14,   14,   62,   62,   62,   62,   62,   62,
+       62,   62,   62,   62,   63,   63,   63,   63,   63,   63,
+       63,   63,   63,   63,   66,   66,   66,   66,   66,   66,
+
+       66,   66,   66,   66,   69,   69,   69,   69,   69,   69,
+       69,   69,   69,   69,   72,   72,   84,   84,   84,  533,
+       84,  157,  157,  157,  157,  533,  157,  158,  158,  158,
+      533,  158,  158,  158,  158,  158,  158,  160,  160,  160,
+      533,  160,  160,  160,  160,  533,  160,  161,  161,  161,
+      161,  161,  161,  161,  161,  161,  161,  171,  171,  533,
+      171,  171,  171,  171,  171,  171,  171,  173,  533,  173,
+      173,  173,  173,  173,  173,  173,  173,  263,  263,  347,
+      347,   13,  533,  533,  533,  533,  533,  533,  533,  533,
+      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
+
+      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
+      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
+      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
+      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
+      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
+      533,  533,  533,  533,  533
     } ;
 
-static const flex_int16_t yy_chk[1373] =
+static const flex_int16_t yy_chk[1256] =
     {   0,
-        0,  159,    1,    2,    7,    8,   60,   60,   11,    7,
+        0,  155,    1,    2,    7,    8,   60,   60,   11,    7,
         8,   11,   12,   71,   18,   12,   18,   25,   25,   28,
        28,   61,   61,   73,   65,   73,   79,   79,   59,   79,
-       79,  160,  160,  167,  167,  168,  168,  179,  179,  180,
-      180,  274,  274,   30,    1,    2,    3,    3,    3,    3,
+       79,  156,  156,  163,  163,  164,  164,  175,  175,  176,
+      176,  261,  261,   30,    1,    2,    3,    3,    3,    3,
         3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
         3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
         3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
@@ -1029,146 +995,133 @@ static const flex_int16_t yy_chk[1373] =
         3,    3,    3,    3,    3,    3,    3,    3,    3,    5,
         5,    5,    5,    5,    5,    5,    5,    5,   26,   26,
        26,    9,   10,    5,    5,    5,    9,   10,   31,   26,
-       37,   38,   39,  275,  275,   27,   31,   39,   31,   40,
+       37,   38,   39,  262,  262,   27,   31,   39,   31,   40,
        41,   43,   32,   31,   44,   38,   32,   43,   47,   32,
-       44,   24,    5,    5,  369,  369,   20,   31,   26,   37,
+       44,   24,    5,    5,  346,  346,   20,   31,   26,   37,
        38,   39,   32,    9,   10,   31,   39,   31,   40,   41,
        43,   32,   31,   44,   38,   32,   43,   47,   32,   44,
         5,    5,    6,    6,    6,    6,    6,    6,    6,    6,
 
-        6,   32,   52,   55,   35,   34,    6,    6,    6,   34,
-       42,   46,   48,   34,   42,   46,   48,   85,   42,   34,
-       48,   86,   34,   87,   42,   35,   48,   35,   46,   86,
-       13,   52,   55,   88,   34,    6,    6,   35,   34,   42,
-       46,   48,   34,   42,   46,   48,   85,   42,   34,   48,
-       86,   34,   87,   42,   35,   48,   35,   46,   86,   45,
-       89,   49,   88,    6,    6,   33,   35,   45,   51,   49,
-       51,   45,   33,   51,   45,   45,   49,   49,   91,   33,
-       53,   53,   33,   33,   93,   33,    0,   96,   45,   89,
-       49,    0,    0,   97,   33,   98,   45,   51,   49,   51,
-
-       45,   33,   51,   45,   45,   49,   49,   91,   33,   53,
-       53,   33,   33,   93,   33,   36,   96,   76,   76,  101,
-       77,   77,   97,   36,   98,  102,   36,   76,   90,   36,
-       77,  103,   36,  105,   99,   36,   78,   78,   78,   99,
-      106,   90,   94,    0,   36,    0,   94,   78,  101,    0,
-        0,  108,   36,    0,  102,   36,   76,   90,   36,   77,
-      103,   36,  105,   99,   36,   50,  109,  107,   99,  106,
-       90,   94,   50,   50,  100,   94,   78,  100,  107,   50,
-      108,  110,   50,  100,  112,   50,    0,   95,  113,   95,
-      100,   95,  111,  114,   50,  109,  107,  115,  111,  116,
-
-      115,   50,   50,  100,  119,    0,  100,  107,   50,  120,
-      110,   50,  100,  112,   50,   68,   95,  113,   95,  100,
-       95,  111,  114,   68,   68,  117,  115,  111,  116,  115,
-       68,  121,  122,  119,   68,  117,  124,  123,  120,  123,
-      117,  117,   68,  125,  126,  127,   68,  128,   68,  129,
-      131,  132,   68,  133,  117,  134,  135,  137,  136,   68,
-      121,  122,  136,   68,  117,  124,  123,  138,  123,  117,
-      117,   68,  125,  126,  127,   68,  128,   68,  129,  131,
-      132,   68,  133,  139,  134,  135,  137,  136,  139,  139,
-      140,  136,  141,  142,  143,  144,  138,  145,  146,  147,
-
-      148,  150,  142,  151,  152,  153,  154,  155,  156,  157,
-      142,  152,  139,  155,  158,  157,    0,  139,  139,  140,
-      183,  141,  142,  143,  144,  185,  145,  146,  147,  148,
-      150,  142,  151,  152,  153,  154,  155,  156,  157,  142,
-      152,  186,  155,  158,  157,  178,  178,  187,  188,  183,
-      189,  190,  191,  192,  185,  178,  193,  194,  195,  196,
-      197,  198,  189,  199,  201,  202,  190,  203,  204,  205,
-      186,  206,  207,  208,  210,  211,  187,  188,  212,  189,
-      190,  191,  192,  213,  178,  193,  194,  195,  196,  197,
-      198,  189,  199,  201,  202,  190,  203,  204,  205,  214,
-
-      206,  207,  208,  210,  211,  215,  216,  212,  217,  218,
-      219,  220,  213,  221,  222,  223,  224,  225,  227,  226,
-      229,  230,  231,  232,  233,  234,  235,  237,  214,  226,
-      239,  240,  241,  242,  215,  216,  243,  217,  218,  219,
-      220,  244,  221,  222,  223,  224,  225,  227,  226,  229,
-      230,  231,  232,  233,  234,  235,  237,  246,  226,  239,
-      240,  241,  242,  247,  245,  243,  245,  248,  249,  250,
-      244,  251,  252,  253,  254,  256,  258,  257,  259,  260,
-      261,  262,  252,  263,  264,  266,  246,  257,  265,  267,
-      265,  268,  247,  245,  269,  245,  248,  249,  250,  271,
-
-      251,  252,  253,  254,  256,  258,  257,  259,  260,  261,
-      262,  270,  263,  264,  266,  270,  257,  265,  267,  265,
-      268,  272,  273,  269,  277,  278,  279,  280,  271,  281,
-      282,  283,  286,  287,  288,  289,  291,  292,  293,  294,
-      270,  295,  296,  297,  270,  298,  299,  300,  303,  304,
-      272,  273,  305,  277,  278,  279,  280,  306,  281,  282,
-      283,  286,  287,  288,  289,  291,  292,  293,  294,  307,
-      295,  296,  297,  308,  298,  299,  300,  303,  304,  309,
-      312,  305,  314,  316,  317,  318,  306,  325,  319,  327,
-      328,  329,  330,  331,  333,  334,  335,  336,  307,  319,
-
-      337,  339,  308,  341,  342,  343,  345,  346,  309,  312,
-      347,  314,  316,  317,  318,  348,  325,  319,  327,  328,
-      329,  330,  331,  333,  334,  335,  336,  349,  319,  337,
-      339,  350,  341,  342,  343,  345,  346,  351,  352,  347,
-      354,  356,  357,  358,  348,  359,  360,  361,  362,  363,
-      365,  366,  368,  372,  373,  374,  349,  375,  376,  377,
-      350,  376,  378,  380,  381,  382,  351,  352,  383,  354,
-      356,  357,  358,  384,  359,  360,  361,  362,  363,  365,
-      366,  368,  372,  373,  374,  385,  375,  376,  377,  386,
-      376,  378,  380,  381,  382,  387,  388,  383,  389,  390,
-
-      391,  392,  384,  393,  397,  398,  400,  403,  404,  405,
-      407,  412,  405,  413,  385,  414,  415,  416,  386,  418,
-      419,  421,  422,  423,  387,  388,  424,  389,  390,  391,
-      392,  425,  393,  397,  398,  400,  403,  404,  405,  407,
-      412,  405,  413,  426,  414,  415,  416,  427,  418,  419,
-      421,  422,  423,  429,  430,  424,  431,  433,  434,  436,
-      425,  437,  439,  440,  441,  442,  444,  445,  446,  447,
-      448,  450,  426,  452,  453,  454,  427,  455,  456,  458,
-      459,  462,  429,  430,  463,  431,  433,  434,  436,  464,
-      437,  439,  440,  441,  442,  444,  445,  446,  447,  448,
-
-      450,  467,  452,  453,  454,  468,  455,  456,  458,  459,
-      462,  469,  471,  463,  472,  473,  474,  475,  464,  476,
-      478,  481,  484,  485,  486,  487,  491,  493,  494,  496,
-      467,  497,  498,  499,  468,  500,  501,  504,  507,  508,
-      469,  471,  510,  472,  473,  474,  475,  513,  476,  478,
-      481,  484,  485,  486,  487,  491,  493,  494,  496,  514,
-      497,  498,  499,  515,  500,  501,  504,  507,  508,  517,
-      519,  510,  520,  521,  522,  523,  513,  524,  525,  526,
-      528,  529,  530,  531,  532,  533,  534,  535,  514,  537,
-      539,  540,  515,  542,  543,  545,  546,  548,  517,  519,
-
-      549,  520,  521,  522,  523,  550,  524,  525,  526,  528,
-      529,  530,  531,  532,  533,  534,  535,  551,  537,  539,
-      540,  552,  542,  543,  545,  546,  548,  554,  555,  549,
-      556,  557,  559,  560,  550,  563,  565,  566,  569,  573,
-      574,  575,  580,  581,  582,  585,  551,  587,  588,  589,
-      552,  591,    0,    0,    0,    0,  554,  555,    0,  556,
-      557,  559,  560,    0,  563,  565,  566,  569,  573,  574,
-      575,  580,  581,  582,  585,    0,  587,  588,  589,    0,
-      591,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-
-      595,  596,  596,  596,  596,  596,  596,  596,  596,  596,
-      596,  597,  597,  597,  597,  597,  597,  597,  597,  597,
-      597,  598,  598,  598,  598,  598,  598,  598,  598,  598,
-      598,  599,  599,  600,  600,  600,    0,  600,  601,  601,
-      601,  601,    0,  601,  602,  602,  602,    0,  602,  602,
-      602,  602,  602,  602,  603,  603,  603,    0,  603,  603,
-      603,  603,    0,  603,  604,  604,  604,  604,  604,  604,
-      604,  604,  604,  604,  605,  605,    0,  605,  605,  605,
-      605,  605,  605,  605,  606,    0,  606,  606,  606,  606,
-      606,  606,  606,  606,  607,  607,  608,  608,  593,  593,
-
-      593,  593,  593,  593,  593,  593,  593,  593,  593,  593,
-      593,  593,  593,  593,  593,  593,  593,  593,  593,  593,
-      593,  593,  593,  593,  593,  593,  593,  593,  593,  593,
-      593,  593,  593,  593,  593,  593,  593,  593,  593,  593,
-      593,  593,  593,  593,  593,  593,  593,  593,  593,  593,
-      593,  593,  593,  593,  593,  593,  593,  593,  593,  593,
-      593,  593,  593,  593,  593,  593,  593,  593,  593,  593,
-      593,  593
+        6,   32,   52,   36,   35,   34,    6,    6,    6,   34,
+       42,   36,   46,   34,   42,   55,   46,   36,   42,   51,
+       36,   51,   34,   36,   51,   35,   85,   35,   87,   46,
+       13,   52,   36,   88,   34,    6,    6,   35,   34,   42,
+       36,   46,   34,   42,   55,   46,   36,   42,   51,   36,
+       51,   34,   36,   51,   35,   85,   35,   87,   46,   45,
+       53,   53,   88,    6,    6,   33,   35,   45,   76,   76,
+       89,   45,   33,   48,   45,   45,   49,   48,   76,   33,
+       90,   48,   33,   33,   49,   33,    0,   48,   45,   53,
+       53,   49,   49,    0,   33,    0,   45,   91,    0,   89,
+
+       45,   33,   48,   45,   45,   49,   48,   76,   33,   90,
+       48,   33,   33,   49,   33,   50,   48,   77,   77,   93,
+       49,   49,   50,   78,   78,   78,   91,   77,   94,   50,
+       86,   96,   50,   97,   78,   50,    0,   95,   86,   95,
+       98,   95,   99,    0,   50,    0,  101,  102,   93,    0,
+      104,   50,  105,  107,  108,    0,   77,   94,   50,   86,
+       96,   50,   97,   78,   50,   68,   95,   86,   95,   98,
+       95,   99,  100,   68,   68,  101,  102,  106,  100,  104,
+       68,  105,  107,  108,   68,  100,  110,  109,  106,  111,
+      112,  113,   68,  109,  113,  114,   68,    0,   68,  117,
+
+      118,  100,   68,  119,  120,  122,  106,  100,  121,   68,
+      121,  123,    0,   68,  100,  110,  109,  106,  111,  112,
+      113,   68,  109,  113,  114,   68,  115,   68,  117,  118,
+      124,   68,  119,  120,  122,  125,  115,  121,  126,  121,
+      123,  115,  115,  128,  129,  130,  131,  132,  133,  134,
+      135,  136,  133,  137,  138,  115,  136,  136,  140,  124,
+      141,  142,  143,  144,  125,  115,  146,  126,  147,  149,
+      115,  115,  128,  129,  130,  131,  132,  133,  134,  135,
+      136,  133,  137,  138,  139,  136,  136,  140,  150,  141,
+      142,  143,  144,  139,  151,  146,  148,  147,  149,  152,
+
+      153,  139,  154,  148,  174,  174,  153,  179,  181,  182,
+      183,  185,  184,  139,  174,  186,  187,  150,  188,  189,
+      190,  191,  139,  151,  184,  148,  185,  192,  152,  153,
+      139,  154,  148,  194,  195,  153,  179,  181,  182,  183,
+      185,  184,  196,  174,  186,  187,  197,  188,  189,  190,
+      191,  198,  199,  184,  201,  185,  192,  202,  203,  204,
+      205,  206,  194,  195,  207,  208,  209,  210,  211,  212,
+      213,  196,  214,  215,  216,  197,  217,  219,  220,  221,
+      198,  199,  222,  201,  216,  223,  202,  203,  204,  205,
+      206,  224,  226,  207,  208,  209,  210,  211,  212,  213,
+
+      228,  214,  215,  216,  229,  217,  219,  220,  221,  230,
+      231,  222,  232,  216,  223,  233,  234,  235,  234,  236,
+      224,  226,  237,  238,  239,  240,  241,  242,  243,  228,
+      246,  247,  248,  229,  249,  250,  241,  251,  230,  231,
+      246,  232,  252,  254,  233,  234,  235,  234,  236,  255,
+      256,  237,  238,  239,  240,  241,  242,  243,  257,  246,
+      247,  248,  257,  249,  250,  253,  251,  253,  258,  246,
+      259,  252,  254,  260,  264,  265,  266,  267,  255,  256,
+      268,  269,  272,  273,  274,  276,  277,  257,  278,  279,
+      280,  257,  281,  282,  253,  285,  253,  258,  286,  259,
+
+      287,  288,  260,  264,  265,  266,  267,  289,  290,  268,
+      269,  272,  273,  274,  276,  277,  293,  278,  279,  280,
+      295,  281,  282,  297,  285,  298,  299,  286,  300,  287,
+      288,  306,  307,  308,  309,  310,  289,  290,  311,  313,
+      314,  315,  316,  317,  319,  293,  321,  322,  323,  295,
+      325,  326,  297,  327,  298,  299,  328,  300,  329,  330,
+      306,  307,  308,  309,  310,  331,  334,  311,  313,  314,
+      315,  316,  317,  319,  335,  321,  322,  323,  336,  325,
+      326,  337,  327,  338,  339,  328,  340,  329,  330,  342,
+      343,  349,  350,  351,  331,  334,  352,  353,  355,  352,
+
+      356,  357,  358,  335,  359,  360,  361,  336,  362,  363,
+      337,  364,  338,  339,  365,  340,  368,  369,  342,  343,
+      349,  350,  351,  371,  374,  352,  353,  355,  352,  356,
+      357,  358,  377,  359,  360,  361,  375,  362,  363,  375,
+      364,  382,  383,  365,  384,  368,  369,  385,  386,  388,
+      389,  391,  371,  374,  392,  393,  394,  395,  396,  398,
+      399,  377,  401,  402,  404,  375,  406,  407,  375,  408,
+      382,  383,  409,  384,  410,  411,  385,  386,  388,  389,
+      391,  412,  414,  392,  393,  394,  395,  396,  398,  399,
+      416,  401,  402,  404,  417,  406,  407,  418,  408,  420,
+
+      421,  409,  423,  410,  411,  424,  425,  428,  429,  431,
+      412,  414,  432,  433,  434,  435,  436,  438,  443,  416,
+      444,  445,  450,  417,  452,  453,  418,  454,  420,  421,
+      455,  423,  456,  460,  424,  425,  428,  429,  431,  461,
+      463,  432,  433,  434,  435,  436,  438,  443,  465,  444,
+      445,  450,  466,  452,  453,  467,  454,  469,  471,  455,
+      472,  456,  460,  473,  474,  475,  476,  477,  461,  463,
+      478,  479,  480,  481,  482,  483,  485,  465,  486,  488,
+      489,  466,  491,  492,  467,  493,  469,  471,  494,  472,
+      495,  497,  473,  474,  475,  476,  477,  498,  499,  478,
+
+      479,  480,  481,  482,  483,  485,  500,  486,  488,  489,
+      501,  491,  492,  502,  493,  505,  507,  494,  508,  495,
+      497,  510,  513,  514,  515,  520,  498,  499,  521,  522,
+      525,  527,  528,  529,  531,  500,    0,    0,    0,  501,
+        0,    0,  502,    0,  505,  507,    0,  508,    0,    0,
+      510,  513,  514,  515,  520,    0,    0,  521,  522,  525,
+      527,  528,  529,  531,  534,  534,  534,  534,  534,  534,
+      534,  534,  534,  534,  535,  535,  535,  535,  535,  535,
+      535,  535,  535,  535,  536,  536,  536,  536,  536,  536,
+      536,  536,  536,  536,  537,  537,  537,  537,  537,  537,
+
+      537,  537,  537,  537,  538,  538,  538,  538,  538,  538,
+      538,  538,  538,  538,  539,  539,  540,  540,  540,    0,
+      540,  541,  541,  541,  541,    0,  541,  542,  542,  542,
+        0,  542,  542,  542,  542,  542,  542,  543,  543,  543,
+        0,  543,  543,  543,  543,    0,  543,  544,  544,  544,
+      544,  544,  544,  544,  544,  544,  544,  545,  545,    0,
+      545,  545,  545,  545,  545,  545,  545,  546,    0,  546,
+      546,  546,  546,  546,  546,  546,  546,  547,  547,  548,
+      548,  533,  533,  533,  533,  533,  533,  533,  533,  533,
+      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
+
+      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
+      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
+      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
+      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
+      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
+      533,  533,  533,  533,  533
     } ;
 
 /* Table of booleans, true if rule could match eol. */
-static const flex_int32_t yy_rule_can_match_eol[169] =
+static const flex_int32_t yy_rule_can_match_eol[152] =
     {   0,
 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -1176,9 +1129,8 @@ static const flex_int32_t yy_rule_can_match_eol[169] =
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 
-    1, 1, 0, 0, 0, 1, 0, 0, 0,     };
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+    0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0,     };
 
 /* The intent behind this definition is that it'll catch
  * any uses of REJECT which flex missed.
@@ -1273,6 +1225,7 @@ class ParseSubqueryExpression;
 class ParseSubqueryTableReference;
 class ParseTableReference;
 class ParseTableReferenceSignature;
+class ParseTypeCast;
 class ParseWindow;
 class Type;
 class UnaryOperation;
@@ -1290,14 +1243,14 @@ class UnaryOperation;
     yycolumn += yyleng;                                   \
   }
 
-#line 1293 "SqlLexer_gen.cpp"
+#line 1246 "SqlLexer_gen.cpp"
 /* FIXME(chasseur, qzeng): Add support for hexadecimal literals. */
 /**
  * These patterns are based on the SQL-2011 standard for syntax of numeric
  * literals (Part 2, Section 5.3 of the standard).
  **/
 
-#line 1300 "SqlLexer_gen.cpp"
+#line 1253 "SqlLexer_gen.cpp"
 
 #define INITIAL 0
 #define CONDITION_SQL 1
@@ -1584,10 +1537,10 @@ YY_DECL
 		}
 
 	{
-#line 133 "../SqlLexer.lpp"
+#line 134 "../SqlLexer.lpp"
 
 
-#line 1590 "SqlLexer_gen.cpp"
+#line 1543 "SqlLexer_gen.cpp"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -1614,13 +1567,13 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 594 )
+				if ( yy_current_state >= 534 )
 					yy_c = yy_meta[yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 			++yy_cp;
 			}
-		while ( yy_current_state != 593 );
+		while ( yy_current_state != 533 );
 		yy_cp = yyg->yy_last_accepting_cpos;
 		yy_current_state = yyg->yy_last_accepting_state;
 
@@ -1654,7 +1607,7 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 136 "../SqlLexer.lpp"
+#line 137 "../SqlLexer.lpp"
 {
     /* A forward slash character represents a system command. */
     BEGIN(CONDITION_COMMAND);
@@ -1666,7 +1619,7 @@ YY_RULE_SETUP
 case 2:
 /* rule 2 can match eol */
 YY_RULE_SETUP
-#line 144 "../SqlLexer.lpp"
+#line 145 "../SqlLexer.lpp"
 {
     /* This is a SQL command. Place the char back and process normally. */
     yyless(0);
@@ -1678,7 +1631,7 @@ YY_RULE_SETUP
 
 case 3:
 YY_RULE_SETUP
-#line 153 "../SqlLexer.lpp"
+#line 154 "../SqlLexer.lpp"
 {
     /* This is a command argument. */
     yylval->string_value_ = new quickstep::ParseString(
@@ -1688,7 +1641,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 160 "../SqlLexer.lpp"
+#line 161 "../SqlLexer.lpp"
 {
     /* Ignore whitespace. */
   }
@@ -1696,7 +1649,7 @@ YY_RULE_SETUP
 case 5:
 /* rule 5 can match eol */
 YY_RULE_SETUP
-#line 164 "../SqlLexer.lpp"
+#line 165 "../SqlLexer.lpp"
 {
     /* Newline reverts the lexer to the initial state. */
     yycolumn = 0;
@@ -1708,707 +1661,622 @@ YY_RULE_SETUP
 
 case 6:
 YY_RULE_SETUP
-#line 173 "../SqlLexer.lpp"
+#line 174 "../SqlLexer.lpp"
 return TOKEN_ADD;
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 174 "../SqlLexer.lpp"
+#line 175 "../SqlLexer.lpp"
 return TOKEN_ALL;
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 175 "../SqlLexer.lpp"
+#line 176 "../SqlLexer.lpp"
 return TOKEN_ALTER;
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 176 "../SqlLexer.lpp"
+#line 177 "../SqlLexer.lpp"
 return TOKEN_AND;
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 177 "../SqlLexer.lpp"
+#line 178 "../SqlLexer.lpp"
 return TOKEN_AS;
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 178 "../SqlLexer.lpp"
+#line 179 "../SqlLexer.lpp"
 return TOKEN_ASC;
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 179 "../SqlLexer.lpp"
+#line 180 "../SqlLexer.lpp"
 return TOKEN_ASC;
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 180 "../SqlLexer.lpp"
+#line 181 "../SqlLexer.lpp"
 return TOKEN_BETWEEN;
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 181 "../SqlLexer.lpp"
-return TOKEN_BIGINT;
-	YY_BREAK
-case 15:
-YY_RULE_SETUP
 #line 182 "../SqlLexer.lpp"
-return TOKEN_BIT;
-	YY_BREAK
-case 16:
-YY_RULE_SETUP
-#line 183 "../SqlLexer.lpp"
 return TOKEN_BITWEAVING;
 	YY_BREAK
-case 17:
+case 15:
 YY_RULE_SETUP
-#line 184 "../SqlLexer.lpp"
+#line 183 "../SqlLexer.lpp"
 return TOKEN_BLOCKPROPERTIES;
 	YY_BREAK
-case 18:
+case 16:
 YY_RULE_SETUP
-#line 185 "../SqlLexer.lpp"
+#line 184 "../SqlLexer.lpp"
 return TOKEN_BLOCKSAMPLE;
 	YY_BREAK
-case 19:
+case 17:
 YY_RULE_SETUP
-#line 186 "../SqlLexer.lpp"
+#line 185 "../SqlLexer.lpp"
 return TOKEN_BLOOM_FILTER;
 	YY_BREAK
-case 20:
+case 18:
 YY_RULE_SETUP
-#line 187 "../SqlLexer.lpp"
+#line 186 "../SqlLexer.lpp"
 return TOKEN_CASE;
 	YY_BREAK
-case 21:
+case 19:
 YY_RULE_SETUP
-#line 188 "../SqlLexer.lpp"
+#line 187 "../SqlLexer.lpp"
 return TOKEN_CAST;
 	YY_BREAK
-case 22:
+case 20:
 YY_RULE_SETUP
-#line 189 "../SqlLexer.lpp"
+#line 188 "../SqlLexer.lpp"
 return TOKEN_CSB_TREE;
 	YY_BREAK
-case 23:
+case 21:
 YY_RULE_SETUP
-#line 190 "../SqlLexer.lpp"
+#line 189 "../SqlLexer.lpp"
 return TOKEN_BY;
 	YY_BREAK
-case 24:
-YY_RULE_SETUP
-#line 191 "../SqlLexer.lpp"
-return TOKEN_CHARACTER;
-	YY_BREAK
-case 25:
-YY_RULE_SETUP
-#line 192 "../SqlLexer.lpp"
-return TOKEN_CHARACTER;
-	YY_BREAK
-case 26:
+case 22:
 YY_RULE_SETUP
-#line 193 "../SqlLexer.lpp"
+#line 190 "../SqlLexer.lpp"
 return TOKEN_CHECK;
 	YY_BREAK
-case 27:
+case 23:
 YY_RULE_SETUP
-#line 194 "../SqlLexer.lpp"
+#line 191 "../SqlLexer.lpp"
 return TOKEN_COLUMN;
 	YY_BREAK
-case 28:
+case 24:
 YY_RULE_SETUP
-#line 195 "../SqlLexer.lpp"
+#line 192 "../SqlLexer.lpp"
 return TOKEN_CONSTRAINT;
 	YY_BREAK
-case 29:
+case 25:
 YY_RULE_SETUP
-#line 196 "../SqlLexer.lpp"
+#line 193 "../SqlLexer.lpp"
 return TOKEN_COPY;
 	YY_BREAK
-case 30:
+case 26:
 YY_RULE_SETUP
-#line 197 "../SqlLexer.lpp"
+#line 194 "../SqlLexer.lpp"
 return TOKEN_CREATE;
 	YY_BREAK
-case 31:
+case 27:
 YY_RULE_SETUP
-#line 198 "../SqlLexer.lpp"
+#line 195 "../SqlLexer.lpp"
 return TOKEN_CURRENT;
 	YY_BREAK
-case 32:
-YY_RULE_SETUP
-#line 199 "../SqlLexer.lpp"
-return TOKEN_DATE;
-	YY_BREAK
-case 33:
-YY_RULE_SETUP
-#line 200 "../SqlLexer.lpp"
-return TOKEN_DATETIME;
-	YY_BREAK
-case 34:
+case 28:
 YY_RULE_SETUP
-#line 201 "../SqlLexer.lpp"
+#line 196 "../SqlLexer.lpp"
 return TOKEN_DAY;
 	YY_BREAK
-case 35:
-YY_RULE_SETUP
-#line 202 "../SqlLexer.lpp"
-return TOKEN_DECIMAL;
-	YY_BREAK
-case 36:
+case 29:
 YY_RULE_SETUP
-#line 203 "../SqlLexer.lpp"
+#line 197 "../SqlLexer.lpp"
 return TOKEN_DEFAULT;
 	YY_BREAK
-case 37:
+case 30:
 YY_RULE_SETUP
-#line 204 "../SqlLexer.lpp"
+#line 198 "../SqlLexer.lpp"
 return TOKEN_DELETE;
 	YY_BREAK
-case 38:
+case 31:
 YY_RULE_SETUP
-#line 205 "../SqlLexer.lpp"
+#line 199 "../SqlLexer.lpp"
 return TOKEN_DESC;
 	YY_BREAK
-case 39:
+case 32:
 YY_RULE_SETUP
-#line 206 "../SqlLexer.lpp"
+#line 200 "../SqlLexer.lpp"
 return TOKEN_DESC;
 	YY_BREAK
-case 40:
+case 33:
 YY_RULE_SETUP
-#line 207 "../SqlLexer.lpp"
+#line 201 "../SqlLexer.lpp"
 return TOKEN_DISTINCT;
 	YY_BREAK
-case 41:
-YY_RULE_SETUP
-#line 208 "../SqlLexer.lpp"
-return TOKEN_DOUBLE;
-	YY_BREAK
-case 42:
+case 34:
 YY_RULE_SETUP
-#line 209 "../SqlLexer.lpp"
+#line 202 "../SqlLexer.lpp"
 return TOKEN_DROP;
 	YY_BREAK
-case 43:
+case 35:
 YY_RULE_SETUP
-#line 210 "../SqlLexer.lpp"
+#line 203 "../SqlLexer.lpp"
 return TOKEN_ELSE;
 	YY_BREAK
-case 44:
+case 36:
 YY_RULE_SETUP
-#line 211 "../SqlLexer.lpp"
+#line 204 "../SqlLexer.lpp"
 return TOKEN_END;
 	YY_BREAK
-case 45:
+case 37:
 YY_RULE_SETUP
-#line 212 "../SqlLexer.lpp"
+#line 205 "../SqlLexer.lpp"
 return TOKEN_EXISTS;
 	YY_BREAK
-case 46:
+case 38:
 YY_RULE_SETUP
-#line 213 "../SqlLexer.lpp"
+#line 206 "../SqlLexer.lpp"
 return TOKEN_EXTRACT;
 	YY_BREAK
-case 47:
+case 39:
 YY_RULE_SETUP
-#line 214 "../SqlLexer.lpp"
+#line 207 "../SqlLexer.lpp"
 return TOKEN_FALSE;
 	YY_BREAK
-case 48:
+case 40:
 YY_RULE_SETUP
-#line 215 "../SqlLexer.lpp"
+#line 208 "../SqlLexer.lpp"
 return TOKEN_FIRST;
 	YY_BREAK
-case 49:
-YY_RULE_SETUP
-#line 216 "../SqlLexer.lpp"
-return TOKEN_FLOAT;
-	YY_BREAK
-case 50:
+case 41:
 YY_RULE_SETUP
-#line 217 "../SqlLexer.lpp"
+#line 209 "../SqlLexer.lpp"
 return TOKEN_FOLLOWING;
 	YY_BREAK
-case 51:
+case 42:
 YY_RULE_SETUP
-#line 218 "../SqlLexer.lpp"
+#line 210 "../SqlLexer.lpp"
 return TOKEN_FOR;
 	YY_BREAK
-case 52:
+case 43:
 YY_RULE_SETUP
-#line 219 "../SqlLexer.lpp"
+#line 211 "../SqlLexer.lpp"
 return TOKEN_FOREIGN;
 	YY_BREAK
-case 53:
+case 44:
 YY_RULE_SETUP
-#line 220 "../SqlLexer.lpp"
+#line 212 "../SqlLexer.lpp"
 return TOKEN_FROM;
 	YY_BREAK
-case 54:
+case 45:
 YY_RULE_SETUP
-#line 221 "../SqlLexer.lpp"
+#line 213 "../SqlLexer.lpp"
 return TOKEN_FULL;
 	YY_BREAK
-case 55:
+case 46:
 YY_RULE_SETUP
-#line 222 "../SqlLexer.lpp"
+#line 214 "../SqlLexer.lpp"
 return TOKEN_GROUP;
 	YY_BREAK
-case 56:
+case 47:
 YY_RULE_SETUP
-#line 223 "../SqlLexer.lpp"
+#line 215 "../SqlLexer.lpp"
 return TOKEN_HASH;
 	YY_BREAK
-case 57:
+case 48:
 YY_RULE_SETUP
-#line 224 "../SqlLexer.lpp"
+#line 216 "../SqlLexer.lpp"
 return TOKEN_HAVING;
 	YY_BREAK
-case 58:
+case 49:
 YY_RULE_SETUP
-#line 225 "../SqlLexer.lpp"
+#line 217 "../SqlLexer.lpp"
 return TOKEN_HOUR;
 	YY_BREAK
-case 59:
+case 50:
 YY_RULE_SETUP
-#line 226 "../SqlLexer.lpp"
+#line 218 "../SqlLexer.lpp"
 return TOKEN_IN;
 	YY_BREAK
-case 60:
+case 51:
 YY_RULE_SETUP
-#line 227 "../SqlLexer.lpp"
+#line 219 "../SqlLexer.lpp"
 return TOKEN_INDEX;
 	YY_BREAK
-case 61:
+case 52:
 YY_RULE_SETUP
-#line 228 "../SqlLexer.lpp"
+#line 220 "../SqlLexer.lpp"
 return TOKEN_INNER;
 	YY_BREAK
-case 62:
+case 53:
 YY_RULE_SETUP
-#line 229 "../SqlLexer.lpp"
+#line 221 "../SqlLexer.lpp"
 return TOKEN_INSERT;
 	YY_BREAK
-case 63:
-YY_RULE_SETUP
-#line 230 "../SqlLexer.lpp"
-return TOKEN_INTEGER;
-	YY_BREAK
-case 64:
-YY_RULE_SETUP
-#line 231 "../SqlLexer.lpp"
-return TOKEN_INTEGER;
-	YY_BREAK
-case 65:
+case 54:
 YY_RULE_SETUP
-#line 232 "../SqlLexer.lpp"
+#line 222 "../SqlLexer.lpp"
 return TOKEN_INTERSECT;
 	YY_BREAK
-case 66:
+case 55:
 YY_RULE_SETUP
-#line 233 "../SqlLexer.lpp"
+#line 223 "../SqlLexer.lpp"
 return TOKEN_INTERVAL;
 	YY_BREAK
-case 67:
+case 56:
 YY_RULE_SETUP
-#line 234 "../SqlLexer.lpp"
+#line 224 "../SqlLexer.lpp"
 return TOKEN_INTO;
 	YY_BREAK
-case 68:
+case 57:
 YY_RULE_SETUP
-#line 235 "../SqlLexer.lpp"
+#line 225 "../SqlLexer.lpp"
 return TOKEN_IS;
 	YY_BREAK
-case 69:
+case 58:
 YY_RULE_SETUP
-#line 236 "../SqlLexer.lpp"
+#line 226 "../SqlLexer.lpp"
 return TOKEN_JOIN;
 	YY_BREAK
-case 70:
+case 59:
 YY_RULE_SETUP
-#line 237 "../SqlLexer.lpp"
+#line 227 "../SqlLexer.lpp"
 return TOKEN_KEY;
 	YY_BREAK
-case 71:
+case 60:
 YY_RULE_SETUP
-#line 238 "../SqlLexer.lpp"
+#line 228 "../SqlLexer.lpp"
 return TOKEN_LAST;
 	YY_BREAK
-case 72:
+case 61:
 YY_RULE_SETUP
-#line 239 "../SqlLexer.lpp"
+#line 229 "../SqlLexer.lpp"
 return TOKEN_LEFT;
 	YY_BREAK
-case 73:
+case 62:
 YY_RULE_SETUP
-#line 240 "../SqlLexer.lpp"
+#line 230 "../SqlLexer.lpp"
 return TOKEN_LIKE;
 	YY_BREAK
-case 74:
+case 63:
 YY_RULE_SETUP
-#line 241 "../SqlLexer.lpp"
+#line 231 "../SqlLexer.lpp"
 return TOKEN_LIMIT;
 	YY_BREAK
-case 75:
-YY_RULE_SETUP
-#line 242 "../SqlLexer.lpp"
-return TOKEN_LONG;
-	YY_BREAK
-case 76:
+case 64:
 YY_RULE_SETUP
-#line 243 "../SqlLexer.lpp"
+#line 232 "../SqlLexer.lpp"
 return TOKEN_MINUTE;
 	YY_BREAK
-case 77:
+case 65:
 YY_RULE_SETUP
-#line 244 "../SqlLexer.lpp"
+#line 233 "../SqlLexer.lpp"
 return TOKEN_MONTH;
 	YY_BREAK
-case 78:
+case 66:
 YY_RULE_SETUP
-#line 245 "../SqlLexer.lpp"
+#line 234 "../SqlLexer.lpp"
 return TOKEN_NOT;
 	YY_BREAK
-case 79:
+case 67:
 YY_RULE_SETUP
-#line 246 "../SqlLexer.lpp"
+#line 235 "../SqlLexer.lpp"
 return TOKEN_NULL;
 	YY_BREAK
-case 80:
+case 68:
 YY_RULE_SETUP
-#line 247 "../SqlLexer.lpp"
+#line 236 "../SqlLexer.lpp"
 return TOKEN_NULLS;
 	YY_BREAK
-case 81:
+case 69:
 YY_RULE_SETUP
-#line 248 "../SqlLexer.lpp"
+#line 237 "../SqlLexer.lpp"
 return TOKEN_OFF;
 	YY_BREAK
-case 82:
+case 70:
 YY_RULE_SETUP
-#line 249 "../SqlLexer.lpp"
+#line 238 "../SqlLexer.lpp"
 return TOKEN_ON;
 	YY_BREAK
-case 83:
+case 71:
 YY_RULE_SETUP
-#line 250 "../SqlLexer.lpp"
+#line 239 "../SqlLexer.lpp"
 return TOKEN_OR;
 	YY_BREAK
-case 84:
+case 72:
 YY_RULE_SETUP
-#line 251 "../SqlLexer.lpp"
+#line 240 "../SqlLexer.lpp"
 return TOKEN_ORDER;
 	YY_BREAK
-case 85:
+case 73:
 YY_RULE_SETUP
-#line 252 "../SqlLexer.lpp"
+#line 241 "../SqlLexer.lpp"
 return TOKEN_OUTER;
 	YY_BREAK
-case 86:
+case 74:
 YY_RULE_SETUP
-#line 253 "../SqlLexer.lpp"
+#line 242 "../SqlLexer.lpp"
 return TOKEN_OVER;
 	YY_BREAK
-case 87:
+case 75:
 YY_RULE_SETUP
-#line 254 "../SqlLexer.lpp"
+#line 243 "../SqlLexer.lpp"
 return TOKEN_PARTITION;
 	YY_BREAK
-case 88:
+case 76:
 YY_RULE_SETUP
-#line 255 "../SqlLexer.lpp"
+#line 244 "../SqlLexer.lpp"
 return TOKEN_PARTITIONS;
 	YY_BREAK
-case 89:
+case 77:
 YY_RULE_SETUP
-#line 256 "../SqlLexer.lpp"
+#line 245 "../SqlLexer.lpp"
 return TOKEN_PERCENT;
 	YY_BREAK
-case 90:
+case 78:
 YY_RULE_SETUP
-#line 257 "../SqlLexer.lpp"
+#line 246 "../SqlLexer.lpp"
 return TOKEN_PRECEDING;
 	YY_BREAK
-case 91:
+case 79:
 YY_RULE_SETUP
-#line 258 "../SqlLexer.lpp"
+#line 247 "../SqlLexer.lpp"
 return TOKEN_PRIMARY;
 	YY_BREAK
-case 92:
+case 80:
 YY_RULE_SETUP
-#line 259 "../SqlLexer.lpp"
+#line 248 "../SqlLexer.lpp"
 return TOKEN_PRIORITY;
 	YY_BREAK
-case 93:
+case 81:
 YY_RULE_SETUP
-#line 260 "../SqlLexer.lpp"
+#line 249 "../SqlLexer.lpp"
 return TOKEN_QUIT;
 	YY_BREAK
-case 94:
+case 82:
 YY_RULE_SETUP
-#line 261 "../SqlLexer.lpp"
+#line 250 "../SqlLexer.lpp"
 return TOKEN_RANGE;
 	YY_BREAK
-case 95:
+case 83:
 YY_RULE_SETUP
-#line 262 "../SqlLexer.lpp"
+#line 251 "../SqlLexer.lpp"
 return TOKEN_REAL;
 	YY_BREAK
-case 96:
+case 84:
 YY_RULE_SETUP
-#line 263 "../SqlLexer.lpp"
+#line 252 "../SqlLexer.lpp"
 return TOKEN_REFERENCES;
 	YY_BREAK
-case 97:
+case 85:
 YY_RULE_SETUP
-#line 264 "../SqlLexer.lpp"
+#line 253 "../SqlLexer.lpp"
 return TOKEN_REGEXP;
 	YY_BREAK
-case 98:
+case 86:
 YY_RULE_SETUP
-#line 265 "../SqlLexer.lpp"
+#line 254 "../SqlLexer.lpp"
 return TOKEN_RIGHT;
 	YY_BREAK
-case 99:
+case 87:
 YY_RULE_SETUP
-#line 266 "../SqlLexer.lpp"
+#line 255 "../SqlLexer.lpp"
 return TOKEN_ROW;
 	YY_BREAK
-case 100:
+case 88:
 YY_RULE_SETUP
-#line 267 "../SqlLexer.lpp"
+#line 256 "../SqlLexer.lpp"
 return TOKEN_ROW_DELIMITER;
 	YY_BREAK
-case 101:
+case 89:
 YY_RULE_SETUP
-#line 268 "../SqlLexer.lpp"
+#line 257 "../SqlLexer.lpp"
 return TOKEN_ROWS;
 	YY_BREAK
-case 102:
+case 90:
 YY_RULE_SETUP
-#line 269 "../SqlLexer.lpp"
+#line 258 "../SqlLexer.lpp"
 return TOKEN_SECOND;
 	YY_BREAK
-case 103:
+case 91:
 YY_RULE_SETUP
-#line 270 "../SqlLexer.lpp"
+#line 259 "../SqlLexer.lpp"
 return TOKEN_SELECT;
 	YY_BREAK
-case 104:
+case 92:
 YY_RULE_SETUP
-#line 271 "../SqlLexer.lpp"
+#line 260 "../SqlLexer.lpp"
 return TOKEN_SET;
 	YY_BREAK
-case 105:
+case 93:
 YY_RULE_SETUP
-#line 272 "../SqlLexer.lpp"
+#line 261 "../SqlLexer.lpp"
 return TOKEN_SMA;
 	YY_BREAK
-case 106:
-YY_RULE_SETUP
-#line 273 "../SqlLexer.lpp"
-return TOKEN_SMALLINT;
-	YY_BREAK
-case 107:
+case 94:
 YY_RULE_SETUP
-#line 274 "../SqlLexer.lpp"
+#line 262 "../SqlLexer.lpp"
 return TOKEN_STDERR;
 	YY_BREAK
-case 108:
+case 95:
 YY_RULE_SETUP
-#line 275 "../SqlLexer.lpp"
+#line 263 "../SqlLexer.lpp"
 return TOKEN_STDOUT;
 	YY_BREAK
-case 109:
+case 96:
 YY_RULE_SETUP
-#line 276 "../SqlLexer.lpp"
+#line 264 "../SqlLexer.lpp"
 return TOKEN_SUBSTRING;
 	YY_BREAK
-case 110:
+case 97:
 YY_RULE_SETUP
-#line 277 "../SqlLexer.lpp"
+#line 265 "../SqlLexer.lpp"
 return TOKEN_TABLE;
 	YY_BREAK
-case 111:
+case 98:
 YY_RULE_SETUP
-#line 278 "../SqlLexer.lpp"
+#line 266 "../SqlLexer.lpp"
 return TOKEN_THEN;
 	YY_BREAK
-case 112:
-YY_RULE_SETUP
-#line 279 "../SqlLexer.lpp"
-return TOKEN_TIME;
-	YY_BREAK
-case 113:
-YY_RULE_SETUP
-#line 280 "../SqlLexer.lpp"
-return TOKEN_TIMESTAMP;
-	YY_BREAK
-case 114:
+case 99:
 YY_RULE_SETUP
-#line 281 "../SqlLexer.lpp"
+#line 267 "../SqlLexer.lpp"
 return TOKEN_TO;
 	YY_BREAK
-case 115:
+case 100:
 YY_RULE_SETUP
-#line 282 "../SqlLexer.lpp"
+#line 268 "../SqlLexer.lpp"
 return TOKEN_TRUE;
 	YY_BREAK
-case 116:
+case 101:
 YY_RULE_SETUP
-#line 283 "../SqlLexer.lpp"
+#line 269 "../SqlLexer.lpp"
 return TOKEN_TUPLESAMPLE;
 	YY_BREAK
-case 117:
+case 102:
 YY_RULE_SETUP
-#line 284 "../SqlLexer.lpp"
+#line 270 "../SqlLexer.lpp"
 return TOKEN_UNBOUNDED;
 	YY_BREAK
-case 118:
+case 103:
 YY_RULE_SETUP
-#line 285 "../SqlLexer.lpp"
+#line 271 "../SqlLexer.lpp"
 return TOKEN_UNION;
 	YY_BREAK
-case 119:
+case 104:
 YY_RULE_SETUP
-#line 286 "../SqlLexer.lpp"
+#line 272 "../SqlLexer.lpp"
 return TOKEN_UNIQUE;
 	YY_BREAK
-case 120:
+case 105:
 YY_RULE_SETUP
-#line 287 "../SqlLexer.lpp"
+#line 273 "../SqlLexer.lpp"
 return TOKEN_UPDATE;
 	YY_BREAK
-case 121:
+case 106:
 YY_RULE_SETUP
-#line 288 "../SqlLexer.lpp"
+#line 274 "../SqlLexer.lpp"
 return TOKEN_USING;
 	YY_BREAK
-case 122:
+case 107:
 YY_RULE_SETUP
-#line 289 "../SqlLexer.lpp"
+#line 275 "../SqlLexer.lpp"
 return TOKEN_VALUES;
 	YY_BREAK
-case 123:
-YY_RULE_SETUP
-#line 290 "../SqlLexer.lpp"
-return TOKEN_VARCHAR;
-	YY_BREAK
-case 124:
+case 108:
 YY_RULE_SETUP
-#line 291 "../SqlLexer.lpp"
+#line 276 "../SqlLexer.lpp"
 return TOKEN_WHEN;
 	YY_BREAK
-case 125:
+case 109:
 YY_RULE_SETUP
-#line 292 "../SqlLexer.lpp"
+#line 277 "../SqlLexer.lpp"
 return TOKEN_WHERE;
 	YY_BREAK
-case 126:
+case 110:
 YY_RULE_SETUP
-#line 293 "../SqlLexer.lpp"
+#line 278 "../SqlLexer.lpp"
 return TOKEN_WINDOW;
 	YY_BREAK
-case 127:
+case 111:
 YY_RULE_SETUP
-#line 294 "../SqlLexer.lpp"
+#line 279 "../SqlLexer.lpp"
 return TOKEN_WITH;
 	YY_BREAK
-case 128:
+case 112:
 YY_RULE_SETUP
-#line 295 "../SqlLexer.lpp"
+#line 280 "../SqlLexer.lpp"
 return TOKEN_YEAR;
 	YY_BREAK
-case 129:
-YY_RULE_SETUP
-#line 296 "../SqlLexer.lpp"
-return TOKEN_YEARMONTH;
-	YY_BREAK
-case 130:
+case 113:
 YY_RULE_SETUP
-#line 298 "../SqlLexer.lpp"
+#line 282 "../SqlLexer.lpp"
 return TOKEN_EQ;
 	YY_BREAK
-case 131:
+case 114:
 YY_RULE_SETUP
-#line 299 "../SqlLexer.lpp"
+#line 283 "../SqlLexer.lpp"
 return TOKEN_NEQ;
 	YY_BREAK
-case 132:
+case 115:
 YY_RULE_SETUP
-#line 300 "../SqlLexer.lpp"
+#line 284 "../SqlLexer.lpp"
 return TOKEN_NEQ;
 	YY_BREAK
-case 133:
+case 116:
 YY_RULE_SETUP
-#line 301 "../SqlLexer.lpp"
+#line 285 "../SqlLexer.lpp"
 return TOKEN_LT;
 	YY_BREAK
-case 134:
+case 117:
 YY_RULE_SETUP
-#line 302 "../SqlLexer.lpp"
+#line 286 "../SqlLexer.lpp"
 return TOKEN_GT;
 	YY_BREAK
-case 135:
+case 118:
 YY_RULE_SETUP
-#line 303 "../SqlLexer.lpp"
+#line 287 "../SqlLexer.lpp"
 return TOKEN_LEQ;
 	YY_BREAK
-case 136:
+case 119:
 YY_RULE_SETUP
-#line 304 "../SqlLexer.lpp"
+#line 288 "../SqlLexer.lpp"
 return TOKEN_GEQ;
 	YY_BREAK
-case 137:
+case 120:
 YY_RULE_SETUP
-#line 305 "../SqlLexer.lpp"
+#line 289 "../SqlLexer.lpp"
 return TOKEN_DOUBLECOLON;
 	YY_BREAK
-case 138:
+case 121:
 YY_RULE_SETUP
-#line 306 "../SqlLexer.lpp"
+#line 290 "../SqlLexer.lpp"
 return TOKEN_LBRACE;
 	YY_BREAK
-case 139:
+case 122:
 YY_RULE_SETUP
-#line 307 "../SqlLexer.lpp"
+#line 291 "../SqlLexer.lpp"
 return TOKEN_RBRACE;
 	YY_BREAK
-case 140:
+case 123:
 YY_RULE_SETUP
-#line 309 "../SqlLexer.lpp"
+#line 293 "../SqlLexer.lpp"
 return yytext[0];
 	YY_BREAK
-case 141:
+case 124:
 YY_RULE_SETUP
-#line 310 "../SqlLexer.lpp"
+#line 294 "../SqlLexer.lpp"
 return yytext[0];
 	YY_BREAK
 /**
     * Quoted strings. Prefacing a string with an 'e' or 'E' causes escape
     * sequences to be processed (as in PostgreSQL).
     **/
-case 142:
+case 125:
 YY_RULE_SETUP
-#line 316 "../SqlLexer.lpp"
+#line 300 "../SqlLexer.lpp"
 {
     yylval->string_value_ = new quickstep::ParseString(yylloc->first_line, yylloc->first_column);
     BEGIN(CONDITION_STRING_SINGLE_QUOTED_ESCAPED);
   }
 	YY_BREAK
-case 143:
+case 126:
 YY_RULE_SETUP
-#line 321 "../SqlLexer.lpp"
+#line 305 "../SqlLexer.lpp"
 {
     yylval->string_value_ = new quickstep::ParseString(yylloc->first_line, yylloc->first_column);
     BEGIN(CONDITION_STRING_SINGLE_QUOTED);
   }
 	YY_BREAK
-case 144:
+case 127:
 YY_RULE_SETUP
-#line 326 "../SqlLexer.lpp"
+#line 310 "../SqlLexer.lpp"
 {
     yylval->string_value_ = new quickstep::ParseString(yylloc->first_line, yylloc->first_column);
     BEGIN(CONDITION_STRING_DOUBLE_QUOTED);
@@ -2420,7 +2288,7 @@ YY_RULE_SETUP
 case YY_STATE_EOF(CONDITION_STRING_SINGLE_QUOTED):
 case YY_STATE_EOF(CONDITION_STRING_SINGLE_QUOTED_ESCAPED):
 case YY_STATE_EOF(CONDITION_STRING_DOUBLE_QUOTED):
-#line 335 "../SqlLexer.lpp"
+#line 319 "../SqlLexer.lpp"
 {
     delete yylval->string_value_;
     BEGIN(INITIAL);
@@ -2431,9 +2299,9 @@ case YY_STATE_EOF(CONDITION_STRING_DOUBLE_QUOTED):
 
 /* Process escape sequences. */
 
-case 145:
+case 128:
 YY_RULE_SETUP
-#line 345 "../SqlLexer.lpp"
+#line 329 "../SqlLexer.lpp"
 {
     /* Octal code */
     unsigned int code;
@@ -2447,9 +2315,9 @@ YY_RULE_SETUP
     yylval->string_value_->push_back(code);
   }
 	YY_BREAK
-case 146:
+case 129:
 YY_RULE_SETUP
-#line 357 "../SqlLexer.lpp"
+#line 341 "../SqlLexer.lpp"
 {
     /* Hexadecimal code */
     unsigned int code;
@@ -2457,9 +2325,9 @@ YY_RULE_SETUP
     yylval->string_value_->push_back(code);
   }
 	YY_BREAK
-case 147:
+case 130:
 YY_RULE_SETUP
-#line 363 "../SqlLexer.lpp"
+#line 347 "../SqlLexer.lpp"
 {
     /* A numeric escape sequence that isn't correctly specified. */
     delete yylval->string_value_;
@@ -2468,58 +2336,58 @@ YY_RULE_SETUP
     return TOKEN_LEX_ERROR;
   }
 	YY_BREAK
-case 148:
+case 131:
 YY_RULE_SETUP
-#line 370 "../SqlLexer.lpp"
+#line 354 "../SqlLexer.lpp"
 {
     /* Backspace */
     yylval->string_value_->push_back('\b');
   }
 	YY_BREAK
-case 149:
+case 132:
 YY_RULE_SETUP
-#line 374 "../SqlLexer.lpp"
+#line 358 "../SqlLexer.lpp"
 {
     /* Form-feed */
     yylval->string_value_->push_back('\f');
   }
 	YY_BREAK
-case 150:
+case 133:
 YY_RULE_SETUP
-#line 378 "../SqlLexer.lpp"
+#line 362 "../SqlLexer.lpp"
 {
     /* Newline */
     yylval->string_value_->push_back('\n');
   }
 	YY_BREAK
-case 151:
+case 134:
 YY_RULE_SETUP
-#line 382 "../SqlLexer.lpp"
+#line 366 "../SqlLexer.lpp"
 {
     /* Carriage-return */
     yylval->string_value_->push_back('\r');
   }
 	YY_BREAK
-case 152:
+case 135:
 YY_RULE_SETUP
-#line 386 "../SqlLexer.lpp"
+#line 370 "../SqlLexer.lpp"
 {
     /* Horizontal Tab */
     yylval->string_value_->push_back('\t');
   }
 	YY_BREAK
-case 153:
-/* rule 153 can match eol */
+case 136:
+/* rule 136 can match eol */
 YY_RULE_SETUP
-#line 390 "../SqlLexer.lpp"
+#line 374 "../SqlLexer.lpp"
 {
     /* Any other character (including actual newline or carriage return) */
     yylval->string_value_->push_back(yytext[1]);
   }
 	YY_BREAK
-case 154:
+case 137:
 YY_RULE_SETUP
-#line 394 "../SqlLexer.lpp"
+#line 378 "../SqlLexer.lpp"
 {
     /* This should only be encountered right before an EOF. */
     delete yylval->string_value_;
@@ -2530,17 +2398,17 @@ YY_RULE_SETUP
 	YY_BREAK
 
 
-case 155:
+case 138:
 YY_RULE_SETUP
-#line 404 "../SqlLexer.lpp"
+#line 388 "../SqlLexer.lpp"
 {
     /* Two quotes in a row become a single quote (this is specified by the SQL standard). */
     yylval->string_value_->push_back('\'');
   }
 	YY_BREAK
-case 156:
+case 139:
 YY_RULE_SETUP
-#line 408 "../SqlLexer.lpp"
+#line 392 "../SqlLexer.lpp"
 {
     /* End string */
     BEGIN(CONDITION_SQL);
@@ -2549,17 +2417,17 @@ YY_RULE_SETUP
 	YY_BREAK
 
 
-case 157:
+case 140:
 YY_RULE_SETUP
-#line 416 "../SqlLexer.lpp"
+#line 400 "../SqlLexer.lpp"
 {
     /* Two quotes in a row become a single quote (this is specified by the SQL standard). */
     yylval->string_value_->push_back('"');
   }
 	YY_BREAK
-case 158:
+case 141:
 YY_RULE_SETUP
-#line 420 "../SqlLexer.lpp"
+#line 404 "../SqlLexer.lpp"
 {
     /* End string */
     BEGIN(CONDITION_SQL);
@@ -2567,94 +2435,94 @@ YY_RULE_SETUP
   }
 	YY_BREAK
 
-case 159:
-/* rule 159 can match eol */
+case 142:
+/* rule 142 can match eol */
 YY_RULE_SETUP
-#line 427 "../SqlLexer.lpp"
+#line 411 "../SqlLexer.lpp"
 {
   /* Scan up to a quote. */
   yylval->string_value_->append(yytext, yyleng);
 }
 	YY_BREAK
-case 160:
-/* rule 160 can match eol */
+case 143:
+/* rule 143 can match eol */
 YY_RULE_SETUP
-#line 432 "../SqlLexer.lpp"
+#line 416 "../SqlLexer.lpp"
 {
   /* Scan up to a quote or escape sequence. */
   yylval->string_value_->append(yytext, yyleng);
 }
 	YY_BREAK
-case 161:
-/* rule 161 can match eol */
+case 144:
+/* rule 144 can match eol */
 YY_RULE_SETUP
-#line 437 "../SqlLexer.lpp"
+#line 421 "../SqlLexer.lpp"
 {
   /* Scan up to a quote. */
   yylval->string_value_->append(yytext, yyleng);
 }
 	YY_BREAK
 
-case 162:
+case 145:
 YY_RULE_SETUP
-#line 443 "../SqlLexer.lpp"
+#line 427 "../SqlLexer.lpp"
 {
     yylval->string_value_ = new quickstep::ParseString(
         yylloc->first_line, yylloc->first_column, std::string(yytext, yyleng));
     return TOKEN_NAME;
   }
 	YY_BREAK
-case 163:
+case 146:
 YY_RULE_SETUP
-#line 449 "../SqlLexer.lpp"
+#line 433 "../SqlLexer.lpp"
 {
     yylval->numeric_literal_value_ = new quickstep::NumericParseLiteralValue(
         yylloc->first_line, yylloc->first_column, yytext);
     return TOKEN_UNSIGNED_NUMVAL;
   }
 	YY_BREAK
-case 164:
+case 147:
 YY_RULE_SETUP
-#line 455 "../SqlLexer.lpp"
+#line 439 "../SqlLexer.lpp"
 /* comment */
 	YY_BREAK
-case 165:
-/* rule 165 can match eol */
+case 148:
+/* rule 148 can match eol */
 YY_RULE_SETUP
-#line 457 "../SqlLexer.lpp"
+#line 441 "../SqlLexer.lpp"
 { yycolumn = 0; }
 	YY_BREAK
-case 166:
+case 149:
 YY_RULE_SETUP
-#line 459 "../SqlLexer.lpp"
+#line 443 "../SqlLexer.lpp"
 ; /* ignore white space */
 	YY_BREAK
 /* CONDITION_SQL */
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(CONDITION_COMMAND):
 case YY_STATE_EOF(CONDITION_SQL):
-#line 463 "../SqlLexer.lpp"
+#line 447 "../SqlLexer.lpp"
 {
   /* All conditions except for mutli-state string extracting conditions. */
   BEGIN(INITIAL);
   return TOKEN_EOF;
 }
 	YY_BREAK
-case 167:
+case 150:
 YY_RULE_SETUP
-#line 469 "../SqlLexer.lpp"
+#line 453 "../SqlLexer.lpp"
 {
   BEGIN(INITIAL);
   quickstep_yyerror(NULL, yyscanner, NULL, "illegal character");
   return TOKEN_LEX_ERROR;
 }
 	YY_BREAK
-case 168:
+case 151:
 YY_RULE_SETUP
-#line 475 "../SqlLexer.lpp"
+#line 459 "../SqlLexer.lpp"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 2657 "SqlLexer_gen.cpp"
+#line 2525 "SqlLexer_gen.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2952,7 +2820,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 594 )
+			if ( yy_current_state >= 534 )
 				yy_c = yy_meta[yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -2981,11 +2849,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 594 )
+		if ( yy_current_state >= 534 )
 			yy_c = yy_meta[yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	yy_is_jam = (yy_current_state == 593);
+	yy_is_jam = (yy_current_state == 533);
 
 	(void)yyg;
 	return yy_is_jam ? 0 : yy_current_state;
@@ -3815,6 +3683,6 @@ void yyfree (void * ptr , yyscan_t yyscanner)
 
 #define YYTABLES_NAME "yytables"
 
-#line 475 "../SqlLexer.lpp"
+#line 459 "../SqlLexer.lpp"
 
 

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/7a048ee6/parser/preprocessed/SqlLexer_gen.hpp
----------------------------------------------------------------------
diff --git a/parser/preprocessed/SqlLexer_gen.hpp b/parser/preprocessed/SqlLexer_gen.hpp
index 6d3c441..ba92557 100644
--- a/parser/preprocessed/SqlLexer_gen.hpp
+++ b/parser/preprocessed/SqlLexer_gen.hpp
@@ -733,7 +733,7 @@ extern int yylex \
 #undef yyTABLES_NAME
 #endif
 
-#line 475 "../SqlLexer.lpp"
+#line 459 "../SqlLexer.lpp"
 
 
 #line 739 "SqlLexer_gen.hpp"


Mime
View raw message