diff --git a/src/parser/bison_parser.cpp b/src/parser/bison_parser.cpp index 531627a..9334616 100644 --- a/src/parser/bison_parser.cpp +++ b/src/parser/bison_parser.cpp @@ -257,55 +257,54 @@ extern int hsql_debug; SQL_LIKE = 344, SQL_LOAD = 345, SQL_NULL = 346, - SQL_PART = 347, - SQL_PLAN = 348, - SQL_SHOW = 349, - SQL_TEXT = 350, - SQL_THEN = 351, - SQL_TIME = 352, - SQL_VIEW = 353, - SQL_WHEN = 354, - SQL_WITH = 355, - SQL_ADD = 356, - SQL_ALL = 357, - SQL_AND = 358, - SQL_ASC = 359, - SQL_CSV = 360, - SQL_END = 361, - SQL_FOR = 362, - SQL_INT = 363, - SQL_KEY = 364, - SQL_NOT = 365, - SQL_OFF = 366, - SQL_SET = 367, - SQL_TBL = 368, - SQL_TOP = 369, - SQL_AS = 370, - SQL_BY = 371, - SQL_IF = 372, - SQL_IN = 373, - SQL_IS = 374, - SQL_OF = 375, - SQL_ON = 376, - SQL_OR = 377, - SQL_TO = 378, - SQL_ARRAY = 379, - SQL_CONCAT = 380, - SQL_ILIKE = 381, - SQL_SECOND = 382, - SQL_MINUTE = 383, - SQL_HOUR = 384, - SQL_DAY = 385, - SQL_MONTH = 386, - SQL_YEAR = 387, - SQL_EQUALS = 388, - SQL_NOTEQUALS = 389, - SQL_LESS = 390, - SQL_GREATER = 391, - SQL_LESSEQ = 392, - SQL_GREATEREQ = 393, - SQL_NOTNULL = 394, - SQL_UMINUS = 395 + SQL_PLAN = 347, + SQL_SHOW = 348, + SQL_TEXT = 349, + SQL_THEN = 350, + SQL_TIME = 351, + SQL_VIEW = 352, + SQL_WHEN = 353, + SQL_WITH = 354, + SQL_ADD = 355, + SQL_ALL = 356, + SQL_AND = 357, + SQL_ASC = 358, + SQL_CSV = 359, + SQL_END = 360, + SQL_FOR = 361, + SQL_INT = 362, + SQL_KEY = 363, + SQL_NOT = 364, + SQL_OFF = 365, + SQL_SET = 366, + SQL_TBL = 367, + SQL_TOP = 368, + SQL_AS = 369, + SQL_BY = 370, + SQL_IF = 371, + SQL_IN = 372, + SQL_IS = 373, + SQL_OF = 374, + SQL_ON = 375, + SQL_OR = 376, + SQL_TO = 377, + SQL_ARRAY = 378, + SQL_CONCAT = 379, + SQL_ILIKE = 380, + SQL_SECOND = 381, + SQL_MINUTE = 382, + SQL_HOUR = 383, + SQL_DAY = 384, + SQL_MONTH = 385, + SQL_YEAR = 386, + SQL_EQUALS = 387, + SQL_NOTEQUALS = 388, + SQL_LESS = 389, + SQL_GREATER = 390, + SQL_LESSEQ = 391, + SQL_GREATEREQ = 392, + SQL_NOTNULL = 393, + SQL_UMINUS = 394 }; #endif @@ -355,7 +354,7 @@ union HSQL_STYPE std::vector* expr_vec; std::vector* order_vec; -#line 359 "bison_parser.cpp" /* yacc.c:355 */ +#line 358 "bison_parser.cpp" /* yacc.c:355 */ }; typedef union HSQL_STYPE HSQL_STYPE; @@ -385,7 +384,7 @@ int hsql_parse (hsql::SQLParserResult* result, yyscan_t scanner); /* Copy the second part of user declarations. */ -#line 389 "bison_parser.cpp" /* yacc.c:358 */ +#line 388 "bison_parser.cpp" /* yacc.c:358 */ #ifdef short # undef short @@ -629,10 +628,10 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 52 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 600 +#define YYLAST 646 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 158 +#define YYNTOKENS 157 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 93 /* YYNRULES -- Number of rules. */ @@ -643,7 +642,7 @@ union yyalloc /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 395 +#define YYMAXUTOK 394 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -655,13 +654,13 @@ static const yytype_uint8 yytranslate[] = 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 147, 2, 2, - 152, 153, 145, 143, 156, 144, 154, 146, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 155, - 136, 133, 137, 157, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 146, 2, 2, + 151, 152, 144, 142, 155, 143, 153, 145, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 154, + 135, 132, 136, 156, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 150, 2, 151, 148, 2, 2, 2, 2, 2, + 2, 149, 2, 150, 147, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -690,8 +689,8 @@ static const yytype_uint8 yytranslate[] = 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, - 125, 126, 127, 128, 129, 130, 131, 132, 134, 135, - 138, 139, 140, 141, 142, 149 + 125, 126, 127, 128, 129, 130, 131, 133, 134, 137, + 138, 139, 140, 141, 148 }; #if HSQL_DEBUG @@ -742,10 +741,10 @@ static const char *const yytname[] = "LOCAL", "MERGE", "MINUS", "ORDER", "OUTER", "RIGHT", "TABLE", "UNION", "USING", "WHERE", "CALL", "CASE", "DATE", "DESC", "DROP", "ELSE", "FILE", "FROM", "FULL", "HASH", "HINT", "INTO", "JOIN", "LEFT", "LIKE", "LOAD", - "NULL", "PART", "PLAN", "SHOW", "TEXT", "THEN", "TIME", "VIEW", "WHEN", - "WITH", "ADD", "ALL", "AND", "ASC", "CSV", "END", "FOR", "INT", "KEY", - "NOT", "OFF", "SET", "TBL", "TOP", "AS", "BY", "IF", "IN", "IS", "OF", - "ON", "OR", "TO", "ARRAY", "CONCAT", "ILIKE", "SECOND", "MINUTE", "HOUR", + "NULL", "PLAN", "SHOW", "TEXT", "THEN", "TIME", "VIEW", "WHEN", "WITH", + "ADD", "ALL", "AND", "ASC", "CSV", "END", "FOR", "INT", "KEY", "NOT", + "OFF", "SET", "TBL", "TOP", "AS", "BY", "IF", "IN", "IS", "OF", "ON", + "OR", "TO", "ARRAY", "CONCAT", "ILIKE", "SECOND", "MINUTE", "HOUR", "DAY", "MONTH", "YEAR", "'='", "EQUALS", "NOTEQUALS", "'<'", "'>'", "LESS", "GREATER", "LESSEQ", "GREATEREQ", "NOTNULL", "'+'", "'-'", "'*'", "'/'", "'%'", "'^'", "UMINUS", "'['", "']'", "'('", "')'", "'.'", "';'", @@ -794,16 +793,16 @@ static const yytype_uint16 yytoknum[] = 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, - 385, 386, 387, 61, 388, 389, 60, 62, 390, 391, - 392, 393, 394, 43, 45, 42, 47, 37, 94, 395, - 91, 93, 40, 41, 46, 59, 44, 63 + 385, 386, 61, 387, 388, 60, 62, 389, 390, 391, + 392, 393, 43, 45, 42, 47, 37, 94, 394, 91, + 93, 40, 41, 46, 59, 44, 63 }; # endif -#define YYPACT_NINF -321 +#define YYPACT_NINF -312 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-321))) + (!!((Yystate) == (-312))) #define YYTABLE_NINF -223 @@ -814,48 +813,48 @@ static const yytype_uint16 yytoknum[] = STATE-NUM. */ static const yytype_int16 yypact[] = { - 276, 17, 42, 52, 63, -33, 10, 19, 29, 62, - 42, -24, 30, -38, 129, -18, -321, 78, 78, -321, - -321, -321, -321, -321, -321, -321, -321, -321, -321, 23, - -321, 28, 127, 26, -321, 27, 111, 69, 69, 42, - 117, 42, 202, 197, 122, -321, 99, 99, 42, -321, - 70, 82, -321, 276, -321, 157, -321, -321, -321, -321, - -321, -38, 141, 140, -38, -5, -321, 255, 20, 259, - 154, 42, 42, 194, -321, 189, 120, -321, -321, -321, - 121, 271, 236, 42, 42, -321, -321, -321, -321, 130, - -321, 225, -321, -321, -321, 121, 225, 202, 7, -321, - -321, -321, -321, -321, -321, 74, -321, -321, -321, -321, - -321, -321, -321, -321, 257, -77, 120, 121, -321, 291, - 296, 66, 5, 164, 167, 11, 184, 174, 178, -321, - 161, 245, 169, -321, 16, 250, -321, -321, -321, -321, - -321, -321, -321, -321, -321, -321, -321, -321, -321, -321, - -321, 199, -44, -321, -321, -321, -321, 331, -5, 182, - -321, -25, -5, -321, 293, 295, 301, -321, 20, -321, - 238, 349, 239, -23, 267, -321, -321, 76, 204, -321, - 22, 15, 308, 348, 121, 158, 114, 207, 178, 379, - 121, 103, 211, -76, 6, 194, -321, 121, -321, 121, - 364, 121, -321, -321, 178, -321, 178, -49, 219, 3, - 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, - 178, 178, 178, 178, 178, 202, 121, 271, -321, 221, - 80, -321, -321, 121, -321, -321, -321, -321, 202, 202, - 202, -321, 297, -4, 88, -321, -38, 42, -321, 371, - 20, -321, 121, -321, -321, 224, -321, -321, -321, -321, - -321, -321, 298, -46, 115, 121, 121, -321, 308, 290, - 59, -321, -321, -38, -321, 274, -321, 226, -321, 8, - -321, 320, -321, -321, -321, 285, 317, 420, 178, 237, - 161, -321, 310, 242, 420, 420, 420, 420, 450, 450, - 450, 450, 103, 103, 48, 48, 48, 67, 248, -23, - -321, 20, -321, 331, -321, -321, -321, -321, 291, -321, - -321, -321, -321, -321, -321, 349, -321, -321, -321, 106, - 128, -321, 121, 121, 121, -321, 243, 104, 249, -321, - 251, 316, -321, -321, -321, 338, 339, 341, 324, 6, - 410, -321, -321, -321, 302, -321, 178, 420, 161, 261, - 134, -321, -321, 136, -321, -321, -321, -321, -321, -68, - -23, 244, -321, 121, -321, 8, 6, -321, -321, -321, - 6, 346, 265, 121, 379, 266, 148, -321, -321, -321, - -321, -321, -23, -321, -321, 386, 296, -36, -321, -321, - 269, 121, 159, 121, -321, 25, -23, -321, -321, -23, - 268, 270, -321 + 309, 18, 43, 79, 99, -18, 44, 45, 52, -3, + 43, 33, 2, -39, 180, 34, -312, 136, 136, -312, + -312, -312, -312, -312, -312, -312, -312, -312, -312, 3, + -312, 5, 192, 83, -312, 68, 146, 135, 135, 43, + 153, 43, 257, 255, 170, -312, 169, 169, 43, -312, + 140, 147, -312, 309, -312, 202, -312, -312, -312, -312, + -312, -39, 197, 187, -39, -15, -312, 300, 20, 302, + 205, 43, 43, 237, -312, 234, 167, -312, -312, -312, + 161, 316, 281, 43, 43, -312, -312, -312, -312, 171, + -312, 259, -312, -312, -312, 161, 259, 257, 28, -312, + -312, -312, -312, -312, -312, 27, -312, -312, -312, -312, + -312, -312, -312, -312, 283, -63, 167, 161, -312, 321, + 326, 81, 91, 179, 181, 118, 219, 184, 285, -312, + 157, 252, 182, -312, 14, 322, -312, -312, -312, -312, + -312, -312, -312, -312, -312, -312, -312, -312, -312, -312, + -312, 203, -69, -312, -312, -312, -312, 335, -15, 185, + -312, -43, -15, -312, 294, 299, 301, -312, 20, -312, + 235, 346, 238, -41, 265, -312, -312, 31, 204, -312, + 16, 12, 306, 251, 161, 128, -6, 206, 285, 402, + 161, 66, 208, -55, 4, 237, -312, 161, -312, 161, + 355, 161, -312, -312, 285, -312, 285, -62, 214, 24, + 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, + 285, 285, 285, 285, 285, 257, 161, 316, -312, 215, + 32, -312, -312, 161, -312, -312, -312, -312, 257, 257, + 257, -312, 286, -7, 62, -312, -39, 43, -312, 366, + 20, -312, 161, -312, -312, 220, -312, -312, -312, -312, + -312, -312, 289, -45, 95, 161, 161, -312, 306, 284, + -57, -312, -312, -39, -312, 26, -312, 228, -312, 6, + -312, 313, -312, -312, -312, 282, 361, 432, 285, 236, + 157, -312, 295, 240, 432, 432, 432, 432, 274, 274, + 274, 274, 66, 66, 96, 96, 96, -87, 241, -41, + -312, 20, -312, 335, -312, -312, -312, -312, 321, -312, + -312, -312, -312, -312, -312, 346, -312, -312, -312, 77, + 101, -312, 161, 161, 161, -312, 87, 75, 243, -312, + 244, 298, -312, -312, -312, 324, 328, 330, 303, 4, + 397, -312, -312, -312, 288, -312, 285, 432, 157, 249, + 116, -312, -312, 120, -312, -312, -312, -312, -312, -51, + -41, 129, -312, 161, -312, 6, 4, -312, -312, -312, + 4, 195, 253, 161, 402, 254, 121, -312, -312, -312, + -312, -312, -41, -312, -312, 526, 326, -30, -312, -312, + 261, 161, 141, 161, -312, 13, -41, -312, -312, -41, + 262, 270, -312 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -910,16 +909,16 @@ static const yytype_uint8 yydefact[] = /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -321, -321, -321, 373, -321, 406, -321, 118, -321, -321, - -321, -321, -321, 119, -321, -321, 394, -321, 110, -321, - -321, 391, -321, -321, -321, 323, -321, -321, 213, -185, - 9, 377, -13, 413, -321, -321, 253, 292, -321, -321, - -321, -109, -321, -321, 37, -321, 214, -321, -321, -69, - -184, -230, 273, -94, -70, -321, -321, -321, -321, -321, - -321, 263, -321, -321, -321, -321, -321, -321, -321, -321, - 41, -65, -115, -321, -34, -321, -321, -321, -320, 95, - -321, -321, -321, 0, -321, 98, 347, -321, -321, -321, - -321, -321, 86 + -312, -312, -312, 352, -312, 406, -312, 112, -312, -312, + -312, -312, -312, 108, -312, -312, 389, -312, 105, -312, + -312, 385, -312, -312, -312, 317, -312, -312, 207, -206, + 30, 371, -13, 407, -312, -312, 233, 263, -312, -312, + -312, -130, -312, -312, 82, -312, 209, -312, -312, -129, + -184, -230, 247, -94, -70, -312, -312, -312, -312, -312, + -312, 260, -312, -312, -312, -312, -312, -312, -312, -312, + 46, -65, -115, -312, -34, -312, -312, -312, -311, 61, + -312, -312, -312, 0, -312, 74, 318, -312, -312, -312, + -312, -312, 57 }; /* YYDEFGOTO[NTERM-NUM]. */ @@ -942,132 +941,140 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { - 51, 161, 34, 106, 175, 170, 270, 403, 78, 33, - 45, 198, 9, 77, 122, 101, 102, 77, 253, 198, - 329, 319, 50, 173, 101, 102, 77, 199, 410, 381, - 117, 185, 58, 320, 79, 199, 193, 58, 37, 73, - 288, 76, 97, 228, 32, 33, 201, 46, 85, 48, - 333, 123, 124, 234, 201, 35, 189, 199, 191, 98, - 395, 326, 59, 163, 166, 38, 36, 59, 330, 289, - 90, 115, 116, 90, 47, 171, 201, 272, 199, 235, - 199, 363, 49, 155, 156, 390, 281, 125, 340, 232, - 263, 321, 39, 237, 291, 60, 63, 201, 164, 201, - 60, 40, 103, 241, 322, 283, 360, 285, 179, 165, - 184, 103, 227, 292, 13, 41, 9, 192, 189, 199, - 197, 126, 178, 350, 122, 101, 102, 77, 158, 52, - 66, 200, 309, 162, 286, 127, 287, 53, 201, 161, + 51, 161, 34, 106, 175, 117, 270, 33, 78, 198, + 45, 9, 58, 403, 58, 253, 410, 198, 319, 170, + 329, 48, 228, 173, 101, 102, 77, 288, 79, 232, + 320, 185, 97, 237, 77, 234, 193, 210, 381, 73, + 326, 76, 59, 50, 59, 32, 33, 199, 85, 98, + 333, 199, 341, 37, 49, 289, 189, 199, 191, 199, + 235, 199, 225, 163, 166, 281, 201, 340, 330, 395, + 201, 115, 116, 63, 265, 60, 201, 60, 201, 38, + 201, 363, 35, 155, 156, 342, 227, 321, 171, 343, + 263, 90, 266, 339, 90, 344, 345, 272, 197, 267, + 322, 390, 36, 241, 46, 283, 360, 285, 179, 346, + 42, 103, 13, -222, 347, 291, 199, 192, 189, 164, + 350, 122, 101, 102, 77, 197, 39, 40, 200, 165, + 47, 9, 309, 292, 286, 201, 287, 178, 41, 161, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, - 303, 304, 305, 306, 307, 128, 129, 180, 273, 181, - 254, 123, 124, 130, 122, 101, 102, 77, 104, 255, - 129, 336, 337, 210, 386, 251, 42, 104, 55, 68, - 67, 122, 101, 102, 77, 106, 70, 122, 101, 102, - 77, 308, 210, 69, 265, 334, 224, 125, 225, 397, - 373, 123, 124, 175, 315, 316, 317, 199, 77, 79, - 339, 9, 103, 266, 266, 197, 82, 225, 357, 124, - 267, 335, 74, 86, 187, 124, 201, 167, 210, 248, - 168, 126, 249, 312, 81, 87, 313, 125, 369, 370, - 371, 324, 89, 93, 325, 127, 106, 327, 221, 222, - 223, 224, 103, 225, 125, 338, 95, 184, 100, 367, - 125, 199, 168, 112, 114, 128, 129, 204, 117, 103, - 119, 126, 120, 130, 151, 103, 154, 359, 104, 392, - 201, 368, 157, 1, 197, 127, 384, 388, 188, 389, - 197, 2, 168, 63, 188, 101, 205, 169, 3, 176, - 341, 399, 127, 4, 197, 128, 129, 406, 127, 409, - 5, 6, 408, 130, 92, 249, 182, 92, 104, 183, - 7, 8, 128, 129, 190, 197, 9, 194, 128, 129, - 130, 10, 226, 342, 229, 104, 130, 343, 233, 206, - 238, 104, 239, 344, 345, 385, 199, 199, 240, 372, - 391, 242, 243, 247, 246, 11, 250, 346, 9, 268, - 207, -222, 347, 205, 271, 201, 201, 284, 208, 209, - 12, 290, 341, 311, 328, 210, 211, 331, 318, 288, - 332, 354, 349, 212, 213, 214, 215, 216, 199, 358, - 217, 218, 225, 219, 220, 221, 222, 223, 224, 362, - 225, 361, 374, 376, 375, 342, 206, 377, 378, 343, - 379, 380, 341, 382, 387, 344, 345, 396, 383, 398, - 356, 405, 181, 412, 57, 205, 88, 269, 13, 346, - -196, 364, 72, -222, 347, 366, 209, 365, 84, 172, - 310, 96, 210, 211, 64, 342, 411, 314, 264, 343, - 212, 213, 214, 215, 216, 344, 345, 217, 218, 400, - 219, 220, 221, 222, 223, 224, 205, 225, 206, 346, - 282, 394, 252, 393, 347, 256, 257, 258, 259, 260, - 261, 202, 402, 0, 0, 0, 0, 0, 0, 269, - 0, 0, 0, 0, 0, 0, 205, 0, 209, 0, - 0, 0, -197, 0, 210, 211, 0, 401, 0, -223, - 0, 0, 212, 213, 214, 215, 216, 0, 0, 217, - 218, 0, 219, 220, 221, 222, 223, 224, 0, 225, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 209, - 0, 0, 0, 0, 0, 210, -223, 0, 0, 0, - 0, 0, 0, -223, -223, -223, 215, 216, 0, 0, - 217, 218, 0, 219, 220, 221, 222, 223, 224, 209, - 225, 0, 0, 0, 0, 210, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, -223, -223, 0, 0, - -223, -223, 0, 219, 220, 221, 222, 223, 224, 0, - 225 + 303, 304, 305, 306, 307, 273, 254, 129, 123, 124, + 122, 101, 102, 77, 122, 101, 102, 77, 251, 255, + 373, 336, 337, 158, 386, 334, 104, 199, 162, 167, + 52, -196, 168, 248, 312, 106, 249, 313, 53, 199, + 210, 308, 372, 266, 125, 66, 201, 123, 124, 397, + 335, 123, 124, 175, 315, 316, 317, 9, 201, 103, + 221, 222, 223, 224, 324, 225, 184, 325, 357, 68, + 210, 341, 122, 101, 102, 77, 184, 126, 69, 367, + 199, 199, 168, 125, 391, 55, 67, 125, 369, 370, + 371, 127, 180, 224, 181, 225, 106, 327, 103, 201, + 201, 70, 103, 368, 342, 338, 197, 74, 343, 187, + 124, 128, 129, 77, 344, 345, 126, 79, 388, 130, + 126, 197, 389, 399, 104, 168, 197, 359, 346, 392, + 127, 81, -222, 347, 127, 82, 384, 89, 122, 101, + 102, 77, 86, 408, 92, 125, 249, 92, 93, 87, + 128, 129, 95, 100, 128, 129, 112, 406, 130, 409, + 103, 117, 130, 104, 114, 119, 1, 104, 120, 151, + 205, 154, 157, 169, 2, 101, 124, 63, 188, 176, + 182, 3, 183, 190, 194, 226, 4, 197, 229, 204, + 233, 238, 127, 5, 6, 385, 239, 242, 240, 243, + -197, 247, 246, 7, 8, 250, 9, 268, 284, 9, + 271, 125, 128, 129, 10, 290, 311, 318, 205, 328, + 130, 332, 331, 288, 354, 104, 103, 256, 257, 258, + 259, 260, 261, 349, 199, 376, 361, 358, 11, 225, + 380, 362, 209, 377, 188, 374, 375, 378, 210, 379, + 382, 387, 12, 383, 396, 88, 398, 205, 127, -223, + -223, 206, 405, -223, -223, 181, 219, 220, 221, 222, + 223, 224, 412, 225, 57, 364, 365, 72, 128, 129, + 366, 207, 84, 172, 310, 96, 130, 394, 64, 208, + 209, 104, 314, 252, 282, 264, 210, 211, 205, 393, + 206, 411, 202, 402, 212, 213, 214, 215, 216, 0, + 13, 217, 218, 356, 219, 220, 221, 222, 223, 224, + 269, 225, 0, 0, 0, 0, 0, 0, 205, 209, + 0, 0, 0, 0, 0, 210, 211, 0, 0, 0, + 0, 206, 0, 212, 213, 214, 215, 216, 0, 0, + 217, 218, 0, 219, 220, 221, 222, 223, 224, 0, + 225, 269, 0, 0, 0, 0, 0, 0, 0, 0, + 209, -223, 0, 0, 0, 0, 210, 211, 0, 0, + 0, 0, 0, 0, 212, 213, 214, 215, 216, 0, + 0, 217, 218, 0, 219, 220, 221, 222, 223, 224, + 209, 225, 341, 0, 0, 0, 210, -223, 0, 0, + 0, 0, 0, 0, -223, -223, -223, 215, 216, 0, + 0, 217, 218, 0, 219, 220, 221, 222, 223, 224, + 0, 225, 0, 0, 0, 342, 0, 0, 0, 343, + 0, 0, 0, 0, 0, 344, 345, 0, 0, 400, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 346, + 0, 0, 0, 0, 347, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 401 }; static const yytype_int16 yycheck[] = { - 13, 95, 2, 68, 119, 82, 190, 43, 42, 3, - 10, 3, 50, 6, 3, 4, 5, 6, 3, 3, - 250, 25, 13, 117, 4, 5, 6, 103, 3, 349, - 74, 125, 9, 37, 12, 103, 130, 9, 71, 39, - 89, 41, 47, 152, 27, 3, 122, 71, 48, 19, - 96, 40, 41, 78, 122, 3, 126, 103, 128, 64, - 380, 246, 39, 97, 98, 98, 3, 39, 252, 118, - 61, 71, 72, 64, 98, 152, 122, 153, 103, 104, - 103, 311, 52, 83, 84, 153, 195, 76, 273, 158, - 184, 95, 82, 162, 91, 72, 68, 122, 91, 122, - 72, 82, 91, 168, 108, 199, 290, 201, 121, 102, - 99, 91, 156, 110, 152, 86, 50, 130, 188, 103, - 156, 110, 56, 115, 3, 4, 5, 6, 91, 0, - 3, 115, 226, 96, 204, 124, 206, 155, 122, 233, + 13, 95, 2, 68, 119, 74, 190, 3, 42, 3, + 10, 50, 9, 43, 9, 3, 3, 3, 25, 82, + 250, 19, 152, 117, 4, 5, 6, 89, 12, 158, + 37, 125, 47, 162, 6, 78, 130, 124, 349, 39, + 246, 41, 39, 13, 39, 27, 3, 102, 48, 64, + 95, 102, 26, 71, 52, 117, 126, 102, 128, 102, + 103, 102, 149, 97, 98, 195, 121, 273, 252, 380, + 121, 71, 72, 68, 80, 72, 121, 72, 121, 97, + 121, 311, 3, 83, 84, 59, 155, 94, 151, 63, + 184, 61, 98, 150, 64, 69, 70, 152, 155, 105, + 107, 152, 3, 168, 71, 199, 290, 201, 121, 83, + 113, 91, 151, 87, 88, 91, 102, 130, 188, 91, + 114, 3, 4, 5, 6, 155, 82, 82, 114, 101, + 97, 50, 226, 109, 204, 121, 206, 56, 86, 233, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, - 220, 221, 222, 223, 224, 144, 145, 152, 152, 154, - 145, 40, 41, 152, 3, 4, 5, 6, 157, 182, - 145, 265, 266, 125, 358, 153, 114, 157, 100, 152, - 154, 3, 4, 5, 6, 250, 117, 3, 4, 5, - 6, 225, 125, 82, 80, 80, 148, 76, 150, 383, - 96, 40, 41, 318, 238, 239, 240, 103, 6, 12, - 151, 50, 91, 99, 99, 156, 117, 150, 288, 41, - 106, 106, 105, 153, 40, 41, 122, 153, 125, 153, - 156, 110, 156, 153, 112, 153, 156, 76, 332, 333, - 334, 153, 85, 102, 156, 124, 311, 247, 145, 146, - 147, 148, 91, 150, 76, 268, 116, 99, 3, 153, - 76, 103, 156, 4, 110, 144, 145, 17, 74, 91, - 81, 110, 152, 152, 3, 91, 40, 290, 157, 373, - 122, 153, 152, 7, 156, 124, 356, 153, 110, 153, - 156, 15, 156, 68, 110, 4, 46, 40, 22, 3, - 26, 153, 124, 27, 156, 144, 145, 401, 124, 403, - 34, 35, 153, 152, 61, 156, 152, 64, 157, 152, - 44, 45, 144, 145, 150, 156, 50, 82, 144, 145, - 152, 55, 133, 59, 3, 157, 152, 63, 156, 89, - 47, 157, 47, 69, 70, 358, 103, 103, 47, 106, - 106, 113, 3, 86, 115, 79, 152, 83, 50, 152, - 110, 87, 88, 46, 153, 122, 122, 3, 118, 119, - 94, 152, 26, 152, 3, 125, 126, 153, 81, 89, - 82, 61, 156, 133, 134, 135, 136, 137, 103, 152, - 140, 141, 150, 143, 144, 145, 146, 147, 148, 151, - 150, 91, 153, 87, 153, 59, 89, 69, 69, 63, - 69, 87, 26, 3, 153, 69, 70, 152, 116, 153, - 103, 152, 154, 153, 18, 46, 53, 110, 152, 83, - 156, 313, 38, 87, 88, 325, 119, 318, 47, 116, - 227, 64, 125, 126, 31, 59, 405, 233, 185, 63, - 133, 134, 135, 136, 137, 69, 70, 140, 141, 73, - 143, 144, 145, 146, 147, 148, 46, 150, 89, 83, - 197, 376, 180, 375, 88, 127, 128, 129, 130, 131, - 132, 134, 396, -1, -1, -1, -1, -1, -1, 110, - -1, -1, -1, -1, -1, -1, 46, -1, 119, -1, - -1, -1, 156, -1, 125, 126, -1, 121, -1, 89, - -1, -1, 133, 134, 135, 136, 137, -1, -1, 140, - 141, -1, 143, 144, 145, 146, 147, 148, -1, 150, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 119, - -1, -1, -1, -1, -1, 125, 126, -1, -1, -1, - -1, -1, -1, 133, 134, 135, 136, 137, -1, -1, - 140, 141, -1, 143, 144, 145, 146, 147, 148, 119, - 150, -1, -1, -1, -1, 125, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 136, 137, -1, -1, - 140, 141, -1, 143, 144, 145, 146, 147, 148, -1, - 150 + 220, 221, 222, 223, 224, 151, 144, 144, 40, 41, + 3, 4, 5, 6, 3, 4, 5, 6, 152, 182, + 95, 265, 266, 91, 358, 80, 156, 102, 96, 152, + 0, 155, 155, 152, 152, 250, 155, 155, 154, 102, + 124, 225, 105, 98, 76, 3, 121, 40, 41, 383, + 105, 40, 41, 318, 238, 239, 240, 50, 121, 91, + 144, 145, 146, 147, 152, 149, 98, 155, 288, 151, + 124, 26, 3, 4, 5, 6, 98, 109, 82, 152, + 102, 102, 155, 76, 105, 99, 153, 76, 332, 333, + 334, 123, 151, 147, 153, 149, 311, 247, 91, 121, + 121, 116, 91, 152, 59, 268, 155, 104, 63, 40, + 41, 143, 144, 6, 69, 70, 109, 12, 152, 151, + 109, 155, 152, 152, 156, 155, 155, 290, 83, 373, + 123, 111, 87, 88, 123, 116, 356, 85, 3, 4, + 5, 6, 152, 152, 61, 76, 155, 64, 101, 152, + 143, 144, 115, 3, 143, 144, 4, 401, 151, 403, + 91, 74, 151, 156, 109, 81, 7, 156, 151, 3, + 46, 40, 151, 40, 15, 4, 41, 68, 109, 3, + 151, 22, 151, 149, 82, 132, 27, 155, 3, 17, + 155, 47, 123, 34, 35, 358, 47, 112, 47, 3, + 155, 86, 114, 44, 45, 151, 50, 151, 3, 50, + 152, 76, 143, 144, 55, 151, 151, 81, 46, 3, + 151, 82, 152, 89, 61, 156, 91, 126, 127, 128, + 129, 130, 131, 155, 102, 87, 91, 151, 79, 149, + 87, 150, 118, 69, 109, 152, 152, 69, 124, 69, + 3, 152, 93, 115, 151, 53, 152, 46, 123, 135, + 136, 89, 151, 139, 140, 153, 142, 143, 144, 145, + 146, 147, 152, 149, 18, 313, 318, 38, 143, 144, + 325, 109, 47, 116, 227, 64, 151, 376, 31, 117, + 118, 156, 233, 180, 197, 185, 124, 125, 46, 375, + 89, 405, 134, 396, 132, 133, 134, 135, 136, -1, + 151, 139, 140, 102, 142, 143, 144, 145, 146, 147, + 109, 149, -1, -1, -1, -1, -1, -1, 46, 118, + -1, -1, -1, -1, -1, 124, 125, -1, -1, -1, + -1, 89, -1, 132, 133, 134, 135, 136, -1, -1, + 139, 140, -1, 142, 143, 144, 145, 146, 147, -1, + 149, 109, -1, -1, -1, -1, -1, -1, -1, -1, + 118, 89, -1, -1, -1, -1, 124, 125, -1, -1, + -1, -1, -1, -1, 132, 133, 134, 135, 136, -1, + -1, 139, 140, -1, 142, 143, 144, 145, 146, 147, + 118, 149, 26, -1, -1, -1, 124, 125, -1, -1, + -1, -1, -1, -1, 132, 133, 134, 135, 136, -1, + -1, 139, 140, -1, 142, 143, 144, 145, 146, 147, + -1, 149, -1, -1, -1, 59, -1, -1, -1, 63, + -1, -1, -1, -1, -1, 69, 70, -1, -1, 73, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 83, + -1, -1, -1, -1, 88, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 120 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -1075,75 +1082,75 @@ static const yytype_int16 yycheck[] = static const yytype_uint8 yystos[] = { 0, 7, 15, 22, 27, 34, 35, 44, 45, 50, - 55, 79, 94, 152, 159, 160, 161, 162, 166, 168, - 169, 172, 173, 178, 180, 181, 182, 184, 187, 188, - 190, 194, 27, 3, 241, 3, 3, 71, 98, 82, - 82, 86, 114, 206, 240, 241, 71, 98, 19, 52, - 188, 190, 0, 155, 249, 100, 163, 163, 9, 39, - 72, 191, 192, 68, 191, 202, 3, 154, 152, 82, - 117, 174, 174, 241, 105, 170, 241, 6, 232, 12, - 195, 112, 117, 179, 179, 241, 153, 153, 161, 85, - 188, 189, 194, 102, 193, 116, 189, 47, 64, 207, - 3, 4, 5, 91, 157, 209, 229, 230, 231, 232, - 233, 234, 4, 167, 110, 241, 241, 74, 199, 81, - 152, 183, 3, 40, 41, 76, 110, 124, 144, 145, - 152, 196, 208, 210, 211, 212, 213, 214, 215, 216, - 217, 218, 220, 221, 222, 223, 225, 226, 227, 228, - 229, 3, 185, 186, 40, 241, 241, 152, 202, 203, - 204, 211, 202, 232, 91, 102, 232, 153, 156, 40, - 82, 152, 183, 211, 171, 230, 3, 250, 56, 190, - 152, 154, 152, 152, 99, 211, 219, 40, 110, 212, - 150, 212, 190, 211, 82, 197, 198, 156, 3, 103, - 115, 122, 244, 245, 17, 46, 89, 110, 118, 119, - 125, 126, 133, 134, 135, 136, 137, 140, 141, 143, - 144, 145, 146, 147, 148, 150, 133, 156, 199, 3, - 164, 165, 207, 156, 78, 104, 205, 207, 47, 47, - 47, 229, 113, 3, 175, 176, 115, 86, 153, 156, - 152, 153, 195, 3, 145, 190, 127, 128, 129, 130, - 131, 132, 224, 211, 219, 80, 99, 106, 152, 110, - 208, 153, 153, 152, 235, 236, 237, 238, 239, 241, - 246, 199, 210, 211, 3, 211, 212, 212, 89, 118, - 152, 91, 110, 212, 212, 212, 212, 212, 212, 212, - 212, 212, 212, 212, 212, 212, 212, 212, 232, 211, - 186, 152, 153, 156, 204, 232, 232, 232, 81, 25, - 37, 95, 108, 177, 153, 156, 187, 241, 3, 209, - 208, 153, 82, 96, 80, 106, 211, 211, 190, 151, - 187, 26, 59, 63, 69, 70, 83, 88, 247, 156, - 115, 242, 243, 244, 61, 200, 103, 212, 152, 190, - 208, 91, 151, 209, 165, 171, 176, 153, 153, 211, - 211, 211, 106, 96, 153, 153, 87, 69, 69, 69, - 87, 236, 3, 116, 212, 190, 208, 153, 153, 153, - 153, 106, 211, 243, 237, 236, 152, 208, 153, 153, - 73, 121, 250, 43, 201, 152, 211, 248, 153, 211, - 3, 228, 153 + 55, 79, 93, 151, 158, 159, 160, 161, 165, 167, + 168, 171, 172, 177, 179, 180, 181, 183, 186, 187, + 189, 193, 27, 3, 240, 3, 3, 71, 97, 82, + 82, 86, 113, 205, 239, 240, 71, 97, 19, 52, + 187, 189, 0, 154, 248, 99, 162, 162, 9, 39, + 72, 190, 191, 68, 190, 201, 3, 153, 151, 82, + 116, 173, 173, 240, 104, 169, 240, 6, 231, 12, + 194, 111, 116, 178, 178, 240, 152, 152, 160, 85, + 187, 188, 193, 101, 192, 115, 188, 47, 64, 206, + 3, 4, 5, 91, 156, 208, 228, 229, 230, 231, + 232, 233, 4, 166, 109, 240, 240, 74, 198, 81, + 151, 182, 3, 40, 41, 76, 109, 123, 143, 144, + 151, 195, 207, 209, 210, 211, 212, 213, 214, 215, + 216, 217, 219, 220, 221, 222, 224, 225, 226, 227, + 228, 3, 184, 185, 40, 240, 240, 151, 201, 202, + 203, 210, 201, 231, 91, 101, 231, 152, 155, 40, + 82, 151, 182, 210, 170, 229, 3, 249, 56, 189, + 151, 153, 151, 151, 98, 210, 218, 40, 109, 211, + 149, 211, 189, 210, 82, 196, 197, 155, 3, 102, + 114, 121, 243, 244, 17, 46, 89, 109, 117, 118, + 124, 125, 132, 133, 134, 135, 136, 139, 140, 142, + 143, 144, 145, 146, 147, 149, 132, 155, 198, 3, + 163, 164, 206, 155, 78, 103, 204, 206, 47, 47, + 47, 228, 112, 3, 174, 175, 114, 86, 152, 155, + 151, 152, 194, 3, 144, 189, 126, 127, 128, 129, + 130, 131, 223, 210, 218, 80, 98, 105, 151, 109, + 207, 152, 152, 151, 234, 235, 236, 237, 238, 240, + 245, 198, 209, 210, 3, 210, 211, 211, 89, 117, + 151, 91, 109, 211, 211, 211, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 231, 210, + 185, 151, 152, 155, 203, 231, 231, 231, 81, 25, + 37, 94, 107, 176, 152, 155, 186, 240, 3, 208, + 207, 152, 82, 95, 80, 105, 210, 210, 189, 150, + 186, 26, 59, 63, 69, 70, 83, 88, 246, 155, + 114, 241, 242, 243, 61, 199, 102, 211, 151, 189, + 207, 91, 150, 208, 164, 170, 175, 152, 152, 210, + 210, 210, 105, 95, 152, 152, 87, 69, 69, 69, + 87, 235, 3, 115, 211, 189, 207, 152, 152, 152, + 152, 105, 210, 242, 236, 235, 151, 207, 152, 152, + 73, 120, 249, 43, 200, 151, 210, 247, 152, 210, + 3, 227, 152 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 158, 159, 160, 160, 161, 161, 161, 162, 162, - 162, 162, 162, 162, 162, 162, 162, 163, 163, 164, - 164, 165, 165, 166, 167, 168, 168, 169, 170, 171, - 172, 172, 173, 173, 173, 174, 174, 175, 175, 176, - 177, 177, 177, 177, 178, 178, 178, 179, 179, 180, - 181, 182, 182, 183, 183, 184, 185, 185, 186, 187, - 187, 187, 188, 188, 189, 189, 190, 190, 191, 192, - 192, 192, 193, 193, 194, 195, 195, 196, 197, 197, - 198, 199, 199, 200, 200, 201, 201, 202, 202, 203, - 203, 204, 205, 205, 205, 206, 206, 207, 207, 207, - 207, 207, 207, 207, 207, 208, 208, 209, 209, 210, - 211, 211, 211, 211, 211, 212, 212, 212, 212, 212, - 212, 212, 212, 212, 212, 213, 213, 214, 214, 214, - 214, 214, 215, 215, 215, 215, 215, 215, 215, 215, - 215, 215, 215, 216, 216, 217, 217, 217, 217, 218, - 218, 218, 218, 219, 219, 220, 220, 221, 221, 221, - 221, 221, 221, 221, 222, 222, 223, 224, 224, 224, - 224, 224, 224, 225, 226, 227, 228, 228, 228, 228, - 229, 229, 229, 229, 230, 231, 231, 232, 233, 234, - 235, 235, 236, 236, 237, 237, 238, 238, 239, 240, - 241, 241, 242, 242, 243, 243, 244, 244, 245, 245, - 246, 246, 246, 247, 247, 247, 247, 247, 247, 247, - 247, 247, 247, 248, 249, 249, 250, 250 + 0, 157, 158, 159, 159, 160, 160, 160, 161, 161, + 161, 161, 161, 161, 161, 161, 161, 162, 162, 163, + 163, 164, 164, 165, 166, 167, 167, 168, 169, 170, + 171, 171, 172, 172, 172, 173, 173, 174, 174, 175, + 176, 176, 176, 176, 177, 177, 177, 178, 178, 179, + 180, 181, 181, 182, 182, 183, 184, 184, 185, 186, + 186, 186, 187, 187, 188, 188, 189, 189, 190, 191, + 191, 191, 192, 192, 193, 194, 194, 195, 196, 196, + 197, 198, 198, 199, 199, 200, 200, 201, 201, 202, + 202, 203, 204, 204, 204, 205, 205, 206, 206, 206, + 206, 206, 206, 206, 206, 207, 207, 208, 208, 209, + 210, 210, 210, 210, 210, 211, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 212, 212, 213, 213, 213, + 213, 213, 214, 214, 214, 214, 214, 214, 214, 214, + 214, 214, 214, 215, 215, 216, 216, 216, 216, 217, + 217, 217, 217, 218, 218, 219, 219, 220, 220, 220, + 220, 220, 220, 220, 221, 221, 222, 223, 223, 223, + 223, 223, 223, 224, 225, 226, 227, 227, 227, 227, + 228, 228, 228, 228, 229, 230, 230, 231, 232, 233, + 234, 234, 235, 235, 236, 236, 237, 237, 238, 239, + 240, 240, 241, 241, 242, 242, 243, 243, 244, 244, + 245, 245, 245, 246, 246, 246, 246, 246, 246, 246, + 246, 246, 246, 247, 248, 248, 249, 249 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -1670,28 +1677,28 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio case 3: /* IDENTIFIER */ #line 142 "bison_parser.y" /* yacc.c:1257 */ { free( (((*yyvaluep).sval)) ); } -#line 1674 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1681 "bison_parser.cpp" /* yacc.c:1257 */ break; case 4: /* STRING */ #line 142 "bison_parser.y" /* yacc.c:1257 */ { free( (((*yyvaluep).sval)) ); } -#line 1680 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1687 "bison_parser.cpp" /* yacc.c:1257 */ break; case 5: /* FLOATVAL */ #line 140 "bison_parser.y" /* yacc.c:1257 */ { } -#line 1686 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1693 "bison_parser.cpp" /* yacc.c:1257 */ break; case 6: /* INTVAL */ #line 140 "bison_parser.y" /* yacc.c:1257 */ { } -#line 1692 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1699 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 160: /* statement_list */ + case 159: /* statement_list */ #line 143 "bison_parser.y" /* yacc.c:1257 */ { if ((((*yyvaluep).stmt_vec)) != nullptr) { @@ -1701,22 +1708,22 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio } delete (((*yyvaluep).stmt_vec)); } -#line 1705 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1712 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 161: /* statement */ + case 160: /* statement */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).statement)); } -#line 1711 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1718 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 162: /* preparable_statement */ + case 161: /* preparable_statement */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).statement)); } -#line 1717 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1724 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 163: /* opt_hints */ + case 162: /* opt_hints */ #line 143 "bison_parser.y" /* yacc.c:1257 */ { if ((((*yyvaluep).expr_vec)) != nullptr) { @@ -1726,10 +1733,10 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio } delete (((*yyvaluep).expr_vec)); } -#line 1730 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1737 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 164: /* hint_list */ + case 163: /* hint_list */ #line 143 "bison_parser.y" /* yacc.c:1257 */ { if ((((*yyvaluep).expr_vec)) != nullptr) { @@ -1739,70 +1746,70 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio } delete (((*yyvaluep).expr_vec)); } -#line 1743 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1750 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 165: /* hint */ + case 164: /* hint */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 1749 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1756 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 166: /* prepare_statement */ + case 165: /* prepare_statement */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).prep_stmt)); } -#line 1755 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1762 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 167: /* prepare_target_query */ + case 166: /* prepare_target_query */ #line 142 "bison_parser.y" /* yacc.c:1257 */ { free( (((*yyvaluep).sval)) ); } -#line 1761 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1768 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 168: /* execute_statement */ + case 167: /* execute_statement */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).exec_stmt)); } -#line 1767 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1774 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 169: /* import_statement */ + case 168: /* import_statement */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).import_stmt)); } -#line 1773 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1780 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 170: /* import_file_type */ + case 169: /* import_file_type */ #line 140 "bison_parser.y" /* yacc.c:1257 */ { } -#line 1779 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1786 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 171: /* file_path */ + case 170: /* file_path */ #line 142 "bison_parser.y" /* yacc.c:1257 */ { free( (((*yyvaluep).sval)) ); } -#line 1785 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1792 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 172: /* show_statement */ + case 171: /* show_statement */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).show_stmt)); } -#line 1791 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1798 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 173: /* create_statement */ + case 172: /* create_statement */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).create_stmt)); } -#line 1797 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1804 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 174: /* opt_not_exists */ + case 173: /* opt_not_exists */ #line 140 "bison_parser.y" /* yacc.c:1257 */ { } -#line 1803 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1810 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 175: /* column_def_commalist */ + case 174: /* column_def_commalist */ #line 143 "bison_parser.y" /* yacc.c:1257 */ { if ((((*yyvaluep).column_vec)) != nullptr) { @@ -1812,52 +1819,52 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio } delete (((*yyvaluep).column_vec)); } -#line 1816 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1823 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 176: /* column_def */ + case 175: /* column_def */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).column_t)); } -#line 1822 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1829 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 177: /* column_type */ + case 176: /* column_type */ #line 140 "bison_parser.y" /* yacc.c:1257 */ { } -#line 1828 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1835 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 178: /* drop_statement */ + case 177: /* drop_statement */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).drop_stmt)); } -#line 1834 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1841 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 179: /* opt_exists */ + case 178: /* opt_exists */ #line 140 "bison_parser.y" /* yacc.c:1257 */ { } -#line 1840 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1847 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 180: /* delete_statement */ + case 179: /* delete_statement */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).delete_stmt)); } -#line 1846 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1853 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 181: /* truncate_statement */ + case 180: /* truncate_statement */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).delete_stmt)); } -#line 1852 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1859 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 182: /* insert_statement */ + case 181: /* insert_statement */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).insert_stmt)); } -#line 1858 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1865 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 183: /* opt_column_list */ + case 182: /* opt_column_list */ #line 143 "bison_parser.y" /* yacc.c:1257 */ { if ((((*yyvaluep).str_vec)) != nullptr) { @@ -1867,16 +1874,16 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio } delete (((*yyvaluep).str_vec)); } -#line 1871 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1878 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 184: /* update_statement */ + case 183: /* update_statement */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).update_stmt)); } -#line 1877 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1884 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 185: /* update_clause_commalist */ + case 184: /* update_clause_commalist */ #line 143 "bison_parser.y" /* yacc.c:1257 */ { if ((((*yyvaluep).update_vec)) != nullptr) { @@ -1886,52 +1893,52 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio } delete (((*yyvaluep).update_vec)); } -#line 1890 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1897 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 186: /* update_clause */ + case 185: /* update_clause */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).update_t)); } -#line 1896 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1903 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 187: /* select_statement */ + case 186: /* select_statement */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).select_stmt)); } -#line 1902 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1909 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 188: /* select_with_paren */ + case 187: /* select_with_paren */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).select_stmt)); } -#line 1908 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1915 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 189: /* select_paren_or_clause */ + case 188: /* select_paren_or_clause */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).select_stmt)); } -#line 1914 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1921 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 190: /* select_no_paren */ + case 189: /* select_no_paren */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).select_stmt)); } -#line 1920 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1927 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 194: /* select_clause */ + case 193: /* select_clause */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).select_stmt)); } -#line 1926 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1933 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 195: /* opt_distinct */ + case 194: /* opt_distinct */ #line 140 "bison_parser.y" /* yacc.c:1257 */ { } -#line 1932 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1939 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 196: /* select_list */ + case 195: /* select_list */ #line 143 "bison_parser.y" /* yacc.c:1257 */ { if ((((*yyvaluep).expr_vec)) != nullptr) { @@ -1941,40 +1948,40 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio } delete (((*yyvaluep).expr_vec)); } -#line 1945 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1952 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 197: /* opt_from_clause */ + case 196: /* opt_from_clause */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).table)); } -#line 1951 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1958 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 198: /* from_clause */ + case 197: /* from_clause */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).table)); } -#line 1957 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1964 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 199: /* opt_where */ + case 198: /* opt_where */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 1963 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1970 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 200: /* opt_group */ + case 199: /* opt_group */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).group_t)); } -#line 1969 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1976 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 201: /* opt_having */ + case 200: /* opt_having */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 1975 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1982 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 202: /* opt_order */ + case 201: /* opt_order */ #line 143 "bison_parser.y" /* yacc.c:1257 */ { if ((((*yyvaluep).order_vec)) != nullptr) { @@ -1984,10 +1991,10 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio } delete (((*yyvaluep).order_vec)); } -#line 1988 "bison_parser.cpp" /* yacc.c:1257 */ +#line 1995 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 203: /* order_list */ + case 202: /* order_list */ #line 143 "bison_parser.y" /* yacc.c:1257 */ { if ((((*yyvaluep).order_vec)) != nullptr) { @@ -1997,34 +2004,34 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio } delete (((*yyvaluep).order_vec)); } -#line 2001 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2008 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 204: /* order_desc */ + case 203: /* order_desc */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).order)); } -#line 2007 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2014 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 205: /* opt_order_type */ + case 204: /* opt_order_type */ #line 140 "bison_parser.y" /* yacc.c:1257 */ { } -#line 2013 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2020 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 206: /* opt_top */ + case 205: /* opt_top */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).limit)); } -#line 2019 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2026 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 207: /* opt_limit */ + case 206: /* opt_limit */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).limit)); } -#line 2025 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2032 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 208: /* expr_list */ + case 207: /* expr_list */ #line 143 "bison_parser.y" /* yacc.c:1257 */ { if ((((*yyvaluep).expr_vec)) != nullptr) { @@ -2034,10 +2041,10 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio } delete (((*yyvaluep).expr_vec)); } -#line 2038 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2045 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 209: /* literal_list */ + case 208: /* literal_list */ #line 143 "bison_parser.y" /* yacc.c:1257 */ { if ((((*yyvaluep).expr_vec)) != nullptr) { @@ -2047,178 +2054,178 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio } delete (((*yyvaluep).expr_vec)); } -#line 2051 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2058 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 210: /* expr_alias */ + case 209: /* expr_alias */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2057 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2064 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 211: /* expr */ + case 210: /* expr */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2063 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2070 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 212: /* operand */ + case 211: /* operand */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2069 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2076 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 213: /* scalar_expr */ + case 212: /* scalar_expr */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2075 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2082 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 214: /* unary_expr */ + case 213: /* unary_expr */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2081 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2088 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 215: /* binary_expr */ + case 214: /* binary_expr */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2087 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2094 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 216: /* logic_expr */ + case 215: /* logic_expr */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2093 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2100 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 217: /* in_expr */ + case 216: /* in_expr */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2099 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2106 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 218: /* case_expr */ + case 217: /* case_expr */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2105 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2112 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 219: /* case_list */ + case 218: /* case_list */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2111 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2118 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 220: /* exists_expr */ + case 219: /* exists_expr */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2117 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2124 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 221: /* comp_expr */ + case 220: /* comp_expr */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2123 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2130 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 222: /* function_expr */ + case 221: /* function_expr */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2129 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2136 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 223: /* extract_expr */ + case 222: /* extract_expr */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2135 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2142 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 224: /* datetime_field */ + case 223: /* datetime_field */ #line 140 "bison_parser.y" /* yacc.c:1257 */ { } -#line 2141 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2148 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 225: /* array_expr */ + case 224: /* array_expr */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2147 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2154 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 226: /* array_index */ + case 225: /* array_index */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2153 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2160 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 227: /* between_expr */ + case 226: /* between_expr */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2159 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2166 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 228: /* column_name */ + case 227: /* column_name */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2165 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2172 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 229: /* literal */ + case 228: /* literal */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2171 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2178 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 230: /* string_literal */ + case 229: /* string_literal */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2177 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2184 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 231: /* num_literal */ + case 230: /* num_literal */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2183 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2190 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 232: /* int_literal */ + case 231: /* int_literal */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2189 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2196 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 233: /* null_literal */ + case 232: /* null_literal */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2195 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2202 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 234: /* param_expr */ + case 233: /* param_expr */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2201 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2208 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 235: /* table_ref */ + case 234: /* table_ref */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).table)); } -#line 2207 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2214 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 236: /* table_ref_atomic */ + case 235: /* table_ref_atomic */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).table)); } -#line 2213 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2220 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 237: /* nonjoin_table_ref_atomic */ + case 236: /* nonjoin_table_ref_atomic */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).table)); } -#line 2219 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2226 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 238: /* table_ref_commalist */ + case 237: /* table_ref_commalist */ #line 143 "bison_parser.y" /* yacc.c:1257 */ { if ((((*yyvaluep).table_vec)) != nullptr) { @@ -2228,70 +2235,70 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio } delete (((*yyvaluep).table_vec)); } -#line 2232 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2239 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 239: /* table_ref_name */ + case 238: /* table_ref_name */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).table)); } -#line 2238 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2245 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 240: /* table_ref_name_no_alias */ + case 239: /* table_ref_name_no_alias */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).table)); } -#line 2244 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2251 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 241: /* table_name */ + case 240: /* table_name */ #line 141 "bison_parser.y" /* yacc.c:1257 */ { free( (((*yyvaluep).table_name).name) ); free( (((*yyvaluep).table_name).schema) ); } -#line 2250 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2257 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 242: /* table_alias */ + case 241: /* table_alias */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).alias_t)); } -#line 2256 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2263 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 243: /* opt_table_alias */ + case 242: /* opt_table_alias */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).alias_t)); } -#line 2262 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2269 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 244: /* alias */ + case 243: /* alias */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).alias_t)); } -#line 2268 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2275 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 245: /* opt_alias */ + case 244: /* opt_alias */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).alias_t)); } -#line 2274 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2281 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 246: /* join_clause */ + case 245: /* join_clause */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).table)); } -#line 2280 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2287 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 247: /* opt_join_type */ + case 246: /* opt_join_type */ #line 140 "bison_parser.y" /* yacc.c:1257 */ { } -#line 2286 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2293 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 248: /* join_condition */ + case 247: /* join_condition */ #line 151 "bison_parser.y" /* yacc.c:1257 */ { delete (((*yyvaluep).expr)); } -#line 2292 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2299 "bison_parser.cpp" /* yacc.c:1257 */ break; - case 250: /* ident_commalist */ + case 249: /* ident_commalist */ #line 143 "bison_parser.y" /* yacc.c:1257 */ { if ((((*yyvaluep).str_vec)) != nullptr) { @@ -2301,7 +2308,7 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio } delete (((*yyvaluep).str_vec)); } -#line 2305 "bison_parser.cpp" /* yacc.c:1257 */ +#line 2312 "bison_parser.cpp" /* yacc.c:1257 */ break; @@ -2420,7 +2427,7 @@ YYLTYPE yylloc = yyloc_default; yylloc.string_length = 0; } -#line 2424 "bison_parser.cpp" /* yacc.c:1429 */ +#line 2431 "bison_parser.cpp" /* yacc.c:1429 */ yylsp[0] = yylloc; goto yysetstate; @@ -2625,7 +2632,7 @@ yyreduce: } delete (yyvsp[-1].stmt_vec); } -#line 2629 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2636 "bison_parser.cpp" /* yacc.c:1646 */ break; case 3: @@ -2636,7 +2643,7 @@ yyreduce: (yyval.stmt_vec) = new std::vector(); (yyval.stmt_vec)->push_back((yyvsp[0].statement)); } -#line 2640 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2647 "bison_parser.cpp" /* yacc.c:1646 */ break; case 4: @@ -2647,7 +2654,7 @@ yyreduce: (yyvsp[-2].stmt_vec)->push_back((yyvsp[0].statement)); (yyval.stmt_vec) = (yyvsp[-2].stmt_vec); } -#line 2651 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2658 "bison_parser.cpp" /* yacc.c:1646 */ break; case 5: @@ -2656,7 +2663,7 @@ yyreduce: (yyval.statement) = (yyvsp[-1].prep_stmt); (yyval.statement)->hints = (yyvsp[0].expr_vec); } -#line 2660 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2667 "bison_parser.cpp" /* yacc.c:1646 */ break; case 6: @@ -2665,7 +2672,7 @@ yyreduce: (yyval.statement) = (yyvsp[-1].statement); (yyval.statement)->hints = (yyvsp[0].expr_vec); } -#line 2669 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2676 "bison_parser.cpp" /* yacc.c:1646 */ break; case 7: @@ -2673,85 +2680,85 @@ yyreduce: { (yyval.statement) = (yyvsp[0].show_stmt); } -#line 2677 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2684 "bison_parser.cpp" /* yacc.c:1646 */ break; case 8: #line 302 "bison_parser.y" /* yacc.c:1646 */ { (yyval.statement) = (yyvsp[0].select_stmt); } -#line 2683 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2690 "bison_parser.cpp" /* yacc.c:1646 */ break; case 9: #line 303 "bison_parser.y" /* yacc.c:1646 */ { (yyval.statement) = (yyvsp[0].import_stmt); } -#line 2689 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2696 "bison_parser.cpp" /* yacc.c:1646 */ break; case 10: #line 304 "bison_parser.y" /* yacc.c:1646 */ { (yyval.statement) = (yyvsp[0].create_stmt); } -#line 2695 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2702 "bison_parser.cpp" /* yacc.c:1646 */ break; case 11: #line 305 "bison_parser.y" /* yacc.c:1646 */ { (yyval.statement) = (yyvsp[0].insert_stmt); } -#line 2701 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2708 "bison_parser.cpp" /* yacc.c:1646 */ break; case 12: #line 306 "bison_parser.y" /* yacc.c:1646 */ { (yyval.statement) = (yyvsp[0].delete_stmt); } -#line 2707 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2714 "bison_parser.cpp" /* yacc.c:1646 */ break; case 13: #line 307 "bison_parser.y" /* yacc.c:1646 */ { (yyval.statement) = (yyvsp[0].delete_stmt); } -#line 2713 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2720 "bison_parser.cpp" /* yacc.c:1646 */ break; case 14: #line 308 "bison_parser.y" /* yacc.c:1646 */ { (yyval.statement) = (yyvsp[0].update_stmt); } -#line 2719 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2726 "bison_parser.cpp" /* yacc.c:1646 */ break; case 15: #line 309 "bison_parser.y" /* yacc.c:1646 */ { (yyval.statement) = (yyvsp[0].drop_stmt); } -#line 2725 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2732 "bison_parser.cpp" /* yacc.c:1646 */ break; case 16: #line 310 "bison_parser.y" /* yacc.c:1646 */ { (yyval.statement) = (yyvsp[0].exec_stmt); } -#line 2731 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2738 "bison_parser.cpp" /* yacc.c:1646 */ break; case 17: #line 319 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr_vec) = (yyvsp[-1].expr_vec); } -#line 2737 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2744 "bison_parser.cpp" /* yacc.c:1646 */ break; case 18: #line 320 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr_vec) = nullptr; } -#line 2743 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2750 "bison_parser.cpp" /* yacc.c:1646 */ break; case 19: #line 325 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr_vec) = new std::vector(); (yyval.expr_vec)->push_back((yyvsp[0].expr)); } -#line 2749 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2756 "bison_parser.cpp" /* yacc.c:1646 */ break; case 20: #line 326 "bison_parser.y" /* yacc.c:1646 */ { (yyvsp[-2].expr_vec)->push_back((yyvsp[0].expr)); (yyval.expr_vec) = (yyvsp[-2].expr_vec); } -#line 2755 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2762 "bison_parser.cpp" /* yacc.c:1646 */ break; case 21: @@ -2760,7 +2767,7 @@ yyreduce: (yyval.expr) = Expr::make(kExprHint); (yyval.expr)->name = (yyvsp[0].sval); } -#line 2764 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2771 "bison_parser.cpp" /* yacc.c:1646 */ break; case 22: @@ -2770,7 +2777,7 @@ yyreduce: (yyval.expr)->name = (yyvsp[-3].sval); (yyval.expr)->exprList = (yyvsp[-1].expr_vec); } -#line 2774 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2781 "bison_parser.cpp" /* yacc.c:1646 */ break; case 23: @@ -2780,7 +2787,7 @@ yyreduce: (yyval.prep_stmt)->name = (yyvsp[-2].sval); (yyval.prep_stmt)->query = (yyvsp[0].sval); } -#line 2784 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2791 "bison_parser.cpp" /* yacc.c:1646 */ break; case 25: @@ -2789,7 +2796,7 @@ yyreduce: (yyval.exec_stmt) = new ExecuteStatement(); (yyval.exec_stmt)->name = (yyvsp[0].sval); } -#line 2793 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2800 "bison_parser.cpp" /* yacc.c:1646 */ break; case 26: @@ -2799,7 +2806,7 @@ yyreduce: (yyval.exec_stmt)->name = (yyvsp[-3].sval); (yyval.exec_stmt)->parameters = (yyvsp[-1].expr_vec); } -#line 2803 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2810 "bison_parser.cpp" /* yacc.c:1646 */ break; case 27: @@ -2810,19 +2817,19 @@ yyreduce: (yyval.import_stmt)->schema = (yyvsp[0].table_name).schema; (yyval.import_stmt)->tableName = (yyvsp[0].table_name).name; } -#line 2814 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2821 "bison_parser.cpp" /* yacc.c:1646 */ break; case 28: #line 381 "bison_parser.y" /* yacc.c:1646 */ { (yyval.uval) = kImportCSV; } -#line 2820 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2827 "bison_parser.cpp" /* yacc.c:1646 */ break; case 29: #line 385 "bison_parser.y" /* yacc.c:1646 */ { (yyval.sval) = strdup((yyvsp[0].expr)->name); delete (yyvsp[0].expr); } -#line 2826 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2833 "bison_parser.cpp" /* yacc.c:1646 */ break; case 30: @@ -2830,7 +2837,7 @@ yyreduce: { (yyval.show_stmt) = new ShowStatement(kShowTables); } -#line 2834 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2841 "bison_parser.cpp" /* yacc.c:1646 */ break; case 31: @@ -2840,7 +2847,7 @@ yyreduce: (yyval.show_stmt)->schema = (yyvsp[0].table_name).schema; (yyval.show_stmt)->name = (yyvsp[0].table_name).name; } -#line 2844 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2851 "bison_parser.cpp" /* yacc.c:1646 */ break; case 32: @@ -2852,7 +2859,7 @@ yyreduce: (yyval.create_stmt)->tableName = (yyvsp[-4].table_name).name; (yyval.create_stmt)->filePath = (yyvsp[0].sval); } -#line 2856 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2863 "bison_parser.cpp" /* yacc.c:1646 */ break; case 33: @@ -2864,7 +2871,7 @@ yyreduce: (yyval.create_stmt)->tableName = (yyvsp[-3].table_name).name; (yyval.create_stmt)->columns = (yyvsp[-1].column_vec); } -#line 2868 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2875 "bison_parser.cpp" /* yacc.c:1646 */ break; case 34: @@ -2877,31 +2884,31 @@ yyreduce: (yyval.create_stmt)->viewColumns = (yyvsp[-2].str_vec); (yyval.create_stmt)->select = (yyvsp[0].select_stmt); } -#line 2881 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2888 "bison_parser.cpp" /* yacc.c:1646 */ break; case 35: #line 437 "bison_parser.y" /* yacc.c:1646 */ { (yyval.bval) = true; } -#line 2887 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2894 "bison_parser.cpp" /* yacc.c:1646 */ break; case 36: #line 438 "bison_parser.y" /* yacc.c:1646 */ { (yyval.bval) = false; } -#line 2893 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2900 "bison_parser.cpp" /* yacc.c:1646 */ break; case 37: #line 442 "bison_parser.y" /* yacc.c:1646 */ { (yyval.column_vec) = new std::vector(); (yyval.column_vec)->push_back((yyvsp[0].column_t)); } -#line 2899 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2906 "bison_parser.cpp" /* yacc.c:1646 */ break; case 38: #line 443 "bison_parser.y" /* yacc.c:1646 */ { (yyvsp[-2].column_vec)->push_back((yyvsp[0].column_t)); (yyval.column_vec) = (yyvsp[-2].column_vec); } -#line 2905 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2912 "bison_parser.cpp" /* yacc.c:1646 */ break; case 39: @@ -2909,31 +2916,31 @@ yyreduce: { (yyval.column_t) = new ColumnDefinition((yyvsp[-1].sval), (ColumnDefinition::DataType) (yyvsp[0].uval)); } -#line 2913 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2920 "bison_parser.cpp" /* yacc.c:1646 */ break; case 40: #line 454 "bison_parser.y" /* yacc.c:1646 */ { (yyval.uval) = ColumnDefinition::INT; } -#line 2919 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2926 "bison_parser.cpp" /* yacc.c:1646 */ break; case 41: #line 455 "bison_parser.y" /* yacc.c:1646 */ { (yyval.uval) = ColumnDefinition::INT; } -#line 2925 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2932 "bison_parser.cpp" /* yacc.c:1646 */ break; case 42: #line 456 "bison_parser.y" /* yacc.c:1646 */ { (yyval.uval) = ColumnDefinition::DOUBLE; } -#line 2931 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2938 "bison_parser.cpp" /* yacc.c:1646 */ break; case 43: #line 457 "bison_parser.y" /* yacc.c:1646 */ { (yyval.uval) = ColumnDefinition::TEXT; } -#line 2937 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2944 "bison_parser.cpp" /* yacc.c:1646 */ break; case 44: @@ -2944,7 +2951,7 @@ yyreduce: (yyval.drop_stmt)->schema = (yyvsp[0].table_name).schema; (yyval.drop_stmt)->name = (yyvsp[0].table_name).name; } -#line 2948 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2955 "bison_parser.cpp" /* yacc.c:1646 */ break; case 45: @@ -2955,7 +2962,7 @@ yyreduce: (yyval.drop_stmt)->schema = (yyvsp[0].table_name).schema; (yyval.drop_stmt)->name = (yyvsp[0].table_name).name; } -#line 2959 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2966 "bison_parser.cpp" /* yacc.c:1646 */ break; case 46: @@ -2965,19 +2972,19 @@ yyreduce: (yyval.drop_stmt)->ifExists = false; (yyval.drop_stmt)->name = (yyvsp[0].sval); } -#line 2969 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2976 "bison_parser.cpp" /* yacc.c:1646 */ break; case 47: #line 487 "bison_parser.y" /* yacc.c:1646 */ { (yyval.bval) = true; } -#line 2975 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2982 "bison_parser.cpp" /* yacc.c:1646 */ break; case 48: #line 488 "bison_parser.y" /* yacc.c:1646 */ { (yyval.bval) = false; } -#line 2981 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2988 "bison_parser.cpp" /* yacc.c:1646 */ break; case 49: @@ -2988,7 +2995,7 @@ yyreduce: (yyval.delete_stmt)->tableName = (yyvsp[-1].table_name).name; (yyval.delete_stmt)->expr = (yyvsp[0].expr); } -#line 2992 "bison_parser.cpp" /* yacc.c:1646 */ +#line 2999 "bison_parser.cpp" /* yacc.c:1646 */ break; case 50: @@ -2998,7 +3005,7 @@ yyreduce: (yyval.delete_stmt)->schema = (yyvsp[0].table_name).schema; (yyval.delete_stmt)->tableName = (yyvsp[0].table_name).name; } -#line 3002 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3009 "bison_parser.cpp" /* yacc.c:1646 */ break; case 51: @@ -3010,7 +3017,7 @@ yyreduce: (yyval.insert_stmt)->columns = (yyvsp[-4].str_vec); (yyval.insert_stmt)->values = (yyvsp[-1].expr_vec); } -#line 3014 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3021 "bison_parser.cpp" /* yacc.c:1646 */ break; case 52: @@ -3022,19 +3029,19 @@ yyreduce: (yyval.insert_stmt)->columns = (yyvsp[-1].str_vec); (yyval.insert_stmt)->select = (yyvsp[0].select_stmt); } -#line 3026 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3033 "bison_parser.cpp" /* yacc.c:1646 */ break; case 53: #line 537 "bison_parser.y" /* yacc.c:1646 */ { (yyval.str_vec) = (yyvsp[-1].str_vec); } -#line 3032 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3039 "bison_parser.cpp" /* yacc.c:1646 */ break; case 54: #line 538 "bison_parser.y" /* yacc.c:1646 */ { (yyval.str_vec) = nullptr; } -#line 3038 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3045 "bison_parser.cpp" /* yacc.c:1646 */ break; case 55: @@ -3045,19 +3052,19 @@ yyreduce: (yyval.update_stmt)->updates = (yyvsp[-1].update_vec); (yyval.update_stmt)->where = (yyvsp[0].expr); } -#line 3049 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3056 "bison_parser.cpp" /* yacc.c:1646 */ break; case 56: #line 557 "bison_parser.y" /* yacc.c:1646 */ { (yyval.update_vec) = new std::vector(); (yyval.update_vec)->push_back((yyvsp[0].update_t)); } -#line 3055 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3062 "bison_parser.cpp" /* yacc.c:1646 */ break; case 57: #line 558 "bison_parser.y" /* yacc.c:1646 */ { (yyvsp[-2].update_vec)->push_back((yyvsp[0].update_t)); (yyval.update_vec) = (yyvsp[-2].update_vec); } -#line 3061 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3068 "bison_parser.cpp" /* yacc.c:1646 */ break; case 58: @@ -3067,7 +3074,7 @@ yyreduce: (yyval.update_t)->column = (yyvsp[-2].sval); (yyval.update_t)->value = (yyvsp[0].expr); } -#line 3071 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3078 "bison_parser.cpp" /* yacc.c:1646 */ break; case 61: @@ -3086,19 +3093,19 @@ yyreduce: (yyval.select_stmt)->limit = (yyvsp[0].limit); } } -#line 3090 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3097 "bison_parser.cpp" /* yacc.c:1646 */ break; case 62: #line 593 "bison_parser.y" /* yacc.c:1646 */ { (yyval.select_stmt) = (yyvsp[-1].select_stmt); } -#line 3096 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3103 "bison_parser.cpp" /* yacc.c:1646 */ break; case 63: #line 594 "bison_parser.y" /* yacc.c:1646 */ { (yyval.select_stmt) = (yyvsp[-1].select_stmt); } -#line 3102 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3109 "bison_parser.cpp" /* yacc.c:1646 */ break; case 66: @@ -3113,7 +3120,7 @@ yyreduce: (yyval.select_stmt)->limit = (yyvsp[0].limit); } } -#line 3117 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3124 "bison_parser.cpp" /* yacc.c:1646 */ break; case 67: @@ -3132,7 +3139,7 @@ yyreduce: (yyval.select_stmt)->limit = (yyvsp[0].limit); } } -#line 3136 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3143 "bison_parser.cpp" /* yacc.c:1646 */ break; case 74: @@ -3146,49 +3153,49 @@ yyreduce: (yyval.select_stmt)->whereClause = (yyvsp[-1].expr); (yyval.select_stmt)->groupBy = (yyvsp[0].group_t); } -#line 3150 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3157 "bison_parser.cpp" /* yacc.c:1646 */ break; case 75: #line 657 "bison_parser.y" /* yacc.c:1646 */ { (yyval.bval) = true; } -#line 3156 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3163 "bison_parser.cpp" /* yacc.c:1646 */ break; case 76: #line 658 "bison_parser.y" /* yacc.c:1646 */ { (yyval.bval) = false; } -#line 3162 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3169 "bison_parser.cpp" /* yacc.c:1646 */ break; case 78: #line 666 "bison_parser.y" /* yacc.c:1646 */ { (yyval.table) = (yyvsp[0].table); } -#line 3168 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3175 "bison_parser.cpp" /* yacc.c:1646 */ break; case 79: #line 667 "bison_parser.y" /* yacc.c:1646 */ { (yyval.table) = nullptr; } -#line 3174 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3181 "bison_parser.cpp" /* yacc.c:1646 */ break; case 80: #line 670 "bison_parser.y" /* yacc.c:1646 */ { (yyval.table) = (yyvsp[0].table); } -#line 3180 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3187 "bison_parser.cpp" /* yacc.c:1646 */ break; case 81: #line 675 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = (yyvsp[0].expr); } -#line 3186 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3193 "bison_parser.cpp" /* yacc.c:1646 */ break; case 82: #line 676 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = nullptr; } -#line 3192 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3199 "bison_parser.cpp" /* yacc.c:1646 */ break; case 83: @@ -3198,157 +3205,157 @@ yyreduce: (yyval.group_t)->columns = (yyvsp[-1].expr_vec); (yyval.group_t)->having = (yyvsp[0].expr); } -#line 3202 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3209 "bison_parser.cpp" /* yacc.c:1646 */ break; case 84: #line 685 "bison_parser.y" /* yacc.c:1646 */ { (yyval.group_t) = nullptr; } -#line 3208 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3215 "bison_parser.cpp" /* yacc.c:1646 */ break; case 85: #line 689 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = (yyvsp[0].expr); } -#line 3214 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3221 "bison_parser.cpp" /* yacc.c:1646 */ break; case 86: #line 690 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = nullptr; } -#line 3220 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3227 "bison_parser.cpp" /* yacc.c:1646 */ break; case 87: #line 693 "bison_parser.y" /* yacc.c:1646 */ { (yyval.order_vec) = (yyvsp[0].order_vec); } -#line 3226 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3233 "bison_parser.cpp" /* yacc.c:1646 */ break; case 88: #line 694 "bison_parser.y" /* yacc.c:1646 */ { (yyval.order_vec) = nullptr; } -#line 3232 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3239 "bison_parser.cpp" /* yacc.c:1646 */ break; case 89: #line 698 "bison_parser.y" /* yacc.c:1646 */ { (yyval.order_vec) = new std::vector(); (yyval.order_vec)->push_back((yyvsp[0].order)); } -#line 3238 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3245 "bison_parser.cpp" /* yacc.c:1646 */ break; case 90: #line 699 "bison_parser.y" /* yacc.c:1646 */ { (yyvsp[-2].order_vec)->push_back((yyvsp[0].order)); (yyval.order_vec) = (yyvsp[-2].order_vec); } -#line 3244 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3251 "bison_parser.cpp" /* yacc.c:1646 */ break; case 91: #line 703 "bison_parser.y" /* yacc.c:1646 */ { (yyval.order) = new OrderDescription((yyvsp[0].order_type), (yyvsp[-1].expr)); } -#line 3250 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3257 "bison_parser.cpp" /* yacc.c:1646 */ break; case 92: #line 707 "bison_parser.y" /* yacc.c:1646 */ { (yyval.order_type) = kOrderAsc; } -#line 3256 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3263 "bison_parser.cpp" /* yacc.c:1646 */ break; case 93: #line 708 "bison_parser.y" /* yacc.c:1646 */ { (yyval.order_type) = kOrderDesc; } -#line 3262 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3269 "bison_parser.cpp" /* yacc.c:1646 */ break; case 94: #line 709 "bison_parser.y" /* yacc.c:1646 */ { (yyval.order_type) = kOrderAsc; } -#line 3268 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3275 "bison_parser.cpp" /* yacc.c:1646 */ break; case 95: #line 715 "bison_parser.y" /* yacc.c:1646 */ { (yyval.limit) = new LimitDescription((yyvsp[0].expr)->ival, kNoOffset); delete (yyvsp[0].expr); } -#line 3274 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3281 "bison_parser.cpp" /* yacc.c:1646 */ break; case 96: #line 716 "bison_parser.y" /* yacc.c:1646 */ { (yyval.limit) = nullptr; } -#line 3280 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3287 "bison_parser.cpp" /* yacc.c:1646 */ break; case 97: #line 720 "bison_parser.y" /* yacc.c:1646 */ { (yyval.limit) = new LimitDescription((yyvsp[0].expr)->ival, kNoOffset); delete (yyvsp[0].expr); } -#line 3286 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3293 "bison_parser.cpp" /* yacc.c:1646 */ break; case 98: #line 721 "bison_parser.y" /* yacc.c:1646 */ { (yyval.limit) = new LimitDescription((yyvsp[-2].expr)->ival, (yyvsp[0].expr)->ival); delete (yyvsp[-2].expr); delete (yyvsp[0].expr); } -#line 3292 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3299 "bison_parser.cpp" /* yacc.c:1646 */ break; case 99: #line 722 "bison_parser.y" /* yacc.c:1646 */ { (yyval.limit) = new LimitDescription(kNoLimit, (yyvsp[0].expr)->ival); delete (yyvsp[0].expr); } -#line 3298 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3305 "bison_parser.cpp" /* yacc.c:1646 */ break; case 100: #line 723 "bison_parser.y" /* yacc.c:1646 */ { (yyval.limit) = nullptr; } -#line 3304 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3311 "bison_parser.cpp" /* yacc.c:1646 */ break; case 101: #line 724 "bison_parser.y" /* yacc.c:1646 */ { (yyval.limit) = nullptr; } -#line 3310 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3317 "bison_parser.cpp" /* yacc.c:1646 */ break; case 102: #line 725 "bison_parser.y" /* yacc.c:1646 */ { (yyval.limit) = new LimitDescription(kNoLimit, (yyvsp[0].expr)->ival); delete (yyvsp[0].expr); } -#line 3316 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3323 "bison_parser.cpp" /* yacc.c:1646 */ break; case 103: #line 726 "bison_parser.y" /* yacc.c:1646 */ { (yyval.limit) = new LimitDescription(kNoLimit, (yyvsp[0].expr)->ival); delete (yyvsp[0].expr); } -#line 3322 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3329 "bison_parser.cpp" /* yacc.c:1646 */ break; case 104: #line 727 "bison_parser.y" /* yacc.c:1646 */ { (yyval.limit) = nullptr; } -#line 3328 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3335 "bison_parser.cpp" /* yacc.c:1646 */ break; case 105: #line 734 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr_vec) = new std::vector(); (yyval.expr_vec)->push_back((yyvsp[0].expr)); } -#line 3334 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3341 "bison_parser.cpp" /* yacc.c:1646 */ break; case 106: #line 735 "bison_parser.y" /* yacc.c:1646 */ { (yyvsp[-2].expr_vec)->push_back((yyvsp[0].expr)); (yyval.expr_vec) = (yyvsp[-2].expr_vec); } -#line 3340 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3347 "bison_parser.cpp" /* yacc.c:1646 */ break; case 107: #line 739 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr_vec) = new std::vector(); (yyval.expr_vec)->push_back((yyvsp[0].expr)); } -#line 3346 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3353 "bison_parser.cpp" /* yacc.c:1646 */ break; case 108: #line 740 "bison_parser.y" /* yacc.c:1646 */ { (yyvsp[-2].expr_vec)->push_back((yyvsp[0].expr)); (yyval.expr_vec) = (yyvsp[-2].expr_vec); } -#line 3352 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3359 "bison_parser.cpp" /* yacc.c:1646 */ break; case 109: @@ -3360,355 +3367,355 @@ yyreduce: delete (yyvsp[0].alias_t); } } -#line 3364 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3371 "bison_parser.cpp" /* yacc.c:1646 */ break; case 115: #line 762 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = (yyvsp[-1].expr); } -#line 3370 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3377 "bison_parser.cpp" /* yacc.c:1646 */ break; case 124: #line 771 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeSelect((yyvsp[-1].select_stmt)); } -#line 3376 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3383 "bison_parser.cpp" /* yacc.c:1646 */ break; case 127: #line 780 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpUnary(kOpUnaryMinus, (yyvsp[0].expr)); } -#line 3382 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3389 "bison_parser.cpp" /* yacc.c:1646 */ break; case 128: #line 781 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpUnary(kOpNot, (yyvsp[0].expr)); } -#line 3388 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3395 "bison_parser.cpp" /* yacc.c:1646 */ break; case 129: #line 782 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpUnary(kOpIsNull, (yyvsp[-1].expr)); } -#line 3394 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3401 "bison_parser.cpp" /* yacc.c:1646 */ break; case 130: #line 783 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpUnary(kOpIsNull, (yyvsp[-2].expr)); } -#line 3400 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3407 "bison_parser.cpp" /* yacc.c:1646 */ break; case 131: #line 784 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpUnary(kOpNot, Expr::makeOpUnary(kOpIsNull, (yyvsp[-3].expr))); } -#line 3406 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3413 "bison_parser.cpp" /* yacc.c:1646 */ break; case 133: #line 789 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpMinus, (yyvsp[0].expr)); } -#line 3412 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3419 "bison_parser.cpp" /* yacc.c:1646 */ break; case 134: #line 790 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpPlus, (yyvsp[0].expr)); } -#line 3418 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3425 "bison_parser.cpp" /* yacc.c:1646 */ break; case 135: #line 791 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpSlash, (yyvsp[0].expr)); } -#line 3424 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3431 "bison_parser.cpp" /* yacc.c:1646 */ break; case 136: #line 792 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpAsterisk, (yyvsp[0].expr)); } -#line 3430 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3437 "bison_parser.cpp" /* yacc.c:1646 */ break; case 137: #line 793 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpPercentage, (yyvsp[0].expr)); } -#line 3436 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3443 "bison_parser.cpp" /* yacc.c:1646 */ break; case 138: #line 794 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpCaret, (yyvsp[0].expr)); } -#line 3442 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3449 "bison_parser.cpp" /* yacc.c:1646 */ break; case 139: #line 795 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpLike, (yyvsp[0].expr)); } -#line 3448 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3455 "bison_parser.cpp" /* yacc.c:1646 */ break; case 140: #line 796 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-3].expr), kOpNotLike, (yyvsp[0].expr)); } -#line 3454 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3461 "bison_parser.cpp" /* yacc.c:1646 */ break; case 141: #line 797 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpILike, (yyvsp[0].expr)); } -#line 3460 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3467 "bison_parser.cpp" /* yacc.c:1646 */ break; case 142: #line 798 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpConcat, (yyvsp[0].expr)); } -#line 3466 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3473 "bison_parser.cpp" /* yacc.c:1646 */ break; case 143: #line 802 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpAnd, (yyvsp[0].expr)); } -#line 3472 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3479 "bison_parser.cpp" /* yacc.c:1646 */ break; case 144: #line 803 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpOr, (yyvsp[0].expr)); } -#line 3478 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3485 "bison_parser.cpp" /* yacc.c:1646 */ break; case 145: #line 807 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeInOperator((yyvsp[-4].expr), (yyvsp[-1].expr_vec)); } -#line 3484 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3491 "bison_parser.cpp" /* yacc.c:1646 */ break; case 146: #line 808 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpUnary(kOpNot, Expr::makeInOperator((yyvsp[-5].expr), (yyvsp[-1].expr_vec))); } -#line 3490 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3497 "bison_parser.cpp" /* yacc.c:1646 */ break; case 147: #line 809 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeInOperator((yyvsp[-4].expr), (yyvsp[-1].select_stmt)); } -#line 3496 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3503 "bison_parser.cpp" /* yacc.c:1646 */ break; case 148: #line 810 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpUnary(kOpNot, Expr::makeInOperator((yyvsp[-5].expr), (yyvsp[-1].select_stmt))); } -#line 3502 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3509 "bison_parser.cpp" /* yacc.c:1646 */ break; case 149: #line 816 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeCase((yyvsp[-2].expr), (yyvsp[-1].expr), nullptr); } -#line 3508 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3515 "bison_parser.cpp" /* yacc.c:1646 */ break; case 150: #line 817 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeCase((yyvsp[-4].expr), (yyvsp[-3].expr), (yyvsp[-1].expr)); } -#line 3514 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3521 "bison_parser.cpp" /* yacc.c:1646 */ break; case 151: #line 818 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeCase(nullptr, (yyvsp[-1].expr), nullptr); } -#line 3520 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3527 "bison_parser.cpp" /* yacc.c:1646 */ break; case 152: #line 819 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeCase(nullptr, (yyvsp[-3].expr), (yyvsp[-1].expr)); } -#line 3526 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3533 "bison_parser.cpp" /* yacc.c:1646 */ break; case 153: #line 823 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeCaseList(Expr::makeCaseListElement((yyvsp[-2].expr), (yyvsp[0].expr))); } -#line 3532 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3539 "bison_parser.cpp" /* yacc.c:1646 */ break; case 154: #line 824 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::caseListAppend((yyvsp[-4].expr), Expr::makeCaseListElement((yyvsp[-2].expr), (yyvsp[0].expr))); } -#line 3538 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3545 "bison_parser.cpp" /* yacc.c:1646 */ break; case 155: #line 828 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeExists((yyvsp[-1].select_stmt)); } -#line 3544 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3551 "bison_parser.cpp" /* yacc.c:1646 */ break; case 156: #line 829 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpUnary(kOpNot, Expr::makeExists((yyvsp[-1].select_stmt))); } -#line 3550 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3557 "bison_parser.cpp" /* yacc.c:1646 */ break; case 157: #line 833 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpEquals, (yyvsp[0].expr)); } -#line 3556 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3563 "bison_parser.cpp" /* yacc.c:1646 */ break; case 158: #line 834 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpEquals, (yyvsp[0].expr)); } -#line 3562 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3569 "bison_parser.cpp" /* yacc.c:1646 */ break; case 159: #line 835 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpNotEquals, (yyvsp[0].expr)); } -#line 3568 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3575 "bison_parser.cpp" /* yacc.c:1646 */ break; case 160: #line 836 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpLess, (yyvsp[0].expr)); } -#line 3574 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3581 "bison_parser.cpp" /* yacc.c:1646 */ break; case 161: #line 837 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpGreater, (yyvsp[0].expr)); } -#line 3580 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3587 "bison_parser.cpp" /* yacc.c:1646 */ break; case 162: #line 838 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpLessEq, (yyvsp[0].expr)); } -#line 3586 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3593 "bison_parser.cpp" /* yacc.c:1646 */ break; case 163: #line 839 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeOpBinary((yyvsp[-2].expr), kOpGreaterEq, (yyvsp[0].expr)); } -#line 3592 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3599 "bison_parser.cpp" /* yacc.c:1646 */ break; case 164: #line 843 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeFunctionRef((yyvsp[-2].sval), new std::vector(), false); } -#line 3598 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3605 "bison_parser.cpp" /* yacc.c:1646 */ break; case 165: #line 844 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeFunctionRef((yyvsp[-4].sval), (yyvsp[-1].expr_vec), (yyvsp[-2].bval)); } -#line 3604 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3611 "bison_parser.cpp" /* yacc.c:1646 */ break; case 166: #line 848 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeExtract((yyvsp[-3].datetime_field), (yyvsp[-1].expr)); } -#line 3610 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3617 "bison_parser.cpp" /* yacc.c:1646 */ break; case 167: #line 852 "bison_parser.y" /* yacc.c:1646 */ { (yyval.datetime_field) = kDatetimeSecond; } -#line 3616 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3623 "bison_parser.cpp" /* yacc.c:1646 */ break; case 168: #line 853 "bison_parser.y" /* yacc.c:1646 */ { (yyval.datetime_field) = kDatetimeMinute; } -#line 3622 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3629 "bison_parser.cpp" /* yacc.c:1646 */ break; case 169: #line 854 "bison_parser.y" /* yacc.c:1646 */ { (yyval.datetime_field) = kDatetimeHour; } -#line 3628 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3635 "bison_parser.cpp" /* yacc.c:1646 */ break; case 170: #line 855 "bison_parser.y" /* yacc.c:1646 */ { (yyval.datetime_field) = kDatetimeDay; } -#line 3634 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3641 "bison_parser.cpp" /* yacc.c:1646 */ break; case 171: #line 856 "bison_parser.y" /* yacc.c:1646 */ { (yyval.datetime_field) = kDatetimeMonth; } -#line 3640 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3647 "bison_parser.cpp" /* yacc.c:1646 */ break; case 172: #line 857 "bison_parser.y" /* yacc.c:1646 */ { (yyval.datetime_field) = kDatetimeYear; } -#line 3646 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3653 "bison_parser.cpp" /* yacc.c:1646 */ break; case 173: #line 860 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeArray((yyvsp[-1].expr_vec)); } -#line 3652 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3659 "bison_parser.cpp" /* yacc.c:1646 */ break; case 174: #line 864 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeArrayIndex((yyvsp[-3].expr), (yyvsp[-1].expr)->ival); } -#line 3658 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3665 "bison_parser.cpp" /* yacc.c:1646 */ break; case 175: #line 868 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeBetween((yyvsp[-4].expr), (yyvsp[-2].expr), (yyvsp[0].expr)); } -#line 3664 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3671 "bison_parser.cpp" /* yacc.c:1646 */ break; case 176: #line 872 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeColumnRef((yyvsp[0].sval)); } -#line 3670 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3677 "bison_parser.cpp" /* yacc.c:1646 */ break; case 177: #line 873 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeColumnRef((yyvsp[-2].sval), (yyvsp[0].sval)); } -#line 3676 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3683 "bison_parser.cpp" /* yacc.c:1646 */ break; case 178: #line 874 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeStar(); } -#line 3682 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3689 "bison_parser.cpp" /* yacc.c:1646 */ break; case 179: #line 875 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeStar((yyvsp[-2].sval)); } -#line 3688 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3695 "bison_parser.cpp" /* yacc.c:1646 */ break; case 184: #line 886 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeLiteral((yyvsp[0].sval)); } -#line 3694 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3701 "bison_parser.cpp" /* yacc.c:1646 */ break; case 185: #line 891 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeLiteral((yyvsp[0].fval)); } -#line 3700 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3707 "bison_parser.cpp" /* yacc.c:1646 */ break; case 187: #line 896 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeLiteral((yyvsp[0].ival)); } -#line 3706 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3713 "bison_parser.cpp" /* yacc.c:1646 */ break; case 188: #line 900 "bison_parser.y" /* yacc.c:1646 */ { (yyval.expr) = Expr::makeNullLiteral(); } -#line 3712 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3719 "bison_parser.cpp" /* yacc.c:1646 */ break; case 189: @@ -3718,7 +3725,7 @@ yyreduce: (yyval.expr)->ival2 = yyloc.param_list.size(); yyloc.param_list.push_back((yyval.expr)); } -#line 3722 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3729 "bison_parser.cpp" /* yacc.c:1646 */ break; case 191: @@ -3729,7 +3736,7 @@ yyreduce: tbl->list = (yyvsp[-2].table_vec); (yyval.table) = tbl; } -#line 3733 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3740 "bison_parser.cpp" /* yacc.c:1646 */ break; case 195: @@ -3740,19 +3747,19 @@ yyreduce: tbl->alias = (yyvsp[0].alias_t); (yyval.table) = tbl; } -#line 3744 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3751 "bison_parser.cpp" /* yacc.c:1646 */ break; case 196: #line 942 "bison_parser.y" /* yacc.c:1646 */ { (yyval.table_vec) = new std::vector(); (yyval.table_vec)->push_back((yyvsp[0].table)); } -#line 3750 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3757 "bison_parser.cpp" /* yacc.c:1646 */ break; case 197: #line 943 "bison_parser.y" /* yacc.c:1646 */ { (yyvsp[-2].table_vec)->push_back((yyvsp[0].table)); (yyval.table_vec) = (yyvsp[-2].table_vec); } -#line 3756 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3763 "bison_parser.cpp" /* yacc.c:1646 */ break; case 198: @@ -3764,7 +3771,7 @@ yyreduce: tbl->alias = (yyvsp[0].alias_t); (yyval.table) = tbl; } -#line 3768 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3775 "bison_parser.cpp" /* yacc.c:1646 */ break; case 199: @@ -3774,49 +3781,49 @@ yyreduce: (yyval.table)->schema = (yyvsp[0].table_name).schema; (yyval.table)->name = (yyvsp[0].table_name).name; } -#line 3778 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3785 "bison_parser.cpp" /* yacc.c:1646 */ break; case 200: #line 968 "bison_parser.y" /* yacc.c:1646 */ { (yyval.table_name).schema = nullptr; (yyval.table_name).name = (yyvsp[0].sval);} -#line 3784 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3791 "bison_parser.cpp" /* yacc.c:1646 */ break; case 201: #line 969 "bison_parser.y" /* yacc.c:1646 */ { (yyval.table_name).schema = (yyvsp[-2].sval); (yyval.table_name).name = (yyvsp[0].sval); } -#line 3790 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3797 "bison_parser.cpp" /* yacc.c:1646 */ break; case 203: #line 975 "bison_parser.y" /* yacc.c:1646 */ { (yyval.alias_t) = new Alias((yyvsp[-3].sval), (yyvsp[-1].str_vec)); } -#line 3796 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3803 "bison_parser.cpp" /* yacc.c:1646 */ break; case 205: #line 981 "bison_parser.y" /* yacc.c:1646 */ { (yyval.alias_t) = nullptr; } -#line 3802 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3809 "bison_parser.cpp" /* yacc.c:1646 */ break; case 206: #line 985 "bison_parser.y" /* yacc.c:1646 */ { (yyval.alias_t) = new Alias((yyvsp[0].sval)); } -#line 3808 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3815 "bison_parser.cpp" /* yacc.c:1646 */ break; case 207: #line 986 "bison_parser.y" /* yacc.c:1646 */ { (yyval.alias_t) = new Alias((yyvsp[0].sval)); } -#line 3814 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3821 "bison_parser.cpp" /* yacc.c:1646 */ break; case 209: #line 992 "bison_parser.y" /* yacc.c:1646 */ { (yyval.alias_t) = nullptr; } -#line 3820 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3827 "bison_parser.cpp" /* yacc.c:1646 */ break; case 210: @@ -3828,7 +3835,7 @@ yyreduce: (yyval.table)->join->left = (yyvsp[-3].table); (yyval.table)->join->right = (yyvsp[0].table); } -#line 3832 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3839 "bison_parser.cpp" /* yacc.c:1646 */ break; case 211: @@ -3841,7 +3848,7 @@ yyreduce: (yyval.table)->join->right = (yyvsp[-2].table); (yyval.table)->join->condition = (yyvsp[0].expr); } -#line 3845 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3852 "bison_parser.cpp" /* yacc.c:1646 */ break; case 212: @@ -3861,83 +3868,83 @@ yyreduce: (yyval.table)->join->condition = Expr::makeOpBinary(left_col, kOpEquals, right_col); delete (yyvsp[-1].expr); } -#line 3865 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3872 "bison_parser.cpp" /* yacc.c:1646 */ break; case 213: #line 1037 "bison_parser.y" /* yacc.c:1646 */ { (yyval.uval) = kJoinInner; } -#line 3871 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3878 "bison_parser.cpp" /* yacc.c:1646 */ break; case 214: #line 1038 "bison_parser.y" /* yacc.c:1646 */ { (yyval.uval) = kJoinLeft; } -#line 3877 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3884 "bison_parser.cpp" /* yacc.c:1646 */ break; case 215: #line 1039 "bison_parser.y" /* yacc.c:1646 */ { (yyval.uval) = kJoinLeft; } -#line 3883 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3890 "bison_parser.cpp" /* yacc.c:1646 */ break; case 216: #line 1040 "bison_parser.y" /* yacc.c:1646 */ { (yyval.uval) = kJoinRight; } -#line 3889 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3896 "bison_parser.cpp" /* yacc.c:1646 */ break; case 217: #line 1041 "bison_parser.y" /* yacc.c:1646 */ { (yyval.uval) = kJoinRight; } -#line 3895 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3902 "bison_parser.cpp" /* yacc.c:1646 */ break; case 218: #line 1042 "bison_parser.y" /* yacc.c:1646 */ { (yyval.uval) = kJoinFull; } -#line 3901 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3908 "bison_parser.cpp" /* yacc.c:1646 */ break; case 219: #line 1043 "bison_parser.y" /* yacc.c:1646 */ { (yyval.uval) = kJoinFull; } -#line 3907 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3914 "bison_parser.cpp" /* yacc.c:1646 */ break; case 220: #line 1044 "bison_parser.y" /* yacc.c:1646 */ { (yyval.uval) = kJoinFull; } -#line 3913 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3920 "bison_parser.cpp" /* yacc.c:1646 */ break; case 221: #line 1045 "bison_parser.y" /* yacc.c:1646 */ { (yyval.uval) = kJoinCross; } -#line 3919 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3926 "bison_parser.cpp" /* yacc.c:1646 */ break; case 222: #line 1046 "bison_parser.y" /* yacc.c:1646 */ { (yyval.uval) = kJoinInner; } -#line 3925 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3932 "bison_parser.cpp" /* yacc.c:1646 */ break; case 226: #line 1066 "bison_parser.y" /* yacc.c:1646 */ { (yyval.str_vec) = new std::vector(); (yyval.str_vec)->push_back((yyvsp[0].sval)); } -#line 3931 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3938 "bison_parser.cpp" /* yacc.c:1646 */ break; case 227: #line 1067 "bison_parser.y" /* yacc.c:1646 */ { (yyvsp[-2].str_vec)->push_back((yyvsp[0].sval)); (yyval.str_vec) = (yyvsp[-2].str_vec); } -#line 3937 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3944 "bison_parser.cpp" /* yacc.c:1646 */ break; -#line 3941 "bison_parser.cpp" /* yacc.c:1646 */ +#line 3948 "bison_parser.cpp" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires diff --git a/src/parser/bison_parser.h b/src/parser/bison_parser.h index 5a356cb..c92653c 100644 --- a/src/parser/bison_parser.h +++ b/src/parser/bison_parser.h @@ -168,55 +168,54 @@ extern int hsql_debug; SQL_LIKE = 344, SQL_LOAD = 345, SQL_NULL = 346, - SQL_PART = 347, - SQL_PLAN = 348, - SQL_SHOW = 349, - SQL_TEXT = 350, - SQL_THEN = 351, - SQL_TIME = 352, - SQL_VIEW = 353, - SQL_WHEN = 354, - SQL_WITH = 355, - SQL_ADD = 356, - SQL_ALL = 357, - SQL_AND = 358, - SQL_ASC = 359, - SQL_CSV = 360, - SQL_END = 361, - SQL_FOR = 362, - SQL_INT = 363, - SQL_KEY = 364, - SQL_NOT = 365, - SQL_OFF = 366, - SQL_SET = 367, - SQL_TBL = 368, - SQL_TOP = 369, - SQL_AS = 370, - SQL_BY = 371, - SQL_IF = 372, - SQL_IN = 373, - SQL_IS = 374, - SQL_OF = 375, - SQL_ON = 376, - SQL_OR = 377, - SQL_TO = 378, - SQL_ARRAY = 379, - SQL_CONCAT = 380, - SQL_ILIKE = 381, - SQL_SECOND = 382, - SQL_MINUTE = 383, - SQL_HOUR = 384, - SQL_DAY = 385, - SQL_MONTH = 386, - SQL_YEAR = 387, - SQL_EQUALS = 388, - SQL_NOTEQUALS = 389, - SQL_LESS = 390, - SQL_GREATER = 391, - SQL_LESSEQ = 392, - SQL_GREATEREQ = 393, - SQL_NOTNULL = 394, - SQL_UMINUS = 395 + SQL_PLAN = 347, + SQL_SHOW = 348, + SQL_TEXT = 349, + SQL_THEN = 350, + SQL_TIME = 351, + SQL_VIEW = 352, + SQL_WHEN = 353, + SQL_WITH = 354, + SQL_ADD = 355, + SQL_ALL = 356, + SQL_AND = 357, + SQL_ASC = 358, + SQL_CSV = 359, + SQL_END = 360, + SQL_FOR = 361, + SQL_INT = 362, + SQL_KEY = 363, + SQL_NOT = 364, + SQL_OFF = 365, + SQL_SET = 366, + SQL_TBL = 367, + SQL_TOP = 368, + SQL_AS = 369, + SQL_BY = 370, + SQL_IF = 371, + SQL_IN = 372, + SQL_IS = 373, + SQL_OF = 374, + SQL_ON = 375, + SQL_OR = 376, + SQL_TO = 377, + SQL_ARRAY = 378, + SQL_CONCAT = 379, + SQL_ILIKE = 380, + SQL_SECOND = 381, + SQL_MINUTE = 382, + SQL_HOUR = 383, + SQL_DAY = 384, + SQL_MONTH = 385, + SQL_YEAR = 386, + SQL_EQUALS = 387, + SQL_NOTEQUALS = 388, + SQL_LESS = 389, + SQL_GREATER = 390, + SQL_LESSEQ = 391, + SQL_GREATEREQ = 392, + SQL_NOTNULL = 393, + SQL_UMINUS = 394 }; #endif @@ -266,7 +265,7 @@ union HSQL_STYPE std::vector* expr_vec; std::vector* order_vec; -#line 270 "bison_parser.h" /* yacc.c:1909 */ +#line 269 "bison_parser.h" /* yacc.c:1909 */ }; typedef union HSQL_STYPE HSQL_STYPE; diff --git a/src/parser/bison_parser.y b/src/parser/bison_parser.y index 402c157..400c781 100755 --- a/src/parser/bison_parser.y +++ b/src/parser/bison_parser.y @@ -170,7 +170,7 @@ int yyerror(YYLTYPE* llocp, SQLParserResult* result, yyscan_t scanner, const cha %token DELTA GROUP INDEX INNER LIMIT LOCAL MERGE MINUS ORDER %token OUTER RIGHT TABLE UNION USING WHERE CALL CASE DATE %token DESC DROP ELSE FILE FROM FULL HASH HINT INTO JOIN -%token LEFT LIKE LOAD NULL PART PLAN SHOW TEXT THEN TIME +%token LEFT LIKE LOAD NULL PLAN SHOW TEXT THEN TIME %token VIEW WHEN WITH ADD ALL AND ASC CSV END FOR INT KEY %token NOT OFF SET TBL TOP AS BY IF IN IS OF ON OR TO %token ARRAY CONCAT ILIKE SECOND MINUTE HOUR DAY MONTH YEAR diff --git a/src/parser/flex_lexer.cpp b/src/parser/flex_lexer.cpp index e8e7a2b..57369b8 100644 --- a/src/parser/flex_lexer.cpp +++ b/src/parser/flex_lexer.cpp @@ -9,11 +9,245 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 6 -#define YY_FLEX_SUBMINOR_VERSION 1 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif +#ifdef yy_create_buffer +#define hsql__create_buffer_ALREADY_DEFINED +#else +#define yy_create_buffer hsql__create_buffer +#endif + +#ifdef yy_delete_buffer +#define hsql__delete_buffer_ALREADY_DEFINED +#else +#define yy_delete_buffer hsql__delete_buffer +#endif + +#ifdef yy_scan_buffer +#define hsql__scan_buffer_ALREADY_DEFINED +#else +#define yy_scan_buffer hsql__scan_buffer +#endif + +#ifdef yy_scan_string +#define hsql__scan_string_ALREADY_DEFINED +#else +#define yy_scan_string hsql__scan_string +#endif + +#ifdef yy_scan_bytes +#define hsql__scan_bytes_ALREADY_DEFINED +#else +#define yy_scan_bytes hsql__scan_bytes +#endif + +#ifdef yy_init_buffer +#define hsql__init_buffer_ALREADY_DEFINED +#else +#define yy_init_buffer hsql__init_buffer +#endif + +#ifdef yy_flush_buffer +#define hsql__flush_buffer_ALREADY_DEFINED +#else +#define yy_flush_buffer hsql__flush_buffer +#endif + +#ifdef yy_load_buffer_state +#define hsql__load_buffer_state_ALREADY_DEFINED +#else +#define yy_load_buffer_state hsql__load_buffer_state +#endif + +#ifdef yy_switch_to_buffer +#define hsql__switch_to_buffer_ALREADY_DEFINED +#else +#define yy_switch_to_buffer hsql__switch_to_buffer +#endif + +#ifdef yypush_buffer_state +#define hsql_push_buffer_state_ALREADY_DEFINED +#else +#define yypush_buffer_state hsql_push_buffer_state +#endif + +#ifdef yypop_buffer_state +#define hsql_pop_buffer_state_ALREADY_DEFINED +#else +#define yypop_buffer_state hsql_pop_buffer_state +#endif + +#ifdef yyensure_buffer_stack +#define hsql_ensure_buffer_stack_ALREADY_DEFINED +#else +#define yyensure_buffer_stack hsql_ensure_buffer_stack +#endif + +#ifdef yylex +#define hsql_lex_ALREADY_DEFINED +#else +#define yylex hsql_lex +#endif + +#ifdef yyrestart +#define hsql_restart_ALREADY_DEFINED +#else +#define yyrestart hsql_restart +#endif + +#ifdef yylex_init +#define hsql_lex_init_ALREADY_DEFINED +#else +#define yylex_init hsql_lex_init +#endif + +#ifdef yylex_init_extra +#define hsql_lex_init_extra_ALREADY_DEFINED +#else +#define yylex_init_extra hsql_lex_init_extra +#endif + +#ifdef yylex_destroy +#define hsql_lex_destroy_ALREADY_DEFINED +#else +#define yylex_destroy hsql_lex_destroy +#endif + +#ifdef yyget_debug +#define hsql_get_debug_ALREADY_DEFINED +#else +#define yyget_debug hsql_get_debug +#endif + +#ifdef yyset_debug +#define hsql_set_debug_ALREADY_DEFINED +#else +#define yyset_debug hsql_set_debug +#endif + +#ifdef yyget_extra +#define hsql_get_extra_ALREADY_DEFINED +#else +#define yyget_extra hsql_get_extra +#endif + +#ifdef yyset_extra +#define hsql_set_extra_ALREADY_DEFINED +#else +#define yyset_extra hsql_set_extra +#endif + +#ifdef yyget_in +#define hsql_get_in_ALREADY_DEFINED +#else +#define yyget_in hsql_get_in +#endif + +#ifdef yyset_in +#define hsql_set_in_ALREADY_DEFINED +#else +#define yyset_in hsql_set_in +#endif + +#ifdef yyget_out +#define hsql_get_out_ALREADY_DEFINED +#else +#define yyget_out hsql_get_out +#endif + +#ifdef yyset_out +#define hsql_set_out_ALREADY_DEFINED +#else +#define yyset_out hsql_set_out +#endif + +#ifdef yyget_leng +#define hsql_get_leng_ALREADY_DEFINED +#else +#define yyget_leng hsql_get_leng +#endif + +#ifdef yyget_text +#define hsql_get_text_ALREADY_DEFINED +#else +#define yyget_text hsql_get_text +#endif + +#ifdef yyget_lineno +#define hsql_get_lineno_ALREADY_DEFINED +#else +#define yyget_lineno hsql_get_lineno +#endif + +#ifdef yyset_lineno +#define hsql_set_lineno_ALREADY_DEFINED +#else +#define yyset_lineno hsql_set_lineno +#endif + +#ifdef yyget_column +#define hsql_get_column_ALREADY_DEFINED +#else +#define yyget_column hsql_get_column +#endif + +#ifdef yyset_column +#define hsql_set_column_ALREADY_DEFINED +#else +#define yyset_column hsql_set_column +#endif + +#ifdef yywrap +#define hsql_wrap_ALREADY_DEFINED +#else +#define yywrap hsql_wrap +#endif + +#ifdef yyget_lval +#define hsql_get_lval_ALREADY_DEFINED +#else +#define yyget_lval hsql_get_lval +#endif + +#ifdef yyset_lval +#define hsql_set_lval_ALREADY_DEFINED +#else +#define yyset_lval hsql_set_lval +#endif + +#ifdef yyget_lloc +#define hsql_get_lloc_ALREADY_DEFINED +#else +#define yyget_lloc hsql_get_lloc +#endif + +#ifdef yyset_lloc +#define hsql_set_lloc_ALREADY_DEFINED +#else +#define yyset_lloc hsql_set_lloc +#endif + +#ifdef yyalloc +#define hsql_alloc_ALREADY_DEFINED +#else +#define yyalloc hsql_alloc +#endif + +#ifdef yyrealloc +#define hsql_realloc_ALREADY_DEFINED +#else +#define yyrealloc hsql_realloc +#endif + +#ifdef yyfree +#define hsql_free_ALREADY_DEFINED +#else +#define yyfree hsql_free +#endif + /* First, we deal with platform-specific or compiler-specific issues. */ /* begin standard C headers. */ @@ -84,10 +318,16 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif + #endif /* ! C99 */ #endif /* ! FLEXINT_H */ +/* begin standard C++ headers. */ + /* TODO: this is always defined, so inline it */ #define yyconst const @@ -100,12 +340,10 @@ typedef unsigned int flex_uint32_t; /* Returned upon end-of-file. */ #define YY_NULL 0 -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. +/* Promotes a possibly negative, possibly signed char to an + * integer in range [0..255] for use as an array index. */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) +#define YY_SC_TO_UI(c) ((YY_CHAR) (c)) /* An opaque pointer. */ #ifndef YY_TYPEDEF_YY_SCANNER_T @@ -129,20 +367,16 @@ typedef void* yyscan_t; * definition of BEGIN. */ #define BEGIN yyg->yy_start = 1 + 2 * - /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ #define YY_START ((yyg->yy_start - 1) / 2) #define YYSTATE YY_START - /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE hsql_restart(yyin ,yyscanner ) - +#define YY_NEW_FILE yyrestart( yyin , yyscanner ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ @@ -175,7 +409,7 @@ typedef size_t yy_size_t; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 - + #define YY_LESS_LINENO(n) #define YY_LINENO_REWIND_TO(ptr) @@ -192,7 +426,6 @@ typedef size_t yy_size_t; YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) - #define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner ) #ifndef YY_STRUCT_YY_BUFFER_STATE @@ -252,7 +485,7 @@ struct yy_buffer_state * possible backing-up. * * When we actually see the EOF, we change the status to "new" - * (via hsql_restart()), so that the user can continue scanning by + * (via yyrestart()), so that the user can continue scanning by * just pointing yyin at a new input file. */ #define YY_BUFFER_EOF_PENDING 2 @@ -269,73 +502,67 @@ struct yy_buffer_state #define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \ ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \ : NULL) - /* Same as previous macro, but useful when we know that the buffer stack is not * NULL or when we need an lvalue. For internal use only. */ #define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] -void hsql_restart (FILE *input_file ,yyscan_t yyscanner ); -void hsql__switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -YY_BUFFER_STATE hsql__create_buffer (FILE *file,int size ,yyscan_t yyscanner ); -void hsql__delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void hsql__flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void hsql_push_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -void hsql_pop_buffer_state (yyscan_t yyscanner ); +void yyrestart ( FILE *input_file , yyscan_t yyscanner ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner ); +void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +void yypop_buffer_state ( yyscan_t yyscanner ); -static void hsql_ensure_buffer_stack (yyscan_t yyscanner ); -static void hsql__load_buffer_state (yyscan_t yyscanner ); -static void hsql__init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner ); +static void yyensure_buffer_stack ( yyscan_t yyscanner ); +static void yy_load_buffer_state ( yyscan_t yyscanner ); +static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file , yyscan_t yyscanner ); +#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER , yyscanner) -#define YY_FLUSH_BUFFER hsql__flush_buffer(YY_CURRENT_BUFFER ,yyscanner) +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner ); -YY_BUFFER_STATE hsql__scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); -YY_BUFFER_STATE hsql__scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); -YY_BUFFER_STATE hsql__scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner ); - -void *hsql_alloc (yy_size_t ,yyscan_t yyscanner ); -void *hsql_realloc (void *,yy_size_t ,yyscan_t yyscanner ); -void hsql_free (void * ,yyscan_t yyscanner ); - -#define yy_new_buffer hsql__create_buffer +void *yyalloc ( yy_size_t , yyscan_t yyscanner ); +void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner ); +void yyfree ( void * , yyscan_t yyscanner ); +#define yy_new_buffer yy_create_buffer #define yy_set_interactive(is_interactive) \ { \ if ( ! YY_CURRENT_BUFFER ){ \ - hsql_ensure_buffer_stack (yyscanner); \ + yyensure_buffer_stack (yyscanner); \ YY_CURRENT_BUFFER_LVALUE = \ - hsql__create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \ + yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } - #define yy_set_bol(at_bol) \ { \ if ( ! YY_CURRENT_BUFFER ){\ - hsql_ensure_buffer_stack (yyscanner); \ + yyensure_buffer_stack (yyscanner); \ YY_CURRENT_BUFFER_LVALUE = \ - hsql__create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \ + yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } - #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) /* Begin user sect3 */ #define hsql_wrap(yyscanner) (/*CONSTCOND*/1) #define YY_SKIP_YYWRAP - -typedef unsigned char YY_CHAR; +typedef flex_uint8_t YY_CHAR; typedef int yy_state_type; #define yytext_ptr yytext_r -static yy_state_type yy_get_previous_state (yyscan_t yyscanner ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ,yyscan_t yyscanner); -static int yy_get_next_buffer (yyscan_t yyscanner ); -static void yynoreturn yy_fatal_error (yyconst char* msg ,yyscan_t yyscanner ); +static yy_state_type yy_get_previous_state ( yyscan_t yyscanner ); +static yy_state_type yy_try_NUL_trans ( yy_state_type current_state , yyscan_t yyscanner); +static int yy_get_next_buffer ( yyscan_t yyscanner ); +static void yynoreturn yy_fatal_error ( const char* msg , yyscan_t yyscanner ); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. @@ -346,9 +573,8 @@ static void yynoreturn yy_fatal_error (yyconst char* msg ,yyscan_t yyscanner ); yyg->yy_hold_char = *yy_cp; \ *yy_cp = '\0'; \ yyg->yy_c_buf_p = yy_cp; - -#define YY_NUM_RULES 144 -#define YY_END_OF_BUFFER 145 +#define YY_NUM_RULES 143 +#define YY_END_OF_BUFFER 144 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -356,27 +582,27 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[988] = +static const flex_int16_t yy_accept[986] = { 0, - 0, 0, 2, 2, 145, 143, 4, 4, 143, 143, - 136, 143, 136, 136, 139, 136, 136, 136, 141, 141, - 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, - 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, - 141, 141, 136, 2, 2, 3, 2, 2, 2, 2, + 0, 0, 2, 2, 144, 142, 4, 4, 142, 142, + 135, 142, 135, 135, 138, 135, 135, 135, 140, 140, + 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, + 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, + 140, 140, 135, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 4, 131, 0, 0, 142, 1, 139, 138, 137, - 133, 132, 130, 134, 141, 141, 141, 141, 141, 141, + 2, 4, 130, 0, 0, 141, 1, 138, 137, 136, + 132, 131, 129, 133, 140, 140, 140, 140, 140, 140, - 115, 141, 116, 141, 141, 141, 141, 141, 141, 141, - 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, - 141, 141, 141, 141, 141, 117, 141, 141, 118, 119, - 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, - 141, 141, 120, 121, 122, 141, 141, 141, 141, 141, - 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, - 141, 123, 141, 141, 141, 141, 141, 141, 141, 141, - 141, 135, 2, 2, 2, 2, 2, 2, 1, 2, + 114, 140, 115, 140, 140, 140, 140, 140, 140, 140, + 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, + 140, 140, 140, 140, 140, 116, 140, 140, 117, 118, + 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, + 140, 140, 119, 120, 121, 140, 140, 140, 140, 140, + 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, + 140, 122, 140, 140, 140, 140, 140, 140, 140, 140, + 140, 134, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -386,18 +612,18 @@ static yyconst flex_int16_t yy_accept[988] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 140, 137, 101, 141, 102, 141, - 141, 103, 141, 104, 141, 141, 141, 141, 141, 141, - 141, 141, 105, 141, 127, 141, 141, 141, 141, 141, - 141, 141, 141, 141, 106, 141, 141, 141, 141, 141, + 2, 2, 2, 2, 139, 136, 100, 140, 101, 140, + 140, 102, 140, 103, 140, 140, 140, 140, 140, 140, + 140, 140, 104, 140, 126, 140, 140, 140, 140, 140, + 140, 140, 140, 140, 105, 140, 140, 140, 140, 140, - 141, 141, 107, 141, 141, 141, 141, 141, 141, 141, - 141, 141, 141, 141, 141, 141, 141, 108, 141, 141, - 109, 141, 141, 141, 141, 141, 141, 141, 141, 141, - 110, 141, 141, 111, 141, 141, 141, 141, 141, 141, - 141, 141, 141, 141, 141, 141, 112, 141, 141, 141, - 141, 113, 141, 141, 141, 141, 114, 141, 141, 141, - 141, 141, 141, 141, 141, 141, 141, 141, 2, 2, + 140, 140, 106, 140, 140, 140, 140, 140, 140, 140, + 140, 140, 140, 140, 140, 140, 140, 107, 140, 140, + 108, 140, 140, 140, 140, 140, 140, 140, 140, 140, + 109, 140, 140, 110, 140, 140, 140, 140, 140, 140, + 140, 140, 140, 140, 140, 140, 111, 140, 140, 140, + 140, 112, 140, 140, 140, 140, 113, 140, 140, 140, + 140, 140, 140, 140, 140, 140, 140, 140, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -409,17 +635,17 @@ static yyconst flex_int16_t yy_accept[988] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 141, 141, 141, 141, 141, 141, 74, 141, - 75, 141, 141, 141, 141, 76, 141, 141, 141, 141, - 77, 141, 141, 141, 78, 79, 141, 141, 141, 141, + 2, 2, 140, 140, 140, 140, 140, 140, 74, 140, + 75, 140, 140, 140, 140, 76, 140, 140, 140, 140, + 77, 140, 140, 140, 78, 79, 140, 140, 140, 140, - 141, 141, 80, 81, 82, 141, 141, 83, 141, 84, - 141, 126, 141, 141, 141, 141, 141, 141, 85, 141, - 86, 87, 88, 141, 90, 141, 141, 141, 141, 141, - 91, 141, 141, 141, 141, 141, 92, 93, 141, 141, - 141, 141, 141, 141, 141, 141, 94, 141, 141, 141, - 141, 95, 96, 97, 141, 141, 141, 141, 141, 141, - 141, 98, 141, 99, 141, 100, 129, 2, 2, 2, + 140, 140, 80, 81, 82, 140, 140, 83, 140, 84, + 140, 125, 140, 140, 140, 140, 140, 140, 85, 140, + 86, 87, 88, 140, 90, 140, 140, 140, 140, 140, + 91, 140, 140, 140, 140, 140, 92, 140, 140, 140, + 140, 140, 140, 140, 140, 93, 140, 140, 140, 140, + 94, 95, 96, 140, 140, 140, 140, 140, 140, 140, + 97, 140, 98, 140, 99, 128, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -430,15 +656,15 @@ static yyconst flex_int16_t yy_accept[988] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 55, 56, 141, 57, 141, 141, 141, 141, - 141, 141, 58, 141, 141, 141, 59, 141, 141, 141, - 141, 141, 141, 141, 141, 141, 141, 60, 141, 141, - 89, 141, 61, 62, 141, 141, 141, 141, 63, 64, + 55, 56, 140, 57, 140, 140, 140, 140, 140, 140, + 58, 140, 140, 140, 59, 140, 140, 140, 140, 140, + 140, 140, 140, 140, 140, 60, 140, 140, 89, 140, + 61, 62, 140, 140, 140, 140, 63, 64, 65, 66, - 65, 66, 141, 128, 141, 141, 141, 67, 68, 141, - 141, 141, 141, 141, 69, 141, 141, 141, 141, 141, - 70, 141, 141, 141, 71, 141, 141, 141, 72, 141, - 141, 73, 2, 2, 2, 2, 2, 2, 2, 2, + 140, 127, 140, 140, 140, 67, 68, 140, 140, 140, + 140, 140, 69, 140, 140, 140, 140, 140, 70, 140, + 140, 140, 71, 140, 140, 140, 72, 140, 140, 73, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -446,29 +672,29 @@ static yyconst flex_int16_t yy_accept[988] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 141, 30, 141, 141, 31, 141, 32, 141, - 141, 33, 34, 141, 35, 36, 37, 141, 38, 141, - 141, 40, 41, 141, 42, 43, 141, 141, 44, 125, - 141, 141, 45, 141, 141, 141, 46, 141, 47, 124, - 48, 49, 141, 50, 141, 141, 141, 51, 52, 53, - 54, 141, 2, 2, 2, 2, 2, 2, 2, 2, + 140, 30, 140, 140, 31, 140, 32, 140, 140, 33, + 34, 140, 35, 36, 37, 140, 38, 140, 140, 40, + 41, 140, 42, 43, 140, 140, 44, 124, 140, 140, + 45, 140, 140, 140, 46, 140, 47, 123, 48, 49, + 140, 50, 140, 140, 140, 51, 52, 53, 54, 140, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 14, 15, 16, 17, 18, 141, 19, 141, - 20, 21, 39, 22, 23, 141, 24, 141, 141, 25, - 26, 141, 27, 28, 141, 141, 141, 29, 2, 2, + 14, 15, 16, 17, 18, 140, 19, 140, 20, 21, + 39, 22, 23, 140, 24, 140, 140, 25, 26, 140, + 27, 28, 140, 140, 140, 29, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 141, 10, 141, 11, 141, 12, - 141, 141, 13, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 141, 7, 141, 8, 9, 2, 2, 2, - 2, 2, 5, 6, 2, 2, 0 + 2, 2, 140, 10, 140, 11, 140, 12, 140, 140, + 13, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 140, 7, 140, 8, 9, 2, 2, 2, 2, 2, + 5, 6, 2, 2, 0 } ; -static yyconst YY_CHAR yy_ec[256] = +static const YY_CHAR yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -500,7 +726,7 @@ static yyconst YY_CHAR yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst YY_CHAR yy_meta[68] = +static const YY_CHAR yy_meta[68] = { 0, 1, 1, 2, 1, 3, 1, 1, 1, 1, 4, 1, 1, 1, 4, 4, 4, 4, 4, 4, 4, @@ -511,18 +737,18 @@ static yyconst YY_CHAR yy_meta[68] = 4, 4, 4, 4, 4, 4, 1 } ; -static yyconst flex_uint16_t yy_base[995] = +static const flex_int16_t yy_base[993] = { 0, - 0, 0, 67, 0, 523, 3889, 133, 135, 462, 0, - 3889, 463, 131, 456, 133, 132, 451, 434, 129, 129, + 0, 0, 67, 0, 523, 3916, 133, 135, 462, 0, + 3916, 463, 131, 456, 133, 132, 451, 434, 129, 129, 137, 135, 145, 179, 127, 184, 189, 131, 144, 201, 202, 224, 235, 230, 0, 200, 262, 305, 241, 253, 255, 146, 366, 0, 200, 224, 391, 357, 0, 348, 264, 327, 222, 251, 297, 294, 363, 430, 484, 536, 584, 632, 283, 359, 680, 294, 293, 361, 422, 732, 780, 431, 348, 435, 830, 882, 472, 530, 443, 360, - 225, 296, 3889, 279, 246, 3889, 3889, 306, 226, 207, - 3889, 3889, 3889, 3889, 0, 243, 280, 359, 438, 293, + 225, 296, 3916, 279, 246, 3916, 3916, 306, 226, 207, + 3916, 3916, 3916, 3916, 0, 243, 280, 359, 438, 293, 309, 474, 0, 395, 478, 373, 294, 473, 537, 427, 296, 306, 353, 379, 386, 537, 426, 463, 481, 488, @@ -531,7 +757,7 @@ static yyconst flex_uint16_t yy_base[995] = 599, 612, 609, 0, 635, 623, 626, 644, 643, 632, 642, 646, 684, 640, 638, 660, 660, 651, 678, 690, 684, 682, 679, 699, 697, 694, 695, 731, 710, 696, - 716, 3889, 0, 340, 0, 206, 198, 0, 0, 335, + 716, 3916, 0, 340, 0, 206, 198, 0, 0, 335, 190, 161, 0, 0, 0, 0, 736, 741, 745, 770, 795, 811, 834, 869, 778, 873, 901, 799, 871, 923, @@ -541,7 +767,7 @@ static yyconst flex_uint16_t yy_base[995] = 1161, 1179, 1177, 1187, 1189, 1171, 1220, 1215, 1225, 1231, 1228, 1260, 1241, 1263, 1279, 1271, 1282, 1315, 1292, 1317, 1328, 1202, 1323, 1314, 1333, 1365, 1357, 1367, 1359, 1368, - 1382, 1390, 1401, 0, 3889, 145, 0, 735, 0, 746, + 1382, 1390, 1401, 0, 3916, 145, 0, 735, 0, 746, 740, 0, 761, 0, 776, 792, 828, 1305, 823, 832, 852, 849, 0, 903, 0, 910, 929, 1403, 938, 942, 949, 989, 1058, 1079, 0, 1092, 1107, 1135, 1182, 1230, @@ -549,104 +775,104 @@ static yyconst flex_uint16_t yy_base[995] = 1260, 1327, 0, 1338, 1382, 1403, 1391, 1408, 1409, 1404, 1405, 1409, 1417, 1415, 1426, 1431, 1433, 1441, 1419, 1427, 0, 1424, 1442, 1439, 1445, 1458, 1453, 1440, 1442, 1443, - 0, 1454, 1451, 1451, 1467, 1472, 1478, 1464, 1464, 1468, - 1481, 1464, 1477, 1485, 1477, 1489, 0, 1472, 1480, 1481, - 1490, 0, 1487, 1490, 1499, 1509, 0, 1501, 1501, 1505, - 1522, 1510, 1505, 1508, 1512, 1520, 1525, 1517, 0, 140, - 1531, 1539, 1541, 1543, 1562, 1544, 1577, 1547, 1565, 1581, - 1598, 1595, 1587, 1616, 1617, 1619, 1621, 1627, 1629, 1650, - 1655, 1652, 1661, 1653, 1683, 1665, 1693, 1687, 1691, 1709, + 0, 1454, 1451, 1451, 1467, 1472, 1477, 1465, 1464, 1468, + 1481, 1464, 1477, 1485, 1477, 1489, 0, 1472, 1478, 1480, + 1489, 0, 1486, 1483, 1496, 1508, 0, 1500, 1501, 1500, + 1519, 1509, 1503, 1503, 1511, 1518, 1525, 1516, 0, 140, + 1530, 1539, 1541, 1543, 1544, 1547, 1569, 1552, 1573, 1584, + 1598, 1587, 1581, 1606, 1617, 1595, 1603, 1619, 1627, 1649, + 1655, 1643, 1659, 1641, 1672, 1680, 1697, 1671, 1689, 1705, - 1695, 1719, 1721, 1743, 1745, 1706, 1727, 1749, 1760, 1755, - 1773, 1761, 1795, 1783, 1786, 1804, 1812, 1809, 1814, 1823, - 1827, 1838, 1837, 1840, 1835, 1863, 1852, 1869, 1892, 1881, - 1866, 1906, 1894, 1907, 1897, 1925, 1935, 1937, 1911, 1920, - 1946, 1956, 1960, 1977, 1990, 1974, 1999, 1991, 1995, 2000, - 2008, 2023, 2025, 2033, 2044, 2034, 2062, 2059, 2049, 2036, - 2057, 2088, 2093, 2092, 2094, 2098, 2111, 2126, 2122, 2143, - 2147, 2148, 1536, 1539, 1563, 1564, 1656, 1701, 0, 1728, - 0, 1770, 1858, 1873, 1888, 0, 1896, 1927, 1964, 2043, - 0, 2130, 2129, 2144, 0, 0, 2146, 2148, 2146, 2150, + 1693, 1723, 1731, 1722, 1726, 1710, 1734, 1747, 1764, 1763, + 1759, 1765, 1776, 1789, 1793, 1801, 1799, 1817, 1818, 1822, + 1830, 1833, 1839, 1847, 1851, 1861, 1852, 1885, 1891, 1900, + 1895, 1909, 1906, 1914, 1919, 1943, 1931, 1935, 1940, 1945, + 1968, 1974, 1969, 1973, 1979, 1997, 2011, 1998, 2003, 2009, + 2022, 2028, 2032, 2051, 2057, 2033, 2043, 2067, 2076, 2068, + 2072, 2097, 2101, 2100, 2122, 2116, 2130, 2135, 2139, 2151, + 2165, 2170, 1520, 1536, 1615, 1618, 1654, 1711, 0, 1792, + 0, 1789, 1862, 1886, 1896, 0, 1952, 2018, 2020, 2106, + 0, 2107, 2103, 2124, 0, 0, 2150, 2156, 2156, 2159, - 2170, 2176, 0, 0, 0, 2180, 2169, 0, 2172, 0, - 2172, 0, 2185, 2174, 2172, 2183, 2184, 2198, 0, 2191, - 0, 0, 0, 2186, 0, 2195, 2204, 2191, 2207, 2200, - 0, 2217, 2216, 2204, 2206, 2212, 0, 0, 2225, 2226, - 2218, 2217, 2219, 2227, 2227, 2241, 0, 2241, 2241, 2250, - 2241, 0, 0, 2238, 2256, 2246, 2240, 2262, 2244, 2258, - 2264, 0, 2249, 0, 2267, 0, 0, 2275, 2276, 2270, - 2273, 2298, 2299, 2301, 2309, 2304, 2327, 2330, 2340, 2339, - 2314, 2358, 2352, 2349, 2388, 2363, 2373, 2397, 2402, 2394, - 2403, 2407, 2426, 2431, 2440, 2442, 2443, 2432, 2448, 2456, + 2179, 2180, 0, 0, 0, 2183, 2173, 0, 2180, 0, + 2183, 0, 2196, 2187, 2185, 2192, 2194, 2206, 0, 2202, + 0, 0, 0, 2198, 0, 2207, 2215, 2207, 2215, 2211, + 0, 2227, 2226, 2215, 2216, 2222, 0, 2237, 2241, 2230, + 2226, 2228, 2236, 2238, 2252, 0, 2254, 2254, 2259, 2251, + 0, 0, 2248, 2265, 2258, 2252, 2273, 2257, 2271, 2275, + 0, 2260, 0, 2278, 0, 0, 2284, 2293, 2287, 2292, + 2308, 2298, 2309, 2326, 2310, 2342, 2338, 2332, 2361, 2343, + 2360, 2366, 2376, 2372, 2384, 2400, 2397, 2414, 2406, 2410, + 2429, 2432, 2435, 2445, 2446, 2454, 2463, 2464, 2468, 2489, - 2461, 2480, 2472, 2477, 2485, 2496, 2494, 2502, 2515, 2511, - 2526, 2534, 2550, 2517, 2560, 2545, 2548, 2551, 2569, 2556, - 2586, 2582, 2585, 2588, 2601, 2604, 2619, 2610, 2623, 2625, - 2634, 2640, 2653, 2659, 2668, 2676, 2658, 2674, 2699, 2693, - 2710, 2677, 2712, 2718, 2727, 2731, 2728, 2733, 2736, 2744, - 2752, 2766, 2785, 2787, 2790, 2776, 2784, 2800, 2795, 2798, - 2801, 2806, 0, 0, 2259, 0, 2306, 2310, 2390, 2397, - 2461, 2493, 0, 2499, 2615, 2656, 0, 2675, 2734, 2762, - 2767, 2782, 2815, 2821, 2832, 2840, 2832, 0, 2838, 2828, - 0, 2829, 0, 0, 2831, 2849, 2836, 2844, 0, 0, + 2486, 2480, 2494, 2498, 2519, 2508, 2517, 2534, 2523, 2538, + 2540, 2571, 2532, 2568, 2562, 2563, 2572, 2586, 2576, 2597, + 2594, 2612, 2622, 2616, 2620, 2637, 2638, 2648, 2660, 2666, + 2650, 2676, 2682, 2671, 2704, 2710, 2708, 2712, 2722, 2714, + 2726, 2736, 2738, 2750, 2754, 2762, 2764, 2768, 2790, 2776, + 2798, 2807, 2804, 2808, 2812, 2820, 2830, 2838, 2841, 2842, + 0, 0, 2296, 0, 2327, 2412, 2476, 2490, 2494, 2522, + 0, 2597, 2685, 2745, 0, 2760, 2777, 2816, 2829, 2829, + 2831, 2834, 2848, 2855, 2853, 0, 2862, 2853, 0, 2855, + 0, 0, 2857, 2874, 2862, 2871, 0, 0, 0, 0, - 0, 0, 2852, 0, 2858, 2852, 2841, 0, 0, 2858, - 2846, 2847, 2861, 2860, 0, 2873, 2871, 2857, 2875, 2879, - 2866, 2871, 2874, 2894, 0, 2892, 2894, 2894, 0, 2881, - 2902, 0, 2903, 2904, 2906, 2908, 2909, 2912, 2914, 2937, - 2938, 2942, 2943, 2966, 2960, 2952, 2968, 2977, 2982, 2978, - 2981, 2996, 3006, 3000, 3030, 3012, 3035, 3031, 3044, 3036, - 3040, 3065, 3052, 3054, 3075, 3066, 3084, 3089, 3088, 3094, - 3100, 3106, 3110, 3118, 3128, 3129, 3119, 3140, 3142, 3143, - 3158, 3164, 3152, 3182, 3154, 3192, 3194, 3180, 3197, 3210, - 3218, 3234, 3216, 3246, 3208, 3240, 3250, 3248, 3251, 3272, + 2881, 0, 2886, 2880, 2869, 0, 0, 2886, 2877, 2879, + 2894, 2891, 0, 2900, 2899, 2885, 2903, 2908, 2892, 2894, + 2897, 2918, 0, 2915, 2917, 2918, 0, 2906, 2928, 0, + 2926, 2928, 2936, 2932, 2938, 2940, 2950, 2962, 2954, 2966, + 2968, 2980, 2992, 2994, 2996, 3005, 3002, 3004, 3008, 3030, + 3033, 3042, 3054, 3046, 3079, 3064, 3068, 3087, 3076, 3090, + 3082, 3092, 3116, 3098, 3108, 3133, 3121, 3124, 3130, 3142, + 3146, 3152, 3165, 3156, 3175, 3154, 3164, 3178, 3187, 3196, + 3204, 3206, 3208, 3219, 3221, 3229, 3258, 3254, 3218, 3260, + 3252, 3286, 3263, 3269, 3292, 3275, 3288, 3297, 3325, 3303, - 3283, 3262, 2918, 0, 2935, 2947, 3056, 3218, 0, 3228, - 3249, 0, 0, 3282, 0, 0, 0, 3284, 0, 3276, - 3273, 0, 0, 3270, 0, 0, 3281, 3296, 0, 0, - 3293, 3305, 0, 3287, 3304, 3285, 0, 3310, 3300, 0, - 0, 0, 3309, 0, 3322, 3324, 3307, 0, 0, 0, - 0, 3317, 3326, 3334, 3339, 3336, 3338, 3337, 3340, 3370, - 3362, 3372, 3374, 3378, 3380, 3388, 3391, 3393, 3396, 3422, - 3414, 3406, 3410, 3412, 3424, 3428, 3447, 3445, 3446, 3450, - 3476, 3468, 3462, 3484, 3478, 3480, 3481, 3514, 3502, 3486, - 3517, 3518, 3535, 3520, 3536, 3550, 3551, 3548, 3552, 3554, + 3010, 0, 3025, 3036, 3026, 3113, 0, 3172, 3198, 0, + 0, 3295, 0, 0, 0, 3304, 0, 3305, 3311, 0, + 0, 3307, 0, 0, 3315, 3329, 0, 0, 3325, 3338, + 0, 3321, 3337, 3320, 0, 3344, 3329, 0, 0, 0, + 3339, 0, 3351, 3353, 3336, 0, 0, 0, 0, 3350, + 3360, 3362, 3366, 3365, 3377, 3381, 3379, 3396, 3383, 3400, + 3411, 3419, 3414, 3422, 3432, 3433, 3435, 3436, 3450, 3437, + 3448, 3451, 3454, 3467, 3473, 3476, 3485, 3488, 3499, 3511, + 3489, 3502, 3510, 3521, 3525, 3542, 3539, 3527, 3543, 3551, + 3575, 3556, 3564, 3565, 3579, 3573, 3577, 3581, 3596, 3607, - 3560, 3584, 0, 0, 0, 0, 0, 3346, 0, 3421, - 0, 0, 0, 0, 0, 3454, 0, 3517, 3558, 0, - 0, 3561, 0, 0, 3573, 3580, 3589, 0, 3590, 3592, - 3594, 3600, 3602, 3628, 3605, 3623, 3606, 3634, 3636, 3640, - 3642, 3646, 3657, 3659, 3658, 3668, 3674, 3676, 3680, 3682, - 3697, 3708, 3692, 3711, 3593, 0, 3683, 0, 3700, 0, - 3694, 3709, 0, 3730, 3722, 3733, 3732, 3751, 3734, 3736, - 3762, 3765, 3766, 0, 3753, 0, 0, 3768, 3770, 3787, - 3776, 3784, 0, 0, 3786, 3799, 3889, 3864, 3868, 136, - 3872, 3876, 3880, 3884 + 0, 0, 0, 0, 0, 3372, 0, 3476, 0, 0, + 0, 0, 0, 3530, 0, 3592, 3610, 0, 0, 3598, + 0, 0, 3602, 3609, 3618, 0, 3619, 3629, 3630, 3631, + 3633, 3652, 3635, 3668, 3647, 3664, 3665, 3669, 3670, 3673, + 3681, 3705, 3686, 3687, 3702, 3704, 3703, 3721, 3727, 3735, + 3736, 3737, 3621, 0, 3711, 0, 3725, 0, 3719, 3731, + 0, 3758, 3759, 3760, 3761, 3776, 3771, 3772, 3790, 3777, + 3793, 0, 3780, 0, 0, 3795, 3809, 3811, 3812, 3813, + 0, 0, 3814, 3826, 3916, 3891, 3895, 136, 3899, 3903, + 3907, 3911 } ; -static yyconst flex_int16_t yy_def[995] = +static const flex_int16_t yy_def[993] = { 0, - 987, 1, 987, 3, 987, 987, 987, 987, 987, 988, - 987, 989, 987, 987, 987, 987, 987, 987, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 987, 991, 991, 987, 991, 992, 991, 993, - 991, 991, 991, 991, 991, 991, 994, 994, 58, 58, + 985, 1, 985, 3, 985, 985, 985, 985, 985, 986, + 985, 987, 985, 985, 985, 985, 985, 985, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 985, 989, 989, 985, 989, 990, 989, 991, + 989, 989, 989, 989, 989, 989, 992, 992, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 991, 987, 987, 988, 989, 987, 987, 987, 987, 987, - 987, 987, 987, 987, 990, 990, 990, 990, 990, 990, + 989, 985, 985, 986, 987, 985, 985, 985, 985, 985, + 985, 985, 985, 985, 988, 988, 988, 988, 988, 988, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 987, 991, 991, 991, 992, 993, 991, 991, 991, - 991, 991, 991, 991, 991, 991, 58, 58, 58, 58, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 985, 989, 989, 989, 990, 991, 989, 989, 989, + 989, 989, 989, 989, 989, 989, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, @@ -655,18 +881,18 @@ static yyconst flex_int16_t yy_def[995] = 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 991, 987, 987, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, + 58, 58, 58, 989, 985, 985, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 991, 991, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 989, 989, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, @@ -678,17 +904,17 @@ static yyconst flex_int16_t yy_def[995] = 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, + 58, 58, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 58, 58, 58, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, @@ -699,15 +925,15 @@ static yyconst flex_int16_t yy_def[995] = 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 58, 58, 58, 58, 58, 58, 58, 58, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, @@ -715,31 +941,31 @@ static yyconst flex_int16_t yy_def[995] = 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 58, 58, 58, 58, 58, 58, 58, 58, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 990, 990, 990, 990, 990, 58, 58, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 988, 988, 988, 988, 988, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 990, 990, 990, 990, 990, 990, - 990, 990, 990, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 990, 990, 990, 990, 990, 58, 58, 58, - 58, 58, 990, 990, 58, 58, 0, 987, 987, 987, - 987, 987, 987, 987 + 58, 58, 988, 988, 988, 988, 988, 988, 988, 988, + 988, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 988, 988, 988, 988, 988, 58, 58, 58, 58, 58, + 988, 988, 58, 58, 0, 985, 985, 985, 985, 985, + 985, 985 } ; -static yyconst flex_uint16_t yy_nxt[3957] = +static const flex_int16_t yy_nxt[3984] = { 0, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, @@ -798,104 +1024,104 @@ static yyconst flex_uint16_t yy_nxt[3957] = 257, 187, 279, 258, 280, 284, 276, 187, 304, 187, 285, 197, 305, 306, 198, 199, 187, 307, 312, 275, - 303, 187, 987, 987, 196, 256, 987, 257, 187, 279, - 258, 280, 284, 276, 987, 304, 187, 285, 197, 305, - 306, 198, 199, 259, 307, 312, 987, 187, 187, 200, + 303, 187, 985, 985, 196, 256, 985, 257, 187, 279, + 258, 280, 284, 276, 985, 304, 187, 285, 197, 305, + 306, 198, 199, 259, 307, 312, 985, 187, 187, 200, 286, 260, 297, 201, 298, 287, 308, 202, 299, 309, 313, 288, 314, 203, 319, 300, 204, 187, 289, 301, - 259, 320, 321, 187, 187, 987, 200, 286, 260, 297, + 259, 320, 321, 187, 187, 985, 200, 286, 260, 297, 201, 298, 287, 308, 202, 299, 309, 313, 288, 314, 203, 319, 300, 204, 187, 289, 301, 310, 320, 321, 187, 187, 311, 315, 322, 323, 327, 324, 205, 325, 206, 326, 328, 316, 329, 207, 330, 331, 317, 318, - 208, 187, 987, 332, 310, 333, 987, 334, 187, 311, + 208, 187, 985, 332, 310, 333, 985, 334, 187, 311, 315, 322, 323, 327, 324, 205, 325, 206, 326, 328, 316, 329, 207, 330, 331, 317, 318, 208, 187, 187, 332, 335, 333, 209, 334, 336, 337, 338, 341, 210, 339, 343, 211, 342, 340, 212, 344, 348, 349, 187, - 987, 987, 987, 350, 351, 352, 187, 987, 335, 987, - 209, 987, 336, 337, 338, 341, 210, 339, 343, 211, + 985, 985, 985, 350, 351, 352, 187, 985, 335, 985, + 209, 985, 336, 337, 338, 341, 210, 339, 343, 211, 342, 340, 212, 344, 348, 349, 187, 187, 218, 345, 350, 351, 352, 353, 219, 220, 221, 355, 346, 356, - 357, 222, 358, 361, 354, 362, 347, 187, 987, 363, - 359, 987, 987, 360, 187, 218, 345, 366, 367, 368, + 357, 222, 358, 361, 354, 362, 347, 187, 985, 363, + 359, 985, 985, 360, 187, 218, 345, 366, 367, 368, 353, 219, 220, 221, 355, 346, 356, 357, 222, 358, 361, 354, 362, 347, 187, 231, 363, 359, 364, 187, - 360, 987, 473, 187, 366, 367, 368, 371, 187, 232, - 987, 365, 187, 474, 475, 233, 234, 987, 987, 187, - 987, 987, 231, 187, 476, 364, 187, 372, 187, 473, - 187, 987, 187, 987, 371, 187, 232, 187, 365, 187, - 474, 475, 233, 234, 373, 187, 187, 187, 235, 987, + 360, 985, 473, 187, 366, 367, 368, 371, 187, 232, + 985, 365, 187, 474, 475, 233, 234, 985, 985, 187, + 985, 985, 231, 187, 476, 364, 187, 372, 187, 473, + 187, 985, 187, 985, 371, 187, 232, 187, 365, 187, + 474, 475, 233, 234, 373, 187, 187, 187, 235, 985, 187, 476, 374, 477, 372, 187, 236, 187, 375, 187, - 237, 376, 187, 238, 187, 187, 385, 187, 987, 987, - 987, 373, 187, 987, 187, 235, 386, 478, 187, 374, - 477, 987, 187, 236, 187, 375, 187, 237, 376, 187, + 237, 376, 187, 238, 187, 187, 385, 187, 985, 985, + 985, 373, 187, 985, 187, 235, 386, 478, 187, 374, + 477, 985, 187, 236, 187, 375, 187, 237, 376, 187, 238, 377, 187, 385, 187, 244, 187, 245, 187, 378, 246, 187, 479, 386, 478, 187, 482, 247, 248, 187, - 987, 987, 396, 187, 483, 484, 187, 187, 377, 987, - 987, 187, 244, 187, 245, 187, 378, 246, 187, 479, - 485, 987, 987, 482, 247, 248, 187, 379, 187, 396, + 985, 985, 396, 187, 483, 484, 187, 187, 377, 985, + 985, 187, 244, 187, 245, 187, 378, 246, 187, 479, + 485, 985, 985, 482, 247, 248, 187, 379, 187, 396, 187, 483, 484, 187, 187, 249, 250, 381, 187, 251, - 987, 380, 252, 253, 382, 387, 187, 485, 187, 254, - 187, 987, 255, 187, 379, 187, 987, 187, 187, 187, - 486, 987, 249, 250, 381, 383, 251, 384, 380, 252, + 985, 380, 252, 253, 382, 387, 187, 485, 187, 254, + 187, 985, 255, 187, 379, 187, 985, 187, 187, 187, + 486, 985, 249, 250, 381, 383, 251, 384, 380, 252, 253, 382, 387, 187, 487, 187, 254, 187, 187, 255, - 187, 987, 488, 187, 987, 187, 187, 486, 187, 400, - 987, 187, 383, 491, 384, 388, 394, 395, 397, 492, - 389, 487, 987, 187, 987, 187, 987, 187, 187, 488, - 187, 187, 987, 399, 187, 187, 400, 187, 187, 987, + 187, 985, 488, 187, 985, 187, 187, 486, 187, 400, + 985, 187, 383, 491, 384, 388, 394, 395, 397, 492, + 389, 487, 985, 187, 985, 187, 985, 187, 187, 488, + 187, 187, 985, 399, 187, 187, 400, 187, 187, 985, 491, 493, 388, 394, 395, 397, 492, 389, 390, 187, 187, 398, 187, 391, 187, 187, 406, 187, 187, 392, - 399, 187, 187, 494, 187, 987, 393, 987, 493, 187, - 987, 987, 187, 987, 187, 390, 187, 187, 398, 187, + 399, 187, 187, 494, 187, 985, 393, 985, 493, 187, + 985, 985, 187, 985, 187, 390, 187, 187, 398, 187, 391, 187, 187, 406, 187, 187, 392, 407, 187, 187, - 494, 187, 409, 393, 187, 987, 187, 425, 408, 187, - 401, 187, 402, 987, 187, 187, 403, 416, 187, 187, + 494, 187, 409, 393, 187, 985, 187, 425, 408, 187, + 401, 187, 402, 985, 187, 187, 403, 416, 187, 187, 187, 187, 187, 404, 407, 187, 187, 405, 187, 409, - 410, 187, 187, 987, 425, 408, 411, 401, 187, 402, - 187, 987, 187, 403, 416, 187, 187, 187, 187, 987, + 410, 187, 187, 985, 425, 408, 411, 401, 187, 402, + 187, 985, 187, 403, 416, 187, 187, 187, 187, 985, 404, 187, 412, 187, 405, 413, 495, 410, 187, 187, 187, 187, 418, 411, 187, 187, 496, 187, 417, 414, - 423, 187, 187, 187, 415, 497, 424, 987, 187, 412, - 187, 187, 413, 495, 187, 187, 987, 187, 187, 418, - 987, 187, 187, 496, 498, 417, 414, 423, 187, 187, - 987, 415, 497, 424, 187, 426, 987, 187, 187, 187, + 423, 187, 187, 187, 415, 497, 424, 985, 187, 412, + 187, 187, 413, 495, 187, 187, 985, 187, 187, 418, + 985, 187, 187, 496, 498, 417, 414, 423, 187, 187, + 985, 415, 497, 424, 187, 426, 985, 187, 187, 187, 187, 187, 419, 187, 429, 427, 430, 428, 187, 187, - 499, 498, 420, 431, 187, 987, 187, 421, 422, 187, - 187, 187, 426, 187, 987, 432, 187, 187, 187, 419, + 499, 498, 420, 431, 187, 985, 187, 421, 422, 187, + 187, 187, 426, 187, 985, 432, 187, 187, 187, 419, 187, 429, 427, 430, 428, 187, 187, 499, 187, 420, - 431, 187, 187, 187, 421, 422, 187, 187, 187, 987, - 187, 433, 432, 434, 187, 187, 187, 987, 187, 987, + 431, 187, 187, 187, 421, 422, 187, 187, 187, 985, + 187, 433, 432, 434, 187, 187, 187, 985, 187, 985, 437, 436, 187, 187, 187, 187, 187, 438, 187, 187, - 987, 435, 987, 500, 187, 187, 187, 987, 433, 459, - 434, 187, 987, 187, 187, 187, 187, 437, 436, 187, - 987, 187, 187, 187, 438, 187, 439, 187, 435, 187, + 985, 435, 985, 500, 187, 187, 187, 985, 433, 459, + 434, 187, 985, 187, 187, 187, 187, 437, 436, 187, + 985, 187, 187, 187, 438, 187, 439, 187, 435, 187, 500, 187, 187, 187, 442, 443, 459, 440, 187, 444, - 987, 187, 187, 187, 501, 441, 987, 187, 187, 187, - 447, 987, 187, 439, 187, 187, 187, 987, 187, 187, - 987, 442, 443, 987, 440, 187, 444, 187, 187, 187, + 985, 187, 187, 187, 501, 441, 985, 187, 187, 187, + 447, 985, 187, 439, 187, 187, 187, 985, 187, 187, + 985, 442, 443, 985, 440, 187, 444, 187, 187, 187, 187, 501, 441, 448, 187, 187, 445, 447, 187, 187, - 502, 446, 187, 987, 449, 187, 187, 187, 452, 187, + 502, 446, 187, 985, 449, 187, 187, 187, 452, 187, - 187, 987, 987, 450, 187, 187, 455, 187, 187, 187, - 448, 451, 453, 445, 987, 187, 187, 502, 446, 187, + 187, 985, 985, 450, 187, 187, 455, 187, 187, 187, + 448, 451, 453, 445, 985, 187, 187, 502, 446, 187, 480, 449, 481, 187, 187, 452, 187, 187, 454, 187, - 450, 187, 187, 455, 187, 187, 187, 987, 451, 453, + 450, 187, 187, 455, 187, 187, 187, 985, 451, 453, 187, 456, 461, 187, 503, 187, 187, 480, 460, 481, - 187, 187, 187, 457, 187, 454, 187, 987, 187, 187, - 187, 187, 987, 504, 458, 187, 462, 187, 456, 461, + 187, 187, 187, 457, 187, 454, 187, 985, 187, 187, + 187, 187, 985, 504, 458, 187, 462, 187, 456, 461, 187, 503, 187, 465, 187, 460, 187, 187, 187, 187, 457, 187, 187, 467, 187, 468, 463, 187, 466, 464, - 504, 458, 187, 462, 187, 987, 187, 187, 469, 470, + 504, 458, 187, 462, 187, 985, 187, 187, 469, 470, - 465, 187, 187, 187, 187, 187, 505, 187, 987, 187, + 465, 187, 187, 187, 187, 187, 505, 187, 985, 187, 467, 187, 468, 463, 472, 466, 464, 506, 187, 187, 489, 187, 471, 187, 507, 469, 470, 187, 508, 187, 509, 187, 187, 505, 187, 490, 510, 511, 187, 512, @@ -904,281 +1130,284 @@ static yyconst flex_uint16_t yy_nxt[3957] = 524, 525, 490, 510, 511, 187, 512, 513, 519, 514, 515, 526, 527, 528, 529, 516, 530, 517, 531, 520, 521, 532, 533, 522, 534, 518, 523, 524, 525, 535, - 538, 536, 539, 540, 541, 519, 542, 543, 526, 527, + 536, 537, 538, 539, 540, 519, 541, 542, 526, 527, - 528, 529, 544, 530, 545, 531, 546, 547, 532, 533, - 537, 534, 548, 549, 550, 551, 535, 538, 536, 539, - 540, 541, 552, 542, 543, 553, 554, 555, 556, 544, - 557, 545, 558, 546, 547, 559, 560, 537, 561, 548, - 549, 550, 551, 562, 563, 566, 564, 567, 187, 552, - 565, 987, 553, 554, 555, 556, 568, 557, 187, 558, - 569, 187, 559, 560, 187, 561, 663, 987, 187, 664, - 562, 563, 566, 564, 567, 187, 187, 565, 187, 187, - 187, 187, 187, 568, 187, 187, 570, 569, 187, 987, - 571, 187, 572, 663, 187, 187, 664, 987, 187, 187, + 528, 529, 543, 530, 544, 531, 545, 546, 532, 533, + 547, 534, 548, 549, 550, 551, 535, 536, 537, 538, + 539, 540, 552, 541, 542, 553, 554, 557, 555, 543, + 556, 544, 558, 545, 546, 559, 560, 547, 561, 548, + 549, 550, 551, 562, 563, 565, 566, 187, 564, 552, + 661, 985, 553, 554, 557, 555, 567, 556, 187, 558, + 568, 187, 559, 560, 187, 561, 662, 187, 569, 187, + 562, 563, 565, 566, 187, 564, 187, 661, 187, 985, + 187, 187, 570, 567, 187, 187, 187, 568, 187, 187, + 187, 187, 985, 662, 187, 569, 187, 985, 187, 985, - 665, 666, 187, 187, 187, 187, 187, 187, 187, 187, - 575, 187, 576, 570, 187, 187, 573, 571, 187, 572, - 577, 187, 574, 987, 187, 187, 187, 665, 666, 187, - 579, 187, 187, 187, 187, 187, 187, 575, 187, 576, - 987, 187, 187, 573, 581, 187, 187, 577, 578, 574, - 580, 187, 987, 187, 187, 987, 187, 579, 187, 187, - 187, 187, 187, 187, 187, 187, 187, 187, 583, 584, - 587, 581, 187, 187, 582, 578, 586, 580, 187, 589, - 187, 187, 187, 187, 585, 187, 667, 187, 987, 187, - 187, 187, 187, 187, 187, 583, 584, 587, 187, 187, + 571, 187, 574, 187, 575, 187, 187, 187, 187, 570, + 187, 187, 187, 187, 576, 187, 187, 187, 187, 572, + 187, 187, 573, 187, 187, 187, 579, 571, 187, 574, + 578, 575, 187, 187, 187, 187, 580, 187, 577, 187, + 187, 576, 187, 187, 187, 187, 572, 187, 187, 573, + 187, 187, 663, 579, 187, 664, 187, 578, 586, 187, + 583, 187, 187, 580, 187, 577, 187, 187, 582, 985, + 187, 187, 187, 581, 585, 584, 187, 985, 187, 663, + 187, 187, 664, 187, 665, 586, 187, 583, 590, 187, + 985, 187, 187, 187, 588, 582, 187, 187, 985, 187, - 187, 582, 187, 586, 591, 187, 589, 987, 187, 187, - 187, 585, 593, 667, 187, 588, 187, 187, 668, 187, - 187, 590, 592, 598, 187, 187, 187, 187, 187, 187, - 187, 591, 187, 987, 594, 187, 187, 187, 187, 593, - 987, 669, 588, 187, 187, 668, 187, 187, 590, 592, - 598, 187, 595, 187, 987, 187, 187, 187, 187, 187, - 187, 594, 187, 187, 187, 187, 187, 596, 669, 601, - 187, 187, 187, 187, 599, 597, 987, 187, 187, 595, - 187, 603, 187, 187, 600, 187, 187, 187, 987, 187, - 187, 187, 187, 187, 596, 670, 601, 187, 187, 187, + 581, 585, 584, 187, 587, 187, 187, 187, 187, 187, + 592, 665, 985, 187, 187, 590, 187, 187, 591, 187, + 985, 588, 187, 187, 187, 589, 187, 597, 666, 985, + 187, 587, 985, 187, 187, 187, 187, 592, 593, 187, + 187, 187, 187, 187, 187, 591, 595, 187, 187, 187, + 985, 187, 589, 187, 597, 666, 596, 187, 985, 187, + 187, 187, 594, 187, 187, 593, 187, 187, 187, 187, + 187, 187, 598, 595, 187, 187, 187, 600, 187, 985, + 187, 187, 187, 596, 187, 602, 187, 187, 599, 594, + 187, 187, 601, 187, 985, 187, 187, 603, 187, 598, - 187, 599, 597, 187, 187, 187, 602, 187, 603, 187, - 187, 600, 187, 187, 987, 605, 604, 187, 606, 187, - 187, 187, 670, 187, 187, 187, 187, 187, 987, 187, - 187, 610, 187, 602, 607, 608, 609, 187, 987, 187, - 611, 187, 605, 604, 612, 606, 187, 187, 187, 187, - 187, 187, 187, 187, 187, 613, 187, 187, 610, 187, - 187, 607, 608, 609, 187, 614, 616, 611, 187, 618, - 615, 612, 187, 187, 187, 187, 187, 187, 187, 187, - 187, 187, 613, 187, 187, 622, 187, 187, 671, 187, - 619, 187, 614, 616, 621, 617, 618, 615, 187, 187, + 187, 187, 187, 187, 600, 667, 187, 187, 187, 187, + 187, 187, 602, 187, 668, 599, 187, 985, 187, 601, + 187, 604, 607, 187, 603, 605, 187, 187, 187, 187, + 187, 606, 667, 187, 187, 609, 187, 187, 187, 610, + 187, 668, 985, 187, 608, 187, 985, 611, 604, 607, + 612, 985, 605, 187, 187, 187, 187, 187, 606, 187, + 613, 187, 609, 187, 187, 187, 610, 187, 187, 617, + 187, 608, 614, 615, 611, 985, 187, 612, 187, 985, + 985, 187, 187, 187, 187, 985, 187, 613, 187, 187, + 985, 187, 669, 616, 187, 187, 617, 187, 187, 614, - 187, 187, 187, 187, 187, 672, 187, 187, 620, 187, - 187, 187, 622, 187, 187, 671, 187, 619, 187, 673, - 674, 621, 617, 187, 187, 187, 624, 187, 629, 187, - 187, 187, 672, 187, 187, 620, 187, 630, 187, 623, - 625, 187, 187, 187, 187, 187, 673, 674, 187, 626, - 187, 187, 187, 624, 187, 629, 187, 187, 187, 631, - 675, 187, 187, 187, 630, 627, 623, 625, 628, 187, - 187, 187, 187, 187, 187, 187, 626, 187, 632, 187, - 987, 187, 633, 187, 187, 987, 631, 675, 634, 187, - 187, 187, 627, 187, 187, 628, 676, 187, 987, 187, + 615, 985, 187, 187, 985, 187, 618, 619, 187, 985, + 985, 187, 187, 620, 621, 187, 187, 187, 670, 669, + 616, 985, 187, 187, 985, 187, 187, 671, 187, 187, + 985, 187, 187, 618, 619, 187, 187, 187, 623, 187, + 620, 621, 622, 187, 187, 670, 187, 624, 187, 187, + 187, 187, 187, 187, 671, 187, 187, 628, 187, 187, + 187, 626, 629, 187, 187, 623, 627, 625, 187, 622, + 187, 985, 187, 187, 624, 187, 672, 187, 187, 187, + 187, 630, 187, 187, 628, 187, 187, 187, 626, 629, + 187, 187, 634, 627, 625, 187, 187, 632, 633, 187, - 187, 187, 635, 636, 187, 632, 637, 187, 639, 633, - 187, 187, 187, 987, 187, 634, 187, 641, 187, 638, - 187, 187, 640, 676, 187, 187, 987, 187, 187, 635, - 636, 987, 187, 637, 187, 639, 187, 187, 187, 187, - 187, 187, 187, 187, 641, 187, 638, 987, 987, 640, - 187, 187, 187, 649, 187, 187, 677, 643, 642, 187, - 187, 187, 187, 187, 187, 644, 187, 187, 645, 187, - 187, 187, 187, 187, 187, 648, 187, 187, 187, 187, - 649, 187, 987, 677, 643, 642, 187, 187, 187, 187, - 646, 647, 644, 187, 187, 645, 187, 187, 187, 187, + 631, 985, 985, 672, 187, 187, 187, 187, 630, 187, + 187, 187, 187, 187, 187, 637, 187, 187, 187, 634, + 187, 985, 985, 187, 632, 633, 639, 631, 187, 635, + 638, 636, 187, 187, 187, 187, 985, 187, 187, 187, + 187, 187, 637, 187, 985, 187, 187, 187, 187, 187, + 187, 673, 674, 639, 985, 187, 635, 638, 636, 187, + 187, 187, 187, 640, 641, 187, 187, 187, 187, 187, + 187, 644, 187, 187, 187, 187, 187, 187, 673, 674, + 187, 643, 985, 642, 187, 647, 187, 187, 187, 187, + 640, 641, 187, 187, 187, 187, 187, 187, 644, 645, - 187, 187, 648, 187, 987, 187, 187, 654, 187, 187, - 187, 187, 987, 187, 650, 187, 987, 646, 647, 653, - 651, 187, 652, 187, 655, 187, 187, 987, 187, 187, - 187, 187, 187, 987, 654, 187, 187, 187, 187, 187, - 987, 650, 187, 187, 656, 678, 653, 651, 187, 652, - 679, 655, 187, 987, 658, 187, 187, 187, 187, 187, - 187, 657, 187, 187, 187, 187, 187, 661, 680, 659, - 187, 656, 678, 660, 681, 187, 682, 679, 662, 683, - 187, 658, 684, 685, 187, 187, 187, 187, 657, 686, - 187, 187, 187, 687, 661, 680, 659, 688, 689, 690, + 985, 187, 646, 985, 187, 187, 985, 187, 643, 187, + 642, 187, 647, 187, 187, 187, 187, 187, 187, 675, + 187, 187, 676, 648, 677, 985, 645, 651, 649, 646, + 650, 187, 187, 187, 187, 652, 187, 187, 187, 187, + 187, 187, 653, 985, 187, 187, 675, 187, 678, 676, + 648, 677, 187, 187, 651, 649, 187, 650, 985, 187, + 187, 187, 652, 654, 187, 187, 187, 187, 187, 653, + 655, 656, 187, 985, 187, 678, 187, 657, 679, 187, + 187, 658, 187, 187, 680, 659, 187, 187, 187, 681, + 654, 682, 683, 684, 187, 187, 685, 655, 656, 187, - 660, 681, 691, 682, 692, 662, 683, 187, 693, 684, - 685, 187, 187, 694, 695, 698, 686, 696, 699, 700, - 687, 701, 702, 703, 688, 689, 690, 704, 697, 691, - 705, 692, 706, 707, 708, 693, 709, 710, 711, 712, - 694, 695, 698, 713, 696, 699, 700, 714, 701, 702, - 703, 715, 716, 717, 704, 697, 718, 705, 719, 706, - 707, 708, 720, 709, 710, 711, 712, 721, 722, 723, - 713, 724, 725, 726, 714, 727, 728, 729, 715, 716, - 717, 730, 731, 718, 732, 719, 987, 187, 987, 720, - 187, 987, 187, 187, 721, 722, 723, 803, 724, 725, + 660, 686, 187, 187, 657, 679, 687, 187, 658, 187, + 688, 680, 659, 689, 187, 187, 681, 690, 682, 683, + 684, 691, 692, 685, 693, 694, 696, 660, 686, 187, + 697, 698, 699, 687, 187, 702, 695, 688, 700, 701, + 689, 703, 704, 705, 690, 706, 707, 708, 691, 692, + 709, 693, 694, 696, 710, 711, 712, 697, 698, 699, + 713, 714, 702, 695, 715, 700, 701, 716, 703, 704, + 705, 717, 706, 707, 708, 718, 719, 709, 720, 721, + 722, 710, 711, 712, 723, 724, 725, 713, 714, 726, + 727, 715, 728, 729, 716, 730, 985, 985, 717, 985, - 726, 987, 727, 728, 729, 733, 734, 735, 730, 731, - 736, 732, 187, 187, 187, 187, 738, 187, 187, 187, - 187, 187, 739, 804, 803, 987, 187, 805, 737, 987, - 987, 187, 733, 734, 735, 187, 187, 736, 187, 187, - 187, 187, 187, 738, 187, 187, 187, 187, 187, 739, - 804, 187, 740, 187, 805, 737, 187, 187, 187, 987, - 741, 987, 187, 187, 187, 187, 187, 187, 187, 187, - 743, 187, 742, 187, 187, 187, 187, 187, 187, 740, - 187, 746, 744, 187, 187, 745, 187, 741, 748, 187, - 187, 187, 987, 187, 187, 187, 187, 743, 987, 742, + 985, 187, 718, 719, 187, 720, 721, 722, 985, 187, + 187, 723, 724, 725, 731, 736, 726, 727, 985, 728, + 729, 187, 730, 732, 733, 187, 187, 187, 187, 734, + 187, 187, 985, 985, 801, 187, 187, 187, 735, 737, + 985, 731, 736, 187, 802, 187, 187, 187, 187, 187, + 732, 733, 187, 187, 187, 187, 734, 187, 985, 187, + 187, 801, 187, 187, 740, 735, 737, 738, 739, 187, + 187, 802, 187, 187, 187, 187, 187, 187, 187, 187, + 187, 985, 187, 187, 742, 745, 187, 187, 985, 187, + 187, 740, 741, 187, 738, 739, 187, 187, 187, 743, - 187, 747, 187, 187, 187, 187, 806, 187, 746, 744, - 187, 187, 745, 187, 187, 748, 187, 187, 749, 187, - 187, 987, 187, 807, 187, 187, 750, 187, 747, 987, - 987, 187, 187, 806, 187, 751, 987, 187, 187, 187, - 187, 187, 987, 187, 187, 749, 187, 187, 187, 187, - 807, 187, 187, 750, 752, 755, 756, 187, 187, 187, - 187, 187, 751, 187, 753, 187, 187, 187, 187, 187, - 187, 187, 754, 187, 757, 187, 187, 187, 187, 187, - 187, 752, 755, 756, 187, 187, 187, 187, 808, 187, - 187, 753, 187, 187, 187, 187, 187, 187, 187, 754, + 985, 187, 187, 187, 187, 187, 187, 187, 744, 187, + 187, 742, 745, 187, 187, 746, 187, 187, 747, 741, + 187, 187, 985, 187, 187, 187, 743, 187, 187, 803, + 187, 187, 985, 985, 187, 744, 187, 187, 748, 985, + 187, 187, 746, 187, 187, 747, 187, 187, 187, 187, + 187, 187, 187, 985, 187, 985, 803, 749, 187, 753, + 750, 187, 187, 187, 187, 748, 187, 754, 751, 187, + 187, 187, 187, 187, 187, 985, 187, 752, 187, 187, + 187, 187, 187, 187, 749, 187, 753, 750, 985, 187, + 187, 187, 804, 187, 754, 751, 187, 187, 187, 187, - 187, 757, 187, 759, 187, 187, 187, 187, 758, 187, - 809, 187, 187, 187, 187, 808, 187, 187, 987, 761, - 187, 187, 187, 760, 187, 187, 810, 987, 187, 187, - 759, 187, 187, 187, 187, 758, 187, 809, 187, 187, - 187, 187, 987, 187, 187, 762, 761, 763, 187, 187, - 760, 187, 187, 810, 187, 187, 764, 987, 187, 187, - 187, 187, 187, 187, 765, 187, 187, 187, 187, 766, - 187, 187, 762, 187, 763, 187, 987, 187, 187, 187, - 767, 187, 187, 764, 768, 187, 187, 187, 187, 187, - 187, 765, 187, 187, 187, 187, 766, 187, 187, 771, + 187, 187, 755, 187, 752, 187, 187, 187, 187, 187, + 187, 187, 187, 985, 756, 187, 805, 187, 187, 804, + 757, 806, 985, 187, 187, 187, 187, 187, 187, 755, + 187, 187, 187, 187, 759, 187, 187, 985, 187, 807, + 187, 756, 187, 805, 187, 187, 758, 757, 806, 187, + 187, 187, 187, 187, 187, 187, 187, 187, 187, 761, + 187, 759, 187, 187, 760, 985, 807, 187, 762, 187, + 763, 187, 187, 758, 985, 187, 187, 187, 187, 187, + 187, 187, 187, 187, 187, 187, 761, 187, 187, 187, + 764, 760, 766, 187, 985, 762, 187, 763, 187, 187, - 187, 769, 187, 187, 187, 187, 187, 767, 774, 187, - 770, 768, 187, 187, 187, 187, 772, 773, 187, 187, - 187, 187, 187, 187, 187, 187, 771, 777, 769, 187, - 187, 775, 187, 187, 776, 774, 187, 770, 187, 811, - 187, 187, 187, 772, 773, 187, 187, 187, 187, 187, - 187, 187, 187, 778, 777, 779, 187, 187, 775, 780, - 187, 776, 187, 187, 987, 187, 811, 187, 187, 187, - 187, 187, 781, 812, 187, 187, 187, 187, 187, 987, - 778, 782, 779, 187, 187, 187, 780, 187, 784, 187, - 187, 187, 987, 187, 187, 187, 187, 187, 187, 781, + 187, 765, 187, 187, 187, 187, 187, 187, 187, 187, + 985, 769, 187, 187, 187, 187, 187, 764, 767, 766, + 187, 768, 985, 187, 808, 985, 187, 187, 765, 187, + 187, 187, 187, 187, 187, 187, 187, 187, 769, 187, + 187, 187, 772, 770, 771, 767, 773, 985, 768, 187, + 187, 808, 774, 187, 187, 775, 187, 187, 187, 187, + 187, 187, 985, 985, 187, 187, 187, 187, 985, 772, + 770, 771, 985, 773, 187, 187, 187, 187, 776, 774, + 187, 187, 775, 187, 187, 187, 187, 187, 187, 779, + 777, 778, 187, 187, 187, 780, 781, 187, 985, 187, - 812, 783, 187, 187, 187, 187, 785, 813, 782, 987, - 187, 187, 187, 187, 187, 784, 187, 187, 187, 787, - 187, 187, 187, 187, 786, 788, 987, 187, 783, 789, - 187, 987, 187, 785, 813, 187, 187, 187, 187, 790, - 187, 187, 987, 187, 791, 187, 787, 187, 187, 187, - 187, 786, 788, 187, 187, 187, 789, 187, 792, 794, - 814, 187, 187, 187, 187, 187, 790, 793, 187, 187, - 187, 791, 187, 187, 187, 187, 187, 187, 795, 815, - 187, 187, 187, 187, 816, 792, 794, 814, 187, 187, - 987, 187, 187, 800, 793, 187, 187, 187, 797, 796, + 985, 187, 187, 187, 187, 776, 985, 985, 187, 809, + 187, 985, 187, 187, 187, 187, 779, 777, 778, 187, + 187, 187, 780, 781, 187, 187, 187, 187, 985, 187, + 187, 187, 985, 784, 782, 187, 809, 786, 785, 187, + 187, 187, 783, 787, 985, 187, 187, 187, 187, 187, + 985, 187, 187, 187, 187, 789, 187, 788, 187, 187, + 784, 782, 810, 187, 786, 785, 187, 187, 187, 783, + 787, 187, 187, 187, 187, 187, 187, 790, 187, 187, + 187, 187, 789, 792, 788, 187, 187, 187, 985, 810, + 187, 187, 811, 187, 187, 791, 985, 985, 187, 187, - 187, 187, 187, 187, 187, 795, 815, 187, 187, 799, - 187, 816, 187, 187, 817, 802, 187, 187, 187, 798, - 800, 187, 187, 187, 187, 797, 796, 187, 187, 187, - 187, 187, 187, 801, 187, 187, 799, 187, 187, 187, - 187, 817, 802, 187, 187, 187, 798, 818, 187, 187, - 187, 187, 819, 820, 187, 821, 822, 823, 824, 187, - 801, 825, 187, 826, 187, 187, 827, 828, 829, 830, - 187, 831, 832, 833, 818, 834, 835, 836, 837, 819, - 820, 838, 821, 822, 823, 824, 839, 840, 825, 841, - 826, 842, 843, 827, 828, 829, 830, 844, 831, 832, + 187, 187, 187, 812, 790, 187, 187, 187, 187, 794, + 792, 795, 187, 187, 187, 187, 793, 985, 187, 811, + 187, 187, 791, 797, 187, 798, 187, 187, 187, 187, + 812, 985, 187, 813, 187, 187, 794, 187, 795, 796, + 187, 187, 187, 793, 187, 187, 814, 187, 187, 187, + 797, 187, 798, 799, 187, 800, 187, 187, 187, 187, + 813, 815, 187, 816, 187, 817, 796, 187, 187, 818, + 819, 187, 187, 814, 187, 187, 187, 820, 187, 187, + 799, 821, 800, 822, 187, 187, 187, 823, 815, 824, + 816, 825, 817, 826, 187, 827, 818, 819, 828, 829, - 833, 845, 834, 835, 836, 837, 846, 847, 838, 848, - 849, 850, 851, 839, 840, 852, 841, 987, 842, 843, - 187, 187, 987, 187, 844, 187, 854, 987, 845, 855, - 856, 187, 987, 846, 847, 903, 848, 849, 850, 851, - 187, 187, 852, 187, 853, 187, 187, 187, 187, 187, - 187, 187, 187, 854, 187, 187, 855, 856, 187, 859, - 187, 904, 903, 857, 905, 858, 987, 187, 187, 862, - 187, 853, 187, 187, 187, 187, 187, 187, 187, 187, - 187, 187, 187, 187, 861, 187, 859, 187, 904, 187, - 857, 905, 858, 860, 187, 865, 862, 187, 866, 187, + 830, 831, 187, 832, 820, 187, 187, 833, 821, 834, + 822, 835, 836, 837, 823, 838, 824, 839, 825, 840, + 826, 841, 827, 842, 843, 828, 829, 830, 831, 844, + 832, 845, 846, 847, 833, 848, 834, 849, 835, 836, + 837, 850, 838, 187, 839, 187, 840, 985, 841, 187, + 842, 843, 985, 187, 985, 852, 844, 853, 845, 846, + 847, 985, 848, 187, 849, 187, 854, 187, 850, 187, + 187, 187, 187, 187, 851, 187, 187, 187, 985, 187, + 187, 856, 852, 857, 853, 187, 985, 187, 855, 985, + 187, 187, 187, 854, 187, 985, 187, 187, 187, 187, - 987, 187, 187, 187, 187, 187, 187, 187, 864, 863, - 187, 861, 187, 187, 187, 187, 187, 187, 187, 187, - 860, 187, 865, 187, 187, 866, 187, 871, 867, 187, - 187, 869, 187, 187, 987, 864, 863, 187, 868, 987, + 187, 851, 187, 187, 187, 187, 187, 858, 856, 187, + 857, 860, 187, 187, 187, 855, 859, 187, 187, 187, + 985, 863, 187, 985, 187, 864, 187, 901, 862, 187, + 187, 187, 187, 187, 858, 985, 187, 861, 860, 187, + 187, 187, 187, 859, 187, 187, 187, 187, 863, 187, + 187, 902, 864, 903, 901, 862, 187, 904, 187, 187, + 187, 869, 865, 187, 861, 866, 187, 187, 187, 187, + 187, 187, 187, 867, 187, 868, 985, 187, 902, 187, + 903, 187, 985, 187, 904, 187, 187, 871, 869, 865, + 187, 187, 866, 187, 187, 985, 187, 187, 187, 187, + + 867, 187, 868, 870, 187, 187, 187, 187, 187, 187, + 187, 985, 187, 187, 871, 875, 187, 872, 187, 187, + 187, 985, 873, 187, 187, 187, 187, 187, 187, 187, + 870, 187, 187, 187, 187, 187, 187, 905, 187, 876, + 187, 187, 875, 187, 872, 187, 187, 187, 874, 873, + 187, 187, 187, 187, 187, 985, 187, 877, 187, 187, + 187, 187, 187, 878, 905, 187, 876, 187, 187, 187, + 187, 187, 187, 187, 187, 874, 880, 187, 879, 187, + 187, 187, 187, 187, 877, 187, 187, 906, 187, 187, + 878, 187, 187, 187, 187, 882, 187, 187, 187, 985, + + 187, 187, 187, 880, 187, 879, 187, 881, 187, 187, + 187, 985, 187, 187, 906, 187, 187, 883, 187, 187, + 187, 885, 882, 187, 187, 187, 884, 886, 187, 187, + 907, 187, 887, 187, 881, 187, 187, 888, 187, 187, + 187, 187, 187, 187, 883, 187, 187, 985, 885, 892, + 187, 187, 187, 884, 886, 187, 187, 907, 187, 887, + 187, 889, 187, 187, 888, 187, 187, 891, 187, 187, + 187, 187, 187, 187, 890, 187, 892, 187, 985, 985, + 187, 985, 187, 187, 894, 187, 896, 985, 889, 187, + 893, 187, 898, 187, 891, 187, 187, 187, 187, 895, + + 187, 890, 187, 187, 187, 187, 187, 187, 897, 187, + 908, 894, 187, 896, 187, 985, 187, 893, 187, 898, + 187, 909, 187, 187, 187, 187, 895, 187, 899, 187, + 187, 910, 187, 187, 187, 897, 187, 908, 900, 187, + 187, 187, 187, 911, 912, 913, 914, 187, 909, 915, + 187, 916, 187, 917, 918, 899, 187, 919, 910, 920, + 921, 187, 187, 922, 923, 900, 924, 187, 925, 187, + 911, 912, 913, 914, 926, 985, 915, 927, 916, 187, + 917, 918, 929, 187, 919, 953, 920, 921, 985, 187, + 922, 923, 928, 924, 187, 925, 187, 187, 187, 187, + + 187, 926, 187, 187, 927, 931, 187, 985, 930, 929, + 187, 932, 953, 187, 187, 933, 187, 187, 187, 928, + 187, 187, 985, 187, 187, 187, 187, 187, 187, 187, + 187, 187, 931, 187, 934, 930, 187, 187, 932, 187, + 187, 187, 933, 187, 187, 187, 985, 187, 187, 187, + 935, 187, 187, 187, 187, 187, 187, 985, 187, 187, + 187, 934, 936, 187, 187, 187, 187, 187, 187, 187, + 187, 187, 187, 187, 187, 187, 187, 935, 187, 187, + 187, 187, 937, 187, 187, 187, 187, 187, 938, 936, + 187, 187, 187, 940, 187, 187, 187, 187, 187, 187, + + 187, 187, 187, 939, 187, 187, 187, 985, 954, 937, + 187, 187, 187, 187, 187, 938, 187, 187, 187, 187, + 940, 985, 187, 941, 942, 187, 187, 944, 187, 187, + 939, 187, 187, 187, 943, 954, 187, 187, 187, 187, + 187, 985, 187, 187, 187, 955, 187, 187, 187, 187, + 941, 942, 187, 187, 944, 187, 187, 946, 945, 187, + 187, 943, 187, 187, 187, 187, 187, 985, 187, 187, + 947, 187, 955, 187, 187, 187, 187, 949, 950, 187, + 187, 187, 187, 187, 946, 945, 187, 187, 187, 187, + 187, 187, 187, 187, 187, 187, 187, 947, 187, 948, + + 187, 187, 187, 187, 949, 950, 187, 187, 187, 187, + 187, 951, 187, 187, 187, 187, 187, 187, 187, 187, + 187, 187, 956, 187, 187, 187, 948, 957, 187, 187, + 958, 952, 959, 187, 960, 961, 187, 187, 951, 187, + 187, 187, 985, 187, 187, 187, 187, 187, 187, 956, + 187, 187, 187, 971, 957, 985, 187, 958, 952, 959, + 187, 960, 961, 187, 187, 962, 187, 187, 187, 187, + 187, 187, 187, 187, 187, 187, 985, 187, 985, 187, + 971, 187, 187, 187, 187, 187, 187, 187, 964, 187, + 187, 187, 962, 187, 187, 187, 187, 187, 187, 187, + + 963, 187, 187, 966, 187, 187, 187, 187, 187, 187, + 187, 187, 187, 187, 187, 964, 187, 187, 187, 187, + 187, 187, 187, 187, 187, 187, 985, 963, 187, 187, + 966, 187, 187, 187, 187, 965, 967, 187, 187, 187, + 187, 187, 187, 972, 187, 187, 187, 187, 187, 187, + 187, 187, 187, 970, 187, 973, 974, 968, 187, 975, + 969, 985, 965, 967, 187, 187, 187, 187, 187, 187, + 972, 187, 187, 187, 187, 187, 187, 187, 187, 187, + 970, 187, 973, 974, 968, 187, 975, 969, 187, 187, + 976, 187, 977, 187, 187, 187, 187, 187, 187, 187, + + 187, 187, 187, 187, 187, 187, 978, 187, 187, 979, + 981, 982, 983, 187, 187, 187, 187, 976, 980, 977, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, - 187, 870, 187, 187, 871, 867, 187, 187, 869, 872, - 187, 187, 987, 873, 187, 868, 874, 187, 187, 187, - 187, 187, 187, 187, 187, 187, 187, 187, 870, 187, - 187, 187, 187, 877, 187, 987, 872, 906, 187, 187, - 873, 187, 187, 874, 187, 187, 187, 875, 187, 187, + 187, 187, 187, 978, 187, 187, 979, 981, 982, 983, + 187, 187, 984, 187, 985, 980, 187, 985, 187, 187, + 187, 187, 985, 187, 187, 187, 187, 187, 187, 187, + 985, 985, 985, 187, 985, 985, 985, 985, 985, 984, + 187, 985, 985, 187, 985, 187, 187, 187, 187, 985, + 985, 985, 985, 985, 985, 985, 985, 985, 985, 985, + 187, 84, 985, 985, 84, 85, 985, 85, 85, 173, - 187, 187, 187, 187, 187, 187, 187, 876, 187, 187, - 877, 187, 187, 879, 906, 878, 187, 187, 187, 187, - 987, 187, 987, 187, 875, 187, 187, 880, 187, 187, - 187, 187, 187, 187, 876, 187, 187, 187, 187, 187, - 879, 881, 878, 187, 187, 187, 187, 187, 187, 882, - 187, 883, 187, 187, 880, 187, 187, 187, 187, 187, - 884, 987, 187, 187, 187, 187, 187, 987, 881, 887, - 187, 187, 187, 187, 187, 187, 882, 187, 883, 187, - 187, 187, 187, 187, 187, 987, 187, 884, 885, 187, - 987, 187, 187, 187, 886, 187, 887, 187, 187, 187, - - 987, 187, 187, 888, 187, 889, 187, 187, 187, 187, - 890, 187, 891, 892, 187, 885, 187, 187, 187, 187, - 987, 886, 187, 893, 187, 187, 187, 187, 187, 187, - 888, 187, 889, 187, 187, 187, 187, 890, 187, 891, - 892, 187, 907, 908, 187, 187, 187, 187, 896, 894, - 893, 187, 187, 187, 187, 187, 187, 898, 187, 897, - 187, 187, 187, 187, 895, 900, 899, 187, 187, 907, - 908, 187, 187, 987, 187, 896, 894, 187, 187, 187, - 187, 909, 187, 187, 898, 187, 897, 187, 187, 187, - 187, 895, 900, 899, 187, 187, 902, 910, 187, 187, - - 187, 911, 912, 901, 187, 913, 187, 914, 909, 187, - 187, 915, 187, 916, 187, 187, 187, 917, 918, 919, - 187, 920, 921, 902, 910, 922, 187, 187, 911, 912, - 901, 923, 913, 924, 914, 925, 187, 926, 915, 927, - 916, 928, 987, 929, 917, 918, 919, 187, 920, 921, - 987, 187, 922, 931, 187, 187, 187, 187, 923, 955, - 924, 933, 925, 187, 926, 930, 927, 987, 928, 932, - 929, 187, 987, 187, 187, 187, 187, 187, 187, 187, - 931, 187, 187, 187, 187, 934, 955, 187, 933, 187, - 187, 187, 930, 936, 935, 187, 932, 187, 187, 187, - - 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, - 937, 187, 934, 187, 187, 187, 187, 187, 187, 987, - 936, 935, 187, 187, 187, 187, 187, 187, 187, 187, - 187, 187, 187, 187, 187, 187, 187, 937, 187, 187, - 187, 187, 187, 187, 187, 187, 939, 187, 938, 940, - 187, 187, 187, 956, 187, 187, 187, 187, 187, 187, - 187, 187, 942, 187, 187, 187, 187, 187, 187, 957, - 187, 987, 187, 939, 187, 938, 940, 941, 187, 187, - 956, 944, 187, 187, 187, 187, 187, 187, 187, 942, - 187, 187, 187, 187, 187, 946, 957, 187, 187, 187, - - 943, 187, 987, 187, 941, 187, 187, 987, 944, 187, - 187, 187, 187, 187, 187, 187, 945, 947, 187, 187, - 187, 187, 946, 187, 187, 187, 187, 943, 187, 948, - 187, 187, 187, 949, 187, 187, 987, 187, 987, 187, - 187, 987, 187, 945, 947, 187, 187, 958, 187, 951, - 187, 187, 187, 187, 187, 187, 948, 187, 187, 950, - 949, 187, 187, 952, 187, 187, 187, 187, 187, 187, - 987, 187, 187, 187, 958, 959, 951, 187, 187, 187, - 187, 187, 187, 953, 187, 187, 950, 187, 187, 187, - 952, 187, 187, 960, 187, 187, 187, 187, 187, 187, - - 187, 187, 959, 961, 187, 962, 963, 187, 954, 187, - 953, 187, 187, 987, 187, 187, 187, 187, 187, 187, - 960, 187, 187, 187, 187, 973, 987, 187, 187, 187, - 961, 187, 962, 963, 187, 954, 187, 187, 187, 187, - 187, 964, 187, 187, 187, 187, 187, 987, 187, 187, - 187, 187, 973, 187, 187, 965, 187, 187, 187, 187, - 187, 966, 987, 187, 187, 187, 187, 187, 964, 187, - 187, 187, 187, 187, 187, 968, 187, 187, 187, 187, - 187, 987, 965, 187, 187, 187, 187, 187, 966, 967, - 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, - - 187, 187, 968, 187, 187, 187, 187, 987, 969, 972, - 187, 187, 187, 187, 187, 974, 967, 187, 187, 187, - 187, 187, 187, 187, 187, 187, 187, 970, 187, 187, - 975, 976, 187, 971, 187, 969, 972, 977, 187, 187, - 187, 187, 974, 987, 187, 187, 187, 187, 187, 187, - 187, 187, 187, 187, 970, 187, 187, 975, 976, 187, - 971, 187, 978, 987, 977, 979, 187, 187, 187, 187, - 187, 187, 187, 981, 187, 187, 187, 187, 187, 187, - 187, 980, 187, 983, 984, 985, 187, 187, 187, 978, - 982, 987, 979, 187, 187, 187, 187, 187, 187, 187, - - 981, 187, 187, 187, 187, 187, 187, 187, 980, 187, - 983, 984, 985, 187, 187, 187, 187, 982, 986, 987, - 187, 187, 987, 187, 187, 987, 187, 987, 187, 187, - 187, 187, 187, 987, 187, 987, 187, 987, 987, 987, - 187, 987, 987, 187, 987, 986, 987, 987, 187, 987, - 187, 187, 987, 987, 987, 987, 987, 987, 987, 987, - 987, 987, 987, 187, 84, 987, 987, 84, 85, 987, - 85, 85, 173, 987, 173, 173, 176, 987, 176, 176, - 177, 987, 177, 177, 187, 987, 187, 187, 5, 987, - 987, 987, 987, 987, 987, 987, 987, 987, 987, 987, - - 987, 987, 987, 987, 987, 987, 987, 987, 987, 987, - 987, 987, 987, 987, 987, 987, 987, 987, 987, 987, - 987, 987, 987, 987, 987, 987, 987, 987, 987, 987, - 987, 987, 987, 987, 987, 987, 987, 987, 987, 987, - 987, 987, 987, 987, 987, 987, 987, 987, 987, 987, - 987, 987, 987, 987, 987, 987 + 985, 173, 173, 176, 985, 176, 176, 177, 985, 177, + 177, 187, 985, 187, 187, 5, 985, 985, 985, 985, + 985, 985, 985, 985, 985, 985, 985, 985, 985, 985, + 985, 985, 985, 985, 985, 985, 985, 985, 985, 985, + 985, 985, 985, 985, 985, 985, 985, 985, 985, 985, + 985, 985, 985, 985, 985, 985, 985, 985, 985, 985, + 985, 985, 985, 985, 985, 985, 985, 985, 985, 985, + 985, 985, 985, 985, 985, 985, 985, 985, 985, 985, + 985, 985, 985 } ; -static yyconst flex_int16_t yy_chk[3957] = +static const flex_int16_t yy_chk[3984] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1194,7 +1423,7 @@ static yyconst flex_int16_t yy_chk[3957] = 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, 7, 7, 8, 8, 13, 990, + 3, 3, 3, 3, 7, 7, 8, 8, 13, 988, 13, 15, 15, 16, 16, 19, 20, 19, 22, 370, 21, 25, 22, 19, 266, 19, 22, 25, 28, 19, 19, 29, 22, 42, 21, 22, 20, 21, 21, 23, @@ -1343,278 +1572,281 @@ static yyconst flex_int16_t yy_chk[3957] = 324, 325, 288, 310, 311, 263, 312, 313, 318, 314, 315, 326, 327, 328, 329, 316, 330, 317, 332, 319, 320, 333, 334, 322, 335, 318, 323, 324, 325, 336, - 338, 337, 339, 340, 341, 318, 342, 343, 326, 327, + 337, 338, 339, 340, 341, 318, 342, 343, 326, 327, 328, 329, 344, 330, 345, 332, 346, 348, 333, 334, - 337, 335, 349, 350, 351, 353, 336, 338, 337, 339, - 340, 341, 354, 342, 343, 355, 356, 358, 359, 344, - 359, 345, 360, 346, 348, 361, 362, 337, 363, 349, - 350, 351, 353, 364, 365, 367, 366, 368, 371, 354, - 366, 0, 355, 356, 358, 359, 372, 359, 373, 360, - 374, 376, 361, 362, 378, 363, 473, 0, 371, 474, - 364, 365, 367, 366, 368, 371, 372, 366, 373, 375, - 374, 376, 379, 372, 378, 373, 375, 374, 376, 0, - 377, 378, 379, 473, 377, 371, 474, 0, 380, 375, + 349, 335, 350, 351, 353, 354, 336, 337, 338, 339, + 340, 341, 355, 342, 343, 356, 358, 360, 359, 344, + 359, 345, 361, 346, 348, 362, 363, 349, 364, 350, + 351, 353, 354, 365, 366, 367, 368, 371, 366, 355, + 473, 0, 356, 358, 360, 359, 372, 359, 373, 361, + 374, 375, 362, 363, 376, 364, 474, 371, 375, 378, + 365, 366, 367, 368, 371, 366, 372, 473, 373, 0, + 374, 375, 377, 372, 376, 373, 377, 374, 375, 378, + 379, 376, 0, 474, 371, 375, 378, 0, 383, 0, - 475, 476, 379, 372, 383, 373, 375, 374, 376, 379, - 382, 378, 382, 375, 377, 381, 380, 377, 380, 379, - 383, 377, 381, 0, 383, 380, 375, 475, 476, 379, - 385, 383, 382, 384, 385, 381, 386, 382, 387, 382, - 0, 377, 381, 380, 388, 380, 389, 383, 384, 381, - 386, 383, 0, 384, 385, 0, 386, 385, 387, 382, - 384, 385, 381, 386, 388, 387, 389, 390, 391, 392, - 394, 388, 391, 389, 390, 384, 393, 386, 393, 396, - 384, 385, 396, 386, 392, 387, 477, 390, 0, 392, - 394, 388, 391, 389, 390, 391, 392, 394, 393, 391, + 379, 380, 382, 372, 382, 373, 377, 374, 375, 377, + 379, 376, 386, 377, 383, 381, 378, 379, 383, 380, + 387, 380, 381, 384, 382, 383, 386, 379, 380, 382, + 385, 382, 386, 377, 385, 381, 388, 379, 384, 386, + 387, 383, 381, 384, 389, 383, 380, 387, 380, 381, + 384, 382, 475, 386, 385, 476, 388, 385, 394, 386, + 392, 385, 381, 388, 389, 384, 390, 387, 391, 0, + 384, 389, 391, 390, 393, 392, 393, 0, 394, 475, + 392, 385, 476, 388, 477, 394, 390, 392, 398, 395, + 0, 389, 391, 390, 396, 391, 393, 396, 0, 391, - 395, 390, 396, 393, 398, 393, 396, 0, 399, 396, - 397, 392, 401, 477, 390, 395, 392, 394, 478, 391, - 395, 397, 400, 406, 398, 393, 400, 395, 399, 396, - 397, 398, 401, 0, 402, 399, 402, 397, 403, 401, - 0, 480, 395, 406, 407, 478, 400, 395, 397, 400, - 406, 398, 403, 400, 0, 399, 402, 397, 403, 401, - 404, 402, 405, 402, 407, 403, 408, 404, 480, 410, - 406, 407, 410, 400, 408, 405, 0, 409, 412, 403, - 404, 412, 405, 402, 409, 403, 408, 404, 0, 405, - 411, 407, 410, 408, 404, 482, 410, 409, 412, 410, + 390, 393, 392, 393, 395, 394, 399, 392, 398, 395, + 401, 477, 0, 390, 397, 398, 395, 396, 400, 391, + 0, 396, 400, 393, 396, 397, 399, 406, 478, 0, + 401, 395, 0, 399, 397, 398, 395, 401, 402, 404, + 402, 397, 400, 405, 396, 400, 404, 406, 403, 400, + 0, 407, 397, 399, 406, 478, 405, 401, 0, 404, + 402, 397, 403, 405, 408, 402, 404, 402, 403, 400, + 405, 407, 408, 404, 406, 403, 411, 410, 407, 0, + 410, 409, 412, 405, 408, 412, 404, 402, 409, 403, + 405, 408, 411, 413, 0, 403, 411, 413, 407, 408, - 414, 408, 405, 415, 409, 412, 411, 404, 412, 405, - 411, 409, 413, 408, 0, 414, 413, 411, 415, 410, - 414, 416, 482, 415, 409, 412, 418, 414, 0, 417, - 415, 419, 413, 411, 416, 417, 418, 411, 0, 413, - 420, 416, 414, 413, 421, 415, 418, 414, 416, 417, - 415, 419, 425, 418, 423, 422, 417, 424, 419, 413, - 420, 416, 417, 418, 421, 422, 424, 420, 416, 427, - 423, 421, 425, 418, 423, 422, 417, 424, 419, 425, - 426, 423, 422, 431, 424, 431, 428, 420, 483, 427, - 428, 421, 422, 424, 430, 426, 427, 423, 430, 425, + 410, 409, 412, 411, 410, 480, 414, 410, 409, 412, + 415, 408, 412, 413, 482, 409, 417, 0, 416, 411, + 413, 414, 417, 411, 413, 415, 414, 410, 409, 412, + 415, 416, 480, 414, 418, 419, 417, 415, 416, 420, + 413, 482, 0, 417, 418, 416, 0, 421, 414, 417, + 422, 0, 415, 414, 418, 419, 423, 415, 416, 420, + 422, 418, 419, 417, 424, 416, 420, 421, 425, 427, + 422, 418, 423, 424, 421, 0, 423, 422, 426, 0, + 0, 418, 419, 423, 424, 0, 420, 422, 425, 427, + 0, 424, 483, 426, 421, 425, 427, 422, 426, 423, - 426, 423, 422, 431, 424, 484, 428, 426, 429, 429, - 431, 433, 431, 428, 435, 483, 427, 428, 430, 485, - 487, 430, 426, 432, 434, 430, 433, 426, 439, 429, - 431, 433, 484, 428, 435, 429, 429, 440, 433, 432, - 434, 435, 436, 432, 434, 430, 485, 487, 439, 436, - 432, 434, 437, 433, 438, 439, 429, 440, 433, 441, - 488, 435, 436, 441, 440, 437, 432, 434, 438, 436, - 432, 434, 437, 442, 438, 439, 436, 443, 441, 437, - 0, 438, 442, 441, 440, 0, 441, 488, 443, 436, - 441, 446, 437, 442, 444, 438, 489, 443, 0, 437, + 424, 0, 428, 423, 0, 426, 428, 429, 429, 0, + 0, 424, 431, 430, 431, 425, 427, 430, 484, 483, + 426, 0, 428, 433, 0, 426, 432, 485, 429, 428, + 0, 434, 431, 428, 429, 429, 435, 430, 433, 431, + 430, 431, 432, 433, 430, 484, 432, 434, 437, 428, + 433, 434, 438, 432, 485, 429, 435, 439, 434, 431, + 436, 437, 440, 435, 430, 433, 438, 436, 437, 432, + 433, 0, 438, 432, 434, 437, 487, 439, 434, 438, + 436, 441, 440, 435, 439, 441, 443, 436, 437, 440, + 444, 442, 445, 438, 436, 437, 445, 443, 444, 438, - 442, 438, 444, 445, 443, 441, 446, 445, 448, 442, - 441, 446, 449, 0, 444, 443, 447, 450, 446, 447, - 442, 444, 449, 489, 443, 451, 0, 445, 448, 444, - 445, 0, 449, 446, 445, 448, 447, 450, 446, 449, - 452, 444, 453, 447, 450, 451, 447, 0, 0, 449, - 454, 456, 451, 460, 445, 448, 490, 453, 452, 449, - 452, 455, 453, 447, 450, 454, 459, 452, 455, 453, - 454, 456, 451, 460, 461, 459, 458, 454, 456, 457, - 460, 455, 0, 490, 453, 452, 459, 452, 455, 453, - 457, 458, 454, 459, 461, 455, 458, 454, 456, 457, + 442, 0, 0, 487, 439, 441, 443, 436, 441, 440, + 444, 442, 441, 443, 446, 448, 445, 444, 442, 445, + 449, 0, 0, 445, 443, 444, 450, 442, 447, 446, + 449, 447, 441, 443, 446, 448, 0, 444, 442, 451, + 449, 446, 448, 445, 0, 452, 450, 449, 447, 453, + 456, 488, 489, 450, 0, 447, 446, 449, 447, 451, + 457, 446, 448, 452, 453, 452, 451, 449, 454, 453, + 456, 457, 452, 450, 455, 447, 453, 456, 488, 489, + 457, 455, 0, 454, 458, 460, 451, 457, 454, 461, + 452, 453, 452, 459, 455, 454, 453, 456, 457, 458, - 460, 461, 459, 458, 0, 462, 457, 465, 455, 464, - 463, 465, 0, 459, 462, 466, 0, 457, 458, 464, - 463, 461, 463, 458, 466, 462, 457, 0, 467, 464, - 463, 465, 462, 0, 465, 466, 464, 463, 465, 469, - 0, 462, 466, 468, 467, 492, 464, 463, 467, 463, - 493, 466, 462, 0, 469, 467, 464, 463, 465, 469, - 470, 468, 466, 468, 471, 472, 469, 471, 494, 470, - 468, 467, 492, 470, 497, 467, 498, 493, 472, 499, - 470, 469, 500, 501, 471, 472, 469, 470, 468, 502, - 468, 471, 472, 506, 471, 494, 470, 507, 509, 511, + 0, 455, 459, 0, 458, 460, 0, 457, 455, 461, + 454, 458, 460, 459, 462, 454, 461, 464, 463, 490, + 459, 455, 492, 462, 493, 0, 458, 464, 463, 459, + 463, 458, 460, 466, 462, 465, 461, 464, 463, 465, + 459, 462, 466, 0, 464, 463, 490, 467, 494, 492, + 462, 493, 468, 466, 464, 463, 469, 463, 0, 465, + 466, 462, 465, 467, 464, 463, 465, 467, 470, 466, + 468, 469, 468, 0, 467, 494, 469, 470, 497, 468, + 466, 470, 471, 469, 498, 471, 465, 472, 470, 499, + 467, 500, 501, 502, 467, 470, 506, 468, 469, 468, - 470, 497, 513, 498, 514, 472, 499, 470, 515, 500, - 501, 471, 472, 516, 517, 520, 502, 518, 524, 526, - 506, 527, 528, 528, 507, 509, 511, 529, 518, 513, - 530, 514, 532, 533, 534, 515, 535, 536, 539, 540, - 516, 517, 520, 541, 518, 524, 526, 542, 527, 528, - 528, 543, 544, 545, 529, 518, 546, 530, 548, 532, - 533, 534, 549, 535, 536, 539, 540, 550, 551, 554, - 541, 555, 556, 557, 542, 558, 559, 560, 543, 544, - 545, 561, 563, 546, 565, 548, 0, 570, 0, 549, - 571, 0, 568, 569, 550, 551, 554, 665, 555, 556, + 472, 507, 471, 469, 470, 497, 509, 472, 470, 471, + 511, 498, 471, 513, 472, 470, 499, 514, 500, 501, + 502, 515, 516, 506, 517, 518, 520, 472, 507, 471, + 524, 526, 527, 509, 472, 529, 518, 511, 528, 528, + 513, 530, 532, 533, 514, 534, 535, 536, 515, 516, + 538, 517, 518, 520, 539, 540, 541, 524, 526, 527, + 542, 543, 529, 518, 544, 528, 528, 545, 530, 532, + 533, 547, 534, 535, 536, 548, 549, 538, 550, 553, + 554, 539, 540, 541, 555, 556, 557, 542, 543, 558, + 559, 544, 560, 562, 545, 564, 0, 0, 547, 0, - 557, 0, 558, 559, 560, 568, 569, 570, 561, 563, - 571, 565, 568, 569, 570, 572, 573, 571, 574, 568, - 569, 576, 575, 667, 665, 0, 575, 668, 572, 0, - 0, 581, 568, 569, 570, 572, 573, 571, 574, 568, - 569, 576, 572, 573, 577, 574, 575, 578, 576, 575, - 667, 581, 577, 575, 668, 572, 580, 579, 581, 0, - 578, 0, 572, 573, 577, 574, 584, 578, 576, 583, - 580, 577, 579, 575, 578, 582, 580, 579, 581, 577, - 586, 584, 582, 580, 579, 583, 584, 578, 587, 583, - 587, 577, 0, 584, 578, 582, 583, 580, 0, 579, + 0, 567, 548, 549, 569, 550, 553, 554, 0, 570, + 568, 555, 556, 557, 567, 572, 558, 559, 0, 560, + 562, 567, 564, 568, 569, 571, 573, 575, 567, 570, + 568, 569, 0, 0, 663, 572, 570, 568, 571, 574, + 0, 567, 572, 574, 665, 571, 573, 575, 567, 578, + 568, 569, 571, 573, 575, 577, 570, 568, 0, 576, + 580, 663, 572, 574, 578, 571, 574, 576, 577, 578, + 574, 665, 571, 573, 575, 577, 578, 581, 579, 576, + 580, 0, 577, 582, 581, 584, 576, 580, 0, 584, + 574, 578, 579, 583, 576, 577, 578, 581, 579, 582, - 586, 585, 582, 580, 579, 585, 669, 586, 584, 582, - 587, 590, 583, 584, 588, 587, 583, 587, 588, 589, - 591, 0, 582, 670, 592, 585, 589, 586, 585, 0, - 0, 590, 585, 669, 588, 592, 0, 587, 590, 589, - 591, 588, 0, 593, 592, 588, 589, 591, 594, 598, - 670, 592, 585, 589, 593, 596, 597, 595, 590, 596, - 597, 588, 592, 593, 594, 599, 589, 591, 594, 598, - 593, 592, 595, 600, 601, 594, 598, 595, 601, 596, - 597, 593, 596, 597, 595, 599, 596, 597, 671, 603, - 593, 594, 599, 600, 604, 594, 598, 602, 601, 595, + 0, 585, 577, 582, 581, 579, 576, 580, 583, 584, + 582, 581, 584, 583, 587, 586, 584, 586, 587, 579, + 583, 585, 0, 589, 581, 579, 582, 590, 585, 666, + 582, 588, 0, 0, 587, 583, 584, 586, 588, 0, + 583, 587, 586, 589, 586, 587, 591, 590, 585, 592, + 589, 588, 593, 0, 590, 0, 666, 591, 588, 595, + 592, 587, 594, 595, 586, 588, 591, 596, 593, 592, + 589, 596, 593, 591, 590, 0, 592, 594, 588, 593, + 597, 598, 594, 595, 591, 599, 595, 592, 0, 594, + 595, 596, 667, 591, 596, 593, 592, 602, 596, 593, - 600, 601, 605, 604, 595, 601, 596, 597, 602, 603, - 672, 607, 599, 606, 604, 671, 603, 602, 0, 608, - 600, 604, 605, 606, 602, 601, 674, 0, 610, 605, - 604, 607, 609, 606, 614, 602, 603, 672, 607, 608, - 606, 604, 0, 611, 602, 609, 608, 610, 610, 605, - 606, 612, 609, 674, 614, 610, 611, 0, 607, 609, - 606, 614, 616, 611, 612, 617, 608, 613, 618, 613, - 611, 612, 609, 620, 610, 610, 0, 615, 612, 609, - 613, 614, 616, 611, 615, 617, 619, 613, 618, 616, - 611, 612, 617, 620, 613, 618, 613, 615, 612, 622, + 597, 598, 600, 601, 594, 599, 600, 597, 598, 594, + 595, 603, 599, 0, 601, 604, 668, 602, 596, 667, + 603, 669, 0, 601, 602, 606, 600, 597, 598, 600, + 601, 603, 599, 600, 607, 604, 605, 0, 603, 670, + 609, 601, 604, 668, 602, 606, 605, 603, 669, 613, + 601, 608, 606, 600, 607, 610, 605, 611, 603, 609, + 609, 607, 604, 605, 608, 0, 670, 609, 610, 613, + 611, 608, 606, 605, 0, 610, 613, 611, 608, 615, + 616, 607, 610, 605, 611, 614, 609, 609, 612, 617, + 612, 608, 614, 619, 0, 610, 613, 611, 608, 615, - 620, 619, 623, 621, 615, 624, 619, 613, 624, 616, - 621, 615, 617, 619, 613, 618, 623, 623, 625, 622, - 620, 626, 623, 621, 615, 624, 622, 628, 619, 623, - 621, 625, 624, 619, 627, 624, 627, 621, 625, 675, - 629, 626, 630, 623, 623, 625, 622, 628, 626, 623, - 621, 631, 624, 629, 628, 630, 627, 632, 625, 631, - 629, 627, 630, 627, 0, 625, 675, 629, 626, 630, - 633, 631, 634, 676, 628, 637, 634, 632, 631, 0, - 629, 635, 630, 627, 632, 635, 631, 629, 637, 630, - 633, 638, 0, 636, 642, 637, 634, 633, 631, 634, + 616, 612, 610, 618, 611, 614, 615, 616, 612, 617, + 0, 621, 614, 619, 620, 612, 617, 612, 618, 614, + 619, 620, 0, 618, 672, 0, 615, 616, 612, 622, + 618, 621, 614, 624, 620, 612, 617, 625, 621, 623, + 619, 620, 623, 622, 622, 618, 624, 0, 620, 622, + 618, 672, 626, 624, 626, 627, 622, 625, 621, 623, + 624, 620, 0, 0, 625, 628, 623, 631, 0, 623, + 622, 622, 0, 624, 626, 627, 622, 629, 628, 626, + 624, 626, 627, 630, 625, 628, 623, 631, 634, 632, + 629, 630, 628, 632, 631, 633, 634, 629, 0, 633, - 676, 636, 637, 634, 632, 635, 638, 678, 635, 0, - 640, 638, 635, 636, 642, 637, 639, 633, 638, 640, - 636, 642, 637, 634, 639, 641, 0, 641, 636, 643, - 640, 0, 635, 638, 678, 644, 639, 640, 638, 644, - 636, 642, 0, 639, 645, 647, 640, 641, 646, 643, - 648, 639, 641, 649, 641, 644, 643, 640, 646, 650, - 679, 650, 644, 639, 645, 647, 644, 649, 646, 651, - 648, 645, 647, 649, 641, 646, 643, 648, 651, 680, - 649, 650, 644, 652, 681, 646, 650, 679, 650, 651, - 0, 645, 647, 656, 649, 646, 651, 648, 653, 652, + 0, 626, 627, 630, 629, 628, 0, 0, 634, 673, + 630, 0, 628, 632, 631, 634, 632, 629, 630, 633, + 632, 635, 633, 634, 629, 637, 633, 636, 0, 638, + 630, 640, 0, 637, 635, 634, 673, 639, 638, 639, + 632, 635, 636, 641, 0, 637, 633, 636, 635, 638, + 0, 640, 637, 642, 636, 643, 638, 642, 640, 639, + 637, 635, 674, 641, 639, 638, 639, 644, 635, 636, + 641, 645, 637, 642, 636, 643, 638, 644, 640, 646, + 642, 647, 643, 648, 642, 648, 639, 644, 0, 674, + 641, 645, 676, 650, 644, 647, 0, 0, 645, 646, - 649, 657, 653, 652, 654, 651, 680, 655, 650, 655, - 652, 681, 659, 656, 682, 660, 651, 658, 661, 654, - 656, 657, 653, 662, 654, 653, 652, 655, 657, 653, - 652, 654, 659, 658, 655, 660, 655, 658, 661, 659, - 656, 682, 660, 662, 658, 661, 654, 683, 657, 653, - 662, 654, 684, 685, 655, 686, 687, 689, 690, 659, - 658, 692, 660, 695, 658, 661, 696, 697, 698, 703, - 662, 705, 706, 707, 683, 710, 711, 712, 713, 684, - 685, 714, 686, 687, 689, 690, 716, 717, 692, 718, - 695, 719, 720, 696, 697, 698, 703, 721, 705, 706, + 642, 647, 643, 677, 644, 648, 646, 649, 647, 650, + 648, 651, 648, 650, 644, 651, 649, 0, 645, 676, + 650, 653, 647, 653, 652, 654, 646, 649, 647, 655, + 677, 0, 648, 678, 649, 651, 650, 656, 651, 652, + 650, 653, 651, 649, 652, 654, 679, 657, 653, 655, + 653, 652, 654, 656, 649, 658, 655, 656, 659, 660, + 678, 680, 651, 681, 656, 682, 652, 657, 653, 683, + 684, 652, 654, 679, 657, 658, 655, 685, 659, 660, + 656, 687, 658, 688, 656, 659, 660, 690, 680, 693, + 681, 694, 682, 695, 657, 696, 683, 684, 701, 703, - 707, 722, 710, 711, 712, 713, 723, 724, 714, 726, - 727, 728, 730, 716, 717, 731, 718, 0, 719, 720, - 733, 734, 0, 735, 721, 736, 737, 0, 722, 738, - 739, 739, 0, 723, 724, 803, 726, 727, 728, 730, - 733, 734, 731, 735, 735, 736, 737, 733, 734, 738, - 735, 739, 736, 737, 740, 741, 738, 739, 739, 742, - 743, 805, 803, 740, 806, 741, 0, 733, 734, 746, - 735, 735, 736, 737, 740, 741, 738, 745, 739, 742, - 743, 740, 741, 744, 745, 747, 742, 743, 805, 746, - 740, 806, 741, 744, 748, 750, 746, 745, 751, 749, + 704, 705, 658, 708, 685, 659, 660, 709, 687, 710, + 688, 711, 712, 714, 690, 715, 693, 716, 694, 717, + 695, 718, 696, 719, 720, 701, 703, 704, 705, 721, + 708, 722, 724, 725, 709, 726, 710, 728, 711, 712, + 714, 729, 715, 731, 716, 732, 717, 0, 718, 734, + 719, 720, 0, 733, 0, 735, 721, 736, 722, 724, + 725, 0, 726, 731, 728, 732, 737, 737, 729, 734, + 731, 739, 732, 733, 733, 735, 734, 736, 0, 738, + 733, 739, 735, 740, 736, 741, 0, 737, 738, 0, + 731, 739, 732, 737, 737, 0, 734, 742, 739, 738, - 0, 740, 741, 744, 745, 747, 742, 743, 749, 748, - 744, 745, 747, 752, 748, 750, 746, 754, 751, 749, - 744, 748, 750, 753, 745, 751, 749, 756, 752, 756, - 744, 754, 747, 752, 0, 749, 748, 754, 753, 0, - 752, 748, 750, 753, 754, 751, 749, 755, 758, 756, - 753, 755, 757, 760, 756, 752, 756, 761, 754, 757, - 752, 759, 0, 759, 754, 753, 760, 755, 758, 763, - 753, 764, 757, 760, 755, 758, 756, 761, 755, 757, - 760, 759, 762, 766, 761, 0, 757, 807, 759, 763, - 759, 764, 765, 760, 755, 758, 763, 762, 764, 757, + 733, 733, 735, 740, 736, 741, 738, 742, 739, 743, + 740, 744, 741, 745, 737, 738, 743, 742, 739, 747, + 0, 748, 746, 0, 742, 749, 738, 801, 747, 743, + 740, 744, 741, 745, 742, 0, 743, 746, 744, 747, + 745, 748, 746, 743, 742, 749, 747, 750, 748, 746, + 751, 803, 749, 804, 801, 747, 743, 805, 744, 752, + 745, 754, 750, 754, 746, 751, 747, 750, 748, 746, + 751, 753, 749, 752, 750, 753, 0, 751, 803, 752, + 804, 756, 0, 754, 805, 757, 752, 757, 754, 750, + 754, 753, 751, 759, 750, 0, 755, 751, 753, 761, - 760, 767, 762, 766, 761, 769, 768, 765, 759, 762, - 766, 770, 765, 768, 807, 767, 763, 771, 764, 765, - 0, 767, 0, 772, 762, 769, 768, 773, 767, 762, - 766, 770, 769, 768, 765, 774, 777, 771, 770, 765, - 768, 775, 767, 772, 771, 775, 776, 773, 767, 776, - 772, 777, 769, 768, 773, 774, 777, 778, 770, 779, - 780, 0, 774, 777, 771, 775, 776, 0, 775, 783, - 772, 785, 775, 776, 773, 781, 776, 778, 777, 779, - 780, 782, 774, 777, 778, 0, 779, 780, 781, 783, - 0, 785, 775, 776, 782, 781, 783, 788, 785, 784, + 752, 756, 753, 755, 758, 757, 752, 760, 756, 762, + 754, 0, 757, 759, 757, 764, 755, 758, 753, 761, + 759, 0, 760, 755, 758, 765, 761, 760, 756, 762, + 755, 758, 757, 763, 760, 764, 762, 806, 767, 765, + 759, 768, 764, 755, 758, 765, 761, 769, 763, 760, + 766, 758, 765, 763, 760, 0, 762, 766, 767, 770, + 763, 768, 764, 771, 806, 767, 765, 769, 768, 772, + 766, 776, 765, 774, 769, 763, 774, 766, 773, 770, + 763, 777, 773, 771, 766, 767, 770, 808, 768, 772, + 771, 776, 775, 774, 769, 778, 772, 766, 776, 0, - 0, 782, 781, 784, 778, 786, 779, 780, 782, 786, - 787, 787, 788, 789, 789, 781, 783, 788, 785, 784, - 0, 782, 781, 790, 788, 795, 784, 790, 782, 786, - 784, 787, 786, 793, 789, 791, 786, 787, 787, 788, - 789, 789, 808, 810, 788, 795, 784, 790, 793, 791, - 790, 792, 795, 793, 790, 791, 786, 796, 787, 794, - 793, 789, 791, 794, 792, 798, 797, 797, 799, 808, - 810, 792, 795, 0, 790, 793, 791, 796, 792, 802, - 793, 811, 791, 794, 796, 798, 794, 797, 799, 800, - 794, 792, 798, 797, 797, 799, 801, 814, 792, 802, + 774, 777, 773, 774, 779, 773, 770, 775, 777, 773, + 771, 0, 775, 780, 808, 778, 772, 779, 776, 775, + 774, 781, 778, 782, 779, 783, 780, 782, 777, 773, + 809, 779, 784, 780, 775, 789, 784, 785, 785, 775, + 780, 781, 778, 782, 779, 783, 786, 0, 781, 789, + 782, 779, 783, 780, 782, 789, 784, 809, 785, 784, + 780, 786, 789, 784, 785, 785, 786, 788, 781, 791, + 782, 788, 783, 786, 787, 787, 789, 790, 0, 0, + 793, 0, 789, 784, 791, 785, 794, 0, 786, 791, + 790, 788, 796, 786, 788, 787, 791, 790, 788, 792, - 801, 818, 820, 800, 796, 821, 802, 824, 811, 800, - 794, 827, 798, 828, 797, 799, 800, 831, 832, 834, - 801, 835, 836, 801, 814, 838, 802, 801, 818, 820, - 800, 839, 821, 843, 824, 845, 800, 846, 827, 847, - 828, 852, 0, 853, 831, 832, 834, 801, 835, 836, - 0, 854, 838, 856, 858, 857, 855, 859, 839, 908, - 843, 858, 845, 853, 846, 855, 847, 0, 852, 857, - 853, 854, 0, 856, 858, 857, 855, 859, 854, 861, - 856, 858, 857, 855, 859, 860, 908, 860, 858, 862, - 853, 863, 855, 864, 861, 864, 857, 865, 854, 861, + 793, 787, 787, 792, 790, 797, 794, 793, 795, 795, + 812, 791, 796, 794, 798, 0, 791, 790, 788, 796, + 800, 816, 787, 792, 790, 797, 792, 793, 798, 795, + 792, 818, 797, 794, 798, 795, 795, 812, 799, 796, + 800, 798, 799, 819, 822, 825, 826, 800, 816, 829, + 792, 830, 797, 832, 833, 798, 795, 834, 818, 836, + 837, 798, 799, 841, 843, 799, 844, 800, 845, 799, + 819, 822, 825, 826, 850, 0, 829, 851, 830, 852, + 832, 833, 854, 853, 834, 906, 836, 837, 0, 799, + 841, 843, 853, 844, 855, 845, 857, 851, 856, 852, - 856, 858, 857, 855, 859, 866, 861, 860, 867, 862, - 868, 863, 860, 869, 860, 864, 862, 865, 863, 0, - 864, 861, 864, 872, 865, 866, 861, 873, 867, 874, - 868, 871, 866, 869, 860, 867, 862, 868, 863, 870, - 869, 875, 864, 872, 865, 876, 871, 873, 870, 874, - 872, 871, 866, 910, 873, 867, 874, 868, 871, 870, - 869, 875, 878, 879, 877, 876, 870, 880, 875, 916, - 872, 0, 876, 871, 873, 870, 874, 877, 871, 883, - 910, 882, 878, 879, 877, 882, 870, 880, 875, 878, - 879, 877, 876, 881, 880, 885, 916, 886, 887, 883, + 859, 850, 854, 853, 851, 856, 852, 0, 855, 854, + 853, 858, 906, 858, 855, 859, 857, 860, 856, 853, + 859, 855, 0, 857, 851, 856, 852, 859, 861, 854, + 853, 863, 856, 858, 862, 855, 862, 860, 858, 864, + 858, 855, 859, 857, 860, 856, 0, 859, 861, 865, + 866, 863, 867, 868, 870, 861, 862, 0, 863, 864, + 858, 862, 868, 862, 860, 871, 864, 869, 872, 865, + 866, 873, 867, 868, 870, 861, 865, 866, 863, 867, + 868, 870, 869, 862, 874, 871, 864, 869, 872, 868, + 875, 873, 871, 876, 869, 872, 865, 866, 873, 867, - 881, 884, 0, 890, 877, 882, 883, 0, 882, 878, - 879, 877, 882, 881, 880, 885, 884, 886, 887, 889, - 881, 884, 885, 890, 886, 887, 883, 881, 884, 888, - 890, 888, 882, 889, 891, 892, 0, 894, 0, 889, - 881, 0, 885, 884, 886, 887, 889, 918, 884, 895, - 890, 888, 893, 895, 891, 892, 888, 894, 888, 893, - 889, 891, 892, 896, 894, 898, 889, 896, 897, 899, - 0, 900, 893, 895, 918, 919, 895, 901, 888, 893, - 895, 891, 892, 897, 894, 898, 893, 896, 897, 899, - 896, 900, 898, 922, 896, 897, 899, 901, 900, 893, + 868, 870, 877, 875, 874, 878, 881, 0, 908, 869, + 875, 874, 871, 876, 869, 872, 879, 875, 873, 882, + 876, 0, 877, 879, 880, 878, 881, 883, 880, 877, + 875, 874, 878, 881, 882, 908, 879, 875, 884, 882, + 876, 0, 885, 879, 888, 914, 882, 883, 880, 877, + 879, 880, 878, 881, 883, 880, 887, 886, 884, 886, + 889, 882, 885, 879, 888, 884, 882, 0, 890, 885, + 887, 888, 914, 892, 883, 880, 887, 893, 894, 886, + 889, 893, 894, 887, 886, 884, 886, 889, 890, 885, + 896, 888, 891, 892, 897, 890, 895, 887, 898, 891, - 895, 902, 919, 925, 901, 926, 927, 929, 902, 930, - 897, 931, 898, 0, 896, 897, 899, 932, 900, 933, - 922, 902, 935, 937, 901, 955, 0, 929, 902, 930, - 925, 931, 926, 927, 929, 902, 930, 932, 931, 933, - 936, 934, 935, 937, 932, 934, 933, 0, 902, 935, - 937, 938, 955, 939, 929, 936, 930, 940, 931, 941, - 936, 942, 0, 942, 932, 934, 933, 936, 934, 935, - 937, 938, 934, 939, 943, 945, 944, 940, 938, 941, - 939, 0, 936, 942, 940, 946, 941, 936, 942, 944, - 942, 947, 934, 948, 943, 945, 944, 949, 938, 950, + 892, 893, 894, 887, 893, 894, 886, 889, 893, 894, + 896, 895, 891, 899, 897, 890, 895, 896, 898, 891, + 892, 897, 916, 895, 900, 898, 891, 917, 893, 894, + 920, 900, 923, 899, 924, 925, 927, 896, 895, 891, + 899, 897, 0, 895, 900, 898, 928, 929, 930, 916, + 931, 900, 933, 953, 917, 0, 927, 920, 900, 923, + 899, 924, 925, 927, 935, 932, 928, 929, 930, 932, + 931, 900, 933, 928, 929, 930, 0, 931, 0, 933, + 953, 936, 937, 927, 935, 934, 938, 939, 940, 932, + 940, 935, 932, 928, 929, 930, 932, 931, 941, 933, - 939, 943, 945, 944, 940, 946, 941, 0, 948, 953, - 942, 947, 946, 948, 951, 957, 944, 949, 947, 950, - 948, 943, 945, 944, 949, 952, 950, 951, 954, 953, - 959, 961, 946, 952, 951, 948, 953, 962, 947, 965, - 948, 951, 957, 0, 949, 952, 950, 964, 954, 967, - 966, 969, 952, 970, 951, 954, 953, 959, 961, 965, - 952, 951, 964, 0, 962, 966, 965, 964, 968, 967, - 966, 969, 952, 970, 964, 954, 967, 966, 969, 971, - 970, 968, 972, 973, 975, 978, 965, 979, 968, 964, - 971, 0, 966, 981, 964, 968, 967, 966, 969, 971, + 934, 936, 937, 943, 944, 934, 938, 939, 936, 937, + 940, 935, 934, 938, 939, 940, 932, 940, 941, 945, + 947, 946, 942, 943, 944, 941, 0, 934, 936, 937, + 943, 944, 934, 938, 939, 942, 946, 940, 948, 945, + 947, 946, 942, 955, 949, 941, 945, 947, 946, 942, + 943, 944, 950, 951, 952, 957, 959, 949, 948, 960, + 950, 0, 942, 946, 949, 948, 945, 947, 946, 942, + 955, 949, 950, 951, 952, 962, 963, 964, 965, 950, + 951, 952, 957, 959, 949, 948, 960, 950, 967, 968, + 962, 949, 964, 966, 970, 962, 963, 964, 965, 950, - 970, 982, 972, 985, 980, 978, 971, 979, 968, 972, - 973, 975, 978, 981, 979, 968, 986, 971, 980, 0, - 981, 982, 0, 985, 980, 0, 971, 0, 982, 972, - 985, 980, 978, 0, 979, 0, 986, 0, 0, 0, - 981, 0, 0, 986, 0, 980, 0, 0, 982, 0, - 985, 980, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 986, 988, 0, 0, 988, 989, 0, - 989, 989, 991, 0, 991, 991, 992, 0, 992, 992, - 993, 0, 993, 993, 994, 0, 994, 994, 987, 987, - 987, 987, 987, 987, 987, 987, 987, 987, 987, 987, + 951, 952, 962, 963, 964, 965, 966, 969, 967, 968, + 971, 973, 976, 966, 970, 967, 968, 962, 969, 964, + 966, 970, 962, 963, 964, 965, 977, 969, 978, 979, + 980, 983, 976, 966, 969, 967, 968, 971, 973, 976, + 966, 970, 978, 984, 0, 969, 977, 0, 978, 979, + 980, 983, 0, 977, 969, 978, 979, 980, 983, 976, + 0, 0, 0, 984, 0, 0, 0, 0, 0, 978, + 984, 0, 0, 977, 0, 978, 979, 980, 983, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 984, 986, 0, 0, 986, 987, 0, 987, 987, 989, - 987, 987, 987, 987, 987, 987, 987, 987, 987, 987, - 987, 987, 987, 987, 987, 987, 987, 987, 987, 987, - 987, 987, 987, 987, 987, 987, 987, 987, 987, 987, - 987, 987, 987, 987, 987, 987, 987, 987, 987, 987, - 987, 987, 987, 987, 987, 987, 987, 987, 987, 987, - 987, 987, 987, 987, 987, 987 + 0, 989, 989, 990, 0, 990, 990, 991, 0, 991, + 991, 992, 0, 992, 992, 985, 985, 985, 985, 985, + 985, 985, 985, 985, 985, 985, 985, 985, 985, 985, + 985, 985, 985, 985, 985, 985, 985, 985, 985, 985, + 985, 985, 985, 985, 985, 985, 985, 985, 985, 985, + 985, 985, 985, 985, 985, 985, 985, 985, 985, 985, + 985, 985, 985, 985, 985, 985, 985, 985, 985, 985, + 985, 985, 985, 985, 985, 985, 985, 985, 985, 985, + 985, 985, 985 } ; /* The intent behind this definition is that it'll catch @@ -1641,6 +1873,7 @@ static yyconst flex_int16_t yy_chk[3957] = #define TOKEN(name) { return SQL_##name; } +#line 1877 "flex_lexer.cpp" /*************************** ** Section 2: Rules ***************************/ @@ -1653,7 +1886,7 @@ static yyconst flex_int16_t yy_chk[3957] = /*************************** ** Section 3: Rules ***************************/ -#line 1657 "flex_lexer.cpp" +#line 1890 "flex_lexer.cpp" #define INITIAL 0 #define COMMENT 1 @@ -1708,7 +1941,7 @@ struct yyguts_t }; /* end struct yyguts_t */ -static int yy_init_globals (yyscan_t yyscanner ); +static int yy_init_globals ( yyscan_t yyscanner ); /* This must go here because YYSTYPE and YYLTYPE are included * from bison output in section 1.*/ @@ -1716,50 +1949,50 @@ static int yy_init_globals (yyscan_t yyscanner ); # define yylloc yyg->yylloc_r -int hsql_lex_init (yyscan_t* scanner); +int yylex_init (yyscan_t* scanner); -int hsql_lex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); +int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int hsql_lex_destroy (yyscan_t yyscanner ); +int yylex_destroy ( yyscan_t yyscanner ); -int hsql_get_debug (yyscan_t yyscanner ); +int yyget_debug ( yyscan_t yyscanner ); -void hsql_set_debug (int debug_flag ,yyscan_t yyscanner ); +void yyset_debug ( int debug_flag , yyscan_t yyscanner ); -YY_EXTRA_TYPE hsql_get_extra (yyscan_t yyscanner ); +YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner ); -void hsql_set_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); +void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner ); -FILE *hsql_get_in (yyscan_t yyscanner ); +FILE *yyget_in ( yyscan_t yyscanner ); -void hsql_set_in (FILE * _in_str ,yyscan_t yyscanner ); +void yyset_in ( FILE * _in_str , yyscan_t yyscanner ); -FILE *hsql_get_out (yyscan_t yyscanner ); +FILE *yyget_out ( yyscan_t yyscanner ); -void hsql_set_out (FILE * _out_str ,yyscan_t yyscanner ); +void yyset_out ( FILE * _out_str , yyscan_t yyscanner ); - int hsql_get_leng (yyscan_t yyscanner ); + int yyget_leng ( yyscan_t yyscanner ); -char *hsql_get_text (yyscan_t yyscanner ); +char *yyget_text ( yyscan_t yyscanner ); -int hsql_get_lineno (yyscan_t yyscanner ); +int yyget_lineno ( yyscan_t yyscanner ); -void hsql_set_lineno (int _line_number ,yyscan_t yyscanner ); +void yyset_lineno ( int _line_number , yyscan_t yyscanner ); -int hsql_get_column (yyscan_t yyscanner ); +int yyget_column ( yyscan_t yyscanner ); -void hsql_set_column (int _column_no ,yyscan_t yyscanner ); +void yyset_column ( int _column_no , yyscan_t yyscanner ); -YYSTYPE * hsql_get_lval (yyscan_t yyscanner ); +YYSTYPE * yyget_lval ( yyscan_t yyscanner ); -void hsql_set_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); +void yyset_lval ( YYSTYPE * yylval_param , yyscan_t yyscanner ); - YYLTYPE *hsql_get_lloc (yyscan_t yyscanner ); + YYLTYPE *yyget_lloc ( yyscan_t yyscanner ); - void hsql_set_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner ); + void yyset_lloc ( YYLTYPE * yylloc_param , yyscan_t yyscanner ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -1767,9 +2000,9 @@ void hsql_set_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int hsql_wrap (yyscan_t yyscanner ); +extern "C" int yywrap ( yyscan_t yyscanner ); #else -extern int hsql_wrap (yyscan_t yyscanner ); +extern int yywrap ( yyscan_t yyscanner ); #endif #endif @@ -1778,19 +2011,18 @@ extern int hsql_wrap (yyscan_t yyscanner ); #endif #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); +static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); +static int yy_flex_strlen ( const char * , yyscan_t yyscanner); #endif #ifndef YY_NO_INPUT - #ifdef __cplusplus -static int yyinput (yyscan_t yyscanner ); +static int yyinput ( yyscan_t yyscanner ); #else -static int input (yyscan_t yyscanner ); +static int input ( yyscan_t yyscanner ); #endif #endif @@ -1821,7 +2053,7 @@ static int input (yyscan_t yyscanner ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -1834,7 +2066,7 @@ static int input (yyscan_t yyscanner ); else \ { \ errno=0; \ - while ( (result = (int) fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ + while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ { \ if( errno != EINTR) \ { \ @@ -1875,10 +2107,10 @@ static int input (yyscan_t yyscanner ); #ifndef YY_DECL #define YY_DECL_IS_OURS 1 -extern int hsql_lex \ - (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner); +extern int yylex \ + (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner); -#define YY_DECL int hsql_lex \ +#define YY_DECL int yylex \ (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner) #endif /* !YY_DECL */ @@ -1928,19 +2160,19 @@ YY_DECL yyout = stdout; if ( ! YY_CURRENT_BUFFER ) { - hsql_ensure_buffer_stack (yyscanner); + yyensure_buffer_stack (yyscanner); YY_CURRENT_BUFFER_LVALUE = - hsql__create_buffer(yyin,YY_BUF_SIZE ,yyscanner); + yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); } - hsql__load_buffer_state(yyscanner ); + yy_load_buffer_state( yyscanner ); } { #line 51 "flex_lexer.l" -#line 1944 "flex_lexer.cpp" +#line 2176 "flex_lexer.cpp" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1967,13 +2199,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 >= 988 ) - yy_c = yy_meta[(unsigned int) yy_c]; + if ( yy_current_state >= 986 ) + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } - while ( yy_current_state != 987 ); + while ( yy_current_state != 985 ); yy_cp = yyg->yy_last_accepting_cpos; yy_current_state = yyg->yy_last_accepting_state; @@ -2453,198 +2685,198 @@ TOKEN(NULL) case 92: YY_RULE_SETUP #line 146 "flex_lexer.l" -TOKEN(PART) +TOKEN(PLAN) YY_BREAK case 93: YY_RULE_SETUP #line 147 "flex_lexer.l" -TOKEN(PLAN) +TOKEN(SHOW) YY_BREAK case 94: YY_RULE_SETUP #line 148 "flex_lexer.l" -TOKEN(SHOW) +TOKEN(TEXT) YY_BREAK case 95: YY_RULE_SETUP #line 149 "flex_lexer.l" -TOKEN(TEXT) +TOKEN(THEN) YY_BREAK case 96: YY_RULE_SETUP #line 150 "flex_lexer.l" -TOKEN(THEN) +TOKEN(TIME) YY_BREAK case 97: YY_RULE_SETUP #line 151 "flex_lexer.l" -TOKEN(TIME) +TOKEN(VIEW) YY_BREAK case 98: YY_RULE_SETUP #line 152 "flex_lexer.l" -TOKEN(VIEW) +TOKEN(WHEN) YY_BREAK case 99: YY_RULE_SETUP #line 153 "flex_lexer.l" -TOKEN(WHEN) +TOKEN(WITH) YY_BREAK case 100: YY_RULE_SETUP #line 154 "flex_lexer.l" -TOKEN(WITH) +TOKEN(ADD) YY_BREAK case 101: YY_RULE_SETUP #line 155 "flex_lexer.l" -TOKEN(ADD) +TOKEN(ALL) YY_BREAK case 102: YY_RULE_SETUP #line 156 "flex_lexer.l" -TOKEN(ALL) +TOKEN(AND) YY_BREAK case 103: YY_RULE_SETUP #line 157 "flex_lexer.l" -TOKEN(AND) +TOKEN(ASC) YY_BREAK case 104: YY_RULE_SETUP #line 158 "flex_lexer.l" -TOKEN(ASC) +TOKEN(CSV) YY_BREAK case 105: YY_RULE_SETUP #line 159 "flex_lexer.l" -TOKEN(CSV) +TOKEN(END) YY_BREAK case 106: YY_RULE_SETUP #line 160 "flex_lexer.l" -TOKEN(END) +TOKEN(FOR) YY_BREAK case 107: YY_RULE_SETUP #line 161 "flex_lexer.l" -TOKEN(FOR) +TOKEN(INT) YY_BREAK case 108: YY_RULE_SETUP #line 162 "flex_lexer.l" -TOKEN(INT) +TOKEN(KEY) YY_BREAK case 109: YY_RULE_SETUP #line 163 "flex_lexer.l" -TOKEN(KEY) +TOKEN(NOT) YY_BREAK case 110: YY_RULE_SETUP #line 164 "flex_lexer.l" -TOKEN(NOT) +TOKEN(OFF) YY_BREAK case 111: YY_RULE_SETUP #line 165 "flex_lexer.l" -TOKEN(OFF) +TOKEN(SET) YY_BREAK case 112: YY_RULE_SETUP #line 166 "flex_lexer.l" -TOKEN(SET) +TOKEN(TBL) YY_BREAK case 113: YY_RULE_SETUP #line 167 "flex_lexer.l" -TOKEN(TBL) +TOKEN(TOP) YY_BREAK case 114: YY_RULE_SETUP #line 168 "flex_lexer.l" -TOKEN(TOP) +TOKEN(AS) YY_BREAK case 115: YY_RULE_SETUP #line 169 "flex_lexer.l" -TOKEN(AS) +TOKEN(BY) YY_BREAK case 116: YY_RULE_SETUP #line 170 "flex_lexer.l" -TOKEN(BY) +TOKEN(IF) YY_BREAK case 117: YY_RULE_SETUP #line 171 "flex_lexer.l" -TOKEN(IF) +TOKEN(IN) YY_BREAK case 118: YY_RULE_SETUP #line 172 "flex_lexer.l" -TOKEN(IN) +TOKEN(IS) YY_BREAK case 119: YY_RULE_SETUP #line 173 "flex_lexer.l" -TOKEN(IS) +TOKEN(OF) YY_BREAK case 120: YY_RULE_SETUP #line 174 "flex_lexer.l" -TOKEN(OF) +TOKEN(ON) YY_BREAK case 121: YY_RULE_SETUP #line 175 "flex_lexer.l" -TOKEN(ON) +TOKEN(OR) YY_BREAK case 122: YY_RULE_SETUP #line 176 "flex_lexer.l" -TOKEN(OR) +TOKEN(TO) YY_BREAK case 123: YY_RULE_SETUP #line 177 "flex_lexer.l" -TOKEN(TO) +TOKEN(SECOND) YY_BREAK case 124: YY_RULE_SETUP #line 178 "flex_lexer.l" -TOKEN(SECOND) +TOKEN(MINUTE) YY_BREAK case 125: YY_RULE_SETUP #line 179 "flex_lexer.l" -TOKEN(MINUTE) +TOKEN(HOUR) YY_BREAK case 126: YY_RULE_SETUP #line 180 "flex_lexer.l" -TOKEN(HOUR) +TOKEN(DAY) YY_BREAK case 127: YY_RULE_SETUP #line 181 "flex_lexer.l" -TOKEN(DAY) +TOKEN(MONTH) YY_BREAK case 128: YY_RULE_SETUP #line 182 "flex_lexer.l" -TOKEN(MONTH) - YY_BREAK -case 129: -YY_RULE_SETUP -#line 183 "flex_lexer.l" TOKEN(YEAR) YY_BREAK /* Allow =/== see https://sqlite.org/lang_expr.html#collateop */ +case 129: +YY_RULE_SETUP +#line 185 "flex_lexer.l" +TOKEN(EQUALS) + YY_BREAK case 130: YY_RULE_SETUP #line 186 "flex_lexer.l" -TOKEN(EQUALS) +TOKEN(NOTEQUALS) YY_BREAK case 131: YY_RULE_SETUP @@ -2654,83 +2886,78 @@ TOKEN(NOTEQUALS) case 132: YY_RULE_SETUP #line 188 "flex_lexer.l" -TOKEN(NOTEQUALS) +TOKEN(LESSEQ) YY_BREAK case 133: YY_RULE_SETUP #line 189 "flex_lexer.l" -TOKEN(LESSEQ) +TOKEN(GREATEREQ) YY_BREAK case 134: YY_RULE_SETUP #line 190 "flex_lexer.l" -TOKEN(GREATEREQ) +TOKEN(CONCAT) YY_BREAK case 135: YY_RULE_SETUP -#line 191 "flex_lexer.l" -TOKEN(CONCAT) - YY_BREAK -case 136: -YY_RULE_SETUP -#line 193 "flex_lexer.l" +#line 192 "flex_lexer.l" { return yytext[0]; } YY_BREAK +case 136: +#line 195 "flex_lexer.l" case 137: -#line 196 "flex_lexer.l" -case 138: YY_RULE_SETUP -#line 196 "flex_lexer.l" +#line 195 "flex_lexer.l" { yylval->fval = atof(yytext); return SQL_FLOATVAL; } YY_BREAK -case 139: +case 138: YY_RULE_SETUP -#line 201 "flex_lexer.l" +#line 200 "flex_lexer.l" { yylval->ival = atol(yytext); return SQL_INTVAL; } YY_BREAK -case 140: +case 139: YY_RULE_SETUP -#line 206 "flex_lexer.l" +#line 205 "flex_lexer.l" { // Crop the leading and trailing quote char yylval->sval = hsql::substr(yytext, 1, strlen(yytext)-1); return SQL_IDENTIFIER; } YY_BREAK -case 141: +case 140: YY_RULE_SETUP -#line 212 "flex_lexer.l" +#line 211 "flex_lexer.l" { yylval->sval = strdup(yytext); return SQL_IDENTIFIER; } YY_BREAK -case 142: +case 141: YY_RULE_SETUP -#line 217 "flex_lexer.l" +#line 216 "flex_lexer.l" { // Crop the leading and trailing quote char yylval->sval = hsql::substr(yytext, 1, strlen(yytext)-1); return SQL_STRING; } YY_BREAK -case 143: +case 142: YY_RULE_SETUP -#line 223 "flex_lexer.l" +#line 222 "flex_lexer.l" { fprintf(stderr, "[SQL-Lexer-Error] Unknown Character: %c\n", yytext[0]); return 0; } YY_BREAK -case 144: +case 143: YY_RULE_SETUP -#line 226 "flex_lexer.l" +#line 225 "flex_lexer.l" ECHO; YY_BREAK -#line 2734 "flex_lexer.cpp" +#line 2961 "flex_lexer.cpp" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(COMMENT): yyterminate(); @@ -2749,7 +2976,7 @@ case YY_STATE_EOF(COMMENT): /* We're scanning a new file or input source. It's * possible that this happened because the user * just pointed yyin at a new source and called - * hsql_lex(). If so, then we have to assure + * yylex(). If so, then we have to assure * consistency between YY_CURRENT_BUFFER and our * globals. Here is the right place to do so, because * this is the first action (other than possibly a @@ -2810,7 +3037,7 @@ case YY_STATE_EOF(COMMENT): { yyg->yy_did_buffer_switch_on_eof = 0; - if ( hsql_wrap(yyscanner ) ) + if ( yywrap( yyscanner ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -2864,7 +3091,7 @@ case YY_STATE_EOF(COMMENT): } /* end of action switch */ } /* end of scanning one token */ } /* end of user's declarations */ -} /* end of hsql_lex */ +} /* end of yylex */ /* yy_get_next_buffer - try to read in a new buffer * @@ -2943,7 +3170,8 @@ static int yy_get_next_buffer (yyscan_t yyscanner) b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - hsql_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ,yyscanner ); + yyrealloc( (void *) b->yy_ch_buf, + (yy_size_t) (b->yy_buf_size + 2) , yyscanner ); } else /* Can't grow it, we don't own it. */ @@ -2975,7 +3203,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - hsql_restart(yyin ,yyscanner); + yyrestart( yyin , yyscanner); } else @@ -2992,9 +3220,12 @@ static int yy_get_next_buffer (yyscan_t yyscanner) if ((yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { /* Extend the array by 50%, plus the number we really need. */ int new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) hsql_realloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner ); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc( + (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size , yyscanner ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + /* "- 2" to take care of EOB's */ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); } yyg->yy_n_chars += number_to_move; @@ -3027,10 +3258,10 @@ 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 >= 988 ) - yy_c = yy_meta[(unsigned int) yy_c]; + if ( yy_current_state >= 986 ) + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; } return yy_current_state; @@ -3056,11 +3287,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 >= 988 ) - yy_c = yy_meta[(unsigned int) yy_c]; + if ( yy_current_state >= 986 ) + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; - yy_is_jam = (yy_current_state == 987); + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; + yy_is_jam = (yy_current_state == 985); (void)yyg; return yy_is_jam ? 0 : yy_current_state; @@ -3095,7 +3326,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) else { /* need more input */ - int offset = yyg->yy_c_buf_p - yyg->yytext_ptr; + int offset = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr); ++yyg->yy_c_buf_p; switch ( yy_get_next_buffer( yyscanner ) ) @@ -3112,13 +3343,13 @@ static int yy_get_next_buffer (yyscan_t yyscanner) */ /* Reset buffer status. */ - hsql_restart(yyin ,yyscanner); + yyrestart( yyin , yyscanner); /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( hsql_wrap(yyscanner ) ) + if ( yywrap( yyscanner ) ) return 0; if ( ! yyg->yy_did_buffer_switch_on_eof ) @@ -3150,34 +3381,34 @@ static int yy_get_next_buffer (yyscan_t yyscanner) * @param yyscanner The scanner object. * @note This function does not reset the start condition to @c INITIAL . */ - void hsql_restart (FILE * input_file , yyscan_t yyscanner) + void yyrestart (FILE * input_file , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if ( ! YY_CURRENT_BUFFER ){ - hsql_ensure_buffer_stack (yyscanner); + yyensure_buffer_stack (yyscanner); YY_CURRENT_BUFFER_LVALUE = - hsql__create_buffer(yyin,YY_BUF_SIZE ,yyscanner); + yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); } - hsql__init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner); - hsql__load_buffer_state(yyscanner ); + yy_init_buffer( YY_CURRENT_BUFFER, input_file , yyscanner); + yy_load_buffer_state( yyscanner ); } /** Switch to a different input buffer. * @param new_buffer The new input buffer. * @param yyscanner The scanner object. */ - void hsql__switch_to_buffer (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) + void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* TODO. We should be able to replace this entire function body * with - * hsql_pop_buffer_state(); - * hsql_push_buffer_state(new_buffer); + * yypop_buffer_state(); + * yypush_buffer_state(new_buffer); */ - hsql_ensure_buffer_stack (yyscanner); + yyensure_buffer_stack (yyscanner); if ( YY_CURRENT_BUFFER == new_buffer ) return; @@ -3190,17 +3421,17 @@ static int yy_get_next_buffer (yyscan_t yyscanner) } YY_CURRENT_BUFFER_LVALUE = new_buffer; - hsql__load_buffer_state(yyscanner ); + yy_load_buffer_state( yyscanner ); /* We don't actually know whether we did this switch during - * EOF (hsql_wrap()) processing, but the only time this flag - * is looked at is after hsql_wrap() is called, so it's safe + * EOF (yywrap()) processing, but the only time this flag + * is looked at is after yywrap() is called, so it's safe * to go ahead and always set it. */ yyg->yy_did_buffer_switch_on_eof = 1; } -static void hsql__load_buffer_state (yyscan_t yyscanner) +static void yy_load_buffer_state (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; @@ -3215,35 +3446,35 @@ static void hsql__load_buffer_state (yyscan_t yyscanner) * @param yyscanner The scanner object. * @return the allocated buffer state. */ - YY_BUFFER_STATE hsql__create_buffer (FILE * file, int size , yyscan_t yyscanner) + YY_BUFFER_STATE yy_create_buffer (FILE * file, int size , yyscan_t yyscanner) { YY_BUFFER_STATE b; - b = (YY_BUFFER_STATE) hsql_alloc(sizeof( struct yy_buffer_state ) ,yyscanner ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) , yyscanner ); if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in hsql__create_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - b->yy_buf_size = (yy_size_t)size; + b->yy_buf_size = size; /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) hsql_alloc(b->yy_buf_size + 2 ,yyscanner ); + b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) , yyscanner ); if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in hsql__create_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - hsql__init_buffer(b,file ,yyscanner); + yy_init_buffer( b, file , yyscanner); return b; } /** Destroy the buffer. - * @param b a buffer created with hsql__create_buffer() + * @param b a buffer created with yy_create_buffer() * @param yyscanner The scanner object. */ - void hsql__delete_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) + void yy_delete_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; @@ -3254,28 +3485,28 @@ static void hsql__load_buffer_state (yyscan_t yyscanner) YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - hsql_free((void *) b->yy_ch_buf ,yyscanner ); + yyfree( (void *) b->yy_ch_buf , yyscanner ); - hsql_free((void *) b ,yyscanner ); + yyfree( (void *) b , yyscanner ); } /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, - * such as during a hsql_restart() or at EOF. + * such as during a yyrestart() or at EOF. */ - static void hsql__init_buffer (YY_BUFFER_STATE b, FILE * file , yyscan_t yyscanner) + static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file , yyscan_t yyscanner) { int oerrno = errno; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - hsql__flush_buffer(b ,yyscanner); + yy_flush_buffer( b , yyscanner); b->yy_input_file = file; b->yy_fill_buffer = 1; - /* If b is the current buffer, then hsql__init_buffer was _probably_ - * called from hsql_restart() or through yy_get_next_buffer. + /* If b is the current buffer, then yy_init_buffer was _probably_ + * called from yyrestart() or through yy_get_next_buffer. * In that case, we don't want to reset the lineno or column. */ if (b != YY_CURRENT_BUFFER){ @@ -3292,7 +3523,7 @@ static void hsql__load_buffer_state (yyscan_t yyscanner) * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. * @param yyscanner The scanner object. */ - void hsql__flush_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) + void yy_flush_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if ( ! b ) @@ -3313,7 +3544,7 @@ static void hsql__load_buffer_state (yyscan_t yyscanner) b->yy_buffer_status = YY_BUFFER_NEW; if ( b == YY_CURRENT_BUFFER ) - hsql__load_buffer_state(yyscanner ); + yy_load_buffer_state( yyscanner ); } /** Pushes the new state onto the stack. The new state becomes @@ -3322,15 +3553,15 @@ static void hsql__load_buffer_state (yyscan_t yyscanner) * @param new_buffer The new state. * @param yyscanner The scanner object. */ -void hsql_push_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) +void yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if (new_buffer == NULL) return; - hsql_ensure_buffer_stack(yyscanner); + yyensure_buffer_stack(yyscanner); - /* This block is copied from hsql__switch_to_buffer. */ + /* This block is copied from yy_switch_to_buffer. */ if ( YY_CURRENT_BUFFER ) { /* Flush out information for old buffer. */ @@ -3344,8 +3575,8 @@ void hsql_push_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) yyg->yy_buffer_stack_top++; YY_CURRENT_BUFFER_LVALUE = new_buffer; - /* copied from hsql__switch_to_buffer. */ - hsql__load_buffer_state(yyscanner ); + /* copied from yy_switch_to_buffer. */ + yy_load_buffer_state( yyscanner ); yyg->yy_did_buffer_switch_on_eof = 1; } @@ -3353,19 +3584,19 @@ void hsql_push_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) * The next element becomes the new top. * @param yyscanner The scanner object. */ -void hsql_pop_buffer_state (yyscan_t yyscanner) +void yypop_buffer_state (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if (!YY_CURRENT_BUFFER) return; - hsql__delete_buffer(YY_CURRENT_BUFFER ,yyscanner); + yy_delete_buffer(YY_CURRENT_BUFFER , yyscanner); YY_CURRENT_BUFFER_LVALUE = NULL; if (yyg->yy_buffer_stack_top > 0) --yyg->yy_buffer_stack_top; if (YY_CURRENT_BUFFER) { - hsql__load_buffer_state(yyscanner ); + yy_load_buffer_state( yyscanner ); yyg->yy_did_buffer_switch_on_eof = 1; } } @@ -3373,9 +3604,9 @@ void hsql_pop_buffer_state (yyscan_t yyscanner) /* Allocates the stack if it does not exist. * Guarantees space for at least one push. */ -static void hsql_ensure_buffer_stack (yyscan_t yyscanner) +static void yyensure_buffer_stack (yyscan_t yyscanner) { - int num_to_alloc; + yy_size_t num_to_alloc; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if (!yyg->yy_buffer_stack) { @@ -3385,11 +3616,11 @@ static void hsql_ensure_buffer_stack (yyscan_t yyscanner) * immediate realloc on the next call. */ num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ - yyg->yy_buffer_stack = (struct yy_buffer_state**)hsql_alloc + yyg->yy_buffer_stack = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) , yyscanner); if ( ! yyg->yy_buffer_stack ) - YY_FATAL_ERROR( "out of dynamic memory in hsql_ensure_buffer_stack()" ); + YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*)); @@ -3404,12 +3635,12 @@ static void hsql_ensure_buffer_stack (yyscan_t yyscanner) yy_size_t grow_size = 8 /* arbitrary grow size */; num_to_alloc = yyg->yy_buffer_stack_max + grow_size; - yyg->yy_buffer_stack = (struct yy_buffer_state**)hsql_realloc + yyg->yy_buffer_stack = (struct yy_buffer_state**)yyrealloc (yyg->yy_buffer_stack, num_to_alloc * sizeof(struct yy_buffer_state*) , yyscanner); if ( ! yyg->yy_buffer_stack ) - YY_FATAL_ERROR( "out of dynamic memory in hsql_ensure_buffer_stack()" ); + YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); /* zero only the new slots.*/ memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*)); @@ -3423,7 +3654,7 @@ static void hsql_ensure_buffer_stack (yyscan_t yyscanner) * @param yyscanner The scanner object. * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE hsql__scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner) +YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner) { YY_BUFFER_STATE b; @@ -3433,11 +3664,11 @@ YY_BUFFER_STATE hsql__scan_buffer (char * base, yy_size_t size , yyscan_t yysc /* They forgot to leave room for the EOB's. */ return NULL; - b = (YY_BUFFER_STATE) hsql_alloc(sizeof( struct yy_buffer_state ) ,yyscanner ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) , yyscanner ); if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in hsql__scan_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */ b->yy_buf_pos = b->yy_ch_buf = base; b->yy_is_our_buffer = 0; b->yy_input_file = NULL; @@ -3447,33 +3678,33 @@ YY_BUFFER_STATE hsql__scan_buffer (char * base, yy_size_t size , yyscan_t yysc b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - hsql__switch_to_buffer(b ,yyscanner ); + yy_switch_to_buffer( b , yyscanner ); return b; } -/** Setup the input buffer state to scan a string. The next call to hsql_lex() will +/** Setup the input buffer state to scan a string. The next call to yylex() will * scan from a @e copy of @a str. * @param yystr a NUL-terminated string to scan * @param yyscanner The scanner object. * @return the newly allocated buffer state object. * @note If you want to scan bytes that may contain NUL values, then use - * hsql__scan_bytes() instead. + * yy_scan_bytes() instead. */ -YY_BUFFER_STATE hsql__scan_string (yyconst char * yystr , yyscan_t yyscanner) +YY_BUFFER_STATE yy_scan_string (const char * yystr , yyscan_t yyscanner) { - return hsql__scan_bytes(yystr,(int) strlen(yystr) ,yyscanner); + return yy_scan_bytes( yystr, (int) strlen(yystr) , yyscanner); } -/** Setup the input buffer state to scan the given bytes. The next call to hsql_lex() will +/** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. * @param yybytes the byte buffer to scan * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. * @param yyscanner The scanner object. * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE hsql__scan_bytes (yyconst char * yybytes, int _yybytes_len , yyscan_t yyscanner) +YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len , yyscan_t yyscanner) { YY_BUFFER_STATE b; char *buf; @@ -3482,18 +3713,18 @@ YY_BUFFER_STATE hsql__scan_bytes (yyconst char * yybytes, int _yybytes_len , y /* Get memory for full buffer, including space for trailing EOB's. */ n = (yy_size_t) (_yybytes_len + 2); - buf = (char *) hsql_alloc(n ,yyscanner ); + buf = (char *) yyalloc( n , yyscanner ); if ( ! buf ) - YY_FATAL_ERROR( "out of dynamic memory in hsql__scan_bytes()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); for ( i = 0; i < _yybytes_len; ++i ) buf[i] = yybytes[i]; buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - b = hsql__scan_buffer(buf,n ,yyscanner); + b = yy_scan_buffer( buf, n , yyscanner); if ( ! b ) - YY_FATAL_ERROR( "bad buffer in hsql__scan_bytes()" ); + YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); /* It's okay to grow etc. this buffer, and we should throw it * away when we're done. @@ -3507,11 +3738,11 @@ YY_BUFFER_STATE hsql__scan_bytes (yyconst char * yybytes, int _yybytes_len , y #define YY_EXIT_FAILURE 2 #endif -static void yynoreturn yy_fatal_error (yyconst char* msg , yyscan_t yyscanner) +static void yynoreturn yy_fatal_error (const char* msg , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; (void)yyg; - (void) fprintf( stderr, "%s\n", msg ); + fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } @@ -3537,7 +3768,7 @@ static void yynoreturn yy_fatal_error (yyconst char* msg , yyscan_t yyscanner) /** Get the user-defined data for this scanner. * @param yyscanner The scanner object. */ -YY_EXTRA_TYPE hsql_get_extra (yyscan_t yyscanner) +YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyextra; @@ -3546,7 +3777,7 @@ YY_EXTRA_TYPE hsql_get_extra (yyscan_t yyscanner) /** Get the current line number. * @param yyscanner The scanner object. */ -int hsql_get_lineno (yyscan_t yyscanner) +int yyget_lineno (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; @@ -3559,7 +3790,7 @@ int hsql_get_lineno (yyscan_t yyscanner) /** Get the current column number. * @param yyscanner The scanner object. */ -int hsql_get_column (yyscan_t yyscanner) +int yyget_column (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; @@ -3572,7 +3803,7 @@ int hsql_get_column (yyscan_t yyscanner) /** Get the input stream. * @param yyscanner The scanner object. */ -FILE *hsql_get_in (yyscan_t yyscanner) +FILE *yyget_in (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyin; @@ -3581,7 +3812,7 @@ FILE *hsql_get_in (yyscan_t yyscanner) /** Get the output stream. * @param yyscanner The scanner object. */ -FILE *hsql_get_out (yyscan_t yyscanner) +FILE *yyget_out (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyout; @@ -3590,7 +3821,7 @@ FILE *hsql_get_out (yyscan_t yyscanner) /** Get the length of the current token. * @param yyscanner The scanner object. */ -int hsql_get_leng (yyscan_t yyscanner) +int yyget_leng (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyleng; @@ -3600,7 +3831,7 @@ int hsql_get_leng (yyscan_t yyscanner) * @param yyscanner The scanner object. */ -char *hsql_get_text (yyscan_t yyscanner) +char *yyget_text (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yytext; @@ -3610,7 +3841,7 @@ char *hsql_get_text (yyscan_t yyscanner) * @param user_defined The data to be associated with this scanner. * @param yyscanner The scanner object. */ -void hsql_set_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner) +void yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yyextra = user_defined ; @@ -3620,13 +3851,13 @@ void hsql_set_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner) * @param _line_number line number * @param yyscanner The scanner object. */ -void hsql_set_lineno (int _line_number , yyscan_t yyscanner) +void yyset_lineno (int _line_number , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* lineno is only valid if an input buffer exists. */ if (! YY_CURRENT_BUFFER ) - YY_FATAL_ERROR( "hsql_set_lineno called with no buffer" ); + YY_FATAL_ERROR( "yyset_lineno called with no buffer" ); yylineno = _line_number; } @@ -3635,13 +3866,13 @@ void hsql_set_lineno (int _line_number , yyscan_t yyscanner) * @param _column_no column number * @param yyscanner The scanner object. */ -void hsql_set_column (int _column_no , yyscan_t yyscanner) +void yyset_column (int _column_no , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* column is only valid if an input buffer exists. */ if (! YY_CURRENT_BUFFER ) - YY_FATAL_ERROR( "hsql_set_column called with no buffer" ); + YY_FATAL_ERROR( "yyset_column called with no buffer" ); yycolumn = _column_no; } @@ -3650,27 +3881,27 @@ void hsql_set_column (int _column_no , yyscan_t yyscanner) * input buffer. * @param _in_str A readable stream. * @param yyscanner The scanner object. - * @see hsql__switch_to_buffer + * @see yy_switch_to_buffer */ -void hsql_set_in (FILE * _in_str , yyscan_t yyscanner) +void yyset_in (FILE * _in_str , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yyin = _in_str ; } -void hsql_set_out (FILE * _out_str , yyscan_t yyscanner) +void yyset_out (FILE * _out_str , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yyout = _out_str ; } -int hsql_get_debug (yyscan_t yyscanner) +int yyget_debug (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yy_flex_debug; } -void hsql_set_debug (int _bdebug , yyscan_t yyscanner) +void yyset_debug (int _bdebug , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yy_flex_debug = _bdebug ; @@ -3678,25 +3909,25 @@ void hsql_set_debug (int _bdebug , yyscan_t yyscanner) /* Accessor methods for yylval and yylloc */ -YYSTYPE * hsql_get_lval (yyscan_t yyscanner) +YYSTYPE * yyget_lval (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yylval; } -void hsql_set_lval (YYSTYPE * yylval_param , yyscan_t yyscanner) +void yyset_lval (YYSTYPE * yylval_param , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yylval = yylval_param; } -YYLTYPE *hsql_get_lloc (yyscan_t yyscanner) +YYLTYPE *yyget_lloc (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yylloc; } -void hsql_set_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner) +void yyset_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yylloc = yylloc_param; @@ -3704,20 +3935,18 @@ void hsql_set_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner) /* User-visible API */ -/* hsql_lex_init is special because it creates the scanner itself, so it is +/* yylex_init is special because it creates the scanner itself, so it is * the ONLY reentrant function that doesn't take the scanner as the last argument. * That's why we explicitly handle the declaration, instead of using our macros. */ - -int hsql_lex_init(yyscan_t* ptr_yy_globals) - +int yylex_init(yyscan_t* ptr_yy_globals) { if (ptr_yy_globals == NULL){ errno = EINVAL; return 1; } - *ptr_yy_globals = (yyscan_t) hsql_alloc ( sizeof( struct yyguts_t ), NULL ); + *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), NULL ); if (*ptr_yy_globals == NULL){ errno = ENOMEM; @@ -3730,27 +3959,25 @@ int hsql_lex_init(yyscan_t* ptr_yy_globals) return yy_init_globals ( *ptr_yy_globals ); } -/* hsql_lex_init_extra has the same functionality as hsql_lex_init, but follows the +/* yylex_init_extra has the same functionality as yylex_init, but follows the * convention of taking the scanner as the last argument. Note however, that * this is a *pointer* to a scanner, as it will be allocated by this call (and * is the reason, too, why this function also must handle its own declaration). - * The user defined value in the first argument will be available to hsql_alloc in + * The user defined value in the first argument will be available to yyalloc in * the yyextra field. */ - -int hsql_lex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals ) - +int yylex_init_extra( YY_EXTRA_TYPE yy_user_defined, yyscan_t* ptr_yy_globals ) { struct yyguts_t dummy_yyguts; - hsql_set_extra (yy_user_defined, &dummy_yyguts); + yyset_extra (yy_user_defined, &dummy_yyguts); if (ptr_yy_globals == NULL){ errno = EINVAL; return 1; } - *ptr_yy_globals = (yyscan_t) hsql_alloc ( sizeof( struct yyguts_t ), &dummy_yyguts ); + *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts ); if (*ptr_yy_globals == NULL){ errno = ENOMEM; @@ -3761,7 +3988,7 @@ int hsql_lex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals ) yy_init_globals. Leave at 0x00 for releases. */ memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); - hsql_set_extra (yy_user_defined, *ptr_yy_globals); + yyset_extra (yy_user_defined, *ptr_yy_globals); return yy_init_globals ( *ptr_yy_globals ); } @@ -3770,7 +3997,7 @@ static int yy_init_globals (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* Initialization is the same as for the non-reentrant scanner. - * This function is called from hsql_lex_destroy(), so don't allocate here. + * This function is called from yylex_destroy(), so don't allocate here. */ yyg->yy_buffer_stack = NULL; @@ -3794,37 +4021,37 @@ static int yy_init_globals (yyscan_t yyscanner) #endif /* For future reference: Set errno on error, since we are called by - * hsql_lex_init() + * yylex_init() */ return 0; } -/* hsql_lex_destroy is for both reentrant and non-reentrant scanners. */ -int hsql_lex_destroy (yyscan_t yyscanner) +/* yylex_destroy is for both reentrant and non-reentrant scanners. */ +int yylex_destroy (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ - hsql__delete_buffer(YY_CURRENT_BUFFER ,yyscanner ); + yy_delete_buffer( YY_CURRENT_BUFFER , yyscanner ); YY_CURRENT_BUFFER_LVALUE = NULL; - hsql_pop_buffer_state(yyscanner); + yypop_buffer_state(yyscanner); } /* Destroy the stack itself. */ - hsql_free(yyg->yy_buffer_stack ,yyscanner); + yyfree(yyg->yy_buffer_stack , yyscanner); yyg->yy_buffer_stack = NULL; /* Destroy the start condition stack. */ - hsql_free(yyg->yy_start_stack ,yyscanner ); + yyfree( yyg->yy_start_stack , yyscanner ); yyg->yy_start_stack = NULL; /* Reset the globals. This is important in a non-reentrant scanner so the next time - * hsql_lex() is called, initialization will occur. */ + * yylex() is called, initialization will occur. */ yy_init_globals( yyscanner); /* Destroy the main struct (reentrant only). */ - hsql_free ( yyscanner , yyscanner ); + yyfree ( yyscanner , yyscanner ); yyscanner = NULL; return 0; } @@ -3834,7 +4061,7 @@ int hsql_lex_destroy (yyscan_t yyscanner) */ #ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner) +static void yy_flex_strncpy (char* s1, const char * s2, int n , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; (void)yyg; @@ -3846,7 +4073,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yysca #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) +static int yy_flex_strlen (const char * s , yyscan_t yyscanner) { int n; for ( n = 0; s[n]; ++n ) @@ -3856,14 +4083,14 @@ static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) } #endif -void *hsql_alloc (yy_size_t size , yyscan_t yyscanner) +void *yyalloc (yy_size_t size , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; (void)yyg; return malloc(size); } -void *hsql_realloc (void * ptr, yy_size_t size , yyscan_t yyscanner) +void *yyrealloc (void * ptr, yy_size_t size , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; (void)yyg; @@ -3878,17 +4105,16 @@ void *hsql_realloc (void * ptr, yy_size_t size , yyscan_t yyscanner) return realloc(ptr, size); } -void hsql_free (void * ptr , yyscan_t yyscanner) +void yyfree (void * ptr , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; (void)yyg; - free( (char *) ptr ); /* see hsql_realloc() for (char *) cast */ + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ } #define YYTABLES_NAME "yytables" -#line 226 "flex_lexer.l" - +#line 225 "flex_lexer.l" /*************************** ** Section 3: User code diff --git a/src/parser/flex_lexer.h b/src/parser/flex_lexer.h index 6556ab0..34f907f 100644 --- a/src/parser/flex_lexer.h +++ b/src/parser/flex_lexer.h @@ -13,11 +13,245 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 6 -#define YY_FLEX_SUBMINOR_VERSION 1 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif +#ifdef yy_create_buffer +#define hsql__create_buffer_ALREADY_DEFINED +#else +#define yy_create_buffer hsql__create_buffer +#endif + +#ifdef yy_delete_buffer +#define hsql__delete_buffer_ALREADY_DEFINED +#else +#define yy_delete_buffer hsql__delete_buffer +#endif + +#ifdef yy_scan_buffer +#define hsql__scan_buffer_ALREADY_DEFINED +#else +#define yy_scan_buffer hsql__scan_buffer +#endif + +#ifdef yy_scan_string +#define hsql__scan_string_ALREADY_DEFINED +#else +#define yy_scan_string hsql__scan_string +#endif + +#ifdef yy_scan_bytes +#define hsql__scan_bytes_ALREADY_DEFINED +#else +#define yy_scan_bytes hsql__scan_bytes +#endif + +#ifdef yy_init_buffer +#define hsql__init_buffer_ALREADY_DEFINED +#else +#define yy_init_buffer hsql__init_buffer +#endif + +#ifdef yy_flush_buffer +#define hsql__flush_buffer_ALREADY_DEFINED +#else +#define yy_flush_buffer hsql__flush_buffer +#endif + +#ifdef yy_load_buffer_state +#define hsql__load_buffer_state_ALREADY_DEFINED +#else +#define yy_load_buffer_state hsql__load_buffer_state +#endif + +#ifdef yy_switch_to_buffer +#define hsql__switch_to_buffer_ALREADY_DEFINED +#else +#define yy_switch_to_buffer hsql__switch_to_buffer +#endif + +#ifdef yypush_buffer_state +#define hsql_push_buffer_state_ALREADY_DEFINED +#else +#define yypush_buffer_state hsql_push_buffer_state +#endif + +#ifdef yypop_buffer_state +#define hsql_pop_buffer_state_ALREADY_DEFINED +#else +#define yypop_buffer_state hsql_pop_buffer_state +#endif + +#ifdef yyensure_buffer_stack +#define hsql_ensure_buffer_stack_ALREADY_DEFINED +#else +#define yyensure_buffer_stack hsql_ensure_buffer_stack +#endif + +#ifdef yylex +#define hsql_lex_ALREADY_DEFINED +#else +#define yylex hsql_lex +#endif + +#ifdef yyrestart +#define hsql_restart_ALREADY_DEFINED +#else +#define yyrestart hsql_restart +#endif + +#ifdef yylex_init +#define hsql_lex_init_ALREADY_DEFINED +#else +#define yylex_init hsql_lex_init +#endif + +#ifdef yylex_init_extra +#define hsql_lex_init_extra_ALREADY_DEFINED +#else +#define yylex_init_extra hsql_lex_init_extra +#endif + +#ifdef yylex_destroy +#define hsql_lex_destroy_ALREADY_DEFINED +#else +#define yylex_destroy hsql_lex_destroy +#endif + +#ifdef yyget_debug +#define hsql_get_debug_ALREADY_DEFINED +#else +#define yyget_debug hsql_get_debug +#endif + +#ifdef yyset_debug +#define hsql_set_debug_ALREADY_DEFINED +#else +#define yyset_debug hsql_set_debug +#endif + +#ifdef yyget_extra +#define hsql_get_extra_ALREADY_DEFINED +#else +#define yyget_extra hsql_get_extra +#endif + +#ifdef yyset_extra +#define hsql_set_extra_ALREADY_DEFINED +#else +#define yyset_extra hsql_set_extra +#endif + +#ifdef yyget_in +#define hsql_get_in_ALREADY_DEFINED +#else +#define yyget_in hsql_get_in +#endif + +#ifdef yyset_in +#define hsql_set_in_ALREADY_DEFINED +#else +#define yyset_in hsql_set_in +#endif + +#ifdef yyget_out +#define hsql_get_out_ALREADY_DEFINED +#else +#define yyget_out hsql_get_out +#endif + +#ifdef yyset_out +#define hsql_set_out_ALREADY_DEFINED +#else +#define yyset_out hsql_set_out +#endif + +#ifdef yyget_leng +#define hsql_get_leng_ALREADY_DEFINED +#else +#define yyget_leng hsql_get_leng +#endif + +#ifdef yyget_text +#define hsql_get_text_ALREADY_DEFINED +#else +#define yyget_text hsql_get_text +#endif + +#ifdef yyget_lineno +#define hsql_get_lineno_ALREADY_DEFINED +#else +#define yyget_lineno hsql_get_lineno +#endif + +#ifdef yyset_lineno +#define hsql_set_lineno_ALREADY_DEFINED +#else +#define yyset_lineno hsql_set_lineno +#endif + +#ifdef yyget_column +#define hsql_get_column_ALREADY_DEFINED +#else +#define yyget_column hsql_get_column +#endif + +#ifdef yyset_column +#define hsql_set_column_ALREADY_DEFINED +#else +#define yyset_column hsql_set_column +#endif + +#ifdef yywrap +#define hsql_wrap_ALREADY_DEFINED +#else +#define yywrap hsql_wrap +#endif + +#ifdef yyget_lval +#define hsql_get_lval_ALREADY_DEFINED +#else +#define yyget_lval hsql_get_lval +#endif + +#ifdef yyset_lval +#define hsql_set_lval_ALREADY_DEFINED +#else +#define yyset_lval hsql_set_lval +#endif + +#ifdef yyget_lloc +#define hsql_get_lloc_ALREADY_DEFINED +#else +#define yyget_lloc hsql_get_lloc +#endif + +#ifdef yyset_lloc +#define hsql_set_lloc_ALREADY_DEFINED +#else +#define yyset_lloc hsql_set_lloc +#endif + +#ifdef yyalloc +#define hsql_alloc_ALREADY_DEFINED +#else +#define yyalloc hsql_alloc +#endif + +#ifdef yyrealloc +#define hsql_realloc_ALREADY_DEFINED +#else +#define yyrealloc hsql_realloc +#endif + +#ifdef yyfree +#define hsql_free_ALREADY_DEFINED +#else +#define yyfree hsql_free +#endif + /* First, we deal with platform-specific or compiler-specific issues. */ /* begin standard C headers. */ @@ -88,10 +322,16 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif + #endif /* ! C99 */ #endif /* ! FLEXINT_H */ +/* begin standard C++ headers. */ + /* TODO: this is always defined, so inline it */ #define yyconst const @@ -192,21 +432,21 @@ struct yy_buffer_state }; #endif /* !YY_STRUCT_YY_BUFFER_STATE */ -void hsql_restart (FILE *input_file ,yyscan_t yyscanner ); -void hsql__switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -YY_BUFFER_STATE hsql__create_buffer (FILE *file,int size ,yyscan_t yyscanner ); -void hsql__delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void hsql__flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void hsql_push_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -void hsql_pop_buffer_state (yyscan_t yyscanner ); +void yyrestart ( FILE *input_file , yyscan_t yyscanner ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner ); +void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +void yypop_buffer_state ( yyscan_t yyscanner ); -YY_BUFFER_STATE hsql__scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); -YY_BUFFER_STATE hsql__scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); -YY_BUFFER_STATE hsql__scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner ); -void *hsql_alloc (yy_size_t ,yyscan_t yyscanner ); -void *hsql_realloc (void *,yy_size_t ,yyscan_t yyscanner ); -void hsql_free (void * ,yyscan_t yyscanner ); +void *yyalloc ( yy_size_t , yyscan_t yyscanner ); +void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner ); +void yyfree ( void * , yyscan_t yyscanner ); /* Begin user sect3 */ @@ -233,50 +473,50 @@ void hsql_free (void * ,yyscan_t yyscanner ); #define YY_EXTRA_TYPE void * #endif -int hsql_lex_init (yyscan_t* scanner); +int yylex_init (yyscan_t* scanner); -int hsql_lex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); +int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int hsql_lex_destroy (yyscan_t yyscanner ); +int yylex_destroy ( yyscan_t yyscanner ); -int hsql_get_debug (yyscan_t yyscanner ); +int yyget_debug ( yyscan_t yyscanner ); -void hsql_set_debug (int debug_flag ,yyscan_t yyscanner ); +void yyset_debug ( int debug_flag , yyscan_t yyscanner ); -YY_EXTRA_TYPE hsql_get_extra (yyscan_t yyscanner ); +YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner ); -void hsql_set_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); +void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner ); -FILE *hsql_get_in (yyscan_t yyscanner ); +FILE *yyget_in ( yyscan_t yyscanner ); -void hsql_set_in (FILE * _in_str ,yyscan_t yyscanner ); +void yyset_in ( FILE * _in_str , yyscan_t yyscanner ); -FILE *hsql_get_out (yyscan_t yyscanner ); +FILE *yyget_out ( yyscan_t yyscanner ); -void hsql_set_out (FILE * _out_str ,yyscan_t yyscanner ); +void yyset_out ( FILE * _out_str , yyscan_t yyscanner ); - int hsql_get_leng (yyscan_t yyscanner ); + int yyget_leng ( yyscan_t yyscanner ); -char *hsql_get_text (yyscan_t yyscanner ); +char *yyget_text ( yyscan_t yyscanner ); -int hsql_get_lineno (yyscan_t yyscanner ); +int yyget_lineno ( yyscan_t yyscanner ); -void hsql_set_lineno (int _line_number ,yyscan_t yyscanner ); +void yyset_lineno ( int _line_number , yyscan_t yyscanner ); -int hsql_get_column (yyscan_t yyscanner ); +int yyget_column ( yyscan_t yyscanner ); -void hsql_set_column (int _column_no ,yyscan_t yyscanner ); +void yyset_column ( int _column_no , yyscan_t yyscanner ); -YYSTYPE * hsql_get_lval (yyscan_t yyscanner ); +YYSTYPE * yyget_lval ( yyscan_t yyscanner ); -void hsql_set_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); +void yyset_lval ( YYSTYPE * yylval_param , yyscan_t yyscanner ); - YYLTYPE *hsql_get_lloc (yyscan_t yyscanner ); + YYLTYPE *yyget_lloc ( yyscan_t yyscanner ); - void hsql_set_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner ); + void yyset_lloc ( YYLTYPE * yylloc_param , yyscan_t yyscanner ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -284,18 +524,18 @@ void hsql_set_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int hsql_wrap (yyscan_t yyscanner ); +extern "C" int yywrap ( yyscan_t yyscanner ); #else -extern int hsql_wrap (yyscan_t yyscanner ); +extern int yywrap ( yyscan_t yyscanner ); #endif #endif #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); +static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); +static int yy_flex_strlen ( const char * , yyscan_t yyscanner); #endif #ifndef YY_NO_INPUT @@ -323,10 +563,10 @@ static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); #ifndef YY_DECL #define YY_DECL_IS_OURS 1 -extern int hsql_lex \ - (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner); +extern int yylex \ + (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner); -#define YY_DECL int hsql_lex \ +#define YY_DECL int yylex \ (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner) #endif /* !YY_DECL */ @@ -344,9 +584,154 @@ extern int hsql_lex \ #undef YY_DECL #endif -#line 226 "flex_lexer.l" +#ifndef hsql__create_buffer_ALREADY_DEFINED +#undef yy_create_buffer +#endif +#ifndef hsql__delete_buffer_ALREADY_DEFINED +#undef yy_delete_buffer +#endif +#ifndef hsql__scan_buffer_ALREADY_DEFINED +#undef yy_scan_buffer +#endif +#ifndef hsql__scan_string_ALREADY_DEFINED +#undef yy_scan_string +#endif +#ifndef hsql__scan_bytes_ALREADY_DEFINED +#undef yy_scan_bytes +#endif +#ifndef hsql__init_buffer_ALREADY_DEFINED +#undef yy_init_buffer +#endif +#ifndef hsql__flush_buffer_ALREADY_DEFINED +#undef yy_flush_buffer +#endif +#ifndef hsql__load_buffer_state_ALREADY_DEFINED +#undef yy_load_buffer_state +#endif +#ifndef hsql__switch_to_buffer_ALREADY_DEFINED +#undef yy_switch_to_buffer +#endif +#ifndef hsql_push_buffer_state_ALREADY_DEFINED +#undef yypush_buffer_state +#endif +#ifndef hsql_pop_buffer_state_ALREADY_DEFINED +#undef yypop_buffer_state +#endif +#ifndef hsql_ensure_buffer_stack_ALREADY_DEFINED +#undef yyensure_buffer_stack +#endif +#ifndef hsql_lex_ALREADY_DEFINED +#undef yylex +#endif +#ifndef hsql_restart_ALREADY_DEFINED +#undef yyrestart +#endif +#ifndef hsql_lex_init_ALREADY_DEFINED +#undef yylex_init +#endif +#ifndef hsql_lex_init_extra_ALREADY_DEFINED +#undef yylex_init_extra +#endif +#ifndef hsql_lex_destroy_ALREADY_DEFINED +#undef yylex_destroy +#endif +#ifndef hsql_get_debug_ALREADY_DEFINED +#undef yyget_debug +#endif +#ifndef hsql_set_debug_ALREADY_DEFINED +#undef yyset_debug +#endif +#ifndef hsql_get_extra_ALREADY_DEFINED +#undef yyget_extra +#endif +#ifndef hsql_set_extra_ALREADY_DEFINED +#undef yyset_extra +#endif +#ifndef hsql_get_in_ALREADY_DEFINED +#undef yyget_in +#endif +#ifndef hsql_set_in_ALREADY_DEFINED +#undef yyset_in +#endif +#ifndef hsql_get_out_ALREADY_DEFINED +#undef yyget_out +#endif +#ifndef hsql_set_out_ALREADY_DEFINED +#undef yyset_out +#endif +#ifndef hsql_get_leng_ALREADY_DEFINED +#undef yyget_leng +#endif +#ifndef hsql_get_text_ALREADY_DEFINED +#undef yyget_text +#endif +#ifndef hsql_get_lineno_ALREADY_DEFINED +#undef yyget_lineno +#endif +#ifndef hsql_set_lineno_ALREADY_DEFINED +#undef yyset_lineno +#endif +#ifndef hsql_get_column_ALREADY_DEFINED +#undef yyget_column +#endif +#ifndef hsql_set_column_ALREADY_DEFINED +#undef yyset_column +#endif +#ifndef hsql_wrap_ALREADY_DEFINED +#undef yywrap +#endif +#ifndef hsql_get_lval_ALREADY_DEFINED +#undef yyget_lval +#endif +#ifndef hsql_set_lval_ALREADY_DEFINED +#undef yyset_lval +#endif +#ifndef hsql_get_lloc_ALREADY_DEFINED +#undef yyget_lloc +#endif +#ifndef hsql_set_lloc_ALREADY_DEFINED +#undef yyset_lloc +#endif +#ifndef hsql_alloc_ALREADY_DEFINED +#undef yyalloc +#endif +#ifndef hsql_realloc_ALREADY_DEFINED +#undef yyrealloc +#endif +#ifndef hsql_free_ALREADY_DEFINED +#undef yyfree +#endif +#ifndef hsql_text_ALREADY_DEFINED +#undef yytext +#endif +#ifndef hsql_leng_ALREADY_DEFINED +#undef yyleng +#endif +#ifndef hsql_in_ALREADY_DEFINED +#undef yyin +#endif +#ifndef hsql_out_ALREADY_DEFINED +#undef yyout +#endif +#ifndef hsql__flex_debug_ALREADY_DEFINED +#undef yy_flex_debug +#endif +#ifndef hsql_lineno_ALREADY_DEFINED +#undef yylineno +#endif +#ifndef hsql_tables_fload_ALREADY_DEFINED +#undef yytables_fload +#endif +#ifndef hsql_tables_destroy_ALREADY_DEFINED +#undef yytables_destroy +#endif +#ifndef hsql_TABLES_NAME_ALREADY_DEFINED +#undef yyTABLES_NAME +#endif + +#line 225 "flex_lexer.l" -#line 351 "flex_lexer.h" +#line 736 "flex_lexer.h" #undef hsql_IN_HEADER #endif /* hsql_HEADER_H */ diff --git a/src/parser/flex_lexer.l b/src/parser/flex_lexer.l index 9dadc78..60ce15d 100644 --- a/src/parser/flex_lexer.l +++ b/src/parser/flex_lexer.l @@ -143,7 +143,6 @@ LIKE TOKEN(LIKE) ILIKE TOKEN(ILIKE) LOAD TOKEN(LOAD) NULL TOKEN(NULL) -PART TOKEN(PART) PLAN TOKEN(PLAN) SHOW TOKEN(SHOW) TEXT TOKEN(TEXT) diff --git a/src/parser/sql_keywords.txt b/src/parser/sql_keywords.txt index dce0e89..944e5ff 100644 --- a/src/parser/sql_keywords.txt +++ b/src/parser/sql_keywords.txt @@ -94,7 +94,6 @@ MERGE HISTORY DELTA OF -PART LOAD UNLOAD diff --git a/test/queries/tpc-h-02.sql b/test/queries/tpc-h-02.sql index 5fd5b50..c40be73 100644 --- a/test/queries/tpc-h-02.sql +++ b/test/queries/tpc-h-02.sql @@ -1,6 +1,6 @@ -- http://www.sqlserver-dba.com/2011/09/this-is-a-followup-on-my-earlier-post-of-sql-server-test-data-generation-testing-tools-i-had-some-requests-for-my-set-up-pr.html SELECT TOP 100 S_ACCTBAL, S_NAME, N_NAME, P_PARTKEY, P_MFGR, S_ADDRESS, S_PHONE, S_COMMENT -FROM "PART", SUPPLIER, PARTSUPP, NATION, REGION +FROM PART, SUPPLIER, PARTSUPP, NATION, REGION WHERE P_PARTKEY = PS_PARTKEY AND S_SUPPKEY = PS_SUPPKEY AND P_SIZE = 15 AND P_TYPE LIKE '%%BRASS' AND S_NATIONKEY = N_NATIONKEY AND N_REGIONKEY = R_REGIONKEY AND R_NAME = 'EUROPE' AND diff --git a/test/queries/tpc-h-14.sql b/test/queries/tpc-h-14.sql index 12fea0d..72cf9c3 100644 --- a/test/queries/tpc-h-14.sql +++ b/test/queries/tpc-h-14.sql @@ -1,5 +1,5 @@ -- TPC_H Query 14 - Promotion Effect SELECT 100.00* SUM(CASE WHEN P_TYPE LIKE 'PROMO%%' THEN L_EXTENDEDPRICE*(1-L_DISCOUNT) ELSE 0 END) / SUM(L_EXTENDEDPRICE*(1-L_DISCOUNT)) AS PROMO_REVENUE -FROM LINEITEM, "PART" +FROM LINEITEM, PART WHERE L_PARTKEY = P_PARTKEY AND L_SHIPDATE >= '1995-09-01' AND L_SHIPDATE < dateadd(mm, 1, '1995-09-01'); \ No newline at end of file