quickstep-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zu...@apache.org
Subject [12/30] incubator-quickstep git commit: Merge pull request #170 from pivotalsoftware/quickstep_date_support
Date Thu, 05 May 2016 06:16:48 GMT
Merge pull request #170 from pivotalsoftware/quickstep_date_support

Quickstep date support

Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/0f79a9af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/0f79a9af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/0f79a9af

Branch: refs/heads/master
Commit: 0f79a9af25f38687bb9ddd506a858b1ce7926b45
Parents: 7187c86
Author: Rogers Jeffrey Leo John <rogers.john2006@gmail.com>
Authored: Fri Apr 22 13:07:04 2016 -0500
Committer: Zuyu Zhang <zzhang@pivotal.io>
Committed: Wed May 4 23:15:34 2016 -0700

----------------------------------------------------------------------
 parser/CMakeLists.txt                           |    3 +-
 parser/ParseLiteralValue.cpp                    |    1 +
 parser/SqlLexer.lpp                             |    6 +
 parser/SqlParser.ypp                            |   44 +-
 parser/preprocessed/SqlLexer_gen.cpp            | 1248 ++++----
 parser/preprocessed/SqlLexer_gen.hpp            |    2 +-
 parser/preprocessed/SqlParser_gen.cpp           | 2796 +++++++++---------
 parser/preprocessed/SqlParser_gen.hpp           |  154 +-
 parser/tests/TPCH.test                          |   10 +-
 .../tests/execution_generator/Select.test       |    4 +-
 10 files changed, 2238 insertions(+), 2030 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/0f79a9af/parser/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/parser/CMakeLists.txt b/parser/CMakeLists.txt
index d35f3be..9738c2c 100644
--- a/parser/CMakeLists.txt
+++ b/parser/CMakeLists.txt
@@ -199,7 +199,8 @@ target_link_libraries(quickstep_parser_ParseLiteralValue
                       quickstep_types_TypedValue
                       quickstep_types_VarCharType
                       quickstep_types_YearMonthIntervalType
-                      quickstep_utility_Macros)
+                      quickstep_utility_Macros
+                      quickstep_utility_SqlError)
 target_link_libraries(quickstep_parser_ParseOrderBy
                       quickstep_parser_ParseExpression
                       quickstep_parser_ParseTreeNode

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/0f79a9af/parser/ParseLiteralValue.cpp
----------------------------------------------------------------------
diff --git a/parser/ParseLiteralValue.cpp b/parser/ParseLiteralValue.cpp
index 1462244..f839bed 100644
--- a/parser/ParseLiteralValue.cpp
+++ b/parser/ParseLiteralValue.cpp
@@ -37,6 +37,7 @@
 #include "types/Type.hpp"
 #include "types/VarCharType.hpp"
 #include "types/YearMonthIntervalType.hpp"
+#include "utility/SqlError.hpp"
 
 #include "glog/logging.h"
 

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/0f79a9af/parser/SqlLexer.lpp
----------------------------------------------------------------------
diff --git a/parser/SqlLexer.lpp b/parser/SqlLexer.lpp
index 3043322..a399723 100644
--- a/parser/SqlLexer.lpp
+++ b/parser/SqlLexer.lpp
@@ -191,6 +191,7 @@ unsigned_numeric_literal {exact_numeric_literal}|{approximate_numeric_literal}
   "create"           return TOKEN_CREATE;
   "date"             return TOKEN_DATE;
   "datetime"         return TOKEN_DATETIME;
+  "day"              return TOKEN_DAY;
   "decimal"          return TOKEN_DECIMAL;
   "default"          return TOKEN_DEFAULT;
   "delete"           return TOKEN_DELETE;
@@ -214,6 +215,7 @@ unsigned_numeric_literal {exact_numeric_literal}|{approximate_numeric_literal}
   "group"            return TOKEN_GROUP;
   "hash"             return TOKEN_HASH;
   "having"           return TOKEN_HAVING;
+  "hour"             return TOKEN_HOUR;
   "in"               return TOKEN_IN;
   "index"            return TOKEN_INDEX;
   "inner"            return TOKEN_INNER;
@@ -230,6 +232,8 @@ unsigned_numeric_literal {exact_numeric_literal}|{approximate_numeric_literal}
   "like"             return TOKEN_LIKE;
   "limit"            return TOKEN_LIMIT;
   "long"             return TOKEN_LONG;
+  "minute"           return TOKEN_MINUTE;
+  "month"            return TOKEN_MONTH;
   "not"              return TOKEN_NOT;
   "null"             return TOKEN_NULL;
   "nulls"            return TOKEN_NULLS;
@@ -249,6 +253,7 @@ unsigned_numeric_literal {exact_numeric_literal}|{approximate_numeric_literal}
   "regexp"           return TOKEN_REGEXP;
   "right"            return TOKEN_RIGHT;
   "row_delimiter"    return TOKEN_ROW_DELIMITER;
+  "second"           return TOKEN_SECOND;
   "select"           return TOKEN_SELECT;
   "set"              return TOKEN_SET;
   "sma"              return TOKEN_SMA;
@@ -267,6 +272,7 @@ unsigned_numeric_literal {exact_numeric_literal}|{approximate_numeric_literal}
   "when"             return TOKEN_WHEN;
   "where"            return TOKEN_WHERE;
   "with"             return TOKEN_WITH;
+  "year"             return TOKEN_YEAR;
   "yearmonth"        return TOKEN_YEARMONTH;
 
   "="                return TOKEN_EQ;

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/0f79a9af/parser/SqlParser.ypp
----------------------------------------------------------------------
diff --git a/parser/SqlParser.ypp b/parser/SqlParser.ypp
index a8ec821..1202d66 100644
--- a/parser/SqlParser.ypp
+++ b/parser/SqlParser.ypp
@@ -197,7 +197,7 @@ typedef void* yyscan_t;
   quickstep::ParseOrderBy *opt_order_by_clause_;
   bool *order_direction_;
   quickstep::ParseLimit *opt_limit_clause_;
-  
+
   quickstep::ParseSample *opt_sample_clause_;
 
   quickstep::PtrList<quickstep::ParseOrderByItem> *order_commalist_;
@@ -256,6 +256,7 @@ void NotSupported(const YYLTYPE *location, yyscan_t yyscanner, const std::string
 %token TOKEN_CREATE;
 %token TOKEN_DATE;
 %token TOKEN_DATETIME;
+%token TOKEN_DAY;
 %token TOKEN_DECIMAL;
 %token TOKEN_DEFAULT;
 %token TOKEN_DELETE;
@@ -278,6 +279,7 @@ void NotSupported(const YYLTYPE *location, yyscan_t yyscanner, const std::string
 %token TOKEN_GROUP;
 %token TOKEN_HASH;
 %token TOKEN_HAVING;
+%token TOKEN_HOUR;
 %token TOKEN_IN;
 %token TOKEN_INDEX;
 %token TOKEN_INNER;
@@ -291,6 +293,8 @@ void NotSupported(const YYLTYPE *location, yyscan_t yyscanner, const std::string
 %token TOKEN_LEFT;
 %token TOKEN_LIMIT;
 %token TOKEN_LONG;
+%token TOKEN_MINUTE;
+%token TOKEN_MONTH;
 %token TOKEN_NOT;
 %token TOKEN_NULL;
 %token TOKEN_NULLS;
@@ -310,6 +314,7 @@ void NotSupported(const YYLTYPE *location, yyscan_t yyscanner, const std::string
 %token TOKEN_REGEXP;
 %token TOKEN_RIGHT;
 %token TOKEN_ROW_DELIMITER;
+%token TOKEN_SECOND;
 %token TOKEN_SELECT;
 %token TOKEN_SET;
 %token TOKEN_SMA;
@@ -328,12 +333,14 @@ void NotSupported(const YYLTYPE *location, yyscan_t yyscanner, const std::string
 %token TOKEN_WHEN;
 %token TOKEN_WHERE;
 %token TOKEN_WITH;
+%token TOKEN_YEAR;
 %token TOKEN_YEARMONTH;
 %token TOKEN_EOF;
 %token TOKEN_LEX_ERROR;
 
 %type <string_value_>
   any_name
+  datetime_unit
   index_type
   partition_type
 
@@ -1525,7 +1532,7 @@ function_call:
   };
 
 extract_function:
-  TOKEN_EXTRACT '(' any_name TOKEN_FROM add_expression ')' {
+  TOKEN_EXTRACT '(' datetime_unit TOKEN_FROM add_expression ')' {
     $$ = new quickstep::ParseExtractFunction(@1.first_line, @1.first_column, $3, $5);
   };
 
@@ -1630,6 +1637,19 @@ literal_value:
       YYERROR;
     }
   }
+  | TOKEN_INTERVAL TOKEN_STRING_SINGLE_QUOTED datetime_unit {
+    quickstep::StringParseLiteralValue *parse_value;
+    const std::string &datetime_type_value = $3->value();
+    if (quickstep::StringParseLiteralValue::ParseAmbiguousInterval(
+        &($2->append((" " + datetime_type_value).c_str(), datetime_type_value.length() + 1)),
+        &parse_value)) {
+      $$ = parse_value;
+    } else {
+      $$ = nullptr;
+      quickstep_yyerror(&@3, yyscanner, nullptr, "Failed to parse literal as specified type");
+      YYERROR;
+    }
+  }
   | data_type TOKEN_STRING_SINGLE_QUOTED {
     quickstep::StringParseLiteralValue *parse_value
         = new quickstep::StringParseLiteralValue($2, &($1->getType()));
@@ -1642,6 +1662,26 @@ literal_value:
     } else {
       $$ = parse_value;
     }
+  }
+
+datetime_unit:
+  TOKEN_YEAR {
+     $$ = new quickstep::ParseString(@1.first_line, @1.first_column, std::string("YEAR"));
+  }
+  | TOKEN_MONTH {
+     $$ = new quickstep::ParseString(@1.first_line, @1.first_column, std::string("MONTH"));
+  }
+  | TOKEN_DAY {
+     $$ = new quickstep::ParseString(@1.first_line, @1.first_column, std::string("DAY"));
+  }
+  | TOKEN_HOUR {
+     $$ = new quickstep::ParseString(@1.first_line, @1.first_column, std::string("HOUR"));
+  }
+  | TOKEN_MINUTE {
+     $$ = new quickstep::ParseString(@1.first_line, @1.first_column, std::string("MINUTE"));
+  }
+  | TOKEN_SECOND {
+     $$ = new quickstep::ParseString(@1.first_line, @1.first_column, std::string("SECOND"));
   };
 
 literal_value_commalist:

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/0f79a9af/parser/preprocessed/SqlLexer_gen.cpp
----------------------------------------------------------------------
diff --git a/parser/preprocessed/SqlLexer_gen.cpp b/parser/preprocessed/SqlLexer_gen.cpp
index 553a7d9..d836988 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 144
-#define YY_END_OF_BUFFER 145
+#define YY_NUM_RULES 150
+#define YY_END_OF_BUFFER 151
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -390,66 +390,68 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[527] =
+static yyconst flex_int16_t yy_accept[545] =
     {   0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  145,    2,    2,  143,  143,  142,  141,  143,
-      120,  116,  119,  116,  116,  139,  112,  109,  113,  138,
-      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
-      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
-      138,  138,  138,  117,    4,    5,    5,    3,  135,  135,
-      132,  136,  136,  130,  137,  137,  134,    1,  142,  110,
-      140,  139,  139,  139,    0,  114,  111,  115,  138,  138,
-      138,  138,   10,  138,  138,  138,   22,  138,  138,  138,
-      138,  138,  138,  138,  138,  138,  138,  118,  138,  138,
-
-      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
-       55,   63,  138,  138,  138,  138,  138,  138,  138,  138,
-      138,   75,   76,  138,  138,  138,  138,  138,  138,  138,
-      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
-      138,  138,  138,  138,  138,  138,    4,    5,    3,  135,
-      131,  136,  129,  129,  121,  123,  124,  125,  126,  127,
-      128,  129,  137,  133,  140,  139,    0,  139,    6,    7,
-      138,    9,   11,  138,  138,   15,  138,  138,  138,  138,
-      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
-      138,  138,  138,  138,   42,  138,  138,  138,  138,  138,
-
-      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
-       59,  138,   65,  138,  138,  138,  138,  138,   71,  138,
-       74,  138,  138,  138,  138,  138,  138,  138,  138,  138,
-      138,  138,  138,  138,   91,   92,  138,  138,  138,  138,
-      138,  138,  138,  138,  138,  138,  138,  138,  138,  121,
-      123,  122,  138,  138,  138,  138,  138,  138,  138,   20,
-       23,  138,  138,  138,   28,  138,  138,   30,  138,  138,
-      138,  138,   36,  138,  138,   40,   41,  138,  138,  138,
-      138,  138,  138,  138,   50,   51,  138,   53,  138,  138,
-      138,  138,  138,   62,   64,   66,   67,   68,  138,   70,
-
-       72,  138,  138,  138,  138,  138,   83,  138,   85,  138,
-      138,  138,  138,  138,  138,  138,   95,   96,   98,  138,
-      138,  138,  138,  138,  138,  105,  138,  107,  138,  121,
-      122,    8,  138,  138,  138,  138,  138,  138,  138,   25,
-      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
-      138,  138,  138,  138,  138,   46,   47,   48,  138,   52,
-      138,   56,   57,  138,  138,  138,   69,   73,   77,   78,
-      138,  138,  138,   84,  138,  138,   88,  138,  138,  138,
-       94,  138,  138,  138,  138,  102,  138,  138,  106,  138,
-      138,  138,   14,  138,  138,  138,  138,  138,   26,  138,
-
-       29,  138,  138,  138,  138,   34,  138,  138,  138,   39,
-      138,   44,  138,  138,   54,   58,  138,  138,  138,  138,
-      138,  138,   87,  138,   90,  138,  138,  138,  100,  101,
-      103,  138,  138,  138,   13,  138,  138,  138,  138,  138,
-      138,   21,  138,   32,   33,  138,  138,  138,  138,   45,
-       49,   60,  138,  138,   81,   82,  138,  138,  138,  138,
-      138,  104,  138,  138,  138,  138,  138,  138,  138,  138,
-       31,  138,  138,   38,  138,   61,  138,  138,  138,   93,
-      138,  138,  138,   12,  138,  138,  138,  138,   24,  138,
-       35,  138,  138,   79,  138,  138,   97,  138,  108,   16,
-
-      138,  138,  138,   27,   37,  138,   80,   86,  138,  138,
-      138,   18,   19,  138,  138,   99,  138,  138,  138,  138,
-      138,   89,  138,   43,   17,    0
+        0,    0,  151,    2,    2,  149,  149,  148,  147,  149,
+      126,  122,  125,  122,  122,  145,  118,  115,  119,  144,
+      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
+      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
+      144,  144,  144,  144,  123,    4,    5,    5,    3,  141,
+      141,  138,  142,  142,  136,  143,  143,  140,    1,  148,
+      116,  146,  145,  145,  145,    0,  120,  117,  121,  144,
+      144,  144,  144,   10,  144,  144,  144,   22,  144,  144,
+      144,  144,  144,  144,  144,  144,  144,  144,  124,  144,
+
+      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
+      144,  144,   57,   65,  144,  144,  144,  144,  144,  144,
+      144,  144,  144,  144,  144,   79,   80,  144,  144,  144,
+      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
+      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
+        4,    5,    3,  141,  137,  142,  135,  135,  127,  129,
+      130,  131,  132,  133,  134,  135,  143,  139,  146,  145,
+        0,  145,    6,    7,  144,    9,   11,  144,  144,   15,
+      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
+       32,  144,  144,  144,  144,  144,  144,  144,  144,   43,
+
+      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
+      144,  144,  144,  144,  144,  144,   61,  144,   67,  144,
+      144,  144,  144,  144,  144,  144,   75,  144,   78,  144,
+      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
+      144,  144,  144,   96,   97,  144,  144,  144,  144,  144,
+      144,  144,  144,  144,  144,  144,  144,  144,  127,  129,
+      128,  144,  144,  144,  144,  144,  144,  144,   20,   23,
+      144,  144,  144,   28,  144,  144,   30,  144,  144,  144,
+      144,   37,  144,  144,   41,   42,  144,  144,  144,  144,
+      144,  144,  144,   51,   52,  144,   54,  144,   56,  144,
+
+      144,  144,  144,   64,   66,   68,   69,   70,  144,   72,
+      144,  144,   76,  144,  144,  144,  144,  144,   87,  144,
+       89,  144,  144,  144,  144,  144,  144,  144,  144,  100,
+      101,  103,  144,  144,  144,  144,  144,  144,  110,  144,
+      112,  113,  127,  128,    8,  144,  144,  144,  144,  144,
+      144,  144,   25,  144,  144,  144,  144,  144,  144,  144,
+      144,  144,  144,  144,  144,  144,  144,  144,   47,   48,
+       49,  144,   53,  144,   58,   59,  144,  144,  144,   71,
+      144,   74,   77,   81,   82,  144,  144,  144,   88,  144,
+      144,   92,  144,  144,  144,  144,   99,  144,  144,  144,
+
+      144,  107,  144,  144,  111,  144,  144,  144,   14,  144,
+      144,  144,  144,  144,   26,  144,   29,  144,  144,  144,
+      144,   35,  144,  144,  144,   40,  144,   45,  144,  144,
+       55,   60,  144,  144,   73,  144,  144,  144,  144,   91,
+      144,   94,   95,  144,  144,  144,  105,  106,  108,  144,
+      144,  144,   13,  144,  144,  144,  144,  144,  144,   21,
+      144,   33,   34,  144,  144,  144,  144,   46,   50,   62,
+      144,  144,   85,   86,  144,  144,  144,  144,  144,  109,
+      144,  144,  144,  144,  144,  144,  144,  144,   31,  144,
+      144,   39,  144,   63,  144,  144,  144,   98,  144,  144,
+
+      144,   12,  144,  144,  144,  144,   24,  144,   36,  144,
+      144,   83,  144,  144,  102,  144,  114,   16,  144,  144,
+      144,   27,   38,  144,   84,   90,  144,  144,  144,   18,
+       19,  144,  144,  104,  144,  144,  144,  144,  144,   93,
+      144,   44,   17,    0
     } ;
 
 static yyconst YY_CHAR yy_ec[256] =
@@ -496,282 +498,288 @@ static yyconst YY_CHAR yy_meta[72] =
         8
     } ;
 
-static yyconst flex_uint16_t yy_base[542] =
+static yyconst flex_uint16_t yy_base[560] =
     {   0,
         0,    1,   46,    0,  117,  163,    2,    3,  128,  132,
-        6,   10,  260, 1177, 1177,    0, 1177,   13, 1177,  241,
-     1177, 1177, 1177,  239,    6,  130,    4, 1177,  202,  124,
-      161,  170,  178,  207,  260,   92,  110,  161,   97,  108,
-      219,    0,  153,  221,  176,  108,  232,  171,  276,  272,
-      129,  221,  177, 1177,  184,    4,   19,    0,    0,    0,
-      146,    0,    0,  340,    0,    0,  145,    0,   22, 1177,
-        0,  249,  284,  334,   18, 1177, 1177, 1177,    0,  232,
-      262,  234,  270,  267,  285,  278,    0,  276,  307,  331,
-      291,  307,  299,  347,  313,  312,  325, 1177,  325,  345,
-
-      348,  343,  343,  338,  342,  347,  352,  358,  362,  378,
-      394,    0,  381,  366,  382,  396,  392,  390,  387,  397,
-      404,    0,  407,  392,  397,  398,  408,  409,  407,  447,
-      415,  400,  437,  434,  453,  451,  445,  438,  444,  452,
-      458,  454,  453,  461,  447,  467,  148,   29,    0,    0,
-     1177,    0, 1177, 1177,   22,   24, 1177, 1177, 1177, 1177,
-     1177,    0,    0, 1177,    0,  474,   26,   28,    0,    0,
-      467,    0,  468,  451,  466,  453,  478,  475,  480,  496,
-      485,  488,  486,  511,  493,  509,  506,  515,  512,  515,
-      499,  518,  507,  519,    0,  524,  507,  511,  511,  512,
-
-      531,  528,  521,  525,  517,  531,  542,  551,  552,  559,
-      560,  555,    0,  550,  551,  567,  564,  567,    0,  564,
-        0,  572,  573,  559,  578,  569,  563,  577,  575,  583,
-      584,  582,   98,  586,    0,  580,  583,  582,  592,  604,
-      602,  598,  621,  609,  606,  625,  615,  622,  613,   30,
-      125,    0,  614,  620,  630,  622,  632,  628,  627,    0,
-      640,  631,  632,  626,    0,  627,  630,  629,  637,  632,
-      634,  642,  662,  663,  661,    0,    0,  664,  661,  684,
-      681,  667,  668,  680,    0,    0,  674,    0,  677,  668,
-      675,  676,  688,    0,    0,    0,    0,    0,  677,    0,
-
-      679,  681,  682,  694,  699,  704,    0,  702,    0,  690,
-      687,  692,  709,  722,  718,  726,    0,  719,    0,  734,
-      722,  724,  738,  741,  739,    0,  743,    0,  736,  136,
-     1177,    0,  746,  746,  732,  752,  739,  750,  754,    0,
-      747,  744,  758,  759,  756,  765,  757,  765,  762,  769,
-      774,  784,  791,  778,  798,    0,    0,    0,  795,    0,
-      796,    0,    0,  784,  800,  784,    0,    0,    0,    0,
-      787,  794,  791,    0,  805,  795,    0,  808,  794,  806,
-        0,  796,  800,  815,  816,    0,  803,  822,    0,  809,
-      818,  814,    0,  807,  823,  845,  838,  834,    0,  854,
-
-        0,  854,  847,  849,  842,    0,  843,  860,  862,    0,
-       93,    0,  846,  853,    0,    0,  850,  868,  862,  852,
-      848,  860,    0,  865,    0,  864,  878,  879,    0,    0,
-        0,  863,  868,  871,    0,  877,  872,  886,  892,  900,
-      903,    0,  908,    0,    0,  912,  909,  899,  901,    0,
-        0,    0,  909,  907,    0,    0,  920,  915,  905,  913,
-      914,    0,  909,  923,  917,  916,  919,  916,  919,  924,
-        0,  921,  926,    0,  923,    0,  930,  940,  944,    0,
-      946,  947,  962,    0,  964,  970,  964,  972,    0,  958,
-        0,  972,  962,  962,  963,  974,    0,  972,    0,    0,
-
-      967,  982,  970,    0,    0,  980,    0,    0,  970,  988,
-      974,    0,    0,  981,  991,    0,  988,  991,  983,  997,
-      984,    0,  996,    0,    0, 1177, 1061, 1071, 1081, 1091,
-     1101, 1105, 1108, 1114, 1122, 1132, 1142, 1152, 1162, 1167,
-     1169
+        6,   10,  257, 1212, 1212,    0, 1212,   13, 1212,  233,
+     1212, 1212, 1212,  208,    6,  130,    4, 1212,  195,  124,
+      161,  170,  178,  207,  260,   92,  167,  161,   96,  107,
+      219,  214,  212,  224,  236,   92,  279,  171,  278,  281,
+      128,  227,    0,  125, 1212,  184,    4,   19,    0,    0,
+        0,  146,    0,    0,  343,    0,    0,  145,    0,   22,
+     1212,    0,  297,  316,  338,   18, 1212, 1212, 1212,    0,
+      170,  227,  173,  178,  224,  299,  270,    0,  270,  335,
+      330,  286,  320,  327,  376,  308,  316,  326, 1212,  335,
+
+      351,  355,  371,  348,  346,  353,  359,  370,  382,  383,
+      380,  379,  399,    0,  392,  379,  386,  401,  399,  401,
+      402,  407,  402,  413,  420,    0,  431,  417,  420,  422,
+      434,  437,  435,  451,  446,  433,  456,  459,  459,  457,
+      450,  444,  454,  462,  469,  465,  465,  474,  460,  483,
+      148,   29,    0,    0, 1212,    0, 1212, 1212,   22,   24,
+     1212, 1212, 1212, 1212, 1212,    0,    0, 1212,    0,  515,
+       26,   28,    0,    0,  488,    0,  490,  473,  489,  478,
+      501,  502,  496,  512,  496,  499,  494,  520,  503,  521,
+        0,  519,  528,  526,  529,  514,  535,  522,  534,    0,
+
+      539,  522,  524,  532,  534,  553,  551,  546,  550,  544,
+      564,  564,  556,  570,  571,  572,  574,  564,    0,  561,
+      564,  581,  578,  583,  571,  573,    0,  583,    0,  591,
+      592,  578,  596,  587,  589,  604,  600,  609,  612,  612,
+       98,  608,  625,    0,  619,  620,  619,  629,  630,  624,
+      620,  638,  628,  623,  642,  633,  640,  632,   30,  125,
+        0,  635,  640,  650,  642,  652,  647,  654,    0,  668,
+      659,  659,  655,    0,  658,  663,  668,  676,  669,  671,
+      679,  688,  685,  683,    0,    0,  681,  680,  701,  698,
+      685,  686,  699,    0,    0,  693,    0,  697,    0,  688,
+
+      695,  696,  709,    0,    0,    0,    0,    0,  695,    0,
+      705,  720,  711,  715,  718,  730,  741,  746,    0,  743,
+        0,  731,  726,  731,  748,  739,  752,  746,  755,    0,
+      742,    0,  758,  743,  746,  760,  764,  762,    0,  766,
+        0,  759,  136, 1212,    0,  769,  769,  763,  784,  772,
+      780,  791,    0,  783,  786,  800,  801,  798,  807,  797,
+      805,  802,  799,  802,  813,  814,  802,  819,    0,    0,
+        0,  817,    0,  818,    0,    0,  807,  823,  807,    0,
+      825,    0,    0,    0,    0,  811,  818,  823,    0,  838,
+      828,    0,  841,  845,  832,  846,    0,  842,  844,  859,
+
+      860,    0,  847,  866,    0,  853,  860,  857,    0,  852,
+      858,  876,  870,  860,    0,  881,    0,  878,  872,  874,
+      867,    0,  868,  885,  887,    0,   93,    0,  879,  887,
+        0,    0,  884,  903,    0,  898,  890,  888,  906,    0,
+      909,    0,    0,  908,  922,  923,    0,    0,    0,  907,
+      912,  913,    0,  920,  917,  921,  923,  932,  929,    0,
+      935,    0,    0,  936,  934,  924,  926,    0,    0,    0,
+      934,  932,    0,    0,  945,  948,  939,  947,  949,    0,
+      945,  961,  957,  962,  963,  960,  963,  968,    0,  965,
+      970,    0,  965,    0,  973,  985,  979,    0,  977,  979,
+
+      988,    0,  991,  994,  989,  997,    0,  983,    0,  997,
+      987,  987,  996, 1008,    0, 1006,    0,    0, 1002, 1018,
+     1008,    0,    0, 1020,    0,    0, 1016, 1032, 1018,    0,
+        0, 1025, 1035,    0, 1032, 1035, 1025, 1040, 1029,    0,
+     1031,    0,    0, 1212, 1096, 1106, 1116, 1126, 1136, 1140,
+     1143, 1149, 1157, 1167, 1177, 1187, 1197, 1202, 1204
     } ;
 
-static yyconst flex_int16_t yy_def[542] =
+static yyconst flex_int16_t yy_def[560] =
     {   0,
-      527,  527,  526,    3,  528,  528,  529,  529,  530,  530,
-      531,  531,  526,  526,  526,  532,  526,  526,  526,  526,
-      526,  526,  526,  526,  526,  526,  526,  526,  526,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  526,  526,  526,  526,  534,  535,  535,
-      526,  536,  536,  537,  538,  538,  526,  532,  526,  526,
-      539,  526,  526,  526,  526,  526,  526,  526,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  526,  533,  533,
-
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  526,  526,  534,  535,
-      526,  536,  526,  526,  526,  526,  526,  526,  526,  526,
-      526,  540,  538,  526,  539,  526,  526,  526,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  526,
-      526,  541,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  526,
-      526,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      533,  533,  533,  533,  533,    0,  526,  526,  526,  526,
-      526,  526,  526,  526,  526,  526,  526,  526,  526,  526,
-      526
+      545,  545,  544,    3,  546,  546,  547,  547,  548,  548,
+      549,  549,  544,  544,  544,  550,  544,  544,  544,  544,
+      544,  544,  544,  544,  544,  544,  544,  544,  544,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  544,  544,  544,  544,  552,  553,
+      553,  544,  554,  554,  555,  556,  556,  544,  550,  544,
+      544,  557,  544,  544,  544,  544,  544,  544,  544,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  544,  551,
+
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      544,  544,  552,  553,  544,  554,  544,  544,  544,  544,
+      544,  544,  544,  544,  544,  558,  556,  544,  557,  544,
+      544,  544,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  544,  544,
+      559,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  544,  544,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,    0,  544,  544,  544,  544,  544,  544,
+      544,  544,  544,  544,  544,  544,  544,  544,  544
     } ;
 
-static yyconst flex_uint16_t yy_nxt[1249] =
+static yyconst flex_uint16_t yy_nxt[1284] =
     {   0,
-      526,  526,   15,   15,   60,   60,  148,  148,   66,   61,
-       61,   67,   66,  526,   69,   67,   69,   72,   72,   76,
-       77,  148,  148,   69,  526,   69,  167,  167,  526,  168,
-      168,  148,  148,  250,  251,  251,  251,  168,  168,  168,
-      168,  330,  251,  526,   16,   16,   17,   18,   19,   18,
+      544,  544,   15,   15,   61,   61,  152,  152,   67,   62,
+       62,   68,   67,  544,   70,   68,   70,   73,   73,   77,
+       78,  152,  152,   70,  544,   70,  171,  171,  544,  172,
+      172,  152,  152,  259,  260,  260,  260,  172,  172,  172,
+      172,  343,  260,  544,   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,
-       47,   48,   49,   50,   51,   52,   42,   53,   42,   54,
+       47,   48,   49,   50,   51,   52,   53,   54,   53,   55,
        17,   17,   30,   31,   32,   33,   34,   35,   36,   37,
 
        38,   39,   40,   41,   42,   43,   44,   45,   46,   47,
-       48,   49,   50,   51,   52,   42,   53,   17,   55,   56,
-       57,   17,   17,   17,   17,   17,  109,  110,  113,  114,
-       63,   17,   17,   17,   63,   61,  251,  251,  449,   61,
-       73,   74,   74,  313,   80,  128,  143,  251,  251,  147,
-      164,   75,   81,  151,   82,  109,  110,  113,  114,   83,
-       17,   17,   17,   17,   55,   56,   57,   17,   17,   17,
-       17,   17,   64,   80,  128,  143,   64,   17,   17,   17,
-       75,   81,   84,   82,  119,  147,   85,   88,   83,   86,
-      120,  111,  133,  125,   89,   93,  112,  126,  146,   94,
-
-      134,   90,   87,   95,   91,   92,   17,   17,   17,   96,
-      127,   84,   97,  119,   98,   85,   88,   78,   86,  120,
-      111,  133,  125,   89,   93,  112,  126,  146,   94,  134,
-       90,   87,   95,   91,   92,   99,  115,  100,   96,  127,
-      116,   97,  101,  121,  117,  144,  145,  102,   71,  129,
-      118,  122,  169,  130,  172,  123,   70,  131,  124,  526,
-       72,   72,  526,  132,   99,  115,  100,  526,  526,  116,
-       75,  101,  121,  117,  144,  145,  102,  103,  129,  118,
-      122,  169,  130,  172,  123,  104,  131,  124,  105,  173,
-      170,  106,  132,  135,  107,  166,  166,  108,  171,   75,
-
-      136,  137,  140,  174,  141,   75,  103,  142,  175,  177,
-      138,  178,  184,  139,  104,  526,  526,  105,  173,  170,
-      106,  176,  135,  107,  179,  185,  108,  171,  180,  136,
-      137,  140,  174,  141,   75,  186,  142,  175,  177,  138,
-      178,  184,  139,  154,   73,   74,   74,  526,  191,  192,
-      176,  155,  156,  179,  185,   75,  193,  180,  157,  181,
-      194,  182,  158,  183,  186,  195,  187,  196,  197,  188,
-      159,  199,  200,  201,  160,  189,  161,  191,  192,  198,
-      162,  202,  190,  203,   75,  193,  204,  157,  181,  194,
-      182,  158,  183,  205,  195,  187,  196,  197,  188,  159,
-
-      199,  200,  201,  160,  189,  161,  212,  213,  198,  162,
-      202,  190,  203,  206,  208,  204,  207,  214,  215,  216,
-      218,  217,  205,  219,  209,  220,  221,  222,  223,  210,
-      211,  224,  225,  226,  227,  212,  213,  228,  232,  233,
-      526,  526,  206,  208,  526,  207,  214,  215,  216,  218,
-      217,  236,  219,  209,  220,  221,  222,  223,  210,  211,
-      224,  225,  226,  227,  229,  234,  228,  232,  233,  230,
-      231,  237,  238,  235,  239,  240,  241,  242,  243,  244,
-      236,  245,  247,  248,  249,  166,  166,  246,  253,  254,
-      255,  256,  257,  229,  234,   75,  260,  258,  230,  231,
-
-      237,  238,  235,  239,  240,  241,  242,  243,  244,  259,
-      245,  247,  248,  249,  261,  262,  246,  253,  254,  255,
-      256,  257,  263,  264,   75,  260,  258,  265,  266,  267,
-      268,  269,  270,  271,  273,  274,  275,  272,  259,  276,
-      277,  278,  279,  261,  262,  280,  281,  282,  283,  284,
-      285,  263,  264,  286,  287,  288,  265,  266,  267,  268,
-      269,  270,  271,  273,  274,  275,  272,  289,  276,  277,
-      278,  279,  290,  291,  280,  281,  282,  283,  284,  285,
-      292,  293,  286,  287,  288,  295,  296,  297,  298,  299,
-      300,  294,  301,  302,  303,  304,  289,  305,  306,  307,
-
-      308,  290,  291,  309,  310,  311,  312,  314,  315,  292,
-      293,  316,  317,  318,  295,  296,  297,  298,  299,  300,
-      294,  301,  302,  303,  304,  319,  305,  306,  307,  308,
-      320,  321,  309,  310,  311,  312,  314,  315,  322,  323,
-      316,  317,  318,  324,  325,  326,  328,  329,  332,  327,
-      333,  334,  335,  336,  319,  337,  338,  339,  340,  320,
-      321,  341,  342,  343,  344,  345,  346,  322,  323,  347,
-      348,  349,  324,  325,  326,  328,  329,  332,  327,  333,
-      334,  335,  336,  350,  337,  338,  339,  340,  351,  352,
-      341,  342,  343,  344,  345,  346,  353,  354,  347,  348,
-
-      349,  355,  356,  357,  358,  359,  360,  361,  362,  363,
-      364,  365,  350,  367,  368,  369,  370,  351,  352,  371,
-      372,  373,  366,  374,  375,  353,  354,  376,  377,  378,
-      355,  356,  357,  358,  359,  360,  361,  362,  363,  364,
-      365,  379,  367,  368,  369,  370,  380,  381,  371,  372,
-      373,  366,  374,  375,  382,  383,  376,  377,  378,  384,
-      385,  386,  387,  388,  389,  390,  391,  392,  393,  394,
-      379,  395,  397,  398,  396,  380,  381,  399,  400,  401,
-      402,  403,  404,  382,  383,  405,  406,  407,  384,  385,
-      386,  387,  388,  389,  390,  391,  392,  393,  394,  408,
-
-      395,  397,  398,  396,  409,  410,  399,  400,  401,  402,
-      403,  404,  411,  412,  405,  406,  407,  413,  414,  415,
-      416,  417,  418,  419,  420,  421,  422,  423,  408,  424,
-      425,  426,  427,  409,  410,  428,  429,  430,  431,  432,
-      433,  411,  412,  434,  435,  436,  413,  414,  415,  416,
-      417,  418,  419,  420,  421,  422,  423,  437,  424,  425,
-      426,  427,  438,  439,  428,  429,  430,  431,  432,  433,
-      440,  441,  434,  435,  436,  442,  443,  444,  445,  446,
-      447,  448,  450,  451,  452,  453,  437,  454,  455,  456,
-      457,  438,  439,  458,  459,  460,  461,  462,  463,  440,
-
-      441,  464,  465,  466,  442,  443,  444,  445,  446,  447,
-      448,  450,  451,  452,  453,  467,  454,  455,  456,  457,
-      468,  469,  458,  459,  460,  461,  462,  463,  470,  471,
-      464,  465,  466,  472,  473,  474,  475,  476,  477,  478,
-      479,  480,  481,  482,  467,  483,  484,  485,  486,  468,
-      469,  487,  488,  489,  490,  491,  492,  470,  471,  493,
-      494,  495,  472,  473,  474,  475,  476,  477,  478,  479,
-      480,  481,  482,  496,  483,  484,  485,  486,  497,  498,
-      487,  488,  489,  490,  491,  492,  499,  500,  493,  494,
-      495,  501,  502,  503,  504,  505,  506,  507,  508,  509,
-
-      510,  511,  496,  512,  513,  514,  515,  497,  498,  516,
-      517,  518,  519,  520,  521,  499,  500,  522,  523,  524,
-      501,  502,  503,  504,  505,  506,  507,  508,  509,  510,
-      511,  525,  512,  513,  514,  515,  526,  526,  516,  517,
-      518,  519,  520,  521,  526,  526,  522,  523,  524,  526,
-      526,  526,  526,  526,  526,  526,  526,  526,  526,  526,
-      525,   14,   14,   14,   14,   14,   14,   14,   14,   14,
-       14,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   59,   59,   59,   59,   59,   59,   59,   59,   59,
-       59,   62,   62,   62,   62,   62,   62,   62,   62,   62,
-
-       62,   65,   65,   65,   65,   65,   65,   65,   65,   65,
-       65,   68,   68,   79,   79,   79,  526,   79,  149,  149,
-      149,  149,  150,  150,  150,  526,  150,  150,  150,  150,
-      150,  150,  152,  152,  152,  526,  152,  152,  152,  152,
-      526,  152,  153,  153,  153,  153,  153,  153,  153,  153,
-      153,  153,  163,  163,  526,  163,  163,  163,  163,  163,
-      163,  163,  165,  526,  165,  165,  165,  165,  165,  165,
-      165,  165,  252,  252,  331,  331,   13,  526,  526,  526,
-      526,  526,  526,  526,  526,  526,  526,  526,  526,  526,
-      526,  526,  526,  526,  526,  526,  526,  526,  526,  526,
-
-      526,  526,  526,  526,  526,  526,  526,  526,  526,  526,
-      526,  526,  526,  526,  526,  526,  526,  526,  526,  526,
-      526,  526,  526,  526,  526,  526,  526,  526,  526,  526,
-      526,  526,  526,  526,  526,  526,  526,  526,  526,  526,
-      526,  526,  526,  526,  526,  526,  526,  526
+       48,   49,   50,   51,   52,   53,   54,   17,   56,   57,
+       58,   17,   17,   17,   17,   17,  110,  115,  116,  132,
+       64,   17,   17,   17,   64,   62,  260,  260,  467,   62,
+       74,   75,   75,  325,   81,  147,  150,  260,  260,  151,
+      168,   76,   82,  155,   83,  110,  115,  116,  132,   84,
+       17,   17,   17,   17,   56,   57,   58,   17,   17,   17,
+       17,   17,   65,   81,  147,  150,   65,   17,   17,   17,
+       76,   82,   85,   83,  111,  151,   86,   89,   84,   87,
+      173,  113,  137,  176,   90,   94,  114,  177,  112,   95,
+
+      138,   91,   88,   96,   92,   93,   17,   17,   17,   97,
+       79,   85,   98,  111,   99,   86,   89,   72,   87,  173,
+      113,  137,  176,   90,   94,  114,  177,  112,   95,  138,
+       91,   88,   96,   92,   93,  100,  117,  101,   97,  121,
+      118,   98,  102,  123,  119,  122,  125,  103,   71,  124,
+      120,  148,  149,  129,  126,  174,  544,  130,  127,  544,
+      178,  128,  544,  175,  100,  117,  101,  544,  121,  118,
+      131,  102,  123,  119,  122,  125,  103,  104,  124,  120,
+      148,  149,  129,  126,  174,  105,  130,  127,  106,  178,
+      128,  107,  175,  544,  108,  139,  133,  109,  544,  131,
+
+      134,  181,  140,  141,  135,  182,  104,  188,   73,   73,
+      136,  144,  142,  145,  105,  143,  146,  106,   76,  544,
+      107,  544,  179,  108,  139,  133,  109,  170,  170,  134,
+      181,  140,  141,  135,  182,  180,  188,   76,  189,  136,
+      144,  142,  145,  196,  143,  146,  158,   76,   74,   75,
+       75,  179,  183,  197,  159,  160,  184,  198,  185,   76,
+      186,  161,  187,  190,  180,  162,   76,  189,  191,  544,
+      199,  200,  196,  163,  201,  544,  204,  164,  544,  165,
+      205,  183,  197,  166,  206,  184,  198,  185,   76,  186,
+      161,  187,  190,  207,  162,  192,  202,  191,  193,  199,
+
+      200,  208,  163,  201,  194,  204,  164,  203,  165,  205,
+      209,  195,  166,  206,  210,  211,  213,  218,  212,  214,
+      219,  220,  207,  221,  192,  202,  222,  193,  223,  215,
+      208,  224,  225,  194,  216,  217,  203,  226,  227,  209,
+      195,  228,  229,  210,  211,  213,  218,  212,  214,  219,
+      220,  230,  221,  231,  232,  222,  233,  223,  215,  234,
+      224,  225,  235,  216,  217,  236,  226,  227,  237,  240,
+      228,  229,  241,  238,  239,  242,  245,  246,  247,  248,
+      230,  249,  231,  232,  243,  233,  250,  251,  234,  252,
+      253,  235,  244,  254,  236,  256,  257,  237,  240,  255,
+
+      258,  241,  238,  239,  242,  245,  246,  247,  248,  262,
+      249,  263,  264,  243,  265,  250,  251,  266,  252,  253,
+      267,  244,  254,  269,  256,  257,  170,  170,  255,  258,
+      270,  271,  268,  272,  273,  274,   76,  275,  262,  276,
+      263,  264,  277,  265,  278,  279,  266,  280,  282,  267,
+      283,  281,  269,  284,  285,  286,  287,  288,  289,  270,
+      271,  268,  272,  273,  274,   76,  275,  290,  276,  291,
+      292,  277,  293,  278,  279,  294,  280,  282,  295,  283,
+      281,  296,  284,  285,  286,  287,  288,  289,  297,  298,
+      299,  300,  301,  302,  305,  303,  290,  306,  291,  292,
+
+      307,  293,  308,  309,  294,  304,  310,  295,  311,  312,
+      296,  313,  314,  315,  316,  317,  318,  297,  298,  299,
+      300,  301,  302,  305,  303,  319,  306,  320,  321,  307,
+      322,  308,  309,  323,  304,  310,  324,  311,  312,  326,
+      313,  314,  315,  316,  317,  318,  327,  328,  329,  330,
+      331,  332,  333,  334,  319,  335,  320,  321,  336,  322,
+      337,  338,  323,  339,  341,  324,  342,  340,  326,  345,
+      346,  347,  348,  349,  350,  327,  328,  329,  330,  331,
+      332,  333,  334,  351,  335,  352,  353,  336,  354,  337,
+      338,  355,  339,  341,  356,  342,  340,  357,  345,  346,
+
+      347,  348,  349,  350,  358,  359,  360,  361,  362,  363,
+      364,  365,  351,  366,  352,  353,  367,  354,  368,  369,
+      355,  370,  371,  356,  372,  373,  357,  374,  375,  376,
+      377,  380,  378,  358,  359,  360,  361,  362,  363,  364,
+      365,  381,  366,  379,  382,  367,  383,  368,  369,  384,
+      370,  371,  385,  372,  373,  386,  374,  375,  376,  377,
+      380,  378,  387,  388,  389,  390,  391,  392,  393,  394,
+      381,  395,  379,  382,  396,  383,  397,  398,  384,  399,
+      400,  385,  401,  402,  386,  403,  404,  405,  406,  407,
+      408,  387,  388,  389,  390,  391,  392,  393,  394,  409,
+
+      395,  410,  413,  396,  411,  397,  398,  412,  399,  400,
+      414,  401,  402,  415,  403,  404,  405,  406,  407,  408,
+      416,  417,  418,  419,  420,  421,  422,  423,  409,  424,
+      410,  413,  425,  411,  426,  427,  412,  428,  429,  414,
+      430,  431,  415,  432,  433,  434,  435,  436,  437,  416,
+      417,  418,  419,  420,  421,  422,  423,  438,  424,  439,
+      440,  425,  441,  426,  427,  442,  428,  429,  443,  430,
+      431,  444,  432,  433,  434,  435,  436,  437,  445,  446,
+      447,  448,  449,  450,  451,  452,  438,  453,  439,  440,
+      454,  441,  455,  456,  442,  457,  458,  443,  459,  460,
+
+      444,  461,  462,  463,  464,  465,  466,  445,  446,  447,
+      448,  449,  450,  451,  452,  468,  453,  469,  470,  454,
+      471,  455,  456,  472,  457,  458,  473,  459,  460,  474,
+      461,  462,  463,  464,  465,  466,  475,  476,  477,  478,
+      479,  480,  481,  482,  468,  483,  469,  470,  484,  471,
+      485,  486,  472,  487,  488,  473,  489,  490,  474,  491,
+      492,  493,  494,  495,  496,  475,  476,  477,  478,  479,
+      480,  481,  482,  497,  483,  498,  499,  484,  500,  485,
+      486,  501,  487,  488,  502,  489,  490,  503,  491,  492,
+      493,  494,  495,  496,  504,  505,  506,  507,  508,  509,
+
+      510,  511,  497,  512,  498,  499,  513,  500,  514,  515,
+      501,  516,  517,  502,  518,  519,  503,  520,  521,  522,
+      523,  524,  525,  504,  505,  506,  507,  508,  509,  510,
+      511,  526,  512,  527,  528,  513,  529,  514,  515,  530,
+      516,  517,  531,  518,  519,  532,  520,  521,  522,  523,
+      524,  525,  533,  534,  535,  536,  537,  538,  539,  540,
+      526,  541,  527,  528,  542,  529,  543,  544,  530,  544,
+      544,  531,  544,  544,  532,  544,  544,  544,  544,  544,
+      544,  533,  534,  535,  536,  537,  538,  539,  540,  544,
+      541,  544,  544,  542,  544,  543,   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,  544,   80,  153,  153,  153,  153,  154,  154,  154,
+      544,  154,  154,  154,  154,  154,  154,  156,  156,  156,
+      544,  156,  156,  156,  156,  544,  156,  157,  157,  157,
+      157,  157,  157,  157,  157,  157,  157,  167,  167,  544,
+      167,  167,  167,  167,  167,  167,  167,  169,  544,  169,
+
+      169,  169,  169,  169,  169,  169,  169,  261,  261,  344,
+      344,   13,  544,  544,  544,  544,  544,  544,  544,  544,
+      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
+      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
+      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
+      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
+      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
+      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
+      544,  544,  544
     } ;
 
-static yyconst flex_int16_t yy_chk[1249] =
+static yyconst flex_int16_t yy_chk[1284] =
     {   0,
-        0,    0,    1,    2,    7,    8,   56,   56,   11,    7,
+        0,    0,    1,    2,    7,    8,   57,   57,   11,    7,
         8,   11,   12,    0,   18,   12,   18,   25,   25,   27,
-       27,   57,   57,   69,    0,   69,   75,   75,    0,   75,
-       75,  148,  148,  155,  155,  156,  156,  167,  167,  168,
-      168,  250,  250,    0,    1,    2,    3,    3,    3,    3,
+       27,   58,   58,   70,    0,   70,   76,   76,    0,   76,
+       76,  152,  152,  159,  159,  160,  160,  171,  171,  172,
+      172,  259,  259,    0,    1,    2,    3,    3,    3,    3,
         3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
         3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
         3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
@@ -780,134 +788,138 @@ static yyconst flex_int16_t yy_chk[1249] =
 
         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,   37,   39,   40,
-        9,    5,    5,    5,   10,    9,  251,  251,  411,   10,
-       26,   26,   26,  233,   30,   46,   51,  330,  330,  147,
-       67,   26,   30,   61,   30,   36,   37,   39,   40,   30,
+        5,    5,    5,    5,    5,    5,   36,   39,   40,   46,
+        9,    5,    5,    5,   10,    9,  260,  260,  427,   10,
+       26,   26,   26,  241,   30,   51,   54,  343,  343,  151,
+       68,   26,   30,   62,   30,   36,   39,   40,   46,   30,
         5,    5,    5,    6,    6,    6,    6,    6,    6,    6,
-        6,    6,    9,   30,   46,   51,   10,    6,    6,    6,
-       26,   30,   31,   30,   43,   55,   31,   32,   30,   31,
-       43,   38,   48,   45,   32,   33,   38,   45,   53,   33,
+        6,    6,    9,   30,   51,   54,   10,    6,    6,    6,
+       26,   30,   31,   30,   37,   56,   31,   32,   30,   31,
+       81,   38,   48,   83,   32,   33,   38,   84,   37,   33,
 
        48,   32,   31,   33,   32,   32,    6,    6,    6,   33,
-       45,   31,   33,   43,   34,   31,   32,   29,   31,   43,
-       38,   48,   45,   32,   33,   38,   45,   53,   33,   48,
-       32,   31,   33,   32,   32,   34,   41,   34,   33,   45,
-       41,   33,   34,   44,   41,   52,   52,   34,   24,   47,
-       41,   44,   80,   47,   82,   44,   20,   47,   44,   13,
-       72,   72,    0,   47,   34,   41,   34,    0,    0,   41,
-       72,   34,   44,   41,   52,   52,   34,   35,   47,   41,
-       44,   80,   47,   82,   44,   35,   47,   44,   35,   83,
-       81,   35,   47,   49,   35,   73,   73,   35,   81,   72,
-
-       49,   49,   50,   84,   50,   73,   35,   50,   85,   86,
-       49,   88,   91,   49,   35,    0,    0,   35,   83,   81,
-       35,   85,   49,   35,   89,   92,   35,   81,   89,   49,
-       49,   50,   84,   50,   73,   93,   50,   85,   86,   49,
-       88,   91,   49,   64,   74,   74,   74,    0,   95,   96,
-       85,   64,   64,   89,   92,   74,   97,   89,   64,   90,
-       99,   90,   64,   90,   93,  100,   94,  101,  102,   94,
-       64,  103,  104,  105,   64,   94,   64,   95,   96,  102,
-       64,  106,   94,  107,   74,   97,  108,   64,   90,   99,
-       90,   64,   90,  109,  100,   94,  101,  102,   94,   64,
-
-      103,  104,  105,   64,   94,   64,  113,  114,  102,   64,
-      106,   94,  107,  110,  111,  108,  110,  115,  116,  117,
-      118,  117,  109,  119,  111,  120,  121,  123,  124,  111,
-      111,  125,  126,  127,  128,  113,  114,  129,  131,  132,
-        0,    0,  110,  111,    0,  110,  115,  116,  117,  118,
-      117,  134,  119,  111,  120,  121,  123,  124,  111,  111,
-      125,  126,  127,  128,  130,  133,  129,  131,  132,  130,
-      130,  135,  136,  133,  137,  138,  139,  140,  141,  142,
-      134,  143,  144,  145,  146,  166,  166,  143,  171,  173,
-      174,  175,  176,  130,  133,  166,  178,  177,  130,  130,
-
-      135,  136,  133,  137,  138,  139,  140,  141,  142,  177,
-      143,  144,  145,  146,  179,  180,  143,  171,  173,  174,
-      175,  176,  181,  182,  166,  178,  177,  183,  184,  185,
-      186,  187,  188,  189,  190,  191,  192,  189,  177,  193,
-      194,  196,  197,  179,  180,  198,  199,  200,  201,  202,
-      203,  181,  182,  204,  205,  206,  183,  184,  185,  186,
-      187,  188,  189,  190,  191,  192,  189,  207,  193,  194,
-      196,  197,  208,  209,  198,  199,  200,  201,  202,  203,
-      210,  211,  204,  205,  206,  212,  214,  215,  216,  217,
-      218,  211,  220,  222,  223,  224,  207,  225,  226,  227,
-
-      228,  208,  209,  229,  230,  231,  232,  234,  236,  210,
-      211,  237,  238,  239,  212,  214,  215,  216,  217,  218,
-      211,  220,  222,  223,  224,  240,  225,  226,  227,  228,
-      241,  242,  229,  230,  231,  232,  234,  236,  243,  244,
-      237,  238,  239,  245,  246,  247,  248,  249,  253,  247,
-      254,  255,  256,  257,  240,  258,  259,  261,  262,  241,
-      242,  263,  264,  266,  267,  268,  269,  243,  244,  270,
-      271,  272,  245,  246,  247,  248,  249,  253,  247,  254,
-      255,  256,  257,  273,  258,  259,  261,  262,  274,  275,
-      263,  264,  266,  267,  268,  269,  278,  279,  270,  271,
-
-      272,  280,  281,  282,  283,  284,  287,  289,  290,  291,
-      292,  293,  273,  299,  301,  302,  303,  274,  275,  304,
-      305,  306,  293,  308,  310,  278,  279,  311,  312,  313,
-      280,  281,  282,  283,  284,  287,  289,  290,  291,  292,
-      293,  314,  299,  301,  302,  303,  315,  316,  304,  305,
-      306,  293,  308,  310,  318,  320,  311,  312,  313,  321,
-      322,  323,  324,  325,  327,  329,  333,  334,  335,  336,
-      314,  337,  338,  339,  337,  315,  316,  341,  342,  343,
-      344,  345,  346,  318,  320,  347,  348,  349,  321,  322,
-      323,  324,  325,  327,  329,  333,  334,  335,  336,  350,
-
-      337,  338,  339,  337,  351,  352,  341,  342,  343,  344,
-      345,  346,  353,  354,  347,  348,  349,  355,  359,  361,
-      364,  365,  366,  371,  372,  373,  375,  376,  350,  378,
-      379,  380,  382,  351,  352,  383,  384,  385,  387,  388,
-      390,  353,  354,  391,  392,  394,  355,  359,  361,  364,
-      365,  366,  371,  372,  373,  375,  376,  395,  378,  379,
-      380,  382,  396,  397,  383,  384,  385,  387,  388,  390,
-      398,  400,  391,  392,  394,  402,  403,  404,  405,  407,
-      408,  409,  413,  414,  417,  418,  395,  419,  420,  421,
-      422,  396,  397,  424,  426,  427,  428,  432,  433,  398,
-
-      400,  434,  436,  437,  402,  403,  404,  405,  407,  408,
-      409,  413,  414,  417,  418,  438,  419,  420,  421,  422,
-      439,  440,  424,  426,  427,  428,  432,  433,  441,  443,
-      434,  436,  437,  446,  447,  448,  449,  453,  454,  457,
-      458,  459,  460,  461,  438,  463,  464,  465,  466,  439,
-      440,  467,  468,  469,  470,  472,  473,  441,  443,  475,
-      477,  478,  446,  447,  448,  449,  453,  454,  457,  458,
-      459,  460,  461,  479,  463,  464,  465,  466,  481,  482,
-      467,  468,  469,  470,  472,  473,  483,  485,  475,  477,
-      478,  486,  487,  488,  490,  492,  493,  494,  495,  496,
-
-      498,  501,  479,  502,  503,  506,  509,  481,  482,  510,
-      511,  514,  515,  517,  518,  483,  485,  519,  520,  521,
-      486,  487,  488,  490,  492,  493,  494,  495,  496,  498,
-      501,  523,  502,  503,  506,  509,    0,    0,  510,  511,
-      514,  515,  517,  518,    0,    0,  519,  520,  521,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      523,  527,  527,  527,  527,  527,  527,  527,  527,  527,
-      527,  528,  528,  528,  528,  528,  528,  528,  528,  528,
-      528,  529,  529,  529,  529,  529,  529,  529,  529,  529,
-      529,  530,  530,  530,  530,  530,  530,  530,  530,  530,
-
-      530,  531,  531,  531,  531,  531,  531,  531,  531,  531,
-      531,  532,  532,  533,  533,  533,    0,  533,  534,  534,
-      534,  534,  535,  535,  535,    0,  535,  535,  535,  535,
-      535,  535,  536,  536,  536,    0,  536,  536,  536,  536,
-        0,  536,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  538,  538,    0,  538,  538,  538,  538,  538,
-      538,  538,  539,    0,  539,  539,  539,  539,  539,  539,
-      539,  539,  540,  540,  541,  541,  526,  526,  526,  526,
-      526,  526,  526,  526,  526,  526,  526,  526,  526,  526,
-      526,  526,  526,  526,  526,  526,  526,  526,  526,  526,
-
-      526,  526,  526,  526,  526,  526,  526,  526,  526,  526,
-      526,  526,  526,  526,  526,  526,  526,  526,  526,  526,
-      526,  526,  526,  526,  526,  526,  526,  526,  526,  526,
-      526,  526,  526,  526,  526,  526,  526,  526,  526,  526,
-      526,  526,  526,  526,  526,  526,  526,  526
+       29,   31,   33,   37,   34,   31,   32,   24,   31,   81,
+       38,   48,   83,   32,   33,   38,   84,   37,   33,   48,
+       32,   31,   33,   32,   32,   34,   41,   34,   33,   42,
+       41,   33,   34,   43,   41,   42,   44,   34,   20,   43,
+       41,   52,   52,   45,   44,   82,   13,   45,   44,    0,
+       85,   44,    0,   82,   34,   41,   34,    0,   42,   41,
+       45,   34,   43,   41,   42,   44,   34,   35,   43,   41,
+       52,   52,   45,   44,   82,   35,   45,   44,   35,   85,
+       44,   35,   82,    0,   35,   49,   47,   35,    0,   45,
+
+       47,   87,   49,   49,   47,   89,   35,   92,   73,   73,
+       47,   50,   49,   50,   35,   49,   50,   35,   73,    0,
+       35,    0,   86,   35,   49,   47,   35,   74,   74,   47,
+       87,   49,   49,   47,   89,   86,   92,   74,   93,   47,
+       50,   49,   50,   96,   49,   50,   65,   73,   75,   75,
+       75,   86,   90,   97,   65,   65,   90,   98,   91,   75,
+       91,   65,   91,   94,   86,   65,   74,   93,   94,    0,
+      100,  101,   96,   65,  102,    0,  104,   65,    0,   65,
+      105,   90,   97,   65,  106,   90,   98,   91,   75,   91,
+       65,   91,   94,  107,   65,   95,  103,   94,   95,  100,
+
+      101,  108,   65,  102,   95,  104,   65,  103,   65,  105,
+      109,   95,   65,  106,  110,  111,  112,  115,  111,  113,
+      116,  117,  107,  118,   95,  103,  119,   95,  119,  113,
+      108,  120,  121,   95,  113,  113,  103,  122,  123,  109,
+       95,  124,  125,  110,  111,  112,  115,  111,  113,  116,
+      117,  127,  118,  128,  129,  119,  130,  119,  113,  131,
+      120,  121,  132,  113,  113,  133,  122,  123,  134,  135,
+      124,  125,  136,  134,  134,  137,  138,  139,  140,  141,
+      127,  142,  128,  129,  137,  130,  143,  144,  131,  145,
+      146,  132,  137,  147,  133,  148,  149,  134,  135,  147,
+
+      150,  136,  134,  134,  137,  138,  139,  140,  141,  175,
+      142,  177,  178,  137,  179,  143,  144,  180,  145,  146,
+      181,  137,  147,  182,  148,  149,  170,  170,  147,  150,
+      183,  184,  181,  185,  186,  187,  170,  188,  175,  189,
+      177,  178,  190,  179,  192,  193,  180,  194,  195,  181,
+      196,  194,  182,  197,  198,  199,  201,  202,  203,  183,
+      184,  181,  185,  186,  187,  170,  188,  204,  189,  205,
+      206,  190,  207,  192,  193,  208,  194,  195,  209,  196,
+      194,  210,  197,  198,  199,  201,  202,  203,  211,  212,
+      213,  214,  215,  216,  218,  217,  204,  220,  205,  206,
+
+      221,  207,  222,  223,  208,  217,  224,  209,  225,  226,
+      210,  228,  230,  231,  232,  233,  234,  211,  212,  213,
+      214,  215,  216,  218,  217,  235,  220,  236,  237,  221,
+      238,  222,  223,  239,  217,  224,  240,  225,  226,  242,
+      228,  230,  231,  232,  233,  234,  243,  245,  246,  247,
+      248,  249,  250,  251,  235,  252,  236,  237,  253,  238,
+      254,  255,  239,  256,  257,  240,  258,  256,  242,  262,
+      263,  264,  265,  266,  267,  243,  245,  246,  247,  248,
+      249,  250,  251,  268,  252,  270,  271,  253,  272,  254,
+      255,  273,  256,  257,  275,  258,  256,  276,  262,  263,
+
+      264,  265,  266,  267,  277,  278,  279,  280,  281,  282,
+      283,  284,  268,  287,  270,  271,  288,  272,  289,  290,
+      273,  291,  292,  275,  293,  296,  276,  298,  300,  301,
+      302,  309,  303,  277,  278,  279,  280,  281,  282,  283,
+      284,  311,  287,  303,  312,  288,  313,  289,  290,  314,
+      291,  292,  315,  293,  296,  316,  298,  300,  301,  302,
+      309,  303,  317,  318,  320,  322,  323,  324,  325,  326,
+      311,  327,  303,  312,  328,  313,  329,  331,  314,  333,
+      334,  315,  335,  336,  316,  337,  338,  340,  342,  346,
+      347,  317,  318,  320,  322,  323,  324,  325,  326,  348,
+
+      327,  349,  351,  328,  350,  329,  331,  350,  333,  334,
+      352,  335,  336,  354,  337,  338,  340,  342,  346,  347,
+      355,  356,  357,  358,  359,  360,  361,  362,  348,  363,
+      349,  351,  364,  350,  365,  366,  350,  367,  368,  352,
+      372,  374,  354,  377,  378,  379,  381,  386,  387,  355,
+      356,  357,  358,  359,  360,  361,  362,  388,  363,  390,
+      391,  364,  393,  365,  366,  394,  367,  368,  395,  372,
+      374,  396,  377,  378,  379,  381,  386,  387,  398,  399,
+      400,  401,  403,  404,  406,  407,  388,  408,  390,  391,
+      410,  393,  411,  412,  394,  413,  414,  395,  416,  418,
+
+      396,  419,  420,  421,  423,  424,  425,  398,  399,  400,
+      401,  403,  404,  406,  407,  429,  408,  430,  433,  410,
+      434,  411,  412,  436,  413,  414,  437,  416,  418,  438,
+      419,  420,  421,  423,  424,  425,  439,  441,  444,  445,
+      446,  450,  451,  452,  429,  454,  430,  433,  455,  434,
+      456,  457,  436,  458,  459,  437,  461,  464,  438,  465,
+      466,  467,  471,  472,  475,  439,  441,  444,  445,  446,
+      450,  451,  452,  476,  454,  477,  478,  455,  479,  456,
+      457,  481,  458,  459,  482,  461,  464,  483,  465,  466,
+      467,  471,  472,  475,  484,  485,  486,  487,  488,  490,
+
+      491,  493,  476,  495,  477,  478,  496,  479,  497,  499,
+      481,  500,  501,  482,  503,  504,  483,  505,  506,  508,
+      510,  511,  512,  484,  485,  486,  487,  488,  490,  491,
+      493,  513,  495,  514,  516,  496,  519,  497,  499,  520,
+      500,  501,  521,  503,  504,  524,  505,  506,  508,  510,
+      511,  512,  527,  528,  529,  532,  533,  535,  536,  537,
+      513,  538,  514,  516,  539,  519,  541,    0,  520,    0,
+        0,  521,    0,    0,  524,    0,    0,    0,    0,    0,
+        0,  527,  528,  529,  532,  533,  535,  536,  537,    0,
+      538,    0,    0,  539,    0,  541,  545,  545,  545,  545,
+
+      545,  545,  545,  545,  545,  545,  546,  546,  546,  546,
+      546,  546,  546,  546,  546,  546,  547,  547,  547,  547,
+      547,  547,  547,  547,  547,  547,  548,  548,  548,  548,
+      548,  548,  548,  548,  548,  548,  549,  549,  549,  549,
+      549,  549,  549,  549,  549,  549,  550,  550,  551,  551,
+      551,    0,  551,  552,  552,  552,  552,  553,  553,  553,
+        0,  553,  553,  553,  553,  553,  553,  554,  554,  554,
+        0,  554,  554,  554,  554,    0,  554,  555,  555,  555,
+      555,  555,  555,  555,  555,  555,  555,  556,  556,    0,
+      556,  556,  556,  556,  556,  556,  556,  557,    0,  557,
+
+      557,  557,  557,  557,  557,  557,  557,  558,  558,  559,
+      559,  544,  544,  544,  544,  544,  544,  544,  544,  544,
+      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
+      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
+      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
+      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
+      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
+      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
+      544,  544,  544
     } ;
 
 /* Table of booleans, true if rule could match eol. */
-static yyconst flex_int32_t yy_rule_can_match_eol[145] =
+static yyconst flex_int32_t yy_rule_can_match_eol[151] =
     {   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, 
@@ -915,8 +927,8 @@ static yyconst flex_int32_t yy_rule_can_match_eol[145] =
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 
-    0, 1, 0, 0, 0,     };
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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.
@@ -1033,7 +1045,7 @@ class UnaryOperation;
 
 
 
-#line 1037 "SqlLexer_gen.cpp"
+#line 1049 "SqlLexer_gen.cpp"
 
 #define INITIAL 0
 #define CONDITION_SQL 1
@@ -1324,7 +1336,7 @@ YY_DECL
 #line 128 "../SqlLexer.lpp"
 
 
-#line 1328 "SqlLexer_gen.cpp"
+#line 1340 "SqlLexer_gen.cpp"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -1351,13 +1363,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 >= 527 )
+				if ( yy_current_state >= 545 )
 					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 != 526 );
+		while ( yy_current_state != 544 );
 		yy_cp = yyg->yy_last_accepting_cpos;
 		yy_current_state = yyg->yy_last_accepting_state;
 
@@ -1576,27 +1588,27 @@ return TOKEN_DATETIME;
 case 32:
 YY_RULE_SETUP
 #line 194 "../SqlLexer.lpp"
-return TOKEN_DECIMAL;
+return TOKEN_DAY;
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
 #line 195 "../SqlLexer.lpp"
-return TOKEN_DEFAULT;
+return TOKEN_DECIMAL;
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
 #line 196 "../SqlLexer.lpp"
-return TOKEN_DELETE;
+return TOKEN_DEFAULT;
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
 #line 197 "../SqlLexer.lpp"
-return TOKEN_DELIMITER;
+return TOKEN_DELETE;
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
 #line 198 "../SqlLexer.lpp"
-return TOKEN_DESC;
+return TOKEN_DELIMITER;
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
@@ -1606,426 +1618,456 @@ return TOKEN_DESC;
 case 38:
 YY_RULE_SETUP
 #line 200 "../SqlLexer.lpp"
-return TOKEN_DISTINCT;
+return TOKEN_DESC;
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
 #line 201 "../SqlLexer.lpp"
-return TOKEN_DOUBLE;
+return TOKEN_DISTINCT;
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
 #line 202 "../SqlLexer.lpp"
-return TOKEN_DROP;
+return TOKEN_DOUBLE;
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
 #line 203 "../SqlLexer.lpp"
-return TOKEN_ELSE;
+return TOKEN_DROP;
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
 #line 204 "../SqlLexer.lpp"
-return TOKEN_END;
+return TOKEN_ELSE;
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
 #line 205 "../SqlLexer.lpp"
-return TOKEN_ESCAPE_STRINGS;
+return TOKEN_END;
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
 #line 206 "../SqlLexer.lpp"
-return TOKEN_EXISTS;
+return TOKEN_ESCAPE_STRINGS;
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
 #line 207 "../SqlLexer.lpp"
-return TOKEN_EXTRACT;
+return TOKEN_EXISTS;
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
 #line 208 "../SqlLexer.lpp"
-return TOKEN_FALSE;
+return TOKEN_EXTRACT;
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
 #line 209 "../SqlLexer.lpp"
-return TOKEN_FIRST;
+return TOKEN_FALSE;
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
 #line 210 "../SqlLexer.lpp"
-return TOKEN_FLOAT;
+return TOKEN_FIRST;
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
 #line 211 "../SqlLexer.lpp"
-return TOKEN_FOREIGN;
+return TOKEN_FLOAT;
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
 #line 212 "../SqlLexer.lpp"
-return TOKEN_FROM;
+return TOKEN_FOREIGN;
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
 #line 213 "../SqlLexer.lpp"
-return TOKEN_FULL;
+return TOKEN_FROM;
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
 #line 214 "../SqlLexer.lpp"
-return TOKEN_GROUP;
+return TOKEN_FULL;
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
 #line 215 "../SqlLexer.lpp"
-return TOKEN_HASH;
+return TOKEN_GROUP;
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
 #line 216 "../SqlLexer.lpp"
-return TOKEN_HAVING;
+return TOKEN_HASH;
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
 #line 217 "../SqlLexer.lpp"
-return TOKEN_IN;
+return TOKEN_HAVING;
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
 #line 218 "../SqlLexer.lpp"
-return TOKEN_INDEX;
+return TOKEN_HOUR;
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
 #line 219 "../SqlLexer.lpp"
-return TOKEN_INNER;
+return TOKEN_IN;
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
 #line 220 "../SqlLexer.lpp"
-return TOKEN_INSERT;
+return TOKEN_INDEX;
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
 #line 221 "../SqlLexer.lpp"
-return TOKEN_INTEGER;
+return TOKEN_INNER;
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
 #line 222 "../SqlLexer.lpp"
-return TOKEN_INTEGER;
+return TOKEN_INSERT;
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
 #line 223 "../SqlLexer.lpp"
-return TOKEN_INTERVAL;
+return TOKEN_INTEGER;
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
 #line 224 "../SqlLexer.lpp"
-return TOKEN_INTO;
+return TOKEN_INTEGER;
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
 #line 225 "../SqlLexer.lpp"
-return TOKEN_IS;
+return TOKEN_INTERVAL;
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
 #line 226 "../SqlLexer.lpp"
-return TOKEN_JOIN;
+return TOKEN_INTO;
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
 #line 227 "../SqlLexer.lpp"
-return TOKEN_KEY;
+return TOKEN_IS;
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
 #line 228 "../SqlLexer.lpp"
-return TOKEN_LAST;
+return TOKEN_JOIN;
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
 #line 229 "../SqlLexer.lpp"
-return TOKEN_LEFT;
+return TOKEN_KEY;
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
 #line 230 "../SqlLexer.lpp"
-return TOKEN_LIKE;
+return TOKEN_LAST;
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
 #line 231 "../SqlLexer.lpp"
-return TOKEN_LIMIT;
+return TOKEN_LEFT;
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
 #line 232 "../SqlLexer.lpp"
-return TOKEN_LONG;
+return TOKEN_LIKE;
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
 #line 233 "../SqlLexer.lpp"
-return TOKEN_NOT;
+return TOKEN_LIMIT;
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
 #line 234 "../SqlLexer.lpp"
-return TOKEN_NULL;
+return TOKEN_LONG;
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
 #line 235 "../SqlLexer.lpp"
-return TOKEN_NULLS;
+return TOKEN_MINUTE;
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
 #line 236 "../SqlLexer.lpp"
-return TOKEN_OFF;
+return TOKEN_MONTH;
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
 #line 237 "../SqlLexer.lpp"
-return TOKEN_ON;
+return TOKEN_NOT;
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
 #line 238 "../SqlLexer.lpp"
-return TOKEN_OR;
+return TOKEN_NULL;
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
 #line 239 "../SqlLexer.lpp"
-return TOKEN_ORDER;
+return TOKEN_NULLS;
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
 #line 240 "../SqlLexer.lpp"
-return TOKEN_OUTER;
+return TOKEN_OFF;
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
 #line 241 "../SqlLexer.lpp"
-return TOKEN_PARTITION;
+return TOKEN_ON;
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
 #line 242 "../SqlLexer.lpp"
-return TOKEN_PARTITIONS;
+return TOKEN_OR;
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
 #line 243 "../SqlLexer.lpp"
-return TOKEN_PERCENT;
+return TOKEN_ORDER;
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
 #line 244 "../SqlLexer.lpp"
-return TOKEN_PRIMARY;
+return TOKEN_OUTER;
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
 #line 245 "../SqlLexer.lpp"
-return TOKEN_QUIT;
+return TOKEN_PARTITION;
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
 #line 246 "../SqlLexer.lpp"
-return TOKEN_RANGE;
+return TOKEN_PARTITIONS;
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
 #line 247 "../SqlLexer.lpp"
-return TOKEN_REAL;
+return TOKEN_PERCENT;
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
 #line 248 "../SqlLexer.lpp"
-return TOKEN_REFERENCES;
+return TOKEN_PRIMARY;
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
 #line 249 "../SqlLexer.lpp"
-return TOKEN_REGEXP;
+return TOKEN_QUIT;
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
 #line 250 "../SqlLexer.lpp"
-return TOKEN_RIGHT;
+return TOKEN_RANGE;
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
 #line 251 "../SqlLexer.lpp"
-return TOKEN_ROW_DELIMITER;
+return TOKEN_REAL;
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
 #line 252 "../SqlLexer.lpp"
-return TOKEN_SELECT;
+return TOKEN_REFERENCES;
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
 #line 253 "../SqlLexer.lpp"
-return TOKEN_SET;
+return TOKEN_REGEXP;
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
 #line 254 "../SqlLexer.lpp"
-return TOKEN_SMA;
+return TOKEN_RIGHT;
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
 #line 255 "../SqlLexer.lpp"
-return TOKEN_SMALLINT;
+return TOKEN_ROW_DELIMITER;
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
 #line 256 "../SqlLexer.lpp"
-return TOKEN_TABLE;
+return TOKEN_SECOND;
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
 #line 257 "../SqlLexer.lpp"
-return TOKEN_THEN;
+return TOKEN_SELECT;
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
 #line 258 "../SqlLexer.lpp"
-return TOKEN_TIME;
+return TOKEN_SET;
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
 #line 259 "../SqlLexer.lpp"
-return TOKEN_TIMESTAMP;
+return TOKEN_SMA;
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
 #line 260 "../SqlLexer.lpp"
-return TOKEN_TRUE;
+return TOKEN_SMALLINT;
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
 #line 261 "../SqlLexer.lpp"
-return TOKEN_TUPLESAMPLE;
+return TOKEN_TABLE;
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
 #line 262 "../SqlLexer.lpp"
-return TOKEN_UNIQUE;
+return TOKEN_THEN;
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
 #line 263 "../SqlLexer.lpp"
-return TOKEN_UPDATE;
+return TOKEN_TIME;
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
 #line 264 "../SqlLexer.lpp"
-return TOKEN_USING;
+return TOKEN_TIMESTAMP;
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
 #line 265 "../SqlLexer.lpp"
-return TOKEN_VALUES;
+return TOKEN_TRUE;
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
 #line 266 "../SqlLexer.lpp"
-return TOKEN_VARCHAR;
+return TOKEN_TUPLESAMPLE;
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
 #line 267 "../SqlLexer.lpp"
-return TOKEN_WHEN;
+return TOKEN_UNIQUE;
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
 #line 268 "../SqlLexer.lpp"
-return TOKEN_WHERE;
+return TOKEN_UPDATE;
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
 #line 269 "../SqlLexer.lpp"
-return TOKEN_WITH;
+return TOKEN_USING;
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
 #line 270 "../SqlLexer.lpp"
-return TOKEN_YEARMONTH;
+return TOKEN_VALUES;
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 272 "../SqlLexer.lpp"
-return TOKEN_EQ;
+#line 271 "../SqlLexer.lpp"
+return TOKEN_VARCHAR;
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 273 "../SqlLexer.lpp"
-return TOKEN_NEQ;
+#line 272 "../SqlLexer.lpp"
+return TOKEN_WHEN;
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 274 "../SqlLexer.lpp"
-return TOKEN_NEQ;
+#line 273 "../SqlLexer.lpp"
+return TOKEN_WHERE;
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 275 "../SqlLexer.lpp"
-return TOKEN_LT;
+#line 274 "../SqlLexer.lpp"
+return TOKEN_WITH;
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 276 "../SqlLexer.lpp"
-return TOKEN_GT;
+#line 275 "../SqlLexer.lpp"
+return TOKEN_YEAR;
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 277 "../SqlLexer.lpp"
-return TOKEN_LEQ;
+#line 276 "../SqlLexer.lpp"
+return TOKEN_YEARMONTH;
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
 #line 278 "../SqlLexer.lpp"
-return TOKEN_GEQ;
+return TOKEN_EQ;
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 280 "../SqlLexer.lpp"
-return yytext[0];
+#line 279 "../SqlLexer.lpp"
+return TOKEN_NEQ;
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
+#line 280 "../SqlLexer.lpp"
+return TOKEN_NEQ;
+	YY_BREAK
+case 118:
+YY_RULE_SETUP
 #line 281 "../SqlLexer.lpp"
+return TOKEN_LT;
+	YY_BREAK
+case 119:
+YY_RULE_SETUP
+#line 282 "../SqlLexer.lpp"
+return TOKEN_GT;
+	YY_BREAK
+case 120:
+YY_RULE_SETUP
+#line 283 "../SqlLexer.lpp"
+return TOKEN_LEQ;
+	YY_BREAK
+case 121:
+YY_RULE_SETUP
+#line 284 "../SqlLexer.lpp"
+return TOKEN_GEQ;
+	YY_BREAK
+case 122:
+YY_RULE_SETUP
+#line 286 "../SqlLexer.lpp"
+return yytext[0];
+	YY_BREAK
+case 123:
+YY_RULE_SETUP
+#line 287 "../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 118:
+case 124:
 YY_RULE_SETUP
-#line 287 "../SqlLexer.lpp"
+#line 293 "../SqlLexer.lpp"
 {
     yylval->string_value_ = new quickstep::ParseString(yylloc->first_line, yylloc->first_column);
     BEGIN(CONDITION_STRING_SINGLE_QUOTED_ESCAPED);
   }
 	YY_BREAK
-case 119:
+case 125:
 YY_RULE_SETUP
-#line 292 "../SqlLexer.lpp"
+#line 298 "../SqlLexer.lpp"
 {
     yylval->string_value_ = new quickstep::ParseString(yylloc->first_line, yylloc->first_column);
     BEGIN(CONDITION_STRING_SINGLE_QUOTED);
   }
 	YY_BREAK
-case 120:
+case 126:
 YY_RULE_SETUP
-#line 297 "../SqlLexer.lpp"
+#line 303 "../SqlLexer.lpp"
 {
     yylval->string_value_ = new quickstep::ParseString(yylloc->first_line, yylloc->first_column);
     BEGIN(CONDITION_STRING_DOUBLE_QUOTED);
@@ -2037,7 +2079,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 306 "../SqlLexer.lpp"
+#line 312 "../SqlLexer.lpp"
 {
     delete yylval->string_value_;
     BEGIN(INITIAL);
@@ -2048,9 +2090,9 @@ case YY_STATE_EOF(CONDITION_STRING_DOUBLE_QUOTED):
 
 /* Process escape sequences. */
 
-case 121:
+case 127:
 YY_RULE_SETUP
-#line 316 "../SqlLexer.lpp"
+#line 322 "../SqlLexer.lpp"
 {
     /* Octal code */
     unsigned int code;
@@ -2064,9 +2106,9 @@ YY_RULE_SETUP
     yylval->string_value_->push_back(code);
   }
 	YY_BREAK
-case 122:
+case 128:
 YY_RULE_SETUP
-#line 328 "../SqlLexer.lpp"
+#line 334 "../SqlLexer.lpp"
 {
     /* Hexadecimal code */
     unsigned int code;
@@ -2074,9 +2116,9 @@ YY_RULE_SETUP
     yylval->string_value_->push_back(code);
   }
 	YY_BREAK
-case 123:
+case 129:
 YY_RULE_SETUP
-#line 334 "../SqlLexer.lpp"
+#line 340 "../SqlLexer.lpp"
 {
     /* A numeric escape sequence that isn't correctly specified. */
     delete yylval->string_value_;
@@ -2085,58 +2127,58 @@ YY_RULE_SETUP
     return TOKEN_LEX_ERROR;
   }
 	YY_BREAK
-case 124:
+case 130:
 YY_RULE_SETUP
-#line 341 "../SqlLexer.lpp"
+#line 347 "../SqlLexer.lpp"
 {
     /* Backspace */
     yylval->string_value_->push_back('\b');
   }
 	YY_BREAK
-case 125:
+case 131:
 YY_RULE_SETUP
-#line 345 "../SqlLexer.lpp"
+#line 351 "../SqlLexer.lpp"
 {
     /* Form-feed */
     yylval->string_value_->push_back('\f');
   }
 	YY_BREAK
-case 126:
+case 132:
 YY_RULE_SETUP
-#line 349 "../SqlLexer.lpp"
+#line 355 "../SqlLexer.lpp"
 {
     /* Newline */
     yylval->string_value_->push_back('\n');
   }
 	YY_BREAK
-case 127:
+case 133:
 YY_RULE_SETUP
-#line 353 "../SqlLexer.lpp"
+#line 359 "../SqlLexer.lpp"
 {
     /* Carriage-return */
     yylval->string_value_->push_back('\r');
   }
 	YY_BREAK
-case 128:
+case 134:
 YY_RULE_SETUP
-#line 357 "../SqlLexer.lpp"
+#line 363 "../SqlLexer.lpp"
 {
     /* Horizontal Tab */
     yylval->string_value_->push_back('\t');
   }
 	YY_BREAK
-case 129:
-/* rule 129 can match eol */
+case 135:
+/* rule 135 can match eol */
 YY_RULE_SETUP
-#line 361 "../SqlLexer.lpp"
+#line 367 "../SqlLexer.lpp"
 {
     /* Any other character (including actual newline or carriage return) */
     yylval->string_value_->push_back(yytext[1]);
   }
 	YY_BREAK
-case 130:
+case 136:
 YY_RULE_SETUP
-#line 365 "../SqlLexer.lpp"
+#line 371 "../SqlLexer.lpp"
 {
     /* This should only be encountered right before an EOF. */
     delete yylval->string_value_;
@@ -2147,17 +2189,17 @@ YY_RULE_SETUP
 	YY_BREAK
 
 
-case 131:
+case 137:
 YY_RULE_SETUP
-#line 375 "../SqlLexer.lpp"
+#line 381 "../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 132:
+case 138:
 YY_RULE_SETUP
-#line 379 "../SqlLexer.lpp"
+#line 385 "../SqlLexer.lpp"
 {
     /* End string */
     BEGIN(CONDITION_SQL);
@@ -2166,17 +2208,17 @@ YY_RULE_SETUP
 	YY_BREAK
 
 
-case 133:
+case 139:
 YY_RULE_SETUP
-#line 387 "../SqlLexer.lpp"
+#line 393 "../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 134:
+case 140:
 YY_RULE_SETUP
-#line 391 "../SqlLexer.lpp"
+#line 397 "../SqlLexer.lpp"
 {
     /* End string */
     BEGIN(CONDITION_SQL);
@@ -2184,94 +2226,94 @@ YY_RULE_SETUP
   }
 	YY_BREAK
 
-case 135:
-/* rule 135 can match eol */
+case 141:
+/* rule 141 can match eol */
 YY_RULE_SETUP
-#line 398 "../SqlLexer.lpp"
+#line 404 "../SqlLexer.lpp"
 {
   /* Scan up to a quote. */
   yylval->string_value_->append(yytext, yyleng);
 }
 	YY_BREAK
-case 136:
-/* rule 136 can match eol */
+case 142:
+/* rule 142 can match eol */
 YY_RULE_SETUP
-#line 403 "../SqlLexer.lpp"
+#line 409 "../SqlLexer.lpp"
 {
   /* Scan up to a quote or escape sequence. */
   yylval->string_value_->append(yytext, yyleng);
 }
 	YY_BREAK
-case 137:
-/* rule 137 can match eol */
+case 143:
+/* rule 143 can match eol */
 YY_RULE_SETUP
-#line 408 "../SqlLexer.lpp"
+#line 414 "../SqlLexer.lpp"
 {
   /* Scan up to a quote. */
   yylval->string_value_->append(yytext, yyleng);
 }
 	YY_BREAK
 
-case 138:
+case 144:
 YY_RULE_SETUP
-#line 414 "../SqlLexer.lpp"
+#line 420 "../SqlLexer.lpp"
 {
     yylval->string_value_ = new quickstep::ParseString(
         yylloc->first_line, yylloc->first_column, std::string(yytext, yyleng));
     return TOKEN_NAME;
   }
 	YY_BREAK
-case 139:
+case 145:
 YY_RULE_SETUP
-#line 420 "../SqlLexer.lpp"
+#line 426 "../SqlLexer.lpp"
 {
     yylval->numeric_literal_value_ = new quickstep::NumericParseLiteralValue(
         yylloc->first_line, yylloc->first_column, yytext);
     return TOKEN_UNSIGNED_NUMVAL;
   }
 	YY_BREAK
-case 140:
+case 146:
 YY_RULE_SETUP
-#line 426 "../SqlLexer.lpp"
+#line 432 "../SqlLexer.lpp"
 /* comment */
 	YY_BREAK
-case 141:
-/* rule 141 can match eol */
+case 147:
+/* rule 147 can match eol */
 YY_RULE_SETUP
-#line 428 "../SqlLexer.lpp"
+#line 434 "../SqlLexer.lpp"
 { yycolumn = 0; }
 	YY_BREAK
-case 142:
+case 148:
 YY_RULE_SETUP
-#line 430 "../SqlLexer.lpp"
+#line 436 "../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 434 "../SqlLexer.lpp"
+#line 440 "../SqlLexer.lpp"
 {
   /* All conditions except for mutli-state string extracting conditions. */
   BEGIN(INITIAL);
   return TOKEN_EOF;
 }
 	YY_BREAK
-case 143:
+case 149:
 YY_RULE_SETUP
-#line 440 "../SqlLexer.lpp"
+#line 446 "../SqlLexer.lpp"
 {
   BEGIN(INITIAL);
   quickstep_yyerror(NULL, yyscanner, NULL, "illegal character");
   return TOKEN_LEX_ERROR;
 }
 	YY_BREAK
-case 144:
+case 150:
 YY_RULE_SETUP
-#line 446 "../SqlLexer.lpp"
+#line 452 "../SqlLexer.lpp"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 2275 "SqlLexer_gen.cpp"
+#line 2317 "SqlLexer_gen.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2565,7 +2607,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 >= 527 )
+			if ( yy_current_state >= 545 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2594,11 +2636,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 >= 527 )
+		if ( yy_current_state >= 545 )
 			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 == 526);
+	yy_is_jam = (yy_current_state == 544);
 
 	(void)yyg;
 	return yy_is_jam ? 0 : yy_current_state;
@@ -3432,7 +3474,7 @@ void quickstep_yyfree (void * ptr , yyscan_t yyscanner)
 
 #define YYTABLES_NAME "yytables"
 
-#line 446 "../SqlLexer.lpp"
+#line 452 "../SqlLexer.lpp"
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/0f79a9af/parser/preprocessed/SqlLexer_gen.hpp
----------------------------------------------------------------------
diff --git a/parser/preprocessed/SqlLexer_gen.hpp b/parser/preprocessed/SqlLexer_gen.hpp
index b30d697..d629f04 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 446 "../SqlLexer.lpp"
+#line 452 "../SqlLexer.lpp"
 
 
 #line 367 "SqlLexer_gen.hpp"


Mime
View raw message