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/04/12 19:34:29 UTC

[26/27] incubator-quickstep git commit: Refactor type system and operations.

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/da9baf7e/parser/SqlParser.ypp
----------------------------------------------------------------------
diff --git a/parser/SqlParser.ypp b/parser/SqlParser.ypp
index 5db2171..d51ae48 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"
 
@@ -190,8 +184,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_;
@@ -262,6 +256,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;
@@ -393,6 +388,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
 
@@ -623,8 +619,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 {
@@ -1655,7 +1649,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;
@@ -1663,7 +1660,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;
@@ -1671,7 +1671,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;
@@ -1695,6 +1697,9 @@ expression_base:
     $1->setWindow($4);
     $$ = $1;
   }
+  | cast_function {
+    $$ = $1;
+  }
   | extract_function {
     $$ = $1;
   }
@@ -1727,19 +1732,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:
@@ -1959,26 +2004,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/da9baf7e/parser/preprocessed/SqlLexer_gen.cpp
----------------------------------------------------------------------
diff --git a/parser/preprocessed/SqlLexer_gen.cpp b/parser/preprocessed/SqlLexer_gen.cpp
index 3a85df6..152e22d 100644
--- a/parser/preprocessed/SqlLexer_gen.cpp
+++ b/parser/preprocessed/SqlLexer_gen.cpp
@@ -381,8 +381,8 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
 	*yy_cp = '\0'; \
 	yyg->yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 163
-#define YY_END_OF_BUFFER 164
+#define YY_NUM_RULES 164
+#define YY_END_OF_BUFFER 165
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -390,73 +390,73 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[599] =
+static yyconst flex_int16_t yy_accept[600] =
     {   0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  164,    2,    2,  162,  162,  161,  160,  162,
-      139,  135,  138,  135,  135,  158,  131,  128,  132,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  136,    4,    5,    5,    3,  154,
-      154,  151,  155,  155,  149,  156,  156,  153,    1,  161,
-      129,  159,  158,  158,  158,    0,  133,  130,  134,  157,
-      157,  157,  157,   10,  157,  157,  157,   22,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  137,
-
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,   60,   69,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,   83,   84,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,    4,    5,    3,  154,  150,  155,  148,
-      148,  140,  142,  143,  144,  145,  146,  147,  148,  156,
-      152,  159,  158,    0,  158,    6,    7,  157,    9,   11,
-      157,  157,   15,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,   33,  157,  157,  157,  157,  157,
-
-      157,  157,  157,   44,  157,  157,  157,  157,  157,  157,
-      157,   52,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,   64,  157,   71,  157,  157,  157,  157,  157,  157,
-      157,   79,  157,   82,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  100,  157,  157,
-      105,  106,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  140,  142,
-      141,  157,  157,  157,  157,  157,  157,  157,   20,   23,
-      157,  157,  157,   28,  157,  157,  157,   31,  157,  157,
-      157,  157,   38,  157,  157,   42,   43,  157,  157,  157,
-
-      157,  157,  157,  157,  157,   54,   55,  157,   57,  157,
-       59,  157,  157,  157,  157,   68,   70,   72,   73,   74,
-      157,   76,  157,  157,   80,  157,  157,   87,  157,  157,
-      157,  157,  157,   94,  157,   96,  157,  157,  157,  102,
-      157,  157,  157,  157,  157,  157,  110,  111,  113,  157,
-      157,  157,  157,  157,  157,  157,  157,  122,  157,  157,
-      125,  126,  140,  141,    8,  157,  157,  157,  157,  157,
-      157,  157,   25,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,   48,
-       49,   50,  157,  157,   56,  157,   61,   62,  157,  157,
-
-      157,   75,  157,   78,   81,   85,   86,  157,  157,  157,
-      157,  157,   95,  157,  157,   99,  157,  157,  157,  157,
-      157,  109,  157,  157,  157,  116,  157,  157,  119,  157,
-      157,  123,  157,  157,  157,  157,   14,  157,  157,  157,
-      157,  157,   26,  157,   29,  157,  157,  157,  157,  157,
-       36,  157,  157,  157,   41,  157,   46,  157,  157,  157,
-       58,   63,  157,  157,  157,   77,  157,  157,  157,  157,
-      157,  157,   98,  157,  103,  104,  157,  157,  157,  157,
-      157,  117,  118,  120,  157,  124,  157,  157,   13,  157,
-      157,  157,  157,  157,  157,   21,   30,  157,   34,   35,
-
-      157,  157,  157,  157,   47,  157,   53,   65,  157,  157,
-      157,   90,  157,   92,  157,  157,  157,  157,  157,  157,
-      157,  157,  121,  157,  157,  157,  157,  157,  157,  157,
-      157,   32,  157,  157,   40,  157,  157,  157,   67,  157,
-      157,   93,  157,  157,  107,  157,  157,  157,  157,  157,
-       12,  157,  157,  157,  157,   24,  157,   37,  157,  157,
-       51,   66,   88,   91,  157,  157,  108,  112,  157,  115,
-      127,   16,  157,  157,  157,   27,   39,  157,   89,   97,
-      157,  157,  157,   18,   19,  157,  157,  114,  157,  157,
-      157,  157,  157,  101,  157,   45,   17,    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,   23,  158,  158,
+      158,  158,  158,  158,  158,  158,  158,  158,  158,  138,
+
+      158,  158,  158,  158,  158,  158,  158,  158,  158,  158,
+      158,  158,  158,   61,   70,  158,  158,  158,  158,  158,
+      158,  158,  158,  158,  158,  158,   84,   85,  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,    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,   34,  158,  158,  158,  158,  158,
+
+      158,  158,  158,   45,  158,  158,  158,  158,  158,  158,
+      158,   53,  158,  158,  158,  158,  158,  158,  158,  158,
+      158,   65,  158,   72,  158,  158,  158,  158,  158,  158,
+      158,   80,  158,   83,  158,  158,  158,  158,  158,  158,
+      158,  158,  158,  158,  158,  158,  158,  101,  158,  158,
+      106,  107,  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,   21,
+       24,  158,  158,  158,   29,  158,  158,  158,   32,  158,
+      158,  158,  158,   39,  158,  158,   43,   44,  158,  158,
+
+      158,  158,  158,  158,  158,  158,   55,   56,  158,   58,
+      158,   60,  158,  158,  158,  158,   69,   71,   73,   74,
+       75,  158,   77,  158,  158,   81,  158,  158,   88,  158,
+      158,  158,  158,  158,   95,  158,   97,  158,  158,  158,
+      103,  158,  158,  158,  158,  158,  158,  111,  112,  114,
+      158,  158,  158,  158,  158,  158,  158,  158,  123,  158,
+      158,  126,  127,  141,  142,    8,  158,  158,  158,  158,
+      158,  158,  158,   26,  158,  158,  158,  158,  158,  158,
+      158,  158,  158,  158,  158,  158,  158,  158,  158,  158,
+       49,   50,   51,  158,  158,   57,  158,   62,   63,  158,
+
+      158,  158,   76,  158,   79,   82,   86,   87,  158,  158,
+      158,  158,  158,   96,  158,  158,  100,  158,  158,  158,
+      158,  158,  110,  158,  158,  158,  117,  158,  158,  120,
+      158,  158,  124,  158,  158,  158,  158,   14,  158,  158,
+      158,  158,  158,   27,  158,   30,  158,  158,  158,  158,
+      158,   37,  158,  158,  158,   42,  158,   47,  158,  158,
+      158,   59,   64,  158,  158,  158,   78,  158,  158,  158,
+      158,  158,  158,   99,  158,  104,  105,  158,  158,  158,
+      158,  158,  118,  119,  121,  158,  125,  158,  158,   13,
+      158,  158,  158,  158,  158,  158,   22,   31,  158,   35,
+
+       36,  158,  158,  158,  158,   48,  158,   54,   66,  158,
+      158,  158,   91,  158,   93,  158,  158,  158,  158,  158,
+      158,  158,  158,  122,  158,  158,  158,  158,  158,  158,
+      158,  158,   33,  158,  158,   41,  158,  158,  158,   68,
+      158,  158,   94,  158,  158,  108,  158,  158,  158,  158,
+      158,   12,  158,  158,  158,  158,   25,  158,   38,  158,
+      158,   52,   67,   89,   92,  158,  158,  109,  113,  158,
+      116,  128,   16,  158,  158,  158,   28,   40,  158,   90,
+       98,  158,  158,  158,   18,   19,  158,  158,  115,  158,
+      158,  158,  158,  158,  102,  158,   46,   17,    0
 
     } ;
 
@@ -504,157 +504,157 @@ static yyconst YY_CHAR yy_meta[72] =
         8
     } ;
 
-static yyconst flex_uint16_t yy_base[614] =
+static yyconst flex_uint16_t yy_base[615] =
     {   0,
         0,    1,   46,    0,  117,  163,    2,    3,  128,  132,
-        6,   10,  211, 1319, 1319,    0, 1319,   13, 1319,  194,
-     1319, 1319, 1319,  194,    6,  130,    4, 1319,  170,  124,
+        6,   10,  211, 1320, 1320,    0, 1320,   13, 1320,  194,
+     1320, 1320, 1320,  194,    6,  130,    4, 1320,  170,  124,
       161,  215,  170,  207,  265,   92,  167,  162,   96,  107,
       223,  165,  162,  221,  274,   92,  284,  277,  315,  206,
-      128,  232,    0,  125, 1319,  152,    4,   19,    0,    0,
+      128,  232,    0,  125, 1320,  152,    4,   19,    0,    0,
         0,  143,    0,    0,  379,    0,    0,  144,    0,   22,
-     1319,    0,  292,  305,  335,   18, 1319, 1319, 1319,    0,
+     1320,    0,  292,  305,  335,   18, 1320, 1320, 1320,    0,
       174,  264,  180,  186,  209,  271,  229,    0,  277,  333,
-      335,  312,  330,  317,  323,  338,  323,  333,  340, 1319,
+      335,  312,  330,  317,  323,  338,  323,  333,  340, 1320,
 
       339,  355,  357,  381,  370,  373,  377,  382,  380,  384,
       383,  383,  383,  431,    0,  398,  383,  390,  406,  402,
       403,  404,  425,  420,  431,  442,    0,  445,  432,  448,
       436,  437,  451,  448,  444,  460,  452,  439,  489,  464,
       468,  469,  468,  462,  455,  477,  501,  493,  489,  494,
-      502,  494,  510,  142,   29,    0,    0, 1319,    0, 1319,
-     1319,   22,   24, 1319, 1319, 1319, 1319, 1319,    0,    0,
-     1319,    0,  520,   26,   28,    0,    0,  508,    0,  512,
-      495,  510,  497,  530,  518,  506,  525,  508,  512,  509,
-      543,  530,  533,  550,    0,  547,  558,  556,  561,  546,
-
-      565,  552,  564,    0,  569,  552,  554,  556,  557,  576,
-      566,  576,  569,  571,  565,  579,  580,  573,  587,  597,
-      598,  604,  594,    0,  593,  594,  612,  613,  616,  603,
-      605,    0,  614,    0,  622,  623,  611,  610,  630,  631,
-      626,  615,  629,  628,  639,  640,  639,  631,  634,  656,
-        0,  654,  648,  659,  658,  670,  672,  668,  666,  667,
-      682,  671,  665,  684,  674,  685,  683,  675,   30,  125,
-        0,  676,  683,  693,  685,  697,  692,  692,    0,  706,
-      697,  706,  704,    0,  705,  711,  725,  713,  722,  717,
-      719,  727,  736,  733,  731,    0,    0,  728,  725,  745,
-
-      742,  729,  730,  736,  743,    0,    0,  739,    0,  742,
-        0,  733,  742,  743,  759,    0,    0,    0,    0,    0,
-      743,    0,  745,  774,  764,  769,  770,    0,  782,  788,
-      791,  796,  780,    0,  794,    0,  782,  777,  782,    0,
-      799,  790,  802,  795,  788,  804,    0,  791,    0,  808,
-      793,  801,  797,  799,  814,  818,  816,    0,  830,  825,
-        0,  828,  136, 1319,    0,  841,  841,  829,  850,  838,
-      849,  853,    0,  844,  841,  855,  856,  848,  854,  864,
-      854,  862,  859,  857,  858,  868,  871,  858,  876,    0,
-        0,    0,  858,  875,    0,  886,    0,    0,  878,  894,
-
-      885,    0,  898,    0,    0,    0,    0,  889,  898,  909,
-      896,  906,    0,  911,  901,    0,  913,  915,  900,  912,
-      905,    0,  904,  906,  912,    0,  924,  925,    0,  912,
-      933,    0,  912,  922,  930,  926,    0,  929,  938,  956,
-      952,  942,    0,  964,    0,  962,  950,  958,  960,  953,
-        0,  954,  971,  973,    0,   93,    0,  957,  969,  965,
-        0,    0,  963,  977,  982,    0,  975,  967,  979,  964,
-      972,  979,    0,  983,    0,    0,  983,  989, 1008, 1013,
-     1011,    0,    0,    0, 1001,    0, 1006, 1009,    0, 1016,
-     1013, 1016, 1018, 1026, 1023,    0,    0, 1028,    0,    0,
-
-     1029, 1026, 1016, 1018,    0, 1025,    0,    0, 1037, 1029,
-     1027,    0, 1031,    0, 1021, 1044, 1041, 1031, 1039, 1042,
-     1043, 1062,    0, 1052, 1066, 1063, 1062, 1065, 1063, 1068,
-     1073,    0, 1070, 1075,    0, 1070, 1084, 1072,    0, 1079,
-     1087,    0, 1090, 1084,    0, 1091, 1083, 1084, 1099, 1096,
-        0, 1098, 1103, 1097, 1106,    0, 1093,    0, 1107, 1107,
-        0,    0, 1111,    0, 1112, 1126,    0,    0, 1124,    0,
-        0,    0, 1121, 1136, 1126,    0,    0, 1136,    0,    0,
-     1126, 1142, 1128,    0,    0, 1135, 1145,    0, 1142, 1145,
-     1135, 1150, 1137,    0, 1138,    0,    0, 1319, 1203, 1213,
-
-     1223, 1233, 1243, 1247, 1250, 1256, 1264, 1274, 1284, 1294,
-     1304, 1309, 1311
+      502,  494,  510,  142,   29,    0,    0, 1320,    0, 1320,
+     1320,   22,   24, 1320, 1320, 1320, 1320, 1320,    0,    0,
+     1320,    0,  520,   26,   28,    0,    0,  508,    0,  512,
+      495,  510,  497,  530,  524,  505,  521,  507,  512,  509,
+      549,  531,  537,  551,    0,  550,  560,  559,  562,  546,
+
+      565,  553,  565,    0,  570,  553,  557,  557,  558,  577,
+      569,  577,  570,  574,  566,  581,  582,  574,  597,  598,
+      603,  604,  599,    0,  594,  597,  617,  614,  617,  604,
+      606,    0,  615,    0,  623,  624,  612,  613,  631,  632,
+      626,  616,  633,  632,  640,  642,  641,  631,  646,  661,
+        0,  655,  652,  660,  661,  672,  675,  669,  667,  668,
+      683,  672,  666,  685,  675,  687,  684,  676,   30,  125,
+        0,  679,  684,  694,  688,  698,  694,  694,    0,    0,
+      707,  708,  711,  705,    0,  709,  712,  728,  715,  725,
+      718,  720,  728,  737,  734,  732,    0,    0,  729,  726,
+
+      746,  744,  730,  731,  737,  746,    0,    0,  740,    0,
+      743,    0,  736,  743,  745,  759,    0,    0,    0,    0,
+        0,  745,    0,  762,  775,  768,  770,  773,    0,  784,
+      791,  792,  797,  781,    0,  795,    0,  783,  778,  783,
+        0,  800,  791,  804,  796,  789,  805,    0,  794,    0,
+      809,  794,  804,  798,  801,  816,  819,  827,    0,  835,
+      826,    0,  832,  136, 1320,    0,  842,  844,  831,  853,
+      839,  850,  854,    0,  845,  842,  856,  857,  849,  856,
+      865,  855,  863,  862,  858,  859,  871,  872,  860,  878,
+        0,    0,    0,  859,  886,    0,  891,    0,    0,  879,
+
+      898,  885,    0,  904,    0,    0,    0,    0,  892,  899,
+      910,  897,  907,    0,  912,  902,    0,  914,  916,  901,
+      914,  906,    0,  905,  907,  915,    0,  925,  926,    0,
+      915,  934,    0,  914,  924,  931,  937,    0,  934,  939,
+      960,  953,  945,    0,  966,    0,  965,  951,  959,  961,
+      954,    0,  955,  972,  974,    0,   93,    0,  958,  970,
+      967,    0,    0,  964,  978,  983,    0,  978,  968,  980,
+      967,  973,  981,    0,  985,    0,    0,  984, 1000, 1013,
+     1014, 1015,    0,    0,    0, 1002,    0, 1009, 1011,    0,
+     1019, 1014, 1017, 1019, 1027, 1024,    0,    0, 1029,    0,
+
+        0, 1030, 1027, 1017, 1020,    0, 1026,    0,    0, 1038,
+     1030, 1030,    0, 1032,    0, 1022, 1047, 1042, 1033, 1041,
+     1043, 1054, 1067,    0, 1053, 1070, 1064, 1065, 1067, 1066,
+     1069, 1074,    0, 1071, 1076,    0, 1071, 1085, 1073,    0,
+     1080, 1088,    0, 1092, 1085,    0, 1092, 1084, 1087, 1100,
+     1097,    0, 1101, 1104, 1099, 1108,    0, 1094,    0, 1118,
+     1112,    0,    0, 1112,    0, 1116, 1127,    0,    0, 1127,
+        0,    0,    0, 1123, 1139, 1127,    0,    0, 1137,    0,
+        0, 1127, 1143, 1129,    0,    0, 1136, 1146,    0, 1143,
+     1146, 1137, 1151, 1138,    0, 1139,    0,    0, 1320, 1204,
+
+     1214, 1224, 1234, 1244, 1248, 1251, 1257, 1265, 1275, 1285,
+     1295, 1305, 1310, 1312
     } ;
 
-static yyconst flex_int16_t yy_def[614] =
+static yyconst flex_int16_t yy_def[615] =
     {   0,
-      599,  599,  598,    3,  600,  600,  601,  601,  602,  602,
-      603,  603,  598,  598,  598,  604,  598,  598,  598,  598,
-      598,  598,  598,  598,  598,  598,  598,  598,  598,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  598,  598,  598,  598,  606,  607,
-      607,  598,  608,  608,  609,  610,  610,  598,  604,  598,
-      598,  611,  598,  598,  598,  598,  598,  598,  598,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  598,
-
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  598,  598,  606,  607,  598,  608,  598,
-      598,  598,  598,  598,  598,  598,  598,  598,  612,  610,
-      598,  611,  598,  598,  598,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  598,  598,
-      613,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  598,  598,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605,  605,    0,  598,  598,
-
-      598,  598,  598,  598,  598,  598,  598,  598,  598,  598,
-      598,  598,  598
+      600,  600,  599,    3,  601,  601,  602,  602,  603,  603,
+      604,  604,  599,  599,  599,  605,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  599,  599,  599,  599,  607,  608,
+      608,  599,  609,  609,  610,  611,  611,  599,  605,  599,
+      599,  612,  599,  599,  599,  599,  599,  599,  599,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  599,
+
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  599,  599,  607,  608,  599,  609,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  613,  611,
+      599,  612,  599,  599,  599,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  599,  599,
+      614,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  599,  599,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,    0,  599,
+
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599
     } ;
 
-static yyconst flex_uint16_t yy_nxt[1391] =
+static yyconst flex_uint16_t yy_nxt[1392] =
     {   0,
-      598,  598,   15,   15,   61,   61,  155,  155,   67,   62,
-       62,   68,   67,  598,   70,   68,   70,   73,   73,   77,
-       78,  155,  155,   70,  598,   70,  174,  174,  598,  175,
+      599,  599,   15,   15,   61,   61,  155,  155,   67,   62,
+       62,   68,   67,  599,   70,   68,   70,   73,   73,   77,
+       78,  155,  155,   70,  599,   70,  174,  174,  599,  175,
       175,  155,  155,  269,  270,  270,  270,  175,  175,  175,
-      175,  363,  270,  598,   16,   16,   17,   18,   19,   18,
+      175,  364,  270,  599,   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,
@@ -664,7 +664,7 @@ static yyconst flex_uint16_t yy_nxt[1391] =
        38,   39,   40,   41,   42,   43,   44,   45,   46,   47,
        48,   49,   50,   51,   52,   53,   54,   17,   56,   57,
        58,   17,   17,   17,   17,   17,  111,  116,  117,  134,
-       64,   17,   17,   17,   64,   62,  270,  270,  504,   62,
+       64,   17,   17,   17,   64,   62,  270,  270,  505,   62,
        74,   75,   75,  154,   81,  150,  153,  270,  270,  171,
       158,   76,   82,  154,   83,  111,  116,  117,  134,   84,
        17,   17,   17,   17,   56,   57,   58,   17,   17,   17,
@@ -673,96 +673,96 @@ static yyconst flex_uint16_t yy_nxt[1391] =
       122,   96,  114,  124,  176,   97,  123,  115,  113,  125,
 
       179,   98,   88,   72,   99,  180,   17,   17,   17,   71,
-      598,   85,  598,  112,  100,   86,   95,  598,   87,  122,
+      599,   85,  599,  112,  100,   86,   95,  599,   87,  122,
        96,  114,  124,  176,   97,  123,  115,  113,  125,  179,
        98,   88,   89,   99,  180,  101,  147,  102,  148,   90,
       118,  149,  103,  126,  119,  181,   91,  104,  120,   92,
-       93,  127,   94,  598,  121,  128,  151,  152,  129,  130,
-      184,   89,  598,  598,  101,  147,  102,  148,   90,  118,
+       93,  127,   94,  599,  121,  128,  151,  152,  129,  130,
+      184,   89,  599,  599,  101,  147,  102,  148,   90,  118,
       149,  103,  126,  119,  181,   91,  104,  120,   92,   93,
       127,   94,  105,  121,  128,  151,  152,  129,  130,  184,
-      106,  131,  177,  107,  182,  132,  108,  598,  139,  109,
+      106,  131,  177,  107,  182,  132,  108,  599,  139,  109,
 
       178,  135,  110,   73,   73,  136,  140,  183,  133,  137,
-      598,  105,  185,   76,  141,  138,  173,  173,  598,  106,
+      599,  105,  185,   76,  141,  138,  173,  173,  599,  106,
       131,  177,  107,  182,  132,  108,   76,  139,  109,  178,
       135,  110,  142,  191,  136,  140,  183,  133,  137,  143,
       144,  185,   76,  141,  138,   74,   75,   75,  192,  145,
-      186,  193,  146,  598,  187,   76,   76,  196,  200,  194,
+      186,  193,  146,  599,  187,   76,   76,  196,  200,  194,
       197,  142,  191,  188,  195,  189,  198,  190,  143,  144,
-      201,  202,  598,  199,  203,  204,  205,  192,  145,  186,
-      193,  146,  161,  187,  598,   76,  196,  200,  194,  197,
+      201,  202,  599,  199,  203,  204,  205,  192,  145,  186,
+      193,  146,  161,  187,  599,   76,  196,  200,  194,  197,
       162,  163,  188,  195,  189,  198,  190,  164,  208,  201,
 
       202,  165,  199,  203,  204,  205,  206,  209,  210,  166,
       211,  213,  214,  167,  215,  168,  212,  207,  216,  169,
-      218,  217,  598,  223,  224,  225,  164,  208,  226,  227,
-      165,  228,  598,  229,  230,  206,  209,  210,  166,  211,
+      218,  217,  599,  223,  224,  225,  164,  208,  226,  227,
+      165,  228,  599,  229,  230,  206,  209,  210,  166,  211,
       213,  214,  167,  215,  168,  212,  207,  216,  169,  218,
       217,  219,  223,  224,  225,  231,  232,  226,  227,  233,
       228,  220,  229,  230,  234,  235,  221,  222,  236,  237,
-      238,  239,  240,  242,  243,  247,  241,  244,  248,  598,
+      238,  239,  240,  242,  243,  247,  241,  244,  248,  599,
       219,  252,  245,  246,  231,  232,  253,  254,  233,  255,
       220,  256,  257,  234,  235,  221,  222,  236,  237,  238,
 
       239,  240,  242,  243,  247,  241,  244,  248,  249,  258,
       252,  245,  246,  261,  262,  253,  254,  250,  255,  259,
       256,  257,  263,  265,  266,  251,  260,  268,  264,  272,
-      267,  173,  173,  273,  274,  275,  276,  249,  258,  279,
-      280,   76,  261,  262,  281,  282,  250,  283,  259,  277,
-      284,  263,  265,  266,  251,  260,  268,  264,  272,  267,
-      285,  278,  273,  274,  275,  276,  286,  287,  279,  280,
-       76,  288,  289,  281,  282,  290,  283,  291,  277,  284,
-      293,  292,  294,  295,  296,  297,  298,  299,  300,  285,
+      267,  173,  173,  273,  274,  275,  276,  249,  258,  281,
+      282,   76,  261,  262,  283,  279,  250,  284,  259,  277,
+      285,  263,  265,  266,  251,  260,  268,  264,  272,  267,
+      280,  278,  273,  274,  275,  276,  286,  287,  281,  282,
+       76,  288,  289,  283,  279,  290,  284,  291,  277,  285,
+      292,  294,  295,  296,  293,  297,  298,  299,  300,  280,
       278,  301,  302,  303,  304,  286,  287,  305,  306,  307,
 
-      288,  289,  308,  309,  290,  310,  291,  311,  312,  293,
-      292,  294,  295,  296,  297,  298,  299,  300,  313,  314,
-      301,  302,  303,  304,  317,  315,  305,  306,  307,  318,
-      319,  308,  309,  320,  310,  316,  311,  312,  321,  322,
+      288,  289,  308,  309,  290,  310,  291,  311,  312,  292,
+      294,  295,  296,  293,  297,  298,  299,  300,  313,  314,
+      301,  302,  303,  304,  315,  316,  305,  306,  307,  318,
+      319,  308,  309,  320,  310,  317,  311,  312,  321,  322,
       323,  324,  325,  326,  327,  328,  329,  313,  314,  330,
-      331,  334,  335,  317,  315,  332,  336,  333,  318,  319,
-      337,  338,  320,  339,  316,  342,  340,  321,  322,  323,
-      324,  325,  326,  327,  328,  329,  341,  343,  330,  331,
-      334,  335,  344,  345,  332,  336,  333,  346,  347,  337,
-      338,  348,  339,  349,  342,  340,  350,  351,  352,  354,
-
-      353,  355,  356,  357,  358,  360,  343,  361,  359,  362,
-      365,  344,  345,  366,  367,  368,  346,  347,  369,  370,
-      348,  371,  349,  372,  373,  350,  351,  352,  354,  353,
-      355,  356,  357,  358,  360,  374,  361,  359,  362,  365,
+      331,  332,  335,  315,  316,  333,  336,  334,  318,  319,
+      337,  338,  320,  339,  317,  340,  341,  321,  322,  323,
+      324,  325,  326,  327,  328,  329,  342,  343,  330,  331,
+      332,  335,  344,  345,  333,  336,  334,  346,  347,  337,
+      338,  348,  339,  349,  340,  341,  350,  351,  352,  353,
+
+      355,  354,  356,  357,  358,  359,  343,  361,  362,  360,
+      363,  344,  345,  366,  367,  368,  346,  347,  369,  370,
+      348,  371,  349,  372,  373,  350,  351,  352,  353,  355,
+      354,  356,  357,  358,  359,  374,  361,  362,  360,  363,
       375,  376,  366,  367,  368,  377,  378,  369,  370,  379,
       371,  380,  372,  373,  381,  382,  383,  384,  385,  386,
       387,  388,  389,  390,  374,  391,  392,  393,  394,  375,
-      376,  395,  396,  397,  377,  378,  398,  399,  379,  402,
-      380,  403,  400,  381,  382,  383,  384,  385,  386,  387,
-      388,  389,  390,  401,  391,  392,  393,  394,  404,  405,
+      376,  395,  396,  397,  377,  378,  398,  399,  379,  400,
+      380,  403,  401,  381,  382,  383,  384,  385,  386,  387,
+      388,  389,  390,  402,  391,  392,  393,  394,  404,  405,
 
-      395,  396,  397,  406,  407,  398,  399,  408,  402,  409,
-      403,  400,  410,  411,  412,  413,  414,  415,  416,  417,
-      418,  419,  401,  420,  421,  422,  423,  404,  405,  424,
+      395,  396,  397,  406,  407,  398,  399,  408,  400,  409,
+      403,  401,  410,  411,  412,  413,  414,  415,  416,  417,
+      418,  419,  402,  420,  421,  422,  423,  404,  405,  424,
       425,  426,  406,  407,  427,  428,  408,  429,  409,  430,
       431,  410,  411,  412,  413,  414,  415,  416,  417,  418,
       419,  432,  420,  421,  422,  423,  433,  434,  424,  425,
       426,  435,  436,  427,  428,  437,  429,  438,  430,  431,
-      439,  441,  442,  440,  443,  444,  445,  446,  447,  448,
+      439,  440,  442,  443,  441,  444,  445,  446,  447,  448,
       432,  449,  450,  451,  452,  433,  434,  453,  454,  455,
       435,  436,  456,  457,  437,  458,  438,  459,  460,  439,
 
-      441,  442,  440,  443,  444,  445,  446,  447,  448,  461,
-      449,  450,  451,  452,  462,  463,  453,  454,  455,  466,
-      464,  456,  457,  465,  458,  467,  459,  460,  468,  469,
+      440,  442,  443,  441,  444,  445,  446,  447,  448,  461,
+      449,  450,  451,  452,  462,  463,  453,  454,  455,  464,
+      465,  456,  457,  466,  458,  467,  459,  460,  468,  469,
       470,  471,  472,  473,  474,  475,  476,  477,  461,  478,
-      479,  480,  481,  462,  463,  482,  483,  484,  466,  464,
-      485,  486,  465,  487,  467,  488,  489,  468,  469,  470,
+      479,  480,  481,  462,  463,  482,  483,  484,  464,  465,
+      485,  486,  466,  487,  467,  488,  489,  468,  469,  470,
       471,  472,  473,  474,  475,  476,  477,  490,  478,  479,
       480,  481,  491,  492,  482,  483,  484,  493,  494,  485,
       486,  495,  487,  496,  488,  489,  497,  498,  499,  500,
-      501,  502,  503,  505,  506,  507,  490,  508,  509,  510,
+      501,  502,  503,  504,  506,  507,  490,  508,  509,  510,
 
       511,  491,  492,  512,  513,  514,  493,  494,  515,  516,
       495,  517,  496,  518,  519,  497,  498,  499,  500,  501,
-      502,  503,  505,  506,  507,  520,  508,  509,  510,  511,
+      502,  503,  504,  506,  507,  520,  508,  509,  510,  511,
       521,  522,  512,  513,  514,  523,  524,  515,  516,  525,
       517,  526,  518,  519,  527,  528,  529,  530,  531,  532,
       533,  534,  535,  536,  520,  537,  538,  539,  540,  521,
@@ -778,33 +778,35 @@ static yyconst flex_uint16_t yy_nxt[1391] =
       565,  578,  566,  567,  568,  569,  579,  580,  570,  571,
       572,  581,  582,  573,  574,  583,  575,  584,  576,  577,
       585,  586,  587,  588,  589,  590,  591,  592,  593,  594,
-      578,  595,  596,  597,  598,  579,  580,  598,  598,  598,
-      581,  582,  598,  598,  583,  598,  584,  598,  598,  585,
-      586,  587,  588,  589,  590,  591,  592,  593,  594,  598,
-
-      595,  596,  597,   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,  598,   80,
-      156,  156,  156,  156,  157,  157,  157,  598,  157,  157,
-      157,  157,  157,  157,  159,  159,  159,  598,  159,  159,
-      159,  159,  598,  159,  160,  160,  160,  160,  160,  160,
-      160,  160,  160,  160,  170,  170,  598,  170,  170,  170,
-
-      170,  170,  170,  170,  172,  598,  172,  172,  172,  172,
-      172,  172,  172,  172,  271,  271,  364,  364,   13,  598,
-      598,  598,  598,  598,  598,  598,  598,  598,  598,  598,
-      598,  598,  598,  598,  598,  598,  598,  598,  598,  598,
-      598,  598,  598,  598,  598,  598,  598,  598,  598,  598,
-      598,  598,  598,  598,  598,  598,  598,  598,  598,  598,
-      598,  598,  598,  598,  598,  598,  598,  598,  598,  598,
-      598,  598,  598,  598,  598,  598,  598,  598,  598,  598,
-      598,  598,  598,  598,  598,  598,  598,  598,  598,  598
+      578,  595,  596,  597,  598,  579,  580,  599,  599,  599,
+      581,  582,  599,  599,  583,  599,  584,  599,  599,  585,
+      586,  587,  588,  589,  590,  591,  592,  593,  594,  599,
+
+      595,  596,  597,  598,   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,  599,
+       80,  156,  156,  156,  156,  157,  157,  157,  599,  157,
+      157,  157,  157,  157,  157,  159,  159,  159,  599,  159,
+      159,  159,  159,  599,  159,  160,  160,  160,  160,  160,
+      160,  160,  160,  160,  160,  170,  170,  599,  170,  170,
+
+      170,  170,  170,  170,  170,  172,  599,  172,  172,  172,
+      172,  172,  172,  172,  172,  271,  271,  365,  365,   13,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599
+
     } ;
 
-static yyconst flex_int16_t yy_chk[1391] =
+static yyconst flex_int16_t yy_chk[1392] =
     {   0,
         0,    0,    1,    2,    7,    8,   57,   57,   11,    7,
         8,   11,   12,    0,   18,   12,   18,   25,   25,   27,
@@ -820,8 +822,8 @@ static yyconst flex_int16_t yy_chk[1391] =
         3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
         3,    3,    3,    3,    3,    3,    3,    5,    5,    5,
         5,    5,    5,    5,    5,    5,   36,   39,   40,   46,
-        9,    5,    5,    5,   10,    9,  270,  270,  456,   10,
-       26,   26,   26,  154,   30,   51,   54,  363,  363,   68,
+        9,    5,    5,    5,   10,    9,  270,  270,  457,   10,
+       26,   26,   26,  154,   30,   51,   54,  364,  364,   68,
        62,   26,   30,   56,   30,   36,   39,   40,   46,   30,
         5,    5,    5,    6,    6,    6,    6,    6,    6,    6,
         6,    6,    9,   30,   51,   54,   10,    6,    6,    6,
@@ -864,104 +866,106 @@ static yyconst flex_int16_t yy_chk[1391] =
       132,  133,  134,  135,  137,  133,  136,  138,  139,  146,
       140,  136,  136,  148,  149,  141,  142,  139,  143,  147,
       144,  145,  150,  151,  152,  139,  147,  153,  150,  178,
-      152,  173,  173,  180,  181,  182,  183,  139,  146,  185,
-      186,  173,  148,  149,  187,  188,  139,  189,  147,  184,
+      152,  173,  173,  180,  181,  182,  183,  139,  146,  186,
+      187,  173,  148,  149,  188,  185,  139,  189,  147,  184,
       190,  150,  151,  152,  139,  147,  153,  150,  178,  152,
-      191,  184,  180,  181,  182,  183,  192,  193,  185,  186,
-      173,  194,  196,  187,  188,  197,  189,  198,  184,  190,
-      199,  198,  200,  201,  202,  203,  205,  206,  207,  191,
-      184,  208,  209,  210,  211,  192,  193,  212,  213,  214,
-
-      194,  196,  215,  216,  197,  217,  198,  218,  219,  199,
-      198,  200,  201,  202,  203,  205,  206,  207,  220,  221,
-      208,  209,  210,  211,  223,  222,  212,  213,  214,  225,
-      226,  215,  216,  227,  217,  222,  218,  219,  228,  229,
-      230,  231,  233,  235,  236,  237,  238,  220,  221,  239,
-      240,  242,  243,  223,  222,  241,  244,  241,  225,  226,
-      245,  246,  227,  247,  222,  249,  248,  228,  229,  230,
-      231,  233,  235,  236,  237,  238,  248,  250,  239,  240,
-      242,  243,  252,  253,  241,  244,  241,  254,  255,  245,
-      246,  256,  247,  257,  249,  248,  258,  259,  260,  261,
-
-      260,  262,  263,  264,  265,  266,  250,  267,  265,  268,
-      272,  252,  253,  273,  274,  275,  254,  255,  276,  277,
-      256,  278,  257,  280,  281,  258,  259,  260,  261,  260,
-      262,  263,  264,  265,  266,  282,  267,  265,  268,  272,
-      283,  285,  273,  274,  275,  286,  287,  276,  277,  288,
-      278,  289,  280,  281,  290,  291,  292,  293,  294,  295,
-      298,  299,  300,  301,  282,  302,  303,  304,  305,  283,
-      285,  308,  310,  312,  286,  287,  313,  314,  288,  321,
-      289,  323,  315,  290,  291,  292,  293,  294,  295,  298,
-      299,  300,  301,  315,  302,  303,  304,  305,  324,  325,
-
-      308,  310,  312,  326,  327,  313,  314,  329,  321,  330,
-      323,  315,  331,  332,  333,  335,  337,  338,  339,  341,
-      342,  343,  315,  344,  345,  346,  348,  324,  325,  350,
-      351,  352,  326,  327,  353,  354,  329,  355,  330,  356,
-      357,  331,  332,  333,  335,  337,  338,  339,  341,  342,
-      343,  359,  344,  345,  346,  348,  360,  362,  350,  351,
-      352,  366,  367,  353,  354,  368,  355,  369,  356,  357,
-      370,  371,  372,  370,  374,  375,  376,  377,  378,  379,
-      359,  380,  381,  382,  383,  360,  362,  384,  385,  386,
-      366,  367,  387,  388,  368,  389,  369,  393,  394,  370,
-
-      371,  372,  370,  374,  375,  376,  377,  378,  379,  396,
-      380,  381,  382,  383,  399,  400,  384,  385,  386,  403,
-      401,  387,  388,  401,  389,  408,  393,  394,  409,  410,
-      411,  412,  414,  415,  417,  418,  419,  420,  396,  421,
-      423,  424,  425,  399,  400,  427,  428,  430,  403,  401,
-      431,  433,  401,  434,  408,  435,  436,  409,  410,  411,
-      412,  414,  415,  417,  418,  419,  420,  438,  421,  423,
-      424,  425,  439,  440,  427,  428,  430,  441,  442,  431,
-      433,  444,  434,  446,  435,  436,  447,  448,  449,  450,
-      452,  453,  454,  458,  459,  460,  438,  463,  464,  465,
-
-      467,  439,  440,  468,  469,  470,  441,  442,  471,  472,
-      444,  474,  446,  477,  478,  447,  448,  449,  450,  452,
-      453,  454,  458,  459,  460,  479,  463,  464,  465,  467,
-      480,  481,  468,  469,  470,  485,  487,  471,  472,  488,
-      474,  490,  477,  478,  491,  492,  493,  494,  495,  498,
-      501,  502,  503,  504,  479,  506,  509,  510,  511,  480,
-      481,  513,  515,  516,  485,  487,  517,  518,  488,  519,
-      490,  520,  521,  491,  492,  493,  494,  495,  498,  501,
-      502,  503,  504,  522,  506,  509,  510,  511,  524,  525,
-      513,  515,  516,  526,  527,  517,  518,  528,  519,  529,
-
-      520,  521,  530,  531,  533,  534,  536,  537,  538,  540,
-      541,  543,  522,  544,  546,  547,  548,  524,  525,  549,
-      550,  552,  526,  527,  553,  554,  528,  555,  529,  557,
-      559,  530,  531,  533,  534,  536,  537,  538,  540,  541,
-      543,  560,  544,  546,  547,  548,  563,  565,  549,  550,
-      552,  566,  569,  553,  554,  573,  555,  574,  557,  559,
-      575,  578,  581,  582,  583,  586,  587,  589,  590,  591,
-      560,  592,  593,  595,    0,  563,  565,    0,    0,    0,
-      566,  569,    0,    0,  573,    0,  574,    0,    0,  575,
-      578,  581,  582,  583,  586,  587,  589,  590,  591,    0,
-
-      592,  593,  595,  599,  599,  599,  599,  599,  599,  599,
-      599,  599,  599,  600,  600,  600,  600,  600,  600,  600,
-      600,  600,  600,  601,  601,  601,  601,  601,  601,  601,
-      601,  601,  601,  602,  602,  602,  602,  602,  602,  602,
-      602,  602,  602,  603,  603,  603,  603,  603,  603,  603,
-      603,  603,  603,  604,  604,  605,  605,  605,    0,  605,
-      606,  606,  606,  606,  607,  607,  607,    0,  607,  607,
-      607,  607,  607,  607,  608,  608,  608,    0,  608,  608,
-      608,  608,    0,  608,  609,  609,  609,  609,  609,  609,
-      609,  609,  609,  609,  610,  610,    0,  610,  610,  610,
-
-      610,  610,  610,  610,  611,    0,  611,  611,  611,  611,
-      611,  611,  611,  611,  612,  612,  613,  613,  598,  598,
-      598,  598,  598,  598,  598,  598,  598,  598,  598,  598,
-      598,  598,  598,  598,  598,  598,  598,  598,  598,  598,
-      598,  598,  598,  598,  598,  598,  598,  598,  598,  598,
-      598,  598,  598,  598,  598,  598,  598,  598,  598,  598,
-      598,  598,  598,  598,  598,  598,  598,  598,  598,  598,
-      598,  598,  598,  598,  598,  598,  598,  598,  598,  598,
-      598,  598,  598,  598,  598,  598,  598,  598,  598,  598
+      185,  184,  180,  181,  182,  183,  191,  192,  186,  187,
+      173,  193,  194,  188,  185,  196,  189,  197,  184,  190,
+      198,  199,  200,  201,  198,  202,  203,  205,  206,  185,
+      184,  207,  208,  209,  210,  191,  192,  211,  212,  213,
+
+      193,  194,  214,  215,  196,  216,  197,  217,  218,  198,
+      199,  200,  201,  198,  202,  203,  205,  206,  219,  220,
+      207,  208,  209,  210,  221,  222,  211,  212,  213,  223,
+      225,  214,  215,  226,  216,  222,  217,  218,  227,  228,
+      229,  230,  231,  233,  235,  236,  237,  219,  220,  238,
+      239,  240,  242,  221,  222,  241,  243,  241,  223,  225,
+      244,  245,  226,  246,  222,  247,  248,  227,  228,  229,
+      230,  231,  233,  235,  236,  237,  248,  249,  238,  239,
+      240,  242,  250,  252,  241,  243,  241,  253,  254,  244,
+      245,  255,  246,  256,  247,  248,  257,  258,  259,  260,
+
+      261,  260,  262,  263,  264,  265,  249,  266,  267,  265,
+      268,  250,  252,  272,  273,  274,  253,  254,  275,  276,
+      255,  277,  256,  278,  281,  257,  258,  259,  260,  261,
+      260,  262,  263,  264,  265,  282,  266,  267,  265,  268,
+      283,  284,  272,  273,  274,  286,  287,  275,  276,  288,
+      277,  289,  278,  281,  290,  291,  292,  293,  294,  295,
+      296,  299,  300,  301,  282,  302,  303,  304,  305,  283,
+      284,  306,  309,  311,  286,  287,  313,  314,  288,  315,
+      289,  322,  316,  290,  291,  292,  293,  294,  295,  296,
+      299,  300,  301,  316,  302,  303,  304,  305,  324,  325,
+
+      306,  309,  311,  326,  327,  313,  314,  328,  315,  330,
+      322,  316,  331,  332,  333,  334,  336,  338,  339,  340,
+      342,  343,  316,  344,  345,  346,  347,  324,  325,  349,
+      351,  352,  326,  327,  353,  354,  328,  355,  330,  356,
+      357,  331,  332,  333,  334,  336,  338,  339,  340,  342,
+      343,  358,  344,  345,  346,  347,  360,  361,  349,  351,
+      352,  363,  367,  353,  354,  368,  355,  369,  356,  357,
+      370,  371,  372,  373,  371,  375,  376,  377,  378,  379,
+      358,  380,  381,  382,  383,  360,  361,  384,  385,  386,
+      363,  367,  387,  388,  368,  389,  369,  390,  394,  370,
+
+      371,  372,  373,  371,  375,  376,  377,  378,  379,  395,
+      380,  381,  382,  383,  397,  400,  384,  385,  386,  401,
+      402,  387,  388,  402,  389,  404,  390,  394,  409,  410,
+      411,  412,  413,  415,  416,  418,  419,  420,  395,  421,
+      422,  424,  425,  397,  400,  426,  428,  429,  401,  402,
+      431,  432,  402,  434,  404,  435,  436,  409,  410,  411,
+      412,  413,  415,  416,  418,  419,  420,  437,  421,  422,
+      424,  425,  439,  440,  426,  428,  429,  441,  442,  431,
+      432,  443,  434,  445,  435,  436,  447,  448,  449,  450,
+      451,  453,  454,  455,  459,  460,  437,  461,  464,  465,
+
+      466,  439,  440,  468,  469,  470,  441,  442,  471,  472,
+      443,  473,  445,  475,  478,  447,  448,  449,  450,  451,
+      453,  454,  455,  459,  460,  479,  461,  464,  465,  466,
+      480,  481,  468,  469,  470,  482,  486,  471,  472,  488,
+      473,  489,  475,  478,  491,  492,  493,  494,  495,  496,
+      499,  502,  503,  504,  479,  505,  507,  510,  511,  480,
+      481,  512,  514,  516,  482,  486,  517,  518,  488,  519,
+      489,  520,  521,  491,  492,  493,  494,  495,  496,  499,
+      502,  503,  504,  522,  505,  507,  510,  511,  523,  525,
+      512,  514,  516,  526,  527,  517,  518,  528,  519,  529,
+
+      520,  521,  530,  531,  532,  534,  535,  537,  538,  539,
+      541,  542,  522,  544,  545,  547,  548,  523,  525,  549,
+      550,  551,  526,  527,  553,  554,  528,  555,  529,  556,
+      558,  530,  531,  532,  534,  535,  537,  538,  539,  541,
+      542,  560,  544,  545,  547,  548,  561,  564,  549,  550,
+      551,  566,  567,  553,  554,  570,  555,  574,  556,  558,
+      575,  576,  579,  582,  583,  584,  587,  588,  590,  591,
+      560,  592,  593,  594,  596,  561,  564,    0,    0,    0,
+      566,  567,    0,    0,  570,    0,  574,    0,    0,  575,
+      576,  579,  582,  583,  584,  587,  588,  590,  591,    0,
+
+      592,  593,  594,  596,  600,  600,  600,  600,  600,  600,
+      600,  600,  600,  600,  601,  601,  601,  601,  601,  601,
+      601,  601,  601,  601,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  603,  603,  603,  603,  603,  603,
+      603,  603,  603,  603,  604,  604,  604,  604,  604,  604,
+      604,  604,  604,  604,  605,  605,  606,  606,  606,    0,
+      606,  607,  607,  607,  607,  608,  608,  608,    0,  608,
+      608,  608,  608,  608,  608,  609,  609,  609,    0,  609,
+      609,  609,  609,    0,  609,  610,  610,  610,  610,  610,
+      610,  610,  610,  610,  610,  611,  611,    0,  611,  611,
+
+      611,  611,  611,  611,  611,  612,    0,  612,  612,  612,
+      612,  612,  612,  612,  612,  613,  613,  614,  614,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599
+
     } ;
 
 /* Table of booleans, true if rule could match eol. */
-static yyconst flex_int32_t yy_rule_can_match_eol[164] =
+static yyconst flex_int32_t yy_rule_can_match_eol[165] =
     {   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, 
@@ -970,8 +974,8 @@ static yyconst flex_int32_t yy_rule_can_match_eol[164] =
     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, 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.
@@ -1092,7 +1096,7 @@ class UnaryOperation;
 
 
 
-#line 1096 "SqlLexer_gen.cpp"
+#line 1100 "SqlLexer_gen.cpp"
 
 #define INITIAL 0
 #define CONDITION_SQL 1
@@ -1383,7 +1387,7 @@ YY_DECL
 #line 132 "../SqlLexer.lpp"
 
 
-#line 1387 "SqlLexer_gen.cpp"
+#line 1391 "SqlLexer_gen.cpp"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -1410,13 +1414,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 >= 599 )
+				if ( yy_current_state >= 600 )
 					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 != 598 );
+		while ( yy_current_state != 599 );
 		yy_cp = yyg->yy_last_accepting_cpos;
 		yy_current_state = yyg->yy_last_accepting_state;
 
@@ -1580,17 +1584,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
@@ -1600,72 +1604,72 @@ 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_DELIMITER;
+return TOKEN_DELETE;
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
 #line 204 "../SqlLexer.lpp"
-return TOKEN_DESC;
+return TOKEN_DELIMITER;
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
@@ -1675,127 +1679,127 @@ return TOKEN_DESC;
 case 40:
 YY_RULE_SETUP
 #line 206 "../SqlLexer.lpp"
-return TOKEN_DISTINCT;
+return TOKEN_DESC;
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
 #line 207 "../SqlLexer.lpp"
-return TOKEN_DOUBLE;
+return TOKEN_DISTINCT;
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
 #line 208 "../SqlLexer.lpp"
-return TOKEN_DROP;
+return TOKEN_DOUBLE;
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
 #line 209 "../SqlLexer.lpp"
-return TOKEN_ELSE;
+return TOKEN_DROP;
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
 #line 210 "../SqlLexer.lpp"
-return TOKEN_END;
+return TOKEN_ELSE;
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
 #line 211 "../SqlLexer.lpp"
-return TOKEN_ESCAPE_STRINGS;
+return TOKEN_END;
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
 #line 212 "../SqlLexer.lpp"
-return TOKEN_EXISTS;
+return TOKEN_ESCAPE_STRINGS;
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
 #line 213 "../SqlLexer.lpp"
-return TOKEN_EXTRACT;
+return TOKEN_EXISTS;
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
 #line 214 "../SqlLexer.lpp"
-return TOKEN_FALSE;
+return TOKEN_EXTRACT;
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
 #line 215 "../SqlLexer.lpp"
-return TOKEN_FIRST;
+return TOKEN_FALSE;
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
 #line 216 "../SqlLexer.lpp"
-return TOKEN_FLOAT;
+return TOKEN_FIRST;
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
 #line 217 "../SqlLexer.lpp"
-return TOKEN_FOLLOWING;
+return TOKEN_FLOAT;
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
 #line 218 "../SqlLexer.lpp"
-return TOKEN_FOR;
+return TOKEN_FOLLOWING;
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
 #line 219 "../SqlLexer.lpp"
-return TOKEN_FOREIGN;
+return TOKEN_FOR;
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
 #line 220 "../SqlLexer.lpp"
-return TOKEN_FROM;
+return TOKEN_FOREIGN;
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
 #line 221 "../SqlLexer.lpp"
-return TOKEN_FULL;
+return TOKEN_FROM;
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
 #line 222 "../SqlLexer.lpp"
-return TOKEN_GROUP;
+return TOKEN_FULL;
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
 #line 223 "../SqlLexer.lpp"
-return TOKEN_HASH;
+return TOKEN_GROUP;
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
 #line 224 "../SqlLexer.lpp"
-return TOKEN_HAVING;
+return TOKEN_HASH;
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
 #line 225 "../SqlLexer.lpp"
-return TOKEN_HOUR;
+return TOKEN_HAVING;
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
 #line 226 "../SqlLexer.lpp"
-return TOKEN_IN;
+return TOKEN_HOUR;
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
 #line 227 "../SqlLexer.lpp"
-return TOKEN_INDEX;
+return TOKEN_IN;
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
 #line 228 "../SqlLexer.lpp"
-return TOKEN_INNER;
+return TOKEN_INDEX;
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
 #line 229 "../SqlLexer.lpp"
-return TOKEN_INSERT;
+return TOKEN_INNER;
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
 #line 230 "../SqlLexer.lpp"
-return TOKEN_INTEGER;
+return TOKEN_INSERT;
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
@@ -1805,322 +1809,322 @@ return TOKEN_INTEGER;
 case 66:
 YY_RULE_SETUP
 #line 232 "../SqlLexer.lpp"
-return TOKEN_INTERSECT;
+return TOKEN_INTEGER;
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
 #line 233 "../SqlLexer.lpp"
-return TOKEN_INTERVAL;
+return TOKEN_INTERSECT;
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
 #line 234 "../SqlLexer.lpp"
-return TOKEN_INTO;
+return TOKEN_INTERVAL;
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
 #line 235 "../SqlLexer.lpp"
-return TOKEN_IS;
+return TOKEN_INTO;
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
 #line 236 "../SqlLexer.lpp"
-return TOKEN_JOIN;
+return TOKEN_IS;
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
 #line 237 "../SqlLexer.lpp"
-return TOKEN_KEY;
+return TOKEN_JOIN;
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
 #line 238 "../SqlLexer.lpp"
-return TOKEN_LAST;
+return TOKEN_KEY;
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
 #line 239 "../SqlLexer.lpp"
-return TOKEN_LEFT;
+return TOKEN_LAST;
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
 #line 240 "../SqlLexer.lpp"
-return TOKEN_LIKE;
+return TOKEN_LEFT;
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
 #line 241 "../SqlLexer.lpp"
-return TOKEN_LIMIT;
+return TOKEN_LIKE;
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
 #line 242 "../SqlLexer.lpp"
-return TOKEN_LONG;
+return TOKEN_LIMIT;
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
 #line 243 "../SqlLexer.lpp"
-return TOKEN_MINUTE;
+return TOKEN_LONG;
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
 #line 244 "../SqlLexer.lpp"
-return TOKEN_MONTH;
+return TOKEN_MINUTE;
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
 #line 245 "../SqlLexer.lpp"
-return TOKEN_NOT;
+return TOKEN_MONTH;
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
 #line 246 "../SqlLexer.lpp"
-return TOKEN_NULL;
+return TOKEN_NOT;
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
 #line 247 "../SqlLexer.lpp"
-return TOKEN_NULLS;
+return TOKEN_NULL;
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
 #line 248 "../SqlLexer.lpp"
-return TOKEN_OFF;
+return TOKEN_NULLS;
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
 #line 249 "../SqlLexer.lpp"
-return TOKEN_ON;
+return TOKEN_OFF;
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
 #line 250 "../SqlLexer.lpp"
-return TOKEN_OR;
+return TOKEN_ON;
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
 #line 251 "../SqlLexer.lpp"
-return TOKEN_ORDER;
+return TOKEN_OR;
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
 #line 252 "../SqlLexer.lpp"
-return TOKEN_OUTER;
+return TOKEN_ORDER;
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
 #line 253 "../SqlLexer.lpp"
-return TOKEN_OVER;
+return TOKEN_OUTER;
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
 #line 254 "../SqlLexer.lpp"
-return TOKEN_PARTITION;
+return TOKEN_OVER;
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
 #line 255 "../SqlLexer.lpp"
-return TOKEN_PARTITIONS;
+return TOKEN_PARTITION;
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
 #line 256 "../SqlLexer.lpp"
-return TOKEN_PERCENT;
+return TOKEN_PARTITIONS;
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
 #line 257 "../SqlLexer.lpp"
-return TOKEN_PRECEDING;
+return TOKEN_PERCENT;
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
 #line 258 "../SqlLexer.lpp"
-return TOKEN_PRIMARY;
+return TOKEN_PRECEDING;
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
 #line 259 "../SqlLexer.lpp"
-return TOKEN_PRIORITY;
+return TOKEN_PRIMARY;
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
 #line 260 "../SqlLexer.lpp"
-return TOKEN_QUIT;
+return TOKEN_PRIORITY;
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
 #line 261 "../SqlLexer.lpp"
-return TOKEN_RANGE;
+return TOKEN_QUIT;
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
 #line 262 "../SqlLexer.lpp"
-return TOKEN_REAL;
+return TOKEN_RANGE;
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
 #line 263 "../SqlLexer.lpp"
-return TOKEN_REFERENCES;
+return TOKEN_REAL;
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
 #line 264 "../SqlLexer.lpp"
-return TOKEN_REGEXP;
+return TOKEN_REFERENCES;
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
 #line 265 "../SqlLexer.lpp"
-return TOKEN_RIGHT;
+return TOKEN_REGEXP;
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
 #line 266 "../SqlLexer.lpp"
-return TOKEN_ROW;
+return TOKEN_RIGHT;
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
 #line 267 "../SqlLexer.lpp"
-return TOKEN_ROW_DELIMITER;
+return TOKEN_ROW;
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
 #line 268 "../SqlLexer.lpp"
-return TOKEN_ROWS;
+return TOKEN_ROW_DELIMITER;
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
 #line 269 "../SqlLexer.lpp"
-return TOKEN_SECOND;
+return TOKEN_ROWS;
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
 #line 270 "../SqlLexer.lpp"
-return TOKEN_SELECT;
+return TOKEN_SECOND;
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
 #line 271 "../SqlLexer.lpp"
-return TOKEN_SET;
+return TOKEN_SELECT;
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
 #line 272 "../SqlLexer.lpp"
-return TOKEN_SMA;
+return TOKEN_SET;
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
 #line 273 "../SqlLexer.lpp"
-return TOKEN_SMALLINT;
+return TOKEN_SMA;
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
 #line 274 "../SqlLexer.lpp"
-return TOKEN_SUBSTRING;
+return TOKEN_SMALLINT;
 	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_TRUE;
+return TOKEN_TIMESTAMP;
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
 #line 280 "../SqlLexer.lpp"
-return TOKEN_TUPLESAMPLE;
+return TOKEN_TRUE;
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
 #line 281 "../SqlLexer.lpp"
-return TOKEN_UNBOUNDED;
+return TOKEN_TUPLESAMPLE;
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
 #line 282 "../SqlLexer.lpp"
-return TOKEN_UNION;
+return TOKEN_UNBOUNDED;
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
 #line 283 "../SqlLexer.lpp"
-return TOKEN_UNIQUE;
+return TOKEN_UNION;
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
 #line 284 "../SqlLexer.lpp"
-return TOKEN_UPDATE;
+return TOKEN_UNIQUE;
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
 #line 285 "../SqlLexer.lpp"
-return TOKEN_USING;
+return TOKEN_UPDATE;
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
 #line 286 "../SqlLexer.lpp"
-return TOKEN_VALUES;
+return TOKEN_USING;
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
 #line 287 "../SqlLexer.lpp"
-return TOKEN_VARCHAR;
+return TOKEN_VALUES;
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
 #line 288 "../SqlLexer.lpp"
-return TOKEN_WHEN;
+return TOKEN_VARCHAR;
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
 #line 289 "../SqlLexer.lpp"
-return TOKEN_WHERE;
+return TOKEN_WHEN;
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
 #line 290 "../SqlLexer.lpp"
-return TOKEN_WINDOW;
+return TOKEN_WHERE;
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
 #line 291 "../SqlLexer.lpp"
-return TOKEN_WITH;
+return TOKEN_WINDOW;
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
 #line 292 "../SqlLexer.lpp"
-return TOKEN_YEAR;
+return TOKEN_WITH;
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
 #line 293 "../SqlLexer.lpp"
-return TOKEN_YEARMONTH;
+return TOKEN_YEAR;
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 295 "../SqlLexer.lpp"
-return TOKEN_EQ;
+#line 294 "../SqlLexer.lpp"
+return TOKEN_YEARMONTH;
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
 #line 296 "../SqlLexer.lpp"
-return TOKEN_NEQ;
+return TOKEN_EQ;
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
@@ -2130,56 +2134,61 @@ return TOKEN_NEQ;
 case 131:
 YY_RULE_SETUP
 #line 298 "../SqlLexer.lpp"
-return TOKEN_LT;
+return TOKEN_NEQ;
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
 #line 299 "../SqlLexer.lpp"
-return TOKEN_GT;
+return TOKEN_LT;
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
 #line 300 "../SqlLexer.lpp"
-return TOKEN_LEQ;
+return TOKEN_GT;
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
 #line 301 "../SqlLexer.lpp"
-return TOKEN_GEQ;
+return TOKEN_LEQ;
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
-#line 303 "../SqlLexer.lpp"
-return yytext[0];
+#line 302 "../SqlLexer.lpp"
+return TOKEN_GEQ;
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
 #line 304 "../SqlLexer.lpp"
 return yytext[0];
 	YY_BREAK
+case 137:
+YY_RULE_SETUP
+#line 305 "../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 137:
+case 138:
 YY_RULE_SETUP
-#line 310 "../SqlLexer.lpp"
+#line 311 "../SqlLexer.lpp"
 {
     yylval->string_value_ = new quickstep::ParseString(yylloc->first_line, yylloc->first_column);
     BEGIN(CONDITION_STRING_SINGLE_QUOTED_ESCAPED);
   }
 	YY_BREAK
-case 138:
+case 139:
 YY_RULE_SETUP
-#line 315 "../SqlLexer.lpp"
+#line 316 "../SqlLexer.lpp"
 {
     yylval->string_value_ = new quickstep::ParseString(yylloc->first_line, yylloc->first_column);
     BEGIN(CONDITION_STRING_SINGLE_QUOTED);
   }
 	YY_BREAK
-case 139:
+case 140:
 YY_RULE_SETUP
-#line 320 "../SqlLexer.lpp"
+#line 321 "../SqlLexer.lpp"
 {
     yylval->string_value_ = new quickstep::ParseString(yylloc->first_line, yylloc->first_column);
     BEGIN(CONDITION_STRING_DOUBLE_QUOTED);
@@ -2191,7 +2200,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 329 "../SqlLexer.lpp"
+#line 330 "../SqlLexer.lpp"
 {
     delete yylval->string_value_;
     BEGIN(INITIAL);
@@ -2202,9 +2211,9 @@ case YY_STATE_EOF(CONDITION_STRING_DOUBLE_QUOTED):
 
 /* Process escape sequences. */
 
-case 140:
+case 141:
 YY_RULE_SETUP
-#line 339 "../SqlLexer.lpp"
+#line 340 "../SqlLexer.lpp"
 {
     /* Octal code */
     unsigned int code;
@@ -2218,9 +2227,9 @@ YY_RULE_SETUP
     yylval->string_value_->push_back(code);
   }
 	YY_BREAK
-case 141:
+case 142:
 YY_RULE_SETUP
-#line 351 "../SqlLexer.lpp"
+#line 352 "../SqlLexer.lpp"
 {
     /* Hexadecimal code */
     unsigned int code;
@@ -2228,9 +2237,9 @@ YY_RULE_SETUP
     yylval->string_value_->push_back(code);
   }
 	YY_BREAK
-case 142:
+case 143:
 YY_RULE_SETUP
-#line 357 "../SqlLexer.lpp"
+#line 358 "../SqlLexer.lpp"
 {
     /* A numeric escape sequence that isn't correctly specified. */
     delete yylval->string_value_;
@@ -2239,58 +2248,58 @@ YY_RULE_SETUP
     return TOKEN_LEX_ERROR;
   }
 	YY_BREAK
-case 143:
+case 144:
 YY_RULE_SETUP
-#line 364 "../SqlLexer.lpp"
+#line 365 "../SqlLexer.lpp"
 {
     /* Backspace */
     yylval->string_value_->push_back('\b');
   }
 	YY_BREAK
-case 144:
+case 145:
 YY_RULE_SETUP
-#line 368 "../SqlLexer.lpp"
+#line 369 "../SqlLexer.lpp"
 {
     /* Form-feed */
     yylval->string_value_->push_back('\f');
   }
 	YY_BREAK
-case 145:
+case 146:
 YY_RULE_SETUP
-#line 372 "../SqlLexer.lpp"
+#line 373 "../SqlLexer.lpp"
 {
     /* Newline */
     yylval->string_value_->push_back('\n');
   }
 	YY_BREAK
-case 146:
+case 147:
 YY_RULE_SETUP
-#line 376 "../SqlLexer.lpp"
+#line 377 "../SqlLexer.lpp"
 {
     /* Carriage-return */
     yylval->string_value_->push_back('\r');
   }
 	YY_BREAK
-case 147:
+case 148:
 YY_RULE_SETUP
-#line 380 "../SqlLexer.lpp"
+#line 381 "../SqlLexer.lpp"
 {
     /* Horizontal Tab */
     yylval->string_value_->push_back('\t');
   }
 	YY_BREAK
-case 148:
-/* rule 148 can match eol */
+case 149:
+/* rule 149 can match eol */
 YY_RULE_SETUP
-#line 384 "../SqlLexer.lpp"
+#line 385 "../SqlLexer.lpp"
 {
     /* Any other character (including actual newline or carriage return) */
     yylval->string_value_->push_back(yytext[1]);
   }
 	YY_BREAK
-case 149:
+case 150:
 YY_RULE_SETUP
-#line 388 "../SqlLexer.lpp"
+#line 389 "../SqlLexer.lpp"
 {
     /* This should only be encountered right before an EOF. */
     delete yylval->string_value_;
@@ -2301,17 +2310,17 @@ YY_RULE_SETUP
 	YY_BREAK
 
 
-case 150:
+case 151:
 YY_RULE_SETUP
-#line 398 "../SqlLexer.lpp"
+#line 399 "../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 151:
+case 152:
 YY_RULE_SETUP
-#line 402 "../SqlLexer.lpp"
+#line 403 "../SqlLexer.lpp"
 {
     /* End string */
     BEGIN(CONDITION_SQL);
@@ -2320,17 +2329,17 @@ YY_RULE_SETUP
 	YY_BREAK
 
 
-case 152:
+case 153:
 YY_RULE_SETUP
-#line 410 "../SqlLexer.lpp"
+#line 411 "../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 153:
+case 154:
 YY_RULE_SETUP
-#line 414 "../SqlLexer.lpp"
+#line 415 "../SqlLexer.lpp"
 {
     /* End string */
     BEGIN(CONDITION_SQL);
@@ -2338,94 +2347,94 @@ YY_RULE_SETUP
   }
 	YY_BREAK
 
-case 154:
-/* rule 154 can match eol */
+case 155:
+/* rule 155 can match eol */
 YY_RULE_SETUP
-#line 421 "../SqlLexer.lpp"
+#line 422 "../SqlLexer.lpp"
 {
   /* Scan up to a quote. */
   yylval->string_value_->append(yytext, yyleng);
 }
 	YY_BREAK
-case 155:
-/* rule 155 can match eol */
+case 156:
+/* rule 156 can match eol */
 YY_RULE_SETUP
-#line 426 "../SqlLexer.lpp"
+#line 427 "../SqlLexer.lpp"
 {
   /* Scan up to a quote or escape sequence. */
   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 431 "../SqlLexer.lpp"
+#line 432 "../SqlLexer.lpp"
 {
   /* Scan up to a quote. */
   yylval->string_value_->append(yytext, yyleng);
 }
 	YY_BREAK
 
-case 157:
+case 158:
 YY_RULE_SETUP
-#line 437 "../SqlLexer.lpp"
+#line 438 "../SqlLexer.lpp"
 {
     yylval->string_value_ = new quickstep::ParseString(
         yylloc->first_line, yylloc->first_column, std::string(yytext, yyleng));
     return TOKEN_NAME;
   }
 	YY_BREAK
-case 158:
+case 159:
 YY_RULE_SETUP
-#line 443 "../SqlLexer.lpp"
+#line 444 "../SqlLexer.lpp"
 {
     yylval->numeric_literal_value_ = new quickstep::NumericParseLiteralValue(
         yylloc->first_line, yylloc->first_column, yytext);
     return TOKEN_UNSIGNED_NUMVAL;
   }
 	YY_BREAK
-case 159:
+case 160:
 YY_RULE_SETUP
-#line 449 "../SqlLexer.lpp"
+#line 450 "../SqlLexer.lpp"
 /* comment */
 	YY_BREAK
-case 160:
-/* rule 160 can match eol */
+case 161:
+/* rule 161 can match eol */
 YY_RULE_SETUP
-#line 451 "../SqlLexer.lpp"
+#line 452 "../SqlLexer.lpp"
 { yycolumn = 0; }
 	YY_BREAK
-case 161:
+case 162:
 YY_RULE_SETUP
-#line 453 "../SqlLexer.lpp"
+#line 454 "../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 457 "../SqlLexer.lpp"
+#line 458 "../SqlLexer.lpp"
 {
   /* All conditions except for mutli-state string extracting conditions. */
   BEGIN(INITIAL);
   return TOKEN_EOF;
 }
 	YY_BREAK
-case 162:
+case 163:
 YY_RULE_SETUP
-#line 463 "../SqlLexer.lpp"
+#line 464 "../SqlLexer.lpp"
 {
   BEGIN(INITIAL);
   quickstep_yyerror(NULL, yyscanner, NULL, "illegal character");
   return TOKEN_LEX_ERROR;
 }
 	YY_BREAK
-case 163:
+case 164:
 YY_RULE_SETUP
-#line 469 "../SqlLexer.lpp"
+#line 470 "../SqlLexer.lpp"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 2429 "SqlLexer_gen.cpp"
+#line 2438 "SqlLexer_gen.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2719,7 +2728,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 >= 599 )
+			if ( yy_current_state >= 600 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2748,11 +2757,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 >= 599 )
+		if ( yy_current_state >= 600 )
 			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 == 598);
+	yy_is_jam = (yy_current_state == 599);
 
 	(void)yyg;
 	return yy_is_jam ? 0 : yy_current_state;
@@ -3586,7 +3595,7 @@ void quickstep_yyfree (void * ptr , yyscan_t yyscanner)
 
 #define YYTABLES_NAME "yytables"
 
-#line 469 "../SqlLexer.lpp"
+#line 470 "../SqlLexer.lpp"
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/da9baf7e/parser/preprocessed/SqlLexer_gen.hpp
----------------------------------------------------------------------
diff --git a/parser/preprocessed/SqlLexer_gen.hpp b/parser/preprocessed/SqlLexer_gen.hpp
index f8fc00b..7ff9fe4 100644
--- a/parser/preprocessed/SqlLexer_gen.hpp
+++ b/parser/preprocessed/SqlLexer_gen.hpp
@@ -360,7 +360,7 @@ extern int quickstep_yylex \
 #undef YY_DECL
 #endif
 
-#line 469 "../SqlLexer.lpp"
+#line 470 "../SqlLexer.lpp"
 
 
 #line 367 "SqlLexer_gen.hpp"