diff --git a/core/dbobjectsearch.class.php b/core/dbobjectsearch.class.php index 2a570ca09..3144c9726 100644 --- a/core/dbobjectsearch.class.php +++ b/core/dbobjectsearch.class.php @@ -1262,6 +1262,10 @@ class DBObjectSearch extends DBSearch $oRight = $this->OQLExpressionToCondition($sQuery, $oExpression->GetRightExpr(), $aClassAliases); return new BinaryExpression($oLeft, $sOperator, $oRight); } + elseif ($oExpression instanceof ExternalFieldOqlExpression) + { + return new TrueExpression(); + } elseif ($oExpression instanceof FieldOqlExpression) { $sClassAlias = $oExpression->GetParent(); diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php index 59ce6c5cb..622a19260 100644 --- a/core/oql/expression.class.inc.php +++ b/core/oql/expression.class.inc.php @@ -841,6 +841,11 @@ class FalseExpression extends ScalarExpression } } +class ExternalFieldExpression extends UnaryExpression +{ + +} + class FieldExpression extends UnaryExpression { protected $m_sParent; diff --git a/core/oql/oql-lexer.php b/core/oql/oql-lexer.php index 23d9c7b6e..fcba506b3 100644 --- a/core/oql/oql-lexer.php +++ b/core/oql/oql-lexer.php @@ -115,6 +115,8 @@ class OQLLexerRaw '/\GWHERE/ ', '/\GJOIN/ ', '/\GON/ ', + '/\G->/ ', + '/\G:/ ', '/\G\// ', '/\G\\*/ ', '/\G\\+/ ', @@ -316,329 +318,339 @@ class OQLLexerRaw function yy_r1_8($yy_subpatterns) { - $this->token = OQLParser::MATH_DIV; + $this->token = OQLParser::ARROW; } function yy_r1_9($yy_subpatterns) { - $this->token = OQLParser::MATH_MULT; + $this->token = OQLParser::COLON; } function yy_r1_10($yy_subpatterns) { - $this->token = OQLParser::MATH_PLUS; + $this->token = OQLParser::MATH_DIV; } function yy_r1_11($yy_subpatterns) { - $this->token = OQLParser::MATH_MINUS; + $this->token = OQLParser::MATH_MULT; } function yy_r1_12($yy_subpatterns) { - $this->token = OQLParser::LOG_AND; + $this->token = OQLParser::MATH_PLUS; } function yy_r1_13($yy_subpatterns) { - $this->token = OQLParser::LOG_OR; + $this->token = OQLParser::MATH_MINUS; } function yy_r1_14($yy_subpatterns) { - $this->token = OQLParser::BITWISE_OR; + $this->token = OQLParser::LOG_AND; } function yy_r1_15($yy_subpatterns) { - $this->token = OQLParser::BITWISE_AND; + $this->token = OQLParser::LOG_OR; } function yy_r1_16($yy_subpatterns) { - $this->token = OQLParser::BITWISE_XOR; + $this->token = OQLParser::BITWISE_OR; } function yy_r1_17($yy_subpatterns) { - $this->token = OQLParser::BITWISE_LEFT_SHIFT; + $this->token = OQLParser::BITWISE_AND; } function yy_r1_18($yy_subpatterns) { - $this->token = OQLParser::BITWISE_RIGHT_SHIFT; + $this->token = OQLParser::BITWISE_XOR; } function yy_r1_19($yy_subpatterns) { - $this->token = OQLParser::COMA; + $this->token = OQLParser::BITWISE_LEFT_SHIFT; } function yy_r1_20($yy_subpatterns) { - $this->token = OQLParser::PAR_OPEN; + $this->token = OQLParser::BITWISE_RIGHT_SHIFT; } function yy_r1_21($yy_subpatterns) { - $this->token = OQLParser::PAR_CLOSE; + $this->token = OQLParser::COMA; } function yy_r1_22($yy_subpatterns) { - $this->token = OQLParser::REGEXP; + $this->token = OQLParser::PAR_OPEN; } function yy_r1_23($yy_subpatterns) { - $this->token = OQLParser::EQ; + $this->token = OQLParser::PAR_CLOSE; } function yy_r1_24($yy_subpatterns) { - $this->token = OQLParser::NOT_EQ; + $this->token = OQLParser::REGEXP; } function yy_r1_25($yy_subpatterns) { - $this->token = OQLParser::GT; + $this->token = OQLParser::EQ; } function yy_r1_26($yy_subpatterns) { - $this->token = OQLParser::LT; + $this->token = OQLParser::NOT_EQ; } function yy_r1_27($yy_subpatterns) { - $this->token = OQLParser::GE; + $this->token = OQLParser::GT; } function yy_r1_28($yy_subpatterns) { - $this->token = OQLParser::LE; + $this->token = OQLParser::LT; } function yy_r1_29($yy_subpatterns) { - $this->token = OQLParser::LIKE; + $this->token = OQLParser::GE; } function yy_r1_30($yy_subpatterns) { - $this->token = OQLParser::NOT_LIKE; + $this->token = OQLParser::LE; } function yy_r1_31($yy_subpatterns) { - $this->token = OQLParser::IN; + $this->token = OQLParser::LIKE; } function yy_r1_32($yy_subpatterns) { - $this->token = OQLParser::NOT_IN; + $this->token = OQLParser::NOT_LIKE; } function yy_r1_33($yy_subpatterns) { - $this->token = OQLParser::INTERVAL; + $this->token = OQLParser::IN; } function yy_r1_34($yy_subpatterns) { - $this->token = OQLParser::F_IF; + $this->token = OQLParser::NOT_IN; } function yy_r1_35($yy_subpatterns) { - $this->token = OQLParser::F_ELT; + $this->token = OQLParser::INTERVAL; } function yy_r1_36($yy_subpatterns) { - $this->token = OQLParser::F_COALESCE; + $this->token = OQLParser::F_IF; } function yy_r1_37($yy_subpatterns) { - $this->token = OQLParser::F_ISNULL; + $this->token = OQLParser::F_ELT; } function yy_r1_38($yy_subpatterns) { - $this->token = OQLParser::F_CONCAT; + $this->token = OQLParser::F_COALESCE; } function yy_r1_39($yy_subpatterns) { - $this->token = OQLParser::F_SUBSTR; + $this->token = OQLParser::F_ISNULL; } function yy_r1_40($yy_subpatterns) { - $this->token = OQLParser::F_TRIM; + $this->token = OQLParser::F_CONCAT; } function yy_r1_41($yy_subpatterns) { - $this->token = OQLParser::F_DATE; + $this->token = OQLParser::F_SUBSTR; } function yy_r1_42($yy_subpatterns) { - $this->token = OQLParser::F_DATE_FORMAT; + $this->token = OQLParser::F_TRIM; } function yy_r1_43($yy_subpatterns) { - $this->token = OQLParser::F_CURRENT_DATE; + $this->token = OQLParser::F_DATE; } function yy_r1_44($yy_subpatterns) { - $this->token = OQLParser::F_NOW; + $this->token = OQLParser::F_DATE_FORMAT; } function yy_r1_45($yy_subpatterns) { - $this->token = OQLParser::F_TIME; + $this->token = OQLParser::F_CURRENT_DATE; } function yy_r1_46($yy_subpatterns) { - $this->token = OQLParser::F_TO_DAYS; + $this->token = OQLParser::F_NOW; } function yy_r1_47($yy_subpatterns) { - $this->token = OQLParser::F_FROM_DAYS; + $this->token = OQLParser::F_TIME; } function yy_r1_48($yy_subpatterns) { - $this->token = OQLParser::F_YEAR; + $this->token = OQLParser::F_TO_DAYS; } function yy_r1_49($yy_subpatterns) { - $this->token = OQLParser::F_MONTH; + $this->token = OQLParser::F_FROM_DAYS; } function yy_r1_50($yy_subpatterns) { - $this->token = OQLParser::F_DAY; + $this->token = OQLParser::F_YEAR; } function yy_r1_51($yy_subpatterns) { - $this->token = OQLParser::F_HOUR; + $this->token = OQLParser::F_MONTH; } function yy_r1_52($yy_subpatterns) { - $this->token = OQLParser::F_MINUTE; + $this->token = OQLParser::F_DAY; } function yy_r1_53($yy_subpatterns) { - $this->token = OQLParser::F_SECOND; + $this->token = OQLParser::F_HOUR; } function yy_r1_54($yy_subpatterns) { - $this->token = OQLParser::F_DATE_ADD; + $this->token = OQLParser::F_MINUTE; } function yy_r1_55($yy_subpatterns) { - $this->token = OQLParser::F_DATE_SUB; + $this->token = OQLParser::F_SECOND; } function yy_r1_56($yy_subpatterns) { - $this->token = OQLParser::F_ROUND; + $this->token = OQLParser::F_DATE_ADD; } function yy_r1_57($yy_subpatterns) { - $this->token = OQLParser::F_FLOOR; + $this->token = OQLParser::F_DATE_SUB; } function yy_r1_58($yy_subpatterns) { - $this->token = OQLParser::F_INET_ATON; + $this->token = OQLParser::F_ROUND; } function yy_r1_59($yy_subpatterns) { - $this->token = OQLParser::F_INET_NTOA; + $this->token = OQLParser::F_FLOOR; } function yy_r1_60($yy_subpatterns) { - $this->token = OQLParser::BELOW; + $this->token = OQLParser::F_INET_ATON; } function yy_r1_61($yy_subpatterns) { - $this->token = OQLParser::BELOW_STRICT; + $this->token = OQLParser::F_INET_NTOA; } function yy_r1_62($yy_subpatterns) { - $this->token = OQLParser::NOT_BELOW; + $this->token = OQLParser::BELOW; } function yy_r1_63($yy_subpatterns) { - $this->token = OQLParser::NOT_BELOW_STRICT; + $this->token = OQLParser::BELOW_STRICT; } function yy_r1_64($yy_subpatterns) { - $this->token = OQLParser::ABOVE; + $this->token = OQLParser::NOT_BELOW; } function yy_r1_65($yy_subpatterns) { - $this->token = OQLParser::ABOVE_STRICT; + $this->token = OQLParser::NOT_BELOW_STRICT; } function yy_r1_66($yy_subpatterns) { - $this->token = OQLParser::NOT_ABOVE; + $this->token = OQLParser::ABOVE; } function yy_r1_67($yy_subpatterns) { - $this->token = OQLParser::NOT_ABOVE_STRICT; + $this->token = OQLParser::ABOVE_STRICT; } function yy_r1_68($yy_subpatterns) { - $this->token = OQLParser::HEXVAL; + $this->token = OQLParser::NOT_ABOVE; } function yy_r1_69($yy_subpatterns) { - $this->token = OQLParser::NUMVAL; + $this->token = OQLParser::NOT_ABOVE_STRICT; } function yy_r1_70($yy_subpatterns) { - $this->token = OQLParser::STRVAL; + $this->token = OQLParser::HEXVAL; } function yy_r1_71($yy_subpatterns) { - $this->token = OQLParser::NAME; + $this->token = OQLParser::NUMVAL; } function yy_r1_72($yy_subpatterns) { - $this->token = OQLParser::VARNAME; + $this->token = OQLParser::STRVAL; } function yy_r1_73($yy_subpatterns) + { + + $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 fc0101b42..6a477dd41 100644 --- a/core/oql/oql-lexer.plex +++ b/core/oql/oql-lexer.plex @@ -88,6 +88,8 @@ where = "WHERE" join = "JOIN" on = "ON" coma = "," +arrow = "->" +colon = ":" par_open = "(" par_close = ")" math_div = "/" @@ -170,7 +172,7 @@ numval = /([0-9]+)/ strval = /"([^\\"]|\\"|\\\\)*"|'.chr(94).chr(39).'([^\\'.chr(39).']|\\'.chr(39).'|\\\\)*'.chr(39).'/ name = /([_a-zA-Z][_a-zA-Z0-9]*|`[^`]+`)/ varname = /:([_a-zA-Z][_a-zA-Z0-9]*->[_a-zA-Z][_a-zA-Z0-9]*|[_a-zA-Z][_a-zA-Z0-9]*)/ -dot = "." +dot = "." */ /*!lex2php @@ -198,6 +200,12 @@ join { on { $this->token = OQLParser::ON; } +arrow { + $this->token = OQLParser::ARROW; +} +colon { + $this->token = OQLParser::COLON; +} math_div { $this->token = OQLParser::MATH_DIV; } @@ -396,6 +404,7 @@ varname { dot { $this->token = OQLParser::DOT; } + */ } diff --git a/core/oql/oql-parser.php b/core/oql/oql-parser.php index e884c96cc..7bddeca4a 100644 --- a/core/oql/oql-parser.php +++ b/core/oql/oql-parser.php @@ -138,55 +138,56 @@ class OQLParserRaw#line 102 "..\oql-parser.php" 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 BITWISE_LEFT_SHIFT = 47; - const BITWISE_RIGHT_SHIFT = 48; - const BITWISE_AND = 49; - const BITWISE_OR = 50; - const BITWISE_XOR = 51; - const IN = 52; - const NOT_IN = 53; - const F_IF = 54; - const F_ELT = 55; - const F_COALESCE = 56; - const F_ISNULL = 57; - const F_CONCAT = 58; - const F_SUBSTR = 59; - const F_TRIM = 60; - const F_DATE = 61; - const F_DATE_FORMAT = 62; - const F_CURRENT_DATE = 63; - const F_NOW = 64; - const F_TIME = 65; - const F_TO_DAYS = 66; - const F_FROM_DAYS = 67; - const F_DATE_ADD = 68; - const F_DATE_SUB = 69; - const F_ROUND = 70; - const F_FLOOR = 71; - const F_INET_ATON = 72; - const F_INET_NTOA = 73; - const YY_NO_ACTION = 290; - const YY_ACCEPT_ACTION = 289; - const YY_ERROR_ACTION = 288; + const ARROW = 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 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 = 295; + const YY_ACCEPT_ACTION = 294; + const YY_ERROR_ACTION = 293; /* 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 @@ -238,222 +239,235 @@ 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 = 549; + const YY_SZ_ACTTAB = 610; static public $yy_action = array( - /* 0 */ 7, 30, 6, 66, 60, 4, 153, 152, 155, 98, - /* 10 */ 107, 106, 105, 65, 101, 102, 25, 22, 23, 21, - /* 20 */ 19, 27, 26, 28, 24, 162, 151, 43, 177, 177, - /* 30 */ 80, 41, 62, 85, 150, 140, 103, 108, 109, 114, - /* 40 */ 115, 113, 112, 110, 111, 133, 134, 157, 158, 156, - /* 50 */ 154, 159, 160, 165, 166, 164, 20, 121, 125, 3, - /* 60 */ 68, 70, 69, 75, 99, 93, 142, 66, 76, 64, - /* 70 */ 119, 120, 7, 79, 50, 122, 121, 42, 153, 152, - /* 80 */ 155, 139, 107, 106, 105, 65, 101, 102, 149, 119, - /* 90 */ 120, 137, 143, 121, 132, 130, 62, 148, 147, 100, - /* 100 */ 146, 144, 145, 167, 61, 116, 119, 120, 103, 108, - /* 110 */ 109, 114, 115, 113, 112, 110, 111, 133, 134, 157, - /* 120 */ 158, 156, 154, 159, 160, 165, 166, 164, 7, 106, - /* 130 */ 11, 66, 9, 80, 153, 152, 155, 81, 107, 106, - /* 140 */ 105, 65, 101, 102, 163, 161, 72, 8, 10, 88, - /* 150 */ 78, 1, 46, 38, 44, 104, 54, 51, 41, 42, - /* 160 */ 62, 118, 135, 136, 103, 108, 109, 114, 115, 113, - /* 170 */ 112, 110, 111, 133, 134, 157, 158, 156, 154, 159, - /* 180 */ 160, 165, 166, 164, 289, 138, 67, 86, 66, 39, - /* 190 */ 87, 58, 37, 45, 126, 34, 48, 131, 124, 63, - /* 200 */ 13, 40, 66, 17, 230, 15, 12, 36, 97, 2, - /* 210 */ 47, 55, 41, 129, 127, 128, 117, 62, 66, 80, - /* 220 */ 80, 80, 80, 123, 126, 31, 48, 131, 124, 63, - /* 230 */ 59, 62, 237, 17, 91, 15, 20, 36, 73, 80, - /* 240 */ 237, 92, 237, 129, 127, 128, 117, 62, 66, 237, - /* 250 */ 94, 74, 237, 42, 126, 31, 48, 131, 124, 63, - /* 260 */ 237, 237, 66, 17, 66, 15, 66, 36, 83, 95, - /* 270 */ 56, 77, 82, 129, 127, 128, 117, 62, 141, 66, - /* 280 */ 237, 237, 237, 237, 237, 126, 34, 48, 131, 124, - /* 290 */ 63, 62, 237, 62, 17, 62, 15, 52, 36, 5, - /* 300 */ 42, 237, 237, 237, 129, 127, 128, 117, 62, 66, - /* 310 */ 237, 8, 237, 71, 237, 126, 32, 48, 131, 124, - /* 320 */ 63, 237, 237, 66, 17, 118, 15, 53, 36, 89, - /* 330 */ 42, 57, 237, 237, 129, 127, 128, 117, 62, 66, - /* 340 */ 237, 237, 237, 237, 237, 126, 16, 48, 131, 124, - /* 350 */ 63, 237, 62, 66, 17, 237, 15, 237, 36, 90, - /* 360 */ 237, 237, 237, 237, 129, 127, 128, 117, 62, 66, - /* 370 */ 237, 237, 237, 237, 237, 126, 29, 48, 131, 124, - /* 380 */ 63, 237, 62, 237, 17, 237, 15, 237, 36, 237, - /* 390 */ 237, 237, 237, 237, 129, 127, 128, 117, 62, 66, - /* 400 */ 237, 237, 237, 237, 237, 126, 33, 48, 131, 124, - /* 410 */ 63, 237, 237, 237, 17, 237, 15, 237, 36, 237, - /* 420 */ 237, 237, 237, 237, 129, 127, 128, 117, 62, 66, - /* 430 */ 237, 237, 237, 237, 237, 126, 237, 48, 131, 124, - /* 440 */ 63, 237, 237, 237, 17, 237, 15, 237, 35, 237, - /* 450 */ 237, 237, 237, 237, 129, 127, 128, 117, 62, 66, - /* 460 */ 237, 237, 237, 237, 237, 126, 237, 48, 131, 124, - /* 470 */ 63, 237, 237, 237, 17, 237, 14, 66, 237, 237, - /* 480 */ 237, 237, 84, 56, 129, 127, 128, 117, 62, 66, - /* 490 */ 237, 237, 237, 237, 237, 126, 237, 48, 131, 124, - /* 500 */ 63, 237, 237, 237, 18, 66, 62, 237, 237, 237, - /* 510 */ 237, 96, 237, 237, 129, 127, 128, 117, 62, 66, - /* 520 */ 237, 237, 237, 237, 237, 126, 237, 49, 131, 124, - /* 530 */ 63, 237, 237, 237, 62, 237, 237, 237, 237, 237, - /* 540 */ 237, 237, 237, 237, 129, 127, 128, 117, 62, + /* 0 */ 28, 125, 47, 180, 180, 54, 42, 120, 62, 73, + /* 10 */ 11, 38, 37, 66, 128, 68, 7, 48, 123, 119, + /* 20 */ 69, 88, 164, 162, 155, 153, 145, 111, 125, 110, + /* 30 */ 76, 108, 107, 129, 102, 116, 115, 114, 112, 67, + /* 40 */ 152, 138, 87, 87, 127, 117, 131, 132, 29, 139, + /* 50 */ 140, 59, 3, 106, 105, 104, 103, 134, 118, 135, + /* 60 */ 154, 156, 157, 158, 159, 160, 161, 165, 166, 167, + /* 70 */ 168, 169, 163, 7, 58, 6, 109, 73, 87, 164, + /* 80 */ 162, 155, 86, 57, 111, 125, 110, 76, 108, 107, + /* 90 */ 14, 15, 21, 22, 17, 18, 20, 19, 16, 52, + /* 100 */ 56, 44, 45, 45, 87, 55, 112, 67, 45, 54, + /* 110 */ 106, 105, 104, 103, 134, 118, 135, 154, 156, 157, + /* 120 */ 158, 159, 160, 161, 165, 166, 167, 168, 169, 163, + /* 130 */ 7, 87, 41, 5, 73, 129, 164, 162, 155, 91, + /* 140 */ 57, 111, 125, 110, 76, 108, 107, 85, 131, 132, + /* 150 */ 8, 40, 2, 92, 39, 46, 12, 80, 124, 13, + /* 160 */ 45, 99, 87, 112, 67, 130, 126, 106, 105, 104, + /* 170 */ 103, 134, 118, 135, 154, 156, 157, 158, 159, 160, + /* 180 */ 161, 165, 166, 167, 168, 169, 163, 294, 100, 63, + /* 190 */ 170, 73, 9, 79, 235, 50, 10, 68, 34, 49, + /* 200 */ 123, 119, 69, 1, 121, 43, 27, 82, 23, 42, + /* 210 */ 35, 141, 142, 81, 28, 42, 102, 116, 115, 114, + /* 220 */ 112, 67, 73, 87, 53, 8, 83, 45, 68, 31, + /* 230 */ 49, 123, 119, 69, 60, 84, 4, 27, 133, 23, + /* 240 */ 130, 35, 113, 241, 241, 90, 241, 102, 116, 115, + /* 250 */ 114, 112, 67, 73, 51, 241, 241, 241, 241, 68, + /* 260 */ 33, 49, 123, 119, 69, 241, 241, 241, 27, 241, + /* 270 */ 23, 73, 35, 241, 241, 61, 241, 71, 102, 116, + /* 280 */ 115, 114, 112, 67, 241, 241, 122, 73, 241, 241, + /* 290 */ 241, 241, 241, 68, 34, 49, 123, 119, 69, 241, + /* 300 */ 112, 67, 27, 241, 23, 241, 35, 241, 241, 241, + /* 310 */ 241, 241, 102, 116, 115, 114, 112, 67, 73, 241, + /* 320 */ 241, 241, 241, 241, 68, 31, 49, 123, 119, 69, + /* 330 */ 241, 241, 73, 27, 241, 23, 241, 35, 77, 241, + /* 340 */ 241, 89, 241, 102, 116, 115, 114, 112, 67, 73, + /* 350 */ 241, 241, 241, 241, 241, 68, 32, 49, 123, 119, + /* 360 */ 69, 112, 67, 241, 27, 241, 23, 73, 35, 241, + /* 370 */ 241, 241, 241, 65, 102, 116, 115, 114, 112, 67, + /* 380 */ 241, 241, 241, 73, 241, 241, 241, 241, 241, 68, + /* 390 */ 25, 49, 123, 119, 69, 241, 112, 67, 27, 241, + /* 400 */ 23, 241, 35, 241, 241, 241, 241, 241, 102, 116, + /* 410 */ 115, 114, 112, 67, 73, 241, 241, 241, 241, 241, + /* 420 */ 68, 30, 49, 123, 119, 69, 241, 241, 73, 27, + /* 430 */ 241, 23, 241, 35, 72, 241, 241, 241, 241, 102, + /* 440 */ 116, 115, 114, 112, 67, 73, 241, 241, 241, 241, + /* 450 */ 241, 68, 241, 49, 123, 119, 69, 112, 67, 241, + /* 460 */ 27, 241, 23, 241, 36, 241, 241, 241, 241, 241, + /* 470 */ 102, 116, 115, 114, 112, 67, 241, 241, 241, 73, + /* 480 */ 241, 241, 241, 241, 241, 68, 241, 49, 123, 119, + /* 490 */ 69, 241, 241, 241, 27, 241, 24, 93, 94, 95, + /* 500 */ 96, 97, 98, 241, 102, 116, 115, 114, 112, 67, + /* 510 */ 73, 241, 241, 241, 129, 241, 68, 241, 49, 123, + /* 520 */ 119, 69, 241, 241, 241, 26, 137, 131, 132, 241, + /* 530 */ 241, 241, 241, 241, 241, 102, 116, 115, 114, 112, + /* 540 */ 67, 73, 241, 241, 241, 73, 241, 64, 241, 147, + /* 550 */ 241, 78, 143, 144, 241, 241, 241, 241, 146, 148, + /* 560 */ 149, 150, 151, 136, 101, 241, 73, 241, 241, 241, + /* 570 */ 112, 67, 74, 241, 112, 67, 241, 73, 241, 73, + /* 580 */ 241, 241, 241, 75, 241, 70, 241, 241, 241, 241, + /* 590 */ 241, 241, 241, 241, 241, 112, 67, 241, 241, 241, + /* 600 */ 241, 241, 241, 241, 241, 241, 112, 67, 112, 67, ); static public $yy_lookahead = array( - /* 0 */ 18, 79, 20, 79, 82, 6, 24, 25, 26, 85, - /* 10 */ 28, 29, 30, 31, 32, 33, 9, 10, 11, 12, - /* 20 */ 13, 14, 15, 16, 17, 38, 39, 3, 4, 5, - /* 30 */ 108, 7, 108, 81, 47, 48, 54, 55, 56, 57, - /* 40 */ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, - /* 50 */ 68, 69, 70, 71, 72, 73, 2, 37, 93, 18, - /* 60 */ 21, 22, 23, 24, 25, 26, 9, 79, 76, 77, - /* 70 */ 50, 51, 18, 85, 80, 19, 37, 83, 24, 25, - /* 80 */ 26, 81, 28, 29, 30, 31, 32, 33, 31, 50, - /* 90 */ 51, 34, 35, 37, 52, 53, 108, 40, 41, 42, - /* 100 */ 43, 44, 45, 46, 79, 108, 50, 51, 54, 55, - /* 110 */ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - /* 120 */ 66, 67, 68, 69, 70, 71, 72, 73, 18, 29, - /* 130 */ 95, 79, 99, 108, 24, 25, 26, 85, 28, 29, - /* 140 */ 30, 31, 32, 33, 109, 110, 113, 100, 97, 81, - /* 150 */ 103, 18, 4, 5, 3, 30, 80, 27, 7, 83, - /* 160 */ 108, 114, 111, 112, 54, 55, 56, 57, 58, 59, - /* 170 */ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, - /* 180 */ 70, 71, 72, 73, 75, 76, 77, 78, 79, 1, - /* 190 */ 79, 79, 79, 79, 85, 86, 87, 88, 89, 90, - /* 200 */ 8, 3, 79, 94, 27, 96, 8, 98, 85, 5, - /* 210 */ 79, 92, 7, 104, 105, 106, 107, 108, 79, 108, - /* 220 */ 108, 108, 108, 19, 85, 86, 87, 88, 89, 90, - /* 230 */ 91, 108, 115, 94, 81, 96, 2, 98, 36, 108, - /* 240 */ 115, 102, 115, 104, 105, 106, 107, 108, 79, 115, - /* 250 */ 80, 49, 115, 83, 85, 86, 87, 88, 89, 90, - /* 260 */ 115, 115, 79, 94, 79, 96, 79, 98, 85, 84, - /* 270 */ 85, 102, 85, 104, 105, 106, 107, 108, 78, 79, - /* 280 */ 115, 115, 115, 115, 115, 85, 86, 87, 88, 89, - /* 290 */ 90, 108, 115, 108, 94, 108, 96, 80, 98, 5, - /* 300 */ 83, 115, 115, 115, 104, 105, 106, 107, 108, 79, - /* 310 */ 115, 100, 115, 19, 115, 85, 86, 87, 88, 89, - /* 320 */ 90, 115, 115, 79, 94, 114, 96, 80, 98, 85, - /* 330 */ 83, 101, 115, 115, 104, 105, 106, 107, 108, 79, - /* 340 */ 115, 115, 115, 115, 115, 85, 86, 87, 88, 89, - /* 350 */ 90, 115, 108, 79, 94, 115, 96, 115, 98, 85, - /* 360 */ 115, 115, 115, 115, 104, 105, 106, 107, 108, 79, - /* 370 */ 115, 115, 115, 115, 115, 85, 86, 87, 88, 89, - /* 380 */ 90, 115, 108, 115, 94, 115, 96, 115, 98, 115, - /* 390 */ 115, 115, 115, 115, 104, 105, 106, 107, 108, 79, - /* 400 */ 115, 115, 115, 115, 115, 85, 86, 87, 88, 89, - /* 410 */ 90, 115, 115, 115, 94, 115, 96, 115, 98, 115, - /* 420 */ 115, 115, 115, 115, 104, 105, 106, 107, 108, 79, - /* 430 */ 115, 115, 115, 115, 115, 85, 115, 87, 88, 89, - /* 440 */ 90, 115, 115, 115, 94, 115, 96, 115, 98, 115, - /* 450 */ 115, 115, 115, 115, 104, 105, 106, 107, 108, 79, - /* 460 */ 115, 115, 115, 115, 115, 85, 115, 87, 88, 89, - /* 470 */ 90, 115, 115, 115, 94, 115, 96, 79, 115, 115, - /* 480 */ 115, 115, 84, 85, 104, 105, 106, 107, 108, 79, - /* 490 */ 115, 115, 115, 115, 115, 85, 115, 87, 88, 89, - /* 500 */ 90, 115, 115, 115, 94, 79, 108, 115, 115, 115, - /* 510 */ 115, 85, 115, 115, 104, 105, 106, 107, 108, 79, - /* 520 */ 115, 115, 115, 115, 115, 85, 115, 87, 88, 89, - /* 530 */ 90, 115, 115, 115, 108, 115, 115, 115, 115, 115, - /* 540 */ 115, 115, 115, 115, 104, 105, 106, 107, 108, + /* 0 */ 2, 30, 3, 4, 5, 28, 7, 77, 78, 80, + /* 10 */ 96, 1, 80, 80, 19, 86, 18, 88, 89, 90, + /* 20 */ 91, 82, 24, 25, 26, 111, 112, 29, 30, 31, + /* 30 */ 32, 33, 34, 38, 105, 106, 107, 108, 109, 110, + /* 40 */ 39, 40, 110, 110, 53, 54, 51, 52, 80, 48, + /* 50 */ 49, 83, 6, 55, 56, 57, 58, 59, 60, 61, + /* 60 */ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, + /* 70 */ 72, 73, 74, 18, 80, 20, 31, 80, 110, 24, + /* 80 */ 25, 26, 85, 86, 29, 30, 31, 32, 33, 34, + /* 90 */ 9, 10, 11, 12, 13, 14, 15, 16, 17, 81, + /* 100 */ 81, 80, 84, 84, 110, 81, 109, 110, 84, 28, + /* 110 */ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, + /* 120 */ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, + /* 130 */ 18, 110, 80, 5, 80, 38, 24, 25, 26, 85, + /* 140 */ 86, 29, 30, 31, 32, 33, 34, 19, 51, 52, + /* 150 */ 101, 3, 5, 104, 4, 5, 8, 81, 110, 8, + /* 160 */ 84, 82, 110, 109, 110, 116, 19, 55, 56, 57, + /* 170 */ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, + /* 180 */ 68, 69, 70, 71, 72, 73, 74, 76, 77, 78, + /* 190 */ 79, 80, 100, 80, 27, 27, 98, 86, 87, 88, + /* 200 */ 89, 90, 91, 18, 82, 3, 95, 115, 97, 7, + /* 210 */ 99, 113, 114, 37, 2, 7, 105, 106, 107, 108, + /* 220 */ 109, 110, 80, 110, 81, 101, 50, 84, 86, 87, + /* 230 */ 88, 89, 90, 91, 92, 82, 18, 95, 94, 97, + /* 240 */ 116, 99, 110, 117, 117, 103, 117, 105, 106, 107, + /* 250 */ 108, 109, 110, 80, 93, 117, 117, 117, 117, 86, + /* 260 */ 87, 88, 89, 90, 91, 117, 117, 117, 95, 117, + /* 270 */ 97, 80, 99, 117, 117, 102, 117, 86, 105, 106, + /* 280 */ 107, 108, 109, 110, 117, 117, 79, 80, 117, 117, + /* 290 */ 117, 117, 117, 86, 87, 88, 89, 90, 91, 117, + /* 300 */ 109, 110, 95, 117, 97, 117, 99, 117, 117, 117, + /* 310 */ 117, 117, 105, 106, 107, 108, 109, 110, 80, 117, + /* 320 */ 117, 117, 117, 117, 86, 87, 88, 89, 90, 91, + /* 330 */ 117, 117, 80, 95, 117, 97, 117, 99, 86, 117, + /* 340 */ 117, 103, 117, 105, 106, 107, 108, 109, 110, 80, + /* 350 */ 117, 117, 117, 117, 117, 86, 87, 88, 89, 90, + /* 360 */ 91, 109, 110, 117, 95, 117, 97, 80, 99, 117, + /* 370 */ 117, 117, 117, 86, 105, 106, 107, 108, 109, 110, + /* 380 */ 117, 117, 117, 80, 117, 117, 117, 117, 117, 86, + /* 390 */ 87, 88, 89, 90, 91, 117, 109, 110, 95, 117, + /* 400 */ 97, 117, 99, 117, 117, 117, 117, 117, 105, 106, + /* 410 */ 107, 108, 109, 110, 80, 117, 117, 117, 117, 117, + /* 420 */ 86, 87, 88, 89, 90, 91, 117, 117, 80, 95, + /* 430 */ 117, 97, 117, 99, 86, 117, 117, 117, 117, 105, + /* 440 */ 106, 107, 108, 109, 110, 80, 117, 117, 117, 117, + /* 450 */ 117, 86, 117, 88, 89, 90, 91, 109, 110, 117, + /* 460 */ 95, 117, 97, 117, 99, 117, 117, 117, 117, 117, + /* 470 */ 105, 106, 107, 108, 109, 110, 117, 117, 117, 80, + /* 480 */ 117, 117, 117, 117, 117, 86, 117, 88, 89, 90, + /* 490 */ 91, 117, 117, 117, 95, 117, 97, 21, 22, 23, + /* 500 */ 24, 25, 26, 117, 105, 106, 107, 108, 109, 110, + /* 510 */ 80, 117, 117, 117, 38, 117, 86, 117, 88, 89, + /* 520 */ 90, 91, 117, 117, 117, 95, 9, 51, 52, 117, + /* 530 */ 117, 117, 117, 117, 117, 105, 106, 107, 108, 109, + /* 540 */ 110, 80, 117, 117, 117, 80, 117, 86, 117, 32, + /* 550 */ 117, 86, 35, 36, 117, 117, 117, 117, 41, 42, + /* 560 */ 43, 44, 45, 46, 47, 117, 80, 117, 117, 117, + /* 570 */ 109, 110, 86, 117, 109, 110, 117, 80, 117, 80, + /* 580 */ 117, 117, 117, 86, 117, 86, 117, 117, 117, 117, + /* 590 */ 117, 117, 117, 117, 117, 109, 110, 117, 117, 117, + /* 600 */ 117, 117, 117, 117, 117, 117, 109, 110, 109, 110, ); - const YY_SHIFT_USE_DFLT = -19; - const YY_SHIFT_MAX = 67; + const YY_SHIFT_USE_DFLT = -30; + const YY_SHIFT_MAX = 78; static public $yy_shift_ofst = array( - /* 0 */ 54, -18, -18, 110, 110, 110, 110, 110, 110, 110, - /* 10 */ 110, 110, 100, 100, 57, 57, 39, -13, -13, 100, - /* 20 */ 100, 100, 100, 100, 100, 100, 100, 100, 100, 56, - /* 30 */ 24, 20, 20, 20, 20, 202, 202, 151, 100, 234, - /* 40 */ 100, 100, 205, 100, 100, 205, 100, 205, 42, 42, - /* 50 */ -1, 100, -1, -1, -1, 41, 7, 294, 198, 204, - /* 60 */ 148, 192, 177, 133, 188, 125, 130, 188, + /* 0 */ -2, 55, 55, 112, 112, 112, 112, 112, 112, 112, + /* 10 */ 112, 112, -29, -29, -29, -29, -29, -29, -29, -29, + /* 20 */ -29, -29, -29, 517, 517, 476, 1, 1, -29, -1, + /* 30 */ -5, 97, 97, 97, 97, 176, 176, 202, 212, -29, + /* 40 */ -29, 208, -29, -29, 208, 208, -29, -29, -9, -9, + /* 50 */ -29, 218, 46, 46, -29, 46, 46, 81, 148, 150, + /* 60 */ 147, 128, 10, 10, -23, -23, 151, 167, -23, 185, + /* 70 */ -23, -23, -23, 168, -23, -23, 45, -23, -23, ); - const YY_REDUCE_USE_DFLT = -79; - const YY_REDUCE_MAX = 55; + const YY_REDUCE_USE_DFLT = -87; + const YY_REDUCE_MAX = 56; static public $yy_reduce_ofst = array( - /* 0 */ 109, 139, 169, 230, 200, 320, 260, 290, 350, 380, - /* 10 */ 410, 440, 398, 185, 51, 51, 47, 35, 35, 274, - /* 20 */ -78, 426, -12, 123, 52, -76, 183, 244, 187, 211, - /* 30 */ 247, 211, 211, 211, 211, 33, 33, 76, 111, -8, - /* 40 */ 25, 112, 170, 131, 114, 217, 113, -6, 119, 119, - /* 50 */ 153, -3, 68, 0, -48, -35, + /* 0 */ 111, 142, 238, 207, 173, 269, 303, 334, 365, 399, + /* 10 */ 430, -71, -3, 54, 497, 465, 499, 461, 486, 191, + /* 20 */ 348, 287, 252, 98, 98, 49, -86, -86, -32, 143, + /* 30 */ 124, 124, 124, 124, 124, 92, 92, 18, -70, -68, + /* 40 */ -67, 19, -6, 21, 24, 76, 113, 52, 161, 161, + /* 50 */ 132, 144, 153, 122, 48, 79, -61, ); static public $yyExpectedTokens = array( - /* 0 */ array(2, 18, 24, 25, 26, 28, 29, 30, 31, 32, 33, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, ), - /* 1 */ array(18, 20, 24, 25, 26, 28, 29, 30, 31, 32, 33, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, ), - /* 2 */ array(18, 20, 24, 25, 26, 28, 29, 30, 31, 32, 33, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, ), - /* 3 */ array(18, 24, 25, 26, 28, 29, 30, 31, 32, 33, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, ), - /* 4 */ array(18, 24, 25, 26, 28, 29, 30, 31, 32, 33, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, ), - /* 5 */ array(18, 24, 25, 26, 28, 29, 30, 31, 32, 33, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, ), - /* 6 */ array(18, 24, 25, 26, 28, 29, 30, 31, 32, 33, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, ), - /* 7 */ array(18, 24, 25, 26, 28, 29, 30, 31, 32, 33, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, ), - /* 8 */ array(18, 24, 25, 26, 28, 29, 30, 31, 32, 33, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, ), - /* 9 */ array(18, 24, 25, 26, 28, 29, 30, 31, 32, 33, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, ), - /* 10 */ array(18, 24, 25, 26, 28, 29, 30, 31, 32, 33, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, ), - /* 11 */ array(18, 24, 25, 26, 28, 29, 30, 31, 32, 33, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, ), - /* 12 */ array(29, ), - /* 13 */ array(29, ), - /* 14 */ array(9, 31, 34, 35, 40, 41, 42, 43, 44, 45, 46, ), - /* 15 */ array(9, 31, 34, 35, 40, 41, 42, 43, 44, 45, 46, ), - /* 16 */ array(21, 22, 23, 24, 25, 26, 37, 50, 51, ), - /* 17 */ array(38, 39, 47, 48, ), - /* 18 */ array(38, 39, 47, 48, ), - /* 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(19, 37, 50, 51, ), - /* 30 */ array(3, 4, 5, 7, ), - /* 31 */ array(37, 50, 51, ), - /* 32 */ array(37, 50, 51, ), - /* 33 */ array(37, 50, 51, ), - /* 34 */ array(37, 50, 51, ), - /* 35 */ array(36, 49, ), - /* 36 */ array(36, 49, ), + /* 0 */ array(2, 18, 24, 25, 26, 29, 30, 31, 32, 33, 34, 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, 29, 30, 31, 32, 33, 34, 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, 29, 30, 31, 32, 33, 34, 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, 29, 30, 31, 32, 33, 34, 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, 29, 30, 31, 32, 33, 34, 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, 29, 30, 31, 32, 33, 34, 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, 29, 30, 31, 32, 33, 34, 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, 29, 30, 31, 32, 33, 34, 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, 29, 30, 31, 32, 33, 34, 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, 29, 30, 31, 32, 33, 34, 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, 29, 30, 31, 32, 33, 34, 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, 29, 30, 31, 32, 33, 34, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 12 */ array(30, ), + /* 13 */ array(30, ), + /* 14 */ array(30, ), + /* 15 */ array(30, ), + /* 16 */ array(30, ), + /* 17 */ array(30, ), + /* 18 */ array(30, ), + /* 19 */ array(30, ), + /* 20 */ array(30, ), + /* 21 */ array(30, ), + /* 22 */ array(30, ), + /* 23 */ array(9, 32, 35, 36, 41, 42, 43, 44, 45, 46, 47, ), + /* 24 */ array(9, 32, 35, 36, 41, 42, 43, 44, 45, 46, 47, ), + /* 25 */ array(21, 22, 23, 24, 25, 26, 38, 51, 52, ), + /* 26 */ array(39, 40, 48, 49, ), + /* 27 */ array(39, 40, 48, 49, ), + /* 28 */ array(30, ), + /* 29 */ array(3, 4, 5, 7, ), + /* 30 */ array(19, 38, 51, 52, ), + /* 31 */ array(38, 51, 52, ), + /* 32 */ array(38, 51, 52, ), + /* 33 */ array(38, 51, 52, ), + /* 34 */ array(38, 51, 52, ), + /* 35 */ array(37, 50, ), + /* 36 */ array(37, 50, ), /* 37 */ array(3, 7, ), - /* 38 */ array(29, ), - /* 39 */ array(2, ), - /* 40 */ array(29, ), - /* 41 */ array(29, ), - /* 42 */ array(7, ), - /* 43 */ array(29, ), - /* 44 */ array(29, ), + /* 38 */ array(2, ), + /* 39 */ array(30, ), + /* 40 */ array(30, ), + /* 41 */ array(7, ), + /* 42 */ array(30, ), + /* 43 */ array(30, ), + /* 44 */ array(7, ), /* 45 */ array(7, ), - /* 46 */ array(29, ), - /* 47 */ array(7, ), - /* 48 */ array(52, 53, ), - /* 49 */ array(52, 53, ), - /* 50 */ array(6, ), - /* 51 */ array(29, ), + /* 46 */ array(30, ), + /* 47 */ array(30, ), + /* 48 */ array(53, 54, ), + /* 49 */ array(53, 54, ), + /* 50 */ array(30, ), + /* 51 */ array(18, ), /* 52 */ array(6, ), /* 53 */ array(6, ), - /* 54 */ array(6, ), - /* 55 */ array(18, ), - /* 56 */ array(9, 10, 11, 12, 13, 14, 15, 16, 17, ), - /* 57 */ array(5, 19, ), + /* 54 */ array(30, ), + /* 55 */ array(6, ), + /* 56 */ array(6, ), + /* 57 */ array(9, 10, 11, 12, 13, 14, 15, 16, 17, 28, ), /* 58 */ array(3, 8, ), - /* 59 */ array(5, 19, ), - /* 60 */ array(4, 5, ), - /* 61 */ array(8, ), - /* 62 */ array(27, ), - /* 63 */ array(18, ), - /* 64 */ array(1, ), - /* 65 */ array(30, ), - /* 66 */ array(27, ), - /* 67 */ array(1, ), - /* 68 */ array(), - /* 69 */ array(), - /* 70 */ array(), - /* 71 */ array(), - /* 72 */ array(), - /* 73 */ array(), - /* 74 */ array(), - /* 75 */ array(), - /* 76 */ array(), - /* 77 */ array(), - /* 78 */ array(), + /* 59 */ array(4, 5, ), + /* 60 */ array(5, 19, ), + /* 61 */ array(5, 19, ), + /* 62 */ array(1, ), + /* 63 */ array(1, ), + /* 64 */ array(28, ), + /* 65 */ array(28, ), + /* 66 */ array(8, ), + /* 67 */ array(27, ), + /* 68 */ array(28, ), + /* 69 */ array(18, ), + /* 70 */ array(28, ), + /* 71 */ array(28, ), + /* 72 */ array(28, ), + /* 73 */ array(27, ), + /* 74 */ array(28, ), + /* 75 */ array(28, ), + /* 76 */ array(31, ), + /* 77 */ array(28, ), + /* 78 */ array(28, ), /* 79 */ array(), /* 80 */ array(), /* 81 */ array(), @@ -543,25 +557,29 @@ static public $yy_action = array( /* 165 */ array(), /* 166 */ array(), /* 167 */ array(), + /* 168 */ array(), + /* 169 */ array(), + /* 170 */ array(), ); static public $yy_default = array( - /* 0 */ 288, 213, 288, 288, 288, 288, 288, 288, 288, 288, - /* 10 */ 288, 288, 288, 288, 207, 206, 288, 204, 205, 288, - /* 20 */ 288, 288, 288, 288, 288, 288, 288, 288, 288, 288, - /* 30 */ 183, 216, 211, 212, 195, 209, 208, 183, 288, 288, - /* 40 */ 288, 288, 182, 288, 288, 183, 288, 183, 202, 203, - /* 50 */ 180, 288, 180, 180, 180, 288, 288, 288, 288, 288, - /* 60 */ 288, 288, 228, 288, 171, 288, 288, 169, 218, 220, - /* 70 */ 219, 210, 245, 244, 260, 221, 172, 215, 217, 187, - /* 80 */ 230, 194, 193, 192, 185, 175, 170, 178, 176, 191, - /* 90 */ 190, 174, 214, 223, 181, 184, 189, 188, 186, 222, - /* 100 */ 253, 235, 236, 265, 234, 233, 232, 231, 266, 267, - /* 110 */ 272, 273, 271, 270, 268, 269, 229, 227, 247, 261, - /* 120 */ 262, 246, 200, 199, 198, 201, 197, 225, 226, 224, - /* 130 */ 264, 196, 263, 274, 275, 239, 240, 241, 168, 173, - /* 140 */ 259, 179, 242, 243, 255, 256, 254, 252, 250, 251, - /* 150 */ 258, 249, 280, 281, 282, 279, 278, 276, 277, 283, - /* 160 */ 284, 238, 248, 237, 287, 285, 286, 257, + /* 0 */ 293, 216, 293, 293, 293, 293, 293, 293, 293, 293, + /* 10 */ 293, 293, 293, 293, 293, 293, 293, 293, 293, 293, + /* 20 */ 293, 293, 293, 209, 210, 293, 208, 207, 293, 186, + /* 30 */ 293, 219, 215, 214, 198, 211, 212, 186, 293, 293, + /* 40 */ 293, 186, 293, 293, 186, 185, 293, 293, 206, 205, + /* 50 */ 293, 293, 183, 183, 293, 183, 183, 293, 293, 293, + /* 60 */ 293, 293, 174, 172, 193, 191, 293, 231, 200, 293, + /* 70 */ 197, 196, 195, 293, 194, 189, 293, 192, 190, 181, + /* 80 */ 184, 249, 250, 265, 178, 213, 188, 235, 177, 218, + /* 90 */ 217, 187, 220, 221, 222, 223, 224, 225, 226, 179, + /* 100 */ 171, 262, 227, 273, 272, 271, 270, 241, 240, 239, + /* 110 */ 238, 236, 233, 232, 230, 229, 228, 269, 275, 201, + /* 120 */ 175, 176, 182, 199, 234, 237, 202, 268, 203, 251, + /* 130 */ 252, 266, 267, 204, 274, 276, 261, 247, 254, 263, + /* 140 */ 264, 244, 245, 246, 248, 243, 255, 256, 257, 258, + /* 150 */ 259, 260, 253, 242, 277, 284, 278, 279, 280, 281, + /* 160 */ 282, 283, 285, 292, 286, 287, 288, 289, 290, 291, + /* 170 */ 173, ); /* The next thing included is series of defines which control ** various aspects of the generated parser. @@ -578,11 +596,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 = 116; + const YYNOCODE = 118; const YYSTACKDEPTH = 100; - const YYNSTATE = 168; - const YYNRULE = 120; - const YYERRORSYMBOL = 74; + const YYNSTATE = 171; + const YYNRULE = 122; + const YYERRORSYMBOL = 75; const YYERRSYMDT = 'yy0'; const YYFALLBACK = 0; /** The next table maps tokens into fallback tokens. If a construct @@ -671,28 +689,29 @@ static public $yy_action = array( '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', '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', + 'ARROW', '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', + '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', 'basic_field_id', 'name', 'num_operator1', + 'bitwise_operator1', 'num_operator2', 'str_operator', 'bitwise_operator3', + 'bitwise_operator4', ); /** @@ -760,66 +779,68 @@ static public $yy_action = array( /* 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 */ "bitwise_operator1 ::= BITWISE_LEFT_SHIFT", - /* 91 */ "bitwise_operator1 ::= BITWISE_RIGHT_SHIFT", - /* 92 */ "bitwise_operator3 ::= BITWISE_AND", - /* 93 */ "bitwise_operator4 ::= BITWISE_OR", - /* 94 */ "bitwise_operator4 ::= BITWISE_XOR", - /* 95 */ "list_operator ::= IN", - /* 96 */ "list_operator ::= NOT_IN", - /* 97 */ "func_name ::= F_IF", - /* 98 */ "func_name ::= F_ELT", - /* 99 */ "func_name ::= F_COALESCE", - /* 100 */ "func_name ::= F_ISNULL", - /* 101 */ "func_name ::= F_CONCAT", - /* 102 */ "func_name ::= F_SUBSTR", - /* 103 */ "func_name ::= F_TRIM", - /* 104 */ "func_name ::= F_DATE", - /* 105 */ "func_name ::= F_DATE_FORMAT", - /* 106 */ "func_name ::= F_CURRENT_DATE", - /* 107 */ "func_name ::= F_NOW", - /* 108 */ "func_name ::= F_TIME", - /* 109 */ "func_name ::= F_TO_DAYS", - /* 110 */ "func_name ::= F_FROM_DAYS", - /* 111 */ "func_name ::= F_YEAR", - /* 112 */ "func_name ::= F_MONTH", - /* 113 */ "func_name ::= F_DAY", - /* 114 */ "func_name ::= F_DATE_ADD", - /* 115 */ "func_name ::= F_DATE_SUB", - /* 116 */ "func_name ::= F_ROUND", - /* 117 */ "func_name ::= F_FLOOR", - /* 118 */ "func_name ::= F_INET_ATON", - /* 119 */ "func_name ::= F_INET_NTOA", + /* 60 */ "basic_field_id ::= name", + /* 61 */ "basic_field_id ::= class_name DOT name", + /* 62 */ "field_id ::= basic_field_id", + /* 63 */ "field_id ::= field_id ARROW 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 */ "bitwise_operator1 ::= BITWISE_LEFT_SHIFT", + /* 93 */ "bitwise_operator1 ::= BITWISE_RIGHT_SHIFT", + /* 94 */ "bitwise_operator3 ::= BITWISE_AND", + /* 95 */ "bitwise_operator4 ::= BITWISE_OR", + /* 96 */ "bitwise_operator4 ::= BITWISE_XOR", + /* 97 */ "list_operator ::= IN", + /* 98 */ "list_operator ::= NOT_IN", + /* 99 */ "func_name ::= F_IF", + /* 100 */ "func_name ::= F_ELT", + /* 101 */ "func_name ::= F_COALESCE", + /* 102 */ "func_name ::= F_ISNULL", + /* 103 */ "func_name ::= F_CONCAT", + /* 104 */ "func_name ::= F_SUBSTR", + /* 105 */ "func_name ::= F_TRIM", + /* 106 */ "func_name ::= F_DATE", + /* 107 */ "func_name ::= F_DATE_FORMAT", + /* 108 */ "func_name ::= F_CURRENT_DATE", + /* 109 */ "func_name ::= F_NOW", + /* 110 */ "func_name ::= F_TIME", + /* 111 */ "func_name ::= F_TO_DAYS", + /* 112 */ "func_name ::= F_FROM_DAYS", + /* 113 */ "func_name ::= F_YEAR", + /* 114 */ "func_name ::= F_MONTH", + /* 115 */ "func_name ::= F_DAY", + /* 116 */ "func_name ::= F_DATE_ADD", + /* 117 */ "func_name ::= F_DATE_SUB", + /* 118 */ "func_name ::= F_ROUND", + /* 119 */ "func_name ::= F_FLOOR", + /* 120 */ "func_name ::= F_INET_ATON", + /* 121 */ "func_name ::= F_INET_NTOA", ); /** @@ -1184,126 +1205,128 @@ static public $yy_action = array( * */ static public $yyRuleInfo = array( - array( 'lhs' => 75, 'rhs' => 1 ), - array( 'lhs' => 75, 'rhs' => 1 ), - array( 'lhs' => 75, 'rhs' => 1 ), - array( 'lhs' => 76, 'rhs' => 3 ), - array( 'lhs' => 76, 'rhs' => 3 ), - array( 'lhs' => 77, 'rhs' => 4 ), - array( 'lhs' => 77, 'rhs' => 6 ), - array( 'lhs' => 77, 'rhs' => 6 ), - array( 'lhs' => 77, 'rhs' => 8 ), - array( 'lhs' => 82, 'rhs' => 1 ), - array( 'lhs' => 82, 'rhs' => 3 ), + 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' => 82, 'rhs' => 2 ), + array( 'lhs' => 82, 'rhs' => 0 ), array( 'lhs' => 81, 'rhs' => 2 ), + array( 'lhs' => 81, 'rhs' => 1 ), array( 'lhs' => 81, 'rhs' => 0 ), - array( 'lhs' => 80, 'rhs' => 2 ), - array( 'lhs' => 80, 'rhs' => 1 ), - array( 'lhs' => 80, 'rhs' => 0 ), - array( 'lhs' => 83, 'rhs' => 6 ), - array( 'lhs' => 83, 'rhs' => 4 ), - array( 'lhs' => 84, 'rhs' => 3 ), - array( 'lhs' => 84, 'rhs' => 3 ), - array( 'lhs' => 84, 'rhs' => 3 ), - array( 'lhs' => 84, 'rhs' => 3 ), - array( 'lhs' => 84, 'rhs' => 3 ), - array( 'lhs' => 84, 'rhs' => 3 ), - array( 'lhs' => 84, 'rhs' => 3 ), - array( 'lhs' => 84, 'rhs' => 3 ), - array( 'lhs' => 84, 'rhs' => 3 ), - array( 'lhs' => 78, 'rhs' => 1 ), - array( 'lhs' => 87, 'rhs' => 1 ), - array( 'lhs' => 87, 'rhs' => 1 ), - array( 'lhs' => 87, 'rhs' => 1 ), - array( 'lhs' => 87, 'rhs' => 4 ), - array( 'lhs' => 87, 'rhs' => 3 ), - array( 'lhs' => 87, 'rhs' => 3 ), - array( 'lhs' => 94, 'rhs' => 1 ), - array( 'lhs' => 94, 'rhs' => 3 ), - array( 'lhs' => 96, 'rhs' => 1 ), - array( 'lhs' => 96, 'rhs' => 3 ), - array( 'lhs' => 98, 'rhs' => 1 ), - array( 'lhs' => 98, 'rhs' => 3 ), - array( 'lhs' => 86, 'rhs' => 1 ), - array( 'lhs' => 86, 'rhs' => 3 ), - array( 'lhs' => 93, 'rhs' => 3 ), - array( 'lhs' => 101, 'rhs' => 1 ), - array( 'lhs' => 101, 'rhs' => 3 ), - array( 'lhs' => 91, 'rhs' => 0 ), - array( 'lhs' => 91, 'rhs' => 1 ), - array( 'lhs' => 91, 'rhs' => 3 ), - array( 'lhs' => 102, 'rhs' => 1 ), - array( 'lhs' => 102, 'rhs' => 3 ), - array( 'lhs' => 103, 'rhs' => 1 ), - array( 'lhs' => 103, 'rhs' => 1 ), - array( 'lhs' => 103, 'rhs' => 1 ), - array( 'lhs' => 103, 'rhs' => 1 ), - array( 'lhs' => 103, 'rhs' => 1 ), - array( 'lhs' => 103, 'rhs' => 1 ), - array( 'lhs' => 88, 'rhs' => 1 ), - array( 'lhs' => 88, 'rhs' => 1 ), - array( 'lhs' => 104, 'rhs' => 1 ), - array( 'lhs' => 105, 'rhs' => 1 ), - array( 'lhs' => 85, 'rhs' => 1 ), + 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' => 108, 'rhs' => 1 ), - array( 'lhs' => 106, 'rhs' => 1 ), - array( 'lhs' => 106, 'rhs' => 2 ), + array( 'lhs' => 89, 'rhs' => 1 ), + array( 'lhs' => 105, 'rhs' => 1 ), array( 'lhs' => 106, 'rhs' => 1 ), + array( 'lhs' => 109, 'rhs' => 1 ), + array( 'lhs' => 109, 'rhs' => 3 ), + array( 'lhs' => 86, 'rhs' => 1 ), + array( 'lhs' => 86, 'rhs' => 3 ), + array( 'lhs' => 80, 'rhs' => 1 ), + array( 'lhs' => 90, 'rhs' => 1 ), + array( 'lhs' => 110, 'rhs' => 1 ), array( 'lhs' => 107, 'rhs' => 1 ), - array( 'lhs' => 95, 'rhs' => 1 ), - array( 'lhs' => 95, 'rhs' => 1 ), - array( 'lhs' => 97, 'rhs' => 1 ), - array( 'lhs' => 97, 'rhs' => 1 ), - array( 'lhs' => 97, 'rhs' => 1 ), - array( 'lhs' => 97, 'rhs' => 1 ), - array( 'lhs' => 97, 'rhs' => 1 ), - array( 'lhs' => 99, 'rhs' => 1 ), - array( 'lhs' => 99, 'rhs' => 1 ), + array( 'lhs' => 107, 'rhs' => 2 ), + 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' => 109, 'rhs' => 1 ), - array( 'lhs' => 109, 'rhs' => 1 ), + array( 'lhs' => 101, 'rhs' => 1 ), + array( 'lhs' => 101, 'rhs' => 1 ), array( 'lhs' => 111, 'rhs' => 1 ), array( 'lhs' => 111, 'rhs' => 1 ), - array( 'lhs' => 111, 'rhs' => 1 ), - array( 'lhs' => 111, 'rhs' => 1 ), - array( 'lhs' => 111, 'rhs' => 1 ), - array( 'lhs' => 111, 'rhs' => 1 ), - array( 'lhs' => 112, 'rhs' => 1 ), - array( 'lhs' => 112, 'rhs' => 1 ), - array( 'lhs' => 110, 'rhs' => 1 ), - array( 'lhs' => 110, 'rhs' => 1 ), + array( 'lhs' => 113, 'rhs' => 1 ), + array( 'lhs' => 113, 'rhs' => 1 ), + array( 'lhs' => 113, 'rhs' => 1 ), + array( 'lhs' => 113, 'rhs' => 1 ), + array( 'lhs' => 113, 'rhs' => 1 ), array( 'lhs' => 113, 'rhs' => 1 ), array( 'lhs' => 114, 'rhs' => 1 ), array( 'lhs' => 114, 'rhs' => 1 ), - array( 'lhs' => 92, 'rhs' => 1 ), - array( 'lhs' => 92, 'rhs' => 1 ), - array( 'lhs' => 90, 'rhs' => 1 ), - array( 'lhs' => 90, 'rhs' => 1 ), - array( 'lhs' => 90, 'rhs' => 1 ), - array( 'lhs' => 90, 'rhs' => 1 ), - array( 'lhs' => 90, 'rhs' => 1 ), - array( 'lhs' => 90, 'rhs' => 1 ), - array( 'lhs' => 90, 'rhs' => 1 ), - array( 'lhs' => 90, 'rhs' => 1 ), - array( 'lhs' => 90, 'rhs' => 1 ), - array( 'lhs' => 90, 'rhs' => 1 ), - array( 'lhs' => 90, 'rhs' => 1 ), - array( 'lhs' => 90, 'rhs' => 1 ), - array( 'lhs' => 90, 'rhs' => 1 ), - array( 'lhs' => 90, 'rhs' => 1 ), - array( 'lhs' => 90, 'rhs' => 1 ), - array( 'lhs' => 90, 'rhs' => 1 ), - array( 'lhs' => 90, 'rhs' => 1 ), - array( 'lhs' => 90, 'rhs' => 1 ), - array( 'lhs' => 90, 'rhs' => 1 ), - array( 'lhs' => 90, 'rhs' => 1 ), - array( 'lhs' => 90, 'rhs' => 1 ), - array( 'lhs' => 90, 'rhs' => 1 ), - array( 'lhs' => 90, 'rhs' => 1 ), + array( 'lhs' => 112, 'rhs' => 1 ), + array( 'lhs' => 112, 'rhs' => 1 ), + array( 'lhs' => 115, 'rhs' => 1 ), + array( 'lhs' => 116, 'rhs' => 1 ), + array( 'lhs' => 116, '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 ), ); /** @@ -1361,6 +1384,7 @@ static public $yy_action = array( 55 => 27, 56 => 27, 57 => 27, + 62 => 27, 31 => 31, 32 => 32, 33 => 33, @@ -1375,64 +1399,65 @@ static public $yy_action = array( 59 => 58, 60 => 60, 61 => 61, - 62 => 62, - 97 => 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, 63 => 63, 64 => 64, + 99 => 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, 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, + 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, ); /* Beginning here are the reduction cases. A typical example ** follows: @@ -1442,49 +1467,49 @@ static public $yy_action = array( */ #line 29 "..\oql-parser.y" function yy_r0(){ $this->my_result = $this->yystack[$this->yyidx + 0]->minor; } -#line 1449 "..\oql-parser.php" +#line 1474 "..\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 1454 "..\oql-parser.php" +#line 1479 "..\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 1459 "..\oql-parser.php" +#line 1484 "..\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 1464 "..\oql-parser.php" +#line 1489 "..\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 1469 "..\oql-parser.php" +#line 1494 "..\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 1474 "..\oql-parser.php" +#line 1499 "..\oql-parser.php" #line 55 "..\oql-parser.y" function yy_r9(){ $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor); } -#line 1479 "..\oql-parser.php" +#line 1504 "..\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 1485 "..\oql-parser.php" +#line 1510 "..\oql-parser.php" #line 63 "..\oql-parser.y" function yy_r11(){ $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; } -#line 1488 "..\oql-parser.php" +#line 1513 "..\oql-parser.php" #line 64 "..\oql-parser.y" function yy_r12(){ $this->_retvalue = null; } -#line 1491 "..\oql-parser.php" +#line 1516 "..\oql-parser.php" #line 66 "..\oql-parser.y" function yy_r13(){ // insert the join statement on top of the existing list @@ -1492,93 +1517,96 @@ static public $yy_action = array( // and return the updated array $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; } -#line 1499 "..\oql-parser.php" +#line 1524 "..\oql-parser.php" #line 72 "..\oql-parser.y" function yy_r14(){ $this->_retvalue = Array($this->yystack[$this->yyidx + 0]->minor); } -#line 1504 "..\oql-parser.php" +#line 1529 "..\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 1510 "..\oql-parser.php" +#line 1535 "..\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 1516 "..\oql-parser.php" +#line 1541 "..\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 1519 "..\oql-parser.php" +#line 1544 "..\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 1522 "..\oql-parser.php" +#line 1547 "..\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 1525 "..\oql-parser.php" +#line 1550 "..\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 1528 "..\oql-parser.php" +#line 1553 "..\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 1531 "..\oql-parser.php" +#line 1556 "..\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 1534 "..\oql-parser.php" +#line 1559 "..\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 1537 "..\oql-parser.php" +#line 1562 "..\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 1540 "..\oql-parser.php" +#line 1565 "..\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 1543 "..\oql-parser.php" +#line 1568 "..\oql-parser.php" #line 98 "..\oql-parser.y" function yy_r27(){ $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; } -#line 1546 "..\oql-parser.php" +#line 1571 "..\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 1549 "..\oql-parser.php" +#line 1574 "..\oql-parser.php" #line 104 "..\oql-parser.y" function yy_r32(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; } -#line 1552 "..\oql-parser.php" +#line 1577 "..\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 1555 "..\oql-parser.php" +#line 1580 "..\oql-parser.php" #line 120 "..\oql-parser.y" function yy_r42(){ $this->_retvalue = new ListOqlExpression($this->yystack[$this->yyidx + -1]->minor); } -#line 1560 "..\oql-parser.php" +#line 1585 "..\oql-parser.php" #line 131 "..\oql-parser.y" function yy_r45(){ $this->_retvalue = array(); } -#line 1565 "..\oql-parser.php" +#line 1590 "..\oql-parser.php" #line 142 "..\oql-parser.y" function yy_r49(){ $this->_retvalue = new IntervalOqlExpression($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor); } -#line 1568 "..\oql-parser.php" +#line 1593 "..\oql-parser.php" #line 154 "..\oql-parser.y" function yy_r58(){ $this->_retvalue = new ScalarOqlExpression($this->yystack[$this->yyidx + 0]->minor); } -#line 1571 "..\oql-parser.php" +#line 1596 "..\oql-parser.php" #line 157 "..\oql-parser.y" function yy_r60(){ $this->_retvalue = new FieldOqlExpression($this->yystack[$this->yyidx + 0]->minor); } -#line 1574 "..\oql-parser.php" +#line 1599 "..\oql-parser.php" #line 158 "..\oql-parser.y" function yy_r61(){ $this->_retvalue = new FieldOqlExpression($this->yystack[$this->yyidx + 0]->minor, $this->yystack[$this->yyidx + -2]->minor); } -#line 1577 "..\oql-parser.php" -#line 159 "..\oql-parser.y" - function yy_r62(){ $this->_retvalue=$this->yystack[$this->yyidx + 0]->minor; } -#line 1580 "..\oql-parser.php" -#line 162 "..\oql-parser.y" - function yy_r63(){ $this->_retvalue = new VariableOqlExpression(substr($this->yystack[$this->yyidx + 0]->minor, 1)); } -#line 1583 "..\oql-parser.php" -#line 164 "..\oql-parser.y" - function yy_r64(){ +#line 1602 "..\oql-parser.php" +#line 161 "..\oql-parser.y" + function yy_r63(){ $this->_retvalue = new ExternalFieldOqlExpression($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor); } +#line 1605 "..\oql-parser.php" +#line 163 "..\oql-parser.y" + function yy_r64(){ $this->_retvalue=$this->yystack[$this->yyidx + 0]->minor; } +#line 1608 "..\oql-parser.php" +#line 166 "..\oql-parser.y" + function yy_r65(){ $this->_retvalue = new VariableOqlExpression(substr($this->yystack[$this->yyidx + 0]->minor, 1)); } +#line 1611 "..\oql-parser.php" +#line 168 "..\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); @@ -1589,22 +1617,22 @@ static public $yy_action = array( } $this->_retvalue = new OqlName($name, $this->m_iColPrev); } -#line 1596 "..\oql-parser.php" -#line 175 "..\oql-parser.y" - function yy_r65(){$this->_retvalue=(int)$this->yystack[$this->yyidx + 0]->minor; } -#line 1599 "..\oql-parser.php" -#line 176 "..\oql-parser.y" - function yy_r66(){$this->_retvalue=(int)-$this->yystack[$this->yyidx + 0]->minor; } -#line 1602 "..\oql-parser.php" -#line 177 "..\oql-parser.y" - function yy_r67(){$this->_retvalue=new OqlHexValue($this->yystack[$this->yyidx + 0]->minor); } -#line 1605 "..\oql-parser.php" -#line 178 "..\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 1608 "..\oql-parser.php" +#line 1624 "..\oql-parser.php" +#line 179 "..\oql-parser.y" + function yy_r67(){$this->_retvalue=(int)$this->yystack[$this->yyidx + 0]->minor; } +#line 1627 "..\oql-parser.php" +#line 180 "..\oql-parser.y" + function yy_r68(){$this->_retvalue=(int)-$this->yystack[$this->yyidx + 0]->minor; } +#line 1630 "..\oql-parser.php" #line 181 "..\oql-parser.y" - function yy_r69(){$this->_retvalue=$this->yystack[$this->yyidx + 0]->minor; } -#line 1611 "..\oql-parser.php" + function yy_r69(){$this->_retvalue=new OqlHexValue($this->yystack[$this->yyidx + 0]->minor); } +#line 1633 "..\oql-parser.php" +#line 182 "..\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 1636 "..\oql-parser.php" +#line 185 "..\oql-parser.y" + function yy_r71(){$this->_retvalue=$this->yystack[$this->yyidx + 0]->minor; } +#line 1639 "..\oql-parser.php" /** * placeholder for the left hand side in a reduce operation. @@ -1719,7 +1747,7 @@ static public $yy_action = array( #line 25 "..\oql-parser.y" throw new OQLParserException($this->m_sSourceQuery, $this->m_iLine, $this->m_iCol, $this->tokenName($yymajor), $TOKEN); -#line 1727 "..\oql-parser.php" +#line 1755 "..\oql-parser.php" } /** @@ -1886,7 +1914,7 @@ throw new OQLParserException($this->m_sSourceQuery, $this->m_iLine, $this->m_iCo } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0); } } -#line 239 "..\oql-parser.y" +#line 243 "..\oql-parser.y" class OQLParserException extends OQLException @@ -1951,4 +1979,4 @@ class OQLParser extends OQLParserRaw } } -#line 1960 "..\oql-parser.php" +#line 1988 "..\oql-parser.php" diff --git a/core/oql/oql-parser.y b/core/oql/oql-parser.y index 03bb3fe52..580933234 100644 --- a/core/oql/oql-parser.y +++ b/core/oql/oql-parser.y @@ -154,8 +154,12 @@ scalar(A) ::= str_scalar(X). { A = X; } num_scalar(A) ::= num_value(X). { A = new ScalarOqlExpression(X); } str_scalar(A) ::= str_value(X). { A = new ScalarOqlExpression(X); } -field_id(A) ::= name(X). { A = new FieldOqlExpression(X); } -field_id(A) ::= class_name(X) DOT name(Y). { A = new FieldOqlExpression(Y, X); } +basic_field_id(A) ::= name(X). { A = new FieldOqlExpression(X); } +basic_field_id(A) ::= class_name(X) DOT name(Y). { A = new FieldOqlExpression(Y, X); } + +field_id(A) ::= basic_field_id(X). { A = X; } +field_id(A) ::= field_id(X) ARROW name(Y). { A = new ExternalFieldOqlExpression(X, Y); } + class_name(A) ::= name(X). { A=X; } diff --git a/core/oql/oqlquery.class.inc.php b/core/oql/oqlquery.class.inc.php index b0bff7db6..914310f4d 100644 --- a/core/oql/oqlquery.class.inc.php +++ b/core/oql/oqlquery.class.inc.php @@ -168,6 +168,31 @@ class ScalarOqlExpression extends ScalarExpression implements CheckableExpressio } } +class ExternalFieldOqlExpression extends ExternalFieldExpression implements CheckableExpression +{ + private $aExpression = array(); + + function __construct($oExpr1, $oExpr2) + { + parent::__construct("TOTO"); + } + + /** + * Check the validity of the expression with regard to the data model + * and the query in which it is used + * + * @param ModelReflection $oModelReflection MetaModel to consider + * @param array $aAliases Aliases to class names (for the current query) + * @param string $sSourceQuery For the reporting + * + * @throws OqlNormalizeException + */ + public function Check(ModelReflection $oModelReflection, $aAliases, $sSourceQuery) + { + // TODO: Implement Check() method. + } +} + class FieldOqlExpression extends FieldExpression implements CheckableExpression { protected $m_oParent;