diff --git a/core/oql/oql-lexer.php b/core/oql/oql-lexer.php index 36e5ce4ef..a7520e7ac 100644 --- a/core/oql/oql-lexer.php +++ b/core/oql/oql-lexer.php @@ -179,6 +179,7 @@ class OQLLexerRaw '/\G(0x[0-9a-fA-F]+)/ ', '/\G([0-9]+)/ ', '/\G\"([^\\\\\"]|\\\\\"|\\\\\\\\)*\"|'.chr(94).chr(39).'([^\\\\'.chr(39).']|\\\\'.chr(39).'|\\\\\\\\)*'.chr(39).'/ ', + '/\GNULL/ ', '/\G([_a-zA-Z][_a-zA-Z0-9]*|`[^`]+`)/ ', '/\G:([_a-zA-Z][_a-zA-Z0-9]*->[_a-zA-Z][_a-zA-Z0-9]*|[_a-zA-Z][_a-zA-Z0-9]*)/ ', '/\G\\./ ', @@ -637,14 +638,19 @@ class OQLLexerRaw function yy_r1_72($yy_subpatterns) { - $this->token = OQLParser::NAME; + $this->token = OQLParser::NULL_VAL; } function yy_r1_73($yy_subpatterns) { - $this->token = OQLParser::VARNAME; + $this->token = OQLParser::NAME; } function yy_r1_74($yy_subpatterns) + { + + $this->token = OQLParser::VARNAME; + } + function yy_r1_75($yy_subpatterns) { $this->token = OQLParser::DOT; diff --git a/core/oql/oql-lexer.plex b/core/oql/oql-lexer.plex index ba32ba239..446e482f1 100644 --- a/core/oql/oql-lexer.plex +++ b/core/oql/oql-lexer.plex @@ -148,6 +148,7 @@ above = "ABOVE" above_strict = "ABOVE STRICT" not_above = "NOT ABOVE" not_above_strict = "NOT ABOVE STRICT" +null_val = "NULL" // // WARNING: there seems to be a bug in the Lexer about matching the longest pattern // when there are alternates in the regexp. @@ -391,6 +392,9 @@ numval { strval { $this->token = OQLParser::STRVAL; } +null_val { + $this->token = OQLParser::NULL_VAL; +} name { $this->token = OQLParser::NAME; } diff --git a/core/oql/oql-parser.php b/core/oql/oql-parser.php index ac3847796..937d3faa7 100644 --- a/core/oql/oql-parser.php +++ b/core/oql/oql-parser.php @@ -96,8 +96,8 @@ class OQLParser_yyStackEntry // code external to the class is included here // declare_class is output here -#line 24 "../oql-parser.y" -class OQLParserRaw#line 102 "../oql-parser.php" +#line 24 "..\oql-parser.y" +class OQLParserRaw#line 102 "..\oql-parser.php" { /* First off, code is included which follows the "include_class" declaration ** in the input file. */ @@ -137,57 +137,58 @@ class OQLParserRaw#line 102 "../oql-parser.php" const F_DAY = 24; const F_MONTH = 25; const F_YEAR = 26; - const DOT = 27; - const VARNAME = 28; - const NAME = 29; - const NUMVAL = 30; - const MATH_MINUS = 31; - const HEXVAL = 32; - const STRVAL = 33; - const REGEXP = 34; - const NOT_EQ = 35; - const LOG_AND = 36; - const LOG_OR = 37; - const MATH_DIV = 38; - const MATH_MULT = 39; - const MATH_PLUS = 40; - const GT = 41; - const LT = 42; - const GE = 43; - const LE = 44; - const LIKE = 45; - const NOT_LIKE = 46; - const MATCHES = 47; - const BITWISE_LEFT_SHIFT = 48; - const BITWISE_RIGHT_SHIFT = 49; - const BITWISE_AND = 50; - const BITWISE_OR = 51; - const BITWISE_XOR = 52; - const IN = 53; - const NOT_IN = 54; - const F_IF = 55; - const F_ELT = 56; - const F_COALESCE = 57; - const F_ISNULL = 58; - const F_CONCAT = 59; - const F_SUBSTR = 60; - const F_TRIM = 61; - const F_DATE = 62; - const F_DATE_FORMAT = 63; - const F_CURRENT_DATE = 64; - const F_NOW = 65; - const F_TIME = 66; - const F_TO_DAYS = 67; - const F_FROM_DAYS = 68; - const F_DATE_ADD = 69; - const F_DATE_SUB = 70; - const F_ROUND = 71; - const F_FLOOR = 72; - const F_INET_ATON = 73; - const F_INET_NTOA = 74; - const YY_NO_ACTION = 292; - const YY_ACCEPT_ACTION = 291; - const YY_ERROR_ACTION = 290; + const NULL_VAL = 27; + const DOT = 28; + const VARNAME = 29; + const NAME = 30; + const NUMVAL = 31; + const MATH_MINUS = 32; + const HEXVAL = 33; + const STRVAL = 34; + const REGEXP = 35; + const NOT_EQ = 36; + const LOG_AND = 37; + const LOG_OR = 38; + const MATH_DIV = 39; + const MATH_MULT = 40; + const MATH_PLUS = 41; + const GT = 42; + const LT = 43; + const GE = 44; + const LE = 45; + const LIKE = 46; + const NOT_LIKE = 47; + const MATCHES = 48; + const BITWISE_LEFT_SHIFT = 49; + const BITWISE_RIGHT_SHIFT = 50; + const BITWISE_AND = 51; + const BITWISE_OR = 52; + const BITWISE_XOR = 53; + const IN = 54; + const NOT_IN = 55; + const F_IF = 56; + const F_ELT = 57; + const F_COALESCE = 58; + const F_ISNULL = 59; + const F_CONCAT = 60; + const F_SUBSTR = 61; + const F_TRIM = 62; + const F_DATE = 63; + const F_DATE_FORMAT = 64; + const F_CURRENT_DATE = 65; + const F_NOW = 66; + const F_TIME = 67; + const F_TO_DAYS = 68; + const F_FROM_DAYS = 69; + const F_DATE_ADD = 70; + const F_DATE_SUB = 71; + const F_ROUND = 72; + const F_FLOOR = 73; + const F_INET_ATON = 74; + const F_INET_NTOA = 75; + const YY_NO_ACTION = 296; + const YY_ACCEPT_ACTION = 295; + const YY_ERROR_ACTION = 294; /* Next are that tables used to determine what action to take based on the ** current state and lookahead token. These tables are used to implement @@ -239,213 +240,209 @@ class OQLParserRaw#line 102 "../oql-parser.php" ** shifting non-terminals after a reduce. ** self::$yy_default Default action for each state. */ - const YY_SZ_ACTTAB = 552; + const YY_SZ_ACTTAB = 540; static public $yy_action = array( - /* 0 */ 28, 25, 26, 23, 20, 27, 19, 21, 22, 24, - /* 10 */ 145, 42, 178, 178, 93, 40, 5, 44, 55, 125, - /* 20 */ 70, 44, 160, 153, 159, 127, 111, 112, 110, 67, - /* 30 */ 108, 107, 142, 39, 71, 146, 144, 127, 13, 129, - /* 40 */ 130, 143, 141, 140, 139, 138, 137, 135, 100, 132, - /* 50 */ 126, 129, 130, 106, 105, 104, 103, 102, 133, 117, - /* 60 */ 134, 152, 154, 155, 156, 157, 158, 162, 163, 164, - /* 70 */ 165, 166, 167, 5, 29, 7, 10, 59, 11, 160, - /* 80 */ 153, 159, 46, 111, 112, 110, 67, 108, 107, 131, - /* 90 */ 99, 147, 161, 151, 5, 53, 119, 66, 44, 120, - /* 100 */ 160, 153, 159, 80, 111, 112, 110, 67, 108, 107, - /* 110 */ 106, 105, 104, 103, 102, 133, 117, 134, 152, 154, - /* 120 */ 155, 156, 157, 158, 162, 163, 164, 165, 166, 167, - /* 130 */ 112, 106, 105, 104, 103, 102, 133, 117, 134, 152, - /* 140 */ 154, 155, 156, 157, 158, 162, 163, 164, 165, 166, - /* 150 */ 167, 136, 150, 36, 38, 62, 291, 98, 61, 168, - /* 160 */ 65, 149, 148, 4, 60, 41, 123, 32, 48, 122, - /* 170 */ 124, 63, 231, 54, 65, 17, 44, 14, 8, 37, - /* 180 */ 85, 75, 80, 80, 80, 116, 101, 115, 114, 64, - /* 190 */ 65, 113, 128, 80, 80, 68, 123, 33, 48, 122, - /* 200 */ 124, 63, 58, 64, 65, 17, 65, 14, 65, 37, - /* 210 */ 82, 77, 56, 95, 86, 116, 101, 115, 114, 64, - /* 220 */ 121, 65, 45, 52, 80, 9, 40, 123, 32, 48, - /* 230 */ 122, 124, 63, 64, 83, 64, 17, 64, 14, 69, - /* 240 */ 37, 8, 6, 47, 43, 94, 116, 101, 115, 114, - /* 250 */ 64, 65, 92, 109, 12, 128, 74, 123, 34, 48, - /* 260 */ 122, 124, 63, 1, 51, 40, 17, 44, 14, 3, - /* 270 */ 37, 50, 2, 57, 28, 239, 116, 101, 115, 114, - /* 280 */ 64, 65, 239, 239, 239, 239, 118, 123, 33, 48, - /* 290 */ 122, 124, 63, 239, 239, 65, 17, 239, 14, 239, - /* 300 */ 37, 88, 239, 239, 72, 239, 116, 101, 115, 114, - /* 310 */ 64, 65, 239, 239, 239, 239, 239, 123, 31, 48, - /* 320 */ 122, 124, 63, 239, 64, 239, 17, 239, 14, 239, - /* 330 */ 37, 239, 239, 239, 239, 239, 116, 101, 115, 114, - /* 340 */ 64, 65, 239, 239, 239, 239, 239, 123, 16, 48, - /* 350 */ 122, 124, 63, 239, 239, 239, 17, 239, 14, 239, - /* 360 */ 37, 239, 239, 239, 239, 239, 116, 101, 115, 114, - /* 370 */ 64, 65, 239, 239, 239, 239, 239, 123, 30, 48, - /* 380 */ 122, 124, 63, 239, 239, 65, 17, 239, 14, 239, - /* 390 */ 37, 90, 239, 239, 239, 239, 116, 101, 115, 114, - /* 400 */ 64, 65, 239, 239, 239, 239, 239, 123, 239, 48, - /* 410 */ 122, 124, 63, 239, 64, 239, 17, 239, 14, 239, - /* 420 */ 35, 239, 239, 239, 239, 239, 116, 101, 115, 114, - /* 430 */ 64, 65, 239, 239, 239, 239, 239, 123, 239, 48, - /* 440 */ 122, 124, 63, 239, 239, 239, 17, 239, 15, 76, - /* 450 */ 73, 78, 89, 97, 96, 239, 116, 101, 115, 114, - /* 460 */ 64, 65, 239, 239, 239, 127, 239, 123, 239, 48, - /* 470 */ 122, 124, 63, 239, 239, 239, 18, 65, 65, 129, - /* 480 */ 130, 239, 91, 56, 79, 239, 116, 101, 115, 114, - /* 490 */ 64, 65, 65, 239, 239, 239, 239, 123, 81, 49, - /* 500 */ 122, 124, 63, 239, 239, 239, 64, 64, 239, 65, - /* 510 */ 239, 239, 239, 239, 239, 87, 116, 101, 115, 114, - /* 520 */ 64, 64, 65, 239, 239, 239, 239, 239, 84, 239, - /* 530 */ 239, 239, 239, 239, 239, 239, 239, 239, 64, 239, - /* 540 */ 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - /* 550 */ 239, 64, + /* 0 */ 21, 152, 138, 46, 180, 180, 45, 41, 70, 62, + /* 10 */ 41, 139, 140, 133, 127, 124, 7, 48, 123, 125, + /* 20 */ 65, 37, 164, 162, 155, 104, 4, 107, 106, 101, + /* 30 */ 61, 110, 111, 78, 117, 109, 116, 102, 103, 63, + /* 40 */ 28, 27, 26, 25, 24, 23, 22, 19, 20, 30, + /* 50 */ 105, 93, 57, 106, 112, 113, 114, 115, 134, 118, + /* 60 */ 135, 154, 156, 157, 158, 159, 160, 161, 165, 166, + /* 70 */ 167, 168, 169, 163, 7, 59, 5, 128, 11, 93, + /* 80 */ 164, 162, 155, 104, 10, 107, 106, 101, 61, 110, + /* 90 */ 111, 130, 131, 153, 145, 7, 120, 67, 3, 141, + /* 100 */ 142, 164, 162, 155, 104, 93, 107, 106, 101, 61, + /* 110 */ 110, 111, 112, 113, 114, 115, 134, 118, 135, 154, + /* 120 */ 156, 157, 158, 159, 160, 161, 165, 166, 167, 168, + /* 130 */ 169, 163, 132, 112, 113, 114, 115, 134, 118, 135, + /* 140 */ 154, 156, 157, 158, 159, 160, 161, 165, 166, 167, + /* 150 */ 168, 169, 163, 51, 52, 47, 40, 40, 295, 99, + /* 160 */ 66, 170, 62, 8, 126, 9, 77, 13, 124, 33, + /* 170 */ 49, 123, 125, 65, 38, 44, 62, 17, 129, 14, + /* 180 */ 75, 36, 82, 128, 108, 93, 235, 117, 109, 116, + /* 190 */ 102, 103, 63, 62, 91, 1, 64, 130, 131, 124, + /* 200 */ 31, 49, 123, 125, 65, 58, 63, 62, 17, 62, + /* 210 */ 14, 39, 36, 88, 90, 56, 94, 54, 117, 109, + /* 220 */ 116, 102, 103, 63, 122, 62, 93, 43, 41, 21, + /* 230 */ 73, 124, 33, 49, 123, 125, 65, 63, 121, 63, + /* 240 */ 17, 62, 14, 62, 36, 55, 85, 56, 6, 80, + /* 250 */ 117, 109, 116, 102, 103, 63, 243, 93, 42, 62, + /* 260 */ 93, 92, 72, 12, 40, 124, 34, 49, 123, 125, + /* 270 */ 65, 63, 53, 63, 17, 40, 14, 2, 36, 76, + /* 280 */ 50, 60, 243, 40, 117, 109, 116, 102, 103, 63, + /* 290 */ 62, 119, 243, 74, 243, 243, 124, 31, 49, 123, + /* 300 */ 125, 65, 243, 243, 62, 17, 62, 14, 8, 36, + /* 310 */ 87, 243, 98, 68, 243, 117, 109, 116, 102, 103, + /* 320 */ 63, 243, 62, 129, 243, 243, 243, 243, 124, 32, + /* 330 */ 49, 123, 125, 65, 63, 243, 63, 17, 243, 14, + /* 340 */ 243, 36, 243, 243, 243, 243, 243, 117, 109, 116, + /* 350 */ 102, 103, 63, 243, 243, 243, 62, 243, 243, 243, + /* 360 */ 243, 243, 124, 29, 49, 123, 125, 65, 243, 243, + /* 370 */ 62, 17, 243, 14, 243, 36, 83, 243, 243, 243, + /* 380 */ 243, 117, 109, 116, 102, 103, 63, 62, 243, 243, + /* 390 */ 243, 243, 243, 124, 16, 49, 123, 125, 65, 243, + /* 400 */ 63, 62, 17, 243, 14, 243, 36, 84, 243, 243, + /* 410 */ 243, 243, 117, 109, 116, 102, 103, 63, 243, 62, + /* 420 */ 243, 243, 243, 243, 243, 124, 243, 49, 123, 125, + /* 430 */ 65, 63, 243, 243, 17, 243, 14, 243, 35, 243, + /* 440 */ 243, 243, 243, 243, 117, 109, 116, 102, 103, 63, + /* 450 */ 243, 243, 243, 62, 243, 243, 243, 243, 243, 124, + /* 460 */ 243, 49, 123, 125, 65, 243, 243, 243, 17, 243, + /* 470 */ 15, 71, 79, 89, 97, 96, 95, 243, 117, 109, + /* 480 */ 116, 102, 103, 63, 62, 243, 243, 243, 128, 243, + /* 490 */ 124, 243, 49, 123, 125, 65, 243, 243, 62, 18, + /* 500 */ 137, 62, 130, 131, 81, 243, 243, 69, 243, 117, + /* 510 */ 109, 116, 102, 103, 63, 243, 243, 243, 243, 243, + /* 520 */ 243, 243, 243, 147, 243, 243, 143, 144, 63, 243, + /* 530 */ 243, 63, 146, 148, 149, 150, 151, 136, 100, 86, ); static public $yy_lookahead = array( - /* 0 */ 2, 9, 10, 11, 12, 13, 14, 15, 16, 17, - /* 10 */ 9, 3, 4, 5, 81, 7, 18, 84, 81, 19, - /* 20 */ 36, 84, 24, 25, 26, 37, 28, 29, 30, 31, - /* 30 */ 32, 33, 31, 3, 50, 34, 35, 37, 8, 51, - /* 40 */ 52, 40, 41, 42, 43, 44, 45, 46, 47, 53, - /* 50 */ 54, 51, 52, 55, 56, 57, 58, 59, 60, 61, + /* 0 */ 2, 39, 40, 3, 4, 5, 3, 7, 83, 81, + /* 10 */ 7, 49, 50, 54, 55, 87, 18, 89, 90, 91, + /* 20 */ 92, 81, 24, 25, 26, 27, 6, 29, 30, 31, + /* 30 */ 32, 33, 34, 83, 106, 107, 108, 109, 110, 111, + /* 40 */ 9, 10, 11, 12, 13, 14, 15, 16, 17, 81, + /* 50 */ 111, 111, 84, 30, 56, 57, 58, 59, 60, 61, /* 60 */ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, - /* 70 */ 72, 73, 74, 18, 80, 20, 98, 83, 96, 24, - /* 80 */ 25, 26, 1, 28, 29, 30, 31, 32, 33, 94, - /* 90 */ 112, 113, 110, 111, 18, 81, 77, 78, 84, 82, - /* 100 */ 24, 25, 26, 109, 28, 29, 30, 31, 32, 33, - /* 110 */ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, - /* 120 */ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, - /* 130 */ 29, 55, 56, 57, 58, 59, 60, 61, 62, 63, - /* 140 */ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, - /* 150 */ 74, 38, 39, 80, 80, 80, 76, 77, 78, 79, - /* 160 */ 80, 48, 49, 6, 80, 80, 86, 87, 88, 89, - /* 170 */ 90, 91, 27, 81, 80, 95, 84, 97, 101, 99, - /* 180 */ 86, 104, 109, 109, 109, 105, 106, 107, 108, 109, - /* 190 */ 80, 109, 115, 109, 109, 80, 86, 87, 88, 89, - /* 200 */ 90, 91, 92, 109, 80, 95, 80, 97, 80, 99, - /* 210 */ 86, 85, 86, 103, 86, 105, 106, 107, 108, 109, - /* 220 */ 79, 80, 3, 27, 109, 100, 7, 86, 87, 88, - /* 230 */ 89, 90, 91, 109, 82, 109, 95, 109, 97, 114, - /* 240 */ 99, 101, 5, 4, 5, 82, 105, 106, 107, 108, - /* 250 */ 109, 80, 82, 30, 8, 115, 19, 86, 87, 88, - /* 260 */ 89, 90, 91, 18, 81, 7, 95, 84, 97, 18, - /* 270 */ 99, 93, 5, 102, 2, 116, 105, 106, 107, 108, - /* 280 */ 109, 80, 116, 116, 116, 116, 19, 86, 87, 88, - /* 290 */ 89, 90, 91, 116, 116, 80, 95, 116, 97, 116, - /* 300 */ 99, 86, 116, 116, 103, 116, 105, 106, 107, 108, - /* 310 */ 109, 80, 116, 116, 116, 116, 116, 86, 87, 88, - /* 320 */ 89, 90, 91, 116, 109, 116, 95, 116, 97, 116, - /* 330 */ 99, 116, 116, 116, 116, 116, 105, 106, 107, 108, - /* 340 */ 109, 80, 116, 116, 116, 116, 116, 86, 87, 88, - /* 350 */ 89, 90, 91, 116, 116, 116, 95, 116, 97, 116, - /* 360 */ 99, 116, 116, 116, 116, 116, 105, 106, 107, 108, - /* 370 */ 109, 80, 116, 116, 116, 116, 116, 86, 87, 88, - /* 380 */ 89, 90, 91, 116, 116, 80, 95, 116, 97, 116, - /* 390 */ 99, 86, 116, 116, 116, 116, 105, 106, 107, 108, - /* 400 */ 109, 80, 116, 116, 116, 116, 116, 86, 116, 88, - /* 410 */ 89, 90, 91, 116, 109, 116, 95, 116, 97, 116, - /* 420 */ 99, 116, 116, 116, 116, 116, 105, 106, 107, 108, - /* 430 */ 109, 80, 116, 116, 116, 116, 116, 86, 116, 88, - /* 440 */ 89, 90, 91, 116, 116, 116, 95, 116, 97, 21, - /* 450 */ 22, 23, 24, 25, 26, 116, 105, 106, 107, 108, - /* 460 */ 109, 80, 116, 116, 116, 37, 116, 86, 116, 88, - /* 470 */ 89, 90, 91, 116, 116, 116, 95, 80, 80, 51, - /* 480 */ 52, 116, 85, 86, 86, 116, 105, 106, 107, 108, - /* 490 */ 109, 80, 80, 116, 116, 116, 116, 86, 86, 88, - /* 500 */ 89, 90, 91, 116, 116, 116, 109, 109, 116, 80, - /* 510 */ 116, 116, 116, 116, 116, 86, 105, 106, 107, 108, - /* 520 */ 109, 109, 80, 116, 116, 116, 116, 116, 86, 116, - /* 530 */ 116, 116, 116, 116, 116, 116, 116, 116, 109, 116, - /* 540 */ 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, - /* 550 */ 116, 109, + /* 70 */ 72, 73, 74, 75, 18, 81, 20, 38, 97, 111, + /* 80 */ 24, 25, 26, 27, 99, 29, 30, 31, 32, 33, + /* 90 */ 34, 52, 53, 112, 113, 18, 78, 79, 18, 114, + /* 100 */ 115, 24, 25, 26, 27, 111, 29, 30, 31, 32, + /* 110 */ 33, 34, 56, 57, 58, 59, 60, 61, 62, 63, + /* 120 */ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, + /* 130 */ 74, 75, 95, 56, 57, 58, 59, 60, 61, 62, + /* 140 */ 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, + /* 150 */ 73, 74, 75, 82, 82, 81, 85, 85, 77, 78, + /* 160 */ 79, 80, 81, 102, 19, 101, 105, 8, 87, 88, + /* 170 */ 89, 90, 91, 92, 4, 5, 81, 96, 117, 98, + /* 180 */ 116, 100, 87, 38, 31, 111, 28, 106, 107, 108, + /* 190 */ 109, 110, 111, 81, 83, 18, 81, 52, 53, 87, + /* 200 */ 88, 89, 90, 91, 92, 93, 111, 81, 96, 81, + /* 210 */ 98, 1, 100, 87, 86, 87, 104, 28, 106, 107, + /* 220 */ 108, 109, 110, 111, 80, 81, 111, 81, 7, 2, + /* 230 */ 81, 87, 88, 89, 90, 91, 92, 111, 83, 111, + /* 240 */ 96, 81, 98, 81, 100, 94, 86, 87, 5, 87, + /* 250 */ 106, 107, 108, 109, 110, 111, 118, 111, 3, 81, + /* 260 */ 111, 82, 19, 8, 85, 87, 88, 89, 90, 91, + /* 270 */ 92, 111, 82, 111, 96, 85, 98, 5, 100, 37, + /* 280 */ 82, 103, 118, 85, 106, 107, 108, 109, 110, 111, + /* 290 */ 81, 19, 118, 51, 118, 118, 87, 88, 89, 90, + /* 300 */ 91, 92, 118, 118, 81, 96, 81, 98, 102, 100, + /* 310 */ 87, 118, 87, 104, 118, 106, 107, 108, 109, 110, + /* 320 */ 111, 118, 81, 117, 118, 118, 118, 118, 87, 88, + /* 330 */ 89, 90, 91, 92, 111, 118, 111, 96, 118, 98, + /* 340 */ 118, 100, 118, 118, 118, 118, 118, 106, 107, 108, + /* 350 */ 109, 110, 111, 118, 118, 118, 81, 118, 118, 118, + /* 360 */ 118, 118, 87, 88, 89, 90, 91, 92, 118, 118, + /* 370 */ 81, 96, 118, 98, 118, 100, 87, 118, 118, 118, + /* 380 */ 118, 106, 107, 108, 109, 110, 111, 81, 118, 118, + /* 390 */ 118, 118, 118, 87, 88, 89, 90, 91, 92, 118, + /* 400 */ 111, 81, 96, 118, 98, 118, 100, 87, 118, 118, + /* 410 */ 118, 118, 106, 107, 108, 109, 110, 111, 118, 81, + /* 420 */ 118, 118, 118, 118, 118, 87, 118, 89, 90, 91, + /* 430 */ 92, 111, 118, 118, 96, 118, 98, 118, 100, 118, + /* 440 */ 118, 118, 118, 118, 106, 107, 108, 109, 110, 111, + /* 450 */ 118, 118, 118, 81, 118, 118, 118, 118, 118, 87, + /* 460 */ 118, 89, 90, 91, 92, 118, 118, 118, 96, 118, + /* 470 */ 98, 21, 22, 23, 24, 25, 26, 118, 106, 107, + /* 480 */ 108, 109, 110, 111, 81, 118, 118, 118, 38, 118, + /* 490 */ 87, 118, 89, 90, 91, 92, 118, 118, 81, 96, + /* 500 */ 9, 81, 52, 53, 87, 118, 118, 87, 118, 106, + /* 510 */ 107, 108, 109, 110, 111, 118, 118, 118, 118, 118, + /* 520 */ 118, 118, 118, 32, 118, 118, 35, 36, 111, 118, + /* 530 */ 118, 111, 41, 42, 43, 44, 45, 46, 47, 48, ); - const YY_SHIFT_USE_DFLT = -17; + const YY_SHIFT_USE_DFLT = -42; const YY_SHIFT_MAX = 67; static public $yy_shift_ofst = array( - /* 0 */ -2, 55, 55, 76, 76, 76, 76, 76, 76, 76, - /* 10 */ 76, 76, 101, 101, 1, 1, 428, 113, 113, 101, - /* 20 */ 101, 101, 101, 101, 101, 101, 101, 101, 101, 8, - /* 30 */ 0, -12, -12, -12, -12, -16, 219, -16, 258, 101, - /* 40 */ 101, 258, 101, 101, 258, 101, 272, 101, -4, -4, - /* 50 */ 251, 157, 101, 157, 157, 157, -8, 237, 267, 239, - /* 60 */ 30, 81, 246, 245, 145, 196, 81, 223, + /* 0 */ -2, 56, 56, 77, 77, 77, 77, 77, 77, 77, + /* 10 */ 77, 77, 23, 23, 491, 491, 450, -38, -38, 23, + /* 20 */ 23, 23, 23, 23, 23, 23, 23, 23, 23, 145, + /* 30 */ 0, 39, 39, 39, 39, 242, 242, 3, 23, 227, + /* 40 */ 221, 23, 23, 221, 23, 23, 23, 221, -41, -41, + /* 50 */ 20, 20, 20, 20, 23, 80, 31, 170, 272, 255, + /* 60 */ 243, 153, 189, 158, 159, 177, 210, 210, ); - const YY_REDUCE_USE_DFLT = -68; + const YY_REDUCE_USE_DFLT = -76; const YY_REDUCE_MAX = 55; static public $yy_reduce_ofst = array( - /* 0 */ 80, 110, 201, 171, 141, 291, 231, 261, 321, 351, - /* 10 */ 381, 411, 397, 126, -22, -22, 77, -18, -18, 94, - /* 20 */ 429, 442, 124, 398, 412, 305, 215, 128, -6, 183, - /* 30 */ 140, 140, 140, 140, 140, 125, 14, 125, -63, 75, - /* 40 */ 84, 92, 85, 115, -67, 74, 19, 73, 178, 178, - /* 50 */ -5, 17, 82, 152, 163, 170, + /* 0 */ 81, 112, 209, 178, 144, 306, 241, 275, 338, 372, + /* 10 */ 403, -72, 160, 128, -15, -15, 61, -19, -19, 417, + /* 20 */ 420, -32, 95, 289, 320, 225, 223, 162, 126, 206, + /* 30 */ 198, 206, 206, 206, 206, 64, 64, 71, -60, 18, + /* 40 */ 179, -6, 115, 190, 149, 74, 146, 72, 151, 151, + /* 50 */ 155, 111, -75, -50, -61, 37, ); static public $yyExpectedTokens = array( - /* 0 */ array(2, 18, 24, 25, 26, 28, 29, 30, 31, 32, 33, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), - /* 1 */ array(18, 20, 24, 25, 26, 28, 29, 30, 31, 32, 33, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), - /* 2 */ array(18, 20, 24, 25, 26, 28, 29, 30, 31, 32, 33, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), - /* 3 */ array(18, 24, 25, 26, 28, 29, 30, 31, 32, 33, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), - /* 4 */ array(18, 24, 25, 26, 28, 29, 30, 31, 32, 33, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), - /* 5 */ array(18, 24, 25, 26, 28, 29, 30, 31, 32, 33, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), - /* 6 */ array(18, 24, 25, 26, 28, 29, 30, 31, 32, 33, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), - /* 7 */ array(18, 24, 25, 26, 28, 29, 30, 31, 32, 33, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), - /* 8 */ array(18, 24, 25, 26, 28, 29, 30, 31, 32, 33, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), - /* 9 */ array(18, 24, 25, 26, 28, 29, 30, 31, 32, 33, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), - /* 10 */ array(18, 24, 25, 26, 28, 29, 30, 31, 32, 33, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), - /* 11 */ array(18, 24, 25, 26, 28, 29, 30, 31, 32, 33, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), - /* 12 */ array(29, ), - /* 13 */ array(29, ), - /* 14 */ array(9, 31, 34, 35, 40, 41, 42, 43, 44, 45, 46, 47, ), - /* 15 */ array(9, 31, 34, 35, 40, 41, 42, 43, 44, 45, 46, 47, ), - /* 16 */ array(21, 22, 23, 24, 25, 26, 37, 51, 52, ), - /* 17 */ array(38, 39, 48, 49, ), - /* 18 */ array(38, 39, 48, 49, ), - /* 19 */ array(29, ), - /* 20 */ array(29, ), - /* 21 */ array(29, ), - /* 22 */ array(29, ), - /* 23 */ array(29, ), - /* 24 */ array(29, ), - /* 25 */ array(29, ), - /* 26 */ array(29, ), - /* 27 */ array(29, ), - /* 28 */ array(29, ), - /* 29 */ array(3, 4, 5, 7, ), - /* 30 */ array(19, 37, 51, 52, ), - /* 31 */ array(37, 51, 52, ), - /* 32 */ array(37, 51, 52, ), - /* 33 */ array(37, 51, 52, ), - /* 34 */ array(37, 51, 52, ), - /* 35 */ array(36, 50, ), - /* 36 */ array(3, 7, ), - /* 37 */ array(36, 50, ), - /* 38 */ array(7, ), - /* 39 */ array(29, ), - /* 40 */ array(29, ), - /* 41 */ array(7, ), - /* 42 */ array(29, ), - /* 43 */ array(29, ), - /* 44 */ array(7, ), - /* 45 */ array(29, ), - /* 46 */ array(2, ), - /* 47 */ array(29, ), - /* 48 */ array(53, 54, ), - /* 49 */ array(53, 54, ), - /* 50 */ array(18, ), + /* 0 */ array(2, 18, 24, 25, 26, 27, 29, 30, 31, 32, 33, 34, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), + /* 1 */ array(18, 20, 24, 25, 26, 27, 29, 30, 31, 32, 33, 34, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), + /* 2 */ array(18, 20, 24, 25, 26, 27, 29, 30, 31, 32, 33, 34, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), + /* 3 */ array(18, 24, 25, 26, 27, 29, 30, 31, 32, 33, 34, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), + /* 4 */ array(18, 24, 25, 26, 27, 29, 30, 31, 32, 33, 34, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), + /* 5 */ array(18, 24, 25, 26, 27, 29, 30, 31, 32, 33, 34, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), + /* 6 */ array(18, 24, 25, 26, 27, 29, 30, 31, 32, 33, 34, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), + /* 7 */ array(18, 24, 25, 26, 27, 29, 30, 31, 32, 33, 34, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), + /* 8 */ array(18, 24, 25, 26, 27, 29, 30, 31, 32, 33, 34, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), + /* 9 */ array(18, 24, 25, 26, 27, 29, 30, 31, 32, 33, 34, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), + /* 10 */ array(18, 24, 25, 26, 27, 29, 30, 31, 32, 33, 34, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), + /* 11 */ array(18, 24, 25, 26, 27, 29, 30, 31, 32, 33, 34, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), + /* 12 */ array(30, ), + /* 13 */ array(30, ), + /* 14 */ array(9, 32, 35, 36, 41, 42, 43, 44, 45, 46, 47, 48, ), + /* 15 */ array(9, 32, 35, 36, 41, 42, 43, 44, 45, 46, 47, 48, ), + /* 16 */ array(21, 22, 23, 24, 25, 26, 38, 52, 53, ), + /* 17 */ array(39, 40, 49, 50, ), + /* 18 */ array(39, 40, 49, 50, ), + /* 19 */ array(30, ), + /* 20 */ array(30, ), + /* 21 */ array(30, ), + /* 22 */ array(30, ), + /* 23 */ array(30, ), + /* 24 */ array(30, ), + /* 25 */ array(30, ), + /* 26 */ array(30, ), + /* 27 */ array(30, ), + /* 28 */ array(30, ), + /* 29 */ array(19, 38, 52, 53, ), + /* 30 */ array(3, 4, 5, 7, ), + /* 31 */ array(38, 52, 53, ), + /* 32 */ array(38, 52, 53, ), + /* 33 */ array(38, 52, 53, ), + /* 34 */ array(38, 52, 53, ), + /* 35 */ array(37, 51, ), + /* 36 */ array(37, 51, ), + /* 37 */ array(3, 7, ), + /* 38 */ array(30, ), + /* 39 */ array(2, ), + /* 40 */ array(7, ), + /* 41 */ array(30, ), + /* 42 */ array(30, ), + /* 43 */ array(7, ), + /* 44 */ array(30, ), + /* 45 */ array(30, ), + /* 46 */ array(30, ), + /* 47 */ array(7, ), + /* 48 */ array(54, 55, ), + /* 49 */ array(54, 55, ), + /* 50 */ array(6, ), /* 51 */ array(6, ), - /* 52 */ array(29, ), + /* 52 */ array(6, ), /* 53 */ array(6, ), - /* 54 */ array(6, ), - /* 55 */ array(6, ), + /* 54 */ array(30, ), + /* 55 */ array(18, ), /* 56 */ array(9, 10, 11, 12, 13, 14, 15, 16, 17, ), - /* 57 */ array(5, 19, ), + /* 57 */ array(4, 5, ), /* 58 */ array(5, 19, ), - /* 59 */ array(4, 5, ), - /* 60 */ array(3, 8, ), - /* 61 */ array(1, ), - /* 62 */ array(8, ), - /* 63 */ array(18, ), - /* 64 */ array(27, ), - /* 65 */ array(27, ), + /* 59 */ array(3, 8, ), + /* 60 */ array(5, 19, ), + /* 61 */ array(31, ), + /* 62 */ array(28, ), + /* 63 */ array(28, ), + /* 64 */ array(8, ), + /* 65 */ array(18, ), /* 66 */ array(1, ), - /* 67 */ array(30, ), + /* 67 */ array(1, ), /* 68 */ array(), /* 69 */ array(), /* 70 */ array(), @@ -547,25 +544,28 @@ static public $yy_action = array( /* 166 */ array(), /* 167 */ array(), /* 168 */ array(), + /* 169 */ array(), + /* 170 */ array(), ); static public $yy_default = array( - /* 0 */ 290, 214, 290, 290, 290, 290, 290, 290, 290, 290, - /* 10 */ 290, 290, 290, 290, 207, 208, 290, 205, 206, 290, - /* 20 */ 290, 290, 290, 290, 290, 290, 290, 290, 290, 184, - /* 30 */ 290, 213, 196, 217, 212, 210, 184, 209, 184, 290, - /* 40 */ 290, 184, 290, 290, 183, 290, 290, 290, 203, 204, - /* 50 */ 290, 181, 290, 181, 181, 181, 290, 290, 290, 290, - /* 60 */ 290, 170, 290, 290, 229, 290, 172, 290, 179, 246, - /* 70 */ 245, 262, 216, 220, 211, 218, 219, 186, 221, 189, - /* 80 */ 231, 195, 194, 176, 193, 192, 191, 190, 188, 222, - /* 90 */ 187, 185, 177, 182, 175, 215, 224, 223, 169, 240, - /* 100 */ 259, 226, 271, 270, 269, 268, 267, 237, 236, 235, - /* 110 */ 234, 232, 233, 230, 228, 227, 225, 273, 200, 173, - /* 120 */ 174, 180, 197, 198, 199, 201, 266, 247, 248, 263, - /* 130 */ 264, 202, 265, 272, 274, 258, 249, 257, 256, 255, - /* 140 */ 254, 253, 252, 251, 244, 243, 242, 241, 261, 260, - /* 150 */ 250, 239, 275, 282, 276, 277, 278, 279, 280, 281, - /* 160 */ 283, 238, 284, 285, 286, 287, 288, 289, 171, + /* 0 */ 294, 216, 294, 294, 294, 294, 294, 294, 294, 294, + /* 10 */ 294, 294, 294, 294, 209, 210, 294, 207, 208, 294, + /* 20 */ 294, 294, 294, 294, 294, 294, 294, 294, 294, 294, + /* 30 */ 186, 219, 215, 198, 214, 212, 211, 186, 294, 294, + /* 40 */ 185, 294, 294, 186, 294, 294, 294, 186, 206, 205, + /* 50 */ 183, 183, 183, 183, 294, 294, 294, 294, 294, 294, + /* 60 */ 294, 294, 294, 233, 294, 294, 172, 174, 218, 197, + /* 70 */ 179, 221, 213, 181, 266, 250, 249, 220, 177, 222, + /* 80 */ 190, 196, 195, 194, 193, 188, 263, 191, 189, 223, + /* 90 */ 187, 178, 184, 235, 217, 226, 225, 224, 192, 171, + /* 100 */ 262, 238, 230, 231, 232, 234, 237, 236, 239, 228, + /* 110 */ 240, 241, 271, 272, 273, 274, 229, 227, 276, 202, + /* 120 */ 175, 176, 182, 199, 200, 201, 203, 270, 251, 252, + /* 130 */ 267, 268, 204, 269, 275, 277, 261, 247, 254, 264, + /* 140 */ 265, 244, 245, 246, 248, 243, 255, 256, 257, 258, + /* 150 */ 259, 260, 253, 242, 278, 285, 279, 280, 281, 282, + /* 160 */ 283, 284, 286, 293, 287, 288, 289, 290, 291, 292, + /* 170 */ 173, ); /* The next thing included is series of defines which control ** various aspects of the generated parser. @@ -582,11 +582,11 @@ static public $yy_action = array( ** self::YYERRORSYMBOL is the code number of the error symbol. If not ** defined, then do no error processing. */ - const YYNOCODE = 117; + const YYNOCODE = 119; const YYSTACKDEPTH = 100; - const YYNSTATE = 169; - const YYNRULE = 121; - const YYERRORSYMBOL = 75; + const YYNSTATE = 171; + const YYNRULE = 123; + const YYERRORSYMBOL = 76; const YYERRSYMDT = 'yy0'; const YYFALLBACK = 0; /** The next table maps tokens into fallback tokens. If a construct @@ -674,29 +674,30 @@ static public $yy_action = array( 'NOT_BELOW', 'NOT_BELOW_STRICT', 'ABOVE', 'ABOVE_STRICT', 'NOT_ABOVE', 'NOT_ABOVE_STRICT', 'PAR_OPEN', 'PAR_CLOSE', 'INTERVAL', 'F_SECOND', 'F_MINUTE', 'F_HOUR', - 'F_DAY', 'F_MONTH', 'F_YEAR', 'DOT', - 'VARNAME', 'NAME', 'NUMVAL', 'MATH_MINUS', - 'HEXVAL', 'STRVAL', 'REGEXP', 'NOT_EQ', - 'LOG_AND', 'LOG_OR', 'MATH_DIV', 'MATH_MULT', - 'MATH_PLUS', 'GT', 'LT', 'GE', - 'LE', 'LIKE', 'NOT_LIKE', 'MATCHES', - 'BITWISE_LEFT_SHIFT', 'BITWISE_RIGHT_SHIFT', 'BITWISE_AND', 'BITWISE_OR', - 'BITWISE_XOR', 'IN', 'NOT_IN', 'F_IF', - 'F_ELT', 'F_COALESCE', 'F_ISNULL', 'F_CONCAT', - 'F_SUBSTR', 'F_TRIM', 'F_DATE', 'F_DATE_FORMAT', - 'F_CURRENT_DATE', 'F_NOW', 'F_TIME', 'F_TO_DAYS', - 'F_FROM_DAYS', 'F_DATE_ADD', 'F_DATE_SUB', 'F_ROUND', - 'F_FLOOR', 'F_INET_ATON', 'F_INET_NTOA', 'error', - 'result', 'union', 'query', 'condition', - 'class_name', 'join_statement', 'where_statement', 'class_list', - 'join_item', 'join_condition', 'field_id', 'expression_prio4', - 'expression_basic', 'scalar', 'var_name', 'func_name', - 'arg_list', 'list_operator', 'list', 'expression_prio1', - 'operator1', 'expression_prio2', 'operator2', 'expression_prio3', - 'operator3', 'operator4', 'list_items', 'argument', - 'interval_unit', 'num_scalar', 'str_scalar', 'num_value', - 'str_value', 'name', 'num_operator1', 'bitwise_operator1', - 'num_operator2', 'str_operator', 'bitwise_operator3', 'bitwise_operator4', + 'F_DAY', 'F_MONTH', 'F_YEAR', 'NULL_VAL', + 'DOT', 'VARNAME', 'NAME', 'NUMVAL', + 'MATH_MINUS', 'HEXVAL', 'STRVAL', 'REGEXP', + 'NOT_EQ', 'LOG_AND', 'LOG_OR', 'MATH_DIV', + 'MATH_MULT', 'MATH_PLUS', 'GT', 'LT', + 'GE', 'LE', 'LIKE', 'NOT_LIKE', + 'MATCHES', 'BITWISE_LEFT_SHIFT', 'BITWISE_RIGHT_SHIFT', 'BITWISE_AND', + 'BITWISE_OR', 'BITWISE_XOR', 'IN', 'NOT_IN', + 'F_IF', 'F_ELT', 'F_COALESCE', 'F_ISNULL', + 'F_CONCAT', 'F_SUBSTR', 'F_TRIM', 'F_DATE', + 'F_DATE_FORMAT', 'F_CURRENT_DATE', 'F_NOW', 'F_TIME', + 'F_TO_DAYS', 'F_FROM_DAYS', 'F_DATE_ADD', 'F_DATE_SUB', + 'F_ROUND', 'F_FLOOR', 'F_INET_ATON', 'F_INET_NTOA', + 'error', 'result', 'union', 'query', + 'condition', 'class_name', 'join_statement', 'where_statement', + 'class_list', 'join_item', 'join_condition', 'field_id', + 'expression_prio4', 'expression_basic', 'scalar', 'var_name', + 'func_name', 'arg_list', 'list_operator', 'list', + 'expression_prio1', 'operator1', 'expression_prio2', 'operator2', + 'expression_prio3', 'operator3', 'operator4', 'list_items', + 'argument', 'interval_unit', 'num_scalar', 'str_scalar', + 'null_scalar', 'num_value', 'str_value', 'name', + 'num_operator1', 'bitwise_operator1', 'num_operator2', 'str_operator', + 'bitwise_operator3', 'bitwise_operator4', ); /** @@ -762,69 +763,71 @@ static public $yy_action = array( /* 55 */ "interval_unit ::= F_YEAR", /* 56 */ "scalar ::= num_scalar", /* 57 */ "scalar ::= str_scalar", - /* 58 */ "num_scalar ::= num_value", - /* 59 */ "str_scalar ::= str_value", - /* 60 */ "field_id ::= name", - /* 61 */ "field_id ::= class_name DOT name", - /* 62 */ "class_name ::= name", - /* 63 */ "var_name ::= VARNAME", - /* 64 */ "name ::= NAME", - /* 65 */ "num_value ::= NUMVAL", - /* 66 */ "num_value ::= MATH_MINUS NUMVAL", - /* 67 */ "num_value ::= HEXVAL", - /* 68 */ "str_value ::= STRVAL", - /* 69 */ "operator1 ::= num_operator1", - /* 70 */ "operator1 ::= bitwise_operator1", - /* 71 */ "operator2 ::= num_operator2", - /* 72 */ "operator2 ::= str_operator", - /* 73 */ "operator2 ::= REGEXP", - /* 74 */ "operator2 ::= EQ", - /* 75 */ "operator2 ::= NOT_EQ", - /* 76 */ "operator3 ::= LOG_AND", - /* 77 */ "operator3 ::= bitwise_operator3", - /* 78 */ "operator4 ::= LOG_OR", - /* 79 */ "operator4 ::= bitwise_operator4", - /* 80 */ "num_operator1 ::= MATH_DIV", - /* 81 */ "num_operator1 ::= MATH_MULT", - /* 82 */ "num_operator2 ::= MATH_PLUS", - /* 83 */ "num_operator2 ::= MATH_MINUS", - /* 84 */ "num_operator2 ::= GT", - /* 85 */ "num_operator2 ::= LT", - /* 86 */ "num_operator2 ::= GE", - /* 87 */ "num_operator2 ::= LE", - /* 88 */ "str_operator ::= LIKE", - /* 89 */ "str_operator ::= NOT_LIKE", - /* 90 */ "str_operator ::= MATCHES", - /* 91 */ "bitwise_operator1 ::= BITWISE_LEFT_SHIFT", - /* 92 */ "bitwise_operator1 ::= BITWISE_RIGHT_SHIFT", - /* 93 */ "bitwise_operator3 ::= BITWISE_AND", - /* 94 */ "bitwise_operator4 ::= BITWISE_OR", - /* 95 */ "bitwise_operator4 ::= BITWISE_XOR", - /* 96 */ "list_operator ::= IN", - /* 97 */ "list_operator ::= NOT_IN", - /* 98 */ "func_name ::= F_IF", - /* 99 */ "func_name ::= F_ELT", - /* 100 */ "func_name ::= F_COALESCE", - /* 101 */ "func_name ::= F_ISNULL", - /* 102 */ "func_name ::= F_CONCAT", - /* 103 */ "func_name ::= F_SUBSTR", - /* 104 */ "func_name ::= F_TRIM", - /* 105 */ "func_name ::= F_DATE", - /* 106 */ "func_name ::= F_DATE_FORMAT", - /* 107 */ "func_name ::= F_CURRENT_DATE", - /* 108 */ "func_name ::= F_NOW", - /* 109 */ "func_name ::= F_TIME", - /* 110 */ "func_name ::= F_TO_DAYS", - /* 111 */ "func_name ::= F_FROM_DAYS", - /* 112 */ "func_name ::= F_YEAR", - /* 113 */ "func_name ::= F_MONTH", - /* 114 */ "func_name ::= F_DAY", - /* 115 */ "func_name ::= F_DATE_ADD", - /* 116 */ "func_name ::= F_DATE_SUB", - /* 117 */ "func_name ::= F_ROUND", - /* 118 */ "func_name ::= F_FLOOR", - /* 119 */ "func_name ::= F_INET_ATON", - /* 120 */ "func_name ::= F_INET_NTOA", + /* 58 */ "scalar ::= null_scalar", + /* 59 */ "num_scalar ::= num_value", + /* 60 */ "str_scalar ::= str_value", + /* 61 */ "null_scalar ::= NULL_VAL", + /* 62 */ "field_id ::= name", + /* 63 */ "field_id ::= class_name DOT name", + /* 64 */ "class_name ::= name", + /* 65 */ "var_name ::= VARNAME", + /* 66 */ "name ::= NAME", + /* 67 */ "num_value ::= NUMVAL", + /* 68 */ "num_value ::= MATH_MINUS NUMVAL", + /* 69 */ "num_value ::= HEXVAL", + /* 70 */ "str_value ::= STRVAL", + /* 71 */ "operator1 ::= num_operator1", + /* 72 */ "operator1 ::= bitwise_operator1", + /* 73 */ "operator2 ::= num_operator2", + /* 74 */ "operator2 ::= str_operator", + /* 75 */ "operator2 ::= REGEXP", + /* 76 */ "operator2 ::= EQ", + /* 77 */ "operator2 ::= NOT_EQ", + /* 78 */ "operator3 ::= LOG_AND", + /* 79 */ "operator3 ::= bitwise_operator3", + /* 80 */ "operator4 ::= LOG_OR", + /* 81 */ "operator4 ::= bitwise_operator4", + /* 82 */ "num_operator1 ::= MATH_DIV", + /* 83 */ "num_operator1 ::= MATH_MULT", + /* 84 */ "num_operator2 ::= MATH_PLUS", + /* 85 */ "num_operator2 ::= MATH_MINUS", + /* 86 */ "num_operator2 ::= GT", + /* 87 */ "num_operator2 ::= LT", + /* 88 */ "num_operator2 ::= GE", + /* 89 */ "num_operator2 ::= LE", + /* 90 */ "str_operator ::= LIKE", + /* 91 */ "str_operator ::= NOT_LIKE", + /* 92 */ "str_operator ::= MATCHES", + /* 93 */ "bitwise_operator1 ::= BITWISE_LEFT_SHIFT", + /* 94 */ "bitwise_operator1 ::= BITWISE_RIGHT_SHIFT", + /* 95 */ "bitwise_operator3 ::= BITWISE_AND", + /* 96 */ "bitwise_operator4 ::= BITWISE_OR", + /* 97 */ "bitwise_operator4 ::= BITWISE_XOR", + /* 98 */ "list_operator ::= IN", + /* 99 */ "list_operator ::= NOT_IN", + /* 100 */ "func_name ::= F_IF", + /* 101 */ "func_name ::= F_ELT", + /* 102 */ "func_name ::= F_COALESCE", + /* 103 */ "func_name ::= F_ISNULL", + /* 104 */ "func_name ::= F_CONCAT", + /* 105 */ "func_name ::= F_SUBSTR", + /* 106 */ "func_name ::= F_TRIM", + /* 107 */ "func_name ::= F_DATE", + /* 108 */ "func_name ::= F_DATE_FORMAT", + /* 109 */ "func_name ::= F_CURRENT_DATE", + /* 110 */ "func_name ::= F_NOW", + /* 111 */ "func_name ::= F_TIME", + /* 112 */ "func_name ::= F_TO_DAYS", + /* 113 */ "func_name ::= F_FROM_DAYS", + /* 114 */ "func_name ::= F_YEAR", + /* 115 */ "func_name ::= F_MONTH", + /* 116 */ "func_name ::= F_DAY", + /* 117 */ "func_name ::= F_DATE_ADD", + /* 118 */ "func_name ::= F_DATE_SUB", + /* 119 */ "func_name ::= F_ROUND", + /* 120 */ "func_name ::= F_FLOOR", + /* 121 */ "func_name ::= F_INET_ATON", + /* 122 */ "func_name ::= F_INET_NTOA", ); /** @@ -1189,127 +1192,129 @@ static public $yy_action = array( * */ static public $yyRuleInfo = array( - array( 'lhs' => 76, 'rhs' => 1 ), - array( 'lhs' => 76, 'rhs' => 1 ), - array( 'lhs' => 76, 'rhs' => 1 ), - array( 'lhs' => 77, 'rhs' => 3 ), - array( 'lhs' => 77, 'rhs' => 3 ), - array( 'lhs' => 78, 'rhs' => 4 ), - array( 'lhs' => 78, 'rhs' => 6 ), - array( 'lhs' => 78, 'rhs' => 6 ), - array( 'lhs' => 78, 'rhs' => 8 ), - array( 'lhs' => 83, 'rhs' => 1 ), - array( 'lhs' => 83, 'rhs' => 3 ), + array( 'lhs' => 77, 'rhs' => 1 ), + array( 'lhs' => 77, 'rhs' => 1 ), + array( 'lhs' => 77, 'rhs' => 1 ), + array( 'lhs' => 78, 'rhs' => 3 ), + array( 'lhs' => 78, 'rhs' => 3 ), + array( 'lhs' => 79, 'rhs' => 4 ), + array( 'lhs' => 79, 'rhs' => 6 ), + array( 'lhs' => 79, 'rhs' => 6 ), + array( 'lhs' => 79, 'rhs' => 8 ), + array( 'lhs' => 84, 'rhs' => 1 ), + array( 'lhs' => 84, 'rhs' => 3 ), + array( 'lhs' => 83, 'rhs' => 2 ), + array( 'lhs' => 83, 'rhs' => 0 ), array( 'lhs' => 82, 'rhs' => 2 ), + array( 'lhs' => 82, 'rhs' => 1 ), array( 'lhs' => 82, 'rhs' => 0 ), - array( 'lhs' => 81, 'rhs' => 2 ), - array( 'lhs' => 81, 'rhs' => 1 ), - array( 'lhs' => 81, 'rhs' => 0 ), - array( 'lhs' => 84, 'rhs' => 6 ), - array( 'lhs' => 84, 'rhs' => 4 ), - array( 'lhs' => 85, 'rhs' => 3 ), - array( 'lhs' => 85, 'rhs' => 3 ), - array( 'lhs' => 85, 'rhs' => 3 ), - array( 'lhs' => 85, 'rhs' => 3 ), - array( 'lhs' => 85, 'rhs' => 3 ), - array( 'lhs' => 85, 'rhs' => 3 ), - array( 'lhs' => 85, 'rhs' => 3 ), - array( 'lhs' => 85, 'rhs' => 3 ), - array( 'lhs' => 85, 'rhs' => 3 ), - array( 'lhs' => 79, 'rhs' => 1 ), - array( 'lhs' => 88, 'rhs' => 1 ), - array( 'lhs' => 88, 'rhs' => 1 ), - array( 'lhs' => 88, 'rhs' => 1 ), - array( 'lhs' => 88, 'rhs' => 4 ), - array( 'lhs' => 88, 'rhs' => 3 ), - array( 'lhs' => 88, 'rhs' => 3 ), - array( 'lhs' => 95, 'rhs' => 1 ), - array( 'lhs' => 95, 'rhs' => 3 ), - array( 'lhs' => 97, 'rhs' => 1 ), - array( 'lhs' => 97, 'rhs' => 3 ), - array( 'lhs' => 99, 'rhs' => 1 ), - array( 'lhs' => 99, 'rhs' => 3 ), - array( 'lhs' => 87, 'rhs' => 1 ), - array( 'lhs' => 87, 'rhs' => 3 ), - array( 'lhs' => 94, 'rhs' => 3 ), - array( 'lhs' => 102, 'rhs' => 1 ), - array( 'lhs' => 102, 'rhs' => 3 ), - array( 'lhs' => 92, 'rhs' => 0 ), - array( 'lhs' => 92, 'rhs' => 1 ), - array( 'lhs' => 92, 'rhs' => 3 ), - array( 'lhs' => 103, 'rhs' => 1 ), - array( 'lhs' => 103, 'rhs' => 3 ), - array( 'lhs' => 104, 'rhs' => 1 ), - array( 'lhs' => 104, 'rhs' => 1 ), - array( 'lhs' => 104, 'rhs' => 1 ), - array( 'lhs' => 104, 'rhs' => 1 ), - array( 'lhs' => 104, 'rhs' => 1 ), - array( 'lhs' => 104, 'rhs' => 1 ), - array( 'lhs' => 89, 'rhs' => 1 ), - array( 'lhs' => 89, 'rhs' => 1 ), - array( 'lhs' => 105, 'rhs' => 1 ), - array( 'lhs' => 106, 'rhs' => 1 ), - array( 'lhs' => 86, 'rhs' => 1 ), + array( 'lhs' => 85, 'rhs' => 6 ), + array( 'lhs' => 85, 'rhs' => 4 ), + array( 'lhs' => 86, 'rhs' => 3 ), + array( 'lhs' => 86, 'rhs' => 3 ), + array( 'lhs' => 86, 'rhs' => 3 ), + array( 'lhs' => 86, 'rhs' => 3 ), + array( 'lhs' => 86, 'rhs' => 3 ), + array( 'lhs' => 86, 'rhs' => 3 ), + array( 'lhs' => 86, 'rhs' => 3 ), + array( 'lhs' => 86, 'rhs' => 3 ), array( 'lhs' => 86, 'rhs' => 3 ), array( 'lhs' => 80, 'rhs' => 1 ), + array( 'lhs' => 89, 'rhs' => 1 ), + array( 'lhs' => 89, 'rhs' => 1 ), + array( 'lhs' => 89, 'rhs' => 1 ), + array( 'lhs' => 89, 'rhs' => 4 ), + array( 'lhs' => 89, 'rhs' => 3 ), + array( 'lhs' => 89, 'rhs' => 3 ), + array( 'lhs' => 96, 'rhs' => 1 ), + array( 'lhs' => 96, 'rhs' => 3 ), + array( 'lhs' => 98, 'rhs' => 1 ), + array( 'lhs' => 98, 'rhs' => 3 ), + array( 'lhs' => 100, 'rhs' => 1 ), + array( 'lhs' => 100, 'rhs' => 3 ), + array( 'lhs' => 88, 'rhs' => 1 ), + array( 'lhs' => 88, 'rhs' => 3 ), + array( 'lhs' => 95, 'rhs' => 3 ), + array( 'lhs' => 103, 'rhs' => 1 ), + array( 'lhs' => 103, 'rhs' => 3 ), + array( 'lhs' => 93, 'rhs' => 0 ), + array( 'lhs' => 93, 'rhs' => 1 ), + array( 'lhs' => 93, 'rhs' => 3 ), + array( 'lhs' => 104, 'rhs' => 1 ), + array( 'lhs' => 104, 'rhs' => 3 ), + array( 'lhs' => 105, 'rhs' => 1 ), + array( 'lhs' => 105, 'rhs' => 1 ), + array( 'lhs' => 105, 'rhs' => 1 ), + array( 'lhs' => 105, 'rhs' => 1 ), + array( 'lhs' => 105, 'rhs' => 1 ), + array( 'lhs' => 105, 'rhs' => 1 ), array( 'lhs' => 90, 'rhs' => 1 ), - array( 'lhs' => 109, 'rhs' => 1 ), - array( 'lhs' => 107, 'rhs' => 1 ), - array( 'lhs' => 107, 'rhs' => 2 ), + array( 'lhs' => 90, 'rhs' => 1 ), + array( 'lhs' => 90, 'rhs' => 1 ), + array( 'lhs' => 106, 'rhs' => 1 ), array( 'lhs' => 107, 'rhs' => 1 ), array( 'lhs' => 108, 'rhs' => 1 ), - array( 'lhs' => 96, 'rhs' => 1 ), - array( 'lhs' => 96, 'rhs' => 1 ), - array( 'lhs' => 98, 'rhs' => 1 ), - array( 'lhs' => 98, 'rhs' => 1 ), - array( 'lhs' => 98, 'rhs' => 1 ), - array( 'lhs' => 98, 'rhs' => 1 ), - array( 'lhs' => 98, 'rhs' => 1 ), - array( 'lhs' => 100, 'rhs' => 1 ), - array( 'lhs' => 100, 'rhs' => 1 ), + array( 'lhs' => 87, 'rhs' => 1 ), + array( 'lhs' => 87, 'rhs' => 3 ), + array( 'lhs' => 81, 'rhs' => 1 ), + array( 'lhs' => 91, 'rhs' => 1 ), + array( 'lhs' => 111, 'rhs' => 1 ), + array( 'lhs' => 109, 'rhs' => 1 ), + array( 'lhs' => 109, 'rhs' => 2 ), + array( 'lhs' => 109, 'rhs' => 1 ), + array( 'lhs' => 110, 'rhs' => 1 ), + array( 'lhs' => 97, 'rhs' => 1 ), + array( 'lhs' => 97, 'rhs' => 1 ), + array( 'lhs' => 99, 'rhs' => 1 ), + array( 'lhs' => 99, 'rhs' => 1 ), + array( 'lhs' => 99, 'rhs' => 1 ), + array( 'lhs' => 99, 'rhs' => 1 ), + array( 'lhs' => 99, 'rhs' => 1 ), array( 'lhs' => 101, 'rhs' => 1 ), array( 'lhs' => 101, 'rhs' => 1 ), - array( 'lhs' => 110, 'rhs' => 1 ), - array( 'lhs' => 110, 'rhs' => 1 ), + array( 'lhs' => 102, 'rhs' => 1 ), + array( 'lhs' => 102, 'rhs' => 1 ), array( 'lhs' => 112, 'rhs' => 1 ), array( 'lhs' => 112, 'rhs' => 1 ), - array( 'lhs' => 112, 'rhs' => 1 ), - array( 'lhs' => 112, 'rhs' => 1 ), - array( 'lhs' => 112, 'rhs' => 1 ), - array( 'lhs' => 112, 'rhs' => 1 ), - array( 'lhs' => 113, 'rhs' => 1 ), - array( 'lhs' => 113, 'rhs' => 1 ), - array( 'lhs' => 113, 'rhs' => 1 ), - array( 'lhs' => 111, 'rhs' => 1 ), - array( 'lhs' => 111, 'rhs' => 1 ), + array( 'lhs' => 114, 'rhs' => 1 ), + array( 'lhs' => 114, 'rhs' => 1 ), + array( 'lhs' => 114, 'rhs' => 1 ), + array( 'lhs' => 114, 'rhs' => 1 ), + array( 'lhs' => 114, 'rhs' => 1 ), array( 'lhs' => 114, 'rhs' => 1 ), array( 'lhs' => 115, 'rhs' => 1 ), array( 'lhs' => 115, 'rhs' => 1 ), - array( 'lhs' => 93, 'rhs' => 1 ), - array( 'lhs' => 93, 'rhs' => 1 ), - array( 'lhs' => 91, 'rhs' => 1 ), - array( 'lhs' => 91, 'rhs' => 1 ), - array( 'lhs' => 91, 'rhs' => 1 ), - array( 'lhs' => 91, 'rhs' => 1 ), - array( 'lhs' => 91, 'rhs' => 1 ), - array( 'lhs' => 91, 'rhs' => 1 ), - array( 'lhs' => 91, 'rhs' => 1 ), - array( 'lhs' => 91, 'rhs' => 1 ), - array( 'lhs' => 91, 'rhs' => 1 ), - array( 'lhs' => 91, 'rhs' => 1 ), - array( 'lhs' => 91, 'rhs' => 1 ), - array( 'lhs' => 91, 'rhs' => 1 ), - array( 'lhs' => 91, 'rhs' => 1 ), - array( 'lhs' => 91, 'rhs' => 1 ), - array( 'lhs' => 91, 'rhs' => 1 ), - array( 'lhs' => 91, 'rhs' => 1 ), - array( 'lhs' => 91, 'rhs' => 1 ), - array( 'lhs' => 91, 'rhs' => 1 ), - array( 'lhs' => 91, 'rhs' => 1 ), - array( 'lhs' => 91, 'rhs' => 1 ), - array( 'lhs' => 91, 'rhs' => 1 ), - array( 'lhs' => 91, 'rhs' => 1 ), - array( 'lhs' => 91, 'rhs' => 1 ), + array( 'lhs' => 115, 'rhs' => 1 ), + array( 'lhs' => 113, 'rhs' => 1 ), + array( 'lhs' => 113, 'rhs' => 1 ), + array( 'lhs' => 116, 'rhs' => 1 ), + array( 'lhs' => 117, 'rhs' => 1 ), + array( 'lhs' => 117, 'rhs' => 1 ), + array( 'lhs' => 94, 'rhs' => 1 ), + array( 'lhs' => 94, 'rhs' => 1 ), + array( 'lhs' => 92, 'rhs' => 1 ), + array( 'lhs' => 92, 'rhs' => 1 ), + array( 'lhs' => 92, 'rhs' => 1 ), + array( 'lhs' => 92, 'rhs' => 1 ), + array( 'lhs' => 92, 'rhs' => 1 ), + array( 'lhs' => 92, 'rhs' => 1 ), + array( 'lhs' => 92, 'rhs' => 1 ), + array( 'lhs' => 92, 'rhs' => 1 ), + array( 'lhs' => 92, 'rhs' => 1 ), + array( 'lhs' => 92, 'rhs' => 1 ), + array( 'lhs' => 92, 'rhs' => 1 ), + array( 'lhs' => 92, 'rhs' => 1 ), + array( 'lhs' => 92, 'rhs' => 1 ), + array( 'lhs' => 92, 'rhs' => 1 ), + array( 'lhs' => 92, 'rhs' => 1 ), + array( 'lhs' => 92, 'rhs' => 1 ), + array( 'lhs' => 92, 'rhs' => 1 ), + array( 'lhs' => 92, 'rhs' => 1 ), + array( 'lhs' => 92, 'rhs' => 1 ), + array( 'lhs' => 92, 'rhs' => 1 ), + array( 'lhs' => 92, 'rhs' => 1 ), + array( 'lhs' => 92, 'rhs' => 1 ), + array( 'lhs' => 92, 'rhs' => 1 ), ); /** @@ -1367,6 +1372,7 @@ static public $yy_action = array( 55 => 27, 56 => 27, 57 => 27, + 58 => 27, 31 => 31, 32 => 32, 33 => 33, @@ -1377,69 +1383,70 @@ static public $yy_action = array( 42 => 42, 45 => 45, 49 => 49, - 58 => 58, - 59 => 58, - 60 => 60, + 59 => 59, + 60 => 59, 61 => 61, 62 => 62, - 98 => 62, - 99 => 62, - 100 => 62, - 101 => 62, - 102 => 62, - 103 => 62, - 104 => 62, - 105 => 62, - 106 => 62, - 107 => 62, - 108 => 62, - 109 => 62, - 110 => 62, - 111 => 62, - 112 => 62, - 113 => 62, - 114 => 62, - 115 => 62, - 116 => 62, - 117 => 62, - 118 => 62, - 119 => 62, - 120 => 62, 63 => 63, 64 => 64, + 100 => 64, + 101 => 64, + 102 => 64, + 103 => 64, + 104 => 64, + 105 => 64, + 106 => 64, + 107 => 64, + 108 => 64, + 109 => 64, + 110 => 64, + 111 => 64, + 112 => 64, + 113 => 64, + 114 => 64, + 115 => 64, + 116 => 64, + 117 => 64, + 118 => 64, + 119 => 64, + 120 => 64, + 121 => 64, + 122 => 64, 65 => 65, 66 => 66, 67 => 67, 68 => 68, 69 => 69, - 70 => 69, - 71 => 69, - 72 => 69, - 73 => 69, - 74 => 69, - 75 => 69, - 76 => 69, - 77 => 69, - 78 => 69, - 79 => 69, - 80 => 69, - 81 => 69, - 82 => 69, - 83 => 69, - 84 => 69, - 85 => 69, - 86 => 69, - 87 => 69, - 88 => 69, - 89 => 69, - 90 => 69, - 91 => 69, - 92 => 69, - 93 => 69, - 94 => 69, - 95 => 69, - 96 => 69, - 97 => 69, + 70 => 70, + 71 => 71, + 72 => 71, + 73 => 71, + 74 => 71, + 75 => 71, + 76 => 71, + 77 => 71, + 78 => 71, + 79 => 71, + 80 => 71, + 81 => 71, + 82 => 71, + 83 => 71, + 84 => 71, + 85 => 71, + 86 => 71, + 87 => 71, + 88 => 71, + 89 => 71, + 90 => 71, + 91 => 71, + 92 => 71, + 93 => 71, + 94 => 71, + 95 => 71, + 96 => 71, + 97 => 71, + 98 => 71, + 99 => 71, ); /* Beginning here are the reduction cases. A typical example ** follows: @@ -1447,116 +1454,116 @@ static public $yy_action = array( ** function yy_r0($yymsp){ ... } // User supplied code ** #line */ -#line 29 "../oql-parser.y" +#line 29 "..\oql-parser.y" function yy_r0(){ $this->my_result = $this->yystack[$this->yyidx + 0]->minor; } -#line 1456 "../oql-parser.php" -#line 33 "../oql-parser.y" +#line 1463 "..\oql-parser.php" +#line 33 "..\oql-parser.y" function yy_r3(){ $this->_retvalue = new OqlUnionQuery($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor); } -#line 1461 "../oql-parser.php" -#line 40 "../oql-parser.y" +#line 1468 "..\oql-parser.php" +#line 40 "..\oql-parser.y" function yy_r5(){ $this->_retvalue = new OqlObjectQuery($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->yystack[$this->yyidx + -1]->minor, array($this->yystack[$this->yyidx + -2]->minor)); } -#line 1466 "../oql-parser.php" -#line 43 "../oql-parser.y" +#line 1473 "..\oql-parser.php" +#line 43 "..\oql-parser.y" function yy_r6(){ $this->_retvalue = new OqlObjectQuery($this->yystack[$this->yyidx + -4]->minor, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->yystack[$this->yyidx + -1]->minor, array($this->yystack[$this->yyidx + -2]->minor)); } -#line 1471 "../oql-parser.php" -#line 47 "../oql-parser.y" +#line 1478 "..\oql-parser.php" +#line 47 "..\oql-parser.y" function yy_r7(){ $this->_retvalue = new OqlObjectQuery($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + -4]->minor); } -#line 1476 "../oql-parser.php" -#line 50 "../oql-parser.y" +#line 1483 "..\oql-parser.php" +#line 50 "..\oql-parser.y" function yy_r8(){ $this->_retvalue = new OqlObjectQuery($this->yystack[$this->yyidx + -4]->minor, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + -6]->minor); } -#line 1481 "../oql-parser.php" -#line 55 "../oql-parser.y" +#line 1488 "..\oql-parser.php" +#line 55 "..\oql-parser.y" function yy_r9(){ $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor); } -#line 1486 "../oql-parser.php" -#line 58 "../oql-parser.y" +#line 1493 "..\oql-parser.php" +#line 58 "..\oql-parser.y" function yy_r10(){ array_push($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor; } -#line 1492 "../oql-parser.php" -#line 63 "../oql-parser.y" +#line 1499 "..\oql-parser.php" +#line 63 "..\oql-parser.y" function yy_r11(){ $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; } -#line 1495 "../oql-parser.php" -#line 64 "../oql-parser.y" +#line 1502 "..\oql-parser.php" +#line 64 "..\oql-parser.y" function yy_r12(){ $this->_retvalue = null; } -#line 1498 "../oql-parser.php" -#line 66 "../oql-parser.y" +#line 1505 "..\oql-parser.php" +#line 66 "..\oql-parser.y" function yy_r13(){ // insert the join statement on top of the existing list array_unshift($this->yystack[$this->yyidx + 0]->minor, $this->yystack[$this->yyidx + -1]->minor); // and return the updated array $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; } -#line 1506 "../oql-parser.php" -#line 72 "../oql-parser.y" +#line 1513 "..\oql-parser.php" +#line 72 "..\oql-parser.y" function yy_r14(){ $this->_retvalue = Array($this->yystack[$this->yyidx + 0]->minor); } -#line 1511 "../oql-parser.php" -#line 78 "../oql-parser.y" +#line 1518 "..\oql-parser.php" +#line 78 "..\oql-parser.y" function yy_r16(){ // create an array with one single item $this->_retvalue = new OqlJoinSpec($this->yystack[$this->yyidx + -4]->minor, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor); } -#line 1517 "../oql-parser.php" -#line 83 "../oql-parser.y" +#line 1524 "..\oql-parser.php" +#line 83 "..\oql-parser.y" function yy_r17(){ // create an array with one single item $this->_retvalue = new OqlJoinSpec($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor); } -#line 1523 "../oql-parser.php" -#line 88 "../oql-parser.y" +#line 1530 "..\oql-parser.php" +#line 88 "..\oql-parser.y" function yy_r18(){ $this->_retvalue = new BinaryOqlExpression($this->yystack[$this->yyidx + -2]->minor, '=', $this->yystack[$this->yyidx + 0]->minor); } -#line 1526 "../oql-parser.php" -#line 89 "../oql-parser.y" +#line 1533 "..\oql-parser.php" +#line 89 "..\oql-parser.y" function yy_r19(){ $this->_retvalue = new BinaryOqlExpression($this->yystack[$this->yyidx + -2]->minor, 'BELOW', $this->yystack[$this->yyidx + 0]->minor); } -#line 1529 "../oql-parser.php" -#line 90 "../oql-parser.y" +#line 1536 "..\oql-parser.php" +#line 90 "..\oql-parser.y" function yy_r20(){ $this->_retvalue = new BinaryOqlExpression($this->yystack[$this->yyidx + -2]->minor, 'BELOW_STRICT', $this->yystack[$this->yyidx + 0]->minor); } -#line 1532 "../oql-parser.php" -#line 91 "../oql-parser.y" +#line 1539 "..\oql-parser.php" +#line 91 "..\oql-parser.y" function yy_r21(){ $this->_retvalue = new BinaryOqlExpression($this->yystack[$this->yyidx + -2]->minor, 'NOT_BELOW', $this->yystack[$this->yyidx + 0]->minor); } -#line 1535 "../oql-parser.php" -#line 92 "../oql-parser.y" +#line 1542 "..\oql-parser.php" +#line 92 "..\oql-parser.y" function yy_r22(){ $this->_retvalue = new BinaryOqlExpression($this->yystack[$this->yyidx + -2]->minor, 'NOT_BELOW_STRICT', $this->yystack[$this->yyidx + 0]->minor); } -#line 1538 "../oql-parser.php" -#line 93 "../oql-parser.y" +#line 1545 "..\oql-parser.php" +#line 93 "..\oql-parser.y" function yy_r23(){ $this->_retvalue = new BinaryOqlExpression($this->yystack[$this->yyidx + -2]->minor, 'ABOVE', $this->yystack[$this->yyidx + 0]->minor); } -#line 1541 "../oql-parser.php" -#line 94 "../oql-parser.y" +#line 1548 "..\oql-parser.php" +#line 94 "..\oql-parser.y" function yy_r24(){ $this->_retvalue = new BinaryOqlExpression($this->yystack[$this->yyidx + -2]->minor, 'ABOVE_STRICT', $this->yystack[$this->yyidx + 0]->minor); } -#line 1544 "../oql-parser.php" -#line 95 "../oql-parser.y" +#line 1551 "..\oql-parser.php" +#line 95 "..\oql-parser.y" function yy_r25(){ $this->_retvalue = new BinaryOqlExpression($this->yystack[$this->yyidx + -2]->minor, 'NOT_ABOVE', $this->yystack[$this->yyidx + 0]->minor); } -#line 1547 "../oql-parser.php" -#line 96 "../oql-parser.y" +#line 1554 "..\oql-parser.php" +#line 96 "..\oql-parser.y" function yy_r26(){ $this->_retvalue = new BinaryOqlExpression($this->yystack[$this->yyidx + -2]->minor, 'NOT_ABOVE_STRICT', $this->yystack[$this->yyidx + 0]->minor); } -#line 1550 "../oql-parser.php" -#line 98 "../oql-parser.y" +#line 1557 "..\oql-parser.php" +#line 98 "..\oql-parser.y" function yy_r27(){ $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; } -#line 1553 "../oql-parser.php" -#line 103 "../oql-parser.y" +#line 1560 "..\oql-parser.php" +#line 103 "..\oql-parser.y" function yy_r31(){ $this->_retvalue = new FunctionOqlExpression($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + -1]->minor); } -#line 1556 "../oql-parser.php" -#line 104 "../oql-parser.y" +#line 1563 "..\oql-parser.php" +#line 104 "..\oql-parser.y" function yy_r32(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; } -#line 1559 "../oql-parser.php" -#line 105 "../oql-parser.y" +#line 1566 "..\oql-parser.php" +#line 105 "..\oql-parser.y" function yy_r33(){ $this->_retvalue = new BinaryOqlExpression($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor); } -#line 1562 "../oql-parser.php" -#line 111 "../oql-parser.y" +#line 1569 "..\oql-parser.php" +#line 111 "..\oql-parser.y" function yy_r37(){ if ($this->yystack[$this->yyidx + -1]->minor == 'MATCHES') { @@ -1567,37 +1574,40 @@ static public $yy_action = array( $this->_retvalue = new BinaryOqlExpression($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor); } } -#line 1574 "../oql-parser.php" -#line 129 "../oql-parser.y" +#line 1581 "..\oql-parser.php" +#line 129 "..\oql-parser.y" function yy_r42(){ $this->_retvalue = new ListOqlExpression($this->yystack[$this->yyidx + -1]->minor); } -#line 1579 "../oql-parser.php" -#line 140 "../oql-parser.y" +#line 1586 "..\oql-parser.php" +#line 140 "..\oql-parser.y" function yy_r45(){ $this->_retvalue = array(); } -#line 1584 "../oql-parser.php" -#line 151 "../oql-parser.y" +#line 1591 "..\oql-parser.php" +#line 151 "..\oql-parser.y" function yy_r49(){ $this->_retvalue = new IntervalOqlExpression($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor); } -#line 1587 "../oql-parser.php" -#line 163 "../oql-parser.y" - function yy_r58(){ $this->_retvalue = new ScalarOqlExpression($this->yystack[$this->yyidx + 0]->minor); } -#line 1590 "../oql-parser.php" -#line 166 "../oql-parser.y" - function yy_r60(){ $this->_retvalue = new FieldOqlExpression($this->yystack[$this->yyidx + 0]->minor); } -#line 1593 "../oql-parser.php" -#line 167 "../oql-parser.y" - function yy_r61(){ $this->_retvalue = new FieldOqlExpression($this->yystack[$this->yyidx + 0]->minor, $this->yystack[$this->yyidx + -2]->minor); } -#line 1596 "../oql-parser.php" -#line 168 "../oql-parser.y" - function yy_r62(){ $this->_retvalue=$this->yystack[$this->yyidx + 0]->minor; } -#line 1599 "../oql-parser.php" -#line 171 "../oql-parser.y" - function yy_r63(){ $this->_retvalue = new VariableOqlExpression(substr($this->yystack[$this->yyidx + 0]->minor, 1)); } -#line 1602 "../oql-parser.php" -#line 173 "../oql-parser.y" - function yy_r64(){ +#line 1594 "..\oql-parser.php" +#line 164 "..\oql-parser.y" + function yy_r59(){ $this->_retvalue = new ScalarOqlExpression($this->yystack[$this->yyidx + 0]->minor); } +#line 1597 "..\oql-parser.php" +#line 166 "..\oql-parser.y" + function yy_r61(){ $this->_retvalue = new ScalarOqlExpression(null); } +#line 1600 "..\oql-parser.php" +#line 168 "..\oql-parser.y" + function yy_r62(){ $this->_retvalue = new FieldOqlExpression($this->yystack[$this->yyidx + 0]->minor); } +#line 1603 "..\oql-parser.php" +#line 169 "..\oql-parser.y" + function yy_r63(){ $this->_retvalue = new FieldOqlExpression($this->yystack[$this->yyidx + 0]->minor, $this->yystack[$this->yyidx + -2]->minor); } +#line 1606 "..\oql-parser.php" +#line 170 "..\oql-parser.y" + function yy_r64(){ $this->_retvalue=$this->yystack[$this->yyidx + 0]->minor; } +#line 1609 "..\oql-parser.php" +#line 173 "..\oql-parser.y" + function yy_r65(){ $this->_retvalue = new VariableOqlExpression(substr($this->yystack[$this->yyidx + 0]->minor, 1)); } +#line 1612 "..\oql-parser.php" +#line 175 "..\oql-parser.y" + function yy_r66(){ if ($this->yystack[$this->yyidx + 0]->minor[0] == '`') { $name = substr($this->yystack[$this->yyidx + 0]->minor, 1, strlen($this->yystack[$this->yyidx + 0]->minor) - 2); @@ -1608,22 +1618,22 @@ static public $yy_action = array( } $this->_retvalue = new OqlName($name, $this->m_iColPrev); } -#line 1615 "../oql-parser.php" -#line 184 "../oql-parser.y" - function yy_r65(){$this->_retvalue=(int)$this->yystack[$this->yyidx + 0]->minor; } -#line 1618 "../oql-parser.php" -#line 185 "../oql-parser.y" - function yy_r66(){$this->_retvalue=(int)-$this->yystack[$this->yyidx + 0]->minor; } -#line 1621 "../oql-parser.php" -#line 186 "../oql-parser.y" - function yy_r67(){$this->_retvalue=new OqlHexValue($this->yystack[$this->yyidx + 0]->minor); } -#line 1624 "../oql-parser.php" -#line 187 "../oql-parser.y" - function yy_r68(){$this->_retvalue=stripslashes(substr($this->yystack[$this->yyidx + 0]->minor, 1, strlen($this->yystack[$this->yyidx + 0]->minor) - 2)); } -#line 1627 "../oql-parser.php" -#line 190 "../oql-parser.y" - function yy_r69(){$this->_retvalue=$this->yystack[$this->yyidx + 0]->minor; } -#line 1630 "../oql-parser.php" +#line 1625 "..\oql-parser.php" +#line 186 "..\oql-parser.y" + function yy_r67(){$this->_retvalue=(int)$this->yystack[$this->yyidx + 0]->minor; } +#line 1628 "..\oql-parser.php" +#line 187 "..\oql-parser.y" + function yy_r68(){$this->_retvalue=(int)-$this->yystack[$this->yyidx + 0]->minor; } +#line 1631 "..\oql-parser.php" +#line 188 "..\oql-parser.y" + function yy_r69(){$this->_retvalue=new OqlHexValue($this->yystack[$this->yyidx + 0]->minor); } +#line 1634 "..\oql-parser.php" +#line 189 "..\oql-parser.y" + function yy_r70(){$this->_retvalue=stripslashes(substr($this->yystack[$this->yyidx + 0]->minor, 1, strlen($this->yystack[$this->yyidx + 0]->minor) - 2)); } +#line 1637 "..\oql-parser.php" +#line 192 "..\oql-parser.y" + function yy_r71(){$this->_retvalue=$this->yystack[$this->yyidx + 0]->minor; } +#line 1640 "..\oql-parser.php" /** * placeholder for the left hand side in a reduce operation. @@ -1735,10 +1745,10 @@ static public $yy_action = array( */ function yy_syntax_error($yymajor, $TOKEN) { -#line 25 "../oql-parser.y" +#line 25 "..\oql-parser.y" throw new OQLParserException($this->m_sSourceQuery, $this->m_iLine, $this->m_iCol, $this->tokenName($yymajor), $TOKEN); -#line 1746 "../oql-parser.php" +#line 1756 "..\oql-parser.php" } /** @@ -1905,7 +1915,7 @@ throw new OQLParserException($this->m_sSourceQuery, $this->m_iLine, $this->m_iCo } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0); } } -#line 255 "../oql-parser.y" +#line 257 "..\oql-parser.y" class OQLParserException extends OQLException @@ -1970,4 +1980,4 @@ class OQLParser extends OQLParserRaw } } -#line 1979 "../oql-parser.php" +#line 1989 "..\oql-parser.php" diff --git a/core/oql/oql-parser.y b/core/oql/oql-parser.y index c2603402b..4feb66319 100644 --- a/core/oql/oql-parser.y +++ b/core/oql/oql-parser.y @@ -159,9 +159,11 @@ interval_unit(A) ::= F_YEAR(X). { A = X; } scalar(A) ::= num_scalar(X). { A = X; } scalar(A) ::= str_scalar(X). { A = X; } +scalar(A) ::= null_scalar(X). { A = X; } num_scalar(A) ::= num_value(X). { A = new ScalarOqlExpression(X); } str_scalar(A) ::= str_value(X). { A = new ScalarOqlExpression(X); } +null_scalar(A) ::= NULL_VAL. { A = new ScalarOqlExpression(null); } field_id(A) ::= name(X). { A = new FieldOqlExpression(X); } field_id(A) ::= class_name(X) DOT name(Y). { A = new FieldOqlExpression(Y, X); } diff --git a/core/oql/version.txt b/core/oql/version.txt index 052f0a1a1..e3b93580e 100644 --- a/core/oql/version.txt +++ b/core/oql/version.txt @@ -1 +1 @@ -2018-08-31 \ No newline at end of file +2019-11-28 \ No newline at end of file