diff --git a/grammar/php5.y b/grammar/php5.y index 4c32f20..8c51e6c 100644 --- a/grammar/php5.y +++ b/grammar/php5.y @@ -253,22 +253,22 @@ class_entry_type: extends_from: /* empty */ { $$ = null; } - | T_EXTENDS name { $$ = $2; } + | T_EXTENDS class_name { $$ = $2; } ; interface_extends_list: /* empty */ { $$ = array(); } - | T_EXTENDS name_list { $$ = $2; } + | T_EXTENDS class_name_list { $$ = $2; } ; implements_list: /* empty */ { $$ = array(); } - | T_IMPLEMENTS name_list { $$ = $2; } + | T_IMPLEMENTS class_name_list { $$ = $2; } ; -name_list: - name { init($1); } - | name_list ',' name { push($1, $3); } +class_name_list: + class_name { init($1); } + | class_name_list ',' class_name { push($1, $3); } ; for_statement: @@ -440,7 +440,7 @@ class_statement: | method_modifiers T_FUNCTION optional_ref identifier '(' parameter_list ')' optional_return_type method_body { $$ = Stmt\ClassMethod[$4, ['type' => $1, 'byRef' => $3, 'params' => $6, 'returnType' => $8, 'stmts' => $9]]; $this->checkClassMethod($$, #1); } - | T_USE name_list trait_adaptations { $$ = Stmt\TraitUse[$2, $3]; } + | T_USE class_name_list trait_adaptations { $$ = Stmt\TraitUse[$2, $3]; } ; trait_adaptations: @@ -454,7 +454,7 @@ trait_adaptation_list: ; trait_adaptation: - trait_method_reference_fully_qualified T_INSTEADOF name_list ';' + trait_method_reference_fully_qualified T_INSTEADOF class_name_list ';' { $$ = Stmt\TraitUseAdaptation\Precedence[$1[0], $1[1], $3]; } | trait_method_reference T_AS member_modifier identifier ';' { $$ = Stmt\TraitUseAdaptation\Alias[$1[0], $1[1], $3, $4]; } diff --git a/grammar/php7.y b/grammar/php7.y index e98bb08..66914fc 100644 --- a/grammar/php7.y +++ b/grammar/php7.y @@ -289,26 +289,26 @@ class_entry_type: extends_from: /* empty */ { $$ = null; } - | T_EXTENDS name { $$ = $2; } + | T_EXTENDS class_name { $$ = $2; } ; interface_extends_list: /* empty */ { $$ = array(); } - | T_EXTENDS name_list { $$ = $2; } + | T_EXTENDS class_name_list { $$ = $2; } ; implements_list: /* empty */ { $$ = array(); } - | T_IMPLEMENTS name_list { $$ = $2; } + | T_IMPLEMENTS class_name_list { $$ = $2; } ; -name_list: - non_empty_name_list no_comma { $$ = $1; } +class_name_list: + non_empty_class_name_list no_comma { $$ = $1; } ; -non_empty_name_list: - name { init($1); } - | non_empty_name_list ',' name { push($1, $3); } +non_empty_class_name_list: + class_name { init($1); } + | non_empty_class_name_list ',' class_name { push($1, $3); } ; for_statement: @@ -496,7 +496,7 @@ class_statement: | method_modifiers T_FUNCTION optional_ref identifier '(' parameter_list ')' optional_return_type method_body { $$ = Stmt\ClassMethod[$4, ['type' => $1, 'byRef' => $3, 'params' => $6, 'returnType' => $8, 'stmts' => $9]]; $this->checkClassMethod($$, #1); } - | T_USE name_list trait_adaptations { $$ = Stmt\TraitUse[$2, $3]; } + | T_USE class_name_list trait_adaptations { $$ = Stmt\TraitUse[$2, $3]; } ; trait_adaptations: @@ -510,7 +510,7 @@ trait_adaptation_list: ; trait_adaptation: - trait_method_reference_fully_qualified T_INSTEADOF name_list ';' + trait_method_reference_fully_qualified T_INSTEADOF class_name_list ';' { $$ = Stmt\TraitUseAdaptation\Precedence[$1[0], $1[1], $3]; } | trait_method_reference T_AS member_modifier identifier ';' { $$ = Stmt\TraitUseAdaptation\Alias[$1[0], $1[1], $3, $4]; } diff --git a/lib/PhpParser/Parser/Php5.php b/lib/PhpParser/Parser/Php5.php index 23afafb..4837b08 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 = 1012; - protected $gotoTableSize = 652; + protected $actionTableSize = 1020; + protected $gotoTableSize = 591; protected $invalidSymbol = 157; protected $errorSymbol = 1; @@ -235,278 +235,278 @@ class Php5 extends \PhpParser\ParserAbstract protected $action = array( 672, 673, 674, 675, 676,-32766, 677, 678, 679, 715, 716, 216, 217, 218, 219, 220, 221, 222, 223, 224, - 23, 225, 226, 227, 228, 229, 230, 231, 232, 233, + 0, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,-32766,-32766,-32766,-32766,-32766,-32766,-32766, - -32766,-32767,-32767,-32767,-32767, 460, 237, 238,-32766,-32766, - -32766,-32766, 680,-32766, 0,-32766,-32766,-32766,-32766,-32766, + -32766,-32767,-32767,-32767,-32767, 441, 237, 238,-32766,-32766, + -32766,-32766, 680,-32766, 1036,-32766,-32766,-32766,-32766,-32766, -32766,-32767,-32767,-32767,-32767,-32767, 681, 682, 683, 684, - 685, 686, 687, 909, 204, 747,-32766,-32766,-32766,-32766, - -32766, 419, 688, 689, 690, 691, 692, 693, 694, 695, + 685, 686, 687, 909, 329, 747,-32766,-32766,-32766,-32766, + -32766, 282, 688, 689, 690, 691, 692, 693, 694, 695, 696, 697, 698, 718, 719, 720, 721, 722, 710, 711, 712, 713, 714, 699, 700, 701, 702, 703, 704, 705, 741, 742, 743, 744, 745, 746, 706, 707, 708, 709, - 739, 730, 728, 729, 725, 726, 306, 717, 723, 724, + 739, 730, 728, 729, 725, 726, 1178, 717, 723, 724, 731, 732, 734, 733, 735, 736, 52, 53, 420, 54, - 55, 727, 738, 737, 282, 56, 57, 284, 58,-32766, + 55, 727, 738, 737, 23, 56, 57, 284, 58,-32766, -32766,-32766,-32766,-32766,-32766,-32766,-32766,-32766, 7,-32767, - -32767,-32767,-32767, 50, 329, 900, 585, 945, 946, 947, + -32767,-32767,-32767, 50, 325,-32766, 585, 945, 946, 947, 944, 943, 942, 937, 1213, 27, 1215, 1214, 763, 764, - 821, 59, 60,-32766,-32766,-32766, 918, 61, 1172, 62, + 821, 59, 60,-32766,-32766,-32766, 809, 61, 1172, 62, 291, 292, 63, 64, 65, 66, 67, 68, 69, 70, - 356, 24, 299, 71, 413,-32766,-32766,-32766, 1185, 1087, + 334, 24, 299, 71, 413,-32766,-32766,-32766, 1185, 1087, 1088, 749, 633, 1178, 213, 214, 215, 464,-32766,-32766, - -32766, 822, 407, 1099, 311,-32766, 1054,-32766,-32766,-32766, - -32766,-32766,-32766, 1036, 200, -269, 428, 1036,-32766, 447, + -32766, 822, 407, 1099, 311,-32766, 1186,-32766,-32766,-32766, + -32766,-32766,-32766, 1036, 200, -269, 428,-32766,-32766,-32766, -32766,-32766,-32766,-32766,-32766, 120, 491, 945, 946, 947, - 944, 943, 942, 297, 473, 474, 283, 623, 125,-32766, + 944, 943, 942, 306, 473, 474, 293, 623, 125,-32766, 893, 894, 339, 477, 478,-32766, 1093, 1094, 1095, 1096, - 1090, 1091, 307, 492,-32766, 8, 425, 492, 1097, 1092, - 425, 121, -220, 869, 1182, 39, 280, 332, 321, 1186, + 1090, 1091, 307, 492,-32766, 440, 425, 492, 1097, 1092, + 425, 121, -220, 869, 1182, 39, 280, 334, 321, 900, 322, 421, -122, -122, -122, -4, 822, 463, 99, 100, - 101, 811, 301, 377, 38, 19, 422, -122, 465, -122, + 101, 811, 301, 119, 38, 19, 422, -122, 465, -122, 466, -122, 467, -122, 102, 423, -122, -122, -122, 28, - 29, 468, 424, 624, 30, 469, 425, 812, 72, 412, - 923, 349, 350, 470, 471,-32766,-32766,-32766, 298, 472, - 1036, 808, 793, 840, 475, 476,-32767,-32767,-32767,-32767, + 29, 468, 424, 624, 30, 469, 425, 812, 72, 297, + 923, 349, 350, 470, 471,-32766,-32766,-32766, 419, 472, + 1036, 447, 793, 840, 475, 476,-32767,-32767,-32767,-32767, 94, 95, 96, 97, 98,-32766, 126,-32766,-32766,-32766, -32766, 1137, 213, 214, 215, 295, 421, 239, 824, 638, -122, 1036, 463, 893, 894, 1205, 811, 1036, 1204, 38, - 19, 422, 200, 465, 18, 466, 492, 467, 127, 425, + 19, 422, 200, 465, 356, 466, 492, 467, 127, 425, 423, 213, 214, 215, 28, 29, 468, 424, 414, 30, 469, 1036, 870, 72, 320, 822, 349, 350, 470, 471, - 1036, 200, 214, 215, 472, 441, 919, 755, 840, 475, - 476, 213, 214, 215, 295, -216, 76, 77, 78, 47, - 338, 200, 477, 644, 348, 438, 31, 294, 331, 440, - 326, 200, 241, 824, 638, -4, 32, 335, 79, 80, + 34, 200, 214, 215, 472, 460, 762, 755, 840, 475, + 476, 213, 214, 215, 295, -216, 76, 77, 78, 46, + 298, 200, 412, 653, 338, 438, 31, 294, 333, 8, + 348, 200, 241, 824, 638, -4, 32, 332, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, - 101, 1210, 301, 34, 822, 421, 801, 124,-32766,-32766, - -32766, 463, 899, 129, 102, 811, 1178, 576, 38, 19, - 422, 546, 465, 1172, 466, 119, 467, 49,-32766, 423, - -32766,-32766, 647, 28, 29, 468, 822, 803, 30, 469, - 415, 117, 72, 805, 46, 349, 350,-32766,-32766,-32766, - -32766,-32766,-32766, 472, 200, 1036, 234, 235, 236,-32766, - -32766,-32766,-32766,-32766, 641, 1138, 124,-32766,-32766,-32766, - -32766,-32766, 237, 238, 421, 231, 232, 233, 293,-32766, - 463, 518, 856, 638, 811, 439, 809, 38, 19, 422, - 332, 465, 128, 466, 749, 467, 1178, 339, 423, 96, - 97, 98, 28, 29, 468, 822, 421, 30, 469, 118, - 762, 72, 463, 215, 349, 350, 811, 242, 1036, 38, - 19, 422, 472, 465, 206, 466, 116, 467, 1036, 1064, - 423, 200, 833, 642, 28, 29, 468, 822, 1099, 30, - 469, 296, 207, 72, 205, 123, 349, 350,-32766,-32766, - 492, 824, 638, 425, 472, 115, 213, 214, 215, 434, - 492, 244, 640, 425, 243, 653, 237, 238, 429,-32766, - 332, 454, 591, 449, 20, 421, 200, 130, 357, 763, - 764, 463, 820, 824, 638, 811, 922, 666, 38, 19, - 422, 646, 465, 650, 466, 313, 467, 599, 600, 423, - 102, 756, 643, 28, 29, 468, 822, 421, 30, 469, - 934, 656, 72, 463, 301, 349, 350, 811, 41, 51, - 38, 19, 422, 472, 465, 48, 466, 299, 467, 605, - 42, 423, 43, 517, 44, 28, 29, 468, 45,-32766, - 30, 469, 596, 524, 72, 435, 433, 349, 350, 533, - 534, 749, 824, 638, 1208, 472, 776, 33, 103, 104, + 101, 1210, 301, 204, 822, 421, 805, 124,-32766,-32766, + -32766, 463, 899, 1054, 102, 811, 18, 206, 38, 19, + 422, 518, 465, 1172, 466, 546, 467, 47,-32766, 423, + -32766,-32766, 647, 28, 29, 468, 822, 801, 30, 469, + 415, 116, 72, 803, 49, 349, 350,-32766,-32766,-32766, + -32766,-32766,-32766, 472, 477, 808, 234, 235, 236, 213, + 214, 215, 1036, 215, 644, 1138, 124,-32766,-32766,-32766, + -32766,-32766, 237, 238, 421, 231, 232, 233, 1099, 200, + 463, 200, 824, 638, 811, 439, 918, 38, 19, 422, + 1036, 465, 242, 466, 749, 467, 1178, 339, 423, 96, + 97, 98, 28, 29, 468, 822, 421, 30, 469, 117, + 919, 72, 463, 283, 349, 350, 811, 244, 1036, 38, + 19, 422, 472, 465, 243, 466, 118, 467, 377, 1064, + 423, 1036, 207, 642, 28, 29, 468, 822, 129, 30, + 469, 296, 576, 72,-32766,-32766, 349, 350, 123, 205, + 492, 824, 638, 425, 472, 115,-32766,-32766,-32766, 434, + 492, 200, 640, 425, 820, 641,-32766,-32766, 429,-32766, + 334, 237, 238, 454, 591, 421,-32766, 130, 357, 449, + 20, 463, 128, 856, 638, 811, 763, 764, 38, 19, + 422, 313, 465, 646, 466, 650, 467, 599, 600, 423, + 833, 301, 605, 28, 29, 468, 822, 421, 30, 469, + 756, 643, 72, 463, 299, 349, 350, 811, 922, 666, + 38, 19, 422, 472, 465, 102, 466, 51, 467, 934, + 656, 423, 512, 433, 48, 28, 29, 468, 41, 42, + 30, 469, 43, 44, 72, 45, 435, 349, 350, 1057, + 750, 1208, 824, 638, 776, 472, 749, 33, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, - 750, 513, 512, 437, 632, 602, 421, 1057, 622, 612, - 516, 619, 463, 279, 824, 638, 811, 582, 595, 38, - 19, 422, 330, 465, 579, 466, 240, 467, 975, 977, - 423, 609, 334, 537, 28, 29, 468, 12, -80, 30, - 469, 842, 432, 72, 208, 209, 349, 350, 458, 1144, - 210, 384, 211, 327, 472, 841, 9, 393, -398, 409, - 328, 0, 310, 1045, 202, 477, 0, 0, 0, 208, - 209, 0, 1087, 1088, 0, 210,-32766, 211, -497, 312, - 1089, -498, 0, 824, 638, 0, 1098, 4, 372, 202, - 3, 11, 303, 0, -407, 0, 370, 1087, 1088, -406, - -497,-32766, 434, 864, 526, 1089, 408, 385, 75, 835, - 0, 857, 863, 854, 813, 798, 819, 807, 761, 661, - 0, 660, 37, 36, 759, 926, 810, 565, 852, 1093, - 1094, 1095, 1096, 1090, 1091, 383, 929, 806, 930, 818, - 760, 1097, 1092, 928, 804, 302, 802, 927, 212, 796, - -32766, 872, 565, 639, 1093, 1094, 1095, 1096, 1090, 1091, - 383, 649, 651, 652, 654, 655, 1097, 1092, 658, 663, - 664, 1034, 665, 212, 122,-32766, 324, 325, 405, 406, - -416, 1211, 757, 758, 839, 838, 766, 453, 1209, 1179, - 1177, 1163, 1175, 1078, 911, 1183, 1173, 829, 836, 1038, - 1039, 827, 935, 1212, 765, 837, 794, 662, 1050, 861, - 768, 767, 862, 0, 304, 290, 289, 25, 26, 281, - 305, 336, 203, 74, 411, 417, 35, 73,-32766, 40, - 22, 0, 1015, 569, -217, 1016, 1103, 1080, 901, 1040, - 1044, 1041, 629, 559, 461, 457, 455, 450, 378, 16, - 15, 14, -216, 0, 0, 0, 603, 1157, 1104, 1207, - 1077, 1174, 1158, 1162, 1176, 1063, 1048, 1049, 1046, 1047, - 0, 1143 + 534, 533, 517, 513, 524, 437, 421, 602, 516, 622, + 612, 619, 463, 582, 824, 638, 811, 595,-32766, 38, + 19, 422, 632, 465, 579, 466, 240, 467, 975, 977, + 423, 609, 1144, 279, 28, 29, 468, 12, -80, 30, + 469, 537, 432, 72, 208, 209, 349, 350, 458, 1098, + 210, 596, 211, 328, 472, 326, 11, 842, 323, 393, + 4, 385, 408, 303, 202, 1034, 0, 0, 324, 208, + 209, 841, 1087, 1088, 0, 210,-32766, 211, -497, -498, + 1089, 312, 310, 824, 638, 477, 0, 0, 0, 202, + 0, -398, 0, 0, 9, 0, 0, 1087, 1088, 3, + -497,-32766, -406, 370, -407, 1089, 835, 639, 0, 384, + 372, 409, 526, 434, 0, 0, 864, 857, 863, 872, + 0, 813, 798, 819, 807, 761, 661, 565, 760, 1093, + 1094, 1095, 1096, 1090, 1091, 383, 37, 36, 759, 926, + 810, 1097, 1092, 854, 852, 302, 806, 929, 212, 818, + -32766, 930, 565, 928, 1093, 1094, 1095, 1096, 1090, 1091, + 383, 927, 796, 804, 660, 802, 1097, 1092, 649, 651, + 75, 0, 652, 212, 654,-32766, 655, 658, 663, 664, + 665, 405, 122, 330, 331, 406, 0, 1211, 757, 758, + 839, 838, 766, 453, 1209, 1179, 1177, 1163, 1175, 1078, + 911, 1183, 1173, 829, 836, 1038, 1039, 827, 935, 1212, + 765, 837, 794, 662, 1050, 768, 767, 861, 862, 0, + 304, 290, 289, 25, 26, 281, 203, 74, 305, 336, + 411, 417, 35, 73,-32766, 40, 22, 0, 1015, 569, + -217, 1016, 1103, 1080, 901, 1040, 1044, 1041, 629, 559, + 461, 457, 455, 450, 378, 16, 15, 14, -216, 0, + 0, -416, 0, 1045, 603, 1157, 1104, 1207, 1077, 1174, + 1158, 1162, 1176, 1063, 1048, 1049, 1046, 1047, 0, 1143 ); protected $actionCheck = array( 2, 3, 4, 5, 6, 8, 8, 9, 10, 11, 12, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 7, 41, 42, 43, 44, 45, 46, 47, 48, 49, + 0, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 8, 9, 10, 31, 32, 33, 34, 35, 36, 37, 38, 39, 7, 66, 67, 31, 32, - 33, 34, 54, 28, 0, 30, 31, 32, 33, 34, + 33, 34, 54, 28, 12, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 68, 69, 70, 71, 72, 73, 74, 79, 7, 77, 31, 32, 33, 34, 35, 7, 84, 85, 86, 87, 88, 89, 90, 91, 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, 79, 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, + 42, 43, 44, 67, 109, 79, 82, 112, 113, 114, 115, 116, 117, 118, 77, 7, 79, 80, 102, 103, 1, 47, 48, 8, 9, 10, 148, 53, 79, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 7, 67, 68, 69, 70, 8, 9, 10, 1, 75, + 153, 67, 68, 69, 70, 8, 9, 10, 1, 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, 151, 28, 153, 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, 156, 71, 72, 73, 74, 0, 1, 77, 50, 51, - 52, 81, 54, 78, 84, 85, 86, 87, 88, 89, + 52, 81, 54, 13, 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, + 150, 111, 112, 113, 114, 8, 9, 10, 7, 119, + 12, 7, 122, 123, 124, 125, 41, 42, 43, 44, 45, 46, 47, 48, 49, 28, 149, 30, 31, 32, 33, 155, 8, 9, 10, 35, 71, 13, 148, 149, 150, 12, 77, 130, 131, 79, 81, 12, 82, 84, - 85, 86, 28, 88, 152, 90, 143, 92, 67, 146, + 85, 86, 28, 88, 7, 90, 143, 92, 67, 146, 95, 8, 9, 10, 99, 100, 101, 102, 103, 104, 105, 12, 148, 108, 109, 1, 111, 112, 113, 114, - 12, 28, 9, 10, 119, 7, 148, 122, 123, 124, + 13, 28, 9, 10, 119, 7, 148, 122, 123, 124, 125, 8, 9, 10, 35, 152, 8, 9, 10, 67, - 67, 28, 129, 29, 7, 29, 140, 141, 143, 7, + 35, 28, 7, 29, 67, 29, 140, 141, 143, 7, 7, 28, 29, 148, 149, 150, 28, 7, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, - 52, 150, 54, 13, 1, 71, 148, 147, 8, 9, - 10, 77, 152, 149, 66, 81, 79, 153, 84, 85, - 86, 128, 88, 79, 90, 13, 92, 67, 28, 95, + 52, 150, 54, 7, 1, 71, 148, 147, 8, 9, + 10, 77, 152, 152, 66, 81, 152, 15, 84, 85, + 86, 82, 88, 79, 90, 128, 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, 28, 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, 82, 148, 149, 81, 149, 148, 84, 85, 86, - 153, 88, 29, 90, 77, 92, 79, 153, 95, 47, + 31, 32, 33, 119, 129, 148, 50, 51, 52, 8, + 9, 10, 12, 10, 29, 152, 147, 28, 151, 30, + 31, 32, 66, 67, 71, 47, 48, 49, 139, 28, + 77, 28, 148, 149, 81, 149, 148, 84, 85, 86, + 12, 88, 15, 90, 77, 92, 79, 153, 95, 47, 48, 49, 99, 100, 101, 1, 71, 104, 105, 149, - 148, 108, 77, 10, 111, 112, 81, 15, 12, 84, - 85, 86, 119, 88, 15, 90, 149, 92, 12, 112, - 95, 28, 35, 29, 99, 100, 101, 1, 139, 104, - 105, 35, 15, 108, 15, 29, 111, 112, 31, 32, + 148, 108, 77, 35, 111, 112, 81, 15, 12, 84, + 85, 86, 119, 88, 15, 90, 149, 92, 78, 112, + 95, 12, 15, 29, 99, 100, 101, 1, 149, 104, + 105, 35, 153, 108, 31, 32, 111, 112, 29, 15, 143, 148, 149, 146, 119, 15, 8, 9, 10, 146, - 143, 15, 149, 146, 15, 29, 66, 67, 151, 31, - 153, 72, 73, 72, 73, 71, 28, 97, 98, 102, - 103, 77, 29, 148, 149, 81, 148, 149, 84, 85, + 143, 28, 149, 146, 29, 29, 8, 9, 151, 31, + 153, 66, 67, 72, 73, 71, 28, 97, 98, 72, + 73, 77, 29, 148, 149, 81, 102, 103, 84, 85, 86, 29, 88, 29, 90, 29, 92, 106, 107, 95, - 66, 148, 149, 99, 100, 101, 1, 71, 104, 105, - 148, 149, 108, 77, 54, 111, 112, 81, 67, 67, - 84, 85, 86, 119, 88, 67, 90, 68, 92, 74, - 67, 95, 67, 77, 67, 99, 100, 101, 67, 82, - 104, 105, 109, 82, 108, 77, 77, 111, 112, 77, + 35, 54, 74, 99, 100, 101, 1, 71, 104, 105, + 148, 149, 108, 77, 68, 111, 112, 81, 148, 149, + 84, 85, 86, 119, 88, 66, 90, 67, 92, 148, + 149, 95, 77, 77, 67, 99, 100, 101, 67, 67, + 104, 105, 67, 67, 108, 67, 77, 111, 112, 79, 77, 77, 148, 149, 77, 119, 77, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, - 77, 77, 77, 86, 89, 79, 71, 79, 79, 79, - 79, 91, 77, 94, 148, 149, 81, 96, 96, 84, - 85, 86, 110, 88, 87, 90, 29, 92, 56, 57, - 95, 93, 126, 94, 99, 100, 101, 94, 94, 104, - 105, 123, 102, 108, 47, 48, 111, 112, 102, 139, - 53, 146, 55, 126, 119, 123, 142, 146, 142, 146, - 127, -1, 128, 155, 67, 129, -1, -1, -1, 47, - 48, -1, 75, 76, -1, 53, 79, 55, 128, 128, - 83, 128, -1, 148, 149, -1, 139, 142, 146, 67, - 142, 142, 151, -1, 142, -1, 142, 75, 76, 142, - 128, 79, 146, 148, 146, 83, 146, 146, 149, 147, - -1, 148, 148, 148, 148, 148, 148, 148, 148, 148, + 77, 77, 77, 77, 82, 86, 71, 79, 79, 79, + 79, 91, 77, 96, 148, 149, 81, 96, 82, 84, + 85, 86, 89, 88, 87, 90, 29, 92, 56, 57, + 95, 93, 139, 94, 99, 100, 101, 94, 94, 104, + 105, 94, 102, 108, 47, 48, 111, 112, 102, 139, + 53, 109, 55, 126, 119, 110, 142, 123, 126, 146, + 142, 146, 146, 151, 67, 154, -1, -1, 127, 47, + 48, 123, 75, 76, -1, 53, 79, 55, 128, 128, + 83, 128, 128, 148, 149, 129, -1, -1, -1, 67, + -1, 142, -1, -1, 142, -1, -1, 75, 76, 142, + 128, 79, 142, 142, 142, 83, 147, 149, -1, 146, + 146, 146, 146, 146, -1, -1, 148, 148, 148, 148, -1, 148, 148, 148, 148, 148, 148, 130, 148, 132, 133, 134, 135, 136, 137, 138, 148, 148, 148, 148, 148, 144, 145, 148, 148, 151, 148, 148, 151, 148, - 153, 148, 130, 149, 132, 133, 134, 135, 136, 137, - 138, 149, 149, 149, 149, 149, 144, 145, 149, 149, - 149, 154, 149, 151, 149, 153, 149, 149, 149, 149, - 154, 150, 150, 150, 150, 150, 150, 150, 150, 150, + 153, 148, 130, 148, 132, 133, 134, 135, 136, 137, + 138, 148, 148, 148, 148, 148, 144, 145, 149, 149, + 149, -1, 149, 151, 149, 153, 149, 149, 149, 149, + 149, 149, 149, 149, 149, 149, -1, 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, 151, 151, + 150, 150, 150, 150, 150, 150, 150, 150, 150, -1, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, - 151, -1, 152, 152, 152, 152, 152, 152, 152, 152, + 151, 151, 151, 151, 151, 151, 151, -1, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, - 152, 152, 152, -1, -1, -1, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - -1, 156 + 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, 155, -1, 156 ); protected $actionBase = array( - 0, 220, 295, 109, 109, 180, 735, -2, -2, -2, - -2, -2, 135, 574, 473, 606, 473, 505, 404, 675, - 675, 675, 330, 389, 513, 513, 825, 513, 328, 359, - 365, 225, 586, 221, 576, 398, 398, 398, 398, 134, - 134, 398, 398, 398, 398, 398, 398, 398, 398, 398, - 398, 398, 398, 398, 398, 398, 398, 398, 398, 398, - 398, 398, 398, 398, 398, 398, 398, 398, 398, 398, - 398, 398, 398, 398, 398, 398, 398, 398, 398, 398, - 398, 398, 398, 398, 398, 398, 398, 398, 398, 398, - 398, 398, 398, 398, 398, 398, 398, 398, 398, 398, - 398, 398, 398, 398, 398, 398, 398, 398, 398, 398, - 398, 398, 398, 398, 398, 398, 398, 398, 398, 398, - 398, 398, 398, 398, 398, 398, 398, 398, 398, 398, - 398, 254, 179, 482, 460, 738, 736, 729, 731, 827, - 659, 823, 778, 779, 533, 780, 781, 782, 783, 784, - 777, 785, 841, 786, 418, 418, 418, 418, 418, 418, + 0, 220, 295, 109, 109, 180, 745, -2, -2, -2, + -2, -2, 135, 574, 473, 404, 473, 606, 505, 675, + 675, 675, 330, 389, 221, 221, 831, 221, 359, 365, + 328, 520, 589, 548, 576, 42, 42, 42, 42, 134, + 134, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 254, 179, 290, 397, 757, 755, 738, 741, 833, + 679, 829, 784, 785, 623, 786, 787, 788, 789, 790, + 783, 791, 849, 792, 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, -3, 354, 383, 413, 206, - 524, 618, 618, 618, 618, 618, 618, 618, 175, 175, + 628, 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, 521, 521, 521, 573, - 737, 496, 762, 762, 762, 762, 762, 762, 762, 762, + 175, 175, 175, 175, 175, 403, 618, 618, 618, 523, + 737, 603, 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, 608, - 327, 587, 210, 489, 197, 25, 25, 25, 25, 25, + 327, 583, 210, 489, 197, 25, 25, 25, 25, 25, 17, 45, 5, 5, 5, 5, 712, 305, 305, 305, - 305, 118, 118, 118, 118, 774, 775, 795, 798, 303, - 303, 676, 676, 629, 765, 522, 522, 498, 498, 487, + 305, 118, 118, 118, 118, 780, 781, 801, 804, 395, + 395, 696, 696, 616, 773, 522, 522, 498, 498, 487, 487, 487, 487, 487, 487, 487, 487, 487, 487, 387, - 156, 817, 130, 130, 130, 130, 243, 469, 650, 855, + 156, 823, 130, 130, 130, 130, 243, 409, 633, 863, 207, 207, 207, 243, 248, 248, 248, 476, 476, 476, - 76, 631, 296, 296, 547, 547, 547, 477, 477, 477, - 477, 483, 699, 627, 477, 477, 477, 362, 97, 334, - 661, 799, 662, 802, 508, 692, 96, 700, 653, -6, - 680, 571, 569, 561, 656, 406, -6, 254, 532, 430, - 630, 718, 643, 432, 716, 193, 408, 363, 523, 447, - 414, 232, 767, 732, 821, 820, 137, 321, 693, 630, - 630, 630, 13, 84, 768, 769, 447, 273, 570, 570, - 570, 570, 801, 770, 570, 570, 570, 570, 800, 794, - 268, 38, 776, 74, 717, 644, 644, 644, 644, 644, - 644, 567, 644, 807, 664, 819, 819, 642, 666, 567, - 818, 818, 818, 818, 567, 644, 819, 819, 567, 629, - 819, 168, 567, 667, 644, 646, 646, 818, 713, 711, - 664, 671, 673, 819, 819, 819, 673, 642, 567, 818, - 603, 702, 67, 819, 818, 636, 636, 603, 567, 636, - 666, 636, 54, 623, 621, 815, 816, 814, 665, 744, - 672, 658, 805, 804, 812, 626, 639, 808, 806, 698, - 710, 709, 638, 610, 633, 635, 637, 641, 688, 628, - 674, 680, 696, 604, 604, 604, 690, 685, 690, 604, - 604, 604, 604, 604, 604, 604, 604, 648, 694, 697, - 691, 657, 708, 599, 682, 679, 579, 759, 687, 698, - 698, 796, 829, 836, 766, 757, 663, 734, 831, 690, - 854, 715, 274, 597, 681, 797, 645, 649, 701, 690, - 803, 690, 760, 690, 828, 793, 647, 698, 773, 604, - 826, 853, 852, 851, 850, 849, 848, 847, 846, 622, - 845, 707, 677, 835, 119, 811, 656, 654, 651, 706, - 440, 844, 772, 690, 690, 761, 699, 690, 763, 743, - 714, 839, 704, 834, 843, 687, 833, 690, 686, 842, - 440, 632, 625, 822, 678, 695, 813, 670, 824, 810, - 752, 572, 619, 771, 634, 741, 838, 837, 840, 703, - 753, 754, 616, 660, 668, 669, 787, 755, 809, 705, - 788, 789, 830, 684, 696, 689, 652, 683, 655, 756, - 790, 832, 720, 728, 730, 791, 739, 792, 0, 0, + 76, 662, 296, 86, 86, 86, 86, 296, 86, 86, + 554, 554, 554, 483, 761, 676, 477, 430, 97, 459, + 657, 807, 661, 808, 540, 702, 96, 656, 705, -6, + 680, 577, 571, 561, 689, 406, -6, 254, 551, 447, + 617, 732, 663, 268, 730, 377, 38, 367, 532, 362, + 414, 334, 774, 720, 827, 826, 74, 321, 691, 617, + 617, 617, 137, 84, 775, 772, 362, 273, 575, 575, + 575, 575, 806, 776, 575, 575, 575, 575, 805, 800, + 432, 408, 782, 331, 731, 649, 649, 649, 649, 649, + 649, 635, 649, 813, 666, 825, 825, 664, 668, 635, + 824, 824, 824, 824, 635, 649, 825, 825, 635, 616, + 825, 168, 635, 672, 649, 667, 667, 824, 756, 718, + 666, 669, 681, 825, 825, 825, 681, 664, 635, 824, + 682, 699, 466, 825, 824, 632, 632, 682, 635, 632, + 668, 632, 20, 605, 641, 821, 822, 820, 625, 698, + 688, 674, 811, 810, 816, 665, 626, 814, 812, 706, + 717, 716, 639, 610, 642, 645, 646, 648, 697, 637, + 694, 680, 707, 629, 629, 629, 690, 658, 690, 629, + 629, 629, 629, 629, 629, 629, 629, 848, 700, 701, + 693, 659, 715, 604, 704, 687, 472, 768, 650, 706, + 706, 802, 835, 842, 847, 651, 643, 734, 837, 690, + 862, 729, 274, 587, 652, 803, 703, 647, 655, 690, + 809, 690, 769, 690, 834, 799, 644, 706, 779, 629, + 832, 861, 860, 859, 858, 857, 856, 855, 854, 630, + 853, 714, 677, 841, 246, 815, 689, 692, 653, 713, + 67, 852, 778, 690, 690, 770, 761, 690, 771, 711, + 728, 845, 710, 840, 851, 650, 839, 690, 686, 850, + 67, 634, 598, 828, 678, 708, 819, 671, 830, 818, + 759, 547, 579, 777, 636, 754, 844, 843, 846, 709, + 760, 763, 572, 660, 640, 670, 793, 765, 817, 735, + 794, 795, 836, 684, 707, 654, 685, 683, 673, 767, + 796, 838, 736, 739, 743, 797, 753, 798, 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, @@ -539,18 +539,18 @@ class Php5 extends \PhpParser\ParserAbstract -20, -20, -20, 0, 248, 248, 248, 248, -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, 644, - 644, 644, 644, 644, 296, 296, 296, 407, 407, 407, - 644, 0, 0, 0, 0, 0, 0, 644, 296, 0, - 0, 644, 644, 644, 644, 644, 644, 644, 644, 407, - 296, 644, 644, 644, 819, 0, 407, 550, 550, 550, - 550, 440, 447, 0, 644, 644, 0, 671, 0, 0, - 0, 819, 0, 0, 0, 0, 0, 604, 274, 734, - 0, 427, 0, 0, 0, 0, 0, 0, 0, 663, - 427, 246, 246, 0, 0, 622, 604, 604, 604, 0, - 0, 663, 663, 0, 0, 0, 0, 0, 0, 433, - 663, 0, 0, 0, 0, 433, 322, 0, 0, 322, - 0, 440 + 0, 0, 0, 0, 0, 0, 487, 55, 487, 649, + 649, 649, 649, 649, 296, 296, 296, 47, 47, 47, + 649, 0, 0, 0, 0, 0, 0, 649, 296, 0, + 487, 487, 487, 487, 0, 487, 487, 649, 649, 649, + 649, 47, 296, 649, 825, 0, 47, 550, 550, 550, + 550, 67, 362, 0, 649, 649, 0, 669, 0, 0, + 0, 825, 0, 0, 0, 0, 0, 629, 274, 734, + 0, 433, 0, 0, 0, 0, 0, 0, 0, 643, + 433, 322, 322, 0, 0, 630, 629, 629, 629, 0, + 0, 643, 643, 0, 0, 0, 0, 0, 0, 440, + 643, 0, 0, 0, 0, 440, 425, 0, 0, 425, + 0, 67 ); protected $actionDefault = array( @@ -586,7 +586,7 @@ class Php5 extends \PhpParser\ParserAbstract 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, 272,32767, 228, 228, 228, 228, 228,32767,32767,32767, 32767,32767,32767,32767, 321, 322, 320, 448, 449, 447, - 32767, 415,32767, 417,32767,32767,32767,32767,32767,32767, + 32767, 415,32767,32767,32767,32767,32767, 417,32767,32767, 32767,32767,32767,32767,32767,32767,32767, 486,32767,32767, 32767,32767,32767,32767,32767, 499, 404,32767,32767,32767, 397, 212, 214, 161, 472,32767,32767,32767,32767, 504, @@ -604,7 +604,7 @@ class Php5 extends \PhpParser\ParserAbstract 32767,32767,32767,32767,32767,32767,32767,32767,32767, 399, 32767,32767,32767,32767, 365, 366, 475, 488,32767, 489, 32767, 397,32767, 329, 330, 332, 309,32767, 311, 355, - 356, 357, 358, 359, 360, 361, 363,32767,32767, 402, + 356, 357, 358, 359, 360, 361, 363,32767, 402,32767, 405,32767,32767,32767, 84, 108, 247,32767, 537, 84, 400,32767,32767, 294, 537,32767,32767,32767,32767, 532, 32767,32767, 288,32767,32767,32767, 84,32767, 84, 243, @@ -635,61 +635,55 @@ class Php5 extends \PhpParser\ParserAbstract 549, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 145, 146, 147, 161, 148, 163, 149, 197, 164, 150, 151, 152, 198, 153, 131, 625, - 567, 753, 567, 567, 567, 567, 567, 567, 567, 567, + 567, 754, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, - 567, 567, 567, 567, 567, 1100, 754, 1100, 1100, 1100, + 567, 567, 567, 567, 567, 1100, 753, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, 1100, - 885, 885, 1190, 1190, 6, 611, 784, 168, 617, 509, - 358, 509, 171, 172, 173, 388, 389, 390, 391, 167, + 523, 784, 497, 497, 497, 497, 497, 497, 6, 508, + 634, 508, 497, 497, 497, 497, 497, 497, 497, 497, + 497, 497, 509, 550, 509, 580, 606, 522, 885, 885, + 1190, 1190, 815, 849, 849, 849, 849, 168, 844, 850, + 522, 522, 171, 172, 173, 388, 389, 390, 391, 167, 195, 199, 201, 249, 251, 253, 260, 261, 262, 263, 264, 265, 271, 272, 273, 274, 287, 288, 317, 318, 319, 394, 395, 396, 397, 169, 174, 246, 247, 175, - 176, 177, 497, 497, 497, 497, 497, 497, 341, 580, - 606, 523, 497, 497, 497, 497, 497, 497, 497, 497, - 497, 497, 508, 634, 508, 387, 608, 543, 543, 573, - 539, 1076, 1075, 790, 752, 541, 541, 496, 498, 529, - 545, 574, 577, 587, 593, 871, 1169, 851, 1169, 657, - 815, 511, 880, 875, 566, 855, 566, 566, 566, 566, + 176, 177, 387, 608, 543, 543, 573, 539, 583, 586, + 631, 855, 541, 541, 496, 498, 529, 545, 574, 577, + 587, 593, 341, 1169, 566, 1169, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, - 566, 566, 566, 566, 566, 566, 566, 566, 566, 551, - 552, 553, 554, 555, 556, 557, 558, 560, 589, 550, - 323, 309, 514, 522, 1201, 1201, 519, 519, 519, 583, - 586, 631, 510, 519, 510, 1161, 522, 522, 903, 1201, - 590, 344, 404, 430, 430, 430, 430, 430, 430, 538, - 519, 544, 1058, 430, 430, 430, 430, 430, 430, 430, - 430, 430, 430, 1065, 1194, 1065, 892, 892, 892, 892, - 892, 361, 598, 535, 777, 659, 562, 892, 594, 868, - 882, 613, 867, 616, 878, 620, 621, 628, 630, 635, - 637, 849, 849, 849, 849, 1149, 1081, 607, 844, 850, - 615, 777, 777, 1019, 17, 13, 355, 519, 519, 536, - 568, 519, 519, 1187, 519, 443, 445, 933, 636, 375, - 561, 1101, 618, 931, 1061, 1062, 889, 520, 1058, 276, - 277, 278, 21, 1200, 1200, 548, 547, 604, 572, 342, - 343, 1059, 1160, 1059, 1168, 362, 1168, 1009, 1200, 527, - 898, 1060, 941, 540, 347, 1184, 1184, 1184, 1203, 770, - 770, 778, 778, 778, 780, 960, 769, 398, 373, 451, - 369, 369, 369, 773, 368, 771, 645, 1167, 907, 10, - 402, 1051, 1056, 446, 781, 578, 912, 859, 1146, 459, - 949, 0, 369, 0, 0, 0, 0, 0, 0, 386, + 566, 566, 566, 566, 566, 566, 566, 566, 566, 514, + 443, 445, 933, 636, 327, 309, 1101, 618, 931, 519, + 519, 519, 519, 777, 551, 552, 553, 554, 555, 556, + 557, 558, 560, 589, 903, 611, 538, 519, 617, 548, + 358, 544, 572, 430, 430, 430, 430, 430, 430, 1194, + 777, 777, 361, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 1065, 1161, 1065, 892, 892, 892, 892, + 892, 1168, 598, 1168, 590, 344, 404, 892, 369, 369, + 369, 1058, 1184, 1184, 1184, 1076, 1075, 1065, 1065, 1065, + 1065, 1149, 1065, 1065, 519, 519, 536, 568, 519, 519, + 615, 519, 369, 510, 960, 510, 1167, 386, 770, 770, + 778, 778, 778, 780, 520, 769, 276, 277, 278, 535, + 607, 659, 562, 547, 594, 868, 882, 613, 867, 616, + 878, 620, 621, 628, 630, 635, 637, 1081, 375, 1201, + 1201, 1187, 1009, 889, 1019, 17, 13, 355, 790, 752, + 1200, 1200, 898, 1061, 1062, 362, 941, 1058, 1201, 527, + 871, 561, 851, 540, 657, 347, 511, 880, 875, 1200, + 1059, 1160, 1059, 21, 398, 373, 773, 1203, 604, 451, + 1060, 771, 907, 342, 343, 368, 645, 402, 446, 10, + 1056, 1051, 912, 781, 578, 1146, 859, 459, 949, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 528 + 528 ); protected $gotoCheck = array( @@ -704,78 +698,72 @@ class Php5 extends \PhpParser\ParserAbstract 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 53, - 112, 11, 112, 112, 112, 112, 112, 112, 112, 112, - 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, - 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, - 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, - 112, 112, 112, 112, 112, 119, 12, 119, 119, 119, + 63, 12, 63, 63, 63, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 119, 11, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, - 70, 70, 70, 70, 90, 57, 25, 23, 57, 112, - 57, 112, 23, 23, 23, 23, 23, 23, 23, 23, + 94, 25, 110, 110, 110, 110, 110, 110, 91, 63, + 5, 63, 110, 110, 110, 110, 110, 110, 110, 110, + 110, 110, 110, 40, 110, 36, 36, 40, 71, 71, + 71, 71, 46, 63, 63, 63, 63, 23, 63, 63, + 40, 40, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, - 23, 23, 109, 109, 109, 109, 109, 109, 65, 36, - 36, 93, 109, 109, 109, 109, 109, 109, 109, 109, - 109, 109, 109, 5, 109, 47, 47, 47, 47, 47, - 47, 117, 117, 10, 10, 47, 47, 47, 47, 47, - 47, 47, 47, 47, 47, 10, 110, 10, 110, 10, - 46, 10, 10, 10, 53, 29, 53, 53, 53, 53, + 23, 23, 47, 47, 47, 47, 47, 47, 56, 56, + 56, 29, 47, 47, 47, 47, 47, 47, 47, 47, + 47, 47, 66, 111, 53, 111, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, - 53, 53, 53, 53, 53, 53, 53, 53, 53, 102, - 102, 102, 102, 102, 102, 102, 102, 102, 102, 40, - 118, 118, 8, 40, 134, 134, 8, 8, 8, 56, - 56, 56, 115, 8, 115, 75, 40, 40, 77, 134, - 63, 63, 63, 53, 53, 53, 53, 53, 53, 8, - 8, 101, 75, 53, 53, 53, 53, 53, 53, 53, - 53, 53, 53, 53, 132, 53, 53, 53, 53, 53, - 53, 43, 120, 28, 19, 28, 28, 53, 28, 28, - 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, - 28, 53, 53, 53, 53, 124, 30, 45, 53, 53, - 53, 19, 19, 30, 30, 30, 30, 8, 8, 8, - 8, 8, 8, 130, 8, 7, 7, 7, 7, 44, - 30, 7, 7, 7, 75, 75, 72, 8, 75, 61, - 61, 61, 30, 133, 133, 2, 8, 30, 2, 65, - 65, 75, 75, 75, 111, 54, 111, 94, 133, 54, - 74, 75, 90, 54, 14, 111, 111, 111, 133, 19, - 19, 19, 19, 19, 19, 93, 19, 18, 13, 54, - 116, 116, 116, 21, 9, 20, 67, 111, 78, 54, - 17, 105, 107, 59, 22, 60, 79, 64, 123, 100, - 92, -1, 116, -1, -1, -1, -1, -1, -1, 116, + 53, 53, 53, 53, 53, 53, 53, 53, 53, 8, + 7, 7, 7, 7, 118, 118, 7, 7, 7, 8, + 8, 8, 8, 19, 103, 103, 103, 103, 103, 103, + 103, 103, 103, 103, 78, 57, 8, 8, 57, 2, + 57, 102, 2, 53, 53, 53, 53, 53, 53, 132, + 19, 19, 43, 53, 53, 53, 53, 53, 53, 53, + 53, 53, 53, 53, 76, 53, 53, 53, 53, 53, + 53, 112, 120, 112, 64, 64, 64, 53, 116, 116, + 116, 76, 112, 112, 112, 117, 117, 53, 53, 53, + 53, 124, 53, 53, 8, 8, 8, 8, 8, 8, + 53, 8, 116, 115, 94, 115, 112, 116, 19, 19, + 19, 19, 19, 19, 8, 19, 61, 61, 61, 28, + 45, 28, 28, 8, 28, 28, 28, 28, 28, 28, + 28, 28, 28, 28, 28, 28, 28, 30, 44, 134, + 134, 130, 95, 73, 30, 30, 30, 30, 10, 10, + 133, 133, 75, 76, 76, 54, 91, 76, 134, 54, + 10, 30, 10, 54, 10, 14, 10, 10, 10, 133, + 76, 76, 76, 30, 18, 13, 21, 133, 30, 54, + 76, 20, 79, 66, 66, 9, 68, 17, 59, 54, + 108, 106, 80, 22, 60, 123, 65, 101, 93, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 93 + 94 ); protected $gotoBase = array( - 0, 0, -165, 0, 0, 261, 0, 452, 42, 183, - 282, 109, 154, 161, 174, 0, 0, 114, 182, 94, - 167, 187, 84, 7, 0, 198, 0, 0, -226, 287, - 23, 0, 0, 0, 0, 0, 223, 0, 0, -22, - 337, 0, 0, 373, 169, 157, 284, -4, 0, 0, - 0, 0, 0, 104, 61, 0, 66, -251, 0, 87, - 79, -194, 0, 52, 80, -181, 0, 159, 0, 0, - -79, 0, 160, 0, 177, 38, 0, 355, 162, 85, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 192, 0, 70, 222, 186, 0, 0, 0, 0, 0, - 72, 366, 307, 0, 0, 105, 0, 103, 0, -27, - -3, 185, -90, 0, 0, 73, 200, -30, 39, -45, - 209, 0, 0, 76, 231, 0, 0, 0, 0, 0, - 171, 0, 377, 165, 56, 0, 0 + 0, 0, -261, 0, 0, 198, 0, 347, 29, 192, + 487, 154, 109, 168, 185, 0, 0, 121, 183, 43, + 173, 184, 93, 37, 0, 193, 0, 0, -180, 273, + 64, 0, 0, 0, 0, 0, 189, 0, 0, -22, + 201, 0, 0, 354, 188, 180, 216, 3, 0, 0, + 0, 0, 0, 104, 71, 0, -15, -81, 0, 92, + 88, -207, 0, -90, 90, 89, -137, 0, 169, 0, + 0, -51, 0, 177, 0, 179, 67, 0, 351, 166, + 91, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 196, 0, 78, 161, 181, 0, 0, 0, 0, + 0, 80, 356, 322, 0, 0, 115, 0, 111, 0, + -77, 4, 112, 0, 0, 144, 108, 114, 33, -45, + 209, 0, 0, 83, 227, 0, 0, 0, 0, 0, + 199, 0, 362, 182, 171, 0, 0 ); protected $gotoDefault = array( @@ -785,14 +773,14 @@ class Php5 extends \PhpParser\ParserAbstract 1010, 351, 795, 352, 592, 797, 531, 799, 800, 132, 481, 365, 366, 532, 374, 581, 814, 266, 371, 816, 353, 817, 826, 354, 614, 597, 563, 610, 482, 442, - 575, 275, 542, 570, 858, 340, 866, 648, 874, 877, - 483, 564, 888, 448, 896, 1086, 382, 902, 908, 913, - 916, 418, 401, 588, 920, 921, 5, 925, 626, 627, - 940, 300, 948, 961, 416, 1029, 1031, 484, 485, 525, - 456, 507, 530, 486, 1052, 436, 403, 1055, 487, 488, - 426, 427, 1073, 1070, 346, 1154, 345, 444, 308, 1141, + 575, 275, 542, 1073, 570, 858, 340, 866, 648, 874, + 877, 483, 564, 888, 448, 896, 1086, 382, 902, 908, + 913, 916, 418, 401, 588, 920, 921, 5, 925, 626, + 627, 940, 300, 948, 961, 416, 1029, 1031, 484, 485, + 525, 456, 507, 530, 486, 1052, 436, 403, 1055, 487, + 488, 426, 427, 1070, 346, 1154, 345, 444, 308, 1141, 584, 1105, 452, 1193, 1150, 337, 489, 490, 359, 376, - 1188, 431, 1195, 1202, 333, 367, 571 + 1188, 431, 1195, 1202, 335, 367, 571 ); protected $ruleToNonTerminal = array( @@ -814,17 +802,17 @@ class Php5 extends \PhpParser\ParserAbstract 29, 29, 29, 29, 29, 29, 10, 10, 50, 50, 52, 51, 51, 44, 44, 54, 54, 55, 55, 11, 12, 12, 12, 58, 58, 58, 59, 59, 62, 62, - 60, 60, 63, 63, 37, 37, 46, 46, 49, 49, - 49, 48, 48, 64, 38, 38, 38, 38, 65, 65, - 66, 66, 67, 67, 35, 35, 31, 31, 68, 33, - 33, 69, 32, 32, 34, 34, 45, 45, 45, 56, - 56, 71, 71, 72, 72, 74, 74, 74, 73, 73, - 57, 57, 75, 75, 75, 76, 76, 77, 77, 77, - 41, 41, 78, 78, 78, 42, 42, 79, 79, 61, - 61, 80, 80, 80, 80, 85, 85, 86, 86, 87, - 87, 87, 87, 87, 88, 89, 89, 84, 84, 81, - 81, 83, 83, 91, 91, 90, 90, 90, 90, 90, - 90, 82, 82, 92, 92, 43, 43, 36, 36, 39, + 60, 60, 64, 64, 37, 37, 46, 46, 49, 49, + 49, 48, 48, 65, 38, 38, 38, 38, 66, 66, + 67, 67, 68, 68, 35, 35, 31, 31, 69, 33, + 33, 70, 32, 32, 34, 34, 45, 45, 45, 56, + 56, 72, 72, 73, 73, 75, 75, 75, 74, 74, + 57, 57, 76, 76, 76, 77, 77, 78, 78, 78, + 41, 41, 79, 79, 79, 42, 42, 80, 80, 61, + 61, 81, 81, 81, 81, 86, 86, 87, 87, 88, + 88, 88, 88, 88, 89, 90, 90, 85, 85, 82, + 82, 84, 84, 92, 92, 91, 91, 91, 91, 91, + 91, 83, 83, 93, 93, 43, 43, 36, 36, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, @@ -833,22 +821,22 @@ class Php5 extends \PhpParser\ParserAbstract 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 30, 30, 40, 40, 97, 97, 98, - 98, 98, 98, 104, 93, 93, 100, 100, 106, 106, - 107, 108, 108, 108, 108, 108, 108, 112, 112, 53, - 53, 53, 94, 94, 113, 113, 109, 109, 114, 114, - 114, 114, 95, 95, 95, 99, 99, 99, 105, 105, + 39, 39, 39, 30, 30, 40, 40, 98, 98, 99, + 99, 99, 99, 105, 94, 94, 101, 101, 107, 107, + 108, 109, 109, 109, 109, 109, 109, 63, 63, 53, + 53, 53, 95, 95, 113, 113, 110, 110, 114, 114, + 114, 114, 96, 96, 96, 100, 100, 100, 106, 106, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 23, 23, 23, 23, 23, 23, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, - 121, 121, 103, 103, 96, 96, 96, 96, 120, 120, + 121, 121, 104, 104, 97, 97, 97, 97, 120, 120, 123, 123, 122, 122, 124, 124, 47, 47, 47, 47, - 126, 126, 125, 125, 125, 125, 125, 127, 127, 111, - 111, 115, 115, 110, 110, 128, 128, 128, 128, 116, - 116, 116, 116, 102, 102, 117, 117, 117, 117, 70, - 129, 129, 130, 130, 130, 101, 101, 131, 131, 132, + 126, 126, 125, 125, 125, 125, 125, 127, 127, 112, + 112, 115, 115, 111, 111, 128, 128, 128, 128, 116, + 116, 116, 116, 103, 103, 117, 117, 117, 117, 71, + 129, 129, 130, 130, 130, 102, 102, 131, 131, 132, 132, 132, 132, 118, 118, 118, 118, 134, 135, 133, 133, 133, 133, 133, 133, 133, 136, 136, 136 ); diff --git a/lib/PhpParser/Parser/Php7.php b/lib/PhpParser/Parser/Php7.php index 0dd0862..6105c30 100644 --- a/lib/PhpParser/Parser/Php7.php +++ b/lib/PhpParser/Parser/Php7.php @@ -19,7 +19,7 @@ class Php7 extends \PhpParser\ParserAbstract { protected $tokenToSymbolMapSize = 392; protected $actionTableSize = 891; - protected $gotoTableSize = 441; + protected $gotoTableSize = 429; protected $invalidSymbol = 157; protected $errorSymbol = 1; @@ -236,8 +236,8 @@ class Php7 extends \PhpParser\ParserAbstract 581, 582, 583, 584, 585, 0, 586, 587, 588, 624, 625, 477, 27, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110,-32766,-32766,-32766, 95, 96, - 97, 361, 239, 266, -280,-32766,-32766,-32766, -486, -485, - 1077, 542, 1080, 1078, 98,-32766, 275,-32766,-32766,-32766, + 97, 361, 239, 263, -280,-32766,-32766,-32766, -486, -485, + 1077, 542, 1080, 1078, 98,-32766, 272,-32766,-32766,-32766, -32766,-32766, 589, 897, 899,-32766,-32766,-32766,-32766,-32766, -32766,-32766,-32766, 240,-32766, 662, 590, 591, 592, 593, 594, 595, 596,-32766, 289, 656, 865, 866, 867, 864, @@ -248,7 +248,7 @@ class Php7 extends \PhpParser\ParserAbstract 648, 639, 637, 638, 634, 635, 215, 626, 632, 633, 640, 641, 643, 642, 644, 645, 42, 43, 390, 44, 45, 636, 647, 646, 224, 46, 47, 980, 48,-32767, - -32767,-32767,-32767, 90, 91, 92, 93, 94, 269, 440, + -32767,-32767,-32767, 90, 91, 92, 93, 94, 258, 440, 22, 865, 866, 867, 864, 863, 862, 857,-32766,-32766, -32766, 1069, 1030, 1030, 1068, 1047, 996, 293, -441, 246, 287, 49, 50, -486, -485, -486, -485, 51,-32766, 52, @@ -257,13 +257,13 @@ class Php7 extends \PhpParser\ParserAbstract 998, 658, 661, 1030, 28, -475, 1010, 996,-32766,-32766, -32766, 735, 407, 408, 246, 1030,-32766, 246,-32766,-32766, -32766,-32766, 25, 222, 373, 385, 349, 226,-32766, -441, - -32766,-32766,-32766, 1033, 65, 342, 416, 216, 41, 258, - 258, 1044, 7, -441, 403, 404, 120, 21, 973, 24, + -32766,-32766,-32766, 1033, 65, 342, 416, 216, 41, 264, + 264, 1044, 7, -441, 403, 404, 120, 21, 973, 24, -441, 820, -444, 407, 408, -225, 1002, 1003, 1004, 1005, - 999, 1000, 243, 116, -440, -439, 259, 417, 1006, 1001, - 347, 814, 815, 1074, 992, 63, 369, 255, 362, 256, - 258, 391, -131, -131, -131, -4, 735, 392, 658, 224, - -439, 725, 258, -88, 32, 17, 393, -131, 394, -131, + 999, 1000, 243, 116, -440, -439, 265, 417, 1006, 1001, + 347, 814, 815, 1074, 992, 63, 369, 255, 362, 260, + 264, 391, -131, -131, -131, -4, 735, 392, 658, 224, + -439, 725, 264, -88, 32, 17, 393, -131, 394, -131, 395, -131, 396, -131, 128, 397, -131, -131, -131, 34, 35, 398, 346, 122, 36, 399, 814, 815, 62, 814, 815, 286, 288, 400, 401, -440, -439, 465, -249, 402, @@ -276,7 +276,7 @@ class Php7 extends \PhpParser\ParserAbstract 399, 247, 248, 62, 254, 735, 286, 288, 400, 401, 408, 120, 131, 530, 402, 980, 306, 668, 756, 405, 406, 337, 113, 115,-32766,-32766, 72, 73, 74, 242, - 529, 65, 121, 553, 502, 18, 258, 126, 272, 258, + 529, 65, 121, 553, 502, 18, 264, 126, 274, 264, -32766,-32766,-32766, 737, 547, -4, 26, 749, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, @@ -290,35 +290,35 @@ class Php7 extends \PhpParser\ParserAbstract 559, 221, 225, 239, 391, 98, 658, 439, 39, 525, 392, 659, 773, 547, 725, 435, 969, 32, 17, 393, 358, 394, 356, 395, 299, 396, 319, 692, 397, 1072, - 258, 451, 34, 35, 398, 735, 391, 36, 399, 453, + 264, 451, 34, 35, 398, 735, 391, 36, 399, 453, 511, 62, 392, 449, 286, 288, 725, 499, 540, 32, 17, 393, 402, 394, 438, 395, 1079, 396, 354, 444, 397,-32766, 493, 551, 34, 35, 398, 735, 503, 36, - 399, 526, -80, 62, 758, 507, 286, 288, 214, 456, - 10, 737, 547, 519, 402, 508, 267, -442, 0, 0, - 327, 0, 0, 270, 1009, 560, 757, 1012, 274, 0, - 0, 268, 0, 0, 0, 391, 0, 0, 0, 0, - 0, 392, 0, 737, 547, 725, 227, 0, 32, 17, + 399, 526, -80, 62, 757, 507, 286, 288, 214, 456, + 10, 737, 547, 519, 402, 508, 973, 257, 15, 0, + 338, 0, 0, 259, 1009, 560, 758, 1012, 262, 0, + 0, 0, 0, 0, 0, 391, 0, 0, 0, 0, + 0, 392, 0, 737, 547, 725, 227, 256, 32, 17, 393, 0, 394, 0, 395, 0, 396, 0, 0, 397, - 9, 0, 305, 34, 35, 398, 735, 391, 36, 399, - -398, 3, 62, 392, 751, 286, 288, 725, 22, 339, - 32, 17, 393, 402, 394, 338, 395, 324, 396, 316, - 1030, 397, 323, 357, 996, 34, 35, 398, 446, 714, + 3, 0, 9, 34, 35, 398, 735, 391, 36, 399, + 305, -398, 62, 392, 751, 286, 288, 725, 22, 339, + 32, 17, 393, 402, 394, 327, 395, 324, 396, 316, + 1030, 397, 323, 357, 996, 34, 35, 398, 446, 771, 36, 399, 31, 573, 62, 574, 716, 286, 288, 838, 848, 790, 737, 547, 30, 402, 847, 850, 849, 846, - 769, 771, 774, 973, 782, 839, 781, 15, 548, 333, - 550, 555, 557, 558, 264, 265, 391, 332, 571, 570, + 769, 774, 714, 973, 782, 839, 781, 19, 548, 333, + 550, 555, 557, 558, 270, 271, 391, 332, 571, 570, 407, 408, 392, 568, 737, 547, 725, 566, 563, 32, 17, 393, 562, 394, 755, 395, 754, 396, 753, 961, - 397, -465, 65, 855, 34, 35, 398, 258, 742, 36, + 397, -442, 65, 855, 34, 35, 398, 264, 742, 36, 399, 960, 959, 62, 752, 744, 286, 288,-32766,-32766, -32766, 679, 1075, 678, 402, 681, 680, 670, 671, 780, 567, 712, 1076, 779, 1045, 1042, 1037, 1024,-32766, 1031, -32766,-32766,-32766,-32766,-32766,-32766,-32767,-32767,-32767,-32767, - -32767, 1073, 19, 737, 547, -444, 953, -443, 20, 23, - 29, 33, 37, 64, 336, 334, 271, 238, 237, 236, - 235, 218, 217, 132, 129, 123, 70, 69, 68, 67, - 66, -467, 0, 250, 308, 473, 937, 489, 539, -228, + -32767, 1073, 250, 737, 547, -465, 953, -444, -443, 20, + 23, 29, 33, 37, 64, 336, 334, 273, 238, 237, + 236, 235, 218, 217, 132, 129, 123, 70, 69, 68, + 67, 66, -467, 0, 308, 473, 937, 489, 539, -228, 940, 11, 965, 821, 994, 936, 984, 536, 388, -88, 381, 378, 375, 309, 16, 14, 13, 12, -225, -226, 0, -410, 0, 993, 501, 1071, 1036, 1023, 1022, 0, @@ -388,10 +388,10 @@ class Php7 extends \PhpParser\ParserAbstract 85, 86, 119, 88, 79, 90, 80, 92, 102, 82, 95, 82, 109, 29, 99, 100, 101, 1, 87, 104, 105, 91, 94, 108, 123, 93, 111, 112, 94, 94, - 94, 148, 149, 96, 119, 96, 126, 151, -1, -1, + 94, 148, 149, 96, 119, 96, 112, 127, 152, -1, 146, -1, -1, 110, 139, 29, 123, 139, 126, -1, - -1, 127, -1, -1, -1, 71, -1, -1, -1, -1, - -1, 77, -1, 148, 149, 81, 35, -1, 84, 85, + -1, -1, -1, -1, -1, 71, -1, -1, -1, -1, + -1, 77, -1, 148, 149, 81, 35, 126, 84, 85, 86, -1, 88, -1, 90, -1, 92, -1, -1, 95, 142, -1, 142, 99, 100, 101, 1, 71, 104, 105, 142, 142, 108, 77, 147, 111, 112, 81, 67, 146, @@ -411,7 +411,7 @@ class Php7 extends \PhpParser\ParserAbstract 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, -1, 152, 152, 152, 152, 152, 152, 152, + 151, 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, 152, -1, 153, -1, 154, 154, 154, 154, 154, 154, -1, @@ -432,9 +432,9 @@ 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, 64, 64, 359, 201, 701, 708, 703, - 585, 709, 524, 702, 704, 234, 671, 659, 408, 657, - 656, 655, 654, 705, 730, 670, 706, 418, 418, 418, + 134, 134, 134, 64, 64, 359, 201, 670, 708, 703, + 476, 709, 524, 702, 704, 234, 671, 659, 408, 657, + 656, 655, 654, 705, 730, 585, 706, 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, 48, 509, 416, 432, 432, 432, 432, 432, 432, 432, 432, 432, 432, 432, 432, 432, 432, @@ -444,35 +444,35 @@ class Php7 extends \PhpParser\ParserAbstract 280, 280, 280, 280, 280, 280, 280, 280, 614, 616, 618, 619, 414, 429, 429, 196, 196, 196, 196, 146, 151, -45, 199, 77, 498, 735, 399, 174, 174, 111, - 207, -22, -22, -22, 275, 517, 92, 92, 242, -37, - 233, 233, 274, 233, 422, 422, 422, 221, 221, 221, - 221, 221, 240, 519, 221, 221, 221, 591, 529, 653, - 527, 649, 273, 31, 32, 549, 94, 543, 496, 94, - 421, 362, 425, 717, 64, 538, 64, 64, 64, 64, + 207, -22, -22, -22, 275, 517, 514, 514, 514, 514, + 92, 92, 514, 514, 242, -37, 233, 233, 274, 233, + 422, 422, 422, 221, 240, 519, 221, 591, 529, 653, + 527, 649, 273, 31, 32, 484, 94, 543, 496, 94, + 421, 362, 425, 717, 64, 539, 64, 64, 64, 64, 64, 64, 64, 64, 64, 94, 94, 64, 205, 64, 387, 359, 383, 489, 502, 209, 595, 339, 241, 133, 489, 489, 489, 596, 598, 331, 113, 590, 348, 411, 358, 351, 469, 469, 412, 478, 494, 469, 469, 469, - 469, 508, 469, 677, 677, 681, 412, 469, 677, 412, - 266, 24, 173, 67, 412, 281, 500, 469, 512, 512, - 279, 478, 515, 230, 250, 514, 677, 677, 514, 494, - 56, 412, 39, 565, 567, 493, 537, 26, 400, 400, + 469, 508, 469, 678, 678, 682, 412, 469, 678, 412, + 266, 24, 173, 67, 412, 281, 531, 469, 512, 512, + 279, 478, 515, 230, 250, 500, 678, 678, 500, 494, + 56, 412, 26, 565, 567, 493, 537, 39, 400, 400, 238, 493, 228, 412, 400, 508, 245, 170, 400, 5, - 682, 699, 482, 698, 679, 697, 683, 696, 487, 589, - 513, 491, 691, 690, 695, 470, 485, 680, 678, 562, - 483, 456, 465, 539, 481, 476, 496, 557, 479, 479, - 479, 481, 674, 479, 479, 479, 479, 479, 479, 479, - 479, 729, 252, 530, 497, 486, 553, 525, 458, 608, - 495, 562, 562, 651, 728, 673, 474, 689, 714, 694, - 576, 472, 722, 688, 650, 556, 490, 551, 687, 721, - 713, 604, 456, 712, 652, 492, 562, 648, 479, 620, - 700, 734, 733, 676, 732, 720, 484, 516, 731, 647, + 683, 700, 482, 699, 680, 698, 684, 697, 487, 589, + 491, 513, 692, 691, 696, 470, 485, 681, 679, 562, + 483, 456, 465, 528, 481, 620, 496, 557, 479, 479, + 479, 481, 676, 479, 479, 479, 479, 479, 479, 479, + 479, 729, 252, 538, 497, 486, 553, 525, 458, 608, + 495, 562, 562, 651, 728, 673, 474, 690, 714, 695, + 576, 472, 722, 689, 650, 556, 490, 551, 688, 721, + 713, 604, 456, 712, 652, 492, 562, 648, 479, 674, + 701, 734, 733, 677, 732, 720, 549, 516, 731, 647, 711, 600, 599, 564, 725, 707, 719, 646, 718, 568, - 521, 727, 522, 684, 501, 685, 592, 645, 643, 299, - 571, 642, 693, 573, 724, 723, 726, 584, 588, 593, - 594, 480, 641, 397, 587, 692, 511, 475, 520, 586, - 477, 710, 635, 613, 686, 561, 583, 634, 632, 715, - 518, 557, 528, 523, 526, 499, 609, 631, 716, 510, + 521, 727, 522, 685, 501, 686, 592, 645, 643, 299, + 571, 642, 694, 573, 724, 723, 726, 583, 588, 593, + 594, 480, 641, 397, 587, 693, 511, 475, 520, 586, + 477, 710, 635, 613, 687, 584, 561, 634, 632, 715, + 518, 557, 530, 523, 526, 499, 609, 631, 716, 510, 582, 581, 580, 579, 628, 578, 623, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -502,13 +502,13 @@ class Php7 extends \PhpParser\ParserAbstract 221, 221, 221, 221, 49, 49, 49, 49, 221, -22, -22, 221, 221, 221, 221, 221, 221, 49, 221, 92, 92, 92, 221, 94, 94, 0, 0, 0, 0, 0, - 469, 92, 0, 0, 94, 0, 0, 0, 0, 0, - 469, 469, 469, 0, 0, 0, 0, 0, 469, 92, - 0, 0, 0, 64, 423, 423, 423, 423, 0, 0, + 469, 92, 221, 221, 221, 221, 0, 0, 221, 221, + 94, 0, 0, 0, 0, 0, 469, 469, 469, 0, + 469, 92, 0, 64, 423, 423, 423, 423, 0, 0, 0, 469, 0, 469, 515, 0, 0, 0, 0, 412, - 0, 677, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 678, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 479, - 689, 0, 474, 0, 0, 0, 479, 479, 479, 474, + 690, 0, 474, 0, 0, 0, 479, 479, 479, 474, 474, 0, 0, 474 ); @@ -538,9 +538,9 @@ class Php7 extends \PhpParser\ParserAbstract 32767,32767,32767,32767,32767,32767, 88,32767, 282, 282, 282, 282,32767, 339, 340, 240, 240, 240, 240,32767, 240, 283,32767,32767,32767,32767,32767,32767,32767, 431, - 356, 334, 335, 333,32767, 409,32767, 411,32767,32767, - 322, 324, 403, 306,32767,32767, 88,32767,32767,32767, - 32767,32767,32767,32767,32767, 88,32767,32767,32767,32767, + 356, 334, 335, 333,32767, 409,32767,32767,32767,32767, + 32767, 411,32767, 88,32767,32767, 322, 324, 403, 306, + 32767,32767, 88,32767,32767,32767,32767,32767,32767,32767, 32767,32767, 406, 439, 439,32767,32767, 88, 397, 88, 167, 221, 223, 172,32767, 414,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, @@ -585,40 +585,38 @@ 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, 135, 170, 155, - 171, 172, 156, 532, 200, 436, 732, 279, 708, 665, - 667, 229, 200, 230, 231, 441, 441, 441, 789, 5, - 768, 666, 569, 441, 434, 798, 793, 470, 298, 301, - 448, 471, 472, 474, 483, 504, 457, 454, 441, 543, + 171, 172, 156, 532, 200, 436, 732, 279, 469, 853, + 545, 5, 200, 524, 851, 470, 667, 708, 665, 261, + 462, 441, 441, 441, 245, 441, 666, 789, 462, 768, + 702, 569, 433, 434, 798, 793, 457, 454, 441, 433, 572, 490, 492, 518, 522, 786, 527, 528, 800, 535, - 785, 537, 544, 796, 546, 469, 853, 545, 1065, 1065, - 524, 851, 486, 488, 538, 462, 697, 685, 827, 314, - 831, 1065, 447, 462, 702, 775, 729, 458, 745, 480, - 764, 310, 541, 441, 441, 805, 772, 765, 455, 476, - 441, 441, 688, 441, 376, 682, 433, 868, 442, 257, - 245, 701, 966, 433, 467, 479, 8, 823, 466, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 421, 421, 421, 421, 421, 421, 421, - 421, 421, 421, 421, 421, 421, 421, 463, 510, 1057, - 296, 1049, 505, 523, 460, 931, 970, 312, 808, 669, + 785, 537, 544, 796, 546, 543, 766, 766, 766, 766, + 483, 504, 760, 767, 1065, 1065, 697, 685, 827, 314, + 831, 510, 447, 467, 479, 775, 523, 458, 745, 480, + 312, 1065, 729, 441, 441, 805, 772, 765, 455, 476, + 441, 441, 688, 441, 376, 682, 823, 868, 442, 463, + 1049, 701, 966, 486, 488, 538, 8, 1057, 466, 421, + 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, + 421, 421, 421, 422, 422, 422, 422, 422, 422, 422, + 422, 422, 422, 422, 422, 422, 422, 298, 301, 448, + 471, 472, 474, 229, 296, 230, 231, 970, 505, 669, 485, 485, 995, 995, 995, 995, 995, 995, 995, 995, - 995, 995, 995, 995, 819, 812, 674, 285, 724, 719, - 720, 733, 675, 721, 672, 722, 723, 1038, 689, 673, - 497, 727, 277, 307, 686, 326, 506, 330, 317, 317, - 260, 261, 283, 464, 263, 325, 284, 328, 491, 971, - 1064, 1064, 556, 828, 512, 962, 280, 281, 967, 693, - 698, 368, 832, 1064, 482, 384, 777, 972, 1026, 0, - 870, 0, 0, 0, 0, 0, 0, 0, 0, 1067, - 0, 974, 0, 0, 813, 813, 813, 813, 974, 813, - 693, 813, 693, 0, 0, 813, 803, 803, 1054, 0, - 861, 0, 0, 0, 0, 0, 1035, 0, 0, 0, - 0, 0, 0, 1035, 0, 0, 766, 766, 766, 766, - 740, 1046, 1046, 760, 767, 741, 0, 0, 0, 0, - 0, 0, 1032, 0, 0, 0, 0, 684, 684, 0, + 995, 995, 995, 995, 460, 931, 674, 808, 724, 719, + 720, 733, 675, 721, 672, 722, 723, 819, 812, 673, + 689, 727, 764, 310, 541, 326, 506, 330, 317, 317, + 266, 267, 283, 464, 269, 325, 284, 328, 491, 693, + 971, 803, 803, 1054, 1038, 285, 280, 281, 497, 1064, + 1064, 686, 277, 307, 556, 512, 368, 967, 972, 1026, + 828, 962, 698, 482, 832, 777, 1064, 384, 870, 0, + 693, 974, 693, 0, 813, 813, 813, 813, 974, 813, + 1067, 813, 861, 0, 1035, 813, 0, 0, 0, 0, + 0, 1035, 0, 0, 0, 974, 974, 974, 974, 1046, + 1046, 974, 974, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 740, 0, 0, 741, 1032, 684, 684, 0, 0, 0, 694, 694, 694, 696, 0, 683, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 830, 0, 0, 830, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 1039, - 1040 + 0, 0, 0, 0, 0, 0, 0, 0, 830, 0, + 0, 830, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1039, 1040 ); protected $gotoCheck = array( @@ -633,57 +631,55 @@ class Php7 extends \PhpParser\ParserAbstract 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, - 29, 29, 29, 59, 52, 8, 10, 74, 12, 12, - 14, 68, 52, 68, 68, 8, 8, 8, 12, 104, - 12, 13, 12, 8, 12, 12, 12, 91, 45, 45, - 45, 45, 45, 45, 42, 42, 8, 35, 8, 5, + 29, 29, 29, 59, 52, 8, 10, 75, 7, 7, + 7, 105, 52, 7, 7, 92, 14, 12, 12, 127, + 80, 8, 8, 8, 127, 8, 13, 12, 80, 12, + 32, 12, 70, 12, 12, 12, 8, 35, 8, 70, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 35, 7, 7, 7, 139, 139, - 7, 7, 63, 63, 63, 79, 11, 11, 11, 61, - 11, 139, 61, 79, 32, 11, 51, 61, 11, 11, - 70, 70, 70, 8, 8, 11, 36, 11, 8, 8, - 8, 8, 11, 8, 61, 11, 124, 11, 8, 127, - 127, 11, 11, 124, 2, 2, 61, 88, 8, 130, - 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, - 130, 130, 130, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 129, 64, 137, - 48, 135, 50, 64, 49, 110, 86, 64, 82, 10, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 84, 85, 10, 16, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 132, 26, 10, - 20, 10, 9, 15, 24, 52, 52, 52, 52, 52, - 52, 52, 52, 52, 52, 52, 52, 52, 52, 86, - 138, 138, 76, 90, 19, 116, 74, 74, 119, 22, - 28, 66, 93, 138, 67, 114, 73, 86, 86, -1, - 107, -1, -1, -1, -1, -1, -1, -1, -1, 138, - -1, 59, -1, -1, 59, 59, 59, 59, 59, 59, - 22, 59, 22, -1, -1, 59, 79, 79, 79, -1, - 104, -1, -1, -1, -1, -1, 91, -1, -1, -1, - -1, -1, -1, 91, -1, -1, 59, 59, 59, 59, - 59, 91, 91, 59, 59, 59, -1, -1, -1, -1, - -1, -1, 91, -1, -1, -1, -1, 22, 22, -1, + 35, 35, 35, 35, 35, 5, 70, 70, 70, 70, + 42, 42, 70, 70, 139, 139, 11, 11, 11, 61, + 11, 64, 61, 2, 2, 11, 64, 61, 11, 11, + 64, 139, 51, 8, 8, 11, 36, 11, 8, 8, + 8, 8, 11, 8, 61, 11, 89, 11, 8, 129, + 135, 11, 11, 63, 63, 63, 61, 137, 8, 128, + 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 130, 130, 130, 130, 130, 130, 130, + 130, 130, 130, 130, 130, 130, 130, 45, 45, 45, + 45, 45, 45, 68, 48, 68, 68, 87, 50, 10, + 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, + 81, 81, 81, 81, 49, 111, 10, 83, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 85, 86, 10, + 26, 10, 71, 71, 71, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 22, + 87, 80, 80, 80, 132, 16, 75, 75, 20, 138, + 138, 24, 9, 15, 77, 19, 66, 120, 87, 87, + 91, 117, 28, 67, 94, 74, 138, 115, 108, -1, + 22, 59, 22, -1, 59, 59, 59, 59, 59, 59, + 138, 59, 105, -1, 92, 59, -1, -1, -1, -1, + -1, 92, -1, -1, -1, 59, 59, 59, 59, 92, + 92, 59, 59, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 59, -1, -1, 59, 92, 22, 22, -1, -1, -1, 22, 22, 22, 22, -1, 22, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 91, -1, -1, 91, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 91, - 91 + -1, -1, -1, -1, -1, -1, -1, -1, 92, -1, + -1, 92, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 92, 92 ); protected $gotoBase = array( - 0, 0, -335, 0, 0, 139, 0, 162, -139, 20, - -18, -175, 117, 129, 118, 8, 23, 0, 0, -19, - 25, 0, 65, 0, 7, 0, 22, 0, -41, -20, - 0, 0, 177, 0, 0, -401, 180, 0, 0, 0, - 0, 0, 114, 0, 0, 103, 0, 0, 218, 36, - 37, 172, 81, 0, 0, 0, 0, 0, 0, 109, - 0, -167, 0, -64, -131, 0, -38, -44, -447, 0, - -78, 0, 0, -43, -257, 0, 1, 0, 0, 142, - 46, 0, 18, 0, 32, 29, -39, 0, 196, 0, - 24, 134, 0, -40, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 119, 0, 0, -55, 0, 0, - 16, 0, 0, 0, -56, 0, -29, 0, 0, -16, - 0, 0, 0, 0, -26, 0, 0, -46, 19, 224, - 5, 0, 39, 0, 0, 210, 0, 225, 66, -76, + 0, 0, -366, 0, 0, 155, 0, 115, -139, 48, + -18, -175, 126, 134, 124, 38, 61, 0, 0, -8, + 47, 0, 55, 0, 34, 0, 18, 0, -29, -20, + 0, 0, 133, 0, 0, -401, 180, 0, 0, 0, + 0, 0, 140, 0, 0, 212, 0, 0, 222, 56, + 43, 178, 81, 0, 0, 0, 0, 0, 0, 109, + 0, -167, 0, -23, -198, 0, -33, -35, -315, 0, + -90, 35, 0, 0, -34, -257, 0, 13, 0, 0, + 97, 46, 0, 37, 0, 45, 42, -38, 0, 185, + 0, 41, 122, 0, -28, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 111, 0, 0, -47, 0, + 0, 36, 0, 0, 0, -44, 0, -13, 0, 0, + -7, 0, 0, 0, 0, 0, 0, -126, 5, 186, + 19, 0, 66, 0, 0, 169, 0, 193, 75, -70, 0, 0 ); @@ -695,13 +691,13 @@ class Php7 extends \PhpParser\ParserAbstract 517, 715, 450, 717, 718, 297, 303, 304, 877, 459, 484, 728, 203, 452, 730, 290, 731, 739, 331, 295, 363, 520, 494, 475, 509, 410, 365, 481, 228, 461, - 762, 372, 360, 776, 278, 784, 561, 792, 795, 411, - 412, 370, 807, 371, 817, 811, 989, 364, 822, 353, - 829, 1021, 355, 833, 836, 341, 500, 329, 840, 841, - 4, 845, 533, 534, 860, 241, 382, 869, 350, 883, - 344, 950, 952, 445, 379, 963, 359, 521, 387, 968, - 1025, 348, 413, 366, 981, 262, 282, 244, 414, 431, - 249, 415, 367, 1028, 318, 1050, 432, 1058, 1066, 273, + 981, 762, 372, 360, 776, 278, 784, 561, 792, 795, + 411, 412, 370, 807, 371, 817, 811, 989, 364, 822, + 353, 829, 1021, 355, 833, 836, 341, 500, 329, 840, + 841, 4, 845, 533, 534, 860, 241, 382, 869, 350, + 883, 344, 950, 952, 445, 379, 963, 359, 521, 387, + 968, 1025, 348, 413, 366, 268, 282, 244, 414, 431, + 249, 415, 367, 1028, 318, 1050, 432, 1058, 1066, 275, 315, 478 ); @@ -724,18 +720,18 @@ class Php7 extends \PhpParser\ParserAbstract 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 12, 12, 55, 55, 58, 58, 57, 56, 56, 49, 60, 60, 61, 61, 62, 62, 13, 14, 14, 14, - 65, 65, 65, 66, 66, 69, 69, 67, 67, 70, - 71, 71, 43, 43, 51, 51, 54, 54, 54, 53, - 72, 72, 73, 44, 44, 44, 44, 74, 74, 75, - 75, 76, 76, 41, 41, 37, 37, 77, 39, 39, - 78, 38, 38, 40, 40, 50, 50, 50, 50, 63, - 63, 81, 81, 82, 82, 84, 84, 85, 85, 85, - 83, 83, 64, 64, 86, 86, 87, 87, 88, 88, - 88, 46, 89, 89, 90, 47, 92, 92, 93, 93, - 68, 68, 94, 94, 94, 94, 99, 99, 100, 100, - 101, 101, 101, 101, 101, 102, 103, 103, 98, 98, - 95, 95, 97, 97, 105, 105, 104, 104, 104, 104, - 104, 104, 96, 106, 106, 107, 107, 48, 108, 108, + 65, 65, 65, 66, 66, 69, 69, 67, 67, 71, + 72, 72, 43, 43, 51, 51, 54, 54, 54, 53, + 73, 73, 74, 44, 44, 44, 44, 75, 75, 76, + 76, 77, 77, 41, 41, 37, 37, 78, 39, 39, + 79, 38, 38, 40, 40, 50, 50, 50, 50, 63, + 63, 82, 82, 83, 83, 85, 85, 86, 86, 86, + 84, 84, 64, 64, 87, 87, 88, 88, 89, 89, + 89, 46, 90, 90, 91, 47, 93, 93, 94, 94, + 68, 68, 95, 95, 95, 95, 100, 100, 101, 101, + 102, 102, 102, 102, 102, 103, 104, 104, 99, 99, + 96, 96, 98, 98, 106, 106, 105, 105, 105, 105, + 105, 105, 97, 107, 107, 108, 108, 48, 109, 109, 42, 42, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, @@ -744,16 +740,16 @@ class Php7 extends \PhpParser\ParserAbstract 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, - 29, 29, 29, 29, 29, 115, 109, 109, 114, 114, - 117, 118, 118, 119, 120, 120, 120, 124, 124, 59, - 59, 59, 110, 110, 110, 122, 122, 111, 111, 113, - 113, 113, 116, 116, 128, 128, 128, 80, 130, 130, - 130, 112, 112, 112, 112, 112, 112, 112, 112, 112, - 112, 112, 112, 112, 112, 112, 112, 45, 45, 126, - 126, 126, 121, 121, 121, 131, 131, 131, 131, 131, - 131, 52, 52, 52, 91, 91, 91, 91, 133, 125, - 125, 125, 125, 125, 125, 123, 123, 123, 132, 132, - 132, 132, 79, 134, 134, 135, 135, 135, 135, 135, + 29, 29, 29, 29, 29, 116, 110, 110, 115, 115, + 118, 119, 119, 120, 121, 121, 121, 70, 70, 59, + 59, 59, 111, 111, 111, 123, 123, 112, 112, 114, + 114, 114, 117, 117, 128, 128, 128, 81, 130, 130, + 130, 113, 113, 113, 113, 113, 113, 113, 113, 113, + 113, 113, 113, 113, 113, 113, 113, 45, 45, 126, + 126, 126, 122, 122, 122, 131, 131, 131, 131, 131, + 131, 52, 52, 52, 92, 92, 92, 92, 133, 125, + 125, 125, 125, 125, 125, 124, 124, 124, 132, 132, + 132, 132, 80, 134, 134, 135, 135, 135, 135, 135, 129, 136, 136, 137, 137, 137, 137, 137, 127, 127, 127, 127, 139, 140, 138, 138, 138, 138, 138, 138, 138, 141, 141, 141, 141 diff --git a/test/code/parser/stmt/class/name.test b/test/code/parser/stmt/class/name.test index 880da3a..d533305 100644 --- a/test/code/parser/stmt/class/name.test +++ b/test/code/parser/stmt/class/name.test @@ -76,8 +76,21 @@ array( -----