You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@quickstep.apache.org by ji...@apache.org on 2017/10/11 18:38:43 UTC

[19/41] incubator-quickstep git commit: Refactor type system and operations.

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/cb564509/parser/SqlParser.ypp
----------------------------------------------------------------------
diff --git a/parser/SqlParser.ypp b/parser/SqlParser.ypp
index 8fbcdd7..af79fe3 100644
--- a/parser/SqlParser.ypp
+++ b/parser/SqlParser.ypp
@@ -102,15 +102,9 @@ typedef struct YYLTYPE {
 #include "types/Type.hpp"
 #include "types/TypeFactory.hpp"
 #include "types/TypeID.hpp"
-#include "types/operations/binary_operations/BinaryOperation.hpp"
-#include "types/operations/binary_operations/BinaryOperationFactory.hpp"
-#include "types/operations/binary_operations/BinaryOperationID.hpp"
 #include "types/operations/comparisons/Comparison.hpp"
 #include "types/operations/comparisons/ComparisonFactory.hpp"
 #include "types/operations/comparisons/ComparisonID.hpp"
-#include "types/operations/unary_operations/UnaryOperation.hpp"
-#include "types/operations/unary_operations/UnaryOperationFactory.hpp"
-#include "types/operations/unary_operations/UnaryOperationID.hpp"
 #include "utility/PtrList.hpp"
 #include "utility/PtrVector.hpp"
 
@@ -189,8 +183,8 @@ typedef void* yyscan_t;
   quickstep::ParseStatementQuit *quit_statement_;
 
   const quickstep::Comparison *comparison_;
-  const quickstep::UnaryOperation *unary_operation_;
-  const quickstep::BinaryOperation *binary_operation_;
+  quickstep::ParseString *unary_operation_;
+  quickstep::ParseString *binary_operation_;
 
   quickstep::ParseFunctionCall *function_call_;
   quickstep::PtrList<quickstep::ParseExpression> *expression_list_;
@@ -261,6 +255,7 @@ void NotSupported(const YYLTYPE *location, yyscan_t yyscanner, const std::string
 %token TOKEN_CSB_TREE;
 %token TOKEN_BY;
 %token TOKEN_CASE;
+%token TOKEN_CAST;
 %token TOKEN_CHARACTER;
 %token TOKEN_CHECK;
 %token TOKEN_COLUMN;
@@ -394,6 +389,7 @@ void NotSupported(const YYLTYPE *location, yyscan_t yyscanner, const std::string
   add_expression
   case_expression
   opt_else_clause
+  cast_function
   extract_function
   substr_function
 
@@ -624,8 +620,6 @@ void NotSupported(const YYLTYPE *location, yyscan_t yyscanner, const std::string
 
 %destructor { } <boolean_value_>
 %destructor { } <comparison_>
-%destructor { } <unary_operation_>
-%destructor { } <binary_operation_>
 %destructor { } <join_type_>
 
 %destructor {
@@ -1676,7 +1670,10 @@ predicate_expression_base:
 /* Scalars */
 add_expression:
   add_expression add_operation multiply_expression {
-    $$ = new quickstep::ParseBinaryExpression(@2.first_line, @2.first_column, *$2, $1, $3);
+    auto *arguments = new quickstep::PtrList<quickstep::ParseExpression>();
+    arguments->push_back($1);
+    arguments->push_back($3);
+    $$ = new quickstep::ParseFunctionCall(@1.first_line, @1.first_column, false, $2, arguments);
   }
   | multiply_expression {
     $$ = $1;
@@ -1684,7 +1681,10 @@ add_expression:
 
 multiply_expression:
   multiply_expression multiply_operation unary_expression {
-    $$ = new quickstep::ParseBinaryExpression(@2.first_line, @2.first_column, *$2, $1, $3);
+    auto *arguments = new quickstep::PtrList<quickstep::ParseExpression>();
+    arguments->push_back($1);
+    arguments->push_back($3);
+    $$ = new quickstep::ParseFunctionCall(@1.first_line, @1.first_column, false, $2, arguments);
   }
   | unary_expression {
     $$ = $1;
@@ -1692,7 +1692,9 @@ multiply_expression:
 
 unary_expression:
   unary_operation expression_base {
-    $$ = new quickstep::ParseUnaryExpression(@1.first_line, @1.first_column, *$1, $2);
+    auto *arguments = new quickstep::PtrList<quickstep::ParseExpression>();
+    arguments->push_back($2);
+    $$ = new quickstep::ParseFunctionCall(@1.first_line, @1.first_column, false, $1, arguments);
   }
   | expression_base {
     $$ = $1;
@@ -1716,6 +1718,9 @@ expression_base:
     $1->setWindow($4);
     $$ = $1;
   }
+  | cast_function {
+    $$ = $1;
+  }
   | extract_function {
     $$ = $1;
   }
@@ -1748,19 +1753,59 @@ function_call:
     $$ = new quickstep::ParseFunctionCall(@1.first_line, @1.first_column, true, $1, $4);
   };
 
+cast_function:
+  TOKEN_CAST '(' add_expression TOKEN_AS data_type ')' {
+    auto *arguments = new quickstep::PtrList<quickstep::ParseExpression>();
+    arguments->push_back($3);
+    arguments->push_back(new quickstep::ParseScalarLiteral(
+        new quickstep::StringParseLiteralValue(
+            new quickstep::ParseString(@5.first_line,
+                                       @5.first_column,
+                                       $5->getType().getName()),
+            nullptr)));
+    delete $5;
+    auto *name = new quickstep::ParseString(@1.first_line, @1.first_column, "cast");
+    $$ = new quickstep::ParseFunctionCall(
+        @1.first_line, @1.first_column, false, name, arguments);
+  }
+  | TOKEN_CAST '(' add_expression TOKEN_AS any_name ')' {
+    auto *arguments = new quickstep::PtrList<quickstep::ParseExpression>();
+    arguments->push_back($3);
+    arguments->push_back(new quickstep::ParseScalarLiteral(
+        new quickstep::StringParseLiteralValue($5, nullptr)));
+    auto *name = new quickstep::ParseString(@1.first_line, @1.first_column, "cast");
+    $$ = new quickstep::ParseFunctionCall(
+        @1.first_line, @1.first_column, false, name, arguments);
+  };
+
 extract_function:
   TOKEN_EXTRACT '(' datetime_unit TOKEN_FROM add_expression ')' {
-    $$ = new quickstep::ParseExtractFunction(@1.first_line, @1.first_column, $3, $5);
+    auto *arguments = new quickstep::PtrList<quickstep::ParseExpression>();
+    arguments->push_back($5);
+    arguments->push_back(new quickstep::ParseScalarLiteral(
+        new quickstep::StringParseLiteralValue($3, nullptr)));
+    auto *name = new quickstep::ParseString(@1.first_line, @1.first_column, "extract");
+    $$ = new quickstep::ParseFunctionCall(
+        @1.first_line, @1.first_column, false, name, arguments);
   };
 
 substr_function:
   TOKEN_SUBSTRING '(' add_expression TOKEN_FROM TOKEN_UNSIGNED_NUMVAL ')' {
-    $$ = new quickstep::ParseSubstringFunction(
-        @1.first_line, @1.first_column, $3, $5->long_value());
+    auto *arguments = new quickstep::PtrList<quickstep::ParseExpression>();
+    arguments->push_back($3);
+    arguments->push_back(new quickstep::ParseScalarLiteral($5));
+    auto *name = new quickstep::ParseString(@1.first_line, @1.first_column, "substring");
+    $$ = new quickstep::ParseFunctionCall(
+        @1.first_line, @1.first_column, false, name, arguments);
   }
   | TOKEN_SUBSTRING '(' add_expression TOKEN_FROM TOKEN_UNSIGNED_NUMVAL TOKEN_FOR TOKEN_UNSIGNED_NUMVAL ')' {
-    $$ = new quickstep::ParseSubstringFunction(
-        @1.first_line, @1.first_column, $3, $5->long_value(), $7->long_value());
+    auto *arguments = new quickstep::PtrList<quickstep::ParseExpression>();
+    arguments->push_back($3);
+    arguments->push_back(new quickstep::ParseScalarLiteral($5));
+    arguments->push_back(new quickstep::ParseScalarLiteral($7));
+    auto *name = new quickstep::ParseString(@1.first_line, @1.first_column, "substring");
+    $$ = new quickstep::ParseFunctionCall(
+        @1.first_line, @1.first_column, false, name, arguments);
   };
 
 case_expression:
@@ -1980,26 +2025,26 @@ unary_operation:
      * to shift rather than reduce, the case in 'literal_value' has precedence
      * over this one.
      **/
-    $$ = &quickstep::UnaryOperationFactory::GetUnaryOperation(quickstep::UnaryOperationID::kNegate);
+    $$ = new quickstep::ParseString(@1.first_line, @1.first_column, std::string("-"));
   };
 
 add_operation:
   '+' {
-    $$ = &quickstep::BinaryOperationFactory::GetBinaryOperation(quickstep::BinaryOperationID::kAdd);
+    $$ = new quickstep::ParseString(@1.first_line, @1.first_column, std::string("+"));
   }
   | '-' {
-    $$ = &quickstep::BinaryOperationFactory::GetBinaryOperation(quickstep::BinaryOperationID::kSubtract);
+    $$ = new quickstep::ParseString(@1.first_line, @1.first_column, std::string("-"));
   };
 
 multiply_operation:
   '%' {
-    $$ = &quickstep::BinaryOperationFactory::GetBinaryOperation(quickstep::BinaryOperationID::kModulo);
+    $$ = new quickstep::ParseString(@1.first_line, @1.first_column, std::string("%"));
   }
   | '*' {
-    $$ = &quickstep::BinaryOperationFactory::GetBinaryOperation(quickstep::BinaryOperationID::kMultiply);
+    $$ = new quickstep::ParseString(@1.first_line, @1.first_column, std::string("*"));
   }
   | '/' {
-    $$ = &quickstep::BinaryOperationFactory::GetBinaryOperation(quickstep::BinaryOperationID::kDivide);
+    $$ = new quickstep::ParseString(@1.first_line, @1.first_column, std::string("/"));
   };
 
 /* General Utility Stuff */

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/cb564509/parser/preprocessed/SqlLexer_gen.cpp
----------------------------------------------------------------------
diff --git a/parser/preprocessed/SqlLexer_gen.cpp b/parser/preprocessed/SqlLexer_gen.cpp
index 4800cde..b1ea67f 100644
--- a/parser/preprocessed/SqlLexer_gen.cpp
+++ b/parser/preprocessed/SqlLexer_gen.cpp
@@ -592,8 +592,8 @@ static void yynoreturn yy_fatal_error ( const char* msg , yyscan_t yyscanner );
 	yyg->yy_hold_char = *yy_cp; \
 	*yy_cp = '\0'; \
 	yyg->yy_c_buf_p = yy_cp;
-#define YY_NUM_RULES 164
-#define YY_END_OF_BUFFER 165
+#define YY_NUM_RULES 165
+#define YY_END_OF_BUFFER 166
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -601,72 +601,72 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static const flex_int16_t yy_accept[589] =
+static const flex_int16_t yy_accept[590] =
     {   0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  165,    2,    2,  163,  163,  162,  161,  163,
-      140,  136,  139,  136,  136,  159,  132,  129,  133,  158,
-      158,  158,  158,  158,  158,  158,  158,  158,  158,  158,
-      158,  158,  158,  158,  158,  158,  158,  158,  158,  158,
-      158,  158,  158,  158,  137,    4,    5,    5,    3,  155,
-      155,  152,  156,  156,  150,  157,  157,  154,    1,  162,
-      130,  160,  159,  159,  159,    0,  134,  131,  135,  158,
-      158,  158,  158,   10,  158,  158,  158,   22,  158,  158,
-      158,  158,  158,  158,  158,  158,  158,  158,  158,  138,
-
-      158,  158,  158,  158,  158,  158,  158,  158,  158,  158,
-      158,  158,   58,   67,  158,  158,  158,  158,  158,  158,
-      158,  158,  158,  158,  158,   81,   82,  158,  158,  158,
-      158,  158,  158,  158,  158,  158,  158,  158,  158,  158,
-      158,  158,  158,  158,  113,  158,  158,  158,  158,  158,
-      158,  158,  158,  158,    4,    5,    3,  155,  151,  156,
-      149,  149,  141,  143,  144,  145,  146,  147,  148,  149,
-      157,  153,  160,  159,    0,  159,    6,    7,  158,    9,
-       11,  158,  158,   15,  158,  158,  158,  158,  158,  158,
-      158,  158,  158,  158,  158,   33,  158,  158,  158,  158,
-
-      158,  158,  158,  158,   43,  158,  158,  158,  158,  158,
-      158,   50,  158,  158,  158,  158,  158,  158,  158,  158,
-      158,   62,  158,   69,  158,  158,  158,  158,  158,  158,
-      158,   77,  158,   80,  158,  158,  158,  158,  158,  158,
-      158,  158,  158,  158,  158,  158,  158,   98,  158,  158,
-      103,  104,  158,  158,  158,  158,  158,  158,  158,  158,
-      158,  158,  158,  158,  158,  158,  158,  158,  158,  141,
-      143,  142,  158,  158,  158,  158,  158,  158,  158,   20,
-       23,  158,  158,  158,   28,  158,  158,  158,   31,  158,
-      158,  158,   37,  158,  158,   41,   42,  158,  158,  158,
-
-      158,  158,  158,  158,   52,   53,  158,   55,  158,   57,
-      158,  158,  158,  158,   66,   68,   70,   71,   72,  158,
-       74,  158,  158,   78,  158,  158,   85,  158,  158,  158,
-      158,  158,   92,  158,   94,  158,  158,  158,  100,  158,
-      158,  158,  158,  158,  158,  158,  158,  110,  111,  114,
-      158,  158,  158,  158,  158,  158,  158,  158,  123,  158,
-      158,  126,  127,  141,  142,    8,  158,  158,  158,  158,
-      158,  158,  158,   25,  158,  158,  158,  158,  158,  158,
-      158,  158,  158,  158,  158,  158,  158,  158,   46,   47,
-       48,  158,  158,   54,  158,   59,   60,  158,  158,  158,
-
-       73,  158,   76,   79,   83,   84,  158,  158,  158,  158,
-      158,   93,  158,  158,   97,  158,  158,  158,  158,  158,
-      158,  158,  109,  158,  158,  158,  117,  158,  158,  120,
-      158,  158,  124,  158,  158,  158,  158,   14,  158,  158,
-      158,  158,  158,   26,  158,   29,  158,  158,  158,  158,
-      158,   36,  158,  158,   40,   44,  158,  158,  158,   56,
-       61,  158,  158,  158,   75,  158,  158,  158,  158,  158,
-      158,   96,  158,  101,  102,  158,  106,  107,  158,  158,
-      158,  158,  118,  119,  121,  158,  125,  158,  158,   13,
-      158,  158,  158,  158,  158,  158,   21,   30,  158,   34,
-
-       35,  158,  158,   45,  158,   51,   63,  158,  158,  158,
-       88,  158,   90,  158,  158,  158,  158,  158,  158,  158,
-      158,  122,  158,  158,  158,  158,  158,  158,  158,  158,
-       32,  158,   39,  158,  158,   65,  158,  158,   91,  158,
-      158,  105,  158,  158,  158,  158,  158,   12,  158,  158,
-      158,  158,   24,  158,  158,   49,   64,   86,   89,  158,
-      158,  108,  112,  158,  116,  128,   16,  158,  158,  158,
-       27,   38,   87,   95,  158,  158,  158,   18,   19,  158,
-      115,  158,  158,  158,   99,  158,   17,    0
+        0,    0,  166,    2,    2,  164,  164,  163,  162,  164,
+      141,  137,  140,  137,  137,  160,  133,  130,  134,  159,
+      159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  138,    4,    5,    5,    3,  156,
+      156,  153,  157,  157,  151,  158,  158,  155,    1,  163,
+      131,  161,  160,  160,  160,    0,  135,  132,  136,  159,
+      159,  159,  159,   10,  159,  159,  159,   23,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,  159,  159,  139,
+
+      159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,  159,   59,   68,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,   82,   83,  159,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  114,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,    4,    5,    3,  156,  152,  157,
+      150,  150,  142,  144,  145,  146,  147,  148,  149,  150,
+      158,  154,  161,  160,    0,  160,    6,    7,  159,    9,
+       11,  159,  159,   15,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,   34,  159,  159,  159,  159,
+
+      159,  159,  159,  159,   44,  159,  159,  159,  159,  159,
+      159,   51,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,   63,  159,   70,  159,  159,  159,  159,  159,  159,
+      159,   78,  159,   81,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,   99,  159,  159,
+      104,  105,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,  159,  159,  142,
+      144,  143,  159,  159,  159,  159,  159,  159,  159,   20,
+       21,   24,  159,  159,  159,   29,  159,  159,  159,   32,
+      159,  159,  159,   38,  159,  159,   42,   43,  159,  159,
+
+      159,  159,  159,  159,  159,   53,   54,  159,   56,  159,
+       58,  159,  159,  159,  159,   67,   69,   71,   72,   73,
+      159,   75,  159,  159,   79,  159,  159,   86,  159,  159,
+      159,  159,  159,   93,  159,   95,  159,  159,  159,  101,
+      159,  159,  159,  159,  159,  159,  159,  159,  111,  112,
+      115,  159,  159,  159,  159,  159,  159,  159,  159,  124,
+      159,  159,  127,  128,  142,  143,    8,  159,  159,  159,
+      159,  159,  159,  159,   26,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,  159,  159,   47,
+       48,   49,  159,  159,   55,  159,   60,   61,  159,  159,
+
+      159,   74,  159,   77,   80,   84,   85,  159,  159,  159,
+      159,  159,   94,  159,  159,   98,  159,  159,  159,  159,
+      159,  159,  159,  110,  159,  159,  159,  118,  159,  159,
+      121,  159,  159,  125,  159,  159,  159,  159,   14,  159,
+      159,  159,  159,  159,   27,  159,   30,  159,  159,  159,
+      159,  159,   37,  159,  159,   41,   45,  159,  159,  159,
+       57,   62,  159,  159,  159,   76,  159,  159,  159,  159,
+      159,  159,   97,  159,  102,  103,  159,  107,  108,  159,
+      159,  159,  159,  119,  120,  122,  159,  126,  159,  159,
+       13,  159,  159,  159,  159,  159,  159,   22,   31,  159,
+
+       35,   36,  159,  159,   46,  159,   52,   64,  159,  159,
+      159,   89,  159,   91,  159,  159,  159,  159,  159,  159,
+      159,  159,  123,  159,  159,  159,  159,  159,  159,  159,
+      159,   33,  159,   40,  159,  159,   66,  159,  159,   92,
+      159,  159,  106,  159,  159,  159,  159,  159,   12,  159,
+      159,  159,  159,   25,  159,  159,   50,   65,   87,   90,
+      159,  159,  109,  113,  159,  117,  129,   16,  159,  159,
+      159,   28,   39,   88,   96,  159,  159,  159,   18,   19,
+      159,  116,  159,  159,  159,  100,  159,   17,    0
     } ;
 
 static const YY_CHAR yy_ec[256] =
@@ -713,155 +713,155 @@ static const YY_CHAR yy_meta[72] =
         8
     } ;
 
-static const flex_int16_t yy_base[604] =
+static const flex_int16_t yy_base[605] =
     {   0,
         0,    1,   46,    0,  117,  162,    2,    3,  127,  128,
-        6,   10,  147, 1316, 1316,    0, 1316,   13, 1316,  130,
-     1316, 1316, 1316,  129,    6,  129,    4, 1316,   28,  124,
+        6,   10,  147, 1317, 1317,    0, 1317,   13, 1317,  130,
+     1317, 1317, 1317,  129,    6,  129,    4, 1317,   28,  124,
       159,  213,  165,  167,  263,   92,  158,  163,   96,  107,
       214,  160,  186,  219,  221,  155,  281,  274,  325,  257,
-      186,  209,    0,  219, 1316,   27,    4,   19,    0,    0,
+      186,  209,    0,  219, 1317,   27,    4,   19,    0,    0,
         0,   17,    0,    0,  389,    0,    0,    8,    0,   22,
-     1316,    0,  293,  325,  343,   18, 1316, 1316, 1316,    0,
+     1317,    0,  293,  325,  343,   18, 1317, 1317, 1317,    0,
       223,  265,  234,  242,  260,  292,  288,    0,  299,  330,
-      337,  324,  334,  324,  325,  380,  325,  331,  346, 1316,
+      337,  324,  334,  324,  325,  380,  325,  331,  346, 1317,
 
       348,  364,  378,  376,  371,  378,  382,  386,  390,  389,
       386,  385,  435,    0,  402,  389,  400,  435,  433,  431,
       433,  436,  431,  440,  447,    0,  452,  437,  453,  441,
       442,  456,  453,  449,  465,  457,  444,  494,  468,  495,
       500,  501,  499,  492,    0,  486,  492,  507,  506,  502,
-      500,  508,  501,  516,    0,   29,    0,    0, 1316,    0,
-     1316, 1316,   22,   24, 1316, 1316, 1316, 1316, 1316,    0,
-        0, 1316,    0,  524,   26,   28,    0,    0,  517,    0,
-      518,  501,  516,  504,  545,  525,  531,  552,  536,  542,
-      537,  562,  544,  547,  561,    0,  558,  567,  564,  567,
-
-      551,  570,  557,  569,    0,  556,  558,  560,  561,  580,
-      570,  578,  572,  575,  567,  598,  598,  595,  610,  613,
-      614,  615,  607,    0,  602,  603,  619,  616,  619,  606,
-      608,    0,  617,    0,  626,  627,  615,  614,  634,  635,
-      626,  620,  636,  633,  641,  659,  657,  652,  658,  671,
-        0,  665,  673,  660,  668,  668,  678,  679,  673,  671,
-      672,  689,  677,  671,  692,  683,  692,  690,  681,   30,
-      125,    0,  685,  690,  705,  708,  718,  718,  718,    0,
-      733,  724,  723,  717,    0,  718,  722,  736,  722,  730,
-      723,  725,  741,  738,  736,    0,    0,  729,  749,  748,
-
-      734,  735,  741,  748,    0,    0,  743,    0,  747,    0,
-      738,  750,  762,  774,    0,    0,    0,    0,    0,  767,
-        0,  769,  785,  775,  777,  778,    0,  789,  794,  795,
-      800,  784,    0,  798,    0,  786,  781,  786,    0,  803,
-      794,  808,  800,  795,  793,  795,  812,    0,  800,    0,
-      815,  805,  824,  818,  825,  840,  845,  843,    0,  847,
-      838,    0,  841,  131, 1316,    0,  852,  852,  838,  858,
-      844,  855,  859,    0,  850,  847,  861,  864,  856,  862,
-      871,  861,  870,  863,  864,  879,  877,  894,    0,    0,
-        0,  880,  898,    0,  901,    0,    0,  889,  905,  892,
-
-        0,  907,    0,    0,    0,    0,  895,  902,  913,  900,
-      910,    0,  915,  905,    0,  917,  919,  904,  918,  910,
-      909,  912,    0,  911,  914,  921,    0,  931,  937,    0,
-      935,  954,    0,  938,  948,  957,  953,    0,  946,  951,
-      969,  963,  953,    0,  973,    0,  970,  956,  964,  966,
-      959,    0,  976,  978,    0,    0,  962,  976,  972,    0,
-        0,  969,  983,  988,    0,  982,  973,  985,  975,  992,
-      999,    0, 1007,    0,    0, 1007,    0,    0, 1015, 1024,
-     1025, 1023,    0,    0,    0, 1010,    0, 1016, 1017,    0,
-     1023, 1018, 1021, 1023, 1031, 1028,    0,    0, 1033,    0,
-
-        0, 1030, 1020,    0, 1029,    0,    0, 1041, 1033, 1031,
-        0, 1033,    0, 1024, 1048, 1043, 1038, 1056, 1058, 1064,
-     1074,    0, 1062, 1076, 1070, 1069, 1070, 1068, 1071, 1076,
-        0, 1077,    0, 1085, 1073,    0, 1080, 1088,    0, 1091,
-     1084,    0, 1091, 1085, 1086, 1099, 1096,    0, 1098, 1102,
-     1097, 1105,    0, 1096, 1121,    0,    0, 1110,    0, 1116,
-     1128,    0,    0, 1128,    0,    0,    0, 1123, 1137, 1125,
-        0,    0,    0,    0, 1124, 1141, 1127,    0,    0, 1143,
-        0, 1140, 1132, 1146,    0, 1133,    0, 1316, 1198, 1208,
-     1218, 1228, 1238, 1242, 1245, 1251, 1261, 1271, 1281, 1291,
-
-     1301, 1306, 1308
+      500,  508,  501,  516,    0,   29,    0,    0, 1317,    0,
+     1317, 1317,   22,   24, 1317, 1317, 1317, 1317, 1317,    0,
+        0, 1317,    0,  524,   26,   28,    0,    0,  517,    0,
+      518,  501,  516,  504,  545,  544,  512,  552,  536,  542,
+      537,  562,  545,  548,  562,    0,  559,  568,  565,  568,
+
+      552,  571,  558,  570,    0,  557,  561,  561,  562,  581,
+      571,  580,  574,  576,  585,  599,  604,  597,  613,  614,
+      615,  616,  608,    0,  603,  604,  620,  617,  620,  607,
+      609,    0,  618,    0,  627,  628,  616,  617,  635,  636,
+      628,  620,  638,  634,  659,  660,  663,  654,  661,  672,
+        0,  666,  674,  661,  669,  668,  679,  680,  674,  672,
+      673,  690,  678,  674,  693,  683,  694,  691,  685,   30,
+      125,    0,  686,  698,  717,  709,  724,  720,  721,    0,
+        0,  734,  725,  724,  718,    0,  719,  722,  737,  723,
+      731,  724,  726,  742,  739,  737,    0,    0,  730,  752,
+
+      749,  735,  736,  742,  750,    0,    0,  745,    0,  748,
+        0,  746,  762,  763,  780,    0,    0,    0,    0,    0,
+      769,    0,  772,  785,  775,  777,  778,    0,  788,  795,
+      796,  801,  785,    0,  799,    0,  787,  782,  787,    0,
+      804,  797,  809,  801,  796,  794,  797,  814,    0,  801,
+        0,  823,  817,  825,  824,  827,  843,  846,  844,    0,
+      848,  839,    0,  842,  131, 1317,    0,  852,  853,  839,
+      859,  845,  856,  860,    0,  851,  848,  864,  865,  857,
+      863,  872,  863,  872,  864,  872,  891,  878,  900,    0,
+        0,    0,  882,  901,    0,  902,    0,    0,  890,  906,
+
+      894,    0,  907,    0,    0,    0,    0,  894,  903,  914,
+      901,  911,    0,  916,  906,    0,  918,  920,  907,  919,
+      911,  910,  913,    0,  913,  916,  922,    0,  939,  949,
+        0,  936,  960,    0,  940,  951,  958,  954,    0,  947,
+      952,  970,  963,  954,    0,  974,    0,  971,  957,  965,
+      967,  960,    0,  977,  979,    0,    0,  965,  977,  973,
+        0,    0,  970,  984,  990,    0,  984,  974,  993,  987,
+      993, 1005,    0, 1009,    0,    0, 1010,    0,    0, 1016,
+     1025, 1026, 1024,    0,    0,    0, 1011,    0, 1016, 1018,
+        0, 1024, 1019, 1022, 1024, 1032, 1029,    0,    0, 1034,
+
+        0,    0, 1031, 1023,    0, 1030,    0,    0, 1042, 1034,
+     1032,    0, 1035,    0, 1026, 1049, 1051, 1050, 1057, 1064,
+     1066, 1077,    0, 1063, 1077, 1071, 1070, 1071, 1068, 1072,
+     1077,    0, 1078,    0, 1086, 1074,    0, 1081, 1089,    0,
+     1092, 1085,    0, 1094, 1086, 1087, 1100, 1097,    0, 1100,
+     1104, 1098, 1113,    0, 1108, 1122,    0,    0, 1116,    0,
+     1118, 1131,    0,    0, 1129,    0,    0,    0, 1124, 1138,
+     1126,    0,    0,    0,    0, 1125, 1141, 1128,    0,    0,
+     1144,    0, 1141, 1133, 1147,    0, 1134,    0, 1317, 1199,
+     1209, 1219, 1229, 1239, 1243, 1246, 1252, 1262, 1272, 1282,
+
+     1292, 1302, 1307, 1309
     } ;
 
-static const flex_int16_t yy_def[604] =
+static const flex_int16_t yy_def[605] =
     {   0,
-      589,  589,  588,    3,  590,  590,  591,  591,  592,  592,
-      593,  593,  588,  588,  588,  594,  588,  588,  588,  588,
-      588,  588,  588,  588,  588,  588,  588,  588,  588,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  588,  588,  588,  588,  596,  597,
-      597,  588,  598,  598,  599,  600,  600,  588,  594,  588,
-      588,  601,  588,  588,  588,  588,  588,  588,  588,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  588,
-
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  588,  588,  596,  597,  588,  598,
-      588,  588,  588,  588,  588,  588,  588,  588,  588,  602,
-      600,  588,  601,  588,  588,  588,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  588,
-      588,  603,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  588,  588,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
-      595,  595,  595,  595,  595,  595,  595,    0,  588,  588,
-      588,  588,  588,  588,  588,  588,  588,  588,  588,  588,
-
-      588,  588,  588
+      590,  590,  589,    3,  591,  591,  592,  592,  593,  593,
+      594,  594,  589,  589,  589,  595,  589,  589,  589,  589,
+      589,  589,  589,  589,  589,  589,  589,  589,  589,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  589,  589,  589,  589,  597,  598,
+      598,  589,  599,  599,  600,  601,  601,  589,  595,  589,
+      589,  602,  589,  589,  589,  589,  589,  589,  589,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  589,
+
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  589,  589,  597,  598,  589,  599,
+      589,  589,  589,  589,  589,  589,  589,  589,  589,  603,
+      601,  589,  602,  589,  589,  589,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  589,
+      589,  604,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  589,  589,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,  596,  596,
+      596,  596,  596,  596,  596,  596,  596,  596,    0,  589,
+      589,  589,  589,  589,  589,  589,  589,  589,  589,  589,
+
+      589,  589,  589,  589
     } ;
 
-static const flex_int16_t yy_nxt[1388] =
+static const flex_int16_t yy_nxt[1389] =
     {   0,
-      588,  155,   15,   15,   61,   61,  156,  156,   67,   62,
+      589,  155,   15,   15,   61,   61,  156,  156,   67,   62,
        62,   68,   67,  172,   70,   68,   70,   73,   73,   77,
        78,  156,  156,   70,  159,   70,  175,  175,  155,  176,
       176,  156,  156,  270,  271,  271,  271,  176,  176,  176,
-      176,  364,  271,   79,   16,   16,   17,   18,   19,   18,
+      176,  365,  271,   79,   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,
@@ -872,146 +872,146 @@ static const flex_int16_t yy_nxt[1388] =
        48,   49,   50,   51,   52,   53,   54,   17,   56,   57,
        58,   17,   17,   17,   17,   17,  110,  115,  116,   64,
        64,   17,   17,   17,   62,   62,  271,  271,   72,   74,
-       75,   75,  271,  271,   81,   71,  588,  588,  588,  588,
-       76,  588,   82,  588,   83,  110,  115,  116,  588,   84,
+       75,   75,  271,  271,   81,   71,  589,  589,  589,  589,
+       76,  589,   82,  589,   83,  110,  115,  116,  589,   84,
        17,   17,   17,   56,   57,   58,   17,   17,   17,   17,
        17,   65,   65,   81,  100,  111,   17,   17,   17,   76,
        85,   82,   95,   83,   86,  121,   96,   87,   84,  112,
-       97,  122,  133,  113,  588,  101,   98,  102,  114,   99,
+       97,  122,  133,  113,  589,  101,   98,  102,  114,   99,
 
-       88,  588,  588,  151,  111,   17,   17,  103,  588,   85,
-      588,   95,  588,   86,  121,   96,   87,  123,  112,   97,
+       88,  589,  589,  151,  111,   17,   17,  103,  589,   85,
+      589,   95,  589,   86,  121,   96,   87,  123,  112,   97,
       122,  133,  113,  124,  101,   98,  102,  114,   99,   88,
        89,  117,  151,  152,  153,  118,  103,   90,  130,  119,
       154,  125,  131,  177,   91,  120,  123,   92,   93,  126,
-       94,  588,  124,  127,  180,  132,  128,  129,  588,   89,
-      117,  181,  152,  153,  118,  588,   90,  130,  119,  154,
-      125,  131,  177,   91,  120,  588,   92,   93,  126,   94,
-      104,  588,  127,  180,  132,  128,  129,  148,  105,  149,
-      181,  106,  150,  178,  107,  138,  182,  108,  134,  588,
-
-      109,  179,  135,  139,   73,   73,  136,  588,  588,  104,
-      140,  141,  137,  588,   76,  183,  148,  105,  149,  185,
+       94,  589,  124,  127,  180,  132,  128,  129,  589,   89,
+      117,  181,  152,  153,  118,  589,   90,  130,  119,  154,
+      125,  131,  177,   91,  120,  589,   92,   93,  126,   94,
+      104,  589,  127,  180,  132,  128,  129,  148,  105,  149,
+      181,  106,  150,  178,  107,  138,  182,  108,  134,  589,
+
+      109,  179,  135,  139,   73,   73,  136,  589,  589,  104,
+      140,  141,  137,  589,   76,  183,  148,  105,  149,  185,
       106,  150,  178,  107,  138,  182,  108,  134,  184,  109,
-      179,  135,  139,  588,  186,  136,  174,  174,  588,  140,
+      179,  135,  139,  589,  186,  136,  174,  174,  589,  140,
       141,  137,  142,   76,  183,  192,   76,  187,  185,  143,
       144,  188,  193,   74,   75,   75,  145,  184,  194,  146,
       201,  195,  147,  186,   76,  189,  196,  190,  202,  191,
-      588,  142,  588,  588,  192,   76,  187,  203,  143,  144,
-      188,  193,  588,  204,  205,  145,  588,  194,  146,  201,
+      589,  142,  589,  589,  192,   76,  187,  203,  143,  144,
+      188,  193,  589,  204,  205,  145,  589,  194,  146,  201,
       195,  147,  162,   76,  189,  196,  190,  202,  191,  197,
 
       163,  164,  198,  206,  208,  209,  203,  165,  199,  210,
       211,  166,  204,  205,  207,  200,  212,  213,  214,  167,
-      215,  216,  218,  168,  217,  169,  588,  223,  197,  170,
+      215,  216,  218,  168,  217,  169,  589,  223,  197,  170,
       224,  198,  206,  208,  209,  225,  165,  199,  210,  211,
-      166,  588,  588,  207,  200,  212,  213,  214,  167,  215,
+      166,  589,  589,  207,  200,  212,  213,  214,  167,  215,
       216,  218,  168,  217,  169,  219,  223,  226,  170,  224,
       227,  229,  228,  230,  225,  220,  231,  232,  233,  234,
       221,  222,  235,  236,  237,  238,  239,  240,  242,  243,
       247,  241,  244,  248,  219,  252,  226,  245,  246,  227,
-      229,  228,  230,  588,  220,  231,  232,  233,  234,  221,
+      229,  228,  230,  589,  220,  231,  232,  233,  234,  221,
 
       222,  235,  236,  237,  238,  239,  240,  242,  243,  247,
       241,  244,  248,  249,  252,  253,  245,  246,  254,  255,
       256,  257,  250,  258,  259,  260,  262,  263,  264,  266,
       251,  267,  261,  269,  265,  174,  174,  268,  273,  274,
-      275,  276,  249,  277,  253,   76,  280,  254,  255,  256,
+      275,  276,  249,  277,  253,   76,  282,  254,  255,  256,
       257,  250,  258,  259,  260,  262,  263,  264,  266,  251,
-      267,  261,  269,  265,  278,  281,  268,  273,  274,  275,
-      276,  282,  277,  283,   76,  280,  279,  284,  285,  286,
-      287,  288,  289,  290,  291,  292,  293,  294,  295,  296,
-      297,  298,  299,  278,  281,  300,  301,  302,  303,  304,
+      267,  261,  269,  265,  278,  280,  268,  273,  274,  275,
+      276,  283,  277,  284,   76,  282,  279,  285,  286,  287,
+      281,  288,  289,  290,  291,  292,  293,  294,  295,  296,
+      297,  298,  299,  278,  280,  300,  301,  302,  303,  304,
 
-      282,  305,  283,  306,  307,  279,  284,  285,  286,  287,
+      283,  305,  284,  306,  307,  279,  285,  286,  287,  281,
       288,  289,  290,  291,  292,  293,  294,  295,  296,  297,
       298,  299,  308,  309,  300,  301,  302,  303,  304,  310,
-      305,  311,  306,  307,  312,  313,  314,  316,  317,  318,
-      319,  320,  321,  322,  323,  324,  315,  325,  326,  327,
-      328,  308,  309,  329,  330,  331,  333,  332,  310,  334,
-      311,  335,  336,  312,  313,  314,  316,  317,  318,  319,
-      320,  321,  322,  323,  324,  315,  325,  326,  327,  328,
-      337,  338,  329,  330,  331,  333,  332,  339,  334,  341,
-      335,  336,  342,  343,  344,  346,  347,  340,  348,  349,
-
-      350,  351,  352,  353,  345,  354,  355,  356,  357,  337,
-      338,  358,  361,  359,  362,  363,  339,  360,  341,  366,
-      367,  342,  343,  344,  346,  347,  368,  348,  349,  350,
-      351,  352,  353,  345,  354,  355,  356,  357,  369,  370,
-      358,  361,  359,  362,  363,  371,  360,  372,  366,  367,
-      373,  374,  375,  376,  377,  368,  378,  379,  380,  381,
+      305,  311,  306,  307,  312,  313,  314,  315,  317,  318,
+      319,  320,  321,  322,  323,  324,  325,  316,  326,  327,
+      328,  308,  309,  329,  330,  331,  334,  332,  310,  333,
+      311,  335,  336,  312,  313,  314,  315,  317,  318,  319,
+      320,  321,  322,  323,  324,  325,  316,  326,  327,  328,
+      337,  338,  329,  330,  331,  334,  332,  339,  333,  340,
+      335,  336,  342,  343,  344,  345,  347,  348,  349,  341,
+
+      350,  351,  352,  353,  354,  346,  355,  356,  357,  337,
+      338,  358,  359,  360,  362,  363,  339,  361,  340,  364,
+      367,  342,  343,  344,  345,  347,  348,  349,  368,  350,
+      351,  352,  353,  354,  346,  355,  356,  357,  369,  370,
+      358,  359,  360,  362,  363,  371,  361,  372,  364,  367,
+      373,  374,  375,  376,  377,  378,  379,  368,  380,  381,
       382,  383,  384,  385,  386,  387,  388,  369,  370,  389,
       390,  391,  392,  393,  371,  394,  372,  395,  396,  373,
-      374,  375,  376,  377,  397,  378,  379,  380,  381,  382,
+      374,  375,  376,  377,  378,  379,  397,  380,  381,  382,
       383,  384,  385,  386,  387,  388,  398,  399,  389,  390,
 
-      391,  392,  393,  401,  394,  402,  395,  396,  400,  403,
-      404,  405,  406,  397,  407,  408,  409,  410,  411,  412,
+      391,  392,  393,  400,  394,  402,  395,  396,  403,  404,
+      405,  406,  407,  408,  401,  397,  409,  410,  411,  412,
       413,  414,  415,  416,  417,  398,  399,  418,  419,  420,
-      421,  422,  401,  423,  402,  424,  425,  400,  403,  404,
-      405,  406,  426,  407,  408,  409,  410,  411,  412,  413,
+      421,  422,  400,  423,  402,  424,  425,  403,  404,  405,
+      406,  407,  408,  401,  426,  409,  410,  411,  412,  413,
       414,  415,  416,  417,  427,  428,  418,  419,  420,  421,
       422,  429,  423,  430,  424,  425,  431,  432,  433,  434,
-      435,  426,  436,  437,  438,  439,  440,  442,  443,  441,
-      444,  445,  446,  427,  428,  447,  448,  449,  450,  451,
+      435,  436,  437,  426,  438,  439,  440,  441,  443,  444,
+      442,  445,  446,  427,  428,  447,  448,  449,  450,  451,
       429,  452,  430,  453,  454,  431,  432,  433,  434,  435,
 
-      455,  436,  437,  438,  439,  440,  442,  443,  441,  444,
+      436,  437,  455,  438,  439,  440,  441,  443,  444,  442,
       445,  446,  456,  457,  447,  448,  449,  450,  451,  458,
-      452,  459,  453,  454,  460,  461,  462,  463,  465,  455,
-      464,  466,  467,  468,  469,  470,  471,  472,  473,  474,
+      452,  459,  453,  454,  460,  461,  462,  463,  466,  464,
+      467,  455,  465,  468,  469,  470,  471,  472,  473,  474,
       475,  456,  457,  476,  477,  478,  479,  480,  458,  481,
-      459,  482,  483,  460,  461,  462,  463,  465,  484,  464,
-      466,  467,  468,  469,  470,  471,  472,  473,  474,  475,
+      459,  482,  483,  460,  461,  462,  463,  466,  464,  467,
+      484,  465,  468,  469,  470,  471,  472,  473,  474,  475,
       485,  486,  476,  477,  478,  479,  480,  487,  481,  488,
-      482,  483,  489,  490,  491,  492,  493,  484,  494,  495,
+      482,  483,  489,  490,  491,  492,  493,  494,  495,  484,
       496,  497,  498,  499,  500,  501,  502,  503,  504,  485,
 
       486,  505,  506,  507,  508,  509,  487,  510,  488,  511,
-      512,  489,  490,  491,  492,  493,  513,  494,  495,  496,
+      512,  489,  490,  491,  492,  493,  494,  495,  513,  496,
       497,  498,  499,  500,  501,  502,  503,  504,  514,  515,
       505,  506,  507,  508,  509,  516,  510,  517,  511,  512,
-      518,  519,  520,  521,  522,  513,  523,  524,  525,  526,
+      518,  519,  520,  521,  522,  523,  524,  513,  525,  526,
       527,  528,  529,  530,  531,  532,  533,  514,  515,  534,
       535,  536,  537,  538,  516,  539,  517,  540,  541,  518,
-      519,  520,  521,  522,  542,  523,  524,  525,  526,  527,
+      519,  520,  521,  522,  523,  524,  542,  525,  526,  527,
       528,  529,  530,  531,  532,  533,  543,  544,  534,  535,
       536,  537,  538,  545,  539,  546,  540,  541,  547,  548,
 
-      549,  550,  551,  542,  552,  553,  554,  555,  556,  557,
+      549,  550,  551,  552,  553,  542,  554,  555,  556,  557,
       558,  559,  560,  561,  562,  543,  544,  563,  564,  565,
       566,  567,  545,  568,  546,  569,  570,  547,  548,  549,
-      550,  551,  571,  552,  553,  554,  555,  556,  557,  558,
+      550,  551,  552,  553,  571,  554,  555,  556,  557,  558,
       559,  560,  561,  562,  572,  573,  563,  564,  565,  566,
       567,  574,  568,  575,  569,  570,  576,  577,  578,  579,
-      580,  571,  581,  582,  583,  584,  585,  586,  587,  588,
-      588,  588,  588,  572,  573,  588,  588,  588,  588,  588,
-      574,  588,  575,  588,  588,  576,  577,  578,  579,  580,
-      588,  581,  582,  583,  584,  585,  586,  587,   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,  588,   80,  157,  157,  157,  157,  588,
-      157,  158,  158,  158,  588,  158,  158,  158,  158,  158,
-      158,  160,  160,  160,  588,  160,  160,  160,  160,  588,
-      160,  161,  161,  161,  161,  161,  161,  161,  161,  161,
-      161,  171,  171,  588,  171,  171,  171,  171,  171,  171,
-
-      171,  173,  588,  173,  173,  173,  173,  173,  173,  173,
-      173,  272,  272,  365,  365,   13,  588,  588,  588,  588,
-      588,  588,  588,  588,  588,  588,  588,  588,  588,  588,
-      588,  588,  588,  588,  588,  588,  588,  588,  588,  588,
-      588,  588,  588,  588,  588,  588,  588,  588,  588,  588,
-      588,  588,  588,  588,  588,  588,  588,  588,  588,  588,
-      588,  588,  588,  588,  588,  588,  588,  588,  588,  588,
-      588,  588,  588,  588,  588,  588,  588,  588,  588,  588,
-      588,  588,  588,  588,  588,  588,  588
+      580,  581,  582,  571,  583,  584,  585,  586,  587,  588,
+      589,  589,  589,  572,  573,  589,  589,  589,  589,  589,
+      574,  589,  575,  589,  589,  576,  577,  578,  579,  580,
+      581,  582,  589,  583,  584,  585,  586,  587,  588,   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,  589,   80,  157,  157,  157,  157,
+      589,  157,  158,  158,  158,  589,  158,  158,  158,  158,
+      158,  158,  160,  160,  160,  589,  160,  160,  160,  160,
+      589,  160,  161,  161,  161,  161,  161,  161,  161,  161,
+      161,  161,  171,  171,  589,  171,  171,  171,  171,  171,
+
+      171,  171,  173,  589,  173,  173,  173,  173,  173,  173,
+      173,  173,  272,  272,  366,  366,   13,  589,  589,  589,
+      589,  589,  589,  589,  589,  589,  589,  589,  589,  589,
+      589,  589,  589,  589,  589,  589,  589,  589,  589,  589,
+      589,  589,  589,  589,  589,  589,  589,  589,  589,  589,
+      589,  589,  589,  589,  589,  589,  589,  589,  589,  589,
+      589,  589,  589,  589,  589,  589,  589,  589,  589,  589,
+      589,  589,  589,  589,  589,  589,  589,  589,  589,  589,
+      589,  589,  589,  589,  589,  589,  589,  589
     } ;
 
-static const flex_int16_t yy_chk[1388] =
+static const flex_int16_t yy_chk[1389] =
     {   0,
         0,  155,    1,    2,    7,    8,   57,   57,   11,    7,
         8,   11,   12,   68,   18,   12,   18,   25,   25,   27,
@@ -1028,7 +1028,7 @@ static const flex_int16_t yy_chk[1388] =
         3,    3,    3,    3,    3,    3,    3,    5,    5,    5,
         5,    5,    5,    5,    5,    5,   36,   39,   40,    9,
        10,    5,    5,    5,    9,   10,  271,  271,   24,   26,
-       26,   26,  364,  364,   30,   20,   13,    0,    0,    0,
+       26,   26,  365,  365,   30,   20,   13,    0,    0,    0,
        26,    0,   30,    0,   30,   36,   39,   40,    0,   30,
         5,    5,    6,    6,    6,    6,    6,    6,    6,    6,
         6,    9,   10,   30,   34,   37,    6,    6,    6,   26,
@@ -1072,103 +1072,103 @@ static const flex_int16_t yy_chk[1388] =
       132,  135,  137,  138,  139,  140,  135,  135,  141,  142,
       143,  144,  138,  146,  147,  148,  149,  150,  151,  152,
       138,  153,  148,  154,  151,  174,  174,  153,  179,  181,
-      182,  183,  138,  184,  140,  174,  186,  141,  142,  143,
+      182,  183,  138,  184,  140,  174,  187,  141,  142,  143,
       144,  138,  146,  147,  148,  149,  150,  151,  152,  138,
-      153,  148,  154,  151,  185,  187,  153,  179,  181,  182,
-      183,  188,  184,  189,  174,  186,  185,  190,  191,  192,
-      193,  194,  195,  197,  198,  199,  200,  201,  202,  203,
-      204,  206,  207,  185,  187,  208,  209,  210,  211,  212,
+      153,  148,  154,  151,  185,  186,  153,  179,  181,  182,
+      183,  188,  184,  189,  174,  187,  185,  190,  191,  192,
+      186,  193,  194,  195,  197,  198,  199,  200,  201,  202,
+      203,  204,  206,  185,  186,  207,  208,  209,  210,  211,
 
-      188,  213,  189,  214,  215,  185,  190,  191,  192,  193,
-      194,  195,  197,  198,  199,  200,  201,  202,  203,  204,
-      206,  207,  216,  217,  208,  209,  210,  211,  212,  218,
-      213,  219,  214,  215,  220,  221,  222,  223,  225,  226,
+      188,  212,  189,  213,  214,  185,  190,  191,  192,  186,
+      193,  194,  195,  197,  198,  199,  200,  201,  202,  203,
+      204,  206,  215,  216,  207,  208,  209,  210,  211,  217,
+      212,  218,  213,  214,  219,  220,  221,  222,  223,  225,
+      226,  227,  228,  229,  230,  231,  233,  222,  235,  236,
+      237,  215,  216,  238,  239,  240,  242,  241,  217,  241,
+      218,  243,  244,  219,  220,  221,  222,  223,  225,  226,
       227,  228,  229,  230,  231,  233,  222,  235,  236,  237,
-      238,  216,  217,  239,  240,  241,  242,  241,  218,  243,
-      219,  244,  245,  220,  221,  222,  223,  225,  226,  227,
-      228,  229,  230,  231,  233,  222,  235,  236,  237,  238,
-      246,  247,  239,  240,  241,  242,  241,  248,  243,  249,
-      244,  245,  250,  252,  253,  254,  255,  248,  256,  257,
-
-      258,  259,  260,  261,  253,  261,  262,  263,  264,  246,
-      247,  265,  267,  266,  268,  269,  248,  266,  249,  273,
-      274,  250,  252,  253,  254,  255,  275,  256,  257,  258,
-      259,  260,  261,  253,  261,  262,  263,  264,  276,  277,
-      265,  267,  266,  268,  269,  278,  266,  279,  273,  274,
-      281,  282,  283,  284,  286,  275,  287,  288,  289,  290,
-      291,  292,  293,  294,  295,  298,  299,  276,  277,  300,
-      301,  302,  303,  304,  278,  307,  279,  309,  311,  281,
-      282,  283,  284,  286,  312,  287,  288,  289,  290,  291,
-      292,  293,  294,  295,  298,  299,  313,  314,  300,  301,
-
-      302,  303,  304,  320,  307,  322,  309,  311,  314,  323,
-      324,  325,  326,  312,  328,  329,  330,  331,  332,  334,
-      336,  337,  338,  340,  341,  313,  314,  342,  343,  344,
-      345,  346,  320,  347,  322,  349,  351,  314,  323,  324,
-      325,  326,  352,  328,  329,  330,  331,  332,  334,  336,
-      337,  338,  340,  341,  353,  354,  342,  343,  344,  345,
-      346,  355,  347,  356,  349,  351,  357,  358,  360,  361,
-      363,  352,  367,  368,  369,  370,  371,  372,  373,  371,
-      375,  376,  377,  353,  354,  378,  379,  380,  381,  382,
-      355,  383,  356,  384,  385,  357,  358,  360,  361,  363,
-
-      386,  367,  368,  369,  370,  371,  372,  373,  371,  375,
-      376,  377,  387,  388,  378,  379,  380,  381,  382,  392,
-      383,  393,  384,  385,  395,  398,  399,  400,  402,  386,
-      400,  407,  408,  409,  410,  411,  413,  414,  416,  417,
-      418,  387,  388,  419,  420,  421,  422,  424,  392,  425,
-      393,  426,  428,  395,  398,  399,  400,  402,  429,  400,
-      407,  408,  409,  410,  411,  413,  414,  416,  417,  418,
-      431,  432,  419,  420,  421,  422,  424,  434,  425,  435,
-      426,  428,  436,  437,  439,  440,  441,  429,  442,  443,
-      445,  447,  448,  449,  450,  451,  453,  454,  457,  431,
-
-      432,  458,  459,  462,  463,  464,  434,  466,  435,  467,
-      468,  436,  437,  439,  440,  441,  469,  442,  443,  445,
-      447,  448,  449,  450,  451,  453,  454,  457,  470,  471,
-      458,  459,  462,  463,  464,  473,  466,  476,  467,  468,
-      479,  480,  481,  482,  486,  469,  488,  489,  491,  492,
-      493,  494,  495,  496,  499,  502,  503,  470,  471,  505,
-      508,  509,  510,  512,  473,  514,  476,  515,  516,  479,
-      480,  481,  482,  486,  517,  488,  489,  491,  492,  493,
-      494,  495,  496,  499,  502,  503,  518,  519,  505,  508,
-      509,  510,  512,  520,  514,  521,  515,  516,  523,  524,
-
-      525,  526,  527,  517,  528,  529,  530,  532,  534,  535,
-      537,  538,  540,  541,  543,  518,  519,  544,  545,  546,
-      547,  549,  520,  550,  521,  551,  552,  523,  524,  525,
-      526,  527,  554,  528,  529,  530,  532,  534,  535,  537,
-      538,  540,  541,  543,  555,  558,  544,  545,  546,  547,
-      549,  560,  550,  561,  551,  552,  564,  568,  569,  570,
-      575,  554,  576,  577,  580,  582,  583,  584,  586,    0,
-        0,    0,    0,  555,  558,    0,    0,    0,    0,    0,
-      560,    0,  561,    0,    0,  564,  568,  569,  570,  575,
-        0,  576,  577,  580,  582,  583,  584,  586,  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,
-      593,  593,  593,  593,  593,  593,  593,  593,  594,  594,
-      595,  595,  595,    0,  595,  596,  596,  596,  596,    0,
-      596,  597,  597,  597,    0,  597,  597,  597,  597,  597,
-      597,  598,  598,  598,    0,  598,  598,  598,  598,    0,
-      598,  599,  599,  599,  599,  599,  599,  599,  599,  599,
-      599,  600,  600,    0,  600,  600,  600,  600,  600,  600,
-
-      600,  601,    0,  601,  601,  601,  601,  601,  601,  601,
-      601,  602,  602,  603,  603,  588,  588,  588,  588,  588,
-      588,  588,  588,  588,  588,  588,  588,  588,  588,  588,
-      588,  588,  588,  588,  588,  588,  588,  588,  588,  588,
-      588,  588,  588,  588,  588,  588,  588,  588,  588,  588,
-      588,  588,  588,  588,  588,  588,  588,  588,  588,  588,
-      588,  588,  588,  588,  588,  588,  588,  588,  588,  588,
-      588,  588,  588,  588,  588,  588,  588,  588,  588,  588,
-      588,  588,  588,  588,  588,  588,  588
+      245,  246,  238,  239,  240,  242,  241,  247,  241,  248,
+      243,  244,  249,  250,  252,  253,  254,  255,  256,  248,
+
+      257,  258,  259,  260,  261,  253,  261,  262,  263,  245,
+      246,  264,  265,  266,  267,  268,  247,  266,  248,  269,
+      273,  249,  250,  252,  253,  254,  255,  256,  274,  257,
+      258,  259,  260,  261,  253,  261,  262,  263,  275,  276,
+      264,  265,  266,  267,  268,  277,  266,  278,  269,  273,
+      279,  282,  283,  284,  285,  287,  288,  274,  289,  290,
+      291,  292,  293,  294,  295,  296,  299,  275,  276,  300,
+      301,  302,  303,  304,  277,  305,  278,  308,  310,  279,
+      282,  283,  284,  285,  287,  288,  312,  289,  290,  291,
+      292,  293,  294,  295,  296,  299,  313,  314,  300,  301,
+
+      302,  303,  304,  315,  305,  321,  308,  310,  323,  324,
+      325,  326,  327,  329,  315,  312,  330,  331,  332,  333,
+      335,  337,  338,  339,  341,  313,  314,  342,  343,  344,
+      345,  346,  315,  347,  321,  348,  350,  323,  324,  325,
+      326,  327,  329,  315,  352,  330,  331,  332,  333,  335,
+      337,  338,  339,  341,  353,  354,  342,  343,  344,  345,
+      346,  355,  347,  356,  348,  350,  357,  358,  359,  361,
+      362,  364,  368,  352,  369,  370,  371,  372,  373,  374,
+      372,  376,  377,  353,  354,  378,  379,  380,  381,  382,
+      355,  383,  356,  384,  385,  357,  358,  359,  361,  362,
+
+      364,  368,  386,  369,  370,  371,  372,  373,  374,  372,
+      376,  377,  387,  388,  378,  379,  380,  381,  382,  389,
+      383,  393,  384,  385,  394,  396,  399,  400,  403,  401,
+      408,  386,  401,  409,  410,  411,  412,  414,  415,  417,
+      418,  387,  388,  419,  420,  421,  422,  423,  389,  425,
+      393,  426,  427,  394,  396,  399,  400,  403,  401,  408,
+      429,  401,  409,  410,  411,  412,  414,  415,  417,  418,
+      430,  432,  419,  420,  421,  422,  423,  433,  425,  435,
+      426,  427,  436,  437,  438,  440,  441,  442,  443,  429,
+      444,  446,  448,  449,  450,  451,  452,  454,  455,  430,
+
+      432,  458,  459,  460,  463,  464,  433,  465,  435,  467,
+      468,  436,  437,  438,  440,  441,  442,  443,  469,  444,
+      446,  448,  449,  450,  451,  452,  454,  455,  470,  471,
+      458,  459,  460,  463,  464,  472,  465,  474,  467,  468,
+      477,  480,  481,  482,  483,  487,  489,  469,  490,  492,
+      493,  494,  495,  496,  497,  500,  503,  470,  471,  504,
+      506,  509,  510,  511,  472,  513,  474,  515,  516,  477,
+      480,  481,  482,  483,  487,  489,  517,  490,  492,  493,
+      494,  495,  496,  497,  500,  503,  518,  519,  504,  506,
+      509,  510,  511,  520,  513,  521,  515,  516,  522,  524,
+
+      525,  526,  527,  528,  529,  517,  530,  531,  533,  535,
+      536,  538,  539,  541,  542,  518,  519,  544,  545,  546,
+      547,  548,  520,  550,  521,  551,  552,  522,  524,  525,
+      526,  527,  528,  529,  553,  530,  531,  533,  535,  536,
+      538,  539,  541,  542,  555,  556,  544,  545,  546,  547,
+      548,  559,  550,  561,  551,  552,  562,  565,  569,  570,
+      571,  576,  577,  553,  578,  581,  583,  584,  585,  587,
+        0,    0,    0,  555,  556,    0,    0,    0,    0,    0,
+      559,    0,  561,    0,    0,  562,  565,  569,  570,  571,
+      576,  577,    0,  578,  581,  583,  584,  585,  587,  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,  593,  593,  593,  593,  593,  593,  593,  593,  594,
+      594,  594,  594,  594,  594,  594,  594,  594,  594,  595,
+      595,  596,  596,  596,    0,  596,  597,  597,  597,  597,
+        0,  597,  598,  598,  598,    0,  598,  598,  598,  598,
+      598,  598,  599,  599,  599,    0,  599,  599,  599,  599,
+        0,  599,  600,  600,  600,  600,  600,  600,  600,  600,
+      600,  600,  601,  601,    0,  601,  601,  601,  601,  601,
+
+      601,  601,  602,    0,  602,  602,  602,  602,  602,  602,
+      602,  602,  603,  603,  604,  604,  589,  589,  589,  589,
+      589,  589,  589,  589,  589,  589,  589,  589,  589,  589,
+      589,  589,  589,  589,  589,  589,  589,  589,  589,  589,
+      589,  589,  589,  589,  589,  589,  589,  589,  589,  589,
+      589,  589,  589,  589,  589,  589,  589,  589,  589,  589,
+      589,  589,  589,  589,  589,  589,  589,  589,  589,  589,
+      589,  589,  589,  589,  589,  589,  589,  589,  589,  589,
+      589,  589,  589,  589,  589,  589,  589,  589
     } ;
 
 /* Table of booleans, true if rule could match eol. */
-static const flex_int32_t yy_rule_can_match_eol[165] =
+static const flex_int32_t yy_rule_can_match_eol[166] =
     {   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, 
@@ -1177,8 +1177,8 @@ static const flex_int32_t yy_rule_can_match_eol[165] =
     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, 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.
@@ -1613,13 +1613,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 >= 589 )
+				if ( yy_current_state >= 590 )
 					yy_c = yy_meta[yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 			++yy_cp;
 			}
-		while ( yy_current_state != 588 );
+		while ( yy_current_state != 589 );
 		yy_cp = yyg->yy_last_accepting_cpos;
 		yy_current_state = yyg->yy_last_accepting_state;
 
@@ -1783,17 +1783,17 @@ return TOKEN_CASE;
 case 21:
 YY_RULE_SETUP
 #line 187 "../SqlLexer.lpp"
-return TOKEN_CSB_TREE;
+return TOKEN_CAST;
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
 #line 188 "../SqlLexer.lpp"
-return TOKEN_BY;
+return TOKEN_CSB_TREE;
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
 #line 189 "../SqlLexer.lpp"
-return TOKEN_CHARACTER;
+return TOKEN_BY;
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
@@ -1803,67 +1803,67 @@ return TOKEN_CHARACTER;
 case 25:
 YY_RULE_SETUP
 #line 191 "../SqlLexer.lpp"
-return TOKEN_CHECK;
+return TOKEN_CHARACTER;
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
 #line 192 "../SqlLexer.lpp"
-return TOKEN_COLUMN;
+return TOKEN_CHECK;
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
 #line 193 "../SqlLexer.lpp"
-return TOKEN_CONSTRAINT;
+return TOKEN_COLUMN;
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
 #line 194 "../SqlLexer.lpp"
-return TOKEN_COPY;
+return TOKEN_CONSTRAINT;
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
 #line 195 "../SqlLexer.lpp"
-return TOKEN_CREATE;
+return TOKEN_COPY;
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
 #line 196 "../SqlLexer.lpp"
-return TOKEN_CURRENT;
+return TOKEN_CREATE;
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
 #line 197 "../SqlLexer.lpp"
-return TOKEN_DATE;
+return TOKEN_CURRENT;
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
 #line 198 "../SqlLexer.lpp"
-return TOKEN_DATETIME;
+return TOKEN_DATE;
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
 #line 199 "../SqlLexer.lpp"
-return TOKEN_DAY;
+return TOKEN_DATETIME;
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
 #line 200 "../SqlLexer.lpp"
-return TOKEN_DECIMAL;
+return TOKEN_DAY;
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
 #line 201 "../SqlLexer.lpp"
-return TOKEN_DEFAULT;
+return TOKEN_DECIMAL;
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
 #line 202 "../SqlLexer.lpp"
-return TOKEN_DELETE;
+return TOKEN_DEFAULT;
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
 #line 203 "../SqlLexer.lpp"
-return TOKEN_DESC;
+return TOKEN_DELETE;
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
@@ -1873,122 +1873,122 @@ return TOKEN_DESC;
 case 39:
 YY_RULE_SETUP
 #line 205 "../SqlLexer.lpp"
-return TOKEN_DISTINCT;
+return TOKEN_DESC;
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
 #line 206 "../SqlLexer.lpp"
-return TOKEN_DOUBLE;
+return TOKEN_DISTINCT;
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
 #line 207 "../SqlLexer.lpp"
-return TOKEN_DROP;
+return TOKEN_DOUBLE;
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
 #line 208 "../SqlLexer.lpp"
-return TOKEN_ELSE;
+return TOKEN_DROP;
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
 #line 209 "../SqlLexer.lpp"
-return TOKEN_END;
+return TOKEN_ELSE;
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
 #line 210 "../SqlLexer.lpp"
-return TOKEN_EXISTS;
+return TOKEN_END;
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
 #line 211 "../SqlLexer.lpp"
-return TOKEN_EXTRACT;
+return TOKEN_EXISTS;
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
 #line 212 "../SqlLexer.lpp"
-return TOKEN_FALSE;
+return TOKEN_EXTRACT;
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
 #line 213 "../SqlLexer.lpp"
-return TOKEN_FIRST;
+return TOKEN_FALSE;
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
 #line 214 "../SqlLexer.lpp"
-return TOKEN_FLOAT;
+return TOKEN_FIRST;
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
 #line 215 "../SqlLexer.lpp"
-return TOKEN_FOLLOWING;
+return TOKEN_FLOAT;
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
 #line 216 "../SqlLexer.lpp"
-return TOKEN_FOR;
+return TOKEN_FOLLOWING;
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
 #line 217 "../SqlLexer.lpp"
-return TOKEN_FOREIGN;
+return TOKEN_FOR;
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
 #line 218 "../SqlLexer.lpp"
-return TOKEN_FROM;
+return TOKEN_FOREIGN;
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
 #line 219 "../SqlLexer.lpp"
-return TOKEN_FULL;
+return TOKEN_FROM;
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
 #line 220 "../SqlLexer.lpp"
-return TOKEN_GROUP;
+return TOKEN_FULL;
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
 #line 221 "../SqlLexer.lpp"
-return TOKEN_HASH;
+return TOKEN_GROUP;
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
 #line 222 "../SqlLexer.lpp"
-return TOKEN_HAVING;
+return TOKEN_HASH;
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
 #line 223 "../SqlLexer.lpp"
-return TOKEN_HOUR;
+return TOKEN_HAVING;
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
 #line 224 "../SqlLexer.lpp"
-return TOKEN_IN;
+return TOKEN_HOUR;
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
 #line 225 "../SqlLexer.lpp"
-return TOKEN_INDEX;
+return TOKEN_IN;
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
 #line 226 "../SqlLexer.lpp"
-return TOKEN_INNER;
+return TOKEN_INDEX;
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
 #line 227 "../SqlLexer.lpp"
-return TOKEN_INSERT;
+return TOKEN_INNER;
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
 #line 228 "../SqlLexer.lpp"
-return TOKEN_INTEGER;
+return TOKEN_INSERT;
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
@@ -1998,337 +1998,337 @@ return TOKEN_INTEGER;
 case 64:
 YY_RULE_SETUP
 #line 230 "../SqlLexer.lpp"
-return TOKEN_INTERSECT;
+return TOKEN_INTEGER;
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
 #line 231 "../SqlLexer.lpp"
-return TOKEN_INTERVAL;
+return TOKEN_INTERSECT;
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
 #line 232 "../SqlLexer.lpp"
-return TOKEN_INTO;
+return TOKEN_INTERVAL;
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
 #line 233 "../SqlLexer.lpp"
-return TOKEN_IS;
+return TOKEN_INTO;
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
 #line 234 "../SqlLexer.lpp"
-return TOKEN_JOIN;
+return TOKEN_IS;
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
 #line 235 "../SqlLexer.lpp"
-return TOKEN_KEY;
+return TOKEN_JOIN;
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
 #line 236 "../SqlLexer.lpp"
-return TOKEN_LAST;
+return TOKEN_KEY;
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
 #line 237 "../SqlLexer.lpp"
-return TOKEN_LEFT;
+return TOKEN_LAST;
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
 #line 238 "../SqlLexer.lpp"
-return TOKEN_LIKE;
+return TOKEN_LEFT;
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
 #line 239 "../SqlLexer.lpp"
-return TOKEN_LIMIT;
+return TOKEN_LIKE;
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
 #line 240 "../SqlLexer.lpp"
-return TOKEN_LONG;
+return TOKEN_LIMIT;
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
 #line 241 "../SqlLexer.lpp"
-return TOKEN_MINUTE;
+return TOKEN_LONG;
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
 #line 242 "../SqlLexer.lpp"
-return TOKEN_MONTH;
+return TOKEN_MINUTE;
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
 #line 243 "../SqlLexer.lpp"
-return TOKEN_NOT;
+return TOKEN_MONTH;
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
 #line 244 "../SqlLexer.lpp"
-return TOKEN_NULL;
+return TOKEN_NOT;
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
 #line 245 "../SqlLexer.lpp"
-return TOKEN_NULLS;
+return TOKEN_NULL;
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
 #line 246 "../SqlLexer.lpp"
-return TOKEN_OFF;
+return TOKEN_NULLS;
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
 #line 247 "../SqlLexer.lpp"
-return TOKEN_ON;
+return TOKEN_OFF;
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
 #line 248 "../SqlLexer.lpp"
-return TOKEN_OR;
+return TOKEN_ON;
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
 #line 249 "../SqlLexer.lpp"
-return TOKEN_ORDER;
+return TOKEN_OR;
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
 #line 250 "../SqlLexer.lpp"
-return TOKEN_OUTER;
+return TOKEN_ORDER;
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
 #line 251 "../SqlLexer.lpp"
-return TOKEN_OVER;
+return TOKEN_OUTER;
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
 #line 252 "../SqlLexer.lpp"
-return TOKEN_PARTITION;
+return TOKEN_OVER;
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
 #line 253 "../SqlLexer.lpp"
-return TOKEN_PARTITIONS;
+return TOKEN_PARTITION;
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
 #line 254 "../SqlLexer.lpp"
-return TOKEN_PERCENT;
+return TOKEN_PARTITIONS;
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
 #line 255 "../SqlLexer.lpp"
-return TOKEN_PRECEDING;
+return TOKEN_PERCENT;
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
 #line 256 "../SqlLexer.lpp"
-return TOKEN_PRIMARY;
+return TOKEN_PRECEDING;
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
 #line 257 "../SqlLexer.lpp"
-return TOKEN_PRIORITY;
+return TOKEN_PRIMARY;
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
 #line 258 "../SqlLexer.lpp"
-return TOKEN_QUIT;
+return TOKEN_PRIORITY;
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
 #line 259 "../SqlLexer.lpp"
-return TOKEN_RANGE;
+return TOKEN_QUIT;
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
 #line 260 "../SqlLexer.lpp"
-return TOKEN_REAL;
+return TOKEN_RANGE;
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
 #line 261 "../SqlLexer.lpp"
-return TOKEN_REFERENCES;
+return TOKEN_REAL;
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
 #line 262 "../SqlLexer.lpp"
-return TOKEN_REGEXP;
+return TOKEN_REFERENCES;
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
 #line 263 "../SqlLexer.lpp"
-return TOKEN_RIGHT;
+return TOKEN_REGEXP;
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
 #line 264 "../SqlLexer.lpp"
-return TOKEN_ROW;
+return TOKEN_RIGHT;
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
 #line 265 "../SqlLexer.lpp"
-return TOKEN_ROW_DELIMITER;
+return TOKEN_ROW;
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
 #line 266 "../SqlLexer.lpp"
-return TOKEN_ROWS;
+return TOKEN_ROW_DELIMITER;
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
 #line 267 "../SqlLexer.lpp"
-return TOKEN_SECOND;
+return TOKEN_ROWS;
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
 #line 268 "../SqlLexer.lpp"
-return TOKEN_SELECT;
+return TOKEN_SECOND;
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
 #line 269 "../SqlLexer.lpp"
-return TOKEN_SET;
+return TOKEN_SELECT;
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
 #line 270 "../SqlLexer.lpp"
-return TOKEN_SMA;
+return TOKEN_SET;
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
 #line 271 "../SqlLexer.lpp"
-return TOKEN_SMALLINT;
+return TOKEN_SMA;
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
 #line 272 "../SqlLexer.lpp"
-return TOKEN_STDERR;
+return TOKEN_SMALLINT;
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
 #line 273 "../SqlLexer.lpp"
-return TOKEN_STDOUT;
+return TOKEN_STDERR;
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
 #line 274 "../SqlLexer.lpp"
-return TOKEN_SUBSTRING;
+return TOKEN_STDOUT;
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
 #line 275 "../SqlLexer.lpp"
-return TOKEN_TABLE;
+return TOKEN_SUBSTRING;
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
 #line 276 "../SqlLexer.lpp"
-return TOKEN_THEN;
+return TOKEN_TABLE;
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
 #line 277 "../SqlLexer.lpp"
-return TOKEN_TIME;
+return TOKEN_THEN;
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
 #line 278 "../SqlLexer.lpp"
-return TOKEN_TIMESTAMP;
+return TOKEN_TIME;
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
 #line 279 "../SqlLexer.lpp"
-return TOKEN_TO;
+return TOKEN_TIMESTAMP;
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
 #line 280 "../SqlLexer.lpp"
-return TOKEN_TRUE;
+return TOKEN_TO;
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
 #line 281 "../SqlLexer.lpp"
-return TOKEN_TUPLESAMPLE;
+return TOKEN_TRUE;
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
 #line 282 "../SqlLexer.lpp"
-return TOKEN_UNBOUNDED;
+return TOKEN_TUPLESAMPLE;
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
 #line 283 "../SqlLexer.lpp"
-return TOKEN_UNION;
+return TOKEN_UNBOUNDED;
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
 #line 284 "../SqlLexer.lpp"
-return TOKEN_UNIQUE;
+return TOKEN_UNION;
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
 #line 285 "../SqlLexer.lpp"
-return TOKEN_UPDATE;
+return TOKEN_UNIQUE;
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
 #line 286 "../SqlLexer.lpp"
-return TOKEN_USING;
+return TOKEN_UPDATE;
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
 #line 287 "../SqlLexer.lpp"
-return TOKEN_VALUES;
+return TOKEN_USING;
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
 #line 288 "../SqlLexer.lpp"
-return TOKEN_VARCHAR;
+return TOKEN_VALUES;
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
 #line 289 "../SqlLexer.lpp"
-return TOKEN_WHEN;
+return TOKEN_VARCHAR;
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
 #line 290 "../SqlLexer.lpp"
-return TOKEN_WHERE;
+return TOKEN_WHEN;
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
 #line 291 "../SqlLexer.lpp"
-return TOKEN_WINDOW;
+return TOKEN_WHERE;
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
 #line 292 "../SqlLexer.lpp"
-return TOKEN_WITH;
+return TOKEN_WINDOW;
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
 #line 293 "../SqlLexer.lpp"
-return TOKEN_YEAR;
+return TOKEN_WITH;
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
 #line 294 "../SqlLexer.lpp"
-return TOKEN_YEARMONTH;
+return TOKEN_YEAR;
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 296 "../SqlLexer.lpp"
-return TOKEN_EQ;
+#line 295 "../SqlLexer.lpp"
+return TOKEN_YEARMONTH;
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
 #line 297 "../SqlLexer.lpp"
-return TOKEN_NEQ;
+return TOKEN_EQ;
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
@@ -2338,56 +2338,61 @@ return TOKEN_NEQ;
 case 132:
 YY_RULE_SETUP
 #line 299 "../SqlLexer.lpp"
-return TOKEN_LT;
+return TOKEN_NEQ;
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
 #line 300 "../SqlLexer.lpp"
-return TOKEN_GT;
+return TOKEN_LT;
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
 #line 301 "../SqlLexer.lpp"
-return TOKEN_LEQ;
+return TOKEN_GT;
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
 #line 302 "../SqlLexer.lpp"
-return TOKEN_GEQ;
+return TOKEN_LEQ;
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
-#line 304 "../SqlLexer.lpp"
-return yytext[0];
+#line 303 "../SqlLexer.lpp"
+return TOKEN_GEQ;
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
 #line 305 "../SqlLexer.lpp"
 return yytext[0];
 	YY_BREAK
+case 138:
+YY_RULE_SETUP
+#line 306 "../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 138:
+case 139:
 YY_RULE_SETUP
-#line 311 "../SqlLexer.lpp"
+#line 312 "../SqlLexer.lpp"
 {
     yylval->string_value_ = new quickstep::ParseString(yylloc->first_line, yylloc->first_column);
     BEGIN(CONDITION_STRING_SINGLE_QUOTED_ESCAPED);
   }
 	YY_BREAK
-case 139:
+case 140:
 YY_RULE_SETUP
-#line 316 "../SqlLexer.lpp"
+#line 317 "../SqlLexer.lpp"
 {
     yylval->string_value_ = new quickstep::ParseString(yylloc->first_line, yylloc->first_column);
     BEGIN(CONDITION_STRING_SINGLE_QUOTED);
   }
 	YY_BREAK
-case 140:
+case 141:
 YY_RULE_SETUP
-#line 321 "../SqlLexer.lpp"
+#line 322 "../SqlLexer.lpp"
 {
     yylval->string_value_ = new quickstep::ParseString(yylloc->first_line, yylloc->first_column);
     BEGIN(CONDITION_STRING_DOUBLE_QUOTED);
@@ -2399,7 +2404,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 330 "../SqlLexer.lpp"
+#line 331 "../SqlLexer.lpp"
 {
     delete yylval->string_value_;
     BEGIN(INITIAL);
@@ -2410,9 +2415,9 @@ case YY_STATE_EOF(CONDITION_STRING_DOUBLE_QUOTED):
 
 /* Process escape sequences. */
 
-case 141:
+case 142:
 YY_RULE_SETUP
-#line 340 "../SqlLexer.lpp"
+#line 341 "../SqlLexer.lpp"
 {
     /* Octal code */
     unsigned int code;
@@ -2426,9 +2431,9 @@ YY_RULE_SETUP
     yylval->string_value_->push_back(code);
   }
 	YY_BREAK
-case 142:
+case 143:
 YY_RULE_SETUP
-#line 352 "../SqlLexer.lpp"
+#line 353 "../SqlLexer.lpp"
 {
     /* Hexadecimal code */
     unsigned int code;
@@ -2436,9 +2441,9 @@ YY_RULE_SETUP
     yylval->string_value_->push_back(code);
   }
 	YY_BREAK
-case 143:
+case 144:
 YY_RULE_SETUP
-#line 358 "../SqlLexer.lpp"
+#line 359 "../SqlLexer.lpp"
 {
     /* A numeric escape sequence that isn't correctly specified. */
     delete yylval->string_value_;
@@ -2447,58 +2452,58 @@ YY_RULE_SETUP
     return TOKEN_LEX_ERROR;
   }
 	YY_BREAK
-case 144:
+case 145:
 YY_RULE_SETUP
-#line 365 "../SqlLexer.lpp"
+#line 366 "../SqlLexer.lpp"
 {
     /* Backspace */
     yylval->string_value_->push_back('\b');
   }
 	YY_BREAK
-case 145:
+case 146:
 YY_RULE_SETUP
-#line 369 "../SqlLexer.lpp"
+#line 370 "../SqlLexer.lpp"
 {
     /* Form-feed */
     yylval->string_value_->push_back('\f');
   }
 	YY_BREAK
-case 146:
+case 147:
 YY_RULE_SETUP
-#line 373 "../SqlLexer.lpp"
+#line 374 "../SqlLexer.lpp"
 {
     /* Newline */
     yylval->string_value_->push_back('\n');
   }
 	YY_BREAK
-case 147:
+case 148:
 YY_RULE_SETUP
-#line 377 "../SqlLexer.lpp"
+#line 378 "../SqlLexer.lpp"
 {
     /* Carriage-return */
     yylval->string_value_->push_back('\r');
   }
 	YY_BREAK
-case 148:
+case 149:
 YY_RULE_SETUP
-#line 381 "../SqlLexer.lpp"
+#line 382 "../SqlLexer.lpp"
 {
     /* Horizontal Tab */
     yylval->string_value_->push_back('\t');
   }
 	YY_BREAK
-case 149:
-/* rule 149 can match eol */
+case 150:
+/* rule 150 can match eol */
 YY_RULE_SETUP
-#line 385 "../SqlLexer.lpp"
+#line 386 "../SqlLexer.lpp"
 {
     /* Any other character (including actual newline or carriage return) */
     yylval->string_value_->push_back(yytext[1]);
   }
 	YY_BREAK
-case 150:
+case 151:
 YY_RULE_SETUP
-#line 389 "../SqlLexer.lpp"
+#line 390 "../SqlLexer.lpp"
 {
     /* This should only be encountered right before an EOF. */
     delete yylval->string_value_;
@@ -2509,17 +2514,17 @@ YY_RULE_SETUP
 	YY_BREAK
 
 
-case 151:
+case 152:
 YY_RULE_SETUP
-#line 399 "../SqlLexer.lpp"
+#line 400 "../SqlLexer.lpp"
 {
     /* Two quotes in a row become a single quote (this is specified by the SQL standard). */
     yylval->string_value_->push_back('\'');
   }
 	YY_BREAK
-case 152:
+case 153:
 YY_RULE_SETUP
-#line 403 "../SqlLexer.lpp"
+#line 404 "../SqlLexer.lpp"
 {
     /* End string */
     BEGIN(CONDITION_SQL);
@@ -2528,17 +2533,17 @@ YY_RULE_SETUP
 	YY_BREAK
 
 
-case 153:
+case 154:
 YY_RULE_SETUP
-#line 411 "../SqlLexer.lpp"
+#line 412 "../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 154:
+case 155:
 YY_RULE_SETUP
-#line 415 "../SqlLexer.lpp"
+#line 416 "../SqlLexer.lpp"
 {
     /* End string */
     BEGIN(CONDITION_SQL);
@@ -2546,94 +2551,94 @@ YY_RULE_SETUP
   }
 	YY_BREAK
 
-case 155:
-/* rule 155 can match eol */
+case 156:
+/* rule 156 can match eol */
 YY_RULE_SETUP
-#line 422 "../SqlLexer.lpp"
+#line 423 "../SqlLexer.lpp"
 {
   /* Scan up to a quote. */
   yylval->string_value_->append(yytext, yyleng);
 }
 	YY_BREAK
-case 156:
-/* rule 156 can match eol */
+case 157:
+/* rule 157 can match eol */
 YY_RULE_SETUP
-#line 427 "../SqlLexer.lpp"
+#line 428 "../SqlLexer.lpp"
 {
   /* Scan up to a quote or escape sequence. */
   yylval->string_value_->append(yytext, yyleng);
 }
 	YY_BREAK
-case 157:
-/* rule 157 can match eol */
+case 158:
+/* rule 158 can match eol */
 YY_RULE_SETUP
-#line 432 "../SqlLexer.lpp"
+#line 433 "../SqlLexer.lpp"
 {
   /* Scan up to a quote. */
   yylval->string_value_->append(yytext, yyleng);
 }
 	YY_BREAK
 
-case 158:
+case 159:
 YY_RULE_SETUP
-#line 438 "../SqlLexer.lpp"
+#line 439 "../SqlLexer.lpp"
 {
     yylval->string_value_ = new quickstep::ParseString(
         yylloc->first_line, yylloc->first_column, std::string(yytext, yyleng));
     return TOKEN_NAME;
   }
 	YY_BREAK
-case 159:
+case 160:
 YY_RULE_SETUP
-#line 444 "../SqlLexer.lpp"
+#line 445 "../SqlLexer.lpp"
 {
     yylval->numeric_literal_value_ = new quickstep::NumericParseLiteralValue(
         yylloc->first_line, yylloc->first_column, yytext);
     return TOKEN_UNSIGNED_NUMVAL;
   }
 	YY_BREAK
-case 160:
+case 161:
 YY_RULE_SETUP
-#line 450 "../SqlLexer.lpp"
+#line 451 "../SqlLexer.lpp"
 /* comment */
 	YY_BREAK
-case 161:
-/* rule 161 can match eol */
+case 162:
+/* rule 162 can match eol */
 YY_RULE_SETUP
-#line 452 "../SqlLexer.lpp"
+#line 453 "../SqlLexer.lpp"
 { yycolumn = 0; }
 	YY_BREAK
-case 162:
+case 163:
 YY_RULE_SETUP
-#line 454 "../SqlLexer.lpp"
+#line 455 "../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 458 "../SqlLexer.lpp"
+#line 459 "../SqlLexer.lpp"
 {
   /* All conditions except for mutli-state string extracting conditions. */
   BEGIN(INITIAL);
   return TOKEN_EOF;
 }
 	YY_BREAK
-case 163:
+case 164:
 YY_RULE_SETUP
-#line 464 "../SqlLexer.lpp"
+#line 465 "../SqlLexer.lpp"
 {
   BEGIN(INITIAL);
   quickstep_yyerror(NULL, yyscanner, NULL, "illegal character");
   return TOKEN_LEX_ERROR;
 }
 	YY_BREAK
-case 164:
+case 165:
 YY_RULE_SETUP
-#line 470 "../SqlLexer.lpp"
+#line 471 "../SqlLexer.lpp"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 2636 "SqlLexer_gen.cpp"
+#line 2641 "SqlLexer_gen.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2931,7 +2936,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 >= 589 )
+			if ( yy_current_state >= 590 )
 				yy_c = yy_meta[yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -2960,11 +2965,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 589 )
+		if ( yy_current_state >= 590 )
 			yy_c = yy_meta[yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	yy_is_jam = (yy_current_state == 588);
+	yy_is_jam = (yy_current_state == 589);
 
 	(void)yyg;
 	return yy_is_jam ? 0 : yy_current_state;
@@ -3794,6 +3799,6 @@ void yyfree (void * ptr , yyscan_t yyscanner)
 
 #define YYTABLES_NAME "yytables"
 
-#line 470 "../SqlLexer.lpp"
+#line 471 "../SqlLexer.lpp"
 
 

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/cb564509/parser/preprocessed/SqlLexer_gen.hpp
----------------------------------------------------------------------
diff --git a/parser/preprocessed/SqlLexer_gen.hpp b/parser/preprocessed/SqlLexer_gen.hpp
index 5fafae5..479b72d 100644
--- a/parser/preprocessed/SqlLexer_gen.hpp
+++ b/parser/preprocessed/SqlLexer_gen.hpp
@@ -733,7 +733,7 @@ extern int yylex \
 #undef yyTABLES_NAME
 #endif
 
-#line 470 "../SqlLexer.lpp"
+#line 471 "../SqlLexer.lpp"
 
 
 #line 739 "SqlLexer_gen.hpp"