quickstep-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbdeshm...@apache.org
Subject [3/4] incubator-quickstep git commit: Added PRIORITY clause in parser.
Date Fri, 17 Jun 2016 21:03:22 GMT
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/604ed99b/parser/preprocessed/SqlLexer_gen.cpp
----------------------------------------------------------------------
diff --git a/parser/preprocessed/SqlLexer_gen.cpp b/parser/preprocessed/SqlLexer_gen.cpp
index db20491..a2cbea7 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 6
-#define YY_FLEX_SUBMINOR_VERSION 0
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 37
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -159,15 +159,7 @@ typedef void* yyscan_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
 #define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -202,13 +194,6 @@ typedef size_t yy_size_t;
                     if ( yytext[yyl] == '\n' )\
                         --yylineno;\
             }while(0)
-    #define YY_LINENO_REWIND_TO(dst) \
-            do {\
-                const char *p;\
-                for ( p = yy_cp-1; p >= (dst); --p)\
-                    if ( *p == '\n' )\
-                        --yylineno;\
-            }while(0)
     
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
@@ -354,7 +339,7 @@ void quickstep_yyfree (void * ,yyscan_t yyscanner );
 
 /* Begin user sect3 */
 
-#define quickstep_yywrap(yyscanner) (/*CONSTCOND*/1)
+#define quickstep_yywrap(yyscanner) 1
 #define YY_SKIP_YYWRAP
 
 typedef unsigned char YY_CHAR;
@@ -366,9 +351,6 @@ 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
@@ -381,8 +363,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 152
-#define YY_END_OF_BUFFER 153
+#define YY_NUM_RULES 153
+#define YY_END_OF_BUFFER 154
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -390,72 +372,72 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[553] =
+static yyconst flex_int16_t yy_accept[558] =
     {   0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  153,    2,    2,  151,  151,  150,  149,  151,
-      128,  124,  127,  124,  124,  147,  120,  117,  121,  146,
-      146,  146,  146,  146,  146,  146,  146,  146,  146,  146,
-      146,  146,  146,  146,  146,  146,  146,  146,  146,  146,
-      146,  146,  146,  146,  125,    4,    5,    5,    3,  143,
-      143,  140,  144,  144,  138,  145,  145,  142,    1,  150,
-      118,  148,  147,  147,  147,    0,  122,  119,  123,  146,
-      146,  146,  146,   10,  146,  146,  146,   22,  146,  146,
-      146,  146,  146,  146,  146,  146,  146,  146,  126,  146,
-
-      146,  146,  146,  146,  146,  146,  146,  146,  146,  146,
-      146,  146,   58,   66,  146,  146,  146,  146,  146,  146,
-      146,  146,  146,  146,  146,   80,   81,  146,  146,  146,
-      146,  146,  146,  146,  146,  146,  146,  146,  146,  146,
-      146,  146,  146,  146,  146,  146,  146,  146,  146,  146,
-      146,    4,    5,    3,  143,  139,  144,  137,  137,  129,
-      131,  132,  133,  134,  135,  136,  137,  145,  141,  148,
-      147,    0,  147,    6,    7,  146,    9,   11,  146,  146,
-       15,  146,  146,  146,  146,  146,  146,  146,  146,  146,
-      146,   32,  146,  146,  146,  146,  146,  146,  146,  146,
-
-       43,  146,  146,  146,  146,  146,  146,   50,  146,  146,
-      146,  146,  146,  146,  146,  146,  146,   62,  146,   68,
-      146,  146,  146,  146,  146,  146,  146,   76,  146,   79,
-      146,  146,  146,  146,  146,  146,  146,  146,  146,  146,
-      146,  146,  146,  146,   97,   98,  146,  146,  146,  146,
-      146,  146,  146,  146,  146,  146,  146,  146,  146,  146,
-      129,  131,  130,  146,  146,  146,  146,  146,  146,  146,
-       20,   23,  146,  146,  146,   28,  146,  146,   30,  146,
-      146,  146,  146,   37,  146,  146,   41,   42,  146,  146,
-      146,  146,  146,  146,  146,   52,   53,  146,   55,  146,
-
-       57,  146,  146,  146,  146,   65,   67,   69,   70,   71,
-      146,   73,  146,  146,   77,  146,  146,  146,  146,  146,
-       88,  146,   90,  146,  146,  146,  146,  146,  146,  146,
-      146,  146,  102,  103,  105,  146,  146,  146,  146,  146,
-      146,  112,  146,  114,  115,  129,  130,    8,  146,  146,
-      146,  146,  146,  146,  146,   25,  146,  146,  146,  146,
-      146,  146,  146,  146,  146,  146,  146,  146,  146,  146,
-      146,   47,   48,   49,  146,   54,  146,   59,   60,  146,
-      146,  146,   72,  146,   75,   78,   82,   83,  146,  146,
-      146,   89,  146,  146,   93,  146,  146,  146,  146,  146,
-
-      101,  146,  146,  146,  146,  109,  146,  146,  113,  146,
-      146,  146,   14,  146,  146,  146,  146,  146,   26,  146,
-       29,  146,  146,  146,  146,   35,  146,  146,  146,   40,
-      146,   45,  146,  146,   56,   61,  146,  146,   74,  146,
-      146,  146,  146,   92,  146,   95,   96,  146,  146,  146,
-      146,  107,  108,  110,  146,  146,  146,   13,  146,  146,
-      146,  146,  146,  146,   21,  146,   33,   34,  146,  146,
-      146,  146,   46,   51,   63,  146,  146,   86,   87,  146,
-      146,  146,  146,  146,  146,  111,  146,  146,  146,  146,
-      146,  146,  146,  146,   31,  146,  146,   39,  146,   64,
-
-      146,  146,  146,   99,  146,  146,  146,  146,   12,  146,
-      146,  146,  146,   24,  146,   36,  146,  146,   84,  146,
-      146,  100,  104,  146,  116,   16,  146,  146,  146,   27,
-       38,  146,   85,   91,  146,  146,  146,   18,   19,  146,
-      146,  106,  146,  146,  146,  146,  146,   94,  146,   44,
-       17,    0
+        0,    0,  154,    2,    2,  152,  152,  151,  150,  152,
+      129,  125,  128,  125,  125,  148,  121,  118,  122,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  126,    4,    5,    5,    3,  144,
+      144,  141,  145,  145,  139,  146,  146,  143,    1,  151,
+      119,  149,  148,  148,  148,    0,  123,  120,  124,  147,
+      147,  147,  147,   10,  147,  147,  147,   22,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  127,  147,
+
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,   58,   66,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,   80,   81,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,    4,    5,    3,  144,  140,  145,  138,  138,  130,
+      132,  133,  134,  135,  136,  137,  138,  146,  142,  149,
+      148,    0,  148,    6,    7,  147,    9,   11,  147,  147,
+       15,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,   32,  147,  147,  147,  147,  147,  147,  147,  147,
+
+       43,  147,  147,  147,  147,  147,  147,   50,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,   62,  147,   68,
+      147,  147,  147,  147,  147,  147,  147,   76,  147,   79,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  147,   98,   99,  147,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      130,  132,  131,  147,  147,  147,  147,  147,  147,  147,
+       20,   23,  147,  147,  147,   28,  147,  147,   30,  147,
+      147,  147,  147,   37,  147,  147,   41,   42,  147,  147,
+      147,  147,  147,  147,  147,   52,   53,  147,   55,  147,
+
+       57,  147,  147,  147,  147,   65,   67,   69,   70,   71,
+      147,   73,  147,  147,   77,  147,  147,  147,  147,  147,
+      147,   89,  147,   91,  147,  147,  147,  147,  147,  147,
+      147,  147,  147,  103,  104,  106,  147,  147,  147,  147,
+      147,  147,  113,  147,  115,  116,  130,  131,    8,  147,
+      147,  147,  147,  147,  147,  147,   25,  147,  147,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+      147,  147,   47,   48,   49,  147,   54,  147,   59,   60,
+      147,  147,  147,   72,  147,   75,   78,   82,   83,  147,
+      147,  147,  147,   90,  147,  147,   94,  147,  147,  147,
+
+      147,  147,  102,  147,  147,  147,  147,  110,  147,  147,
+      114,  147,  147,  147,   14,  147,  147,  147,  147,  147,
+       26,  147,   29,  147,  147,  147,  147,   35,  147,  147,
+      147,   40,  147,   45,  147,  147,   56,   61,  147,  147,
+       74,  147,  147,  147,  147,  147,   93,  147,   96,   97,
+      147,  147,  147,  147,  108,  109,  111,  147,  147,  147,
+       13,  147,  147,  147,  147,  147,  147,   21,  147,   33,
+       34,  147,  147,  147,  147,   46,   51,   63,  147,  147,
+       86,   87,  147,  147,  147,  147,  147,  147,  147,  112,
+      147,  147,  147,  147,  147,  147,  147,  147,   31,  147,
+
+      147,   39,  147,   64,  147,   88,  147,  147,  100,  147,
+      147,  147,  147,   12,  147,  147,  147,  147,   24,  147,
+       36,  147,  147,   84,  147,  147,  101,  105,  147,  117,
+       16,  147,  147,  147,   27,   38,  147,   85,   92,  147,
+      147,  147,   18,   19,  147,  147,  107,  147,  147,  147,
+      147,  147,   95,  147,   44,   17,    0
     } ;
 
-static yyconst YY_CHAR yy_ec[256] =
+static yyconst flex_int32_t 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 +469,7 @@ static yyconst YY_CHAR yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst YY_CHAR yy_meta[72] =
+static yyconst flex_int32_t 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,26 +481,26 @@ static yyconst YY_CHAR yy_meta[72] =
         8
     } ;
 
-static yyconst flex_uint16_t yy_base[568] =
+static yyconst flex_int16_t yy_base[573] =
     {   0,
         0,    1,   46,    0,  117,  163,    2,    3,  128,  132,
-        6,   10,  257, 1219, 1219,    0, 1219,   13, 1219,  233,
-     1219, 1219, 1219,  208,    6,  130,    4, 1219,  195,  124,
+        6,   10,  257, 1225, 1225,    0, 1225,   13, 1225,  233,
+     1225, 1225, 1225,  208,    6,  130,    4, 1225,  195,  124,
       161,  170,  178,  207,  260,   92,  167,  161,   96,  107,
       219,  214,  212,  224,  236,   92,  279,  272,  278,  281,
-      128,  168,    0,  125, 1219,  184,    4,   19,    0,    0,
+      128,  168,    0,  125, 1225,  184,    4,   19,    0,    0,
         0,  146,    0,    0,  343,    0,    0,  145,    0,   22,
-     1219,    0,  307,  337,  341,   18, 1219, 1219, 1219,    0,
+     1225,    0,  307,  337,  341,   18, 1225, 1225, 1225,    0,
       170,  224,  177,  181,  215,  269,  224,    0,  263,  326,
-      336,  286,  290,  333,  382,  321,  322,  329, 1219,  328,
+      336,  286,  290,  333,  382,  321,  322,  329, 1225,  328,
 
       347,  351,  346,  350,  346,  353,  352,  374,  386,  385,
       383,  382,  402,    0,  395,  382,  389,  403,  399,  397,
       399,  401,  399,  408,  418,    0,  421,  406,  410,  425,
       437,  438,  438,  455,  451,  436,  457,  462,  462,  463,
       461,  454,  447,  454,  462,  469,  465,  466,  474,  460,
-      481,  148,   29,    0,    0, 1219,    0, 1219, 1219,   22,
-       24, 1219, 1219, 1219, 1219, 1219,    0,    0, 1219,    0,
+      481,  148,   29,    0,    0, 1225,    0, 1225, 1225,   22,
+       24, 1225, 1225, 1225, 1225, 1225,    0,    0, 1225,    0,
       509,   26,   28,    0,    0,  478,    0,  481,  478,  501,
       493,  514,  513,  501,  517,  500,  503,  498,  523,  505,
       521,    0,  518,  527,  526,  529,  513,  532,  520,  532,
@@ -526,118 +508,120 @@ static yyconst flex_uint16_t yy_base[568] =
         0,  537,  521,  523,  523,  525,  558,  563,  559,  562,
       554,  568,  568,  560,  574,  575,  576,  577,  569,    0,
       564,  565,  581,  578,  582,  569,  571,    0,  581,    0,
-      589,  590,  576,  595,  586,  580,  595,  605,  621,  625,
-      624,   98,  618,  629,    0,  623,  617,  625,  624,  634,
-      635,  629,  625,  642,  630,  624,  644,  634,  641,  632,
-       30,  125,    0,  633,  639,  649,  642,  652,  647,  647,
-        0,  674,  673,  675,  670,    0,  671,  674,  673,  681,
-      674,  676,  684,  693,  690,  688,    0,    0,  685,  682,
-      702,  700,  686,  687,  699,    0,    0,  693,    0,  696,
-
-        0,  687,  694,  696,  726,    0,    0,    0,    0,    0,
-      696,    0,  698,  734,  727,  730,  731,  741,  746,  751,
-        0,  748,    0,  736,  731,  736,  753,  744,  756,  748,
-      741,  758,    0,  745,    0,  760,  745,  747,  761,  764,
-      762,    0,  767,    0,  761,  136, 1219,    0,  772,  786,
-      780,  801,  788,  800,  805,    0,  795,  792,  806,  807,
-      804,  813,  803,  811,  808,  804,  805,  816,  817,  804,
-      821,    0,    0,    0,  818,    0,  819,    0,    0,  807,
-      823,  808,    0,  827,    0,    0,    0,    0,  814,  835,
-      840,    0,  855,  846,    0,  859,  861,  846,  858,  850,
-
-        0,  849,  851,  866,  867,    0,  854,  873,    0,  860,
-      867,  863,    0,  857,  862,  880,  873,  863,    0,  883,
-        0,  880,  873,  876,  870,    0,  872,  903,  913,    0,
-       93,    0,  898,  906,    0,    0,  904,  922,    0,  915,
-      905,  901,  913,    0,  916,    0,    0,  915,  921,  930,
-      931,    0,    0,    0,  915,  920,  921,    0,  928,  923,
-      926,  928,  936,  933,    0,  938,    0,    0,  939,  937,
-      928,  931,    0,    0,    0,  953,  959,    0,    0,  973,
-      969,  960,  967,  969,  970,    0,  964,  978,  972,  971,
-      972,  969,  972,  977,    0,  974,  979,    0,  975,    0,
-
-      982,  992,  985,    0,  992,  984,  985,  994,    0,  997,
-     1001,  996, 1018,    0, 1012,    0, 1027, 1018, 1019, 1020,
-     1031,    0,    0, 1029,    0,    0, 1024, 1038, 1026,    0,
-        0, 1036,    0,    0, 1026, 1042, 1028,    0,    0, 1035,
-     1045,    0, 1042, 1046, 1036, 1050, 1037,    0, 1038,    0,
-        0, 1219, 1103, 1113, 1123, 1133, 1143, 1147, 1150, 1156,
-     1164, 1174, 1184, 1194, 1204, 1209, 1211
+      589,  590,  576,  595,  587,  579,  610,  614,  625,  627,
+      625,   98,  619,  630,    0,  624,  618,  626,  625,  635,
+      636,  630,  626,  643,  631,  626,  645,  635,  642,  633,
+       30,  125,    0,  634,  640,  651,  643,  653,  649,  662,
+        0,  683,  677,  677,  671,    0,  672,  675,  674,  682,
+      675,  677,  685,  694,  691,  689,    0,    0,  686,  683,
+      704,  701,  687,  688,  700,    0,    0,  694,    0,  697,
+
+        0,  688,  696,  697,  735,    0,    0,    0,    0,    0,
+      696,    0,  698,  725,  727,  730,  731,  741,  746,  751,
+      736,    0,  750,    0,  738,  733,  738,  755,  746,  758,
+      751,  744,  760,    0,  747,    0,  762,  747,  749,  763,
+      767,  765,    0,  769,    0,  763,  136, 1225,    0,  787,
+      795,  784,  805,  791,  802,  806,    0,  797,  794,  808,
+      809,  806,  815,  805,  813,  810,  807,  808,  818,  819,
+      806,  823,    0,    0,    0,  820,    0,  821,    0,    0,
+      810,  826,  810,    0,  829,    0,    0,    0,    0,  829,
+      844,  844,  855,    0,  860,  850,    0,  862,  864,  849,
+
+      861,  853,    0,  852,  854,  869,  870,    0,  857,  876,
+        0,  864,  871,  867,    0,  860,  865,  883,  876,  866,
+        0,  887,    0,  884,  877,  880,  887,    0,  896,  916,
+      919,    0,   93,    0,  903,  910,    0,    0,  907,  925,
+        0,  918,  908,  904,  910,  917,    0,  920,    0,    0,
+      919,  925,  934,  936,    0,    0,    0,  920,  925,  926,
+        0,  932,  927,  930,  932,  941,  938,    0,  943,    0,
+        0,  945,  956,  954,  959,    0,    0,    0,  968,  966,
+        0,    0,  957,  980,  975,  965,  972,  974,  975,    0,
+      969,  983,  977,  976,  977,  975,  978,  983,    0,  980,
+
+      985,    0,  980,    0,  987,    0,  997,  991,    0,  998,
+      990,  992, 1015,    0, 1025, 1031, 1026, 1034,    0, 1020,
+        0, 1034, 1024, 1024, 1025, 1036,    0,    0, 1034,    0,
+        0, 1029, 1043, 1031,    0,    0, 1041,    0,    0, 1031,
+     1048, 1034,    0,    0, 1041, 1051,    0, 1048, 1051, 1041,
+     1055, 1043,    0, 1044,    0,    0, 1225, 1109, 1119, 1129,
+     1139, 1149, 1153, 1156, 1162, 1170, 1180, 1190, 1200, 1210,
+     1215, 1217
     } ;
 
-static yyconst flex_int16_t yy_def[568] =
+static yyconst flex_int16_t yy_def[573] =
     {   0,
-      553,  553,  552,    3,  554,  554,  555,  555,  556,  556,
-      557,  557,  552,  552,  552,  558,  552,  552,  552,  552,
-      552,  552,  552,  552,  552,  552,  552,  552,  552,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  552,  552,  552,  552,  560,  561,
-      561,  552,  562,  562,  563,  564,  564,  552,  558,  552,
-      552,  565,  552,  552,  552,  552,  552,  552,  552,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  552,  559,
-
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  552,  552,  560,  561,  552,  562,  552,  552,  552,
-      552,  552,  552,  552,  552,  552,  566,  564,  552,  565,
-      552,  552,  552,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      552,  552,  567,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  552,  552,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
-      559,    0,  552,  552,  552,  552,  552,  552,  552,  552,
-      552,  552,  552,  552,  552,  552,  552
+      558,  558,  557,    3,  559,  559,  560,  560,  561,  561,
+      562,  562,  557,  557,  557,  563,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  557,  557,  557,  557,  565,  566,
+      566,  557,  567,  567,  568,  569,  569,  557,  563,  557,
+      557,  570,  557,  557,  557,  557,  557,  557,  557,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  557,  564,
+
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  557,  557,  565,  566,  557,  567,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  571,  569,  557,  570,
+      557,  557,  557,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      557,  557,  572,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  557,  557,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,    0,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557
     } ;
 
-static yyconst flex_uint16_t yy_nxt[1291] =
+static yyconst flex_int16_t yy_nxt[1297] =
     {   0,
-      552,  552,   15,   15,   61,   61,  153,  153,   67,   62,
-       62,   68,   67,  552,   70,   68,   70,   73,   73,   77,
-       78,  153,  153,   70,  552,   70,  172,  172,  552,  173,
+      557,  557,   15,   15,   61,   61,  153,  153,   67,   62,
+       62,   68,   67,  557,   70,   68,   70,   73,   73,   77,
+       78,  153,  153,   70,  557,   70,  172,  172,  557,  173,
       173,  153,  153,  261,  262,  262,  262,  173,  173,  173,
-      173,  346,  262,  552,   16,   16,   17,   18,   19,   18,
+      173,  347,  262,  557,   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,
@@ -647,8 +631,8 @@ static yyconst flex_uint16_t yy_nxt[1291] =
        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,  110,  115,  116,  132,
-       64,   17,   17,   17,   64,   62,  262,  262,  472,   62,
-       74,   75,   75,  327,   81,  148,  151,  262,  262,  152,
+       64,   17,   17,   17,   64,   62,  262,  262,  475,   62,
+       74,   75,   75,  328,   81,  148,  151,  262,  262,  152,
       169,   76,   82,  156,   83,  110,  115,  116,  132,   84,
        17,   17,   17,   17,   56,   57,   58,   17,   17,   17,
        17,   17,   65,   81,  148,  151,   65,   17,   17,   17,
@@ -660,8 +644,8 @@ static yyconst flex_uint16_t yy_nxt[1291] =
       113,  149,  150,   90,   94,  114,  177,  112,   95,  178,
        91,   88,   96,   92,   93,  100,  117,  101,   97,  121,
       118,   98,  102,  123,  119,  122,  125,  103,   71,  124,
-      120,  179,  175,  129,  126,  182,  552,  130,  127,  552,
-      176,  128,  552,  552,  100,  117,  101,  552,  121,  118,
+      120,  179,  175,  129,  126,  182,  557,  130,  127,  557,
+      176,  128,  557,  557,  100,  117,  101,  557,  121,  118,
       131,  102,  123,  119,  122,  125,  103,  104,  124,  120,
       179,  175,  129,  126,  182,  105,  130,  127,  106,  176,
       128,  107,  180,  137,  108,  140,  133,  109,  183,  131,
@@ -669,12 +653,12 @@ static yyconst flex_uint16_t yy_nxt[1291] =
       134,  138,  141,  142,  135,  181,  104,  189,  190,  139,
       136,  145,  143,  146,  105,  144,  147,  106,   73,   73,
       107,  180,  137,  108,  140,  133,  109,  183,   76,  134,
-      138,  141,  142,  135,  181,  552,  189,  190,  139,  136,
+      138,  141,  142,  135,  181,  557,  189,  190,  139,  136,
       145,  143,  146,  184,  144,  147,  159,  185,  171,  171,
-      552,   74,   75,   75,  160,  161,  197,   76,   76,  198,
+      557,   74,   75,   75,  160,  161,  197,   76,   76,  198,
       199,  162,   76,  200,  186,  163,  187,  201,  188,  191,
-      202,  203,  184,  164,  192,  552,  185,  165,  205,  166,
-      206,  552,  204,  167,  207,  197,  208,   76,  198,  199,
+      202,  203,  184,  164,  192,  557,  185,  165,  205,  166,
+      206,  557,  204,  167,  207,  197,  208,   76,  198,  199,
       162,   76,  200,  186,  163,  187,  201,  188,  191,  202,
 
       203,  193,  164,  192,  194,  209,  165,  205,  166,  206,
@@ -700,83 +684,85 @@ static yyconst flex_uint16_t yy_nxt[1291] =
       297,  298,  299,  300,  301,  302,  303,  304,  305,  307,
 
       308,  309,  310,  311,  294,  312,  313,  314,  306,  315,
-      316,  317,  318,  295,  319,  320,  321,  296,  322,  297,
+      316,  317,  318,  295,  319,  322,  320,  296,  321,  297,
       298,  299,  300,  301,  302,  303,  304,  305,  307,  308,
       309,  310,  311,  323,  312,  313,  314,  306,  315,  316,
-      317,  318,  324,  319,  320,  321,  325,  322,  326,  328,
+      317,  318,  324,  319,  322,  320,  325,  321,  326,  327,
       329,  330,  331,  332,  333,  334,  335,  336,  337,  338,
-      339,  340,  323,  341,  342,  344,  345,  348,  343,  349,
-      350,  324,  351,  352,  353,  325,  354,  326,  328,  329,
+      339,  340,  323,  341,  342,  343,  345,  346,  349,  344,
+      350,  324,  351,  352,  353,  325,  354,  326,  327,  329,
       330,  331,  332,  333,  334,  335,  336,  337,  338,  339,
-      340,  355,  341,  342,  344,  345,  348,  343,  349,  350,
+      340,  355,  341,  342,  343,  345,  346,  349,  344,  350,
 
       356,  351,  352,  353,  357,  354,  358,  359,  360,  361,
       362,  363,  364,  365,  366,  367,  368,  369,  370,  371,
       355,  372,  373,  374,  375,  376,  377,  378,  379,  356,
-      380,  552,  383,  357,  384,  358,  359,  360,  361,  362,
-      363,  364,  365,  366,  367,  368,  369,  370,  371,  381,
-      372,  373,  374,  375,  376,  377,  378,  379,  385,  380,
-      382,  383,  386,  384,  387,  388,  389,  390,  391,  392,
-      393,  394,  395,  396,  397,  398,  399,  400,  381,  401,
-      402,  403,  404,  405,  406,  407,  408,  385,  409,  382,
-      410,  386,  411,  387,  388,  389,  390,  391,  392,  393,
-
-      394,  395,  396,  397,  398,  399,  400,  412,  401,  402,
-      403,  404,  405,  406,  407,  408,  413,  409,  414,  410,
-      415,  411,  417,  416,  418,  419,  420,  421,  422,  423,
-      424,  425,  426,  427,  428,  429,  412,  430,  431,  432,
-      433,  434,  435,  436,  437,  413,  438,  414,  439,  415,
-      440,  417,  416,  418,  419,  420,  421,  422,  423,  424,
-      425,  426,  427,  428,  429,  441,  430,  431,  432,  433,
-      434,  435,  436,  437,  442,  438,  443,  439,  444,  440,
+      380,  381,  384,  357,  385,  358,  359,  360,  361,  362,
+      363,  364,  365,  366,  367,  368,  369,  370,  371,  386,
+      372,  373,  374,  375,  376,  377,  378,  379,  382,  380,
+      381,  384,  387,  385,  388,  389,  390,  391,  392,  383,
+      393,  394,  395,  396,  397,  398,  399,  400,  386,  401,
+      402,  403,  404,  405,  406,  407,  408,  382,  409,  410,
+      411,  387,  412,  388,  389,  390,  391,  392,  383,  393,
+
+      394,  395,  396,  397,  398,  399,  400,  413,  401,  402,
+      403,  404,  405,  406,  407,  408,  414,  409,  410,  411,
+      415,  412,  416,  417,  419,  420,  418,  421,  422,  423,
+      424,  425,  426,  427,  428,  429,  413,  430,  431,  432,
+      433,  434,  435,  436,  437,  414,  438,  439,  440,  415,
+      441,  416,  417,  419,  420,  418,  421,  422,  423,  424,
+      425,  426,  427,  428,  429,  442,  430,  431,  432,  433,
+      434,  435,  436,  437,  443,  438,  439,  440,  444,  441,
       445,  446,  447,  448,  449,  450,  451,  452,  453,  454,
-      455,  456,  457,  458,  441,  459,  460,  461,  462,  463,
+      455,  456,  457,  458,  442,  459,  460,  461,  462,  463,
 
-      464,  465,  466,  442,  467,  443,  468,  444,  469,  445,
+      464,  465,  466,  443,  467,  468,  469,  444,  470,  445,
       446,  447,  448,  449,  450,  451,  452,  453,  454,  455,
-      456,  457,  458,  470,  459,  460,  461,  462,  463,  464,
-      465,  466,  471,  467,  473,  468,  474,  469,  475,  476,
+      456,  457,  458,  471,  459,  460,  461,  462,  463,  464,
+      465,  466,  472,  467,  468,  469,  473,  470,  474,  476,
       477,  478,  479,  480,  481,  482,  483,  484,  485,  486,
-      487,  488,  470,  489,  490,  491,  492,  493,  494,  495,
-      496,  471,  497,  473,  498,  474,  499,  475,  476,  477,
+      487,  488,  471,  489,  490,  491,  492,  493,  494,  495,
+      496,  472,  497,  498,  499,  473,  500,  474,  476,  477,
       478,  479,  480,  481,  482,  483,  484,  485,  486,  487,
-      488,  500,  489,  490,  491,  492,  493,  494,  495,  496,
-      501,  497,  502,  498,  503,  499,  504,  505,  506,  507,
+      488,  501,  489,  490,  491,  492,  493,  494,  495,  496,
+      502,  497,  498,  499,  503,  500,  504,  505,  506,  507,
 
       508,  509,  510,  511,  512,  513,  514,  515,  516,  517,
-      500,  518,  519,  520,  521,  522,  523,  524,  525,  501,
-      526,  502,  527,  503,  528,  504,  505,  506,  507,  508,
-      509,  510,  511,  512,  513,  514,  515,  516,  517,  529,
-      518,  519,  520,  521,  522,  523,  524,  525,  530,  526,
-      531,  527,  532,  528,  533,  534,  535,  536,  537,  538,
-      539,  540,  541,  542,  543,  544,  545,  546,  529,  547,
-      548,  549,  550,  551,  552,  552,  552,  530,  552,  531,
-      552,  532,  552,  533,  534,  535,  536,  537,  538,  539,
-      540,  541,  542,  543,  544,  545,  546,  552,  547,  548,
-
-      549,  550,  551,   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,  552,   80,
-      154,  154,  154,  154,  155,  155,  155,  552,  155,  155,
-      155,  155,  155,  155,  157,  157,  157,  552,  157,  157,
-      157,  157,  552,  157,  158,  158,  158,  158,  158,  158,
-      158,  158,  158,  158,  168,  168,  552,  168,  168,  168,
-
-      168,  168,  168,  168,  170,  552,  170,  170,  170,  170,
-      170,  170,  170,  170,  263,  263,  347,  347,   13,  552,
-      552,  552,  552,  552,  552,  552,  552,  552,  552,  552,
-      552,  552,  552,  552,  552,  552,  552,  552,  552,  552,
-      552,  552,  552,  552,  552,  552,  552,  552,  552,  552,
-      552,  552,  552,  552,  552,  552,  552,  552,  552,  552,
-      552,  552,  552,  552,  552,  552,  552,  552,  552,  552,
-      552,  552,  552,  552,  552,  552,  552,  552,  552,  552,
-      552,  552,  552,  552,  552,  552,  552,  552,  552,  552
+      501,  518,  519,  520,  521,  522,  523,  524,  525,  502,
+      526,  527,  528,  503,  529,  504,  505,  506,  507,  508,
+      509,  510,  511,  512,  513,  514,  515,  516,  517,  530,
+      518,  519,  520,  521,  522,  523,  524,  525,  531,  526,
+      527,  528,  532,  529,  533,  534,  535,  536,  537,  538,
+      539,  540,  541,  542,  543,  544,  545,  546,  530,  547,
+      548,  549,  550,  551,  552,  553,  554,  531,  555,  556,
+      557,  532,  557,  533,  534,  535,  536,  537,  538,  539,
+      540,  541,  542,  543,  544,  545,  546,  557,  547,  548,
+
+      549,  550,  551,  552,  553,  554,  557,  555,  556,   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,  557,   80,  154,  154,  154,  154,
+      155,  155,  155,  557,  155,  155,  155,  155,  155,  155,
+      157,  157,  157,  557,  157,  157,  157,  157,  557,  157,
+      158,  158,  158,  158,  158,  158,  158,  158,  158,  158,
+
+      168,  168,  557,  168,  168,  168,  168,  168,  168,  168,
+      170,  557,  170,  170,  170,  170,  170,  170,  170,  170,
+      263,  263,  348,  348,   13,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557
+
     } ;
 
-static yyconst flex_int16_t yy_chk[1291] =
+static yyconst flex_int16_t yy_chk[1297] =
     {   0,
         0,    0,    1,    2,    7,    8,   57,   57,   11,    7,
         8,   11,   12,    0,   18,   12,   18,   25,   25,   27,
@@ -792,8 +778,8 @@ static yyconst flex_int16_t yy_chk[1291] =
         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,  262,  262,  431,   10,
-       26,   26,   26,  242,   30,   51,   54,  346,  346,  152,
+        9,    5,    5,    5,   10,    9,  262,  262,  433,   10,
+       26,   26,   26,  242,   30,   51,   54,  347,  347,  152,
        68,   26,   30,   62,   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,
@@ -845,84 +831,86 @@ static yyconst flex_int16_t yy_chk[1291] =
       210,  211,  212,  213,  214,  215,  216,  217,  218,  219,
 
       221,  222,  223,  224,  207,  225,  226,  227,  218,  229,
-      231,  232,  233,  208,  234,  235,  236,  209,  237,  210,
+      231,  232,  233,  208,  234,  236,  235,  209,  235,  210,
       211,  212,  213,  214,  215,  216,  217,  218,  219,  221,
-      222,  223,  224,  238,  225,  226,  227,  218,  229,  231,
-      232,  233,  239,  234,  235,  236,  240,  237,  241,  243,
+      222,  223,  224,  237,  225,  226,  227,  218,  229,  231,
+      232,  233,  238,  234,  236,  235,  239,  235,  240,  241,
+      243,  244,  246,  247,  248,  249,  250,  251,  252,  253,
+      254,  255,  237,  256,  257,  258,  259,  260,  264,  258,
+      265,  238,  266,  267,  268,  239,  269,  240,  241,  243,
       244,  246,  247,  248,  249,  250,  251,  252,  253,  254,
-      255,  256,  238,  257,  258,  259,  260,  264,  258,  265,
-      266,  239,  267,  268,  269,  240,  270,  241,  243,  244,
-      246,  247,  248,  249,  250,  251,  252,  253,  254,  255,
-      256,  272,  257,  258,  259,  260,  264,  258,  265,  266,
-
-      273,  267,  268,  269,  274,  270,  275,  277,  278,  279,
-      280,  281,  282,  283,  284,  285,  286,  289,  290,  291,
-      272,  292,  293,  294,  295,  298,  300,  302,  303,  273,
-      304,    0,  311,  274,  313,  275,  277,  278,  279,  280,
-      281,  282,  283,  284,  285,  286,  289,  290,  291,  305,
-      292,  293,  294,  295,  298,  300,  302,  303,  314,  304,
-      305,  311,  315,  313,  316,  317,  318,  319,  320,  322,
-      324,  325,  326,  327,  328,  329,  330,  331,  305,  332,
-      334,  336,  337,  338,  339,  340,  341,  314,  343,  305,
-      345,  315,  349,  316,  317,  318,  319,  320,  322,  324,
-
-      325,  326,  327,  328,  329,  330,  331,  350,  332,  334,
-      336,  337,  338,  339,  340,  341,  351,  343,  352,  345,
-      353,  349,  354,  353,  355,  357,  358,  359,  360,  361,
-      362,  363,  364,  365,  366,  367,  350,  368,  369,  370,
-      371,  375,  377,  380,  381,  351,  382,  352,  384,  353,
-      389,  354,  353,  355,  357,  358,  359,  360,  361,  362,
-      363,  364,  365,  366,  367,  390,  368,  369,  370,  371,
-      375,  377,  380,  381,  391,  382,  393,  384,  394,  389,
-      396,  397,  398,  399,  400,  402,  403,  404,  405,  407,
-      408,  410,  411,  412,  390,  414,  415,  416,  417,  418,
-
-      420,  422,  423,  391,  424,  393,  425,  394,  427,  396,
-      397,  398,  399,  400,  402,  403,  404,  405,  407,  408,
-      410,  411,  412,  428,  414,  415,  416,  417,  418,  420,
-      422,  423,  429,  424,  433,  425,  434,  427,  437,  438,
-      440,  441,  442,  443,  445,  448,  449,  450,  451,  455,
-      456,  457,  428,  459,  460,  461,  462,  463,  464,  466,
-      469,  429,  470,  433,  471,  434,  472,  437,  438,  440,
-      441,  442,  443,  445,  448,  449,  450,  451,  455,  456,
-      457,  476,  459,  460,  461,  462,  463,  464,  466,  469,
-      477,  470,  480,  471,  481,  472,  482,  483,  484,  485,
-
-      487,  488,  489,  490,  491,  492,  493,  494,  496,  497,
-      476,  499,  501,  502,  503,  505,  506,  507,  508,  477,
-      510,  480,  511,  481,  512,  482,  483,  484,  485,  487,
-      488,  489,  490,  491,  492,  493,  494,  496,  497,  513,
-      499,  501,  502,  503,  505,  506,  507,  508,  515,  510,
-      517,  511,  518,  512,  519,  520,  521,  524,  527,  528,
-      529,  532,  535,  536,  537,  540,  541,  543,  513,  544,
-      545,  546,  547,  549,    0,    0,    0,  515,    0,  517,
-        0,  518,    0,  519,  520,  521,  524,  527,  528,  529,
-      532,  535,  536,  537,  540,  541,  543,    0,  544,  545,
-
-      546,  547,  549,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  554,  554,  554,  554,  554,  554,  554,
-      554,  554,  554,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  556,  556,  556,  556,  556,  556,  556,
-      556,  556,  556,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  558,  558,  559,  559,  559,    0,  559,
-      560,  560,  560,  560,  561,  561,  561,    0,  561,  561,
-      561,  561,  561,  561,  562,  562,  562,    0,  562,  562,
-      562,  562,    0,  562,  563,  563,  563,  563,  563,  563,
-      563,  563,  563,  563,  564,  564,    0,  564,  564,  564,
-
-      564,  564,  564,  564,  565,    0,  565,  565,  565,  565,
-      565,  565,  565,  565,  566,  566,  567,  567,  552,  552,
-      552,  552,  552,  552,  552,  552,  552,  552,  552,  552,
-      552,  552,  552,  552,  552,  552,  552,  552,  552,  552,
-      552,  552,  552,  552,  552,  552,  552,  552,  552,  552,
-      552,  552,  552,  552,  552,  552,  552,  552,  552,  552,
-      552,  552,  552,  552,  552,  552,  552,  552,  552,  552,
-      552,  552,  552,  552,  552,  552,  552,  552,  552,  552,
-      552,  552,  552,  552,  552,  552,  552,  552,  552,  552
+      255,  270,  256,  257,  258,  259,  260,  264,  258,  265,
+
+      272,  266,  267,  268,  273,  269,  274,  275,  277,  278,
+      279,  280,  281,  282,  283,  284,  285,  286,  289,  290,
+      270,  291,  292,  293,  294,  295,  298,  300,  302,  272,
+      303,  304,  311,  273,  313,  274,  275,  277,  278,  279,
+      280,  281,  282,  283,  284,  285,  286,  289,  290,  314,
+      291,  292,  293,  294,  295,  298,  300,  302,  305,  303,
+      304,  311,  315,  313,  316,  317,  318,  319,  320,  305,
+      321,  323,  325,  326,  327,  328,  329,  330,  314,  331,
+      332,  333,  335,  337,  338,  339,  340,  305,  341,  342,
+      344,  315,  346,  316,  317,  318,  319,  320,  305,  321,
+
+      323,  325,  326,  327,  328,  329,  330,  350,  331,  332,
+      333,  335,  337,  338,  339,  340,  351,  341,  342,  344,
+      352,  346,  353,  354,  355,  356,  354,  358,  359,  360,
+      361,  362,  363,  364,  365,  366,  350,  367,  368,  369,
+      370,  371,  372,  376,  378,  351,  381,  382,  383,  352,
+      385,  353,  354,  355,  356,  354,  358,  359,  360,  361,
+      362,  363,  364,  365,  366,  390,  367,  368,  369,  370,
+      371,  372,  376,  378,  391,  381,  382,  383,  392,  385,
+      393,  395,  396,  398,  399,  400,  401,  402,  404,  405,
+      406,  407,  409,  410,  390,  412,  413,  414,  416,  417,
+
+      418,  419,  420,  391,  422,  424,  425,  392,  426,  393,
+      395,  396,  398,  399,  400,  401,  402,  404,  405,  406,
+      407,  409,  410,  427,  412,  413,  414,  416,  417,  418,
+      419,  420,  429,  422,  424,  425,  430,  426,  431,  435,
+      436,  439,  440,  442,  443,  444,  445,  446,  448,  451,
+      452,  453,  427,  454,  458,  459,  460,  462,  463,  464,
+      465,  429,  466,  467,  469,  430,  472,  431,  435,  436,
+      439,  440,  442,  443,  444,  445,  446,  448,  451,  452,
+      453,  473,  454,  458,  459,  460,  462,  463,  464,  465,
+      474,  466,  467,  469,  475,  472,  479,  480,  483,  484,
+
+      485,  486,  487,  488,  489,  491,  492,  493,  494,  495,
+      473,  496,  497,  498,  500,  501,  503,  505,  507,  474,
+      508,  510,  511,  475,  512,  479,  480,  483,  484,  485,
+      486,  487,  488,  489,  491,  492,  493,  494,  495,  513,
+      496,  497,  498,  500,  501,  503,  505,  507,  515,  508,
+      510,  511,  516,  512,  517,  518,  520,  522,  523,  524,
+      525,  526,  529,  532,  533,  534,  537,  540,  513,  541,
+      542,  545,  546,  548,  549,  550,  551,  515,  552,  554,
+        0,  516,    0,  517,  518,  520,  522,  523,  524,  525,
+      526,  529,  532,  533,  534,  537,  540,    0,  541,  542,
+
+      545,  546,  548,  549,  550,  551,    0,  552,  554,  558,
+      558,  558,  558,  558,  558,  558,  558,  558,  558,  559,
+      559,  559,  559,  559,  559,  559,  559,  559,  559,  560,
+      560,  560,  560,  560,  560,  560,  560,  560,  560,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  562,
+      562,  562,  562,  562,  562,  562,  562,  562,  562,  563,
+      563,  564,  564,  564,    0,  564,  565,  565,  565,  565,
+      566,  566,  566,    0,  566,  566,  566,  566,  566,  566,
+      567,  567,  567,    0,  567,  567,  567,  567,    0,  567,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+
+      569,  569,    0,  569,  569,  569,  569,  569,  569,  569,
+      570,    0,  570,  570,  570,  570,  570,  570,  570,  570,
+      571,  571,  572,  572,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557
+
     } ;
 
 /* Table of booleans, true if rule could match eol. */
-static yyconst flex_int32_t yy_rule_can_match_eol[153] =
+static yyconst flex_int32_t yy_rule_can_match_eol[154] =
     {   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, 
@@ -930,8 +918,8 @@ static yyconst flex_int32_t yy_rule_can_match_eol[153] =
     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, 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.
@@ -996,6 +984,7 @@ class ParseOrderBy;
 class ParseOrderByItem;
 class ParsePartitionClause;
 class ParsePredicate;
+class ParsePriority;
 class ParseSample;
 class ParseScalarLiteral;
 class ParseSearchedWhenClause;
@@ -1048,7 +1037,7 @@ class UnaryOperation;
 
 
 
-#line 1052 "SqlLexer_gen.cpp"
+#line 1041 "SqlLexer_gen.cpp"
 
 #define INITIAL 0
 #define CONDITION_SQL 1
@@ -1134,11 +1123,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 );
 
@@ -1146,11 +1135,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 );
 
@@ -1172,10 +1161,6 @@ 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
@@ -1196,12 +1181,7 @@ static int input (yyscan_t yyscanner );
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
 #define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -1290,7 +1270,7 @@ extern int quickstep_yylex \
 
 /* Code executed at the end of each rule. */
 #ifndef YY_BREAK
-#define YY_BREAK /*LINTED*/break;
+#define YY_BREAK break;
 #endif
 
 #define YY_RULE_SETUP \
@@ -1300,11 +1280,16 @@ extern int quickstep_yylex \
  */
 YY_DECL
 {
-	yy_state_type yy_current_state;
-	char *yy_cp, *yy_bp;
-	int yy_act;
+	register yy_state_type yy_current_state;
+	register char *yy_cp, *yy_bp;
+	register int yy_act;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
+#line 129 "../SqlLexer.lpp"
+
+
+#line 1292 "SqlLexer_gen.cpp"
+
     yylval = yylval_param;
 
     yylloc = yylloc_param;
@@ -1335,13 +1320,7 @@ YY_DECL
 		quickstep_yy_load_buffer_state(yyscanner );
 		}
 
-	{
-#line 128 "../SqlLexer.lpp"
-
-
-#line 1343 "SqlLexer_gen.cpp"
-
-	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
+	while ( 1 )		/* loops until end-of-file is reached */
 		{
 		yy_cp = yyg->yy_c_buf_p;
 
@@ -1357,7 +1336,7 @@ YY_DECL
 yy_match:
 		do
 			{
-			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
+			register 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;
@@ -1366,13 +1345,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 >= 553 )
+				if ( yy_current_state >= 558 )
 					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 != 552 );
+		while ( yy_current_state != 557 );
 		yy_cp = yyg->yy_last_accepting_cpos;
 		yy_current_state = yyg->yy_last_accepting_state;
 
@@ -1383,7 +1362,7 @@ yy_find_action:
 
 		if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
 			{
-			yy_size_t yyl;
+			int yyl;
 			for ( yyl = 0; yyl < yyleng; ++yyl )
 				if ( yytext[yyl] == '\n' )
 					   
@@ -1406,7 +1385,7 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 131 "../SqlLexer.lpp"
+#line 132 "../SqlLexer.lpp"
 {
     /* A forward slash character represents a system command. */
     BEGIN(CONDITION_COMMAND);
@@ -1418,7 +1397,7 @@ YY_RULE_SETUP
 case 2:
 /* rule 2 can match eol */
 YY_RULE_SETUP
-#line 139 "../SqlLexer.lpp"
+#line 140 "../SqlLexer.lpp"
 {
     /* This is a SQL command. Place the char back and process normally. */
     yyless(0);
@@ -1430,7 +1409,7 @@ YY_RULE_SETUP
 
 case 3:
 YY_RULE_SETUP
-#line 148 "../SqlLexer.lpp"
+#line 149 "../SqlLexer.lpp"
 {
     /* This is a command argument. */
     yylval->string_value_ = new quickstep::ParseString(
@@ -1440,7 +1419,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 155 "../SqlLexer.lpp"
+#line 156 "../SqlLexer.lpp"
 {
     /* Ignore whitespace. */
   }
@@ -1448,7 +1427,7 @@ YY_RULE_SETUP
 case 5:
 /* rule 5 can match eol */
 YY_RULE_SETUP
-#line 159 "../SqlLexer.lpp"
+#line 160 "../SqlLexer.lpp"
 {
     /* Newline reverts the lexer to the initial state. */
     yycolumn = 0;
@@ -1460,627 +1439,632 @@ YY_RULE_SETUP
 
 case 6:
 YY_RULE_SETUP
-#line 168 "../SqlLexer.lpp"
+#line 169 "../SqlLexer.lpp"
 return TOKEN_ADD;
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 169 "../SqlLexer.lpp"
+#line 170 "../SqlLexer.lpp"
 return TOKEN_ALL;
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 170 "../SqlLexer.lpp"
+#line 171 "../SqlLexer.lpp"
 return TOKEN_ALTER;
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 171 "../SqlLexer.lpp"
+#line 172 "../SqlLexer.lpp"
 return TOKEN_AND;
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 172 "../SqlLexer.lpp"
+#line 173 "../SqlLexer.lpp"
 return TOKEN_AS;
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 173 "../SqlLexer.lpp"
+#line 174 "../SqlLexer.lpp"
 return TOKEN_ASC;
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 174 "../SqlLexer.lpp"
+#line 175 "../SqlLexer.lpp"
 return TOKEN_ASC;
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 175 "../SqlLexer.lpp"
+#line 176 "../SqlLexer.lpp"
 return TOKEN_BETWEEN;
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 176 "../SqlLexer.lpp"
+#line 177 "../SqlLexer.lpp"
 return TOKEN_BIGINT;
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 177 "../SqlLexer.lpp"
+#line 178 "../SqlLexer.lpp"
 return TOKEN_BIT;
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 178 "../SqlLexer.lpp"
+#line 179 "../SqlLexer.lpp"
 return TOKEN_BITWEAVING;
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 179 "../SqlLexer.lpp"
+#line 180 "../SqlLexer.lpp"
 return TOKEN_BLOCKPROPERTIES;
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 180 "../SqlLexer.lpp"
+#line 181 "../SqlLexer.lpp"
 return TOKEN_BLOCKSAMPLE;
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 181 "../SqlLexer.lpp"
+#line 182 "../SqlLexer.lpp"
 return TOKEN_BLOOM_FILTER;
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 182 "../SqlLexer.lpp"
+#line 183 "../SqlLexer.lpp"
 return TOKEN_CASE;
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 183 "../SqlLexer.lpp"
+#line 184 "../SqlLexer.lpp"
 return TOKEN_CSB_TREE;
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 184 "../SqlLexer.lpp"
+#line 185 "../SqlLexer.lpp"
 return TOKEN_BY;
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 185 "../SqlLexer.lpp"
+#line 186 "../SqlLexer.lpp"
 return TOKEN_CHARACTER;
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 186 "../SqlLexer.lpp"
+#line 187 "../SqlLexer.lpp"
 return TOKEN_CHARACTER;
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 187 "../SqlLexer.lpp"
+#line 188 "../SqlLexer.lpp"
 return TOKEN_CHECK;
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 188 "../SqlLexer.lpp"
+#line 189 "../SqlLexer.lpp"
 return TOKEN_COLUMN;
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 189 "../SqlLexer.lpp"
+#line 190 "../SqlLexer.lpp"
 return TOKEN_CONSTRAINT;
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 190 "../SqlLexer.lpp"
+#line 191 "../SqlLexer.lpp"
 return TOKEN_COPY;
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 191 "../SqlLexer.lpp"
+#line 192 "../SqlLexer.lpp"
 return TOKEN_CREATE;
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 192 "../SqlLexer.lpp"
+#line 193 "../SqlLexer.lpp"
 return TOKEN_DATE;
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 193 "../SqlLexer.lpp"
+#line 194 "../SqlLexer.lpp"
 return TOKEN_DATETIME;
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 194 "../SqlLexer.lpp"
+#line 195 "../SqlLexer.lpp"
 return TOKEN_DAY;
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 195 "../SqlLexer.lpp"
+#line 196 "../SqlLexer.lpp"
 return TOKEN_DECIMAL;
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 196 "../SqlLexer.lpp"
+#line 197 "../SqlLexer.lpp"
 return TOKEN_DEFAULT;
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 197 "../SqlLexer.lpp"
+#line 198 "../SqlLexer.lpp"
 return TOKEN_DELETE;
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 198 "../SqlLexer.lpp"
+#line 199 "../SqlLexer.lpp"
 return TOKEN_DELIMITER;
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 199 "../SqlLexer.lpp"
+#line 200 "../SqlLexer.lpp"
 return TOKEN_DESC;
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 200 "../SqlLexer.lpp"
+#line 201 "../SqlLexer.lpp"
 return TOKEN_DESC;
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 201 "../SqlLexer.lpp"
+#line 202 "../SqlLexer.lpp"
 return TOKEN_DISTINCT;
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 202 "../SqlLexer.lpp"
+#line 203 "../SqlLexer.lpp"
 return TOKEN_DOUBLE;
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 203 "../SqlLexer.lpp"
+#line 204 "../SqlLexer.lpp"
 return TOKEN_DROP;
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 204 "../SqlLexer.lpp"
+#line 205 "../SqlLexer.lpp"
 return TOKEN_ELSE;
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 205 "../SqlLexer.lpp"
+#line 206 "../SqlLexer.lpp"
 return TOKEN_END;
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 206 "../SqlLexer.lpp"
+#line 207 "../SqlLexer.lpp"
 return TOKEN_ESCAPE_STRINGS;
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 207 "../SqlLexer.lpp"
+#line 208 "../SqlLexer.lpp"
 return TOKEN_EXISTS;
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 208 "../SqlLexer.lpp"
+#line 209 "../SqlLexer.lpp"
 return TOKEN_EXTRACT;
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 209 "../SqlLexer.lpp"
+#line 210 "../SqlLexer.lpp"
 return TOKEN_FALSE;
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 210 "../SqlLexer.lpp"
+#line 211 "../SqlLexer.lpp"
 return TOKEN_FIRST;
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 211 "../SqlLexer.lpp"
+#line 212 "../SqlLexer.lpp"
 return TOKEN_FLOAT;
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 212 "../SqlLexer.lpp"
+#line 213 "../SqlLexer.lpp"
 return TOKEN_FOR;
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 213 "../SqlLexer.lpp"
+#line 214 "../SqlLexer.lpp"
 return TOKEN_FOREIGN;
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 214 "../SqlLexer.lpp"
+#line 215 "../SqlLexer.lpp"
 return TOKEN_FROM;
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 215 "../SqlLexer.lpp"
+#line 216 "../SqlLexer.lpp"
 return TOKEN_FULL;
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 216 "../SqlLexer.lpp"
+#line 217 "../SqlLexer.lpp"
 return TOKEN_GROUP;
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 217 "../SqlLexer.lpp"
+#line 218 "../SqlLexer.lpp"
 return TOKEN_HASH;
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 218 "../SqlLexer.lpp"
+#line 219 "../SqlLexer.lpp"
 return TOKEN_HAVING;
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 219 "../SqlLexer.lpp"
+#line 220 "../SqlLexer.lpp"
 return TOKEN_HOUR;
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 220 "../SqlLexer.lpp"
+#line 221 "../SqlLexer.lpp"
 return TOKEN_IN;
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 221 "../SqlLexer.lpp"
+#line 222 "../SqlLexer.lpp"
 return TOKEN_INDEX;
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 222 "../SqlLexer.lpp"
+#line 223 "../SqlLexer.lpp"
 return TOKEN_INNER;
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 223 "../SqlLexer.lpp"
+#line 224 "../SqlLexer.lpp"
 return TOKEN_INSERT;
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 224 "../SqlLexer.lpp"
+#line 225 "../SqlLexer.lpp"
 return TOKEN_INTEGER;
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 225 "../SqlLexer.lpp"
+#line 226 "../SqlLexer.lpp"
 return TOKEN_INTEGER;
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 226 "../SqlLexer.lpp"
+#line 227 "../SqlLexer.lpp"
 return TOKEN_INTERVAL;
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 227 "../SqlLexer.lpp"
+#line 228 "../SqlLexer.lpp"
 return TOKEN_INTO;
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 228 "../SqlLexer.lpp"
+#line 229 "../SqlLexer.lpp"
 return TOKEN_IS;
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 229 "../SqlLexer.lpp"
+#line 230 "../SqlLexer.lpp"
 return TOKEN_JOIN;
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 230 "../SqlLexer.lpp"
+#line 231 "../SqlLexer.lpp"
 return TOKEN_KEY;
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 231 "../SqlLexer.lpp"
+#line 232 "../SqlLexer.lpp"
 return TOKEN_LAST;
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 232 "../SqlLexer.lpp"
+#line 233 "../SqlLexer.lpp"
 return TOKEN_LEFT;
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 233 "../SqlLexer.lpp"
+#line 234 "../SqlLexer.lpp"
 return TOKEN_LIKE;
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 234 "../SqlLexer.lpp"
+#line 235 "../SqlLexer.lpp"
 return TOKEN_LIMIT;
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 235 "../SqlLexer.lpp"
+#line 236 "../SqlLexer.lpp"
 return TOKEN_LONG;
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 236 "../SqlLexer.lpp"
+#line 237 "../SqlLexer.lpp"
 return TOKEN_MINUTE;
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 237 "../SqlLexer.lpp"
+#line 238 "../SqlLexer.lpp"
 return TOKEN_MONTH;
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 238 "../SqlLexer.lpp"
+#line 239 "../SqlLexer.lpp"
 return TOKEN_NOT;
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 239 "../SqlLexer.lpp"
+#line 240 "../SqlLexer.lpp"
 return TOKEN_NULL;
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 240 "../SqlLexer.lpp"
+#line 241 "../SqlLexer.lpp"
 return TOKEN_NULLS;
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 241 "../SqlLexer.lpp"
+#line 242 "../SqlLexer.lpp"
 return TOKEN_OFF;
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 242 "../SqlLexer.lpp"
+#line 243 "../SqlLexer.lpp"
 return TOKEN_ON;
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 243 "../SqlLexer.lpp"
+#line 244 "../SqlLexer.lpp"
 return TOKEN_OR;
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 244 "../SqlLexer.lpp"
+#line 245 "../SqlLexer.lpp"
 return TOKEN_ORDER;
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 245 "../SqlLexer.lpp"
+#line 246 "../SqlLexer.lpp"
 return TOKEN_OUTER;
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 246 "../SqlLexer.lpp"
+#line 247 "../SqlLexer.lpp"
 return TOKEN_PARTITION;
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 247 "../SqlLexer.lpp"
+#line 248 "../SqlLexer.lpp"
 return TOKEN_PARTITIONS;
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 248 "../SqlLexer.lpp"
+#line 249 "../SqlLexer.lpp"
 return TOKEN_PERCENT;
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 249 "../SqlLexer.lpp"
+#line 250 "../SqlLexer.lpp"
 return TOKEN_PRIMARY;
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 250 "../SqlLexer.lpp"
-return TOKEN_QUIT;
+#line 251 "../SqlLexer.lpp"
+return TOKEN_PRIORITY;
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 251 "../SqlLexer.lpp"
-return TOKEN_RANGE;
+#line 252 "../SqlLexer.lpp"
+return TOKEN_QUIT;
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 252 "../SqlLexer.lpp"
-return TOKEN_REAL;
+#line 253 "../SqlLexer.lpp"
+return TOKEN_RANGE;
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 253 "../SqlLexer.lpp"
-return TOKEN_REFERENCES;
+#line 254 "../SqlLexer.lpp"
+return TOKEN_REAL;
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 254 "../SqlLexer.lpp"
-return TOKEN_REGEXP;
+#line 255 "../SqlLexer.lpp"
+return TOKEN_REFERENCES;
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 255 "../SqlLexer.lpp"
-return TOKEN_RIGHT;
+#line 256 "../SqlLexer.lpp"
+return TOKEN_REGEXP;
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 256 "../SqlLexer.lpp"
-return TOKEN_ROW_DELIMITER;
+#line 257 "../SqlLexer.lpp"
+return TOKEN_RIGHT;
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 257 "../SqlLexer.lpp"
-return TOKEN_SECOND;
+#line 258 "../SqlLexer.lpp"
+return TOKEN_ROW_DELIMITER;
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 258 "../SqlLexer.lpp"
-return TOKEN_SELECT;
+#line 259 "../SqlLexer.lpp"
+return TOKEN_SECOND;
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 259 "../SqlLexer.lpp"
-return TOKEN_SET;
+#line 260 "../SqlLexer.lpp"
+return TOKEN_SELECT;
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 260 "../SqlLexer.lpp"
-return TOKEN_SMA;
+#line 261 "../SqlLexer.lpp"
+return TOKEN_SET;
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 261 "../SqlLexer.lpp"
-return TOKEN_SMALLINT;
+#line 262 "../SqlLexer.lpp"
+return TOKEN_SMA;
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 262 "../SqlLexer.lpp"
-return TOKEN_SUBSTRING;
+#line 263 "../SqlLexer.lpp"
+return TOKEN_SMALLINT;
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 263 "../SqlLexer.lpp"
-return TOKEN_TABLE;
+#line 264 "../SqlLexer.lpp"
+return TOKEN_SUBSTRING;
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 264 "../SqlLexer.lpp"
-return TOKEN_THEN;
+#line 265 "../SqlLexer.lpp"
+return TOKEN_TABLE;
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 265 "../SqlLexer.lpp"
-return TOKEN_TIME;
+#line 266 "../SqlLexer.lpp"
+return TOKEN_THEN;
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 266 "../SqlLexer.lpp"
-return TOKEN_TIMESTAMP;
+#line 267 "../SqlLexer.lpp"
+return TOKEN_TIME;
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 267 "../SqlLexer.lpp"
-return TOKEN_TRUE;
+#line 268 "../SqlLexer.lpp"
+return TOKEN_TIMESTAMP;
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 268 "../SqlLexer.lpp"
-return TOKEN_TUPLESAMPLE;
+#line 269 "../SqlLexer.lpp"
+return TOKEN_TRUE;
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 269 "../SqlLexer.lpp"
-return TOKEN_UNIQUE;
+#line 270 "../SqlLexer.lpp"
+return TOKEN_TUPLESAMPLE;
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 270 "../SqlLexer.lpp"
-return TOKEN_UPDATE;
+#line 271 "../SqlLexer.lpp"
+return TOKEN_UNIQUE;
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 271 "../SqlLexer.lpp"
-return TOKEN_USING;
+#line 272 "../SqlLexer.lpp"
+return TOKEN_UPDATE;
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 272 "../SqlLexer.lpp"
-return TOKEN_VALUES;
+#line 273 "../SqlLexer.lpp"
+return TOKEN_USING;
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 273 "../SqlLexer.lpp"
-return TOKEN_VARCHAR;
+#line 274 "../SqlLexer.lpp"
+return TOKEN_VALUES;
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 274 "../SqlLexer.lpp"
-return TOKEN_WHEN;
+#line 275 "../SqlLexer.lpp"
+return TOKEN_VARCHAR;
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 275 "../SqlLexer.lpp"
-return TOKEN_WHERE;
+#line 276 "../SqlLexer.lpp"
+return TOKEN_WHEN;
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 276 "../SqlLexer.lpp"
-return TOKEN_WITH;
+#line 277 "../SqlLexer.lpp"
+return TOKEN_WHERE;
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 277 "../SqlLexer.lpp"
-return TOKEN_YEAR;
+#line 278 "../SqlLexer.lpp"
+return TOKEN_WITH;
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 278 "../SqlLexer.lpp"
-return TOKEN_YEARMONTH;
+#line 279 "../SqlLexer.lpp"
+return TOKEN_YEAR;
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
 #line 280 "../SqlLexer.lpp"
-return TOKEN_EQ;
+return TOKEN_YEARMONTH;
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 281 "../SqlLexer.lpp"
-return TOKEN_NEQ;
+#line 282 "../SqlLexer.lpp"
+return TOKEN_EQ;
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 282 "../SqlLexer.lpp"
+#line 283 "../SqlLexer.lpp"
 return TOKEN_NEQ;
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 283 "../SqlLexer.lpp"
-return TOKEN_LT;
+#line 284 "../SqlLexer.lpp"
+return TOKEN_NEQ;
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 284 "../SqlLexer.lpp"
-return TOKEN_GT;
+#line 285 "../SqlLexer.lpp"
+return TOKEN_LT;
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 285 "../SqlLexer.lpp"
-return TOKEN_LEQ;
+#line 286 "../SqlLexer.lpp"
+return TOKEN_GT;
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 286 "../SqlLexer.lpp"
-return TOKEN_GEQ;
+#line 287 "../SqlLexer.lpp"
+return TOKEN_LEQ;
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
 #line 288 "../SqlLexer.lpp"
-return yytext[0];
+return TOKEN_GEQ;
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 289 "../SqlLexer.lpp"
+#line 290 "../SqlLexer.lpp"
+return yytext[0];
+	YY_BREAK
+case 126:
+YY_RULE_SETUP
+#line 291 "../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 126:
+case 127:
 YY_RULE_SETUP
-#line 295 "../SqlLexer.lpp"
+#line 297 "../SqlLexer.lpp"
 {
     yylval->string_value_ = new quickstep::ParseString(yylloc->first_line, yylloc->first_column);
     BEGIN(CONDITION_STRING_SINGLE_QUOTED_ESCAPED);
   }
 	YY_BREAK
-case 127:
+case 128:
 YY_RULE_SETUP
-#line 300 "../SqlLexer.lpp"
+#line 302 "../SqlLexer.lpp"
 {
     yylval->string_value_ = new quickstep::ParseString(yylloc->first_line, yylloc->first_column);
     BEGIN(CONDITION_STRING_SINGLE_QUOTED);
   }
 	YY_BREAK
-case 128:
+case 129:
 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_DOUBLE_QUOTED);
@@ -2092,7 +2076,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 314 "../SqlLexer.lpp"
+#line 316 "../SqlLexer.lpp"
 {
     delete yylval->string_value_;
     BEGIN(INITIAL);
@@ -2103,9 +2087,9 @@ case YY_STATE_EOF(CONDITION_STRING_DOUBLE_QUOTED):
 
 /* Process escape sequences. */
 
-case 129:
+case 130:
 YY_RULE_SETUP
-#line 324 "../SqlLexer.lpp"
+#line 326 "../SqlLexer.lpp"
 {
     /* Octal code */
     unsigned int code;
@@ -2119,9 +2103,9 @@ YY_RULE_SETUP
     yylval->string_value_->push_back(code);
   }
 	YY_BREAK
-case 130:
+case 131:
 YY_RULE_SETUP
-#line 336 "../SqlLexer.lpp"
+#line 338 "../SqlLexer.lpp"
 {
     /* Hexadecimal code */
     unsigned int code;
@@ -2129,9 +2113,9 @@ YY_RULE_SETUP
     yylval->string_value_->push_back(code);
   }
 	YY_BREAK
-case 131:
+case 132:
 YY_RULE_SETUP
-#line 342 "../SqlLexer.lpp"
+#line 344 "../SqlLexer.lpp"
 {
     /* A numeric escape sequence that isn't correctly specified. */
     delete yylval->string_value_;
@@ -2140,58 +2124,58 @@ YY_RULE_SETUP
     return TOKEN_LEX_ERROR;
   }
 	YY_BREAK
-case 132:
+case 133:
 YY_RULE_SETUP
-#line 349 "../SqlLexer.lpp"
+#line 351 "../SqlLexer.lpp"
 {
     /* Backspace */
     yylval->string_value_->push_back('\b');
   }
 	YY_BREAK
-case 133:
+case 134:
 YY_RULE_SETUP
-#line 353 "../SqlLexer.lpp"
+#line 355 "../SqlLexer.lpp"
 {
     /* Form-feed */
     yylval->string_value_->push_back('\f');
   }
 	YY_BREAK
-case 134:
+case 135:
 YY_RULE_SETUP
-#line 357 "../SqlLexer.lpp"
+#line 359 "../SqlLexer.lpp"
 {
     /* Newline */
     yylval->string_value_->push_back('\n');
   }
 	YY_BREAK
-case 135:
+case 136:
 YY_RULE_SETUP
-#line 361 "../SqlLexer.lpp"
+#line 363 "../SqlLexer.lpp"
 {
     /* Carriage-return */
     yylval->string_value_->push_back('\r');
   }
 	YY_BREAK
-case 136:
+case 137:
 YY_RULE_SETUP
-#line 365 "../SqlLexer.lpp"
+#line 367 "../SqlLexer.lpp"
 {
     /* Horizontal Tab */
     yylval->string_value_->push_back('\t');
   }
 	YY_BREAK
-case 137:
-/* rule 137 can match eol */
+case 138:
+/* rule 138 can match eol */
 YY_RULE_SETUP
-#line 369 "../SqlLexer.lpp"
+#line 371 "../SqlLexer.lpp"
 {
     /* Any other character (including actual newline or carriage return) */
     yylval->string_value_->push_back(yytext[1]);
   }
 	YY_BREAK
-case 138:
+case 139:
 YY_RULE_SETUP
-#line 373 "../SqlLexer.lpp"
+#line 375 "../SqlLexer.lpp"
 {
     /* This should only be encountered right before an EOF. */
     delete yylval->string_value_;
@@ -2202,17 +2186,17 @@ YY_RULE_SETUP
 	YY_BREAK
 
 
-case 139:
+case 140:
 YY_RULE_SETUP
-#line 383 "../SqlLexer.lpp"
+#line 385 "../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 140:
+case 141:
 YY_RULE_SETUP
-#line 387 "../SqlLexer.lpp"
+#line 389 "../SqlLexer.lpp"
 {
     /* End string */
     BEGIN(CONDITION_SQL);
@@ -2221,17 +2205,17 @@ YY_RULE_SETUP
 	YY_BREAK
 
 
-case 141:
+case 142:
 YY_RULE_SETUP
-#line 395 "../SqlLexer.lpp"
+#line 397 "../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 142:
+case 143:
 YY_RULE_SETUP
-#line 399 "../SqlLexer.lpp"
+#line 401 "../SqlLexer.lpp"
 {
     /* End string */
     BEGIN(CONDITION_SQL);
@@ -2239,94 +2223,94 @@ YY_RULE_SETUP
   }
 	YY_BREAK
 
-case 143:
-/* rule 143 can match eol */
+case 144:
+/* rule 144 can match eol */
 YY_RULE_SETUP
-#line 406 "../SqlLexer.lpp"
+#line 408 "../SqlLexer.lpp"
 {
   /* Scan up to a quote. */
   yylval->string_value_->append(yytext, yyleng);
 }
 	YY_BREAK
-case 144:
-/* rule 144 can match eol */
+case 145:
+/* rule 145 can match eol */
 YY_RULE_SETUP
-#line 411 "../SqlLexer.lpp"
+#line 413 "../SqlLexer.lpp"
 {
   /* Scan up to a quote or escape sequence. */
   yylval->string_value_->append(yytext, yyleng);
 }
 	YY_BREAK
-case 145:
-/* rule 145 can match eol */
+case 146:
+/* rule 146 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 146:
+case 147:
 YY_RULE_SETUP
-#line 422 "../SqlLexer.lpp"
+#line 424 "../SqlLexer.lpp"
 {
     yylval->string_value_ = new quickstep::ParseString(
         yylloc->first_line, yylloc->first_column, std::string(yytext, yyleng));
     return TOKEN_NAME;
   }
 	YY_BREAK
-case 147:
+case 148:
 YY_RULE_SETUP
-#line 428 "../SqlLexer.lpp"
+#line 430 "../SqlLexer.lpp"
 {
     yylval->numeric_literal_value_ = new quickstep::NumericParseLiteralValue(
         yylloc->first_line, yylloc->first_column, yytext);
     return TOKEN_UNSIGNED_NUMVAL;
   }
 	YY_BREAK
-case 148:
-YY_RULE_SETUP
-#line 434 "../SqlLexer.lpp"
-/* comment */
-	YY_BREAK
 case 149:
-/* rule 149 can match eol */
 YY_RULE_SETUP
 #line 436 "../SqlLexer.lpp"
-{ yycolumn = 0; }
+/* comment */
 	YY_BREAK
 case 150:
+/* rule 150 can match eol */
 YY_RULE_SETUP
 #line 438 "../SqlLexer.lpp"
+{ yycolumn = 0; }
+	YY_BREAK
+case 151:
+YY_RULE_SETUP
+#line 440 "../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 442 "../SqlLexer.lpp"
+#line 444 "../SqlLexer.lpp"
 {
   /* All conditions except for mutli-state string extracting conditions. */
   BEGIN(INITIAL);
   return TOKEN_EOF;
 }
 	YY_BREAK
-case 151:
+case 152:
 YY_RULE_SETUP
-#line 448 "../SqlLexer.lpp"
+#line 450 "../SqlLexer.lpp"
 {
   BEGIN(INITIAL);
   quickstep_yyerror(NULL, yyscanner, NULL, "illegal character");
   return TOKEN_LEX_ERROR;
 }
 	YY_BREAK
-case 152:
+case 153:
 YY_RULE_SETUP
-#line 454 "../SqlLexer.lpp"
+#line 456 "../SqlLexer.lpp"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 2330 "SqlLexer_gen.cpp"
+#line 2314 "SqlLexer_gen.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2456,7 +2440,6 @@ YY_FATAL_ERROR( "flex scanner jammed" );
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
-	} /* end of user's declarations */
 } /* end of quickstep_yylex */
 
 /* yy_get_next_buffer - try to read in a new buffer
@@ -2469,9 +2452,9 @@ YY_FATAL_ERROR( "flex scanner jammed" );
 static int yy_get_next_buffer (yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	char *source = yyg->yytext_ptr;
-	yy_size_t number_to_move, i;
+	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = yyg->yytext_ptr;
+	register int 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] )
@@ -2500,7 +2483,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 = (yy_size_t) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1;
+	number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1;
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
@@ -2603,15 +2586,15 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 
     static yy_state_type yy_get_previous_state (yyscan_t yyscanner)
 {
-	yy_state_type yy_current_state;
-	char *yy_cp;
+	register yy_state_type yy_current_state;
+	register 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 )
 		{
-		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		register 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;
@@ -2620,7 +2603,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 >= 553 )
+			if ( yy_current_state >= 558 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2636,11 +2619,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)
 {
-	int yy_is_jam;
+	register int yy_is_jam;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */
-	char *yy_cp = yyg->yy_c_buf_p;
+	register char *yy_cp = yyg->yy_c_buf_p;
 
-	YY_CHAR yy_c = 1;
+	register YY_CHAR yy_c = 1;
 	if ( yy_accept[yy_current_state] )
 		{
 		yyg->yy_last_accepting_state = yy_current_state;
@@ -2649,20 +2632,16 @@ 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 >= 553 )
+		if ( yy_current_state >= 558 )
 			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 == 552);
+	yy_is_jam = (yy_current_state == 557);
 
 	(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)
@@ -2823,7 +2802,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 = (yy_size_t)size;
+	b->yy_buf_size = 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.
@@ -2984,7 +2963,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; // After all that talk, this was set to 1 anyways...
+		num_to_alloc = 1;
 		yyg->yy_buffer_stack = (struct yy_buffer_state**)quickstep_yyalloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								, yyscanner);
@@ -3001,7 +2980,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. */
-		yy_size_t grow_size = 8 /* arbitrary grow size */;
+		int 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
@@ -3078,7 +3057,7 @@ YY_BUFFER_STATE quickstep_yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yy
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
-	yy_size_t i;
+	int i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
@@ -3109,9 +3088,7 @@ 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)
 {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	(void)yyg;
-	(void) fprintf( stderr, "%s\n", msg );
+    	(void) fprintf( stderr, "%s\n", msg );
 	exit( YY_EXIT_FAILURE );
 }
 
@@ -3217,10 +3194,10 @@ void quickstep_yyset_extra (YY_EXTRA_TYPE  user_defined , yyscan_t yyscanner)
 }
 
 /** Set the current line number.
- * @param _line_number line number
+ * @param 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;
 
@@ -3228,14 +3205,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 _column_no column number
+ * @param line_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;
 
@@ -3243,25 +3220,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)
@@ -3270,10 +3247,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 */
@@ -3436,10 +3413,7 @@ 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)
 {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	(void)yyg;
-
-	int i;
+	register int i;
 	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
 }
@@ -3448,7 +3422,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)
 {
-	int n;
+	register int n;
 	for ( n = 0; s[n]; ++n )
 		;
 
@@ -3458,16 +3432,11 @@ 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
@@ -3480,14 +3449,12 @@ 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 454 "../SqlLexer.lpp"
+#line 456 "../SqlLexer.lpp"
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/604ed99b/parser/preprocessed/SqlLexer_gen.hpp
----------------------------------------------------------------------
diff --git a/parser/preprocessed/SqlLexer_gen.hpp b/parser/preprocessed/SqlLexer_gen.hpp
index c14559b..e1a9b28 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 6
-#define YY_FLEX_SUBMINOR_VERSION 0
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 37
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -132,15 +132,7 @@ typedef void* yyscan_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
 #define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
 #endif
 
 #ifndef YY_TYPEDEF_YY_BUFFER_STATE
@@ -222,7 +214,7 @@ void quickstep_yyfree (void * ,yyscan_t yyscanner );
 
 /* Begin user sect3 */
 
-#define quickstep_yywrap(yyscanner) (/*CONSTCOND*/1)
+#define quickstep_yywrap(yyscanner) 1
 #define YY_SKIP_YYWRAP
 
 #define yytext_ptr yytext_r
@@ -268,11 +260,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 +272,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 );
 
@@ -320,12 +312,7 @@ static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
 #define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
 #endif
 
 /* Number of entries by which start-condition stack grows. */
@@ -360,9 +347,9 @@ extern int quickstep_yylex \
 #undef YY_DECL
 #endif
 
-#line 454 "../SqlLexer.lpp"
+#line 456 "../SqlLexer.lpp"
 
 
-#line 367 "SqlLexer_gen.hpp"
+#line 354 "SqlLexer_gen.hpp"
 #undef quickstep_yyIN_HEADER
 #endif /* quickstep_yyHEADER_H */


Mime
View raw message