From 48d3243abea75380730dd9b8381d62224649a01d Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 19 Jan 2017 23:46:25 +0100 Subject: [PATCH] Drop last vestiges of consistent var mode flag --- grammar/php5.y | 18 +- grammar/php7.y | 14 +- grammar/rebuildParsers.php | 7 - lib/PhpParser/Parser/Php5.php | 612 ++++++++++++------------ lib/PhpParser/Parser/Php7.php | 474 +++++++++--------- lib/PhpParser/ParserAbstract.php | 5 - lib/PhpParser/PrettyPrinterAbstract.php | 4 +- test/PhpParser/CodeParsingTest.php | 1 - test/PhpParser/PrettyPrinterTest.php | 3 - test/code/parser/consistentVarMode.test | 108 ----- 10 files changed, 554 insertions(+), 692 deletions(-) delete mode 100644 test/code/parser/consistentVarMode.test diff --git a/grammar/php5.y b/grammar/php5.y index 346eecb9..218ada99 100644 --- a/grammar/php5.y +++ b/grammar/php5.y @@ -54,7 +54,7 @@ namespace_name: ; plain_variable: - T_VARIABLE { $$ = maybeMakeVar(parseVar($1)); } + T_VARIABLE { $$ = Expr\Variable[parseVar($1)]; } ; top_statement: @@ -421,7 +421,7 @@ global_var_list: ; global_var: - T_VARIABLE { $$ = Expr\Variable[parseVar($1)]; } + plain_variable { $$ = $1; } | '$' variable { $$ = Expr\Variable[$2]; } | '$' '{' expr '}' { $$ = Expr\Variable[$3]; } ; @@ -916,7 +916,7 @@ static_property_with_arrays: reference_variable: reference_variable '[' dim_offset ']' { $$ = Expr\ArrayDimFetch[$1, $3]; } | reference_variable '{' expr '}' { $$ = Expr\ArrayDimFetch[$1, $3]; } - | T_VARIABLE { $$ = Expr\Variable[parseVar($1)]; } + | plain_variable { $$ = $1; } | '$' '{' expr '}' { $$ = Expr\Variable[$3]; } ; @@ -975,18 +975,14 @@ encaps_string_part: T_ENCAPSED_AND_WHITESPACE { $$ = Scalar\EncapsedStringPart[$1]; } ; -encaps_base_var: - T_VARIABLE { $$ = Expr\Variable[parseVar($1)]; } -; - encaps_str_varname: T_STRING_VARNAME { $$ = Expr\Variable[$1]; } ; encaps_var: - encaps_base_var { $$ = $1; } - | encaps_base_var '[' encaps_var_offset ']' { $$ = Expr\ArrayDimFetch[$1, $3]; } - | encaps_base_var T_OBJECT_OPERATOR identifier { $$ = Expr\PropertyFetch[$1, $3]; } + plain_variable { $$ = $1; } + | plain_variable '[' encaps_var_offset ']' { $$ = Expr\ArrayDimFetch[$1, $3]; } + | plain_variable T_OBJECT_OPERATOR identifier { $$ = Expr\PropertyFetch[$1, $3]; } | T_DOLLAR_OPEN_CURLY_BRACES expr '}' { $$ = Expr\Variable[$2]; } | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '}' { $$ = Expr\Variable[$2]; } | T_DOLLAR_OPEN_CURLY_BRACES encaps_str_varname '[' expr ']' '}' @@ -997,7 +993,7 @@ encaps_var: encaps_var_offset: T_STRING { $$ = Scalar\String_[$1]; } | T_NUM_STRING { $$ = $this->parseNumString($1, attributes()); } - | T_VARIABLE { $$ = Expr\Variable[parseVar($1)]; } + | plain_variable { $$ = $1; } ; %% diff --git a/grammar/php7.y b/grammar/php7.y index f9dd8dd0..b8392dc4 100644 --- a/grammar/php7.y +++ b/grammar/php7.y @@ -54,7 +54,7 @@ namespace_name: ; plain_variable: - T_VARIABLE { $$ = maybeMakeVar(parseVar($1)); } + T_VARIABLE { $$ = Expr\Variable[parseVar($1)]; } ; top_statement: @@ -877,18 +877,14 @@ encaps_string_part: T_ENCAPSED_AND_WHITESPACE { $$ = Scalar\EncapsedStringPart[$1]; } ; -encaps_base_var: - T_VARIABLE { $$ = Expr\Variable[parseVar($1)]; } -; - encaps_str_varname: T_STRING_VARNAME { $$ = Expr\Variable[$1]; } ; encaps_var: - encaps_base_var { $$ = $1; } - | encaps_base_var '[' encaps_var_offset ']' { $$ = Expr\ArrayDimFetch[$1, $3]; } - | encaps_base_var T_OBJECT_OPERATOR identifier { $$ = Expr\PropertyFetch[$1, $3]; } + plain_variable { $$ = $1; } + | plain_variable '[' encaps_var_offset ']' { $$ = Expr\ArrayDimFetch[$1, $3]; } + | plain_variable T_OBJECT_OPERATOR identifier { $$ = Expr\PropertyFetch[$1, $3]; } | T_DOLLAR_OPEN_CURLY_BRACES expr '}' { $$ = Expr\Variable[$2]; } | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '}' { $$ = Expr\Variable[$2]; } | T_DOLLAR_OPEN_CURLY_BRACES encaps_str_varname '[' expr ']' '}' @@ -900,7 +896,7 @@ encaps_var_offset: T_STRING { $$ = Scalar\String_[$1]; } | T_NUM_STRING { $$ = $this->parseNumString($1, attributes()); } | '-' T_NUM_STRING { $$ = $this->parseNumString('-' . $2, attributes()); } - | T_VARIABLE { $$ = Expr\Variable[parseVar($1)]; } + | plain_variable { $$ = $1; } ; %% diff --git a/grammar/rebuildParsers.php b/grammar/rebuildParsers.php index 9eea0d9a..09528c6f 100644 --- a/grammar/rebuildParsers.php +++ b/grammar/rebuildParsers.php @@ -224,13 +224,6 @@ function resolveMacros($code) { . '$this->startAttributeStack[#1] + $this->endAttributes) : ' . $args[0] . ')'; } - if ('maybeMakeVar' == $name) { - assertArgs(1, $args, $name); - - return '($this->useConsistentVariableNodes ? new Expr\Variable(' . $args[0] . ', ' - . '$this->startAttributeStack[#1] + $this->endAttributes) : ' . $args[0] . ')'; - } - return $matches[0]; }, $code diff --git a/lib/PhpParser/Parser/Php5.php b/lib/PhpParser/Parser/Php5.php index 48cfa52d..f7ec5696 100644 --- a/lib/PhpParser/Parser/Php5.php +++ b/lib/PhpParser/Parser/Php5.php @@ -18,8 +18,8 @@ use PhpParser\Node\Stmt; class Php5 extends \PhpParser\ParserAbstract { protected $tokenToSymbolMapSize = 392; - protected $actionTableSize = 1003; - protected $gotoTableSize = 637; + protected $actionTableSize = 998; + protected $gotoTableSize = 656; protected $invalidSymbol = 157; protected $errorSymbol = 1; @@ -235,105 +235,104 @@ class Php5 extends \PhpParser\ParserAbstract protected $action = array( 674, 675, 676, 677, 678,-32766, 679, 680, 681, 717, 718, 216, 217, 218, 219, 220, 221, 222, 223, 224, - 282, 225, 226, 227, 228, 229, 230, 231, 232, 233, + 420, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,-32766,-32766,-32766,-32766,-32766,-32766,-32766, -32766,-32767,-32767,-32767,-32767, 419, 237, 238,-32766,-32766, -32766,-32766, 682,-32766, 0,-32766,-32766,-32766,-32766,-32766, -32766,-32767,-32767,-32767,-32767,-32767, 683, 684, 685, 686, - 687, 688, 689, 1184, 348, 749,-32766,-32766,-32766,-32766, - -32766, 23, 690, 691, 692, 693, 694, 695, 696, 697, + 687, 688, 689, 1177, 28, 749,-32766,-32766,-32766,-32766, + -32766, 282, 690, 691, 692, 693, 694, 695, 696, 697, 698, 699, 700, 720, 721, 722, 723, 724, 712, 713, 714, 715, 716, 701, 702, 703, 704, 705, 706, 707, 743, 744, 745, 746, 747, 748, 708, 709, 710, 711, - 741, 732, 730, 731, 727, 728, 28, 719, 725, 726, + 741, 732, 730, 731, 727, 728, 46, 719, 725, 726, 733, 734, 736, 735, 737, 738, 52, 53, 423, 54, - 55, 729, 740, 739, 420, 56, 57, 332, 58,-32766, + 55, 729, 740, 739, 422, 56, 57, 336, 58,-32766, -32766,-32766,-32766,-32766,-32766,-32766,-32766,-32766, 7,-32767, - -32767,-32767,-32767, 50, 329, 1192, 523, 949, 950, 951, - 948, 947, 946, 941, 1220, 121, 1222, 1221, 767, 768, + -32767,-32767,-32767, 50, 330, 18, 523, 949, 950, 951, + 948, 947, 946, 941,-32766,-32766,-32766, 121, 767, 768, 825, 59, 60,-32766,-32766,-32766, 812, 61, 1177, 62, 291, 292, 63, 64, 65, 66, 67, 68, 69, 70, - 358, 24, 299, 71, 415,-32766,-32766,-32766, 1191, 1092, - 1093, 752, 751, 1184, 213, 214, 215, 472,-32766,-32766, - -32766, 826, 408, 1104, 309,-32766, 904,-32766,-32766,-32766, - -32766,-32766,-32766, 1041, 200, -271, 435, 1041,-32766, 422, + 351, 24, 299, 71, 415,-32766,-32766,-32766, 116, 1092, + 1093, 752, 751, 755, 213, 214, 215, 472,-32766,-32766, + -32766, 826, 408, 1104, 307,-32766, 1192,-32766,-32766,-32766, + -32766,-32766,-32766, 1041, 200, -271, 435, 414,-32766, 23, -32766,-32766,-32766,-32766,-32766, 120, 496, 949, 950, 951, - 948, 947, 946, 204, 480, 481, 296, 625, 125,-32766, - 897, 898, 339, 482, 483,-32766, 1098, 1099, 1100, 1101, - 1095, 1096, 307, 497,-32766, 421, 431, 497, 1102, 1097, - 431, 306, -222, 873, 751, 39, 280, 332, 321, 18, + 948, 947, 946, 348, 480, 481, 293, 625, 125,-32766, + 897, 898, 336, 482, 483,-32766, 1098, 1099, 1100, 1101, + 1095, 1096, 310, 497,-32766, 204, 431, 497, 1102, 1097, + 431, 309, -222, 497, 8, 39, 431, 327, 321, 1059, 322, 424, -124, -124, -124, -4, 826, 471, 99, 100, - 101, 814, 301, 549, 38, 19, 425, -124, 473, -124, + 101, 814, 301, 1041, 38, 19, 425, -124, 473, -124, 474, -124, 475, -124, 102, 426, -124, -124, -124, 29, - 30, 427, 428, 626, 31, 476, 431, 816, 72, 326, - 927, 350, 349, 477, 478,-32766,-32766,-32766, 298, 479, + 30, 427, 428, 626, 31, 476, 431, 816, 72, 337, + 927, 349, 350, 477, 478,-32766,-32766,-32766, 298, 479, 1041, 811, 797, 844, 429, 430,-32767,-32767,-32767,-32767, - 94, 95, 96, 97, 98,-32766, 126,-32766,-32766,-32766, + 94, 95, 96, 97, 98,-32766, 418,-32766,-32766,-32766, -32766, 1142, 213, 214, 215, 295, 424, 239, 828, 640, - -124, 1041, 471, 897, 898, 1211, 814, 1041, 1210, 38, - 19, 425, 200, 473, 1059, 474, 497, 475, 414, 431, + -124, 280, 471, 897, 898, 755, 814, 1041, 1210, 38, + 19, 425, 200, 473, 904, 474, 497, 475, 297, 431, 426, 213, 214, 215, 29, 30, 427, 428, 406, 31, - 476, 1041, 874, 72, 320, 826, 350, 349, 477, 478, - 338, 200, 214, 215, 479, 8, 922, 759, 844, 429, - 430, 213, 214, 215, 295, -218, 76, 77, 78, 46, - 590, 200, 482, 644, 297, 445, 27, 294, 331, 418, - 335, 200, 241, 828, 640, -4, 32, 1041, 79, 80, + 476, 1041, 445, 72, 320, 826, 349, 350, 477, 478, + 421, 200, 334, 873, 479, 214, 215, 759, 844, 429, + 430, 213, 214, 215, 295, 923, 76, 77, 78, 47, + 590, 1191, 482, 655, 200, 326, 27, 294, 332, 807, + 119, 200, 241, 828, 640, -4, 32, 1041, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, - 101, 448, 301, 215, 826, 424, 805, 124,-32766,-32766, - -32766, 471, 903, 244, 102, 814, 1177, 1104, 38, 19, - 425, 200, 473, 913, 474, 119, 475, 47,-32766, 426, - -32766,-32766, 643, 29, 30, 427, 826, 807, 31, 476, - 416, 116, 72, 809, 49, 350, 349,-32766,-32766,-32766, - -32766,-32766,-32766, 479, 34, 1041, 234, 235, 236, 213, - 214, 215,-32766,-32766, 649, 1143, 124,-32766,-32766,-32766, - -32766,-32766, 237, 238, 424, 231, 232, 233, 293, 200, - 471, 243, 828, 640, 814, 446, 923, 38, 19, 425, - 339, 473, 242, 474, 752, 475, 1184, 284, 426, 96, - 97, 98, 29, 30, 427, 826, 424, 31, 476, 117, - 766, 72, 471, 129, 350, 349, 814, 581, 1041, 38, - 19, 425, 479, 473, 115, 474, 118, 475, 1041, 1069, - 426,-32766,-32766, 655, 29, 30, 427, 826, 206, 31, - 476, 283, 205, 72, 207, 123, 350, 349, 237, 238, - 497, 828, 640, 431, 479, 648,-32766,-32766,-32766, 441, - 497, 200, 642, 431, 824, 646, 460, 596, 436, 128, - 332, 455, 20, 130, 359, 424,-32766, 767, 768, 603, - 604, 471, 313, 828, 640, 814, 926, 668, 38, 19, - 425, -82, 473, 652, 474, 837, 475, 760, 645, 426, - -32766, 938, 658, 29, 30, 427, 826, 424, 31, 476, - 301, 102, 72, 471, 44, 350, 349, 814, 45, 48, - 38, 19, 425, 479, 473, 127, 474, 299, 475, 609, - 43, 426, 41, 42, 51, 29, 30, 427, 753, 529, - 31, 476, 613, 634, 72, 752, 587, 350, 349, 751, - 755, 601, 828, 640, 954, 479,-32766, 33, 103, 104, + 101, 34, 301, 448, 826, 424, 809, 124,-32766,-32766, + -32766, 471, 903, 441, 102, 814, 642, 1104, 38, 19, + 425, 75, 473, 416, 474, 327, 475, 766,-32766, 426, + -32766,-32766, 644, 29, 30, 427, 826, 751, 31, 476, + -218, 117, 72, 805, 49, 349, 350,-32766,-32766,-32766, + 215,-32766, 446, 479,-32766,-32766, 234, 235, 236, 213, + 214, 215, 874, 207, 643, 1143, 124,-32766, 200,-32766, + -32766,-32766, 237, 238, 424, 231, 232, 233, 1041, 200, + 471, 922, 828, 640, 814, 206, 129, 38, 19, 425, + 581, 473, 242, 474, 752, 475, 755, 115, 426, 96, + 97, 98, 29, 30, 427, 826, 424, 31, 476, 126, + 128, 72, 471, 327, 349, 350, 814, 205, 1041, 38, + 19, 425, 479, 473, 243, 474, 118, 475, 1041, 1069, + 426, 200, 1041, 646, 29, 30, 427, 826, 244, 31, + 476, 296, 313, 72, 549, 123, 349, 350,-32766,-32766, + 1219, 828, 640, 1220, 479, 283,-32766,-32766,-32766, 824, + 497, 237, 238, 431, 652, 649, 460, 596, 436, 648, + 327, 455, 20, 130, 359, 424,-32766, 767, 768, 938, + 658, 471, -82, 828, 640, 814, 603, 604, 38, 19, + 425,-32766, 473, 837, 474, 301, 475, 760, 645, 426, + 102, 926, 668, 29, 30, 427, 826, 424, 31, 476, + 43, 51, 72, 471, 127, 349, 350, 814, 45, 48, + 38, 19, 425, 479, 473, 299, 474, 753, 475, 41, + 42, 426, 44, 609, 954, 29, 30, 427, 752, 613, + 31, 476, 444, 751, 72, 621, 755, 349, 350, 331, + 529,-32766, 860, 640, 601, 479, 845, 33, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, - 444, 621, 584, 12, 600, 279, 424, -80, 465, 439, - 447, 9, 471, 330, 860, 640, 814, 409, 4, 38, - 19, 425, 815, 473, 305, 474, 240, 475, 980, 982, - 426, 0, 0, 0, 29, 30, 427, 0, 334, 31, - 476, 846, 845, 72, 208, 209, 350, 349, 327, 308, - 210, 328, 211, -501, 479, -500, 310, 0, 482, 1103, - 0, 0, 1149, 410, 202, 0, 0, 0, 357, 208, - 209, 0, 1092, 1093, -409, 210,-32766, 211, -401, -410, - 1094, 3, 11, 828, 640, 839, -219, 531, 441, 202, - 392, 384, 383, 372, 304, 0, 663, 1092, 1093, 662, - -500,-32766, 37, 36, 764, 1094, 763, 930, 806, 932, - 808, 810, 822, 813, 765, 931, 933, 934, 856, 858, - 0, 861, 800, 868, 867, 876, 817, 570, 802, 1098, - 1099, 1100, 1101, 1095, 1096, 382, 823, 939, 405, 325, - 324, 1102, 1097, 122, 75, 404, 1039, 667, 212, 666, - -32766, 665, 570, 660, 1098, 1099, 1100, 1101, 1095, 1096, - 382, 657, 656, 654, 653, 651, 1102, 1097, 641, 303, - 831, 866, 607, 212, 840,-32766, 1043, 865, 769, 770, - 459, 1216, 1185, 1183, 1168, 1181, 1083, 915, 1189, 1179, - 1055, 841, 842, 1044, 833, 1218, 761, 762, 1219, 1217, - 798, 664, 772, 771, 843, 0, 336, 302, 290, 22, - 25, 289, 407, 413, 281, 203, 26, 35, 40, 74, - 73,-32766, 0, 1045, 1021, 1020, 574, 1085, 1108, 905, - 1049, 1046, 631, 564, 469, 464, 463, 456, 377, 16, - 15, 14, -218, 0, 0, -419, 0, 1163, 1162, 1109, - 1214, 1082, 1180, 1050, 1167, 1182, 1068, 1053, 1054, 1051, - 1052, 0, 1148 + 584, 634, -80, 447, 12, 279, 424, 465, 439, -409, + 600, 587, 471, 40, 828, 640, 814, 846, 1103, 38, + 19, 425, 840, 473, 1148, 474, 240, 475, 980, 982, + 426, 329, 482, 335, 29, 30, 427, 0, 0, 31, + 476, 1149, 328, 72, 208, 209, 349, 350, -501, -500, + 210, 308, 211, 306, 479, 1039, 0, 0, 0, 358, + -401, 3, 0, 0, 202, 0, 4, 0, 11, 208, + 209, -410, 1092, 1093, 9, 210,-32766, 211, 839, 409, + 1094, 35, 384, 828, 640, 441, 383, 372, 410, 202, + 392, 531, 641, 607, 861, 856, 800, 1092, 1093, 934, + -500,-32766, 868, 867, 933, 1094, 817, 802, 823, 815, + 765, 663, 662, 37, 36, 932, 764, 931, 763, 930, + 0, 876, 813, 810, 858, 808, 806, 570, 822, 1098, + 1099, 1100, 1101, 1095, 1096, 382, 404, 75, 325, 324, + 122, 1102, 1097, 405, 651, 653, 284, 654, 212, 656, + -32766, 660, 570, 665, 1098, 1099, 1100, 1101, 1095, 1096, + 382, 666, 667, 657, -419, 772, 1102, 1097, 771, 770, + 866, 865, 1163, 212, 1055,-32766, 664, 798, 1216, 459, + 1215, 1185, 1183, 1168, 1181, 1083, 915, 1189, 1179, 841, + 842, 843, 939, 831, 1044, 769, 1043, 833, 1217, 761, + 762, 1218, 0, 26, 413, 407, 338, 305, 304, 73, + 25, 303, 22,-32766, 302, 290, 289, 281, 203, 74, + 0, 1020, 574, 1021, 1045, -219, -218, 14, 1085, 1108, + 905, 1049, 1046, 631, 564, 469, 464, 463, 456, 377, + 16, 15, 0, 0, 0, 1162, 1109, 1213, 1082, 1180, + 1052, 1167, 1182, 1068, 1053, 1054, 1051, 1050 ); protected $actionCheck = array( @@ -349,102 +348,101 @@ class Php5 extends \PhpParser\ParserAbstract 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, - 122, 123, 124, 125, 126, 127, 7, 129, 130, 131, + 122, 123, 124, 125, 126, 127, 67, 129, 130, 131, 132, 133, 134, 135, 136, 137, 2, 3, 4, 5, 6, 143, 144, 145, 7, 11, 12, 153, 14, 31, 32, 33, 34, 35, 36, 37, 38, 39, 103, 41, 42, 43, 44, 67, 109, 152, 82, 112, 113, 114, - 115, 116, 117, 118, 77, 7, 79, 80, 102, 103, - 1, 47, 48, 8, 9, 10, 148, 53, 79, 55, + 115, 116, 117, 118, 8, 9, 10, 7, 102, 103, + 1, 47, 48, 31, 32, 33, 148, 53, 79, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 7, 67, 68, 69, 70, 8, 9, 10, 1, 75, + 7, 67, 68, 69, 70, 8, 9, 10, 149, 75, 76, 77, 77, 79, 8, 9, 10, 83, 8, 9, 10, 1, 146, 139, 128, 28, 152, 30, 31, 32, - 33, 34, 35, 12, 28, 79, 102, 12, 28, 7, + 33, 34, 35, 12, 28, 79, 102, 7, 28, 7, 30, 31, 32, 33, 34, 149, 112, 112, 113, 114, 115, 116, 117, 7, 120, 121, 35, 77, 149, 103, 130, 131, 153, 129, 130, 109, 132, 133, 134, 135, 136, 137, 138, 143, 118, 7, 146, 143, 144, 145, - 146, 7, 152, 29, 77, 151, 13, 153, 154, 152, + 146, 7, 152, 143, 7, 151, 146, 153, 154, 152, 156, 71, 72, 73, 74, 0, 1, 77, 50, 51, - 52, 81, 54, 78, 84, 85, 86, 87, 88, 89, + 52, 81, 54, 12, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 66, 95, 96, 97, 98, 99, 100, 101, 102, 143, 104, 105, 146, 148, 108, 7, 150, 111, 112, 113, 114, 8, 9, 10, 35, 119, 12, 148, 122, 123, 124, 125, 41, 42, 43, 44, - 45, 46, 47, 48, 49, 28, 149, 30, 31, 32, + 45, 46, 47, 48, 49, 28, 7, 30, 31, 32, 33, 155, 8, 9, 10, 35, 71, 13, 148, 149, - 150, 12, 77, 130, 131, 79, 81, 12, 82, 84, + 150, 13, 77, 130, 131, 79, 81, 12, 82, 84, 85, 86, 28, 88, 152, 90, 143, 92, 7, 146, 95, 8, 9, 10, 99, 100, 101, 102, 103, 104, - 105, 12, 148, 108, 109, 1, 111, 112, 113, 114, - 67, 28, 9, 10, 119, 7, 148, 122, 123, 124, - 125, 8, 9, 10, 35, 152, 8, 9, 10, 67, - 82, 28, 129, 29, 7, 29, 140, 141, 143, 7, - 7, 28, 29, 148, 149, 150, 28, 12, 30, 31, + 105, 12, 29, 108, 109, 1, 111, 112, 113, 114, + 7, 28, 67, 29, 119, 9, 10, 122, 123, 124, + 125, 8, 9, 10, 35, 148, 8, 9, 10, 67, + 82, 1, 129, 29, 28, 7, 140, 141, 143, 148, + 13, 28, 29, 148, 149, 150, 28, 12, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, - 52, 128, 54, 10, 1, 71, 148, 147, 8, 9, - 10, 77, 152, 15, 66, 81, 79, 139, 84, 85, - 86, 28, 88, 79, 90, 13, 92, 67, 28, 95, - 30, 31, 29, 99, 100, 101, 1, 148, 104, 105, - 123, 149, 108, 148, 67, 111, 112, 8, 9, 10, - 31, 32, 33, 119, 13, 12, 50, 51, 52, 8, - 9, 10, 8, 9, 29, 152, 147, 28, 151, 30, - 31, 32, 66, 67, 71, 47, 48, 49, 35, 28, - 77, 15, 148, 149, 81, 149, 148, 84, 85, 86, - 153, 88, 15, 90, 77, 92, 79, 153, 95, 47, + 52, 13, 54, 128, 1, 71, 148, 147, 8, 9, + 10, 77, 152, 146, 66, 81, 149, 139, 84, 85, + 86, 149, 88, 123, 90, 153, 92, 148, 28, 95, + 30, 31, 29, 99, 100, 101, 1, 77, 104, 105, + 152, 149, 108, 148, 67, 111, 112, 8, 9, 10, + 10, 151, 149, 119, 8, 9, 50, 51, 52, 8, + 9, 10, 148, 15, 29, 152, 147, 28, 28, 30, + 31, 32, 66, 67, 71, 47, 48, 49, 12, 28, + 77, 148, 148, 149, 81, 15, 149, 84, 85, 86, + 153, 88, 15, 90, 77, 92, 79, 15, 95, 47, 48, 49, 99, 100, 101, 1, 71, 104, 105, 149, - 148, 108, 77, 149, 111, 112, 81, 153, 12, 84, + 29, 108, 77, 153, 111, 112, 81, 15, 12, 84, 85, 86, 119, 88, 15, 90, 149, 92, 12, 112, - 95, 31, 32, 29, 99, 100, 101, 1, 15, 104, - 105, 35, 15, 108, 15, 29, 111, 112, 66, 67, - 143, 148, 149, 146, 119, 29, 8, 9, 10, 146, - 143, 28, 149, 146, 29, 29, 72, 73, 151, 29, - 153, 72, 73, 97, 98, 71, 28, 102, 103, 106, - 107, 77, 29, 148, 149, 81, 148, 149, 84, 85, - 86, 29, 88, 29, 90, 35, 92, 148, 149, 95, - 31, 148, 149, 99, 100, 101, 1, 71, 104, 105, - 54, 66, 108, 77, 67, 111, 112, 81, 67, 67, - 84, 85, 86, 119, 88, 67, 90, 68, 92, 74, - 67, 95, 67, 67, 67, 99, 100, 101, 77, 82, - 104, 105, 93, 89, 108, 77, 96, 111, 112, 77, - 79, 109, 148, 149, 79, 119, 82, 15, 16, 17, + 95, 28, 12, 29, 99, 100, 101, 1, 15, 104, + 105, 35, 29, 108, 78, 29, 111, 112, 31, 32, + 77, 148, 149, 80, 119, 35, 8, 9, 10, 29, + 143, 66, 67, 146, 29, 29, 72, 73, 151, 29, + 153, 72, 73, 97, 98, 71, 28, 102, 103, 148, + 149, 77, 29, 148, 149, 81, 106, 107, 84, 85, + 86, 31, 88, 35, 90, 54, 92, 148, 149, 95, + 66, 148, 149, 99, 100, 101, 1, 71, 104, 105, + 67, 67, 108, 77, 67, 111, 112, 81, 67, 67, + 84, 85, 86, 119, 88, 68, 90, 77, 92, 67, + 67, 95, 67, 74, 79, 99, 100, 101, 77, 93, + 104, 105, 86, 77, 108, 91, 79, 111, 112, 110, + 82, 82, 148, 149, 109, 119, 123, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, - 86, 91, 87, 94, 96, 94, 71, 94, 102, 102, - 94, 142, 77, 110, 148, 149, 81, 146, 142, 84, - 85, 86, 148, 88, 151, 90, 29, 92, 56, 57, - 95, -1, -1, -1, 99, 100, 101, -1, 126, 104, - 105, 123, 123, 108, 47, 48, 111, 112, 126, 128, - 53, 127, 55, 128, 119, 128, 128, -1, 129, 139, - -1, -1, 139, 146, 67, -1, -1, -1, 142, 47, - 48, -1, 75, 76, 142, 53, 79, 55, 142, 142, - 83, 142, 142, 148, 149, 147, 152, 146, 146, 67, - 146, 146, 146, 146, 151, -1, 148, 75, 76, 148, + 87, 89, 94, 94, 94, 94, 71, 102, 102, 142, + 96, 96, 77, 151, 148, 149, 81, 123, 139, 84, + 85, 86, 150, 88, 156, 90, 29, 92, 56, 57, + 95, 127, 129, 126, 99, 100, 101, -1, -1, 104, + 105, 139, 126, 108, 47, 48, 111, 112, 128, 128, + 53, 128, 55, 128, 119, 154, -1, -1, -1, 142, + 142, 142, -1, -1, 67, -1, 142, -1, 142, 47, + 48, 142, 75, 76, 142, 53, 79, 55, 147, 146, + 83, 151, 146, 148, 149, 146, 146, 146, 146, 67, + 146, 146, 149, 155, 148, 148, 148, 75, 76, 148, 128, 79, 148, 148, 148, 83, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, -1, 148, 148, 148, 148, 148, 148, 130, 148, 132, - 133, 134, 135, 136, 137, 138, 148, 150, 149, 149, - 149, 144, 145, 149, 149, 149, 154, 149, 151, 149, + 133, 134, 135, 136, 137, 138, 149, 149, 149, 149, + 149, 144, 145, 149, 149, 149, 153, 149, 151, 149, 153, 149, 130, 149, 132, 133, 134, 135, 136, 137, - 138, 149, 149, 149, 149, 149, 144, 145, 149, 151, + 138, 149, 149, 149, 154, 150, 144, 145, 150, 150, 150, 150, 155, 151, 150, 153, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, - 150, 150, 150, 150, 150, -1, 151, 151, 151, 151, + 150, 150, -1, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, - 151, 151, -1, 152, 152, 152, 152, 152, 152, 152, + -1, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, - 152, 152, 152, -1, -1, 154, -1, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, -1, 156 + 152, 152, -1, -1, -1, 155, 155, 155, 155, 155, + 155, 155, 155, 155, 155, 155, 155, 155 ); protected $actionBase = array( - 0, 220, 295, 109, 109, 180, 701, -2, -2, -2, - -2, -2, 135, 404, 505, 574, 505, 473, 606, 675, - 675, 675, 330, 389, 513, 513, 815, 225, 513, 328, - 359, 365, 586, 576, 221, 435, 435, 435, 435, 134, + 0, 220, 295, 109, 109, 180, 707, -2, -2, -2, + -2, -2, 135, 473, 606, 404, 606, 505, 574, 675, + 675, 675, 330, 389, 221, 221, 816, 536, 221, 365, + 291, 328, 586, 590, 576, 435, 435, 435, 435, 134, 134, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, @@ -454,57 +452,57 @@ class Php5 extends \PhpParser\ParserAbstract 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, - 435, 254, 179, 482, 511, 700, 702, 703, 704, 811, - 651, 812, 771, 772, 610, 773, 774, 775, 776, 777, - 770, 778, 757, 779, 418, 418, 418, 418, 418, 418, + 435, 384, 179, 427, 458, 718, 717, 715, 720, 812, + 651, 811, 770, 771, 551, 772, 773, 774, 775, 776, + 769, 777, 678, 778, 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, -3, 354, 383, 413, 206, - 524, 521, 521, 521, 521, 521, 521, 521, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 403, 618, 618, 618, 463, - 737, 603, 762, 762, 762, 762, 762, 762, 762, 762, + 516, 521, 521, 521, 521, 521, 521, 521, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 406, 618, 618, 618, 510, + 737, 573, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, 762, - 762, 762, 762, 762, 762, 470, -20, -20, 509, 639, - 327, 570, 210, 489, 197, 25, 25, 25, 25, 25, + 762, 762, 762, 762, 762, 470, -20, -20, 509, 630, + 327, 587, 210, 152, 197, 25, 25, 25, 25, 25, 17, 45, 5, 5, 5, 5, 712, 305, 305, 305, - 305, 118, 118, 118, 118, 794, 782, 781, 780, 303, - 303, 669, 669, 629, 734, 522, 522, 498, 498, 487, - 487, 487, 487, 487, 487, 487, 487, 487, 487, 387, - 156, 810, 130, 130, 130, 130, 243, 84, 207, 207, - 207, 663, 846, 243, 248, 248, 248, 476, 476, 476, - 76, 627, 296, 296, 545, 545, 545, 477, 477, 477, - 477, 483, 735, 644, 477, 477, 477, 430, 97, 434, - 620, 767, 648, 761, 508, 677, 96, 611, 657, 647, - 414, 569, 564, 543, 676, 406, 796, 407, 414, 254, - 523, 447, 626, 705, 432, 698, 193, 38, 343, 519, - 362, 137, 731, 696, 814, 813, 13, 665, 626, 626, - 626, 74, 348, 730, 736, 362, 273, 552, 552, 552, - 552, 793, 729, 552, 552, 552, 552, 792, 768, 408, - 268, 769, 232, 699, 638, 638, 642, 642, 638, 638, - 638, 638, 645, 630, 638, 805, 798, 798, 642, 641, - 642, 645, 630, 807, 807, 807, 807, 642, 630, 642, - 642, 638, 642, 798, 798, 630, 629, 798, 119, 630, - 662, 638, 652, 652, 807, 691, 688, 642, 642, 664, - 798, 798, 798, 664, 630, 807, 612, 678, 246, 798, - 807, 623, 641, 623, 612, 630, 623, 641, 641, 623, - 54, 632, 635, 806, 809, 801, 759, 659, 658, 800, - 797, 808, 803, 799, 605, 681, 706, 614, 579, 636, - 633, 617, 621, 679, 622, 661, 647, 682, 615, 615, - 615, 667, 616, 667, 615, 615, 615, 615, 615, 615, - 615, 615, 838, 666, 672, 668, 654, 728, 597, 687, - 656, 593, 744, 660, 681, 681, 790, 819, 826, 831, - 732, 631, 796, 821, 667, 845, 695, 168, 599, 758, - 791, 686, 685, 667, 683, 667, 742, 667, 818, 789, - 628, 788, 681, 787, 615, 817, 844, 843, 842, 841, - 840, 839, 832, 837, 637, 836, 720, 655, 825, 274, - 804, 676, 609, 684, 718, 433, 835, 786, 667, 667, - 740, 735, 667, 738, 717, 694, 829, 716, 824, 834, - 660, 823, 667, 646, 833, 433, 596, 625, 674, 619, - 715, 802, 816, 795, 756, 547, 536, 785, 634, 714, - 828, 827, 830, 713, 755, 468, 754, 650, 784, 753, - 613, 711, 766, 764, 820, 653, 682, 680, 643, 649, - 624, 752, 783, 822, 710, 709, 708, 760, 707, 727, + 305, 118, 118, 118, 118, 781, 780, 779, 764, 303, + 303, 643, 643, 627, 731, 522, 522, 498, 498, 487, + 487, 487, 487, 487, 487, 487, 487, 487, 487, 370, + 156, 802, 130, 130, 130, 130, 430, 430, 430, 243, + 84, 642, 608, 243, 248, 248, 248, 476, 476, 476, + 76, 638, 296, 296, 545, 545, 545, 342, 140, 140, + 140, 140, 337, 639, 543, 140, 407, 140, 140, 362, + 655, 761, 654, 760, 523, 669, 96, 673, 682, 733, + 646, 733, 569, 564, 550, 658, 373, 803, -6, 384, + 501, 447, 611, 714, 349, 710, 193, 38, 345, 519, + 59, 13, 730, 708, 810, 809, 74, 660, 611, 611, + 611, 232, 348, 729, 727, 59, 358, 565, 565, 565, + 565, 758, 734, 565, 565, 565, 565, 755, 785, 277, + 403, 759, 137, 711, 631, 631, 636, 636, 631, 631, + 631, 631, 625, 628, 631, 792, 801, 801, 636, 637, + 636, 625, 628, 602, 602, 602, 602, 636, 628, 636, + 636, 631, 636, 801, 801, 628, 627, 801, 67, 628, + 656, 631, 647, 647, 602, 704, 703, 636, 636, 644, + 801, 801, 801, 644, 628, 602, 615, 671, 268, 801, + 602, 583, 637, 583, 615, 628, 583, 637, 637, 583, + 54, 623, 632, 670, 798, 794, 683, 603, 634, 805, + 804, 808, 806, 799, 600, 685, 702, 701, 552, 633, + 613, 635, 621, 659, 622, 665, 646, 679, 604, 604, + 604, 661, 664, 661, 604, 604, 604, 604, 604, 604, + 604, 604, 842, 657, 607, 663, 626, 700, 572, 681, + 649, 540, 742, 619, 685, 685, 767, 820, 827, 750, + 641, 620, 803, 822, 661, 835, 706, 170, 518, 800, + 766, 680, 676, 661, 797, 661, 744, 661, 819, 768, + 617, 791, 685, 790, 604, 818, 841, 840, 839, 838, + 837, 836, 757, 834, 614, 833, 699, 653, 826, 274, + 807, 658, 672, 684, 698, 322, 832, 789, 661, 661, + 752, 728, 661, 753, 713, 705, 815, 695, 825, 831, + 619, 824, 661, 645, 830, 322, 610, 629, 813, 616, + 694, 793, 817, 795, 735, 547, 579, 788, 605, 688, + 829, 828, 814, 686, 736, 593, 738, 624, 787, 740, + 796, 716, 786, 612, 821, 648, 679, 666, 609, 650, + 652, 754, 784, 823, 687, 691, 696, 783, 709, 782, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -538,17 +536,17 @@ class Php5 extends \PhpParser\ParserAbstract -20, -20, -20, -20, 55, 55, 55, 55, 487, 487, 487, 487, 487, 487, 248, 248, 476, 476, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 487, 55, - 487, 638, 638, 638, 638, 638, 296, -6, -6, -6, - 296, 296, 638, 0, 0, 0, 0, 0, 0, 638, - 296, 0, 0, 638, 638, 638, 638, 638, 638, 638, - 638, -6, 296, 638, 638, 638, 798, 0, -6, 546, - 546, 546, 546, 433, 362, 0, 638, 638, 641, 0, - 0, 0, 0, 798, 0, 642, 0, 0, 0, 0, - 0, 615, 168, 0, 67, 0, 0, 0, 0, 0, - 0, 631, 67, 427, 427, 0, 637, 615, 615, 615, - 0, 0, 631, 631, 0, 0, 0, 0, 0, 0, - 322, 631, 0, 0, 0, 0, 322, 381, 0, 0, - 381, 0, 433 + 487, 631, 631, 631, 631, 637, 637, 637, 631, 296, + 296, 296, 631, 0, 0, 0, 0, 0, 0, 631, + 296, 0, 0, 631, 631, 631, 637, 631, 631, 631, + 631, 631, 296, 637, 631, 637, 631, 631, 801, 546, + 546, 546, 546, 322, 59, 0, 631, 631, 637, 637, + 637, 0, 0, 0, 801, 0, 636, 0, 0, 0, + 0, 604, 170, 0, 246, 0, 0, 0, 0, 0, + 0, 620, 246, 381, 381, 0, 614, 604, 604, 604, + 0, 0, 620, 620, 0, 0, 0, 0, 0, 0, + 428, 620, 0, 0, 0, 0, 428, 230, 0, 0, + 230, 0, 322 ); protected $actionDefault = array( @@ -582,13 +580,13 @@ class Php5 extends \PhpParser\ParserAbstract 344, 467, 468, 469, 470, 273, 273, 273, 273,32767, 32767, 528, 528,32767,32767, 329, 330, 456, 457,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 274,32767, 230, 230, 230, 230, 230,32767,32767,32767, + 274,32767, 230, 230, 230, 230,32767,32767,32767, 230, 32767,32767,32767,32767, 324, 325, 323, 451, 452, 450, 32767, 418,32767, 420,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767,32767,32767, 489,32767,32767, - 32767,32767,32767,32767,32767, 502, 407,32767,32767, 400, - 32767, 214, 216, 163, 475,32767,32767,32767,32767,32767, - 32767, 507, 334,32767,32767,32767,32767,32767, 544,32767, + 32767,32767,32767,32767,32767,32767,32767,32767,32767, 489, + 32767,32767,32767,32767,32767, 502, 407,32767,32767,32767, + 400,32767, 214, 216, 163, 475,32767,32767,32767,32767, + 32767, 507, 334,32767,32767,32767,32767,32767, 543,32767, 502,32767,32767,32767,32767,32767,32767, 347, 326, 327, 328,32767,32767,32767,32767, 506, 500, 459, 460, 461, 462,32767,32767, 453, 454, 455, 458,32767,32767,32767, @@ -606,7 +604,7 @@ class Php5 extends \PhpParser\ParserAbstract 364, 366,32767,32767, 405, 408,32767,32767,32767, 85, 110, 249,32767, 541, 85, 403,32767,32767, 297, 541, 32767,32767,32767,32767, 536,32767,32767, 291,32767,32767, - 32767, 85, 85, 245,32767, 165,32767, 526,32767, 543, + 32767, 85, 85, 245,32767, 165,32767, 526,32767, 542, 32767, 500, 404,32767, 331,32767,32767,32767,32767,32767, 32767,32767,32767,32767, 501,32767,32767,32767,32767, 221, 32767, 438,32767, 85,32767, 181,32767,32767, 295, 240, @@ -637,55 +635,57 @@ class Php5 extends \PhpParser\ParserAbstract 572, 572, 572, 572, 572, 572, 572, 572, 572, 572, 572, 572, 572, 572, 572, 572, 572, 572, 572, 572, 572, 572, 572, 572, 572, 572, 572, 572, 572, 572, - 572, 572, 572, 572, 572, 1105, 6, 1105, 1105, 1105, + 572, 572, 572, 572, 572, 1105, 757, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, - 636, 889, 889, 1196, 1196, 528, 1174, 168, 1174, 514, - 757, 514, 171, 172, 173, 387, 388, 389, 390, 167, + 636, 889, 889, 1196, 1196, 6, 1174, 168, 1174, 514, + 788, 514, 171, 172, 173, 387, 388, 389, 390, 167, 195, 199, 201, 249, 251, 253, 260, 261, 262, 263, 264, 265, 271, 272, 273, 274, 287, 288, 317, 318, 319, 393, 394, 395, 396, 169, 174, 246, 247, 175, - 176, 177, 502, 502, 502, 502, 502, 502, 553, 341, - 788, 577, 502, 502, 502, 502, 502, 502, 502, 502, + 176, 177, 502, 502, 502, 502, 502, 502, 528, 588, + 591, 633, 502, 502, 502, 502, 502, 502, 502, 502, 502, 502, 513, 635, 513, 386, 612, 547, 547, 578, 543, 585, 610, 794, 756, 545, 545, 501, 503, 534, 551, 579, 582, 592, 598, 875, 515, 855, 515, 659, - 819, 516, 884, 879, 571, 859, 571, 571, 571, 571, + 341, 516, 884, 879, 571, 819, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, 556, - 557, 558, 559, 560, 561, 562, 563, 565, 594, 1081, - 1080, 555, 519, 907, 1166, 527, 524, 524, 524, 450, - 452, 937, 638, 524, 548, 1106, 620, 935, 527, 527, - 1200, 1063, 363, 437, 437, 437, 437, 437, 437, 542, - 524, 323, 312, 437, 437, 437, 437, 437, 437, 437, + 557, 558, 559, 560, 561, 562, 563, 565, 594, 859, + 553, 555, 519, 577, 1200, 527, 524, 524, 524, 450, + 452, 937, 638, 907, 524, 1106, 620, 935, 527, 527, + 1207, 1207, 548, 437, 437, 437, 437, 437, 437, 542, + 524, 363, 1207, 437, 437, 437, 437, 437, 437, 437, 437, 437, 437, 1070, 602, 1070, 896, 896, 896, 896, - 896, 1154, 611, 540, 375, 661, 567, 896, 599, 872, - 886, 617, 871, 618, 882, 622, 623, 630, 632, 637, - 639, 853, 853, 853, 853, 781, 1206, 1206, 848, 854, - 468, 370, 370, 370, 945, 1193, 524, 524, 1206, 965, - 541, 573, 524, 524, 1207, 1207, 524, 1014, 1209, 1086, - 1066, 1067, 781, 781, 1063, 370, 1207, 1024, 17, 13, - 355, 893, 385, 525, 356, 342, 343, 1064, 1165, 1064, - 1173, 532, 1173, 552, 902, 544, 1065, 615, 566, 1190, - 1190, 1190, 1062, 624, 347, 397, 1188, 1188, 1188, 21, - 457, 777, 616, 369, 608, 619, 373, 911, 360, 775, - 647, 10, 401, 1172, 588, 591, 633, 1056, 916, 774, - 774, 785, 863, 782, 782, 782, 784, 953, 453, 773, - 595, 344, 403, 276, 277, 278, 1061, 583, 1151, 466, - 0, 0, 0, 0, 539, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1081, 1080, 357, 896, 1166, 616, 781, 896, 619, 532, + 1173, 360, 1173, 544, 370, 370, 370, 1190, 1190, 1190, + 1063, 1154, 853, 853, 853, 853, 323, 312, 457, 848, + 611, 854, 468, 781, 781, 370, 524, 524, 1172, 10, + 541, 573, 524, 524, 385, 540, 524, 661, 567, 1193, + 599, 872, 886, 617, 871, 618, 882, 622, 623, 630, + 632, 637, 639, 525, 368, 368, 368, 1206, 1206, 595, + 344, 403, 375, 552, 1014, 368, 368, 368, 893, 1206, + 276, 277, 278, 945, 1188, 1188, 1188, 368, 1221, 1209, + 774, 774, 965, 902, 782, 782, 782, 784, 1066, 1067, + 773, 347, 1063, 913, 521, 913, 342, 343, 369, 397, + 1086, 777, 373, 911, 775, 1064, 1165, 1064, 1024, 17, + 13, 356, 647, 401, 1065, 785, 1056, 953, 453, 916, + 583, 1151, 863, 466, 0, 539, 1061, 0, 0, 566, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 21, 0, 0, 0, 0, 608, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 521, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 518, 538, 0, 0, 0, 0, - 0, 0, 533, 0, 0, 0, 518, 0, 538, 0, + 0, 0, 0, 0, 0, 0, 518, 0, 538, 0, 0, 0, 0, 0, 0, 517, 0, 522, 440, 0, - 442, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 780, 1215 + 442, 0, 0, 0, 0, 0, 615, 0, 0, 0, + 0, 1062, 624, 0, 0, 780, 1214, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 533 ); protected $gotoCheck = array( @@ -704,91 +704,93 @@ class Php5 extends \PhpParser\ParserAbstract 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, - 115, 115, 115, 115, 115, 122, 92, 122, 122, 122, + 115, 115, 115, 115, 115, 122, 13, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, - 8, 72, 72, 72, 72, 96, 113, 25, 113, 115, - 13, 115, 25, 25, 25, 25, 25, 25, 25, 25, + 8, 72, 72, 72, 72, 92, 113, 25, 113, 115, + 27, 115, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, - 25, 25, 112, 112, 112, 112, 112, 112, 2, 67, - 27, 2, 112, 112, 112, 112, 112, 112, 112, 112, + 25, 25, 112, 112, 112, 112, 112, 112, 96, 58, + 58, 58, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 5, 112, 49, 49, 49, 49, 49, 49, 38, 38, 12, 12, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 12, 118, 12, 118, 12, - 48, 12, 12, 12, 55, 31, 55, 55, 55, 55, + 67, 12, 12, 12, 55, 48, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 105, - 105, 105, 105, 105, 105, 105, 105, 105, 105, 120, - 120, 45, 9, 79, 77, 45, 9, 9, 9, 7, - 7, 7, 7, 9, 104, 7, 7, 7, 45, 45, - 136, 77, 44, 55, 55, 55, 55, 55, 55, 9, - 9, 121, 121, 55, 55, 55, 55, 55, 55, 55, + 105, 105, 105, 105, 105, 105, 105, 105, 105, 31, + 2, 45, 9, 2, 136, 45, 9, 9, 9, 7, + 7, 7, 7, 79, 9, 7, 7, 7, 45, 45, + 138, 138, 104, 55, 55, 55, 55, 55, 55, 9, + 9, 44, 138, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 123, 55, 55, 55, 55, 55, - 55, 127, 47, 30, 46, 30, 30, 55, 30, 30, + 120, 120, 56, 55, 77, 59, 21, 55, 59, 56, + 114, 59, 114, 56, 119, 119, 119, 114, 114, 114, + 77, 127, 55, 55, 55, 55, 121, 121, 56, 55, + 47, 55, 55, 21, 21, 119, 9, 9, 114, 56, + 9, 9, 9, 9, 119, 30, 9, 30, 30, 134, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 55, 55, 55, 55, 21, 137, 137, 55, 55, - 55, 119, 119, 119, 92, 134, 9, 9, 137, 96, - 9, 9, 9, 9, 138, 138, 9, 97, 137, 32, - 77, 77, 21, 21, 77, 119, 138, 32, 32, 32, - 32, 74, 119, 9, 56, 67, 67, 77, 77, 77, - 114, 56, 114, 9, 76, 56, 77, 11, 32, 114, - 114, 114, 11, 11, 16, 20, 8, 8, 8, 32, - 56, 23, 59, 10, 32, 59, 15, 80, 59, 22, - 69, 56, 19, 114, 58, 58, 58, 108, 81, 21, - 21, 24, 66, 21, 21, 21, 21, 94, 61, 21, - 65, 65, 65, 63, 63, 63, 110, 62, 126, 103, - -1, -1, -1, -1, 8, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 30, 30, 30, 9, 11, 11, 11, 137, 137, 65, + 65, 65, 46, 9, 97, 11, 11, 11, 74, 137, + 63, 63, 63, 92, 8, 8, 8, 11, 11, 137, + 21, 21, 96, 76, 21, 21, 21, 21, 77, 77, + 21, 16, 77, 11, 11, 11, 67, 67, 10, 20, + 32, 23, 15, 80, 22, 77, 77, 77, 32, 32, + 32, 32, 69, 19, 77, 24, 108, 94, 61, 81, + 62, 126, 66, 103, -1, 8, 110, -1, -1, 32, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 32, -1, -1, -1, -1, 32, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 8, 8, -1, -1, -1, -1, - -1, -1, 96, -1, -1, -1, 8, -1, 8, -1, + -1, -1, -1, -1, -1, -1, 8, -1, 8, -1, -1, -1, -1, -1, -1, 8, -1, 8, 8, -1, - 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 8, 8 + 8, -1, -1, -1, -1, -1, 11, -1, -1, -1, + -1, 11, 11, -1, -1, 8, 8, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 96 ); protected $gotoBase = array( - 0, 0, -384, 0, 0, 261, 0, 366, 188, 42, - 172, 25, 282, 208, 109, 159, 174, 0, 0, 107, - 170, 115, 161, 175, 103, 7, 0, 252, 0, 0, - -228, 287, 44, 0, 0, 0, 0, 0, 245, 0, - 0, -22, 0, 0, 344, 339, 124, 132, 284, -4, - 0, 0, 0, 0, 0, 104, 46, 0, 211, 39, - 0, 85, 84, -132, 0, 202, 102, -187, 0, 151, - 0, 0, -78, 0, 165, 0, 171, 27, 0, 340, - 149, 99, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 144, 0, 106, 0, 166, 156, 0, 0, - 0, 0, 0, 75, 349, 307, 0, 0, 100, 0, - 114, 0, -27, -93, 181, -90, 0, 0, -3, 133, - 50, 70, -45, 201, 0, 0, 80, 207, 0, 0, - 0, 0, 0, 0, 163, 0, 352, 125, 143, 0, - 0, 0 + 0, 0, -282, 0, 0, 261, 0, 366, 188, 42, + 186, 164, 282, 154, 109, 175, 191, 0, 0, 128, + 194, 96, 176, 195, 117, 7, 0, 202, 0, 0, + -186, 341, 105, 0, 0, 0, 0, 0, 245, 0, + 0, -22, 0, 0, 353, 339, 192, 160, 289, -4, + 0, 0, 0, 0, 0, 104, -16, 0, -44, -48, + 0, 95, 87, -175, 0, 150, 122, -146, 0, 173, + 0, 0, -78, 0, 179, 0, 190, 75, 0, 350, + 172, 120, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 193, 0, 116, 0, 219, 183, 0, 0, + 0, 0, 0, 79, 357, 307, 0, 0, 119, 0, + 124, 0, -27, -93, 121, -90, 0, 0, -3, 118, + 103, 115, -45, 201, 0, 0, 83, 227, 0, 0, + 0, 0, 0, 0, 177, 0, 336, 166, 69, 0, + 0 ); protected $gotoDefault = array( -32768, 470, 670, 2, 671, 742, 750, 605, 484, 485, - 520, 521, 857, 795, 796, 365, 411, 486, 364, 398, + 520, 1184, 857, 795, 796, 365, 411, 486, 364, 398, 391, 783, 776, 778, 786, 166, 399, 789, 1, 791, - 526, 827, 1015, 351, 799, 352, 597, 801, 536, 803, + 526, 827, 1015, 352, 799, 353, 597, 801, 536, 803, 804, 132, 366, 367, 537, 487, 374, 586, 818, 266, - 371, 820, 353, 821, 830, 354, 467, 462, 568, 614, + 371, 820, 354, 821, 830, 355, 467, 462, 568, 614, 432, 449, 580, 275, 546, 575, 862, 340, 870, 650, 878, 881, 488, 569, 892, 454, 900, 1091, 381, 906, 912, 917, 920, 412, 400, 593, 924, 925, 5, 929, 628, 629, 944, 300, 952, 606, 966, 417, 1034, 1036, 489, 490, 530, 461, 512, 535, 491, 1057, 443, 402, 1060, 492, 493, 433, 434, 1078, 1075, 346, 1159, 345, - 451, 311, 1146, 589, 1110, 458, 1199, 1155, 337, 494, - 495, 361, 1178, 376, 1194, 438, 1201, 1208, 333, 368, - 550, 576 + 451, 311, 1146, 589, 1110, 458, 1199, 1155, 339, 494, + 495, 361, 1178, 376, 1194, 438, 1201, 1208, 333, 550, + 576 ); protected $ruleToNonTerminal = array( @@ -846,8 +848,8 @@ class Php5 extends \PhpParser\ParserAbstract 131, 131, 131, 119, 119, 119, 119, 105, 105, 120, 120, 120, 120, 72, 133, 133, 134, 134, 134, 104, 104, 135, 135, 136, 136, 136, 136, 121, 121, 121, - 121, 138, 139, 140, 137, 137, 137, 137, 137, 137, - 137, 141, 141, 141 + 121, 138, 139, 137, 137, 137, 137, 137, 137, 137, + 140, 140, 140 ); protected $ruleToLength = array( @@ -905,8 +907,8 @@ class Php5 extends \PhpParser\ParserAbstract 6, 4, 4, 4, 4, 1, 4, 0, 1, 1, 3, 1, 1, 4, 3, 1, 1, 1, 0, 0, 2, 3, 1, 3, 1, 4, 2, 2, 2, 1, - 2, 1, 1, 1, 1, 4, 3, 3, 3, 6, - 3, 1, 1, 1 + 2, 1, 1, 1, 4, 3, 3, 3, 6, 3, + 1, 1, 1 ); protected function reduceRule0() { @@ -1255,7 +1257,7 @@ class Php5 extends \PhpParser\ParserAbstract } protected function reduceRule86() { - $this->semValue = ($this->useConsistentVariableNodes ? new Expr\Variable(substr($this->semStack[$this->stackPos-(1-1)], 1), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes) : substr($this->semStack[$this->stackPos-(1-1)], 1)); + $this->semValue = new Expr\Variable(substr($this->semStack[$this->stackPos-(1-1)], 1), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); } protected function reduceRule87() { @@ -1891,7 +1893,7 @@ class Php5 extends \PhpParser\ParserAbstract } protected function reduceRule244() { - $this->semValue = new Expr\Variable(substr($this->semStack[$this->stackPos-(1-1)], 1), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); + $this->semValue = $this->semStack[$this->stackPos-(1-1)]; } protected function reduceRule245() { @@ -2987,7 +2989,7 @@ class Php5 extends \PhpParser\ParserAbstract } protected function reduceRule515() { - $this->semValue = new Expr\Variable(substr($this->semStack[$this->stackPos-(1-1)], 1), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); + $this->semValue = $this->semStack[$this->stackPos-(1-1)]; } protected function reduceRule516() { @@ -3095,50 +3097,46 @@ class Php5 extends \PhpParser\ParserAbstract } protected function reduceRule542() { - $this->semValue = new Expr\Variable(substr($this->semStack[$this->stackPos-(1-1)], 1), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule543() { $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); } - protected function reduceRule544() { + protected function reduceRule543() { $this->semValue = $this->semStack[$this->stackPos-(1-1)]; } - protected function reduceRule545() { + protected function reduceRule544() { $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); } - protected function reduceRule546() { + protected function reduceRule545() { $this->semValue = new Expr\PropertyFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); } + protected function reduceRule546() { + $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); + } + protected function reduceRule547() { $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); } protected function reduceRule548() { - $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule549() { $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(6-2)], $this->semStack[$this->stackPos-(6-4)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes); } - protected function reduceRule550() { + protected function reduceRule549() { $this->semValue = $this->semStack[$this->stackPos-(3-2)]; } - protected function reduceRule551() { + protected function reduceRule550() { $this->semValue = new Scalar\String_($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); } - protected function reduceRule552() { + protected function reduceRule551() { $this->semValue = $this->parseNumString($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); } - protected function reduceRule553() { - $this->semValue = new Expr\Variable(substr($this->semStack[$this->stackPos-(1-1)], 1), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); + protected function reduceRule552() { + $this->semValue = $this->semStack[$this->stackPos-(1-1)]; } } diff --git a/lib/PhpParser/Parser/Php7.php b/lib/PhpParser/Parser/Php7.php index 773ccd95..b4c514f9 100644 --- a/lib/PhpParser/Parser/Php7.php +++ b/lib/PhpParser/Parser/Php7.php @@ -234,102 +234,102 @@ class Php7 extends \PhpParser\ParserAbstract protected $action = array( 572, 573, 574, 575, 576, 215, 577, 578, 579, 615, - 616, 478, 27, 99, 100, 101, 102, 103, 104, 105, + 616, 1011, 27, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110,-32766,-32766,-32766, 95, 96, - 97, 275, 239, 0, -269,-32766,-32766,-32766, -473, -474, - 1057, 649, 1060, 1058, 98,-32766, 25,-32766,-32766,-32766, + 97, 0, 239, 275, -269,-32766,-32766,-32766,-32766,-32766, + -32766, 649, 25, 114, 98,-32766, 116,-32766,-32766,-32766, -32766,-32766, 580, 876, 878,-32766,-32766,-32766,-32766,-32766, -32766,-32766,-32766, 224,-32766, 719, 581, 582, 583, 584, - 585, 586, 587,-32766, 116, 647, 845, 846, 847, 844, + 585, 586, 587,-32766, 346, 647, 845, 846, 847, 844, 843, 842, 588, 589, 590, 591, 592, 593, 594, 595, 596, 597, 598, 618, 619, 620, 621, 622, 610, 611, 612, 613, 614, 599, 600, 601, 602, 603, 604, 605, 641, 642, 643, 644, 645, 646, 606, 607, 608, 609, - 639, 630, 628, 629, 625, 626, 769, 617, 623, 624, + 639, 630, 628, 629, 625, 626, 286, 617, 623, 624, 631, 632, 634, 633, 635, 636, 42, 43, 388, 44, 45, 627, 638, 637, -216, 46, 47, 958, 48,-32767, - -32767,-32767,-32767, 90, 91, 92, 93, 94, 269, 440, + -32767,-32767,-32767, 90, 91, 92, 93, 94, 269, 71, 22, 845, 846, 847, 844, 843, 842, 837,-32766,-32766, - -32766, 1048, 1008, 349, 1047, 120, 974, 346, -428, 248, - 802, 49, 50, -473, -474, -473, -474, 51,-32766, 52, + -32766, 653, 1008, 350, 1047, 120, 974, 440, -428, 248, + 802, 49, 50, 665, 666, 266, 7, 51,-32766, 52, 219, 220, 53, 54, 55, 56, 57, 58, 59, 60, 1026, 22, 232, 61, 354, 951,-32766,-32766,-32766, 975, - 976, 650, 710, 1008, 216, -463, 988, 974,-32766,-32766, - -32766, 720, 402, 403, 365, 1008,-32766, 540,-32766,-32766, - -32766,-32766, 24, 222,-32766,-32766, 362, 286,-32766, -428, - -32766,-32766,-32766, 1011, 65, 770, 412, 266, -164, 258, - 1008, 226, 248, -428, 400, 401, 241, 522, 951, 28, - -428, 718, -431, 402, 403, 128, 980, 981, 982, 983, - 977, 978, 243, 131, -427, -426, 649, 413, 984, 979, - 359, 796, 797, 118, 970, 63, 112, 255, 7, 256, - 258, 389, -124, -124, -124, -4, 720, 390, 650, 117, - 40, 709, 258, -221, 33, 17, 391, -124, 392, -124, - 393, -124, 394, -124, 664, 395, -124, -124, -124, 34, - 35, 355, 356, 523, 36, 396, 359, 258, 62, 111, - 823, 287, 288, 397, 398, -427, -426, 130, 351, 399, - 38, -426, 695, 740, 357, 358, -240, 22, 122, -427, + 976, 650, 710, 1008, 216, -463, 478, 974,-32766,-32766, + -32766, 720, 402, 403, 226, 1008,-32766, 340,-32766,-32766, + -32766,-32766, 24, 222, 988, 241, 362, 349,-32766, -428, + -32766,-32766,-32766, -240, 65, 1056, 412, 365, 1057, 259, + 540, 28, 248, -428, 400, 401, 128, 522, 951, 131, + -428, 118, -431, 402, 403, 112, 980, 981, 982, 983, + 977, 978, 243, 117, -427, -426, 649, 413, 984, 979, + 359, 796, 797, 111, 970, 63, 130, 255, 352, 256, + 259, 389, -124, -124, -124, -4, 720, 390, 650, 124, + 40, 709, 259, -221, 33, 17, 391, -124, 392, -124, + 393, -124, 394, -124, 707, 395, -124, -124, -124, 34, + 35, 355, 356, 523, 36, 396, 359, 819, 62, 718, + 823, 287, 288, 397, 398, -427, -426, 351, -164, 399, + 38, -426, 695, 740, 357, 358, -465, 22, 122, -427, -426,-32766,-32766,-32766, 796, 797, -427, -426, -430, 1008, -463, 247, 1008, 974, 413, 41, 389, 359, 722, 538, - -124,-32766, 390,-32766,-32766, 290, 709, 665, 666, 33, - 17, 391, 115, 392, 21, 393, 353, 394, -465, 350, - 395, 71, 951, -164, 34, 35, 355, 356, 338, 36, + -124,-32766, 390,-32766,-32766, 290, 709, -473, 664, 33, + 17, 391, 115, 392, -474, 393, 291, 394, -240, 224, + 395, 353, 951, 21, 34, 35, 355, 356, 338, 36, 396, 246, -426, 62, 254, 720, 287, 288, 397, 398, 403,-32766,-32766,-32766, 399, 958, -426, 657, 740, 357, - 358, 340, 113, -426, -163, 375, 72, 73, 74, 819, - 352, 65, 121, 544, 224, 124, 258, 259, 272, 258, - 92, 93, 94, 722, 538, -4, 26, 291, 75, 76, + 358, 375, 113, -426, -163, -82, 72, 73, 74, 818, + 769, 65, 121, 544, 1008, 242, 259, 555, 272, 259, + 92, 93, 94, 722, 538, -4, 26, 733, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, - 97, -82, 239, 242, 720, 389, 555,-32766,-32766,-32766, - 550, 390, 114, 16, 98, 709, 127, 298, 33, 17, - 391, -240, 392, 1008, 393, 126, 394, 119, 369, 395, - 498, 18, 545, 34, 35, 355, 720, 276, 36, 396, - 1027, 733, 62, 509, 510, 287, 288, 383, 6, 494, - 495, 665, 666, 399, 796, 797, 951, 225, 223, 803, - 707, 944, 221, -465, 551, 658, 541, 347, 822, 566, - 834, 556, 239, 98, 389, 376, 120, 39, 125, 517, - 390, 850, 756, 538, 709, 651, 650, 33, 17, 391, - 649, 392, 461, 393, 653, 394, 1059, 504, 395, -163, - 258, 818, 34, 35, 355, 720, 389, 36, 396, 532, - -32766, 62, 390, 444, 287, 288, 709, 499, 706, 33, - 17, 391, 399, 392, 449, 393, 503, 394, 518, 271, - 395, 363, 513, 542, 34, 35, 355, 720, 214, 36, - 396, -80, 10, 62, 368, 565, 287, 288, 493, 742, - 274, 722, 538, 932, 399, 741, 990, 0, 325, 0, - 267, 0, 0, 3, 987, 543, 0, 268, 0, 0, + 97, 550, 239, 126, 720, 389,-32766,-32766, 258, 498, + 18, 390, 16, -164, 98, 709, 127, 298, 33, 17, + 391, -465, 392, 1008, 393, 119, 394, 509, 510, 395, + 276, 120, 545, 34, 35, 355, 720, 225, 36, 396, + 1027, 259, 62, 796, 797, 287, 288, 383, 6, 494, + 495, 223, -473, 399, -473, 221, 951, 706, 239, -474, + 98, -474, 665, 666, 551, 517, 944, 347, 803, 369, + 651, 376, 658, 541, 389, 822, 566, 834, 556, 770, + 390, 39, 756, 538, 709, 125, 650, 33, 17, 391, + 649, 392, 1058, 393, 850, 394, 653, 461, 395, -163, + 259, 518, 34, 35, 355, 720, 389, 36, 396, 444, + -32766, 62, 390, 499, 287, 288, 709, 449, 532, 33, + 17, 391, 399, 392, 10, 393, 503, 394, -80, 742, + 395, 214, 368, 542, 34, 35, 355, 720, 504, 36, + 396, 513, 363, 62, 741, 493, 287, 288, 274, 271, + 267, 722, 538, 3, 399, 735, 264, 250, 0, 268, + 0, 0, 990, 0, 987, 543, 0, 0, 0, 0, 0, 0, 0, 0, 0, 389, 0, 0, 0, 0, - 0, 390, 0, 722, 538, 709, 227, 9, 33, 17, - 391, 289, 392, -385, 393, 264, 394, 497, 320, 395, + 0, 390, 0, 722, 538, 709, 227, 325, 33, 17, + 391, 9, 392, 289, 393, -385, 394, 265, 320, 395, 321, 341, 365, 34, 35, 355, 720, 389, 36, 396, - 342, 310, 62, 390, 446, 287, 288, 709, 22, 735, + 342, 310, 62, 390, 446, 287, 288, 709, 22, 565, 33, 17, 391, 399, 392, 564, 393, 663, 394, 32, 1008, 395, 827, 31, 974, 34, 35, 355, 703, 704, 36, 396, 717, 705, 62, 829, 716, 287, 288, 826, 662, 661, 722, 538, 700, 399, 772, 757, 763, 764, - 828, 698, 754, 951, 752, 830, 711, 708, -397, 265, - 336, 337, 562, 561, 559, 539, 389, 546, 548, 549, - 402, 403, 390, 553, 722, 538, 709, 554, 557, 33, - 17, 391, 660, 392, 1056, 393, 1054, 394, 835, 696, - 395, 339, 65, 659, 34, 35, 355, 258, 1055, 36, + 828, 698, 754, 951, 752, 830, 711, 708, 932, 336, + 337, 562, 561, 559, 539, 546, 389, 548, 549, 553, + 402, 403, 390, 554, 722, 538, 709, 557, 339, 33, + 17, 391, 660, 392, 1055, 393, 1053, 394, 835, 696, + 395, 270, 65, 659, 34, 35, 355, 259, 1054, 36, 396, 729, 938, 62, 668, 667, 287, 288,-32766,-32766, - -32766, 736, 727, 762, 399, 670, 669, 1053, 1009, 1002, + -32766, 736, 727, 762, 399, 670, 669, 1052, 1009, 1002, 1016, 1021, 1024, 761, 940, 737, 558, 738,-32766, 739, -32766,-32766,-32766,-32766,-32766,-32766,-32767,-32767,-32767,-32767, - -32767, 939, 250, 722, 538, 270, 1015, 238, 237, 236, - 235, 218, 217, 132, 129, 123, 345, -453, -431, 70, - -430, 69, 68, -429, 20, -455, 67, 23, 29, 66, - 64, 37, 30, 0, 297, 19, 15, 11, 489, 531, - -219, 919, 916, 915, 476, -217, 471, 972, 962, 528, - 386, 382, 381, 377, 14, 13, 12, -216, 0, 0, - 1051, 1000, 1001, 971, 0, 989 + -32767, 939, 297, 722, 538, 238, -397, 237, 236, 235, + 218, 217, 132, 129, 123, 345, -453, -431, 70, -430, + 69, 68, -429, 20, -455, 67, 23, 29, 66, 64, + 37, 30, 0, 19, 15, 11, 489, 531, -219, 919, + 916, 915, 476, -217, 471, 972, 962, 528, 386, 382, + 381, 377, 14, 13, 12, -216, 0, 0, 497, 1015, + 1050, 1000, 1001, 971, 0, 989 ); protected $actionCheck = array( 2, 3, 4, 5, 6, 13, 8, 9, 10, 11, - 12, 48, 15, 16, 17, 18, 19, 20, 21, 22, + 12, 1, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 8, 9, 10, 50, 51, - 52, 7, 54, 0, 79, 8, 9, 10, 7, 7, - 77, 77, 79, 80, 66, 28, 7, 30, 31, 32, + 52, 0, 54, 7, 79, 8, 9, 10, 8, 9, + 10, 77, 7, 13, 66, 28, 7, 30, 31, 32, 33, 34, 54, 56, 57, 28, 8, 30, 31, 32, 33, 34, 35, 35, 109, 1, 68, 69, 70, 71, 72, 73, 74, 118, 7, 77, 112, 113, 114, 115, @@ -337,89 +337,89 @@ class Php7 extends \PhpParser\ParserAbstract 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, - 122, 123, 124, 125, 126, 127, 29, 129, 130, 131, + 122, 123, 124, 125, 126, 127, 7, 129, 130, 131, 132, 133, 134, 135, 136, 137, 2, 3, 4, 5, 6, 143, 144, 145, 152, 11, 12, 1, 14, 41, - 42, 43, 44, 45, 46, 47, 48, 49, 109, 82, + 42, 43, 44, 45, 46, 47, 48, 49, 109, 149, 67, 112, 113, 114, 115, 116, 117, 118, 8, 9, - 10, 79, 79, 7, 82, 147, 83, 7, 67, 28, - 152, 47, 48, 152, 152, 154, 154, 53, 28, 55, + 10, 79, 79, 7, 82, 147, 83, 82, 67, 28, + 152, 47, 48, 102, 103, 7, 7, 53, 28, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 1, 67, 68, 69, 70, 112, 8, 9, 10, 75, - 76, 77, 148, 79, 13, 7, 139, 83, 8, 9, - 10, 1, 129, 130, 146, 79, 28, 149, 30, 31, - 32, 33, 140, 141, 8, 9, 102, 7, 28, 128, - 30, 31, 32, 1, 151, 148, 112, 7, 7, 156, - 79, 7, 28, 142, 120, 121, 7, 77, 112, 13, - 149, 29, 151, 129, 130, 15, 132, 133, 134, 135, + 76, 77, 148, 79, 13, 7, 48, 83, 8, 9, + 10, 1, 129, 130, 7, 79, 28, 146, 30, 31, + 32, 33, 140, 141, 139, 7, 102, 7, 28, 128, + 30, 31, 32, 7, 151, 77, 112, 146, 80, 156, + 149, 13, 28, 142, 120, 121, 15, 77, 112, 15, + 149, 15, 151, 129, 130, 15, 132, 133, 134, 135, 136, 137, 138, 15, 67, 67, 77, 143, 144, 145, 146, 130, 131, 15, 1, 151, 15, 153, 7, 155, 156, 71, 72, 73, 74, 0, 1, 77, 77, 15, 67, 81, 156, 152, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 148, 95, 96, 97, 98, 99, - 100, 101, 102, 143, 104, 105, 146, 156, 108, 15, - 150, 111, 112, 113, 114, 128, 128, 15, 7, 119, + 100, 101, 102, 143, 104, 105, 146, 148, 108, 29, + 150, 111, 112, 113, 114, 128, 128, 7, 7, 119, 67, 67, 122, 123, 124, 125, 7, 67, 149, 142, 142, 8, 9, 10, 130, 131, 149, 149, 151, 79, 152, 128, 79, 83, 143, 7, 71, 146, 148, 149, - 150, 28, 77, 30, 31, 142, 81, 102, 103, 84, - 85, 86, 149, 88, 7, 90, 7, 92, 7, 7, - 95, 149, 112, 152, 99, 100, 101, 102, 103, 104, + 150, 28, 77, 30, 31, 142, 81, 7, 148, 84, + 85, 86, 149, 88, 7, 90, 7, 92, 152, 35, + 95, 7, 112, 7, 99, 100, 101, 102, 103, 104, 105, 128, 128, 108, 109, 1, 111, 112, 113, 114, 130, 8, 9, 10, 119, 1, 142, 122, 123, 124, - 125, 146, 149, 149, 7, 29, 8, 9, 10, 148, - 7, 151, 149, 29, 35, 15, 156, 67, 143, 156, - 47, 48, 49, 148, 149, 150, 28, 7, 30, 31, + 125, 29, 149, 149, 7, 29, 8, 9, 10, 148, + 29, 151, 149, 29, 79, 29, 156, 29, 143, 156, + 47, 48, 49, 148, 149, 150, 28, 35, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, - 52, 29, 54, 29, 1, 71, 29, 8, 9, 10, - 29, 77, 13, 152, 66, 81, 97, 98, 84, 85, - 86, 152, 88, 79, 90, 29, 92, 29, 128, 95, - 72, 73, 29, 99, 100, 101, 1, 33, 104, 105, - 152, 35, 108, 72, 73, 111, 112, 102, 103, 106, - 107, 102, 103, 119, 130, 131, 112, 35, 35, 152, - 148, 152, 35, 152, 29, 148, 149, 123, 148, 149, - 148, 149, 54, 66, 71, 149, 147, 67, 67, 74, - 77, 79, 148, 149, 81, 77, 77, 84, 85, 86, - 77, 88, 78, 90, 79, 92, 80, 96, 95, 152, - 156, 148, 99, 100, 101, 1, 71, 104, 105, 89, - 82, 108, 77, 82, 111, 112, 81, 87, 148, 84, - 85, 86, 119, 88, 86, 90, 93, 92, 91, 110, - 95, 102, 96, 29, 99, 100, 101, 1, 94, 104, - 105, 94, 94, 108, 94, 148, 111, 112, 109, 123, - 126, 148, 149, 153, 119, 123, 139, -1, 146, -1, - 126, -1, -1, 142, 139, 29, -1, 127, -1, -1, + 52, 29, 54, 29, 1, 71, 8, 9, 67, 72, + 73, 77, 152, 152, 66, 81, 97, 98, 84, 85, + 86, 152, 88, 79, 90, 29, 92, 72, 73, 95, + 33, 147, 29, 99, 100, 101, 1, 35, 104, 105, + 152, 156, 108, 130, 131, 111, 112, 102, 103, 106, + 107, 35, 152, 119, 154, 35, 112, 148, 54, 152, + 66, 154, 102, 103, 29, 74, 152, 123, 152, 128, + 77, 149, 148, 149, 71, 148, 149, 148, 149, 148, + 77, 67, 148, 149, 81, 67, 77, 84, 85, 86, + 77, 88, 80, 90, 79, 92, 79, 78, 95, 152, + 156, 91, 99, 100, 101, 1, 71, 104, 105, 82, + 82, 108, 77, 87, 111, 112, 81, 86, 89, 84, + 85, 86, 119, 88, 94, 90, 93, 92, 94, 123, + 95, 94, 94, 29, 99, 100, 101, 1, 96, 104, + 105, 96, 102, 108, 123, 109, 111, 112, 126, 110, + 126, 148, 149, 142, 119, 147, 149, 152, -1, 127, + -1, -1, 139, -1, 139, 29, -1, -1, -1, -1, -1, -1, -1, -1, -1, 71, -1, -1, -1, -1, - -1, 77, -1, 148, 149, 81, 35, 142, 84, 85, - 86, 142, 88, 142, 90, 149, 92, 154, 146, 95, + -1, 77, -1, 148, 149, 81, 35, 146, 84, 85, + 86, 142, 88, 142, 90, 142, 92, 149, 146, 95, 146, 146, 146, 99, 100, 101, 1, 71, 104, 105, - 146, 146, 108, 77, 146, 111, 112, 81, 67, 147, + 146, 146, 108, 77, 146, 111, 112, 81, 67, 148, 84, 85, 86, 119, 88, 148, 90, 148, 92, 148, 79, 95, 148, 148, 83, 99, 100, 101, 148, 148, 104, 105, 148, 148, 108, 148, 148, 111, 112, 148, 148, 148, 148, 149, 148, 119, 148, 148, 148, 148, 148, 148, 148, 112, 148, 148, 148, 148, 153, 149, 149, 149, 149, 149, 149, 149, 71, 149, 149, 149, - 129, 130, 77, 149, 148, 149, 81, 149, 149, 84, + 129, 130, 77, 149, 148, 149, 81, 149, 151, 84, 85, 86, 150, 88, 150, 90, 150, 92, 150, 150, 95, 151, 151, 150, 99, 100, 101, 156, 150, 104, 105, 150, 150, 108, 150, 150, 111, 112, 8, 9, 10, 150, 150, 150, 119, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 28, 150, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 40, 150, 152, 148, 149, 151, 154, 151, 151, 151, + 40, 150, 152, 148, 149, 151, 153, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, - 151, 151, 151, -1, 152, 152, 152, 152, 152, 152, + 151, 151, -1, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, - 152, 152, 152, 152, 152, 152, 152, 152, -1, -1, + 152, 152, 152, 152, 152, 152, -1, -1, 154, 154, 154, 154, 154, 154, -1, 155 ); protected $actionBase = array( 0, 220, 295, 283, 180, 582, -2, -2, -2, -2, -36, 606, 473, 505, 473, 574, 404, 675, 675, 675, - 28, 399, 497, 497, 484, 497, 468, 493, 492, 134, + 28, 354, 490, 490, 489, 490, 466, 486, 472, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, @@ -430,47 +430,47 @@ class Php7 extends \PhpParser\ParserAbstract 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, - 134, 134, 134, 97, 64, 246, 568, 670, 709, 714, - 704, 705, 514, 702, 710, 201, 647, 648, 466, 649, - 650, 651, 652, 706, 513, 703, 707, 418, 418, 418, + 134, 134, 134, 401, 64, 238, 568, 475, 707, 712, + 702, 703, 507, 670, 708, 201, 647, 648, 444, 649, + 650, 651, 652, 704, 724, 701, 705, 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, - 418, 418, 418, 48, 469, 226, 403, 403, 403, 403, + 418, 418, 418, 48, 30, 468, 403, 403, 403, 403, 403, 403, 403, 403, 403, 403, 403, 403, 403, 403, 403, 403, 403, 403, 403, 160, 160, 160, 343, 210, 208, 198, 17, 274, 27, 780, 780, 780, 780, 780, 108, 108, 108, 108, 621, 621, 93, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 659, 657, 655, 654, 414, 393, 393, 151, 151, 151, 151, 146, - -45, 224, 224, 77, 487, 730, 199, 199, 394, 111, - 207, -22, -22, -22, 275, 501, 92, 92, 242, -37, - 274, 274, 233, 274, 419, 419, 419, 221, 221, 221, - 221, 221, 78, 498, 221, 221, 221, 471, 653, 390, - 506, 643, 273, 32, 31, 525, 534, 171, 499, 171, - 171, 171, 413, 428, 441, 521, 679, 396, 97, 474, - 392, 488, 589, 166, 573, 440, 382, 370, 387, 331, - 516, 572, 712, 417, 711, 358, 488, 488, 488, 377, - 590, 591, 339, -8, 646, 592, 241, 415, 381, 645, - 635, 423, 634, 281, 379, 571, 479, 479, 483, 483, - 479, 479, 479, 479, 472, 476, 479, 693, 693, 483, - 485, 483, 472, 476, 700, 483, 476, 483, 483, 479, - 483, 693, 476, 476, 504, 479, 494, 494, 483, 483, - 510, 693, 693, 510, 476, 547, 467, 509, 542, 444, - 485, 444, 509, 476, 444, 485, 444, 33, 699, 698, - 442, 695, 697, 691, 620, 690, 596, 502, 496, 681, - 680, 688, 701, 696, 232, 538, 549, 314, 271, 491, - 480, 692, 499, 526, 477, 477, 477, 480, 687, 477, - 477, 477, 477, 477, 477, 477, 477, 729, 39, 519, - 508, 560, 561, 564, 284, 565, 535, 520, 268, 609, - 495, 538, 538, 619, 585, 470, 478, 679, 716, 684, - 555, 67, 420, 678, 656, 522, 524, 677, 595, 314, - 715, 616, 481, 614, 538, 612, 477, 686, 694, 727, - 728, 689, 672, 721, 249, 482, 588, 24, 486, 726, - 623, 594, 593, 551, 724, 708, 720, 719, 24, 576, - 500, 713, 503, 685, 674, 598, 250, 628, 683, 578, - 723, 722, 725, 579, 580, 599, 322, 600, 258, 682, - 451, 475, 507, 581, 631, 604, 676, 583, 584, 632, - 641, 717, 517, 526, 515, 489, 518, 490, 608, 671, - 718, 447, 586, 587, 567, 642, 554, 618, 0, 0, + -45, 224, 224, 95, 493, 730, 199, 199, 383, 111, + 207, -22, -22, -22, 81, 497, 92, 92, 168, 10, + 274, 274, 233, 274, 430, 430, 430, 221, 221, 221, + 221, 221, 101, 498, 221, 221, 221, 512, 653, 397, + 515, 643, 273, 377, 370, 525, 534, 355, 510, 355, + 355, 355, 413, 407, 425, 523, 678, 392, 401, 467, + 399, 474, 589, 230, 573, 379, 166, 411, 394, 330, + 477, 572, 710, 417, 709, 358, 474, 474, 474, 386, + 518, 590, 236, -8, 646, 591, 331, 415, 339, 645, + 635, 281, 634, 179, 384, 571, 479, 479, 483, 483, + 479, 479, 479, 479, 485, 412, 479, 692, 692, 483, + 487, 483, 485, 412, 699, 483, 412, 483, 483, 479, + 483, 692, 412, 412, 494, 479, 492, 492, 483, 483, + 502, 692, 692, 502, 412, 547, 541, 506, 478, 406, + 487, 406, 506, 412, 406, 487, 406, 31, 698, 697, + 396, 694, 696, 690, 607, 689, 595, 491, 476, 680, + 679, 687, 700, 695, 300, 538, 549, 268, 250, 481, + 484, 691, 510, 526, 464, 464, 464, 484, 686, 464, + 464, 464, 464, 464, 464, 464, 464, 729, 35, 521, + 501, 560, 561, 564, 258, 565, 535, 508, 246, 608, + 495, 538, 538, 619, 673, 585, 463, 678, 714, 683, + 555, 39, 284, 677, 656, 522, 524, 676, 594, 268, + 713, 616, 488, 614, 538, 612, 464, 685, 693, 727, + 728, 688, 725, 719, 228, 511, 588, 26, 482, 726, + 623, 593, 592, 551, 722, 706, 718, 717, 26, 576, + 496, 711, 503, 684, 620, 596, 241, 628, 682, 578, + 721, 720, 723, 579, 580, 598, 271, 599, 244, 681, + 442, 461, 480, 581, 631, 600, 674, 583, 584, 632, + 641, 715, 504, 526, 519, 509, 500, 499, 604, 671, + 716, 408, 586, 587, 567, 642, 554, 618, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 134, 134, @@ -498,16 +498,16 @@ class Php7 extends \PhpParser\ParserAbstract -22, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 49, 49, 49, 49, 221, -22, -22, 221, 221, 221, 221, 221, 49, 221, 221, - 92, 92, 92, 171, 171, 221, 0, 0, 0, 0, - 0, 479, 92, 0, 0, 171, 0, 0, 0, 0, + 92, 92, 92, 355, 355, 221, 0, 0, 0, 0, + 0, 479, 92, 0, 0, 487, 355, 0, 0, 0, 0, 479, 479, 479, 0, 0, 0, 0, 0, 479, - 92, 0, 0, 0, 389, 389, 24, 389, 389, 0, - 0, 0, 479, 479, 0, 485, 0, 0, 0, 0, - 0, 0, 693, 483, 0, 0, 485, 0, 477, 67, - 0, 230, 0, 0, 0, 0, 0, 478, 230, 244, - 0, 244, 0, 477, 477, 477, 0, 478, 478, 0, - 0, 240, 478, 0, 0, 0, 240, 170, 0, 170, - 0, 0, 24 + 92, 0, 0, 0, 389, 389, 26, 389, 389, 0, + 0, 0, 479, 479, 0, 487, 0, 0, 0, 0, + 0, 0, 692, 483, 0, 0, 487, 0, 464, 39, + 0, 119, 0, 0, 0, 0, 0, 463, 119, 217, + 0, 217, 0, 464, 464, 464, 0, 463, 463, 0, + 0, 178, 463, 0, 0, 0, 178, 67, 0, 67, + 0, 0, 26 ); protected $actionDefault = array( @@ -541,7 +541,7 @@ class Php7 extends \PhpParser\ParserAbstract 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, 32767,32767, 393, 426, 426,32767,32767,32767, 384,32767, 32767,32767, 161, 212, 214, 401,32767,32767,32767,32767, - 32767, 332,32767,32767,32767,32767,32767, 483,32767,32767, + 32767, 332,32767,32767,32767,32767,32767, 482,32767,32767, 32767,32767,32767, 426,32767,32767, 324, 325, 326,32767, 32767,32767, 426, 426,32767,32767, 426,32767, 426,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, @@ -557,7 +557,7 @@ class Php7 extends \PhpParser\ParserAbstract 32767,32767,32767,32767,32767,32767, 85, 110, 247,32767, 480, 85, 387,32767, 480,32767,32767,32767,32767,32767, 32767, 289,32767,32767,32767, 85, 85,32767,32767, 464, - 32767, 482,32767, 426, 388,32767, 329, 402, 445,32767, + 32767, 481,32767, 426, 388,32767, 329, 402, 445,32767, 32767, 427,32767,32767, 220, 85,32767, 179,32767,32767, 32767,32767,32767,32767,32767, 406,32767,32767, 181,32767, 32767, 426,32767,32767,32767,32767, 284,32767,32767,32767, @@ -582,43 +582,43 @@ class Php7 extends \PhpParser\ParserAbstract 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 149, 194, 150, 165, 166, 167, 196, 168, 151, 152, 153, 169, 154, 197, 133, 170, 155, - 171, 172, 156, 524, 200, 655, 436, 534, 483, 500, - 468, 692, 654, 656, 278, 200, 441, 441, 441, 5, - 521, 771, 686, 751, 441, 560, 533, 430, 780, 775, - 432, 435, 448, 469, 470, 472, 454, 456, 441, 563, + 171, 172, 156, 524, 200, 686, 436, 534, 507, 692, + 654, 515, 5, 300, 278, 200, 441, 441, 441, 771, + 468, 751, 655, 560, 441, 430, 780, 775, 432, 435, + 448, 469, 470, 472, 483, 500, 454, 456, 441, 563, 490, 492, 512, 514, 768, 519, 520, 782, 527, 767, - 529, 535, 778, 537, 485, 485, 973, 973, 973, 973, - 973, 973, 973, 973, 973, 973, 973, 973, 418, 418, - 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, - 418, 418, 679, 1018, 1019, 467, 833, 536, 441, 441, - 516, 831, 455, 475, 441, 441, 459, 429, 441, 713, - 948, 506, 1044, 1044, 429, 507, 947, 459, 515, 755, - 300, 442, 805, 679, 679, 1044, 302, 464, 417, 417, + 529, 535, 778, 537, 418, 418, 418, 418, 418, 418, + 418, 418, 418, 418, 418, 418, 418, 418, 485, 485, + 973, 973, 973, 973, 973, 973, 973, 973, 973, 973, + 973, 973, 679, 1018, 1019, 467, 833, 536, 441, 441, + 516, 831, 455, 475, 441, 441, 459, 429, 441, 656, + 948, 533, 1044, 1044, 429, 488, 279, 459, 335, 465, + 480, 442, 713, 679, 679, 1044, 755, 464, 417, 417, 417, 417, 417, 417, 417, 417, 417, 417, 417, 417, - 417, 417, 296, 1043, 1043, 486, 487, 530, 447, 457, - 488, 279, 229, 335, 230, 231, 1043, 257, 245, 460, - 378, 465, 480, 1036, 1028, 501, 314, 910, 790, 8, - 1017, 801, 1046, 794, 672, 672, 949, 329, 680, 680, - 680, 682, 675, 308, 671, 285, 950, 1004, 311, 809, + 417, 417, 1059, 296, 229, 805, 230, 231, 460, 447, + 457, 257, 245, 1043, 1043, 486, 487, 530, 1036, 302, + 1028, 378, 501, 314, 910, 790, 1043, 1017, 801, 794, + 8, 285, 438, 329, 672, 672, 949, 675, 680, 680, + 680, 682, 1046, 521, 671, 308, 950, 1004, 311, 809, 673, 547, 332, 941, 812, 683, 946, 373, 323, 502, 328, 313, 313, 260, 261, 283, 463, 263, 322, 284, 326, 491, 280, 281, 759, 482, 384, 849, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 952, 0, 0, 795, 795, 795, 795, 952, 1014, - 795, 795, 0, 1023, 1023, 0, 1014, 795, 0, 841, - 0, 0, 0, 1025, 1025, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 1010, 749, 749, 749, 725, - 749, 0, 0, 744, 750, 726, 0, 0, 0, 0, + 0, 0, 0, 0, 438, 0, 0, 0, 0, 0, + 0, 952, 0, 0, 795, 795, 795, 795, 952, 0, + 795, 795, 841, 1023, 1023, 0, 0, 795, 0, 1014, + 0, 0, 0, 0, 506, 0, 1014, 0, 0, 947, + 0, 0, 0, 1025, 1025, 0, 749, 749, 749, 725, + 749, 0, 0, 744, 750, 726, 1010, 0, 0, 0, 785, 785, 1033, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 453, 811, 0, 1012, 1012, 811, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 453, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 811, 0, 1012, 1012, 811, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 434, 452, 0, 0, 0, 0, 0, 0, 0, 0, 0, 434, 0, 452, 0, 0, 0, 433, 0, 439, 364, 0, 366, 0, 0, - 0, 0, 0, 0, 0, 678, 1052 + 0, 0, 0, 0, 0, 678, 1051 ); protected $gotoCheck = array( @@ -633,37 +633,37 @@ class Php7 extends \PhpParser\ParserAbstract 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, - 25, 25, 25, 54, 47, 13, 9, 8, 37, 37, - 82, 12, 12, 14, 66, 47, 9, 9, 9, 94, - 11, 12, 27, 12, 9, 12, 5, 12, 12, 12, - 40, 40, 40, 40, 40, 40, 30, 9, 9, 30, + 25, 25, 25, 54, 47, 27, 9, 8, 58, 12, + 12, 58, 94, 58, 66, 47, 9, 9, 9, 12, + 82, 12, 13, 12, 9, 12, 12, 12, 40, 40, + 40, 40, 40, 40, 37, 37, 30, 9, 9, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 72, 72, 72, 72, 72, 72, - 72, 72, 72, 72, 72, 72, 72, 72, 118, 118, - 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, - 118, 118, 21, 122, 122, 7, 7, 7, 9, 9, - 7, 7, 9, 9, 9, 9, 71, 112, 9, 46, - 78, 11, 128, 128, 112, 58, 11, 71, 58, 31, - 58, 9, 80, 21, 21, 128, 43, 9, 116, 116, + 30, 30, 30, 30, 118, 118, 118, 118, 118, 118, + 118, 118, 118, 118, 118, 118, 118, 118, 72, 72, + 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, + 72, 72, 21, 122, 122, 7, 7, 7, 9, 9, + 7, 7, 9, 9, 9, 9, 71, 112, 9, 14, + 78, 5, 128, 128, 112, 64, 64, 71, 64, 2, + 2, 9, 46, 21, 21, 128, 31, 9, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, - 116, 116, 55, 127, 127, 57, 57, 57, 55, 55, - 64, 64, 62, 64, 62, 62, 127, 115, 115, 117, - 55, 2, 2, 126, 124, 45, 44, 99, 74, 55, - 120, 76, 127, 77, 21, 21, 78, 20, 21, 21, - 21, 21, 23, 10, 21, 16, 78, 78, 15, 81, + 116, 116, 11, 55, 62, 80, 62, 62, 117, 55, + 55, 115, 115, 127, 127, 57, 57, 57, 126, 43, + 124, 55, 45, 44, 99, 74, 127, 120, 76, 77, + 55, 16, 11, 20, 21, 21, 78, 23, 21, 21, + 21, 21, 127, 11, 21, 10, 78, 78, 15, 81, 22, 68, 19, 105, 83, 24, 107, 60, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 66, 66, 65, 61, 103, 96, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 54, -1, -1, 54, 54, 54, 54, 54, 82, - 54, 54, -1, 8, 8, -1, 82, 54, -1, 94, - -1, -1, -1, 82, 82, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 82, 54, 54, 54, 54, - 54, -1, -1, 54, 54, 54, -1, -1, -1, -1, + -1, -1, -1, -1, 11, -1, -1, -1, -1, -1, + -1, 54, -1, -1, 54, 54, 54, 54, 54, -1, + 54, 54, 94, 8, 8, -1, -1, 54, -1, 82, + -1, -1, -1, -1, 11, -1, 82, -1, -1, 11, + -1, -1, -1, 82, 82, -1, 54, 54, 54, 54, + 54, -1, -1, 54, 54, 54, 82, -1, -1, -1, 71, 71, 71, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 8, 82, -1, 82, 82, 82, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 8, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 82, -1, 82, 82, 82, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 8, 8, -1, -1, -1, @@ -673,25 +673,25 @@ class Php7 extends \PhpParser\ParserAbstract ); protected $gotoBase = array( - 0, 0, -279, 0, 0, 126, 0, 192, 107, -138, - 11, -169, 120, 113, 121, 3, 31, 0, 0, -45, - 12, -62, 4, 16, -54, -20, 0, 125, 0, 0, - -393, 203, 0, 0, 0, 0, 0, 87, 0, 0, - 105, 0, 0, 193, 48, 50, 195, 84, 0, 0, - 0, 0, 0, 0, 109, -114, 0, 9, -166, 0, - -70, -58, -307, 0, -18, -37, -252, 0, -7, 0, - 0, 176, -50, 0, 27, 0, 29, 25, -85, 0, - 201, -2, 117, -56, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 119, 0, -35, 0, 0, 28, + 0, 0, -321, 0, 0, 201, 0, 192, 107, -138, + 13, -16, 118, 130, 207, 3, 17, 0, 0, -45, + 8, -62, 4, 11, -54, -20, 0, 108, 0, 0, + -393, 210, 0, 0, 0, 0, 0, 113, 0, 0, + 103, 0, 0, 226, 45, 47, 208, 84, 0, 0, + 0, 0, 0, 0, 109, -113, 0, 19, -263, 0, + -70, -58, -315, 0, -53, -37, -252, 0, -7, 0, + 0, 176, -36, 0, 24, 0, 26, 21, -85, 0, + 224, -2, 127, -56, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 112, 0, -35, 0, 0, 25, 0, 0, 0, -66, 0, -55, 0, -57, 0, 0, - 0, 0, -25, 0, 0, 2, 14, 236, -36, 0, - 23, 0, -96, 0, 223, 0, 238, -1, -32, 0, - 0, 0 + 0, 0, -25, 0, 0, -4, 14, 225, -50, 0, + 20, 0, -96, 0, 219, 0, 233, 9, -32, 0, + 0 ); protected $gotoDefault = array( -32768, 387, 568, 2, 569, 640, 648, 508, 404, 405, - 437, 438, 753, 693, 694, 304, 343, 406, 303, 330, + 437, 307, 753, 693, 694, 304, 343, 406, 303, 330, 324, 681, 674, 676, 684, 134, 333, 687, 1, 689, 443, 721, 293, 697, 294, 511, 699, 450, 701, 702, 431, 305, 306, 451, 312, 484, 712, 203, 309, 714, @@ -702,8 +702,8 @@ class Php7 extends \PhpParser\ParserAbstract 4, 825, 525, 526, 840, 240, 848, 496, 862, 348, 929, 931, 445, 379, 942, 367, 334, 945, 1003, 361, 409, 371, 959, 262, 282, 244, 410, 427, 249, 411, - 372, 1006, 1013, 315, 1029, 428, 1037, 1045, 273, 307, - 462, 479 + 372, 1006, 1013, 315, 1029, 428, 1037, 1045, 273, 462, + 479 ); protected $ruleToNonTerminal = array( @@ -755,8 +755,8 @@ class Php7 extends \PhpParser\ParserAbstract 113, 113, 113, 111, 111, 111, 120, 120, 120, 120, 71, 123, 123, 124, 124, 124, 124, 124, 117, 125, 125, 126, 126, 126, 126, 126, 115, 115, 115, 115, - 128, 129, 130, 127, 127, 127, 127, 127, 127, 127, - 131, 131, 131, 131 + 128, 129, 127, 127, 127, 127, 127, 127, 127, 130, + 130, 130, 130 ); protected $ruleToLength = array( @@ -808,8 +808,8 @@ class Php7 extends \PhpParser\ParserAbstract 3, 3, 3, 1, 3, 1, 1, 3, 1, 1, 4, 3, 1, 1, 1, 3, 3, 0, 1, 3, 1, 3, 1, 4, 2, 0, 2, 2, 1, 2, - 1, 1, 1, 1, 4, 3, 3, 3, 6, 3, - 1, 1, 2, 1 + 1, 1, 1, 4, 3, 3, 3, 6, 3, 1, + 1, 2, 1 ); protected function reduceRule0() { @@ -1158,7 +1158,7 @@ class Php7 extends \PhpParser\ParserAbstract } protected function reduceRule86() { - $this->semValue = ($this->useConsistentVariableNodes ? new Expr\Variable(substr($this->semStack[$this->stackPos-(1-1)], 1), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes) : substr($this->semStack[$this->stackPos-(1-1)], 1)); + $this->semValue = new Expr\Variable(substr($this->semStack[$this->stackPos-(1-1)], 1), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); } protected function reduceRule87() { @@ -2753,54 +2753,50 @@ class Php7 extends \PhpParser\ParserAbstract } protected function reduceRule481() { - $this->semValue = new Expr\Variable(substr($this->semStack[$this->stackPos-(1-1)], 1), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); - } - - protected function reduceRule482() { $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); } - protected function reduceRule483() { + protected function reduceRule482() { $this->semValue = $this->semStack[$this->stackPos-(1-1)]; } - protected function reduceRule484() { + protected function reduceRule483() { $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); } - protected function reduceRule485() { + protected function reduceRule484() { $this->semValue = new Expr\PropertyFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); } + protected function reduceRule485() { + $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); + } + protected function reduceRule486() { $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); } protected function reduceRule487() { - $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); - } - - protected function reduceRule488() { $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(6-2)], $this->semStack[$this->stackPos-(6-4)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes); } - protected function reduceRule489() { + protected function reduceRule488() { $this->semValue = $this->semStack[$this->stackPos-(3-2)]; } - protected function reduceRule490() { + protected function reduceRule489() { $this->semValue = new Scalar\String_($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); } - protected function reduceRule491() { + protected function reduceRule490() { $this->semValue = $this->parseNumString($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); } - protected function reduceRule492() { + protected function reduceRule491() { $this->semValue = $this->parseNumString('-' . $this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); } - protected function reduceRule493() { - $this->semValue = new Expr\Variable(substr($this->semStack[$this->stackPos-(1-1)], 1), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); + protected function reduceRule492() { + $this->semValue = $this->semStack[$this->stackPos-(1-1)]; } } diff --git a/lib/PhpParser/ParserAbstract.php b/lib/PhpParser/ParserAbstract.php index 7d3af187..f4d6dd5e 100644 --- a/lib/PhpParser/ParserAbstract.php +++ b/lib/PhpParser/ParserAbstract.php @@ -114,8 +114,6 @@ abstract class ParserAbstract implements Parser /** @var bool Whether to create Identifier nodes for non-namespaced names */ protected $useIdentifierNodes; - /** @var bool Whether to consistently use Variable nodes */ - protected $useConsistentVariableNodes; /** @var bool Whether to use Stmt\Nop nodes */ protected $useNopStatements; @@ -125,8 +123,6 @@ abstract class ParserAbstract implements Parser * Options: * * useIdentifierNodes (default false): Create Identifier nodes for non-namespaced names. * Otherwise plain strings will be used. - * * useConsistentVariableNodes (default false): Create Variable nodes in more places (like - * function parameters, catch clause variables, etc.) * * useNopStatements (default true): Create Stmt\Nop nodes for dangling comments at the end of * statement lists. * @@ -137,7 +133,6 @@ abstract class ParserAbstract implements Parser $this->lexer = $lexer; $this->errors = array(); $this->useIdentifierNodes = !empty($options['useIdentifierNodes']); - $this->useConsistentVariableNodes = true; $this->useNopStatements = isset($options['useNopStatements']) ? $options['useNopStatements'] : true; diff --git a/lib/PhpParser/PrettyPrinterAbstract.php b/lib/PhpParser/PrettyPrinterAbstract.php index 84042588..f2bc4325 100644 --- a/lib/PhpParser/PrettyPrinterAbstract.php +++ b/lib/PhpParser/PrettyPrinterAbstract.php @@ -343,8 +343,8 @@ abstract class PrettyPrinterAbstract * * In order to use this method a number of prerequisites must be satisfied: * * The startTokenPos and endTokenPos attributes in the lexer must be enabled. - * * The parser must be run with the options useIdentifierNodes, useConsistentVariableNodes - * ENABLED and useNopStatements DISABLED. + * * The parser must be run with the option useIdentifierNodes ENABLED and + * useNopStatements DISABLED. * * The CloningVisitor must be run on the AST prior to modification. * * The original tokens must be provided, using the getTokens() method on the lexer. * diff --git a/test/PhpParser/CodeParsingTest.php b/test/PhpParser/CodeParsingTest.php index adeb30ac..1112f260 100644 --- a/test/PhpParser/CodeParsingTest.php +++ b/test/PhpParser/CodeParsingTest.php @@ -35,7 +35,6 @@ class CodeParsingTest extends CodeTestAbstract public function createParsers(array $modes) { $parserOptions = [ 'useIdentifierNodes' => isset($modes['ident']), - 'useConsistentVariableNodes' => isset($modes['consistentVars']), ]; $lexer = new Lexer\Emulative(array('usedAttributes' => array( diff --git a/test/PhpParser/PrettyPrinterTest.php b/test/PhpParser/PrettyPrinterTest.php index 6e8d3c0b..2e9236b3 100644 --- a/test/PhpParser/PrettyPrinterTest.php +++ b/test/PhpParser/PrettyPrinterTest.php @@ -23,7 +23,6 @@ class PrettyPrinterTest extends CodeTestAbstract // Use these options on one of the parsers ... don't want to write extra tests for them $parser7 = new Parser\Php7($lexer, [ 'useIdentifierNodes' => true, - 'useConsistentVariableNodes' => true, ]); list($version, $options) = $this->parseModeLine($modeLine); @@ -204,7 +203,6 @@ class PrettyPrinterTest extends CodeTestAbstract $parser = new Parser\Php7($lexer, [ 'useIdentifierNodes' => true, - 'useConsistentVariableNodes' => true, 'useNopStatements' => false, ]); @@ -265,7 +263,6 @@ CODE /** @var Parser $parser */ $parser = new $parserClass($lexer, [ 'useIdentifierNodes' => true, - 'useConsistentVariableNodes' => true, 'useNopStatements' => false, ]); diff --git a/test/code/parser/consistentVarMode.test b/test/code/parser/consistentVarMode.test deleted file mode 100644 index 6a239602..00000000 --- a/test/code/parser/consistentVarMode.test +++ /dev/null @@ -1,108 +0,0 @@ -Consistent variable mode ------ -