quickstep-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zu...@apache.org
Subject [38/50] [abbrv] incubator-quickstep git commit: Added PRIORITY clause in parser.
Date Fri, 08 Jul 2016 01:26:20 GMT
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d6428914/parser/preprocessed/SqlLexer_gen.cpp
----------------------------------------------------------------------
diff --git a/parser/preprocessed/SqlLexer_gen.cpp b/parser/preprocessed/SqlLexer_gen.cpp
index d02db56..b6c747c 100644
--- a/parser/preprocessed/SqlLexer_gen.cpp
+++ b/parser/preprocessed/SqlLexer_gen.cpp
@@ -8,8 +8,8 @@
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 39
+#define YY_FLEX_MINOR_VERSION 6
+#define YY_FLEX_SUBMINOR_VERSION 0
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -354,7 +354,7 @@ void quickstep_yyfree (void * ,yyscan_t yyscanner );
 
 /* Begin user sect3 */
 
-#define quickstep_yywrap(yyscanner) 1
+#define quickstep_yywrap(yyscanner) (/*CONSTCOND*/1)
 #define YY_SKIP_YYWRAP
 
 typedef unsigned char YY_CHAR;
@@ -366,6 +366,9 @@ typedef int yy_state_type;
 static yy_state_type yy_get_previous_state (yyscan_t yyscanner );
 static yy_state_type yy_try_NUL_trans (yy_state_type current_state  ,yyscan_t yyscanner);
 static int yy_get_next_buffer (yyscan_t yyscanner );
+#if defined(__GNUC__) && __GNUC__ >= 3
+__attribute__((__noreturn__))
+#endif
 static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
 
 /* Done after the current pattern has been matched and before the
@@ -378,8 +381,8 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
 	*yy_cp = '\0'; \
 	yyg->yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 160
-#define YY_END_OF_BUFFER 161
+#define YY_NUM_RULES 161
+#define YY_END_OF_BUFFER 162
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -387,75 +390,77 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[588] =
+static yyconst flex_int16_t yy_accept[593] =
     {   0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  161,    2,    2,  159,  159,  158,  157,  159,
-      136,  132,  135,  132,  132,  155,  128,  125,  129,  154,
-      154,  154,  154,  154,  154,  154,  154,  154,  154,  154,
-      154,  154,  154,  154,  154,  154,  154,  154,  154,  154,
-      154,  154,  154,  154,  133,    4,    5,    5,    3,  151,
-      151,  148,  152,  152,  146,  153,  153,  150,    1,  158,
-      126,  156,  155,  155,  155,    0,  130,  127,  131,  154,
-      154,  154,  154,   10,  154,  154,  154,   22,  154,  154,
-      154,  154,  154,  154,  154,  154,  154,  154,  154,  134,
-
-      154,  154,  154,  154,  154,  154,  154,  154,  154,  154,
-      154,  154,  154,   60,   68,  154,  154,  154,  154,  154,
-      154,  154,  154,  154,  154,  154,   82,   83,  154,  154,
-      154,  154,  154,  154,  154,  154,  154,  154,  154,  154,
-      154,  154,  154,  154,  154,  154,  154,  154,  154,  154,
-      154,  154,  154,    4,    5,    3,  151,  147,  152,  145,
-      145,  137,  139,  140,  141,  142,  143,  144,  145,  153,
-      149,  156,  155,    0,  155,    6,    7,  154,    9,   11,
-      154,  154,   15,  154,  154,  154,  154,  154,  154,  154,
-      154,  154,  154,  154,   33,  154,  154,  154,  154,  154,
-
-      154,  154,  154,   44,  154,  154,  154,  154,  154,  154,
-      154,   52,  154,  154,  154,  154,  154,  154,  154,  154,
-      154,   64,  154,   70,  154,  154,  154,  154,  154,  154,
-      154,   78,  154,   81,  154,  154,  154,  154,  154,  154,
-      154,  154,  154,  154,  154,  154,  154,   98,  154,  154,
-      103,  104,  154,  154,  154,  154,  154,  154,  154,  154,
-      154,  154,  154,  154,  154,  154,  154,  154,  137,  139,
-      138,  154,  154,  154,  154,  154,  154,  154,   20,   23,
-      154,  154,  154,   28,  154,  154,  154,   31,  154,  154,
-      154,  154,   38,  154,  154,   42,   43,  154,  154,  154,
-
-      154,  154,  154,  154,  154,   54,   55,  154,   57,  154,
-       59,  154,  154,  154,  154,   67,   69,   71,   72,   73,
-      154,   75,  154,  154,   79,  154,  154,   86,  154,  154,
-      154,  154,   92,  154,   94,  154,  154,  154,  100,  154,
-      154,  154,  154,  154,  154,  108,  109,  111,  154,  154,
-      154,  154,  154,  154,  154,  119,  154,  154,  122,  123,
-      137,  138,    8,  154,  154,  154,  154,  154,  154,  154,
-       25,  154,  154,  154,  154,  154,  154,  154,  154,  154,
-      154,  154,  154,  154,  154,  154,  154,   48,   49,   50,
-      154,  154,   56,  154,   61,   62,  154,  154,  154,   74,
-
-      154,   77,   80,   84,   85,  154,  154,  154,  154,   93,
-      154,  154,   97,  154,  154,  154,  154,  154,  107,  154,
-      154,  154,  154,  154,  116,  154,  154,  120,  154,  154,
-      154,  154,   14,  154,  154,  154,  154,  154,   26,  154,
-       29,  154,  154,  154,  154,  154,   36,  154,  154,  154,
-       41,  154,   46,  154,  154,  154,   58,   63,  154,  154,
-       76,  154,  154,  154,  154,  154,   96,  154,  101,  102,
-      154,  154,  154,  154,  154,  114,  115,  117,  154,  121,
-      154,  154,   13,  154,  154,  154,  154,  154,  154,   21,
-       30,  154,   34,   35,  154,  154,  154,  154,   47,  154,
-
-       53,   65,  154,  154,   89,  154,   91,  154,  154,  154,
-      154,  154,  154,  154,  118,  154,  154,  154,  154,  154,
-      154,  154,  154,   32,  154,  154,   40,  154,  154,   66,
-      154,  154,  154,  154,  105,  154,  154,  154,  154,  154,
-       12,  154,  154,  154,  154,   24,  154,   37,  154,  154,
-       51,   87,   90,  154,  154,  106,  110,  154,  113,  124,
-       16,  154,  154,  154,   27,   39,  154,   88,   95,  154,
-      154,  154,   18,   19,  154,  154,  112,  154,  154,  154,
-      154,  154,   99,  154,   45,   17,    0
+        0,    0,  162,    2,    2,  160,  160,  159,  158,  160,
+      137,  133,  136,  133,  133,  156,  129,  126,  130,  155,
+      155,  155,  155,  155,  155,  155,  155,  155,  155,  155,
+      155,  155,  155,  155,  155,  155,  155,  155,  155,  155,
+      155,  155,  155,  155,  134,    4,    5,    5,    3,  152,
+      152,  149,  153,  153,  147,  154,  154,  151,    1,  159,
+      127,  157,  156,  156,  156,    0,  131,  128,  132,  155,
+      155,  155,  155,   10,  155,  155,  155,   22,  155,  155,
+      155,  155,  155,  155,  155,  155,  155,  155,  155,  135,
+
+      155,  155,  155,  155,  155,  155,  155,  155,  155,  155,
+      155,  155,  155,   60,   68,  155,  155,  155,  155,  155,
+      155,  155,  155,  155,  155,  155,   82,   83,  155,  155,
+      155,  155,  155,  155,  155,  155,  155,  155,  155,  155,
+      155,  155,  155,  155,  155,  155,  155,  155,  155,  155,
+      155,  155,  155,    4,    5,    3,  152,  148,  153,  146,
+      146,  138,  140,  141,  142,  143,  144,  145,  146,  154,
+      150,  157,  156,    0,  156,    6,    7,  155,    9,   11,
+      155,  155,   15,  155,  155,  155,  155,  155,  155,  155,
+      155,  155,  155,  155,   33,  155,  155,  155,  155,  155,
+
+      155,  155,  155,   44,  155,  155,  155,  155,  155,  155,
+      155,   52,  155,  155,  155,  155,  155,  155,  155,  155,
+      155,   64,  155,   70,  155,  155,  155,  155,  155,  155,
+      155,   78,  155,   81,  155,  155,  155,  155,  155,  155,
+      155,  155,  155,  155,  155,  155,  155,   99,  155,  155,
+      104,  105,  155,  155,  155,  155,  155,  155,  155,  155,
+      155,  155,  155,  155,  155,  155,  155,  155,  138,  140,
+      139,  155,  155,  155,  155,  155,  155,  155,   20,   23,
+      155,  155,  155,   28,  155,  155,  155,   31,  155,  155,
+      155,  155,   38,  155,  155,   42,   43,  155,  155,  155,
+
+      155,  155,  155,  155,  155,   54,   55,  155,   57,  155,
+       59,  155,  155,  155,  155,   67,   69,   71,   72,   73,
+      155,   75,  155,  155,   79,  155,  155,   86,  155,  155,
+      155,  155,  155,   93,  155,   95,  155,  155,  155,  101,
+      155,  155,  155,  155,  155,  155,  109,  110,  112,  155,
+      155,  155,  155,  155,  155,  155,  120,  155,  155,  123,
+      124,  138,  139,    8,  155,  155,  155,  155,  155,  155,
+      155,   25,  155,  155,  155,  155,  155,  155,  155,  155,
+      155,  155,  155,  155,  155,  155,  155,  155,   48,   49,
+       50,  155,  155,   56,  155,   61,   62,  155,  155,  155,
+
+       74,  155,   77,   80,   84,   85,  155,  155,  155,  155,
+      155,   94,  155,  155,   98,  155,  155,  155,  155,  155,
+      108,  155,  155,  155,  155,  155,  117,  155,  155,  121,
+      155,  155,  155,  155,   14,  155,  155,  155,  155,  155,
+       26,  155,   29,  155,  155,  155,  155,  155,   36,  155,
+      155,  155,   41,  155,   46,  155,  155,  155,   58,   63,
+      155,  155,   76,  155,  155,  155,  155,  155,  155,   97,
+      155,  102,  103,  155,  155,  155,  155,  155,  115,  116,
+      118,  155,  122,  155,  155,   13,  155,  155,  155,  155,
+      155,  155,   21,   30,  155,   34,   35,  155,  155,  155,
+
+      155,   47,  155,   53,   65,  155,  155,   89,  155,   91,
+      155,  155,  155,  155,  155,  155,  155,  155,  119,  155,
+      155,  155,  155,  155,  155,  155,  155,   32,  155,  155,
+       40,  155,  155,   66,  155,  155,   92,  155,  155,  106,
+      155,  155,  155,  155,  155,   12,  155,  155,  155,  155,
+       24,  155,   37,  155,  155,   51,   87,   90,  155,  155,
+      107,  111,  155,  114,  125,   16,  155,  155,  155,   27,
+       39,  155,   88,   96,  155,  155,  155,   18,   19,  155,
+      155,  113,  155,  155,  155,  155,  155,  100,  155,   45,
+       17,    0
+
     } ;
 
-static yyconst flex_int32_t yy_ec[256] =
+static yyconst YY_CHAR yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    4,    1,    1,    1,    1,    1,    1,    1,
@@ -487,7 +492,7 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[72] =
+static yyconst YY_CHAR yy_meta[72] =
     {   0,
         1,    1,    2,    1,    1,    3,    1,    4,    1,    5,
         5,    6,    6,    5,    1,    1,    1,    7,    7,    7,
@@ -499,27 +504,27 @@ static yyconst flex_int32_t yy_meta[72] =
         8
     } ;
 
-static yyconst flex_int16_t yy_base[603] =
+static yyconst flex_uint16_t yy_base[608] =
     {   0,
         0,    1,   46,    0,  117,  163,    2,    3,  128,  132,
-        6,   10,  211, 1307, 1307,    0, 1307,   13, 1307,  194,
-     1307, 1307, 1307,  194,    6,  130,    4, 1307,  170,  124,
+        6,   10,  211, 1312, 1312,    0, 1312,   13, 1312,  194,
+     1312, 1312, 1312,  194,    6,  130,    4, 1312,  170,  124,
       161,  215,  170,  207,  265,   92,  167,  162,   96,  107,
       223,  165,  162,  221,  274,   92,  284,  277,  315,  206,
-      128,  232,    0,  125, 1307,  152,    4,   19,    0,    0,
+      128,  232,    0,  125, 1312,  152,    4,   19,    0,    0,
         0,  143,    0,    0,  379,    0,    0,  144,    0,   22,
-     1307,    0,  292,  305,  335,   18, 1307, 1307, 1307,    0,
+     1312,    0,  292,  305,  335,   18, 1312, 1312, 1312,    0,
       174,  264,  180,  186,  209,  271,  229,    0,  277,  333,
-      335,  312,  330,  317,  323,  338,  323,  333,  340, 1307,
+      335,  312,  330,  317,  323,  338,  323,  333,  340, 1312,
 
       339,  355,  357,  381,  370,  373,  377,  382,  380,  384,
       383,  383,  383,  431,    0,  398,  383,  390,  406,  402,
       403,  404,  425,  420,  431,  442,    0,  445,  432,  448,
       436,  437,  451,  448,  444,  460,  452,  439,  489,  464,
       468,  469,  468,  462,  455,  477,  501,  493,  489,  494,
-      502,  494,  510,  142,   29,    0,    0, 1307,    0, 1307,
-     1307,   22,   24, 1307, 1307, 1307, 1307, 1307,    0,    0,
-     1307,    0,  520,   26,   28,    0,    0,  508,    0,  512,
+      502,  494,  510,  142,   29,    0,    0, 1312,    0, 1312,
+     1312,   22,   24, 1312, 1312, 1312, 1312, 1312,    0,    0,
+     1312,    0,  520,   26,   28,    0,    0,  508,    0,  512,
       495,  510,  497,  530,  518,  506,  525,  508,  512,  509,
       543,  530,  533,  550,    0,  547,  558,  556,  561,  546,
 
@@ -527,127 +532,127 @@ static yyconst flex_int16_t yy_base[603] =
       566,  576,  569,  571,  565,  579,  580,  573,  587,  597,
       598,  604,  594,    0,  593,  594,  612,  613,  616,  603,
       605,    0,  614,    0,  622,  623,  611,  610,  630,  631,
-      622,  616,  632,  628,  636,  639,  637,  631,  632,  644,
-        0,  649,  647,  655,  657,  667,  670,  665,  665,  664,
-      681,  669,  663,  682,  673,  682,  680,  671,   30,  125,
-        0,  674,  679,  689,  683,  693,  688,  689,    0,  702,
-      694,  694,  688,    0,  699,  706,  720,  709,  717,  712,
-      715,  725,  734,  731,  729,    0,    0,  726,  723,  743,
-
-      740,  726,  727,  734,  741,    0,    0,  735,    0,  738,
-        0,  731,  738,  739,  759,    0,    0,    0,    0,    0,
-      740,    0,  741,  755,  746,  764,  765,    0,  778,  783,
-      786,  792,    0,  791,    0,  779,  774,  779,    0,  796,
-      787,  799,  791,  784,  800,    0,  788,    0,  803,  788,
-      789,  793,  807,  810,  810,    0,  814,  806,    0,  810,
-      136, 1307,    0,  820,  830,  820,  840,  830,  839,  848,
-        0,  840,  837,  851,  852,  844,  850,  859,  849,  857,
-      854,  851,  852,  862,  863,  852,  869,    0,    0,    0,
-      850,  869,    0,  870,    0,    0,  859,  876,  860,    0,
-
-      888,    0,    0,    0,    0,  878,  885,  899,  886,    0,
-      902,  893,    0,  907,  909,  894,  906,  898,    0,  897,
-      899,  905,  915,  916,    0,  904,  923,    0,  902,  911,
-      920,  916,    0,  909,  916,  934,  928,  919,    0,  939,
-        0,  946,  936,  944,  949,  942,    0,  945,  963,  967,
-        0,   93,    0,  951,  963,  959,    0,    0,  956,  974,
-        0,  967,  957,  969,  954,  967,    0,  970,    0,    0,
-      969,  975,  986,  987,  985,    0,    0,    0,  974,    0,
-      979,  981,    0,  988,  983,  996, 1002, 1010, 1010,    0,
-        0, 1015,    0,    0, 1018, 1016, 1008, 1010,    0, 1016,
-
-        0,    0, 1019, 1017,    0, 1019,    0, 1031, 1026, 1016,
-     1023, 1026, 1027, 1036,    0, 1022, 1038, 1032, 1031, 1034,
-     1031, 1035, 1041,    0, 1038, 1053,    0, 1052, 1066,    0,
-     1063, 1071, 1076, 1070,    0, 1079, 1071, 1072, 1085, 1082,
-        0, 1084, 1087, 1081, 1089,    0, 1075,    0, 1090, 1080,
-        0, 1080,    0, 1081, 1094,    0,    0, 1092,    0,    0,
-        0, 1087, 1103, 1091,    0,    0, 1102,    0,    0, 1093,
-     1109, 1105,    0,    0, 1116, 1126,    0, 1126, 1129, 1121,
-     1136, 1125,    0, 1126,    0,    0, 1307, 1191, 1201, 1211,
-     1221, 1231, 1235, 1238, 1244, 1252, 1262, 1272, 1282, 1292,
-
-     1297, 1299
+      626,  615,  629,  628,  639,  640,  639,  631,  634,  656,
+        0,  654,  648,  659,  658,  670,  672,  668,  666,  665,
+      682,  670,  664,  683,  673,  684,  681,  674,   30,  125,
+        0,  675,  680,  692,  684,  694,  691,  690,    0,  704,
+      696,  695,  699,    0,  704,  707,  724,  710,  720,  714,
+      718,  726,  735,  732,  730,    0,    0,  727,  724,  744,
+
+      741,  727,  729,  735,  742,    0,    0,  736,    0,  741,
+        0,  732,  739,  742,  759,    0,    0,    0,    0,    0,
+      741,    0,  743,  757,  763,  765,  769,    0,  779,  786,
+      788,  795,  779,    0,  793,    0,  781,  776,  781,    0,
+      798,  789,  801,  793,  787,  803,    0,  790,    0,  805,
+      792,  793,  795,  811,  814,  813,    0,  818,  809,    0,
+      822,  136, 1312,    0,  836,  836,  825,  845,  835,  843,
+      852,    0,  842,  839,  853,  854,  846,  852,  861,  851,
+      860,  857,  853,  854,  866,  867,  854,  873,    0,    0,
+        0,  854,  872,    0,  874,    0,    0,  862,  888,  876,
+
+        0,  894,    0,    0,    0,    0,  883,  890,  903,  891,
+      903,    0,  908,  898,    0,  910,  912,  897,  909,  901,
+        0,  900,  902,  909,  919,  920,    0,  907,  928,    0,
+      907,  916,  925,  921,    0,  915,  921,  939,  942,  936,
+        0,  956,    0,  956,  942,  952,  955,  950,    0,  951,
+      968,  970,    0,   93,    0,  954,  966,  962,    0,    0,
+      959,  977,    0,  970,  961,  973,  958,  964,  973,    0,
+      976,    0,    0,  975,  983,  992,  994,  993,    0,    0,
+        0,  980,    0,  995, 1000,    0, 1006, 1004, 1007, 1011,
+     1020, 1019,    0,    0, 1024,    0,    0, 1025, 1022, 1012,
+
+     1014,    0, 1020,    0,    0, 1023, 1021,    0, 1023,    0,
+     1014, 1037, 1032, 1022, 1031, 1033, 1034, 1045,    0, 1031,
+     1046, 1041, 1040, 1051, 1052, 1055, 1063,    0, 1060, 1067,
+        0, 1063, 1079,    0, 1073, 1081,    0, 1084, 1077,    0,
+     1084, 1076, 1077, 1090, 1087,    0, 1090, 1093, 1087, 1095,
+        0, 1083,    0, 1097, 1087,    0, 1089,    0, 1090, 1102,
+        0,    0, 1101,    0,    0,    0, 1096, 1120, 1112,    0,
+        0, 1122,    0,    0, 1115, 1131, 1119,    0,    0, 1127,
+     1139,    0, 1136, 1139, 1129, 1143, 1130,    0, 1131,    0,
+        0, 1312, 1196, 1206, 1216, 1226, 1236, 1240, 1243, 1249,
+
+     1257, 1267, 1277, 1287, 1297, 1302, 1304
     } ;
 
-static yyconst flex_int16_t yy_def[603] =
+static yyconst flex_int16_t yy_def[608] =
     {   0,
-      588,  588,  587,    3,  589,  589,  590,  590,  591,  591,
-      592,  592,  587,  587,  587,  593,  587,  587,  587,  587,
-      587,  587,  587,  587,  587,  587,  587,  587,  587,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  587,  587,  587,  587,  595,  596,
-      596,  587,  597,  597,  598,  599,  599,  587,  593,  587,
-      587,  600,  587,  587,  587,  587,  587,  587,  587,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  587,
-
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  587,  587,  595,  596,  587,  597,  587,
-      587,  587,  587,  587,  587,  587,  587,  587,  601,  599,
-      587,  600,  587,  587,  587,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  587,  587,
-      602,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      587,  587,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,    0,  587,  587,  587,
-      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
-
-      587,  587
+      593,  593,  592,    3,  594,  594,  595,  595,  596,  596,
+      597,  597,  592,  592,  592,  598,  592,  592,  592,  592,
+      592,  592,  592,  592,  592,  592,  592,  592,  592,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  592,  592,  592,  592,  600,  601,
+      601,  592,  602,  602,  603,  604,  604,  592,  598,  592,
+      592,  605,  592,  592,  592,  592,  592,  592,  592,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  592,
+
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  592,  592,  600,  601,  592,  602,  592,
+      592,  592,  592,  592,  592,  592,  592,  592,  606,  604,
+      592,  605,  592,  592,  592,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  592,  592,
+      607,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  592,  592,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,    0,  592,  592,  592,  592,  592,  592,  592,  592,
+
+      592,  592,  592,  592,  592,  592,  592
     } ;
 
-static yyconst flex_int16_t yy_nxt[1379] =
+static yyconst flex_uint16_t yy_nxt[1384] =
     {   0,
-      587,  587,   15,   15,   61,   61,  155,  155,   67,   62,
-       62,   68,   67,  587,   70,   68,   70,   73,   73,   77,
-       78,  155,  155,   70,  587,   70,  174,  174,  587,  175,
+      592,  592,   15,   15,   61,   61,  155,  155,   67,   62,
+       62,   68,   67,  592,   70,   68,   70,   73,   73,   77,
+       78,  155,  155,   70,  592,   70,  174,  174,  592,  175,
       175,  155,  155,  269,  270,  270,  270,  175,  175,  175,
-      175,  361,  270,  587,   16,   16,   17,   18,   19,   18,
+      175,  362,  270,  592,   16,   16,   17,   18,   19,   18,
        20,   21,   22,   23,   22,   24,   25,   26,   26,   17,
        27,   28,   29,   30,   31,   32,   33,   34,   35,   36,
        37,   38,   39,   40,   41,   42,   43,   44,   45,   46,
@@ -657,7 +662,7 @@ static yyconst flex_int16_t yy_nxt[1379] =
        38,   39,   40,   41,   42,   43,   44,   45,   46,   47,
        48,   49,   50,   51,   52,   53,   54,   17,   56,   57,
        58,   17,   17,   17,   17,   17,  111,  116,  117,  134,
-       64,   17,   17,   17,   64,   62,  270,  270,  498,   62,
+       64,   17,   17,   17,   64,   62,  270,  270,  501,   62,
        74,   75,   75,  154,   81,  150,  153,  270,  270,  171,
       158,   76,   82,  154,   83,  111,  116,  117,  134,   84,
        17,   17,   17,   17,   56,   57,   58,   17,   17,   17,
@@ -666,35 +671,35 @@ static yyconst flex_int16_t yy_nxt[1379] =
       122,   96,  114,  124,  176,   97,  123,  115,  113,  125,
 
       179,   98,   88,   72,   99,  180,   17,   17,   17,   71,
-      587,   85,  587,  112,  100,   86,   95,  587,   87,  122,
+      592,   85,  592,  112,  100,   86,   95,  592,   87,  122,
        96,  114,  124,  176,   97,  123,  115,  113,  125,  179,
        98,   88,   89,   99,  180,  101,  147,  102,  148,   90,
       118,  149,  103,  126,  119,  181,   91,  104,  120,   92,
-       93,  127,   94,  587,  121,  128,  151,  152,  129,  130,
-      184,   89,  587,  587,  101,  147,  102,  148,   90,  118,
+       93,  127,   94,  592,  121,  128,  151,  152,  129,  130,
+      184,   89,  592,  592,  101,  147,  102,  148,   90,  118,
       149,  103,  126,  119,  181,   91,  104,  120,   92,   93,
       127,   94,  105,  121,  128,  151,  152,  129,  130,  184,
-      106,  131,  177,  107,  182,  132,  108,  587,  139,  109,
+      106,  131,  177,  107,  182,  132,  108,  592,  139,  109,
 
       178,  135,  110,   73,   73,  136,  140,  183,  133,  137,
-      587,  105,  185,   76,  141,  138,  173,  173,  587,  106,
+      592,  105,  185,   76,  141,  138,  173,  173,  592,  106,
       131,  177,  107,  182,  132,  108,   76,  139,  109,  178,
       135,  110,  142,  191,  136,  140,  183,  133,  137,  143,
       144,  185,   76,  141,  138,   74,   75,   75,  192,  145,
-      186,  193,  146,  587,  187,   76,   76,  196,  200,  194,
+      186,  193,  146,  592,  187,   76,   76,  196,  200,  194,
       197,  142,  191,  188,  195,  189,  198,  190,  143,  144,
-      201,  202,  587,  199,  203,  204,  205,  192,  145,  186,
-      193,  146,  161,  187,  587,   76,  196,  200,  194,  197,
+      201,  202,  592,  199,  203,  204,  205,  192,  145,  186,
+      193,  146,  161,  187,  592,   76,  196,  200,  194,  197,
       162,  163,  188,  195,  189,  198,  190,  164,  208,  201,
 
       202,  165,  199,  203,  204,  205,  206,  209,  210,  166,
       211,  213,  214,  167,  215,  168,  212,  207,  216,  169,
-      218,  217,  587,  223,  224,  225,  164,  208,  226,  227,
-      165,  228,  587,  229,  230,  206,  209,  210,  166,  211,
+      218,  217,  592,  223,  224,  225,  164,  208,  226,  227,
+      165,  228,  592,  229,  230,  206,  209,  210,  166,  211,
       213,  214,  167,  215,  168,  212,  207,  216,  169,  218,
       217,  219,  223,  224,  225,  231,  232,  226,  227,  233,
       228,  220,  229,  230,  234,  235,  221,  222,  236,  237,
-      238,  239,  240,  242,  243,  247,  241,  244,  248,  587,
+      238,  239,  240,  242,  243,  247,  241,  244,  248,  592,
       219,  252,  245,  246,  231,  232,  253,  254,  233,  255,
       220,  256,  257,  234,  235,  221,  222,  236,  237,  238,
 
@@ -714,33 +719,33 @@ static yyconst flex_int16_t yy_nxt[1379] =
       301,  302,  303,  304,  317,  315,  305,  306,  307,  318,
       319,  308,  309,  320,  310,  316,  311,  312,  321,  322,
       323,  324,  325,  326,  327,  328,  329,  313,  314,  330,
-      331,  332,  333,  317,  315,  334,  335,  336,  318,  319,
-      337,  338,  320,  341,  316,  342,  339,  321,  322,  323,
-      324,  325,  326,  327,  328,  329,  340,  343,  330,  331,
-      332,  333,  344,  345,  334,  335,  336,  346,  347,  337,
-      338,  348,  341,  349,  342,  339,  350,  351,  352,  353,
+      331,  334,  335,  317,  315,  332,  336,  333,  318,  319,
+      337,  338,  320,  339,  316,  342,  340,  321,  322,  323,
+      324,  325,  326,  327,  328,  329,  341,  343,  330,  331,
+      334,  335,  344,  345,  332,  336,  333,  346,  347,  337,
+      338,  348,  339,  349,  342,  340,  350,  351,  352,  353,
 
-      354,  355,  358,  356,  359,  360,  343,  357,  363,  364,
+      354,  355,  356,  357,  359,  360,  343,  358,  361,  364,
       365,  344,  345,  366,  367,  368,  346,  347,  369,  370,
       348,  371,  349,  372,  373,  350,  351,  352,  353,  354,
-      355,  358,  356,  359,  360,  374,  357,  363,  364,  365,
+      355,  356,  357,  359,  360,  374,  358,  361,  364,  365,
       375,  376,  366,  367,  368,  377,  378,  369,  370,  379,
       371,  380,  372,  373,  381,  382,  383,  384,  385,  386,
       387,  388,  389,  390,  374,  391,  392,  393,  394,  375,
-      376,  395,  396,  397,  377,  378,  400,  401,  379,  402,
-      380,  403,  398,  381,  382,  383,  384,  385,  386,  387,
-      388,  389,  390,  399,  391,  392,  393,  394,  404,  405,
+      376,  395,  396,  397,  377,  378,  398,  401,  379,  402,
+      380,  403,  399,  381,  382,  383,  384,  385,  386,  387,
+      388,  389,  390,  400,  391,  392,  393,  394,  404,  405,
 
-      395,  396,  397,  406,  407,  400,  401,  408,  402,  409,
-      403,  398,  410,  411,  412,  413,  414,  415,  416,  417,
-      418,  419,  399,  420,  421,  422,  423,  404,  405,  424,
+      395,  396,  397,  406,  407,  398,  401,  408,  402,  409,
+      403,  399,  410,  411,  412,  413,  414,  415,  416,  417,
+      418,  419,  400,  420,  421,  422,  423,  404,  405,  424,
       425,  426,  406,  407,  427,  428,  408,  429,  409,  430,
       431,  410,  411,  412,  413,  414,  415,  416,  417,  418,
       419,  432,  420,  421,  422,  423,  433,  434,  424,  425,
-      426,  437,  435,  427,  428,  436,  429,  438,  430,  431,
-      439,  440,  441,  442,  443,  444,  445,  446,  447,  448,
+      426,  435,  436,  427,  428,  439,  429,  437,  430,  431,
+      438,  440,  441,  442,  443,  444,  445,  446,  447,  448,
       432,  449,  450,  451,  452,  433,  434,  453,  454,  455,
-      437,  435,  456,  457,  436,  458,  438,  459,  460,  439,
+      435,  436,  456,  457,  439,  458,  437,  459,  460,  438,
 
       440,  441,  442,  443,  444,  445,  446,  447,  448,  461,
       449,  450,  451,  452,  462,  463,  453,  454,  455,  464,
@@ -750,11 +755,11 @@ static yyconst flex_int16_t yy_nxt[1379] =
       485,  486,  466,  487,  467,  488,  489,  468,  469,  470,
       471,  472,  473,  474,  475,  476,  477,  490,  478,  479,
       480,  481,  491,  492,  482,  483,  484,  493,  494,  485,
-      486,  495,  487,  496,  488,  489,  497,  499,  500,  501,
+      486,  495,  487,  496,  488,  489,  497,  498,  499,  500,
       502,  503,  504,  505,  506,  507,  490,  508,  509,  510,
 
       511,  491,  492,  512,  513,  514,  493,  494,  515,  516,
-      495,  517,  496,  518,  519,  497,  499,  500,  501,  502,
+      495,  517,  496,  518,  519,  497,  498,  499,  500,  502,
       503,  504,  505,  506,  507,  520,  508,  509,  510,  511,
       521,  522,  512,  513,  514,  523,  524,  515,  516,  525,
       517,  526,  518,  519,  527,  528,  529,  530,  531,  532,
@@ -770,33 +775,34 @@ static yyconst flex_int16_t yy_nxt[1379] =
       577,  556,  557,  558,  559,  560,  561,  562,  563,  564,
       565,  578,  566,  567,  568,  569,  579,  580,  570,  571,
       572,  581,  582,  573,  574,  583,  575,  584,  576,  577,
-      585,  586,  587,  587,  587,  587,  587,  587,  587,  587,
-      578,  587,  587,  587,  587,  579,  580,  587,  587,  587,
-      581,  582,  587,  587,  583,  587,  584,  587,  587,  585,
-      586,   14,   14,   14,   14,   14,   14,   14,   14,   14,
-
-       14,   59,   59,   59,   59,   59,   59,   59,   59,   59,
-       59,   60,   60,   60,   60,   60,   60,   60,   60,   60,
-       60,   63,   63,   63,   63,   63,   63,   63,   63,   63,
-       63,   66,   66,   66,   66,   66,   66,   66,   66,   66,
-       66,   69,   69,   80,   80,   80,  587,   80,  156,  156,
-      156,  156,  157,  157,  157,  587,  157,  157,  157,  157,
-      157,  157,  159,  159,  159,  587,  159,  159,  159,  159,
-      587,  159,  160,  160,  160,  160,  160,  160,  160,  160,
-      160,  160,  170,  170,  587,  170,  170,  170,  170,  170,
-      170,  170,  172,  587,  172,  172,  172,  172,  172,  172,
-
-      172,  172,  271,  271,  362,  362,   13,  587,  587,  587,
-      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
-      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
-      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
-      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
-      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
-      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
-      587,  587,  587,  587,  587,  587,  587,  587
+      585,  586,  587,  588,  589,  590,  591,  592,  592,  592,
+      578,  592,  592,  592,  592,  579,  580,  592,  592,  592,
+      581,  582,  592,  592,  583,  592,  584,  592,  592,  585,
+      586,  587,  588,  589,  590,  591,   14,   14,   14,   14,
+
+       14,   14,   14,   14,   14,   14,   59,   59,   59,   59,
+       59,   59,   59,   59,   59,   59,   60,   60,   60,   60,
+       60,   60,   60,   60,   60,   60,   63,   63,   63,   63,
+       63,   63,   63,   63,   63,   63,   66,   66,   66,   66,
+       66,   66,   66,   66,   66,   66,   69,   69,   80,   80,
+       80,  592,   80,  156,  156,  156,  156,  157,  157,  157,
+      592,  157,  157,  157,  157,  157,  157,  159,  159,  159,
+      592,  159,  159,  159,  159,  592,  159,  160,  160,  160,
+      160,  160,  160,  160,  160,  160,  160,  170,  170,  592,
+      170,  170,  170,  170,  170,  170,  170,  172,  592,  172,
+
+      172,  172,  172,  172,  172,  172,  172,  271,  271,  363,
+      363,   13,  592,  592,  592,  592,  592,  592,  592,  592,
+      592,  592,  592,  592,  592,  592,  592,  592,  592,  592,
+      592,  592,  592,  592,  592,  592,  592,  592,  592,  592,
+      592,  592,  592,  592,  592,  592,  592,  592,  592,  592,
+      592,  592,  592,  592,  592,  592,  592,  592,  592,  592,
+      592,  592,  592,  592,  592,  592,  592,  592,  592,  592,
+      592,  592,  592,  592,  592,  592,  592,  592,  592,  592,
+      592,  592,  592
     } ;
 
-static yyconst flex_int16_t yy_chk[1379] =
+static yyconst flex_int16_t yy_chk[1384] =
     {   0,
         0,    0,    1,    2,    7,    8,   57,   57,   11,    7,
         8,   11,   12,    0,   18,   12,   18,   25,   25,   27,
@@ -812,8 +818,8 @@ static yyconst flex_int16_t yy_chk[1379] =
         3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
         3,    3,    3,    3,    3,    3,    3,    5,    5,    5,
         5,    5,    5,    5,    5,    5,   36,   39,   40,   46,
-        9,    5,    5,    5,   10,    9,  270,  270,  452,   10,
-       26,   26,   26,  154,   30,   51,   54,  361,  361,   68,
+        9,    5,    5,    5,   10,    9,  270,  270,  454,   10,
+       26,   26,   26,  154,   30,   51,   54,  362,  362,   68,
        62,   26,   30,   56,   30,   36,   39,   40,   46,   30,
         5,    5,    5,    6,    6,    6,    6,    6,    6,    6,
         6,    6,    9,   30,   51,   54,   10,    6,    6,    6,
@@ -869,90 +875,91 @@ static yyconst flex_int16_t yy_chk[1379] =
       208,  209,  210,  211,  223,  222,  212,  213,  214,  225,
       226,  215,  216,  227,  217,  222,  218,  219,  228,  229,
       230,  231,  233,  235,  236,  237,  238,  220,  221,  239,
-      240,  241,  242,  223,  222,  243,  244,  245,  225,  226,
-      246,  247,  227,  249,  222,  250,  248,  228,  229,  230,
-      231,  233,  235,  236,  237,  238,  248,  252,  239,  240,
-      241,  242,  253,  254,  243,  244,  245,  255,  256,  246,
-      247,  257,  249,  258,  250,  248,  259,  260,  261,  262,
-
-      263,  264,  266,  265,  267,  268,  252,  265,  272,  273,
-      274,  253,  254,  275,  276,  277,  255,  256,  278,  280,
-      257,  281,  258,  282,  283,  259,  260,  261,  262,  263,
-      264,  266,  265,  267,  268,  285,  265,  272,  273,  274,
-      286,  287,  275,  276,  277,  288,  289,  278,  280,  290,
-      281,  291,  282,  283,  292,  293,  294,  295,  298,  299,
-      300,  301,  302,  303,  285,  304,  305,  308,  310,  286,
-      287,  312,  313,  314,  288,  289,  321,  323,  290,  324,
-      291,  325,  315,  292,  293,  294,  295,  298,  299,  300,
-      301,  302,  303,  315,  304,  305,  308,  310,  326,  327,
-
-      312,  313,  314,  329,  330,  321,  323,  331,  324,  332,
-      325,  315,  334,  336,  337,  338,  340,  341,  342,  343,
-      344,  345,  315,  347,  349,  350,  351,  326,  327,  352,
-      353,  354,  329,  330,  355,  357,  331,  358,  332,  360,
-      364,  334,  336,  337,  338,  340,  341,  342,  343,  344,
-      345,  365,  347,  349,  350,  351,  366,  367,  352,  353,
-      354,  369,  368,  355,  357,  368,  358,  370,  360,  364,
-      372,  373,  374,  375,  376,  377,  378,  379,  380,  381,
-      365,  382,  383,  384,  385,  366,  367,  386,  387,  391,
-      369,  368,  392,  394,  368,  397,  370,  398,  399,  372,
-
-      373,  374,  375,  376,  377,  378,  379,  380,  381,  401,
-      382,  383,  384,  385,  406,  407,  386,  387,  391,  408,
-      409,  392,  394,  411,  397,  412,  398,  399,  414,  415,
-      416,  417,  418,  420,  421,  422,  423,  424,  401,  426,
-      427,  429,  430,  406,  407,  431,  432,  434,  408,  409,
-      435,  436,  411,  437,  412,  438,  440,  414,  415,  416,
-      417,  418,  420,  421,  422,  423,  424,  442,  426,  427,
-      429,  430,  443,  444,  431,  432,  434,  445,  446,  435,
-      436,  448,  437,  449,  438,  440,  450,  454,  455,  456,
-      459,  460,  462,  463,  464,  465,  442,  466,  468,  471,
-
-      472,  443,  444,  473,  474,  475,  445,  446,  479,  481,
-      448,  482,  449,  484,  485,  450,  454,  455,  456,  459,
-      460,  462,  463,  464,  465,  486,  466,  468,  471,  472,
-      487,  488,  473,  474,  475,  489,  492,  479,  481,  495,
-      482,  496,  484,  485,  497,  498,  500,  503,  504,  506,
-      508,  509,  510,  511,  486,  512,  513,  514,  516,  487,
-      488,  517,  518,  519,  489,  492,  520,  521,  495,  522,
-      496,  523,  525,  497,  498,  500,  503,  504,  506,  508,
-      509,  510,  511,  526,  512,  513,  514,  516,  528,  529,
-      517,  518,  519,  531,  532,  520,  521,  533,  522,  534,
-
-      523,  525,  536,  537,  538,  539,  540,  542,  543,  544,
-      545,  547,  526,  549,  550,  552,  554,  528,  529,  555,
-      558,  562,  531,  532,  563,  564,  533,  567,  534,  570,
-      571,  536,  537,  538,  539,  540,  542,  543,  544,  545,
-      547,  572,  549,  550,  552,  554,  575,  576,  555,  558,
-      562,  578,  579,  563,  564,  580,  567,  581,  570,  571,
-      582,  584,    0,    0,    0,    0,    0,    0,    0,    0,
-      572,    0,    0,    0,    0,  575,  576,    0,    0,    0,
-      578,  579,    0,    0,  580,    0,  581,    0,    0,  582,
-      584,  588,  588,  588,  588,  588,  588,  588,  588,  588,
-
-      588,  589,  589,  589,  589,  589,  589,  589,  589,  589,
-      589,  590,  590,  590,  590,  590,  590,  590,  590,  590,
-      590,  591,  591,  591,  591,  591,  591,  591,  591,  591,
-      591,  592,  592,  592,  592,  592,  592,  592,  592,  592,
-      592,  593,  593,  594,  594,  594,    0,  594,  595,  595,
-      595,  595,  596,  596,  596,    0,  596,  596,  596,  596,
-      596,  596,  597,  597,  597,    0,  597,  597,  597,  597,
-        0,  597,  598,  598,  598,  598,  598,  598,  598,  598,
-      598,  598,  599,  599,    0,  599,  599,  599,  599,  599,
-      599,  599,  600,    0,  600,  600,  600,  600,  600,  600,
-
-      600,  600,  601,  601,  602,  602,  587,  587,  587,  587,
-      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
-      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
-      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
-      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
-      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
-      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
-      587,  587,  587,  587,  587,  587,  587,  587
+      240,  242,  243,  223,  222,  241,  244,  241,  225,  226,
+      245,  246,  227,  247,  222,  249,  248,  228,  229,  230,
+      231,  233,  235,  236,  237,  238,  248,  250,  239,  240,
+      242,  243,  252,  253,  241,  244,  241,  254,  255,  245,
+      246,  256,  247,  257,  249,  248,  258,  259,  260,  261,
+
+      262,  263,  264,  265,  266,  267,  250,  265,  268,  272,
+      273,  252,  253,  274,  275,  276,  254,  255,  277,  278,
+      256,  280,  257,  281,  282,  258,  259,  260,  261,  262,
+      263,  264,  265,  266,  267,  283,  265,  268,  272,  273,
+      285,  286,  274,  275,  276,  287,  288,  277,  278,  289,
+      280,  290,  281,  282,  291,  292,  293,  294,  295,  298,
+      299,  300,  301,  302,  283,  303,  304,  305,  308,  285,
+      286,  310,  312,  313,  287,  288,  314,  321,  289,  323,
+      290,  324,  315,  291,  292,  293,  294,  295,  298,  299,
+      300,  301,  302,  315,  303,  304,  305,  308,  325,  326,
+
+      310,  312,  313,  327,  329,  314,  321,  330,  323,  331,
+      324,  315,  332,  333,  335,  337,  338,  339,  341,  342,
+      343,  344,  315,  345,  346,  348,  350,  325,  326,  351,
+      352,  353,  327,  329,  354,  355,  330,  356,  331,  358,
+      359,  332,  333,  335,  337,  338,  339,  341,  342,  343,
+      344,  361,  345,  346,  348,  350,  365,  366,  351,  352,
+      353,  367,  368,  354,  355,  370,  356,  369,  358,  359,
+      369,  371,  373,  374,  375,  376,  377,  378,  379,  380,
+      361,  381,  382,  383,  384,  365,  366,  385,  386,  387,
+      367,  368,  388,  392,  370,  393,  369,  395,  398,  369,
+
+      371,  373,  374,  375,  376,  377,  378,  379,  380,  399,
+      381,  382,  383,  384,  400,  402,  385,  386,  387,  407,
+      408,  388,  392,  409,  393,  410,  395,  398,  411,  413,
+      414,  416,  417,  418,  419,  420,  422,  423,  399,  424,
+      425,  426,  428,  400,  402,  429,  431,  432,  407,  408,
+      433,  434,  409,  436,  410,  437,  438,  411,  413,  414,
+      416,  417,  418,  419,  420,  422,  423,  439,  424,  425,
+      426,  428,  440,  442,  429,  431,  432,  444,  445,  433,
+      434,  446,  436,  447,  437,  438,  448,  450,  451,  452,
+      456,  457,  458,  461,  462,  464,  439,  465,  466,  467,
+
+      468,  440,  442,  469,  471,  474,  444,  445,  475,  476,
+      446,  477,  447,  478,  482,  448,  450,  451,  452,  456,
+      457,  458,  461,  462,  464,  484,  465,  466,  467,  468,
+      485,  487,  469,  471,  474,  488,  489,  475,  476,  490,
+      477,  491,  478,  482,  492,  495,  498,  499,  500,  501,
+      503,  506,  507,  509,  484,  511,  512,  513,  514,  485,
+      487,  515,  516,  517,  488,  489,  518,  520,  490,  521,
+      491,  522,  523,  492,  495,  498,  499,  500,  501,  503,
+      506,  507,  509,  524,  511,  512,  513,  514,  525,  526,
+      515,  516,  517,  527,  529,  518,  520,  530,  521,  532,
+
+      522,  523,  533,  535,  536,  538,  539,  541,  542,  543,
+      544,  545,  524,  547,  548,  549,  550,  525,  526,  552,
+      554,  555,  527,  529,  557,  559,  530,  560,  532,  563,
+      567,  533,  535,  536,  538,  539,  541,  542,  543,  544,
+      545,  568,  547,  548,  549,  550,  569,  572,  552,  554,
+      555,  575,  576,  557,  559,  577,  560,  580,  563,  567,
+      581,  583,  584,  585,  586,  587,  589,    0,    0,    0,
+      568,    0,    0,    0,    0,  569,  572,    0,    0,    0,
+      575,  576,    0,    0,  577,    0,  580,    0,    0,  581,
+      583,  584,  585,  586,  587,  589,  593,  593,  593,  593,
+
+      593,  593,  593,  593,  593,  593,  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,  599,  599,
+      599,    0,  599,  600,  600,  600,  600,  601,  601,  601,
+        0,  601,  601,  601,  601,  601,  601,  602,  602,  602,
+        0,  602,  602,  602,  602,    0,  602,  603,  603,  603,
+      603,  603,  603,  603,  603,  603,  603,  604,  604,    0,
+      604,  604,  604,  604,  604,  604,  604,  605,    0,  605,
+
+      605,  605,  605,  605,  605,  605,  605,  606,  606,  607,
+      607,  592,  592,  592,  592,  592,  592,  592,  592,  592,
+      592,  592,  592,  592,  592,  592,  592,  592,  592,  592,
+      592,  592,  592,  592,  592,  592,  592,  592,  592,  592,
+      592,  592,  592,  592,  592,  592,  592,  592,  592,  592,
+      592,  592,  592,  592,  592,  592,  592,  592,  592,  592,
+      592,  592,  592,  592,  592,  592,  592,  592,  592,  592,
+      592,  592,  592,  592,  592,  592,  592,  592,  592,  592,
+      592,  592,  592
     } ;
 
 /* Table of booleans, true if rule could match eol. */
-static yyconst flex_int32_t yy_rule_can_match_eol[161] =
+static yyconst flex_int32_t yy_rule_can_match_eol[162] =
     {   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, 
@@ -961,8 +968,8 @@ static yyconst flex_int32_t yy_rule_can_match_eol[161] =
     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, 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.
@@ -1028,6 +1035,7 @@ class ParseOrderBy;
 class ParseOrderByItem;
 class ParsePartitionClause;
 class ParsePredicate;
+class ParsePriority;
 class ParseSample;
 class ParseScalarLiteral;
 class ParseSearchedWhenClause;
@@ -1081,7 +1089,7 @@ class UnaryOperation;
 
 
 
-#line 1085 "SqlLexer_gen.cpp"
+#line 1093 "SqlLexer_gen.cpp"
 
 #define INITIAL 0
 #define CONDITION_SQL 1
@@ -1167,11 +1175,11 @@ void quickstep_yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );
 
 FILE *quickstep_yyget_in (yyscan_t yyscanner );
 
-void quickstep_yyset_in  (FILE * in_str ,yyscan_t yyscanner );
+void quickstep_yyset_in  (FILE * _in_str ,yyscan_t yyscanner );
 
 FILE *quickstep_yyget_out (yyscan_t yyscanner );
 
-void quickstep_yyset_out  (FILE * out_str ,yyscan_t yyscanner );
+void quickstep_yyset_out  (FILE * _out_str ,yyscan_t yyscanner );
 
 yy_size_t quickstep_yyget_leng (yyscan_t yyscanner );
 
@@ -1179,11 +1187,11 @@ char *quickstep_yyget_text (yyscan_t yyscanner );
 
 int quickstep_yyget_lineno (yyscan_t yyscanner );
 
-void quickstep_yyset_lineno (int line_number ,yyscan_t yyscanner );
+void quickstep_yyset_lineno (int _line_number ,yyscan_t yyscanner );
 
 int quickstep_yyget_column  (yyscan_t yyscanner );
 
-void quickstep_yyset_column (int column_no ,yyscan_t yyscanner );
+void quickstep_yyset_column (int _column_no ,yyscan_t yyscanner );
 
 YYSTYPE * quickstep_yyget_lval (yyscan_t yyscanner );
 
@@ -1205,6 +1213,10 @@ extern int quickstep_yywrap (yyscan_t yyscanner );
 #endif
 #endif
 
+#ifndef YY_NO_UNPUT
+    
+#endif
+
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);
 #endif
@@ -1319,7 +1331,7 @@ extern int quickstep_yylex \
 
 /* Code executed at the end of each rule. */
 #ifndef YY_BREAK
-#define YY_BREAK break;
+#define YY_BREAK /*LINTED*/break;
 #endif
 
 #define YY_RULE_SETUP \
@@ -1329,9 +1341,9 @@ extern int quickstep_yylex \
  */
 YY_DECL
 {
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
+	yy_state_type yy_current_state;
+	char *yy_cp, *yy_bp;
+	int yy_act;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
     yylval = yylval_param;
@@ -1365,12 +1377,12 @@ YY_DECL
 		}
 
 	{
-#line 130 "../SqlLexer.lpp"
+#line 131 "../SqlLexer.lpp"
 
 
-#line 1372 "SqlLexer_gen.cpp"
+#line 1384 "SqlLexer_gen.cpp"
 
-	while ( 1 )		/* loops until end-of-file is reached */
+	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
 		yy_cp = yyg->yy_c_buf_p;
 
@@ -1386,7 +1398,7 @@ YY_DECL
 yy_match:
 		do
 			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
+			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
 			if ( yy_accept[yy_current_state] )
 				{
 				yyg->yy_last_accepting_state = yy_current_state;
@@ -1395,13 +1407,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 >= 588 )
+				if ( yy_current_state >= 593 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
-		while ( yy_current_state != 587 );
+		while ( yy_current_state != 592 );
 		yy_cp = yyg->yy_last_accepting_cpos;
 		yy_current_state = yyg->yy_last_accepting_state;
 
@@ -1435,7 +1447,7 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 133 "../SqlLexer.lpp"
+#line 134 "../SqlLexer.lpp"
 {
     /* A forward slash character represents a system command. */
     BEGIN(CONDITION_COMMAND);
@@ -1447,7 +1459,7 @@ YY_RULE_SETUP
 case 2:
 /* rule 2 can match eol */
 YY_RULE_SETUP
-#line 141 "../SqlLexer.lpp"
+#line 142 "../SqlLexer.lpp"
 {
     /* This is a SQL command. Place the char back and process normally. */
     yyless(0);
@@ -1459,7 +1471,7 @@ YY_RULE_SETUP
 
 case 3:
 YY_RULE_SETUP
-#line 150 "../SqlLexer.lpp"
+#line 151 "../SqlLexer.lpp"
 {
     /* This is a command argument. */
     yylval->string_value_ = new quickstep::ParseString(
@@ -1469,7 +1481,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 157 "../SqlLexer.lpp"
+#line 158 "../SqlLexer.lpp"
 {
     /* Ignore whitespace. */
   }
@@ -1477,7 +1489,7 @@ YY_RULE_SETUP
 case 5:
 /* rule 5 can match eol */
 YY_RULE_SETUP
-#line 161 "../SqlLexer.lpp"
+#line 162 "../SqlLexer.lpp"
 {
     /* Newline reverts the lexer to the initial state. */
     yycolumn = 0;
@@ -1489,667 +1501,672 @@ YY_RULE_SETUP
 
 case 6:
 YY_RULE_SETUP
-#line 170 "../SqlLexer.lpp"
+#line 171 "../SqlLexer.lpp"
 return TOKEN_ADD;
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 171 "../SqlLexer.lpp"
+#line 172 "../SqlLexer.lpp"
 return TOKEN_ALL;
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 172 "../SqlLexer.lpp"
+#line 173 "../SqlLexer.lpp"
 return TOKEN_ALTER;
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 173 "../SqlLexer.lpp"
+#line 174 "../SqlLexer.lpp"
 return TOKEN_AND;
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 174 "../SqlLexer.lpp"
+#line 175 "../SqlLexer.lpp"
 return TOKEN_AS;
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 175 "../SqlLexer.lpp"
+#line 176 "../SqlLexer.lpp"
 return TOKEN_ASC;
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 176 "../SqlLexer.lpp"
+#line 177 "../SqlLexer.lpp"
 return TOKEN_ASC;
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 177 "../SqlLexer.lpp"
+#line 178 "../SqlLexer.lpp"
 return TOKEN_BETWEEN;
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 178 "../SqlLexer.lpp"
+#line 179 "../SqlLexer.lpp"
 return TOKEN_BIGINT;
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 179 "../SqlLexer.lpp"
+#line 180 "../SqlLexer.lpp"
 return TOKEN_BIT;
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 180 "../SqlLexer.lpp"
+#line 181 "../SqlLexer.lpp"
 return TOKEN_BITWEAVING;
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 181 "../SqlLexer.lpp"
+#line 182 "../SqlLexer.lpp"
 return TOKEN_BLOCKPROPERTIES;
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 182 "../SqlLexer.lpp"
+#line 183 "../SqlLexer.lpp"
 return TOKEN_BLOCKSAMPLE;
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 183 "../SqlLexer.lpp"
+#line 184 "../SqlLexer.lpp"
 return TOKEN_BLOOM_FILTER;
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 184 "../SqlLexer.lpp"
+#line 185 "../SqlLexer.lpp"
 return TOKEN_CASE;
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 185 "../SqlLexer.lpp"
+#line 186 "../SqlLexer.lpp"
 return TOKEN_CSB_TREE;
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 186 "../SqlLexer.lpp"
+#line 187 "../SqlLexer.lpp"
 return TOKEN_BY;
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 187 "../SqlLexer.lpp"
+#line 188 "../SqlLexer.lpp"
 return TOKEN_CHARACTER;
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 188 "../SqlLexer.lpp"
+#line 189 "../SqlLexer.lpp"
 return TOKEN_CHARACTER;
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 189 "../SqlLexer.lpp"
+#line 190 "../SqlLexer.lpp"
 return TOKEN_CHECK;
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 190 "../SqlLexer.lpp"
+#line 191 "../SqlLexer.lpp"
 return TOKEN_COLUMN;
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 191 "../SqlLexer.lpp"
+#line 192 "../SqlLexer.lpp"
 return TOKEN_CONSTRAINT;
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 192 "../SqlLexer.lpp"
+#line 193 "../SqlLexer.lpp"
 return TOKEN_COPY;
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 193 "../SqlLexer.lpp"
+#line 194 "../SqlLexer.lpp"
 return TOKEN_CREATE;
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 194 "../SqlLexer.lpp"
+#line 195 "../SqlLexer.lpp"
 return TOKEN_CURRENT;
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 195 "../SqlLexer.lpp"
+#line 196 "../SqlLexer.lpp"
 return TOKEN_DATE;
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 196 "../SqlLexer.lpp"
+#line 197 "../SqlLexer.lpp"
 return TOKEN_DATETIME;
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 197 "../SqlLexer.lpp"
+#line 198 "../SqlLexer.lpp"
 return TOKEN_DAY;
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 198 "../SqlLexer.lpp"
+#line 199 "../SqlLexer.lpp"
 return TOKEN_DECIMAL;
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 199 "../SqlLexer.lpp"
+#line 200 "../SqlLexer.lpp"
 return TOKEN_DEFAULT;
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 200 "../SqlLexer.lpp"
+#line 201 "../SqlLexer.lpp"
 return TOKEN_DELETE;
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 201 "../SqlLexer.lpp"
+#line 202 "../SqlLexer.lpp"
 return TOKEN_DELIMITER;
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 202 "../SqlLexer.lpp"
+#line 203 "../SqlLexer.lpp"
 return TOKEN_DESC;
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 203 "../SqlLexer.lpp"
+#line 204 "../SqlLexer.lpp"
 return TOKEN_DESC;
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 204 "../SqlLexer.lpp"
+#line 205 "../SqlLexer.lpp"
 return TOKEN_DISTINCT;
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 205 "../SqlLexer.lpp"
+#line 206 "../SqlLexer.lpp"
 return TOKEN_DOUBLE;
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 206 "../SqlLexer.lpp"
+#line 207 "../SqlLexer.lpp"
 return TOKEN_DROP;
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 207 "../SqlLexer.lpp"
+#line 208 "../SqlLexer.lpp"
 return TOKEN_ELSE;
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 208 "../SqlLexer.lpp"
+#line 209 "../SqlLexer.lpp"
 return TOKEN_END;
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 209 "../SqlLexer.lpp"
+#line 210 "../SqlLexer.lpp"
 return TOKEN_ESCAPE_STRINGS;
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 210 "../SqlLexer.lpp"
+#line 211 "../SqlLexer.lpp"
 return TOKEN_EXISTS;
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 211 "../SqlLexer.lpp"
+#line 212 "../SqlLexer.lpp"
 return TOKEN_EXTRACT;
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 212 "../SqlLexer.lpp"
+#line 213 "../SqlLexer.lpp"
 return TOKEN_FALSE;
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 213 "../SqlLexer.lpp"
+#line 214 "../SqlLexer.lpp"
 return TOKEN_FIRST;
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 214 "../SqlLexer.lpp"
+#line 215 "../SqlLexer.lpp"
 return TOKEN_FLOAT;
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 215 "../SqlLexer.lpp"
+#line 216 "../SqlLexer.lpp"
 return TOKEN_FOLLOWING;
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 216 "../SqlLexer.lpp"
+#line 217 "../SqlLexer.lpp"
 return TOKEN_FOR;
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 217 "../SqlLexer.lpp"
+#line 218 "../SqlLexer.lpp"
 return TOKEN_FOREIGN;
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 218 "../SqlLexer.lpp"
+#line 219 "../SqlLexer.lpp"
 return TOKEN_FROM;
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 219 "../SqlLexer.lpp"
+#line 220 "../SqlLexer.lpp"
 return TOKEN_FULL;
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 220 "../SqlLexer.lpp"
+#line 221 "../SqlLexer.lpp"
 return TOKEN_GROUP;
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 221 "../SqlLexer.lpp"
+#line 222 "../SqlLexer.lpp"
 return TOKEN_HASH;
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 222 "../SqlLexer.lpp"
+#line 223 "../SqlLexer.lpp"
 return TOKEN_HAVING;
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 223 "../SqlLexer.lpp"
+#line 224 "../SqlLexer.lpp"
 return TOKEN_HOUR;
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 224 "../SqlLexer.lpp"
+#line 225 "../SqlLexer.lpp"
 return TOKEN_IN;
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 225 "../SqlLexer.lpp"
+#line 226 "../SqlLexer.lpp"
 return TOKEN_INDEX;
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 226 "../SqlLexer.lpp"
+#line 227 "../SqlLexer.lpp"
 return TOKEN_INNER;
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 227 "../SqlLexer.lpp"
+#line 228 "../SqlLexer.lpp"
 return TOKEN_INSERT;
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 228 "../SqlLexer.lpp"
+#line 229 "../SqlLexer.lpp"
 return TOKEN_INTEGER;
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 229 "../SqlLexer.lpp"
+#line 230 "../SqlLexer.lpp"
 return TOKEN_INTEGER;
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 230 "../SqlLexer.lpp"
+#line 231 "../SqlLexer.lpp"
 return TOKEN_INTERVAL;
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 231 "../SqlLexer.lpp"
+#line 232 "../SqlLexer.lpp"
 return TOKEN_INTO;
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 232 "../SqlLexer.lpp"
+#line 233 "../SqlLexer.lpp"
 return TOKEN_IS;
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 233 "../SqlLexer.lpp"
+#line 234 "../SqlLexer.lpp"
 return TOKEN_JOIN;
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 234 "../SqlLexer.lpp"
+#line 235 "../SqlLexer.lpp"
 return TOKEN_KEY;
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 235 "../SqlLexer.lpp"
+#line 236 "../SqlLexer.lpp"
 return TOKEN_LAST;
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 236 "../SqlLexer.lpp"
+#line 237 "../SqlLexer.lpp"
 return TOKEN_LEFT;
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 237 "../SqlLexer.lpp"
+#line 238 "../SqlLexer.lpp"
 return TOKEN_LIKE;
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 238 "../SqlLexer.lpp"
+#line 239 "../SqlLexer.lpp"
 return TOKEN_LIMIT;
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 239 "../SqlLexer.lpp"
+#line 240 "../SqlLexer.lpp"
 return TOKEN_LONG;
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 240 "../SqlLexer.lpp"
+#line 241 "../SqlLexer.lpp"
 return TOKEN_MINUTE;
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 241 "../SqlLexer.lpp"
+#line 242 "../SqlLexer.lpp"
 return TOKEN_MONTH;
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 242 "../SqlLexer.lpp"
+#line 243 "../SqlLexer.lpp"
 return TOKEN_NOT;
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 243 "../SqlLexer.lpp"
+#line 244 "../SqlLexer.lpp"
 return TOKEN_NULL;
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 244 "../SqlLexer.lpp"
+#line 245 "../SqlLexer.lpp"
 return TOKEN_NULLS;
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 245 "../SqlLexer.lpp"
+#line 246 "../SqlLexer.lpp"
 return TOKEN_OFF;
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 246 "../SqlLexer.lpp"
+#line 247 "../SqlLexer.lpp"
 return TOKEN_ON;
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 247 "../SqlLexer.lpp"
+#line 248 "../SqlLexer.lpp"
 return TOKEN_OR;
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 248 "../SqlLexer.lpp"
+#line 249 "../SqlLexer.lpp"
 return TOKEN_ORDER;
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 249 "../SqlLexer.lpp"
+#line 250 "../SqlLexer.lpp"
 return TOKEN_OUTER;
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 250 "../SqlLexer.lpp"
+#line 251 "../SqlLexer.lpp"
 return TOKEN_OVER;
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 251 "../SqlLexer.lpp"
+#line 252 "../SqlLexer.lpp"
 return TOKEN_PARTITION;
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 252 "../SqlLexer.lpp"
+#line 253 "../SqlLexer.lpp"
 return TOKEN_PARTITIONS;
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 253 "../SqlLexer.lpp"
+#line 254 "../SqlLexer.lpp"
 return TOKEN_PERCENT;
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 254 "../SqlLexer.lpp"
+#line 255 "../SqlLexer.lpp"
 return TOKEN_PRECEDING;
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 255 "../SqlLexer.lpp"
+#line 256 "../SqlLexer.lpp"
 return TOKEN_PRIMARY;
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 256 "../SqlLexer.lpp"
-return TOKEN_QUIT;
+#line 257 "../SqlLexer.lpp"
+return TOKEN_PRIORITY;
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 257 "../SqlLexer.lpp"
-return TOKEN_RANGE;
+#line 258 "../SqlLexer.lpp"
+return TOKEN_QUIT;
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 258 "../SqlLexer.lpp"
-return TOKEN_REAL;
+#line 259 "../SqlLexer.lpp"
+return TOKEN_RANGE;
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 259 "../SqlLexer.lpp"
-return TOKEN_REFERENCES;
+#line 260 "../SqlLexer.lpp"
+return TOKEN_REAL;
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 260 "../SqlLexer.lpp"
-return TOKEN_REGEXP;
+#line 261 "../SqlLexer.lpp"
+return TOKEN_REFERENCES;
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 261 "../SqlLexer.lpp"
-return TOKEN_RIGHT;
+#line 262 "../SqlLexer.lpp"
+return TOKEN_REGEXP;
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 262 "../SqlLexer.lpp"
-return TOKEN_ROW;
+#line 263 "../SqlLexer.lpp"
+return TOKEN_RIGHT;
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 263 "../SqlLexer.lpp"
-return TOKEN_ROW_DELIMITER;
+#line 264 "../SqlLexer.lpp"
+return TOKEN_ROW;
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 264 "../SqlLexer.lpp"
-return TOKEN_ROWS;
+#line 265 "../SqlLexer.lpp"
+return TOKEN_ROW_DELIMITER;
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 265 "../SqlLexer.lpp"
-return TOKEN_SECOND;
+#line 266 "../SqlLexer.lpp"
+return TOKEN_ROWS;
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 266 "../SqlLexer.lpp"
-return TOKEN_SELECT;
+#line 267 "../SqlLexer.lpp"
+return TOKEN_SECOND;
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 267 "../SqlLexer.lpp"
-return TOKEN_SET;
+#line 268 "../SqlLexer.lpp"
+return TOKEN_SELECT;
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 268 "../SqlLexer.lpp"
-return TOKEN_SMA;
+#line 269 "../SqlLexer.lpp"
+return TOKEN_SET;
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 269 "../SqlLexer.lpp"
-return TOKEN_SMALLINT;
+#line 270 "../SqlLexer.lpp"
+return TOKEN_SMA;
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 270 "../SqlLexer.lpp"
-return TOKEN_SUBSTRING;
+#line 271 "../SqlLexer.lpp"
+return TOKEN_SMALLINT;
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 271 "../SqlLexer.lpp"
-return TOKEN_TABLE;
+#line 272 "../SqlLexer.lpp"
+return TOKEN_SUBSTRING;
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 272 "../SqlLexer.lpp"
-return TOKEN_THEN;
+#line 273 "../SqlLexer.lpp"
+return TOKEN_TABLE;
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 273 "../SqlLexer.lpp"
-return TOKEN_TIME;
+#line 274 "../SqlLexer.lpp"
+return TOKEN_THEN;
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 274 "../SqlLexer.lpp"
-return TOKEN_TIMESTAMP;
+#line 275 "../SqlLexer.lpp"
+return TOKEN_TIME;
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 275 "../SqlLexer.lpp"
-return TOKEN_TRUE;
+#line 276 "../SqlLexer.lpp"
+return TOKEN_TIMESTAMP;
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 276 "../SqlLexer.lpp"
-return TOKEN_TUPLESAMPLE;
+#line 277 "../SqlLexer.lpp"
+return TOKEN_TRUE;
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 277 "../SqlLexer.lpp"
-return TOKEN_UNBOUNDED;
+#line 278 "../SqlLexer.lpp"
+return TOKEN_TUPLESAMPLE;
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 278 "../SqlLexer.lpp"
-return TOKEN_UNIQUE;
+#line 279 "../SqlLexer.lpp"
+return TOKEN_UNBOUNDED;
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 279 "../SqlLexer.lpp"
-return TOKEN_UPDATE;
+#line 280 "../SqlLexer.lpp"
+return TOKEN_UNIQUE;
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 280 "../SqlLexer.lpp"
-return TOKEN_USING;
+#line 281 "../SqlLexer.lpp"
+return TOKEN_UPDATE;
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 281 "../SqlLexer.lpp"
-return TOKEN_VALUES;
+#line 282 "../SqlLexer.lpp"
+return TOKEN_USING;
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 282 "../SqlLexer.lpp"
-return TOKEN_VARCHAR;
+#line 283 "../SqlLexer.lpp"
+return TOKEN_VALUES;
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 283 "../SqlLexer.lpp"
-return TOKEN_WHEN;
+#line 284 "../SqlLexer.lpp"
+return TOKEN_VARCHAR;
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 284 "../SqlLexer.lpp"
-return TOKEN_WHERE;
+#line 285 "../SqlLexer.lpp"
+return TOKEN_WHEN;
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 285 "../SqlLexer.lpp"
-return TOKEN_WINDOW;
+#line 286 "../SqlLexer.lpp"
+return TOKEN_WHERE;
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 286 "../SqlLexer.lpp"
-return TOKEN_WITH;
+#line 287 "../SqlLexer.lpp"
+return TOKEN_WINDOW;
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 287 "../SqlLexer.lpp"
-return TOKEN_YEAR;
+#line 288 "../SqlLexer.lpp"
+return TOKEN_WITH;
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 288 "../SqlLexer.lpp"
-return TOKEN_YEARMONTH;
+#line 289 "../SqlLexer.lpp"
+return TOKEN_YEAR;
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
 #line 290 "../SqlLexer.lpp"
-return TOKEN_EQ;
+return TOKEN_YEARMONTH;
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 291 "../SqlLexer.lpp"
-return TOKEN_NEQ;
+#line 292 "../SqlLexer.lpp"
+return TOKEN_EQ;
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 292 "../SqlLexer.lpp"
+#line 293 "../SqlLexer.lpp"
 return TOKEN_NEQ;
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 293 "../SqlLexer.lpp"
-return TOKEN_LT;
+#line 294 "../SqlLexer.lpp"
+return TOKEN_NEQ;
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 294 "../SqlLexer.lpp"
-return TOKEN_GT;
+#line 295 "../SqlLexer.lpp"
+return TOKEN_LT;
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 295 "../SqlLexer.lpp"
-return TOKEN_LEQ;
+#line 296 "../SqlLexer.lpp"
+return TOKEN_GT;
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 296 "../SqlLexer.lpp"
-return TOKEN_GEQ;
+#line 297 "../SqlLexer.lpp"
+return TOKEN_LEQ;
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
 #line 298 "../SqlLexer.lpp"
-return yytext[0];
+return TOKEN_GEQ;
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
-#line 299 "../SqlLexer.lpp"
+#line 300 "../SqlLexer.lpp"
+return yytext[0];
+	YY_BREAK
+case 134:
+YY_RULE_SETUP
+#line 301 "../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 134:
+case 135:
 YY_RULE_SETUP
-#line 305 "../SqlLexer.lpp"
+#line 307 "../SqlLexer.lpp"
 {
     yylval->string_value_ = new quickstep::ParseString(yylloc->first_line, yylloc->first_column);
     BEGIN(CONDITION_STRING_SINGLE_QUOTED_ESCAPED);
   }
 	YY_BREAK
-case 135:
+case 136:
 YY_RULE_SETUP
-#line 310 "../SqlLexer.lpp"
+#line 312 "../SqlLexer.lpp"
 {
     yylval->string_value_ = new quickstep::ParseString(yylloc->first_line, yylloc->first_column);
     BEGIN(CONDITION_STRING_SINGLE_QUOTED);
   }
 	YY_BREAK
-case 136:
+case 137:
 YY_RULE_SETUP
-#line 315 "../SqlLexer.lpp"
+#line 317 "../SqlLexer.lpp"
 {
     yylval->string_value_ = new quickstep::ParseString(yylloc->first_line, yylloc->first_column);
     BEGIN(CONDITION_STRING_DOUBLE_QUOTED);
@@ -2161,7 +2178,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 324 "../SqlLexer.lpp"
+#line 326 "../SqlLexer.lpp"
 {
     delete yylval->string_value_;
     BEGIN(INITIAL);
@@ -2172,9 +2189,9 @@ case YY_STATE_EOF(CONDITION_STRING_DOUBLE_QUOTED):
 
 /* Process escape sequences. */
 
-case 137:
+case 138:
 YY_RULE_SETUP
-#line 334 "../SqlLexer.lpp"
+#line 336 "../SqlLexer.lpp"
 {
     /* Octal code */
     unsigned int code;
@@ -2188,9 +2205,9 @@ YY_RULE_SETUP
     yylval->string_value_->push_back(code);
   }
 	YY_BREAK
-case 138:
+case 139:
 YY_RULE_SETUP
-#line 346 "../SqlLexer.lpp"
+#line 348 "../SqlLexer.lpp"
 {
     /* Hexadecimal code */
     unsigned int code;
@@ -2198,9 +2215,9 @@ YY_RULE_SETUP
     yylval->string_value_->push_back(code);
   }
 	YY_BREAK
-case 139:
+case 140:
 YY_RULE_SETUP
-#line 352 "../SqlLexer.lpp"
+#line 354 "../SqlLexer.lpp"
 {
     /* A numeric escape sequence that isn't correctly specified. */
     delete yylval->string_value_;
@@ -2209,58 +2226,58 @@ YY_RULE_SETUP
     return TOKEN_LEX_ERROR;
   }
 	YY_BREAK
-case 140:
+case 141:
 YY_RULE_SETUP
-#line 359 "../SqlLexer.lpp"
+#line 361 "../SqlLexer.lpp"
 {
     /* Backspace */
     yylval->string_value_->push_back('\b');
   }
 	YY_BREAK
-case 141:
+case 142:
 YY_RULE_SETUP
-#line 363 "../SqlLexer.lpp"
+#line 365 "../SqlLexer.lpp"
 {
     /* Form-feed */
     yylval->string_value_->push_back('\f');
   }
 	YY_BREAK
-case 142:
+case 143:
 YY_RULE_SETUP
-#line 367 "../SqlLexer.lpp"
+#line 369 "../SqlLexer.lpp"
 {
     /* Newline */
     yylval->string_value_->push_back('\n');
   }
 	YY_BREAK
-case 143:
+case 144:
 YY_RULE_SETUP
-#line 371 "../SqlLexer.lpp"
+#line 373 "../SqlLexer.lpp"
 {
     /* Carriage-return */
     yylval->string_value_->push_back('\r');
   }
 	YY_BREAK
-case 144:
+case 145:
 YY_RULE_SETUP
-#line 375 "../SqlLexer.lpp"
+#line 377 "../SqlLexer.lpp"
 {
     /* Horizontal Tab */
     yylval->string_value_->push_back('\t');
   }
 	YY_BREAK
-case 145:
-/* rule 145 can match eol */
+case 146:
+/* rule 146 can match eol */
 YY_RULE_SETUP
-#line 379 "../SqlLexer.lpp"
+#line 381 "../SqlLexer.lpp"
 {
     /* Any other character (including actual newline or carriage return) */
     yylval->string_value_->push_back(yytext[1]);
   }
 	YY_BREAK
-case 146:
+case 147:
 YY_RULE_SETUP
-#line 383 "../SqlLexer.lpp"
+#line 385 "../SqlLexer.lpp"
 {
     /* This should only be encountered right before an EOF. */
     delete yylval->string_value_;
@@ -2271,17 +2288,17 @@ YY_RULE_SETUP
 	YY_BREAK
 
 
-case 147:
+case 148:
 YY_RULE_SETUP
-#line 393 "../SqlLexer.lpp"
+#line 395 "../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 148:
+case 149:
 YY_RULE_SETUP
-#line 397 "../SqlLexer.lpp"
+#line 399 "../SqlLexer.lpp"
 {
     /* End string */
     BEGIN(CONDITION_SQL);
@@ -2290,17 +2307,17 @@ YY_RULE_SETUP
 	YY_BREAK
 
 
-case 149:
+case 150:
 YY_RULE_SETUP
-#line 405 "../SqlLexer.lpp"
+#line 407 "../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 150:
+case 151:
 YY_RULE_SETUP
-#line 409 "../SqlLexer.lpp"
+#line 411 "../SqlLexer.lpp"
 {
     /* End string */
     BEGIN(CONDITION_SQL);
@@ -2308,94 +2325,94 @@ YY_RULE_SETUP
   }
 	YY_BREAK
 
-case 151:
-/* rule 151 can match eol */
+case 152:
+/* rule 152 can match eol */
 YY_RULE_SETUP
-#line 416 "../SqlLexer.lpp"
+#line 418 "../SqlLexer.lpp"
 {
   /* Scan up to a quote. */
   yylval->string_value_->append(yytext, yyleng);
 }
 	YY_BREAK
-case 152:
-/* rule 152 can match eol */
+case 153:
+/* rule 153 can match eol */
 YY_RULE_SETUP
-#line 421 "../SqlLexer.lpp"
+#line 423 "../SqlLexer.lpp"
 {
   /* Scan up to a quote or escape sequence. */
   yylval->string_value_->append(yytext, yyleng);
 }
 	YY_BREAK
-case 153:
-/* rule 153 can match eol */
+case 154:
+/* rule 154 can match eol */
 YY_RULE_SETUP
-#line 426 "../SqlLexer.lpp"
+#line 428 "../SqlLexer.lpp"
 {
   /* Scan up to a quote. */
   yylval->string_value_->append(yytext, yyleng);
 }
 	YY_BREAK
 
-case 154:
+case 155:
 YY_RULE_SETUP
-#line 432 "../SqlLexer.lpp"
+#line 434 "../SqlLexer.lpp"
 {
     yylval->string_value_ = new quickstep::ParseString(
         yylloc->first_line, yylloc->first_column, std::string(yytext, yyleng));
     return TOKEN_NAME;
   }
 	YY_BREAK
-case 155:
+case 156:
 YY_RULE_SETUP
-#line 438 "../SqlLexer.lpp"
+#line 440 "../SqlLexer.lpp"
 {
     yylval->numeric_literal_value_ = new quickstep::NumericParseLiteralValue(
         yylloc->first_line, yylloc->first_column, yytext);
     return TOKEN_UNSIGNED_NUMVAL;
   }
 	YY_BREAK
-case 156:
-YY_RULE_SETUP
-#line 444 "../SqlLexer.lpp"
-/* comment */
-	YY_BREAK
 case 157:
-/* rule 157 can match eol */
 YY_RULE_SETUP
 #line 446 "../SqlLexer.lpp"
-{ yycolumn = 0; }
+/* comment */
 	YY_BREAK
 case 158:
+/* rule 158 can match eol */
 YY_RULE_SETUP
 #line 448 "../SqlLexer.lpp"
+{ yycolumn = 0; }
+	YY_BREAK
+case 159:
+YY_RULE_SETUP
+#line 450 "../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 452 "../SqlLexer.lpp"
+#line 454 "../SqlLexer.lpp"
 {
   /* All conditions except for mutli-state string extracting conditions. */
   BEGIN(INITIAL);
   return TOKEN_EOF;
 }
 	YY_BREAK
-case 159:
+case 160:
 YY_RULE_SETUP
-#line 458 "../SqlLexer.lpp"
+#line 460 "../SqlLexer.lpp"
 {
   BEGIN(INITIAL);
   quickstep_yyerror(NULL, yyscanner, NULL, "illegal character");
   return TOKEN_LEX_ERROR;
 }
 	YY_BREAK
-case 160:
+case 161:
 YY_RULE_SETUP
-#line 464 "../SqlLexer.lpp"
+#line 466 "../SqlLexer.lpp"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 2399 "SqlLexer_gen.cpp"
+#line 2416 "SqlLexer_gen.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2538,9 +2555,9 @@ YY_FATAL_ERROR( "flex scanner jammed" );
 static int yy_get_next_buffer (yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = yyg->yytext_ptr;
-	register int number_to_move, i;
+	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	char *source = yyg->yytext_ptr;
+	yy_size_t number_to_move, i;
 	int ret_val;
 
 	if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] )
@@ -2569,7 +2586,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 	/* Try to read more data. */
 
 	/* First move last chars to start of buffer. */
-	number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1;
+	number_to_move = (yy_size_t) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1;
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
@@ -2672,15 +2689,15 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 
     static yy_state_type yy_get_previous_state (yyscan_t yyscanner)
 {
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
+	yy_state_type yy_current_state;
+	char *yy_cp;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
 	yy_current_state = yyg->yy_start;
 
 	for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp )
 		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
 		if ( yy_accept[yy_current_state] )
 			{
 			yyg->yy_last_accepting_state = yy_current_state;
@@ -2689,7 +2706,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 >= 588 )
+			if ( yy_current_state >= 593 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2705,11 +2722,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
  */
     static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state , yyscan_t yyscanner)
 {
-	register int yy_is_jam;
+	int yy_is_jam;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */
-	register char *yy_cp = yyg->yy_c_buf_p;
+	char *yy_cp = yyg->yy_c_buf_p;
 
-	register YY_CHAR yy_c = 1;
+	YY_CHAR yy_c = 1;
 	if ( yy_accept[yy_current_state] )
 		{
 		yyg->yy_last_accepting_state = yy_current_state;
@@ -2718,16 +2735,20 @@ 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 >= 588 )
+		if ( yy_current_state >= 593 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 587);
+	yy_is_jam = (yy_current_state == 592);
 
 	(void)yyg;
 	return yy_is_jam ? 0 : yy_current_state;
 }
 
+#ifndef YY_NO_UNPUT
+
+#endif
+
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
     static int yyinput (yyscan_t yyscanner)
@@ -2888,7 +2909,7 @@ static void quickstep_yy_load_buffer_state  (yyscan_t yyscanner)
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in quickstep_yy_create_buffer()" );
 
-	b->yy_buf_size = size;
+	b->yy_buf_size = (yy_size_t)size;
 
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
@@ -3049,7 +3070,7 @@ static void quickstep_yyensure_buffer_stack (yyscan_t yyscanner)
 		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
 		 * immediate realloc on the next call.
          */
-		num_to_alloc = 1;
+		num_to_alloc = 1; // After all that talk, this was set to 1 anyways...
 		yyg->yy_buffer_stack = (struct yy_buffer_state**)quickstep_yyalloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								, yyscanner);
@@ -3066,7 +3087,7 @@ static void quickstep_yyensure_buffer_stack (yyscan_t yyscanner)
 	if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){
 
 		/* Increase the buffer to prepare for a possible push. */
-		int grow_size = 8 /* arbitrary grow size */;
+		yy_size_t grow_size = 8 /* arbitrary grow size */;
 
 		num_to_alloc = yyg->yy_buffer_stack_max + grow_size;
 		yyg->yy_buffer_stack = (struct yy_buffer_state**)quickstep_yyrealloc
@@ -3174,7 +3195,9 @@ YY_BUFFER_STATE quickstep_yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yy
 
 static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner)
 {
-    	(void) fprintf( stderr, "%s\n", msg );
+	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	(void)yyg;
+	(void) fprintf( stderr, "%s\n", msg );
 	exit( YY_EXIT_FAILURE );
 }
 
@@ -3280,10 +3303,10 @@ void quickstep_yyset_extra (YY_EXTRA_TYPE  user_defined , yyscan_t yyscanner)
 }
 
 /** Set the current line number.
- * @param line_number
+ * @param _line_number line number
  * @param yyscanner The scanner object.
  */
-void quickstep_yyset_lineno (int  line_number , yyscan_t yyscanner)
+void quickstep_yyset_lineno (int  _line_number , yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
@@ -3291,14 +3314,14 @@ void quickstep_yyset_lineno (int  line_number , yyscan_t yyscanner)
         if (! YY_CURRENT_BUFFER )
            YY_FATAL_ERROR( "quickstep_yyset_lineno called with no buffer" );
     
-    yylineno = line_number;
+    yylineno = _line_number;
 }
 
 /** Set the current column.
- * @param line_number
+ * @param _column_no column number
  * @param yyscanner The scanner object.
  */
-void quickstep_yyset_column (int  column_no , yyscan_t yyscanner)
+void quickstep_yyset_column (int  _column_no , yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
@@ -3306,25 +3329,25 @@ void quickstep_yyset_column (int  column_no , yyscan_t yyscanner)
         if (! YY_CURRENT_BUFFER )
            YY_FATAL_ERROR( "quickstep_yyset_column called with no buffer" );
     
-    yycolumn = column_no;
+    yycolumn = _column_no;
 }
 
 /** Set the input stream. This does not discard the current
  * input buffer.
- * @param in_str A readable stream.
+ * @param _in_str A readable stream.
  * @param yyscanner The scanner object.
  * @see quickstep_yy_switch_to_buffer
  */
-void quickstep_yyset_in (FILE *  in_str , yyscan_t yyscanner)
+void quickstep_yyset_in (FILE *  _in_str , yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    yyin = in_str ;
+    yyin = _in_str ;
 }
 
-void quickstep_yyset_out (FILE *  out_str , yyscan_t yyscanner)
+void quickstep_yyset_out (FILE *  _out_str , yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    yyout = out_str ;
+    yyout = _out_str ;
 }
 
 int quickstep_yyget_debug  (yyscan_t yyscanner)
@@ -3333,10 +3356,10 @@ int quickstep_yyget_debug  (yyscan_t yyscanner)
     return yy_flex_debug;
 }
 
-void quickstep_yyset_debug (int  bdebug , yyscan_t yyscanner)
+void quickstep_yyset_debug (int  _bdebug , yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    yy_flex_debug = bdebug ;
+    yy_flex_debug = _bdebug ;
 }
 
 /* Accessor methods for yylval and yylloc */
@@ -3499,7 +3522,10 @@ int quickstep_yylex_destroy  (yyscan_t yyscanner)
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner)
 {
-	register int i;
+	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	(void)yyg;
+
+	int i;
 	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
 }
@@ -3508,7 +3534,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yysca
 #ifdef YY_NEED_STRLEN
 static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner)
 {
-	register int n;
+	int n;
 	for ( n = 0; s[n]; ++n )
 		;
 
@@ -3518,11 +3544,16 @@ static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner)
 
 void *quickstep_yyalloc (yy_size_t  size , yyscan_t yyscanner)
 {
+	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	(void)yyg;
 	return (void *) malloc( size );
 }
 
 void *quickstep_yyrealloc  (void * ptr, yy_size_t  size , yyscan_t yyscanner)
 {
+	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	(void)yyg;
+
 	/* The cast to (char *) in the following accommodates both
 	 * implementations that use char* generic pointers, and those
 	 * that use void* generic pointers.  It works with the latter
@@ -3535,12 +3566,14 @@ void *quickstep_yyrealloc  (void * ptr, yy_size_t  size , yyscan_t yyscanner)
 
 void quickstep_yyfree (void * ptr , yyscan_t yyscanner)
 {
+	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	(void)yyg;
 	free( (char *) ptr );	/* see quickstep_yyrealloc() for (char *) cast */
 }
 
 #define YYTABLES_NAME "yytables"
 
-#line 463 "../SqlLexer.lpp"
+#line 466 "../SqlLexer.lpp"
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d6428914/parser/preprocessed/SqlLexer_gen.hpp
----------------------------------------------------------------------
diff --git a/parser/preprocessed/SqlLexer_gen.hpp b/parser/preprocessed/SqlLexer_gen.hpp
index f6cd8ad..0dd70e4 100644
--- a/parser/preprocessed/SqlLexer_gen.hpp
+++ b/parser/preprocessed/SqlLexer_gen.hpp
@@ -12,8 +12,8 @@
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 39
+#define YY_FLEX_MINOR_VERSION 6
+#define YY_FLEX_SUBMINOR_VERSION 0
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -222,7 +222,7 @@ void quickstep_yyfree (void * ,yyscan_t yyscanner );
 
 /* Begin user sect3 */
 
-#define quickstep_yywrap(yyscanner) 1
+#define quickstep_yywrap(yyscanner) (/*CONSTCOND*/1)
 #define YY_SKIP_YYWRAP
 
 #define yytext_ptr yytext_r
@@ -268,11 +268,11 @@ void quickstep_yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );
 
 FILE *quickstep_yyget_in (yyscan_t yyscanner );
 
-void quickstep_yyset_in  (FILE * in_str ,yyscan_t yyscanner );
+void quickstep_yyset_in  (FILE * _in_str ,yyscan_t yyscanner );
 
 FILE *quickstep_yyget_out (yyscan_t yyscanner );
 
-void quickstep_yyset_out  (FILE * out_str ,yyscan_t yyscanner );
+void quickstep_yyset_out  (FILE * _out_str ,yyscan_t yyscanner );
 
 yy_size_t quickstep_yyget_leng (yyscan_t yyscanner );
 
@@ -280,11 +280,11 @@ char *quickstep_yyget_text (yyscan_t yyscanner );
 
 int quickstep_yyget_lineno (yyscan_t yyscanner );
 
-void quickstep_yyset_lineno (int line_number ,yyscan_t yyscanner );
+void quickstep_yyset_lineno (int _line_number ,yyscan_t yyscanner );
 
 int quickstep_yyget_column  (yyscan_t yyscanner );
 
-void quickstep_yyset_column (int column_no ,yyscan_t yyscanner );
+void quickstep_yyset_column (int _column_no ,yyscan_t yyscanner );
 
 YYSTYPE * quickstep_yyget_lval (yyscan_t yyscanner );
 
@@ -360,7 +360,7 @@ extern int quickstep_yylex \
 #undef YY_DECL
 #endif
 
-#line 463 "../SqlLexer.lpp"
+#line 466 "../SqlLexer.lpp"
 
 
 #line 367 "SqlLexer_gen.hpp"


Mime
View raw message