diff --git a/grammar/php7.y b/grammar/php7.y index d9a4503..e7030d6 100644 --- a/grammar/php7.y +++ b/grammar/php7.y @@ -530,24 +530,29 @@ non_empty_parameter_list: | non_empty_parameter_list ',' parameter { push($1, $3); } ; -optional_visibility_modifier: +optional_property_modifiers: /* empty */ { $$ = 0; } - | T_PUBLIC { $$ = Stmt\Class_::MODIFIER_PUBLIC; } + | optional_property_modifiers property_modifier + { $this->checkModifier($1, $2, #2); $$ = $1 | $2; } +; + +property_modifier: + T_PUBLIC { $$ = Stmt\Class_::MODIFIER_PUBLIC; } | T_PROTECTED { $$ = Stmt\Class_::MODIFIER_PROTECTED; } | T_PRIVATE { $$ = Stmt\Class_::MODIFIER_PRIVATE; } | T_READONLY { $$ = Stmt\Class_::MODIFIER_READONLY; } ; parameter: - optional_attributes optional_visibility_modifier optional_type_without_static + optional_attributes optional_property_modifiers optional_type_without_static optional_arg_ref optional_ellipsis plain_variable { $$ = new Node\Param($6, null, $3, $4, $5, attributes(), $2, $1); $this->checkParam($$); } - | optional_attributes optional_visibility_modifier optional_type_without_static + | optional_attributes optional_property_modifiers optional_type_without_static optional_arg_ref optional_ellipsis plain_variable '=' expr { $$ = new Node\Param($6, $8, $3, $4, $5, attributes(), $2, $1); $this->checkParam($$); } - | optional_attributes optional_visibility_modifier optional_type_without_static + | optional_attributes optional_property_modifiers optional_type_without_static optional_arg_ref optional_ellipsis error { $$ = new Node\Param(Expr\Error[], null, $3, $4, $5, attributes(), $2, $1); } ; diff --git a/lib/PhpParser/Parser/Php7.php b/lib/PhpParser/Parser/Php7.php index 75fc06d..6f5fa20 100644 --- a/lib/PhpParser/Parser/Php7.php +++ b/lib/PhpParser/Parser/Php7.php @@ -18,15 +18,15 @@ use PhpParser\Node\Stmt; class Php7 extends \PhpParser\ParserAbstract { protected $tokenToSymbolMapSize = 396; - protected $actionTableSize = 1187; - protected $gotoTableSize = 579; + protected $actionTableSize = 1189; + protected $gotoTableSize = 697; protected $invalidSymbol = 168; protected $errorSymbol = 1; protected $defaultAction = -32766; protected $unexpectedTokenRule = 32767; - protected $YY2TBLSTATE = 415; + protected $YY2TBLSTATE = 414; protected $numNonLeafStates = 702; protected $symbolToName = array( @@ -244,253 +244,253 @@ class Php7 extends \PhpParser\ParserAbstract ); protected $action = array( - 131, 132, 133, 563, 134, 135, 0, 714, 715, 716, - 136, 36, 977, 976, 975, 978,-32766,-32766,-32766,-32767, - -32767,-32767,-32767, 100, 101, 102, 103, 104, 1051, 1052, - 1053, 1050, 1049, 1048, 1054, 708, 707,-32766,-32766,-32766, + 131, 132, 133, 562, 134, 135, 0, 714, 715, 716, + 136, 36, 826, 903, 827, 461,-32766,-32766,-32766,-32767, + -32767,-32767,-32767, 100, 101, 102, 103, 104, 1052, 1053, + 1054, 1051, 1050, 1049, 1055, 708, 707,-32766,-32766,-32766, -32766,-32766,-32766,-32766,-32766,-32766,-32767,-32767,-32767,-32767, - -32767, 539, 540, 903, 2, 717,-32766,-32766,-32766, 988, - 989, -88, 914, 440, 441, 442, 365, 366, 462, 265, - 137, 391, 721, 722, 723, 724, 409,-32766, 415,-32766, - -32766,-32766,-32766,-32766, -305, 725, 726, 727, 728, 729, - 730, 731, 732, 733, 734, 735, 755, 564, 756, 757, - 758, 759, 747, 748, 331, 332, 750, 751, 736, 737, - 738, 740, 741, 742, 341, 782, 783, 784, 785, 786, - 787, 743, 744, 565, 566, 776, 767, 765, 766, 779, - 762, 763, 981, 415, 567, 568, 761, 569, 570, 571, - 572, 573, 574, -193, -566, 535, 485, 790, 764, 575, - 576, -566, 138,-32766,-32766,-32766, 131, 132, 133, 563, - 134, 135, 1002, 714, 715, 716, 136, 36, 1043,-32766, - -32766,-32766, 799, -86,-32766, 1276,-32766,-32766,-32766,-32766, - -32766,-32766,-32766, 1051, 1052, 1053, 1050, 1049, 1048, 1054, - -32766, 708, 707,-32766,-32766,-32766, 1241, 238, 463,-32766, - -32766,-32766,-32766,-32766,-32766, 883, 1213, 125, 1176, 1175, - 1177, 717, 801, 689,-32766, 1029,-32766,-32766,-32766,-32766, - -32766, -192,-32766,-32766,-32766, 265, 137, 391, 721, 722, - 723, 724, 883, 945, 415, 680, 12, 34, 247, -86, - -305, 725, 726, 727, 728, 729, 730, 731, 732, 733, - 734, 735, 755, 564, 756, 757, 758, 759, 747, 748, - 331, 332, 750, 751, 736, 737, 738, 740, 741, 742, - 341, 782, 783, 784, 785, 786, 787, 743, 744, 565, - 566, 776, 767, 765, 766, 779, 762, 763, 873, 585, - 567, 568, 761, 569, 570, 571, 572, 573, 574, -193, - 81, 82, 83, -566, 764, 575, 576, -566, 138, 739, - 709, 710, 711, 712, 713, 873, 714, 715, 716, 752, - 753, 35, 33, 84, 85, 86, 87, 88, 89, 90, + -32767, 538, 539,-32766,-32766, 717,-32766,-32766,-32766, 989, + 990, 798, 914, 439, 440, 441, 364, 365, 2, 265, + 137, 390, 721, 722, 723, 724, 408,-32766, 414,-32766, + -32766,-32766,-32766,-32766, 982, 725, 726, 727, 728, 729, + 730, 731, 732, 733, 734, 735, 755, 563, 756, 757, + 758, 759, 747, 748, 330, 331, 750, 751, 736, 737, + 738, 740, 741, 742, 340, 782, 783, 784, 785, 786, + 787, 743, 744, 564, 565, 776, 767, 765, 766, 779, + 762, 763, 279, 414, 566, 567, 761, 568, 569, 570, + 571, 572, 573, 590, -567, 462, 484, 790, 764, 574, + 575, -567, 138,-32766,-32766,-32766, 131, 132, 133, 562, + 134, 135, 1003, 714, 715, 716, 136, 36, 1044,-32766, + -32766,-32766, 1287, 688,-32766, 1288,-32766,-32766,-32766,-32766, + -32766,-32766,-32766, 1052, 1053, 1054, 1051, 1050, 1049, 1055, + -32766, 708, 707, 366, 365, 1242,-32766,-32766,-32766, -564, + 105, 106, 107, 408, 268, 883, -564, 238, 1177, 1176, + 1178, 717,-32766,-32766,-32766, 1030, 108,-32766,-32766,-32766, + -32766, 978, 977, 976, 979, 265, 137, 390, 721, 722, + 723, 724, 12,-32766, 414,-32766,-32766,-32766,-32766, 989, + 990, 725, 726, 727, 728, 729, 730, 731, 732, 733, + 734, 735, 755, 563, 756, 757, 758, 759, 747, 748, + 330, 331, 750, 751, 736, 737, 738, 740, 741, 742, + 340, 782, 783, 784, 785, 786, 787, 743, 744, 564, + 565, 776, 767, 765, 766, 779, 762, 763, 873, 315, + 566, 567, 761, 568, 569, 570, 571, 572, 573,-32766, + 81, 82, 83, -567, 764, 574, 575, -567, 138, 739, + 709, 710, 711, 712, 713, 1262, 714, 715, 716, 752, + 753, 35, 1261, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, - 101, 102, 103, 104, 105, 106, 107, -264, 267,-32766, - -32766,-32766,-32766, 105, 106, 107, 80, 267, 127, 1001, - 108, 946, 314, 885, 717, 675, 367, 366, 143, 108, - 800,-32766, 1027,-32766,-32766, 148, 409, -192, 718, 719, - 720, 721, 722, 723, 724, 237, 1181, 788, 276, -517, - 885, 315, 675, 149, 725, 726, 727, 728, 729, 730, + 101, 102, 103, 104, 105, 106, 107, 987, 268, 148, + -32766,-32766,-32766, 447, 448, 80, 33, -264, -564, 1002, + 108, 314, -564, 885, 717, 674, 795, 127, 989, 990, + 584,-32766, 1028,-32766,-32766,-32766, 801, 149, 718, 719, + 720, 721, 722, 723, 724, -88, 1182, 788, 276, -518, + 279,-32766,-32766,-32766, 725, 726, 727, 728, 729, 730, 731, 732, 733, 734, 735, 755, 778, 756, 757, 758, 759, 747, 748, 749, 777, 750, 751, 736, 737, 738, 740, 741, 742, 781, 782, 783, 784, 785, 786, 787, 743, 744, 745, 746, 776, 767, 765, 766, 779, 762, - 763,-32766,-32766, 754, 760, 761, 768, 769, 771, 770, - 772, 773, 251, -517, -517, 448, 449, 764, 775, 774, - 48, 49, 50, 494, 51, 52, 795, 799, -517, 591, - 53, 54, -111, 55, 986, 708, 707, -111, 792, -111, - -517, 298, -523, 986, 294, 631, 24, -111, -111, -111, - -111, -111, -111, -111, -111, 988, 989, 300, 1286, 1261, - -343, 1287, -343, 1174, 988, 989, 1260, 312, 56, 57, - -32766,-32766,-32766, -111, 58, 1201, 59, 244, 245, 60, - 61, 62, 63, 64, 65, 66, 67, -516, 26, 266, - 68, 429, 495, -319, 647, 648, 1207, 1208, 496, 1172, - 799, 1181, 796, 287, 1205, 40, 23, 497, 73, 498, - 328, 499, 314, 500, 794, 329, 501, 502, 826, 677, - 827, 42, 43, 430, 362, 361, 883, 44, 503, 147, - 394, -16, -557, 353, 327, 355, -557, 1181, 1176, 1175, - 1177, -518, 504, 505, 506, 359, -515, 1257, 47, 363, - 364, -516, -516, 374, 507, 508, 799, 1195, 1196, 1197, - 1198, 1192, 1193, 286, -563, 425, -516, 798, 151, 1199, - 1194, -563, 426, 1176, 1175, 1177, 287, 883, -516, 427, - -522, 69, 799, 310, 311, 314, 30, 109, 110, 111, + 763, 143, 796, 754, 760, 761, 768, 769, 771, 770, + 772, 773, -306, -518, -518, -193, -192, 764, 775, 774, + 48, 49, 50, 493, 51, 52, 237, 799, -518, -86, + 53, 54, -111, 55, 987, 251,-32766, -111, 792, -111, + -518, 534, -524, -344, 294, -344, 298, -111, -111, -111, + -111, -111, -111, -111, -111, 989, 990, 989, 990, 151, + -32766,-32766,-32766, 1175, 799, 125, 300, 1277, 56, 57, + 102, 103, 104, -111, 58, 1202, 59, 244, 245, 60, + 61, 62, 63, 64, 65, 66, 67, -517, 26, 266, + 68, 428, 494, -320, 800, -86, 1208, 1209, 495, 1173, + 799, 1182, 1214, 287, 1206, 40, 23, 496, 73, 497, + 945, 498, 314, 499, 794, 312, 500, 501, 375, 676, + 11, 42, 43, 429, 361, 360, 883, 44, 502, 34, + 247, -16, -558, 352, 326, 327, -558, 1182, 1177, 1176, + 1178, -519, 503, 504, 505, 328, -516, 1258, 47, 708, + 707, -517, -517, 354, 506, 507, 799, 1196, 1197, 1198, + 1199, 1193, 1194, 286, 358, 826, -517, 827, -306, 1200, + 1195, -193, -192, 1177, 1176, 1178, 287, 883, -517, 373, + -523, 69, 799, 310, 311, 314, 30, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, - -153, -153, -153, 368, 369, -518, -518, 681, 428, 873, - -515, -515, 290, 291, 883, -153, 805, -153, 799, -153, - -518, -153, 708, 707, 152, -515, 790, 358, -111, 1088, - 1090, 360, -518, 153, 883, 139, 376, -515, 11, 126, - -515, 314, -111, -111, 682, 155, 279, -520, 102, 103, - 104, 31, 859, -111, -111, -111, -111, 46, 287,-32766, - 873, 623, 624, 73, 684, 1174, 826, 314, 827, 1028, - -79, 700,-32766,-32766,-32766, 122,-32766, 123,-32766, 128, - -32766, 708, 707,-32766, 885, 883, 675, -153,-32766,-32766, - -32766, 708, 707, 129,-32766,-32766, 142, 873, 156, 73, - -32766, 406, 157, 314, -515, -515, 158, 140, 159,-32766, - -75, -520, -520, 314, 26, 691, -73, 873, -72, -515, - -71, 288, 289, -563, -70, -69, 799, -563,-32766, -68, - 1205, -515,-32766, -67, 1174, 885, -66, 675, -520, 72, - -47,-32766,-32766,-32766, -18,-32766, 146,-32766, 124,-32766, - 268, 275,-32766, 988, 989, 690, -51,-32766,-32766,-32766, - 693, 882, 145,-32766,-32766, 899, 108, 277, 873,-32766, - 406, 278, 931, 280, 675, 281, 321, 144,-32766, 267, - 507, 508, 799, 1195, 1196, 1197, 1198, 1192, 1193, 655, - 130, 790, 885, 1288, 675, 1199, 1194, 543, 1058,-32766, - 650, 13,-32766, 537, 632, 1174, 424, 71, 621, 915, - 311, 314,-32766,-32766,-32766, 668,-32766, 637,-32766,-32766, - -32766, 293, 1212,-32766, 916, 445, 638, 549,-32766,-32766, - -32766, 473, -481,-32766,-32766,-32766, -4, 883, -551, 1174, - -32766, 406, 651, 885, 589, 675,-32766,-32766,-32766,-32766, - -32766, 295,-32766, 901,-32766, 0, 798,-32766, 0, 0, - 0, 0,-32766,-32766,-32766,-32766, 0, 292,-32766,-32766, - 0, 1174, 0, 0,-32766, 406, 299, 0,-32766,-32766, - -32766, 0,-32766,-32766,-32766, 1214,-32766, 0, 0,-32766, - 0, 287, -471, 468,-32766,-32766,-32766,-32766, 7, 15, - -32766,-32766, 357, 1174, 555, 38,-32766, 406, 1202, 883, - -32766,-32766,-32766, 39,-32766,-32766,-32766, 697,-32766, 698, - 873,-32766, 864, 955, 932, 939,-32766,-32766,-32766, 929, - 940, 862,-32766,-32766, 927, 1032, 1035, 1036,-32766, 406, - 1033, 1034, 360, 1040, 420, 883, 810,-32766, 1227, 285, - 1245, 694, 1279, -111, -111, 626, 860, 32, 309, 356, - 676, 679, 683, 818, -111, -111, -111, -111, 685, 686, - -32766, 687, 688, 692, 678, 1206, 1174, 1283, 1285, 821, - 820, 829, 908,-32766,-32766,-32766, 9,-32766, 947,-32766, - 828,-32766, 873, 1284,-32766, 885, 907, 675, -4,-32766, - -32766,-32766, 909, 906, 1160,-32766,-32766, 892, -242, -242, - -242,-32766, 406, 902, 360, 26, 890, 937, 938, 1282, - -32766, 1239, 1228, 1246, 1252, -111, -111, 799, 873, 1255, - -267, 1205, -549, -523, -522, 859, -111, -111, -111, -111, - -521, 1, 27, 28, -241, -241, -241, 37, 41, 45, - 360, 70, 74, 75, 76, 77, 78, 79, 141, 0, - 150, -111, -111, 154, 243, 316, 342, 885, 343, 675, - -242, 859, -111, -111, -111, -111, 344, 345, 346, 347, - 348, 349, 508, 350, 1195, 1196, 1197, 1198, 1192, 1193, - 351, 352, 354, 421, 0, -265, 1199, 1194, -264, 17, - 18, 19, 20, 885, 22, 675, -241, 393, 71, 314, - 464, 311, 314, 465, 472, 475, 476, 477, 478, 482, - 483, 484, 492, 662, 1185, 1128, 1203, 1003, 1164, -269, - -103, 16, 21, 25, 284, 392, 582, 586, 613, 667, - 1132, 1180, 1129, 1258, 0, -485, 1145 + -153, -153, -153, 630, 24, -519, -519, 679, 424, 873, + -516, -516, 290, 291, 883, -153, 425, -153, 799, -153, + -519, -153, 708, 707, 426, -516, 790, 357, -111, 1089, + 1091, 359, -519, 427, 883, 139, 805, -516, 946, 126, + -516, 314, -111, -111, 680, 152, 1029, -521, 700, 646, + 647, 153, 859, -111, -111, -111, -111, 46, 287,-32766, + 873, 147, 393, 73, 681, 1175, 155, 314, 362, 363, + 367, 368,-32766,-32766,-32766, 31,-32766, -79,-32766, 122, + -32766, 708, 707,-32766, 885, 883, 674, -153,-32766,-32766, + -32766, 708, 707, 883,-32766,-32766, 123, 873, 128, 73, + -32766, 405, 129, 314, -516, -516, 142, 140, -75,-32766, + 156, -521, -521, 314, 26, 683, 157, 873, 158, -516, + 159, 288, 289, 690, -73, 899, 799, -72,-32766, -71, + 1206, -516, 622, 623, 1175, 885, -70, 674, -521, 72, + -69,-32766,-32766,-32766, -68,-32766, -67,-32766, 124,-32766, + -66, -47,-32766, -18, 146, 269, -51,-32766,-32766,-32766, + 275, 689, 692,-32766,-32766, 882, 145, 277, 873,-32766, + 405, 278, 885, 280, 674, 281, 873, 320,-32766, 108, + 506, 507, 144, 1196, 1197, 1198, 1199, 1193, 1194, 799, + 130, 654, 931, 1059, 674, 1200, 1195, 790, 268,-32766, + 667, 1289, 636, 637, 620, 1175,-32766, 71, 292, 295, + 311, 314,-32766,-32766,-32766, 542,-32766, 631,-32766, 1213, + -32766, 299, 536,-32766, 1215, 13, 901, 649,-32766,-32766, + -32766, 1203,-32766,-32766,-32766,-32766, -4, 883, 548, 1175, + -32766, 405, 444, 885, 472, 674,-32766,-32766,-32766,-32766, + -32766, 885,-32766, 674,-32766, 650, 798,-32766, 38, 694, + 0, 0,-32766,-32766,-32766,-32766, 0, 423,-32766,-32766, + 0, 1175, 915, 0,-32766, 405, 916, 0,-32766,-32766, + -32766, 0,-32766,-32766,-32766, 293,-32766, 0, 0,-32766, + 0, 0, -482, 467,-32766,-32766,-32766,-32766, -472, 7, + -32766,-32766, 15, 1175, 554, 356,-32766, 405, 860, 883, + -32766,-32766,-32766, 588,-32766,-32766,-32766, 39,-32766, 287, + 873,-32766, 697, 698, 864, 955,-32766,-32766,-32766, 932, + 939, 929,-32766,-32766, 940, 862, 927, 1033,-32766, 405, + 1036, 1037, 359, 1034, 419, 883, 1035,-32766, 1041, 285, + 810, -552, 1228, -111, -111, 1246, 1280, 625, -267, 32, + 309, 355, 675, 818, -111, -111, -111, -111, 678, 682, + -32766, 684, 685, 686, 687, 691, 1175, 677, -550, 1284, + 1286, 821, 820,-32766,-32766,-32766, 9,-32766, 829,-32766, + 908,-32766, 873, 947,-32766, 885, 828, 674, -4,-32766, + -32766,-32766, 1285, 907, 909,-32766,-32766, 906, -242, -242, + -242,-32766, 405, 1161, 359, 26, 892, 902, 890, 937, + -32766, 938, 1283, 1240, 1229, -111, -111, 799, 873, 1247, + 1253, 1206, 1256, -265, -524, 859, -111, -111, -111, -111, + -523, -522, 1, 27, -241, -241, -241, 28, 37, 41, + 359, 45, 70, 74, 75, 76, 77, 78, 79, 0, + 141, -111, -111, 150, 154, 243, 316, 885, 341, 674, + -242, 859, -111, -111, -111, -111, 342, 343, 344, 345, + 346, 347, 507, 348, 1196, 1197, 1198, 1199, 1193, 1194, + 349, 350, 351, 353, 420, 0, 1200, 1195, -264, 17, + 18, 19, 20, 885, 22, 674, -241, 392, 71, 314, + 463, 311, 314, 464, 471, 474, 475, 476, 477, 481, + 482, 483, 491, 661, 1186, 1129, 1204, 1004, 1165, -269, + -103, 16, 21, 25, 284, 391, 581, 585, 612, 666, + 1133, 1181, 1130, 1259, 0, -486, 1146, 0, 1207 ); protected $actionCheck = array( 2, 3, 4, 5, 6, 7, 0, 9, 10, 11, - 12, 13, 119, 120, 121, 122, 9, 10, 11, 44, + 12, 13, 106, 1, 108, 31, 9, 10, 11, 44, 45, 46, 47, 48, 49, 50, 51, 52, 116, 117, 118, 119, 120, 121, 122, 37, 38, 30, 116, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, - 43, 117, 118, 1, 8, 57, 9, 10, 11, 137, - 138, 31, 128, 129, 130, 131, 106, 107, 31, 71, + 43, 117, 118, 9, 10, 57, 9, 10, 11, 137, + 138, 155, 128, 129, 130, 131, 106, 107, 8, 71, 72, 73, 74, 75, 76, 77, 116, 30, 80, 32, - 33, 34, 35, 36, 8, 87, 88, 89, 90, 91, + 33, 34, 35, 36, 1, 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, 128, 129, 130, 131, - 132, 133, 1, 80, 136, 137, 138, 139, 140, 141, - 142, 143, 144, 8, 1, 85, 101, 80, 150, 151, + 132, 133, 30, 80, 136, 137, 138, 139, 140, 141, + 142, 143, 144, 51, 1, 161, 101, 80, 150, 151, 152, 8, 154, 9, 10, 11, 2, 3, 4, 5, 6, 7, 164, 9, 10, 11, 12, 13, 123, 9, - 10, 11, 82, 31, 30, 85, 32, 33, 34, 35, + 10, 11, 80, 161, 30, 83, 32, 33, 34, 35, 36, 37, 38, 116, 117, 118, 119, 120, 121, 122, - 30, 37, 38, 9, 10, 11, 1, 14, 161, 9, - 10, 11, 9, 10, 11, 1, 146, 14, 155, 156, - 157, 57, 1, 161, 30, 162, 32, 33, 34, 35, - 30, 8, 32, 33, 34, 71, 72, 73, 74, 75, - 76, 77, 1, 31, 80, 31, 8, 147, 148, 97, - 164, 87, 88, 89, 90, 91, 92, 93, 94, 95, + 30, 37, 38, 106, 107, 1, 9, 10, 11, 1, + 53, 54, 55, 116, 57, 1, 8, 14, 155, 156, + 157, 57, 9, 10, 11, 162, 69, 30, 116, 32, + 33, 119, 120, 121, 122, 71, 72, 73, 74, 75, + 76, 77, 8, 30, 80, 32, 33, 34, 35, 137, + 138, 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, 128, 129, 130, 131, 132, 133, 84, 1, - 136, 137, 138, 139, 140, 141, 142, 143, 144, 164, + 126, 127, 128, 129, 130, 131, 132, 133, 84, 70, + 136, 137, 138, 139, 140, 141, 142, 143, 144, 9, 9, 10, 11, 160, 150, 151, 152, 164, 154, 2, - 3, 4, 5, 6, 7, 84, 9, 10, 11, 12, + 3, 4, 5, 6, 7, 1, 9, 10, 11, 12, 13, 30, 8, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, - 49, 50, 51, 52, 53, 54, 55, 164, 57, 9, - 9, 10, 11, 53, 54, 55, 161, 57, 8, 1, - 69, 159, 167, 159, 57, 161, 106, 107, 8, 69, - 159, 30, 1, 32, 33, 14, 116, 164, 71, 72, - 73, 74, 75, 76, 77, 97, 1, 80, 30, 70, - 159, 70, 161, 14, 87, 88, 89, 90, 91, 92, + 49, 50, 51, 52, 53, 54, 55, 116, 57, 14, + 9, 10, 11, 134, 135, 161, 8, 164, 160, 1, + 69, 167, 164, 159, 57, 161, 80, 8, 137, 138, + 1, 30, 1, 32, 33, 34, 1, 14, 71, 72, + 73, 74, 75, 76, 77, 31, 1, 80, 30, 70, + 30, 9, 10, 11, 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, 128, 129, 130, 131, 132, - 133, 9, 10, 136, 137, 138, 139, 140, 141, 142, - 143, 144, 8, 134, 135, 134, 135, 150, 151, 152, - 2, 3, 4, 5, 6, 7, 80, 82, 149, 51, - 12, 13, 101, 15, 116, 37, 38, 106, 80, 108, - 161, 8, 163, 116, 113, 75, 76, 116, 117, 118, - 119, 120, 121, 122, 123, 137, 138, 8, 80, 1, - 106, 83, 108, 80, 137, 138, 8, 8, 50, 51, - 9, 10, 11, 128, 56, 1, 58, 59, 60, 61, + 133, 8, 156, 136, 137, 138, 139, 140, 141, 142, + 143, 144, 8, 134, 135, 8, 8, 150, 151, 152, + 2, 3, 4, 5, 6, 7, 97, 82, 149, 31, + 12, 13, 101, 15, 116, 8, 116, 106, 80, 108, + 161, 85, 163, 106, 113, 108, 8, 116, 117, 118, + 119, 120, 121, 122, 123, 137, 138, 137, 138, 14, + 9, 10, 11, 80, 82, 14, 8, 85, 50, 51, + 50, 51, 52, 128, 56, 1, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 70, 70, 71, - 72, 73, 74, 162, 75, 76, 78, 79, 80, 116, - 82, 1, 156, 158, 86, 87, 88, 89, 163, 91, - 8, 93, 167, 95, 156, 8, 98, 99, 106, 161, - 108, 103, 104, 105, 106, 107, 1, 109, 110, 101, - 102, 31, 160, 115, 116, 8, 164, 1, 155, 156, - 157, 70, 124, 125, 126, 8, 70, 1, 70, 106, - 107, 134, 135, 8, 136, 137, 82, 139, 140, 141, - 142, 143, 144, 145, 1, 8, 149, 155, 14, 151, - 152, 8, 8, 155, 156, 157, 158, 1, 161, 8, + 72, 73, 74, 162, 159, 97, 78, 79, 80, 116, + 82, 1, 146, 158, 86, 87, 88, 89, 163, 91, + 31, 93, 167, 95, 156, 8, 98, 99, 106, 161, + 108, 103, 104, 105, 106, 107, 1, 109, 110, 147, + 148, 31, 160, 115, 116, 8, 164, 1, 155, 156, + 157, 70, 124, 125, 126, 8, 70, 1, 70, 37, + 38, 134, 135, 8, 136, 137, 82, 139, 140, 141, + 142, 143, 144, 145, 8, 106, 149, 108, 164, 151, + 152, 164, 164, 155, 156, 157, 158, 1, 161, 8, 163, 163, 82, 165, 166, 167, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 75, 76, 77, 106, 107, 134, 135, 31, 8, 84, + 75, 76, 77, 75, 76, 134, 135, 31, 8, 84, 134, 135, 134, 135, 1, 90, 8, 92, 82, 94, - 149, 96, 37, 38, 14, 149, 80, 149, 128, 59, - 60, 106, 161, 14, 1, 161, 106, 161, 108, 161, - 70, 167, 117, 118, 31, 14, 30, 70, 50, 51, - 52, 14, 127, 128, 129, 130, 131, 70, 158, 74, - 84, 111, 112, 163, 31, 80, 106, 167, 108, 159, - 31, 161, 87, 88, 89, 16, 91, 16, 93, 16, + 149, 96, 37, 38, 8, 149, 80, 149, 128, 59, + 60, 106, 161, 8, 1, 161, 8, 161, 159, 161, + 70, 167, 117, 118, 31, 14, 159, 70, 161, 75, + 76, 14, 127, 128, 129, 130, 131, 70, 158, 74, + 84, 101, 102, 163, 31, 80, 14, 167, 106, 107, + 106, 107, 87, 88, 89, 14, 91, 31, 93, 16, 95, 37, 38, 98, 159, 1, 161, 162, 103, 104, - 105, 37, 38, 16, 109, 110, 16, 84, 16, 163, - 115, 116, 16, 167, 134, 135, 16, 161, 16, 124, - 31, 134, 135, 167, 70, 31, 31, 84, 31, 149, - 31, 134, 135, 160, 31, 31, 82, 164, 74, 31, - 86, 161, 116, 31, 80, 159, 31, 161, 161, 154, + 105, 37, 38, 1, 109, 110, 16, 84, 16, 163, + 115, 116, 16, 167, 134, 135, 16, 161, 31, 124, + 16, 134, 135, 167, 70, 31, 16, 84, 16, 149, + 16, 134, 135, 31, 31, 38, 82, 31, 74, 31, + 86, 161, 111, 112, 80, 159, 31, 161, 161, 154, 31, 87, 88, 89, 31, 91, 31, 93, 161, 95, - 31, 31, 98, 137, 138, 31, 31, 103, 104, 105, - 31, 31, 31, 109, 110, 38, 69, 35, 84, 115, - 116, 35, 159, 35, 161, 35, 35, 70, 124, 57, - 136, 137, 82, 139, 140, 141, 142, 143, 144, 77, - 31, 80, 159, 83, 161, 151, 152, 89, 82, 74, - 94, 97, 85, 85, 90, 80, 128, 163, 113, 128, - 166, 167, 87, 88, 89, 92, 91, 96, 93, 116, - 95, 133, 146, 98, 128, 97, 100, 153, 103, 104, - 105, 97, 149, 74, 109, 110, 0, 1, 163, 80, - 115, 116, 100, 159, 153, 161, 87, 88, 89, 124, - 91, 114, 93, 154, 95, -1, 155, 98, -1, -1, - -1, -1, 103, 104, 105, 74, -1, 132, 109, 110, - -1, 80, -1, -1, 115, 116, 132, -1, 87, 88, - 89, -1, 91, 124, 93, 146, 95, -1, -1, 98, - -1, 158, 149, 102, 103, 104, 105, 74, 149, 149, - 109, 110, 149, 80, 81, 159, 115, 116, 160, 1, - 87, 88, 89, 159, 91, 124, 93, 159, 95, 159, + 31, 31, 98, 31, 31, 31, 31, 103, 104, 105, + 31, 31, 31, 109, 110, 31, 31, 35, 84, 115, + 116, 35, 159, 35, 161, 35, 84, 35, 124, 69, + 136, 137, 70, 139, 140, 141, 142, 143, 144, 82, + 31, 77, 159, 82, 161, 151, 152, 80, 57, 74, + 92, 83, 96, 100, 113, 80, 85, 163, 132, 114, + 166, 167, 87, 88, 89, 89, 91, 90, 93, 146, + 95, 132, 85, 98, 146, 97, 154, 94, 103, 104, + 105, 160, 116, 74, 109, 110, 0, 1, 153, 80, + 115, 116, 97, 159, 97, 161, 87, 88, 89, 124, + 91, 159, 93, 161, 95, 100, 155, 98, 159, 162, + -1, -1, 103, 104, 105, 74, -1, 128, 109, 110, + -1, 80, 128, -1, 115, 116, 128, -1, 87, 88, + 89, -1, 91, 124, 93, 133, 95, -1, -1, 98, + -1, -1, 149, 102, 103, 104, 105, 74, 149, 149, + 109, 110, 149, 80, 81, 149, 115, 116, 162, 1, + 87, 88, 89, 153, 91, 124, 93, 159, 95, 158, 84, 98, 159, 159, 159, 159, 103, 104, 105, 159, 159, 159, 109, 110, 159, 159, 159, 159, 115, 116, - 159, 159, 106, 159, 108, 1, 160, 124, 160, 113, - 160, 162, 160, 117, 118, 160, 162, 161, 161, 161, + 159, 159, 106, 159, 108, 1, 159, 124, 159, 113, + 160, 163, 160, 117, 118, 160, 160, 160, 164, 161, 161, 161, 161, 127, 128, 129, 130, 131, 161, 161, - 74, 161, 161, 161, 161, 166, 80, 162, 162, 162, + 74, 161, 161, 161, 161, 161, 80, 161, 163, 162, 162, 162, 162, 87, 88, 89, 150, 91, 162, 93, 162, 95, 84, 162, 98, 159, 162, 161, 162, 103, 104, 105, 162, 162, 162, 109, 110, 162, 100, 101, 102, 115, 116, 162, 106, 70, 162, 162, 162, 162, 124, 162, 162, 162, 162, 117, 118, 82, 84, 162, - 164, 86, 163, 163, 163, 127, 128, 129, 130, 131, + 162, 86, 162, 164, 163, 127, 128, 129, 130, 131, 163, 163, 163, 163, 100, 101, 102, 163, 163, 163, 106, 163, 163, 163, 163, 163, 163, 163, 163, -1, 163, 117, 118, 163, 163, 163, 163, 159, 163, 161, 162, 127, 128, 129, 130, 131, 163, 163, 163, 163, 163, 163, 137, 163, 139, 140, 141, 142, 143, 144, - 163, 163, 163, 163, -1, 164, 151, 152, 164, 164, + 163, 163, 163, 163, 163, -1, 151, 152, 164, 164, 164, 164, 164, 159, 164, 161, 162, 164, 163, 167, 164, 166, 167, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, - 164, 164, 164, 164, -1, 165, 165 + 164, 164, 164, 164, -1, 165, 165, -1, 166 ); protected $actionBase = array( 0, -2, 154, 565, 876, 948, 984, 514, 53, 398, - 822, 307, 307, 67, 307, 307, 616, 673, 673, 724, - 673, 204, 653, 231, 231, 231, 625, 625, 625, 625, + 827, 307, 307, 67, 307, 307, 653, 724, 724, 732, + 724, 616, 673, 204, 204, 204, 625, 625, 625, 625, 694, 694, 831, 831, 863, 799, 765, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, @@ -504,58 +504,58 @@ class Php7 extends \PhpParser\ParserAbstract 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, 936, - 211, 202, 288, 677, 1010, 1016, 1012, 1017, 1008, 1007, - 1011, 1013, 1018, 897, 899, 771, 900, 901, 902, 907, - 1014, 835, 1009, 1015, 291, 291, 291, 291, 291, 291, + 375, 519, 369, 701, 1010, 1016, 1012, 1017, 1008, 1007, + 1011, 1013, 1018, 900, 901, 775, 902, 907, 908, 910, + 1014, 837, 1009, 1015, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, - 340, 193, 432, 501, 501, 501, 501, 501, 501, 501, - 501, 501, 501, 501, 501, 501, 501, 501, 501, 501, - 501, 501, 501, 160, 160, 160, 341, 684, 684, 190, - 184, 610, 47, 985, 985, 985, 985, 985, 985, 985, + 290, 491, 44, 382, 382, 382, 382, 382, 382, 382, + 382, 382, 382, 382, 382, 382, 382, 382, 382, 382, + 382, 382, 382, 160, 160, 160, 187, 684, 684, 341, + 203, 610, 47, 985, 985, 985, 985, 985, 985, 985, 985, 985, 985, 144, 144, 7, 7, 7, 7, 7, - 371, -25, -25, -25, -25, 540, 385, 576, 358, 45, - 394, 638, 638, 656, 656, 367, 367, 367, 367, -78, - -78, -78, -66, 319, 457, 452, 60, 423, 586, 586, - 586, 586, 423, 423, 423, 423, 779, 849, 423, 423, - 423, 511, 516, 516, 518, 300, 300, 300, 516, 600, - 758, 90, 600, 90, 195, 418, 743, -40, 260, 412, - -107, 743, 617, 627, 603, 143, 741, 483, 741, 1006, - 757, 749, 719, 824, 853, 1019, 766, 895, 782, 896, - 321, 679, 1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005, - 1005, 1005, 1005, 982, 438, 1006, 386, 982, 982, 982, - 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, - 590, 386, 410, 459, 386, 781, 438, 211, 783, 211, - 211, 211, 211, 943, 211, 211, 211, 211, 211, 211, - 956, 753, 37, 211, 202, 52, 52, 550, 131, 52, - 52, 52, 52, 211, 211, 211, 483, 762, 714, 537, - 731, 213, 762, 762, 762, 142, 76, 183, 135, 570, - 751, 751, 756, 918, 918, 751, 740, 751, 756, 926, - 751, 918, 773, 350, 597, 542, 577, 604, 918, 473, - 751, 751, 751, 751, 611, 751, 444, 360, 751, 751, - 775, 760, 784, 46, 918, 918, 918, 784, 567, 728, - 728, 728, 798, 800, 735, 759, 499, 489, 648, 314, - 767, 759, 759, 751, 585, 735, 759, 735, 759, 739, - 759, 759, 759, 735, 759, 751, 740, 547, 759, 722, - 640, 228, 759, 6, 928, 929, 30, 930, 924, 931, - 970, 932, 933, 839, 941, 925, 934, 920, 919, 770, - 699, 701, 789, 723, 917, 737, 737, 737, 910, 737, - 737, 737, 737, 737, 737, 737, 737, 699, 788, 793, - 718, 748, 945, 703, 717, 716, 834, 1020, 1021, 721, - 736, 943, 1000, 935, 786, 720, 980, 953, 829, 837, - 954, 955, 983, 1001, 1002, 855, 747, 856, 857, 826, - 957, 840, 737, 928, 933, 925, 934, 920, 919, 745, - 742, 734, 738, 733, 729, 725, 727, 755, 909, 715, - 828, 956, 911, 699, 830, 975, 836, 986, 989, 838, - 768, 750, 832, 858, 958, 960, 967, 841, 1003, 794, - 976, 906, 990, 774, 859, 991, 992, 993, 994, 860, - 847, 848, 850, 803, 754, 971, 761, 866, 361, 778, - 780, 969, 379, 942, 851, 868, 871, 995, 996, 997, - 874, 937, 804, 977, 746, 978, 974, 805, 806, 594, - 772, 776, 650, 659, 880, 881, 882, 940, 764, 752, - 810, 811, 1004, 885, 671, 812, 726, 891, 999, 730, - 732, 763, 852, 790, 777, 744, 968, 769, 815, 894, - 816, 817, 818, 998, 821, 0, 0, 0, 0, 0, + 371, -25, -25, -25, -25, 540, 385, 102, 576, 358, + 45, 377, 460, 460, 360, 231, 231, 231, 231, -78, + -78, -78, -66, 319, 457, -94, 396, 423, 586, 586, + 586, 586, 423, 423, 423, 423, 718, 1022, 423, 423, + 423, 511, 516, 516, 518, 147, 147, 147, 516, 499, + 777, 422, 499, 422, 194, 92, 756, -40, 87, 412, + 756, 617, 627, 198, 143, 741, 602, 741, 1006, 761, + 760, 717, 829, 856, 1019, 743, 897, 795, 899, 219, + 686, 1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005, + 1005, 1005, 982, 552, 1006, 286, 982, 982, 982, 552, + 552, 552, 552, 552, 552, 552, 552, 552, 552, 661, + 286, 568, 614, 286, 782, 552, 375, 789, 375, 375, + 375, 375, 945, 375, 375, 375, 375, 375, 375, 957, + 762, -16, 375, 519, 12, 12, 527, 83, 12, 12, + 12, 12, 375, 375, 375, 602, 781, 725, 604, 800, + 448, 781, 781, 781, 438, 444, 193, 447, 452, 757, + 757, 751, 919, 919, 757, 747, 757, 751, 928, 757, + 919, 801, 359, 640, 567, 596, 648, 919, 478, 757, + 757, 757, 757, 656, 757, 467, 433, 757, 757, 716, + 769, 729, 60, 919, 919, 919, 729, 585, 792, 792, + 792, 803, 804, 731, 764, 547, 498, 668, 348, 727, + 764, 764, 757, 611, 731, 764, 731, 764, 712, 764, + 764, 764, 731, 764, 757, 747, 577, 764, 734, 665, + 224, 764, 6, 929, 930, 354, 931, 925, 932, 971, + 933, 934, 841, 942, 926, 935, 924, 920, 774, 703, + 720, 790, 783, 918, 750, 750, 750, 911, 750, 750, + 750, 750, 750, 750, 750, 750, 703, 711, 796, 779, + 766, 953, 722, 726, 713, 786, 1020, 1021, 784, 788, + 945, 1000, 937, 739, 730, 980, 954, 737, 839, 955, + 956, 983, 1001, 1002, 857, 752, 858, 859, 830, 958, + 847, 750, 929, 934, 926, 935, 924, 920, 759, 755, + 749, 753, 745, 738, 733, 736, 763, 855, 828, 832, + 957, 917, 703, 835, 975, 838, 986, 989, 840, 785, + 758, 836, 860, 960, 967, 968, 848, 1003, 798, 976, + 834, 990, 787, 866, 991, 992, 993, 994, 868, 850, + 851, 852, 805, 767, 909, 746, 871, 335, 778, 780, + 970, 363, 943, 853, 874, 880, 995, 996, 997, 881, + 940, 806, 977, 773, 978, 974, 810, 811, 485, 772, + 776, 671, 677, 882, 885, 891, 941, 770, 754, 812, + 815, 1004, 894, 692, 816, 740, 895, 999, 742, 744, + 748, 854, 793, 735, 768, 969, 771, 817, 896, 818, + 821, 822, 998, 824, 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, 458, 458, 458, 458, 458, 458, 307, @@ -584,31 +584,31 @@ class Php7 extends \PhpParser\ParserAbstract 291, 291, 291, 291, 291, 291, 291, 291, 291, 423, 423, 291, 291, 0, 291, 423, 423, 423, 423, 423, 423, 423, 423, 423, 423, 291, 291, 291, 291, 291, - 291, 291, 773, 300, 300, 300, 300, 423, 423, 423, - 423, -88, -88, 300, 300, 423, 423, 423, 423, 423, - 423, 423, 423, 423, 0, 0, 0, 386, 90, 0, - 740, 740, 740, 740, 0, 0, 0, 0, 90, 90, + 291, 291, 801, 147, 147, 147, 147, 423, 423, 423, + 423, 423, -88, -88, 147, 147, 423, 423, 423, 423, + 423, 423, 423, 423, 0, 0, 0, 286, 422, 0, + 747, 747, 747, 747, 0, 0, 0, 0, 422, 422, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 386, 90, 0, 386, 0, 740, 740, 423, 773, - 773, 498, 0, 423, 0, 0, 0, 0, 386, 740, - 386, 438, 90, 438, 438, 52, 211, 498, 468, 468, - 468, 468, 0, 483, 773, 773, 773, 773, 773, 773, - 773, 773, 773, 773, 773, 740, 0, 773, 0, 740, - 740, 740, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 740, 0, 0, - 918, 0, 0, 0, 0, 751, 0, 0, 0, 0, - 0, 0, 751, 926, 0, 0, 0, 0, 0, 0, - 740, 0, 0, 0, 0, 0, 0, 0, 0, 737, - 768, 0, 768, 0, 737, 737, 737 + 0, 286, 422, 0, 286, 0, 747, 747, 423, 801, + 801, 314, 423, 0, 0, 0, 0, 286, 747, 286, + 552, 422, 552, 552, 12, 375, 314, 600, 600, 600, + 600, 0, 602, 801, 801, 801, 801, 801, 801, 801, + 801, 801, 801, 801, 747, 0, 801, 0, 747, 747, + 747, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 747, 0, 0, 919, + 0, 0, 0, 0, 757, 0, 0, 0, 0, 0, + 0, 757, 928, 0, 0, 0, 0, 0, 0, 747, + 0, 0, 0, 0, 0, 0, 0, 0, 750, 785, + 0, 785, 0, 750, 750, 750 ); protected $actionDefault = array( 3,32767, 103,32767,32767,32767,32767,32767,32767,32767, 32767,32767, 101,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767,32767, 569, 569, 569, 569, - 32767,32767, 246, 103,32767,32767, 445, 363, 363, 363, - 32767,32767, 513, 513, 513, 513, 513, 513,32767,32767, - 32767,32767,32767,32767, 445,32767,32767,32767,32767,32767, + 32767,32767,32767,32767,32767,32767, 570, 570, 570, 570, + 32767,32767, 246, 103,32767,32767, 446, 364, 364, 364, + 32767,32767, 514, 514, 514, 514, 514, 514,32767,32767, + 32767,32767,32767,32767, 446,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, @@ -619,127 +619,139 @@ class Php7 extends \PhpParser\ParserAbstract 32767, 37, 7, 8, 10, 11, 50, 17,32767,32767, 32767,32767,32767, 103,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767, 562,32767,32767,32767,32767,32767,32767, + 32767,32767,32767, 563,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767, 449, 428, 429, 431, 432, 362, - 514, 568, 304, 565, 361, 146, 316, 306, 234, 307, - 250, 450, 251, 451, 454, 455, 211, 278, 358, 150, - 392, 446, 394, 444, 448, 393, 368, 373, 374, 375, - 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, - 366, 367, 447, 425, 424, 423, 390,32767,32767, 391, - 395, 365, 398,32767,32767,32767,32767,32767,32767,32767, - 32767, 103,32767, 396, 397, 414, 415, 412, 413, 416, - 32767, 417, 418, 419, 420,32767,32767,32767,32767, 342, - 340, 405, 406, 295, 295,32767,32767,32767,32767,32767, - 32767,32767,32767, 507, 422,32767,32767,32767,32767,32767, + 32767,32767,32767,32767, 450, 429, 430, 432, 433, 363, + 515, 569, 305, 566, 362, 146, 317, 307, 234, 308, + 250, 451, 251, 452, 455, 456, 211, 279, 359, 150, + 393, 447, 395, 445, 449, 394, 369, 374, 375, 376, + 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, + 367, 368, 448, 426, 425, 424, 391,32767,32767, 392, + 396, 366, 399,32767,32767,32767,32767,32767,32767,32767, + 32767, 103,32767, 397, 398, 415, 416, 413, 414, 417, + 32767, 418, 419, 420, 421,32767,32767, 296,32767,32767, + 343, 341, 406, 407, 296,32767,32767,32767,32767,32767, + 32767,32767,32767, 508, 423,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767, 103,32767, - 101, 509, 387, 389, 477, 400, 401, 399, 369,32767, - 484,32767, 103, 486,32767,32767,32767, 112,32767,32767, - 272,32767, 508,32767, 515, 515,32767, 470, 101, 194, - 32767, 194, 194,32767,32767,32767,32767,32767,32767,32767, - 576, 470, 111, 111, 111, 111, 111, 111, 111, 111, - 111, 111, 111,32767, 194, 111,32767,32767,32767, 101, - 194, 194, 194, 194, 194, 194, 194, 194, 194, 194, - 189,32767, 260, 262, 103, 530, 194,32767, 489,32767, + 101, 510, 388, 390, 478, 401, 402, 400, 370,32767, + 485,32767, 103, 487,32767,32767,32767, 112,32767,32767, + 32767, 509,32767, 516, 516,32767, 471, 101, 194,32767, + 194, 194,32767,32767,32767,32767,32767,32767,32767, 577, + 471, 111, 111, 111, 111, 111, 111, 111, 111, 111, + 111, 111,32767, 194, 111,32767,32767,32767, 101, 194, + 194, 194, 194, 194, 194, 194, 194, 194, 194, 189, + 32767, 260, 262, 103, 531, 194,32767, 490,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767, 482,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767,32767, 470, 410, 139,32767, - 139, 515, 402, 403, 404, 472, 515, 515, 515,32767, - 32767,32767,32767, 487, 487, 101, 101, 101, 101, 482, - 32767,32767, 112, 100, 100, 100, 100, 100, 104, 102, - 32767,32767,32767,32767, 100,32767, 102, 102,32767,32767, - 217, 208, 215, 102,32767, 534, 535, 215, 102, 219, - 219, 219, 239, 239, 461, 297, 102, 100, 102, 102, - 196, 297, 297,32767, 102, 461, 297, 461, 297, 198, - 297, 297, 297, 461, 297,32767,32767, 102, 297, 210, - 100, 100, 297,32767,32767,32767, 472,32767,32767,32767, + 483,32767,32767,32767,32767,32767,32767,32767,32767,32767, + 32767,32767,32767,32767,32767, 471, 411, 139,32767, 139, + 516, 403, 404, 405, 473, 516, 516, 516,32767,32767, + 32767,32767, 488, 488, 101, 101, 101, 101, 483,32767, + 32767, 112, 100, 100, 100, 100, 100, 104, 102,32767, + 32767,32767,32767, 100,32767, 102, 102,32767,32767, 217, + 208, 215, 102,32767, 535, 536, 215, 102, 219, 219, + 219, 239, 239, 462, 298, 102, 100, 102, 102, 196, + 298, 298,32767, 102, 462, 298, 462, 298, 198, 298, + 298, 298, 462, 298,32767,32767, 102, 298, 210, 100, + 100, 298,32767,32767,32767, 473,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767, 502,32767, 519, 532, 408, 409, 411, 517, 433, - 434, 435, 436, 437, 438, 439, 441, 564,32767, 476, - 32767,32767,32767,32767, 315, 574,32767, 574,32767,32767, + 503,32767, 520, 533, 409, 410, 412, 518, 434, 435, + 436, 437, 438, 439, 440, 442, 565,32767, 477,32767, + 32767,32767,32767, 316, 575,32767, 575,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767, 575,32767, 515,32767,32767, - 32767,32767, 407, 9, 76, 43, 44, 52, 58, 493, - 494, 495, 496, 490, 491, 497, 492,32767, 498, 540, - 32767,32767, 516, 567,32767,32767,32767,32767,32767,32767, - 139,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767, 502,32767, 137,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767, 515,32767,32767,32767, 292, - 294,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767,32767, 515,32767,32767,32767, - 280, 282,32767,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767,32767, 277,32767,32767, 357, - 32767,32767,32767,32767, 336,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767, 152, 152, 3, 3, 318, - 152, 152, 152, 318, 152, 318, 318, 318, 152, 152, - 152, 152, 152, 152, 184, 254, 257, 239, 239, 152, - 328, 152 + 32767,32767,32767,32767, 576,32767, 516,32767,32767,32767, + 32767, 408, 9, 76, 43, 44, 52, 58, 494, 495, + 496, 497, 491, 492, 498, 493,32767, 499, 541,32767, + 32767, 517, 568,32767,32767,32767,32767,32767,32767, 139, + 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, + 503,32767, 137,32767,32767,32767,32767,32767,32767,32767, + 32767,32767,32767,32767, 516,32767,32767,32767, 293, 295, + 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, + 32767,32767,32767,32767,32767, 516,32767,32767,32767, 281, + 283,32767,32767,32767,32767,32767,32767,32767,32767,32767, + 32767,32767,32767,32767,32767, 278,32767,32767, 358,32767, + 32767,32767,32767, 337,32767,32767,32767,32767,32767,32767, + 32767,32767,32767,32767, 152, 152, 3, 3, 319, 152, + 152, 152, 319, 152, 319, 319, 319, 152, 152, 152, + 152, 152, 152, 272, 184, 254, 257, 239, 239, 152, + 329, 152 ); protected $goto = array( - 192, 192, 663, 417, 636, 911, 983, 990, 991, 411, - 302, 303, 324, 557, 308, 416, 325, 418, 615, 1005, - 671, 317, 317, 317, 317, 163, 163, 163, 163, 216, + 192, 192, 662, 416, 635, 911, 984, 991, 992, 410, + 302, 303, 323, 556, 308, 415, 324, 417, 614, 1006, + 670, 317, 317, 317, 317, 163, 163, 163, 163, 216, 193, 189, 189, 173, 175, 211, 189, 189, 189, 189, 189, 190, 190, 190, 190, 190, 190, 184, 185, 186, - 187, 188, 213, 211, 214, 515, 516, 407, 517, 519, - 520, 521, 522, 523, 524, 525, 526, 1074, 164, 165, + 187, 188, 213, 211, 214, 514, 515, 406, 516, 518, + 519, 520, 521, 522, 523, 524, 525, 1075, 164, 165, 166, 191, 167, 168, 169, 162, 170, 171, 172, 174, 210, 212, 215, 233, 236, 239, 240, 242, 253, 254, - 255, 256, 257, 258, 259, 261, 262, 263, 264, 271, - 272, 305, 306, 307, 412, 413, 414, 562, 217, 218, + 255, 256, 257, 258, 259, 261, 262, 263, 264, 272, + 273, 305, 306, 307, 411, 412, 413, 561, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 176, 232, 177, 194, 195, 196, 234, - 184, 185, 186, 187, 188, 213, 1074, 197, 178, 179, + 184, 185, 186, 187, 188, 213, 1075, 197, 178, 179, 180, 198, 194, 181, 235, 199, 161, 200, 201, 182, 202, 203, 204, 183, 205, 206, 207, 208, 209, 819, - 579, 601, 601, 541, 532, 815, 816, 1204, 1204, 1204, - 1204, 1204, 1204, 1204, 1204, 1204, 1204, 954, 928, 928, - 926, 928, 695, 817, 531, 963, 958, 381, 385, 542, - 580, 584, 383, 532, 541, 550, 551, 390, 560, 581, - 595, 596, 824, 793, 872, 867, 868, 881, 14, 825, - 869, 822, 870, 871, 823, 480, 850, 481, 875, 527, - 527, 527, 527, 488, 583, 1222, 1222, 791, 1026, 1022, - 1023, 1222, 1222, 1222, 1222, 1222, 1222, 1222, 1222, 1222, - 1222, 1220, 1220, 812, 812, 599, 633, 1220, 1220, 1220, - 1220, 1220, 1220, 1220, 1220, 1220, 1220, 313, 297, 1173, - 1173, 1173, 987, 282, 282, 282, 282, 987, 987, 987, - 987, 987, 987, 987, 987, 987, 447, 447, 432, 249, - 249, 1173, 554, 432, 432, 447, 1173, 1173, 1173, 1173, - 1046, 1047, 1173, 1173, 1173, 1254, 1254, 1254, 1254, 337, - 797, 1272, 1272, 930, 246, 246, 246, 246, 248, 250, - 888, 335, 876, 340, 877, 889, 1249, 1250, 1272, 518, - 518, 832, 1262, 340, 340, 518, 518, 518, 518, 518, - 518, 518, 518, 518, 518, 1275, 844, 340, 340, 831, - 340, 797, 1289, 797, 630, 1169, 644, 645, 646, 529, - 529, 529, 611, 612, 534, 1273, 1273, 340, 812, 951, - 432, 432, 432, 432, 432, 432, 432, 432, 432, 432, - 432, 438, 1273, 432, 558, 593, 924, 924, 924, 924, - 379, 635, 438, 918, 925, 553, 1123, 1154, 904, 422, - 547, 1155, 1158, 905, 1159, 548, 326, 594, 1170, 696, - 614, 616, 1233, 634, 410, 807, 590, 653, 657, 965, - 661, 669, 961, 456, 1247, 1248, 809, 837, 1244, 1244, - 1244, 1171, 1230, 1231, 5, 656, 6, 533, 545, 389, - 968, 968, 533, 1166, 545, 834, 973, 382, 922, 397, - 670, 1256, 1256, 1256, 1256, 1011, 699, 561, 450, 451, - 452, 846, 842, 534, 457, 1280, 1281, 619, 619, 1015, - 1057, 395, 396, 995, 992, 993, 642, 1240, 643, 935, - 399, 400, 401, 461, 654, 0, 0, 0, 402, 0, - 840, 0, 333, 578, 1039, 0, 674, 660, 660, 0, - 666, 1037, 489, 588, 602, 605, 606, 607, 608, 627, - 628, 629, 673, 0, 0, 0, 1013, 893, 1062, 0, - 1242, 1242, 1013, 1168, 598, 252, 252, 0, 0, 970, - 269, 845, 833, 1010, 1014, 530, 530, 836, 0, 639, - 949, 933, 0, 338, 339, 830, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 1165, 0, - 0, 0, 0, 0, 923, 0, 0, 0, 0, 0, + 578, 600, 600, 540, 531, 815, 816, 1205, 1205, 1205, + 1205, 1205, 1205, 1205, 1205, 1205, 1205, 954, 928, 928, + 926, 928, 695, 817, 530, 963, 958, 380, 384, 541, + 579, 583, 382, 531, 540, 549, 550, 389, 559, 580, + 594, 595, 824, 336, 872, 867, 868, 881, 14, 825, + 869, 822, 870, 871, 823, 339, 1274, 1274, 875, 528, + 528, 876, 528, 877, 793, 339, 339, 791, 1027, 1023, + 1024, 1155, 904, 1274, 850, 1156, 1159, 905, 1160, 339, + 339, 437, 339, 479, 1290, 480, 924, 924, 924, 924, + 930, 487, 437, 918, 925, 533, 598, 632, 339, 1174, + 1174, 988, 1174, 988, 282, 282, 282, 282, 988, 988, + 988, 988, 988, 988, 988, 988, 446, 446, 431, 249, + 249, 1174, 553, 431, 431, 446, 1174, 1174, 1174, 1174, + 1047, 1048, 1174, 1174, 1174, 1255, 1255, 1255, 1255, 313, + 297, 812, 812, 1234, 246, 246, 246, 246, 248, 250, + 888, 618, 577, 1040, 889, 673, 659, 659, 618, 665, + 1038, 1223, 1223, 996, 993, 994, 655, 1223, 1223, 1223, + 1223, 1223, 1223, 1223, 1223, 1223, 1223, 1221, 1221, 1250, + 1251, 1273, 1273, 1221, 1221, 1221, 1221, 1221, 1221, 1221, + 1221, 1221, 1221, 629, 533, 643, 644, 645, 1273, 431, + 431, 431, 431, 431, 431, 431, 431, 431, 431, 431, + 517, 517, 431, 409, 1276, 589, 517, 517, 517, 517, + 517, 517, 517, 517, 517, 517, 547, 334, 797, 546, + 696, 613, 615, 5, 633, 6, 593, 1263, 652, 656, + 965, 660, 668, 961, 587, 601, 604, 605, 606, 607, + 626, 627, 628, 672, 1169, 812, 610, 611, 1245, 1245, + 951, 1245, 832, 455, 1248, 1249, 532, 544, 797, 378, + 797, 532, 552, 544, 557, 592, 381, 844, 337, 338, + 831, 1257, 1257, 1257, 1257, 634, 560, 449, 450, 451, + 1124, 842, 394, 395, 1281, 1282, 325, 641, 421, 642, + 1170, 398, 399, 400, 809, 653, 837, 1241, 388, 401, + 922, 396, 669, 332, 834, 1167, 893, 1063, 973, 840, + 699, 1012, 846, 597, 526, 526, 526, 526, 970, 582, + 1016, 488, 845, 833, 1011, 1015, 836, 456, 638, 949, + 1058, 935, 933, 460, 830, 1014, 0, 0, 0, 1243, + 1243, 1014, 0, 1171, 0, 252, 252, 1166, 0, 0, + 807, 270, 0, 0, 0, 923, 529, 529, 0, 0, + 0, 0, 0, 0, 0, 0, 1172, 1231, 1232, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 1056, 849, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 1055, 849 + 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, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 968, 968 ); protected $gotoCheck = array( 42, 42, 72, 65, 65, 87, 87, 87, 87, 65, - 65, 65, 65, 65, 65, 65, 65, 65, 65, 115, + 65, 65, 65, 65, 65, 65, 65, 65, 65, 116, 9, 23, 23, 23, 23, 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, @@ -754,90 +766,102 @@ class Php7 extends \PhpParser\ParserAbstract 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, 15, - 118, 104, 104, 75, 75, 25, 26, 104, 104, 104, + 119, 104, 104, 75, 75, 25, 26, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 25, 25, 25, 25, 25, 25, 27, 25, 25, 25, 58, 58, 58, 58, 58, 75, 75, 75, 75, 75, 75, 75, 75, - 75, 75, 15, 7, 15, 15, 15, 15, 75, 15, - 15, 15, 15, 15, 15, 143, 45, 143, 15, 103, - 103, 103, 103, 143, 103, 156, 156, 6, 15, 15, - 15, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 157, 157, 22, 22, 55, 55, 157, 157, 157, - 157, 157, 157, 157, 157, 157, 157, 155, 155, 72, - 72, 72, 72, 24, 24, 24, 24, 72, 72, 72, - 72, 72, 72, 72, 72, 72, 137, 137, 23, 5, - 5, 72, 158, 23, 23, 137, 72, 72, 72, 72, - 132, 132, 72, 72, 72, 9, 9, 9, 9, 93, - 12, 168, 168, 49, 5, 5, 5, 5, 5, 5, - 72, 165, 64, 14, 64, 72, 164, 164, 168, 159, - 159, 35, 167, 14, 14, 159, 159, 159, 159, 159, - 159, 159, 159, 159, 159, 168, 35, 14, 14, 35, - 14, 12, 14, 12, 84, 20, 84, 84, 84, 19, - 19, 19, 83, 83, 14, 169, 169, 14, 22, 99, + 75, 75, 15, 93, 15, 15, 15, 15, 75, 15, + 15, 15, 15, 15, 15, 14, 170, 170, 15, 19, + 19, 64, 19, 64, 7, 14, 14, 6, 15, 15, + 15, 78, 78, 170, 45, 78, 78, 78, 78, 14, + 14, 19, 14, 144, 14, 144, 19, 19, 19, 19, + 49, 144, 19, 19, 19, 14, 55, 55, 14, 72, + 72, 72, 72, 72, 24, 24, 24, 24, 72, 72, + 72, 72, 72, 72, 72, 72, 138, 138, 23, 5, + 5, 72, 159, 23, 23, 138, 72, 72, 72, 72, + 133, 133, 72, 72, 72, 9, 9, 9, 9, 156, + 156, 22, 22, 14, 5, 5, 5, 5, 5, 5, + 72, 112, 8, 8, 72, 8, 8, 8, 112, 8, + 8, 157, 157, 112, 112, 112, 14, 157, 157, 157, + 157, 157, 157, 157, 157, 157, 157, 158, 158, 165, + 165, 169, 169, 158, 158, 158, 158, 158, 158, 158, + 158, 158, 158, 84, 14, 84, 84, 84, 169, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, - 23, 19, 169, 23, 2, 2, 19, 19, 19, 19, - 61, 63, 19, 19, 19, 100, 139, 78, 78, 108, - 9, 78, 78, 78, 78, 48, 29, 9, 20, 48, - 48, 48, 14, 48, 13, 20, 13, 48, 48, 48, - 48, 48, 48, 162, 162, 162, 18, 39, 118, 118, - 118, 20, 20, 20, 46, 14, 46, 9, 9, 28, - 103, 103, 9, 148, 9, 37, 106, 9, 89, 89, - 89, 118, 118, 118, 118, 117, 95, 9, 9, 9, - 9, 41, 9, 14, 145, 9, 9, 111, 111, 120, - 135, 80, 80, 111, 111, 111, 80, 118, 80, 92, - 80, 80, 80, 82, 80, -1, -1, -1, 80, -1, - 9, -1, 80, 8, 8, -1, 8, 8, 8, -1, - 8, 8, 9, 79, 79, 79, 79, 79, 79, 79, - 79, 79, 79, -1, -1, -1, 118, 17, 17, -1, - 118, 118, 118, 14, 17, 5, 5, -1, -1, 17, - 24, 16, 16, 16, 16, 24, 24, 17, -1, 17, - 17, 16, -1, 93, 93, 17, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 17, -1, - -1, -1, -1, -1, 16, -1, -1, -1, -1, -1, + 160, 160, 23, 13, 169, 13, 160, 160, 160, 160, + 160, 160, 160, 160, 160, 160, 48, 166, 12, 9, + 48, 48, 48, 46, 48, 46, 9, 168, 48, 48, + 48, 48, 48, 48, 79, 79, 79, 79, 79, 79, + 79, 79, 79, 79, 14, 22, 83, 83, 119, 119, + 99, 119, 35, 163, 163, 163, 9, 9, 12, 61, + 12, 9, 100, 9, 2, 2, 9, 35, 93, 93, + 35, 119, 119, 119, 119, 63, 9, 9, 9, 9, + 140, 9, 80, 80, 9, 9, 29, 80, 109, 80, + 20, 80, 80, 80, 18, 80, 39, 119, 28, 80, + 89, 89, 89, 80, 37, 149, 17, 17, 106, 9, + 95, 118, 41, 17, 103, 103, 103, 103, 17, 103, + 121, 9, 16, 16, 16, 16, 17, 146, 17, 17, + 136, 92, 16, 82, 17, 119, -1, -1, -1, 119, + 119, 119, -1, 20, -1, 5, 5, 17, -1, -1, + 20, 24, -1, -1, -1, 16, 24, 24, -1, -1, + -1, -1, -1, -1, -1, -1, 20, 20, 20, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 16, 16, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 16, 16 + -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, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 103, 103 ); protected $gotoBase = array( - 0, 0, -303, 0, 0, 278, 214, 194, 476, 7, - 0, 0, 15, 78, 27, -175, 87, 61, 118, 84, - -33, 0, -74, 18, 260, 161, 162, 179, 103, 111, - 0, 0, 0, 0, 0, -35, 0, 107, 0, 105, - 0, 26, -1, 0, 0, 204, -275, 0, -281, 281, - 0, 0, 0, 0, 0, 207, 0, 0, 144, 0, - 0, 340, 0, 143, 294, -234, 0, 0, 0, 0, - 0, 0, -6, 0, 0, -168, 0, 0, -8, 150, - -10, 0, 16, -108, -339, 0, 0, -270, 0, 145, - 0, 0, 42, -164, 0, 52, 0, 0, 0, 326, - 344, 0, 0, 193, -76, 0, 81, 0, 115, 0, - 0, 184, 0, 0, 0, 17, 0, 86, 153, 0, - 33, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 21, 0, 0, 32, 0, 244, 0, 119, - 0, 0, 0, -260, 0, 30, 0, 0, 79, 0, - 0, 0, 0, 0, 0, -53, -12, 4, 255, 82, - 0, 0, 124, 0, -41, 283, 0, 293, 5, 59, - 0, 0 + 0, 0, -242, 0, 0, 278, 214, 215, 305, 7, + 0, 0, 103, 48, -71, -174, 59, 31, 166, -46, + 83, 0, -16, 18, 261, 161, 162, 179, 143, 171, + 0, 0, 0, 0, 0, 67, 0, 147, 0, 154, + 0, 58, -1, 0, 0, 222, -306, 0, -289, 228, + 0, 0, 0, 0, 0, 218, 0, 0, 144, 0, + 0, 389, 0, 207, 203, -234, 0, 0, 0, 0, + 0, 0, -6, 0, 0, -167, 0, 0, -163, 62, + -18, 0, 47, -43, -329, 0, 0, -270, 0, 177, + 0, 0, 75, -259, 0, 87, 0, 0, 0, 387, + 391, 0, 0, 458, -76, 0, 124, 0, 0, 184, + 0, 0, 44, 0, 0, 0, 17, 0, 123, 153, + 0, 65, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 20, 0, 0, 73, 0, 244, 0, + 182, 0, 0, 0, -231, 0, 74, 0, 0, 122, + 0, 0, 0, 0, 0, 0, -11, 84, 100, 255, + 133, 0, 0, 134, 0, -17, 359, 0, 368, 45, + -80, 0, 0 ); protected $gotoDefault = array( - -32768, 493, 703, 4, 704, 897, 780, 789, 577, 509, - 672, 334, 603, 408, 1238, 874, 1061, 559, 808, 1182, - 1190, 439, 811, 318, 320, 856, 857, 858, 386, 371, - 377, 384, 625, 604, 474, 843, 435, 835, 466, 838, - 434, 847, 160, 405, 491, 851, 3, 853, 536, 884, - 372, 861, 373, 649, 863, 544, 865, 866, 380, 387, - 388, 1066, 552, 600, 878, 241, 546, 879, 370, 880, - 887, 375, 378, 658, 446, 486, 479, 398, 1041, 587, - 622, 443, 460, 610, 609, 597, 459, 640, 403, 920, - 467, 444, 934, 336, 942, 701, 1073, 617, 469, 950, - 618, 957, 960, 510, 511, 458, 972, 273, 470, 1000, - 641, 985, 620, 998, 453, 1004, 436, 1012, 1226, 437, - 1016, 260, 1019, 274, 404, 419, 1024, 1025, 8, 1031, - 664, 665, 10, 270, 490, 1056, 659, 433, 1072, 423, - 1142, 1144, 538, 471, 1162, 1161, 652, 487, 1167, 1229, - 431, 512, 454, 304, 513, 296, 322, 301, 528, 283, - 323, 514, 455, 1235, 1243, 319, 29, 1263, 1274, 330, - 556, 592 + -32768, 492, 703, 4, 704, 897, 780, 789, 576, 508, + 671, 333, 602, 407, 1239, 874, 1062, 558, 808, 1183, + 1191, 438, 811, 318, 693, 856, 857, 858, 385, 370, + 376, 383, 624, 603, 473, 843, 434, 835, 465, 838, + 433, 847, 160, 404, 490, 851, 3, 853, 535, 884, + 371, 861, 372, 648, 863, 543, 865, 866, 379, 386, + 387, 1067, 551, 599, 878, 241, 545, 879, 369, 880, + 887, 374, 377, 657, 445, 485, 478, 397, 1042, 586, + 621, 442, 459, 609, 608, 596, 458, 639, 402, 920, + 466, 443, 934, 335, 942, 701, 1074, 616, 468, 950, + 617, 957, 960, 509, 510, 457, 972, 267, 975, 469, + 1001, 640, 986, 619, 999, 452, 1005, 435, 1013, 1227, + 436, 1017, 260, 1020, 274, 403, 418, 1025, 1026, 8, + 1032, 663, 664, 10, 271, 489, 1057, 658, 432, 1073, + 422, 1143, 1145, 537, 470, 1163, 1162, 651, 486, 1168, + 1230, 430, 511, 453, 304, 512, 296, 321, 301, 527, + 283, 322, 513, 454, 1236, 1244, 319, 29, 1264, 1275, + 329, 555, 591 ); protected $ruleToNonTerminal = array( @@ -868,16 +892,16 @@ class Php7 extends \PhpParser\ParserAbstract 93, 94, 94, 95, 95, 96, 97, 97, 98, 98, 99, 99, 54, 54, 50, 50, 101, 52, 52, 102, 51, 51, 53, 53, 63, 63, 63, 63, 79, 79, - 105, 105, 107, 107, 107, 107, 107, 106, 106, 106, - 109, 109, 109, 87, 87, 111, 111, 111, 110, 110, - 112, 112, 113, 113, 113, 108, 108, 80, 80, 80, - 20, 20, 114, 114, 115, 115, 115, 115, 59, 116, - 116, 117, 60, 119, 119, 120, 120, 121, 121, 84, - 122, 122, 122, 122, 122, 122, 127, 127, 128, 128, - 129, 129, 129, 129, 129, 130, 131, 131, 126, 126, - 123, 123, 125, 125, 133, 133, 132, 132, 132, 132, - 132, 132, 132, 124, 134, 134, 136, 135, 135, 61, - 100, 137, 137, 55, 55, 42, 42, 42, 42, 42, + 105, 105, 107, 107, 108, 108, 108, 108, 106, 106, + 106, 110, 110, 110, 87, 87, 112, 112, 112, 111, + 111, 113, 113, 114, 114, 114, 109, 109, 80, 80, + 80, 20, 20, 115, 115, 116, 116, 116, 116, 59, + 117, 117, 118, 60, 120, 120, 121, 121, 122, 122, + 84, 123, 123, 123, 123, 123, 123, 128, 128, 129, + 129, 130, 130, 130, 130, 130, 131, 132, 132, 127, + 127, 124, 124, 126, 126, 134, 134, 133, 133, 133, + 133, 133, 133, 133, 125, 135, 135, 137, 136, 136, + 61, 100, 138, 138, 55, 55, 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, @@ -886,20 +910,20 @@ class Php7 extends \PhpParser\ParserAbstract 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, 144, 138, - 138, 143, 143, 146, 147, 147, 148, 149, 149, 149, - 19, 19, 72, 72, 72, 72, 139, 139, 139, 139, - 151, 151, 140, 140, 142, 142, 142, 145, 145, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 157, 157, - 104, 159, 159, 159, 159, 141, 141, 141, 141, 141, - 141, 141, 141, 58, 58, 154, 154, 154, 154, 160, - 160, 150, 150, 150, 161, 161, 161, 161, 161, 161, - 73, 73, 65, 65, 65, 65, 118, 118, 118, 118, - 164, 163, 153, 153, 153, 153, 153, 153, 153, 152, - 152, 152, 162, 162, 162, 162, 103, 158, 166, 166, - 165, 165, 167, 167, 167, 167, 167, 167, 167, 167, - 155, 155, 155, 155, 169, 170, 168, 168, 168, 168, - 168, 168, 168, 168, 171, 171, 171, 171 + 42, 42, 42, 42, 42, 42, 42, 42, 42, 145, + 139, 139, 144, 144, 147, 148, 148, 149, 150, 150, + 150, 19, 19, 72, 72, 72, 72, 140, 140, 140, + 140, 152, 152, 141, 141, 143, 143, 143, 146, 146, + 157, 157, 157, 157, 157, 157, 157, 157, 157, 158, + 158, 104, 160, 160, 160, 160, 142, 142, 142, 142, + 142, 142, 142, 142, 58, 58, 155, 155, 155, 155, + 161, 161, 151, 151, 151, 162, 162, 162, 162, 162, + 162, 73, 73, 65, 65, 65, 65, 119, 119, 119, + 119, 165, 164, 154, 154, 154, 154, 154, 154, 154, + 153, 153, 153, 163, 163, 163, 163, 103, 159, 167, + 167, 166, 166, 168, 168, 168, 168, 168, 168, 168, + 168, 156, 156, 156, 156, 170, 171, 169, 169, 169, + 169, 169, 169, 169, 169, 172, 172, 172, 172 ); protected $ruleToLength = array( @@ -930,38 +954,38 @@ class Php7 extends \PhpParser\ParserAbstract 2, 4, 3, 1, 1, 7, 0, 2, 1, 3, 3, 4, 1, 4, 0, 2, 5, 0, 2, 6, 0, 2, 0, 3, 1, 2, 1, 1, 2, 0, - 1, 3, 0, 1, 1, 1, 1, 6, 8, 6, - 1, 2, 1, 1, 1, 1, 1, 1, 3, 3, - 3, 3, 1, 2, 1, 0, 1, 0, 2, 2, - 2, 4, 1, 3, 1, 2, 2, 3, 2, 3, - 1, 1, 2, 3, 1, 1, 3, 2, 0, 1, - 5, 5, 10, 3, 5, 1, 1, 3, 0, 2, - 4, 5, 4, 4, 4, 3, 1, 1, 1, 1, - 1, 1, 0, 1, 1, 2, 1, 1, 1, 1, - 1, 1, 1, 2, 1, 3, 1, 1, 3, 2, - 2, 3, 1, 0, 1, 1, 3, 3, 3, 4, - 1, 1, 2, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, - 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 5, 4, 3, 4, 4, 2, 2, - 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 1, 3, 2, 1, 2, 4, 2, 2, - 8, 9, 8, 9, 9, 10, 9, 10, 8, 3, - 2, 0, 4, 2, 1, 3, 2, 2, 2, 4, - 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, - 1, 1, 0, 3, 0, 1, 1, 0, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, - 3, 4, 1, 1, 3, 1, 1, 1, 1, 1, - 3, 2, 3, 0, 1, 1, 3, 1, 1, 1, - 1, 1, 3, 1, 1, 4, 4, 1, 4, 4, - 0, 1, 1, 1, 3, 3, 1, 4, 2, 2, - 1, 3, 1, 4, 4, 3, 3, 3, 3, 1, - 3, 1, 1, 3, 1, 1, 4, 1, 1, 1, - 3, 1, 1, 2, 1, 3, 4, 3, 2, 0, - 2, 2, 1, 2, 1, 1, 1, 4, 3, 3, - 3, 3, 6, 3, 1, 1, 2, 1 + 1, 3, 0, 2, 1, 1, 1, 1, 6, 8, + 6, 1, 2, 1, 1, 1, 1, 1, 1, 3, + 3, 3, 3, 1, 2, 1, 0, 1, 0, 2, + 2, 2, 4, 1, 3, 1, 2, 2, 3, 2, + 3, 1, 1, 2, 3, 1, 1, 3, 2, 0, + 1, 5, 5, 10, 3, 5, 1, 1, 3, 0, + 2, 4, 5, 4, 4, 4, 3, 1, 1, 1, + 1, 1, 1, 0, 1, 1, 2, 1, 1, 1, + 1, 1, 1, 1, 2, 1, 3, 1, 1, 3, + 2, 2, 3, 1, 0, 1, 1, 3, 3, 3, + 4, 1, 1, 2, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, + 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, + 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 5, 4, 3, 4, 4, 2, + 2, 4, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 1, 3, 2, 1, 2, 4, 2, + 2, 8, 9, 8, 9, 9, 10, 9, 10, 8, + 3, 2, 0, 4, 2, 1, 3, 2, 2, 2, + 4, 1, 1, 1, 1, 1, 1, 1, 1, 3, + 1, 1, 1, 0, 3, 0, 1, 1, 0, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, + 3, 3, 4, 1, 1, 3, 1, 1, 1, 1, + 1, 3, 2, 3, 0, 1, 1, 3, 1, 1, + 1, 1, 1, 3, 1, 1, 4, 4, 1, 4, + 4, 0, 1, 1, 1, 3, 3, 1, 4, 2, + 2, 1, 3, 1, 4, 4, 3, 3, 3, 3, + 1, 3, 1, 1, 3, 1, 1, 4, 1, 1, + 1, 3, 1, 1, 2, 1, 3, 4, 3, 2, + 0, 2, 2, 1, 2, 1, 1, 1, 4, 3, + 3, 3, 3, 6, 3, 1, 1, 2, 1 ); protected function initReduceCallbacks() { @@ -1814,292 +1838,292 @@ class Php7 extends \PhpParser\ParserAbstract $this->semValue = 0; }, 273 => function ($stackPos) { - $this->semValue = Stmt\Class_::MODIFIER_PUBLIC; + $this->checkModifier($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $this->semValue = $this->semStack[$stackPos-(2-1)] | $this->semStack[$stackPos-(2-2)]; }, 274 => function ($stackPos) { - $this->semValue = Stmt\Class_::MODIFIER_PROTECTED; + $this->semValue = Stmt\Class_::MODIFIER_PUBLIC; }, 275 => function ($stackPos) { - $this->semValue = Stmt\Class_::MODIFIER_PRIVATE; + $this->semValue = Stmt\Class_::MODIFIER_PROTECTED; }, 276 => function ($stackPos) { - $this->semValue = Stmt\Class_::MODIFIER_READONLY; + $this->semValue = Stmt\Class_::MODIFIER_PRIVATE; }, 277 => function ($stackPos) { + $this->semValue = Stmt\Class_::MODIFIER_READONLY; + }, + 278 => function ($stackPos) { $this->semValue = new Node\Param($this->semStack[$stackPos-(6-6)], null, $this->semStack[$stackPos-(6-3)], $this->semStack[$stackPos-(6-4)], $this->semStack[$stackPos-(6-5)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes, $this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-1)]); $this->checkParam($this->semValue); }, - 278 => function ($stackPos) { + 279 => function ($stackPos) { $this->semValue = new Node\Param($this->semStack[$stackPos-(8-6)], $this->semStack[$stackPos-(8-8)], $this->semStack[$stackPos-(8-3)], $this->semStack[$stackPos-(8-4)], $this->semStack[$stackPos-(8-5)], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes, $this->semStack[$stackPos-(8-2)], $this->semStack[$stackPos-(8-1)]); $this->checkParam($this->semValue); }, - 279 => function ($stackPos) { + 280 => function ($stackPos) { $this->semValue = new Node\Param(new Expr\Error($this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes), null, $this->semStack[$stackPos-(6-3)], $this->semStack[$stackPos-(6-4)], $this->semStack[$stackPos-(6-5)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes, $this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-1)]); }, - 280 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(1-1)]; - }, 281 => function ($stackPos) { - $this->semValue = new Node\NullableType($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 282 => function ($stackPos) { - $this->semValue = new Node\UnionType($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); - }, - 283 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(1-1)]; - }, - 284 => function ($stackPos) { - $this->semValue = new Node\Name('static', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); - }, - 285 => function ($stackPos) { - $this->semValue = $this->handleBuiltinTypes($this->semStack[$stackPos-(1-1)]); - }, - 286 => function ($stackPos) { - $this->semValue = new Node\Identifier('array', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); - }, - 287 => function ($stackPos) { - $this->semValue = new Node\Identifier('callable', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); - }, - 288 => function ($stackPos) { - $this->semValue = array($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)]); - }, - 289 => function ($stackPos) { - $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; - }, - 290 => function ($stackPos) { - $this->semValue = array($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)]); - }, - 291 => function ($stackPos) { - $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; - }, - 292 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(1-1)]; - }, - 293 => function ($stackPos) { $this->semValue = new Node\NullableType($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, - 294 => function ($stackPos) { + 283 => function ($stackPos) { $this->semValue = new Node\UnionType($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, + 284 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 285 => function ($stackPos) { + $this->semValue = new Node\Name('static', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 286 => function ($stackPos) { + $this->semValue = $this->handleBuiltinTypes($this->semStack[$stackPos-(1-1)]); + }, + 287 => function ($stackPos) { + $this->semValue = new Node\Identifier('array', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 288 => function ($stackPos) { + $this->semValue = new Node\Identifier('callable', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 289 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)]); + }, + 290 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 291 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)]); + }, + 292 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 293 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 294 => function ($stackPos) { + $this->semValue = new Node\NullableType($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, 295 => function ($stackPos) { - $this->semValue = null; + $this->semValue = new Node\UnionType($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, 296 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(1-1)]; + $this->semValue = null; }, 297 => function ($stackPos) { - $this->semValue = null; - }, - 298 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(2-2)]; - }, - 299 => function ($stackPos) { - $this->semValue = null; - }, - 300 => function ($stackPos) { - $this->semValue = array(); - }, - 301 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(4-2)]; - }, - 302 => function ($stackPos) { - $this->semValue = array($this->semStack[$stackPos-(1-1)]); - }, - 303 => function ($stackPos) { - $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; - }, - 304 => function ($stackPos) { - $this->semValue = new Node\Arg($this->semStack[$stackPos-(1-1)], false, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); - }, - 305 => function ($stackPos) { - $this->semValue = new Node\Arg($this->semStack[$stackPos-(2-2)], true, false, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); - }, - 306 => function ($stackPos) { - $this->semValue = new Node\Arg($this->semStack[$stackPos-(2-2)], false, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); - }, - 307 => function ($stackPos) { - $this->semValue = new Node\Arg($this->semStack[$stackPos-(3-3)], false, false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes, $this->semStack[$stackPos-(3-1)]); - }, - 308 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(2-1)]; - }, - 309 => function ($stackPos) { - $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; - }, - 310 => function ($stackPos) { - $this->semValue = array($this->semStack[$stackPos-(1-1)]); - }, - 311 => function ($stackPos) { $this->semValue = $this->semStack[$stackPos-(1-1)]; }, - 312 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(2-1)]; + 298 => function ($stackPos) { + $this->semValue = null; }, - 313 => function ($stackPos) { - $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + 299 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-2)]; }, - 314 => function ($stackPos) { - $this->semValue = array($this->semStack[$stackPos-(1-1)]); + 300 => function ($stackPos) { + $this->semValue = null; }, - 315 => function ($stackPos) { - $this->semValue = new Stmt\StaticVar($this->semStack[$stackPos-(1-1)], null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); - }, - 316 => function ($stackPos) { - $this->semValue = new Stmt\StaticVar($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); - }, - 317 => function ($stackPos) { - if ($this->semStack[$stackPos-(2-2)] !== null) { $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; } - }, - 318 => function ($stackPos) { + 301 => function ($stackPos) { $this->semValue = array(); }, + 302 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(4-2)]; + }, + 303 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 304 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 305 => function ($stackPos) { + $this->semValue = new Node\Arg($this->semStack[$stackPos-(1-1)], false, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 306 => function ($stackPos) { + $this->semValue = new Node\Arg($this->semStack[$stackPos-(2-2)], true, false, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 307 => function ($stackPos) { + $this->semValue = new Node\Arg($this->semStack[$stackPos-(2-2)], false, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 308 => function ($stackPos) { + $this->semValue = new Node\Arg($this->semStack[$stackPos-(3-3)], false, false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes, $this->semStack[$stackPos-(3-1)]); + }, + 309 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 310 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 311 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 312 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 313 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(2-1)]; + }, + 314 => function ($stackPos) { + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + }, + 315 => function ($stackPos) { + $this->semValue = array($this->semStack[$stackPos-(1-1)]); + }, + 316 => function ($stackPos) { + $this->semValue = new Stmt\StaticVar($this->semStack[$stackPos-(1-1)], null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + }, + 317 => function ($stackPos) { + $this->semValue = new Stmt\StaticVar($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, + 318 => function ($stackPos) { + if ($this->semStack[$stackPos-(2-2)] !== null) { $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; } + }, 319 => function ($stackPos) { + $this->semValue = array(); + }, + 320 => function ($stackPos) { $startAttributes = $this->lookaheadStartAttributes; if (isset($startAttributes['comments'])) { $nop = new Stmt\Nop($this->createCommentNopAttributes($startAttributes['comments'])); } else { $nop = null; }; if ($nop !== null) { $this->semStack[$stackPos-(1-1)][] = $nop; } $this->semValue = $this->semStack[$stackPos-(1-1)]; }, - 320 => function ($stackPos) { + 321 => function ($stackPos) { $this->semValue = new Stmt\Property($this->semStack[$stackPos-(5-2)], $this->semStack[$stackPos-(5-4)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes, $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-1)]); $this->checkProperty($this->semValue, $stackPos-(5-2)); }, - 321 => function ($stackPos) { + 322 => function ($stackPos) { $this->semValue = new Stmt\ClassConst($this->semStack[$stackPos-(5-4)], $this->semStack[$stackPos-(5-2)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes, $this->semStack[$stackPos-(5-1)]); $this->checkClassConst($this->semValue, $stackPos-(5-2)); }, - 322 => function ($stackPos) { + 323 => function ($stackPos) { $this->semValue = new Stmt\ClassMethod($this->semStack[$stackPos-(10-5)], ['type' => $this->semStack[$stackPos-(10-2)], 'byRef' => $this->semStack[$stackPos-(10-4)], 'params' => $this->semStack[$stackPos-(10-7)], 'returnType' => $this->semStack[$stackPos-(10-9)], 'stmts' => $this->semStack[$stackPos-(10-10)], 'attrGroups' => $this->semStack[$stackPos-(10-1)]], $this->startAttributeStack[$stackPos-(10-1)] + $this->endAttributes); $this->checkClassMethod($this->semValue, $stackPos-(10-2)); }, - 323 => function ($stackPos) { + 324 => function ($stackPos) { $this->semValue = new Stmt\TraitUse($this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, - 324 => function ($stackPos) { + 325 => function ($stackPos) { $this->semValue = new Stmt\EnumCase($this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-4)], $this->semStack[$stackPos-(5-1)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes); }, - 325 => function ($stackPos) { + 326 => function ($stackPos) { $this->semValue = null; /* will be skipped */ }, - 326 => function ($stackPos) { - $this->semValue = array(); - }, 327 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(3-2)]; + $this->semValue = array(); }, 328 => function ($stackPos) { - $this->semValue = array(); + $this->semValue = $this->semStack[$stackPos-(3-2)]; }, 329 => function ($stackPos) { - $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; + $this->semValue = array(); }, 330 => function ($stackPos) { - $this->semValue = new Stmt\TraitUseAdaptation\Precedence($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; }, 331 => function ($stackPos) { - $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(5-1)][0], $this->semStack[$stackPos-(5-1)][1], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-4)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes); + $this->semValue = new Stmt\TraitUseAdaptation\Precedence($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); }, 332 => function ($stackPos) { - $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], $this->semStack[$stackPos-(4-3)], null, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(5-1)][0], $this->semStack[$stackPos-(5-1)][1], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-4)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes); }, 333 => function ($stackPos) { - $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], null, $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], $this->semStack[$stackPos-(4-3)], null, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); }, 334 => function ($stackPos) { $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], null, $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); }, 335 => function ($stackPos) { - $this->semValue = array($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)]); + $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], null, $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); }, 336 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(1-1)]; + $this->semValue = array($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)]); }, 337 => function ($stackPos) { - $this->semValue = array(null, $this->semStack[$stackPos-(1-1)]); + $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 338 => function ($stackPos) { - $this->semValue = null; + $this->semValue = array(null, $this->semStack[$stackPos-(1-1)]); }, 339 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(1-1)]; + $this->semValue = null; }, 340 => function ($stackPos) { $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 341 => function ($stackPos) { - $this->semValue = 0; + $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 342 => function ($stackPos) { $this->semValue = 0; }, 343 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(1-1)]; + $this->semValue = 0; }, 344 => function ($stackPos) { $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 345 => function ($stackPos) { - $this->checkModifier($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $this->semValue = $this->semStack[$stackPos-(2-1)] | $this->semStack[$stackPos-(2-2)]; + $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 346 => function ($stackPos) { - $this->semValue = Stmt\Class_::MODIFIER_PUBLIC; + $this->checkModifier($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $this->semValue = $this->semStack[$stackPos-(2-1)] | $this->semStack[$stackPos-(2-2)]; }, 347 => function ($stackPos) { - $this->semValue = Stmt\Class_::MODIFIER_PROTECTED; + $this->semValue = Stmt\Class_::MODIFIER_PUBLIC; }, 348 => function ($stackPos) { - $this->semValue = Stmt\Class_::MODIFIER_PRIVATE; + $this->semValue = Stmt\Class_::MODIFIER_PROTECTED; }, 349 => function ($stackPos) { - $this->semValue = Stmt\Class_::MODIFIER_STATIC; + $this->semValue = Stmt\Class_::MODIFIER_PRIVATE; }, 350 => function ($stackPos) { - $this->semValue = Stmt\Class_::MODIFIER_ABSTRACT; + $this->semValue = Stmt\Class_::MODIFIER_STATIC; }, 351 => function ($stackPos) { - $this->semValue = Stmt\Class_::MODIFIER_FINAL; + $this->semValue = Stmt\Class_::MODIFIER_ABSTRACT; }, 352 => function ($stackPos) { - $this->semValue = Stmt\Class_::MODIFIER_READONLY; + $this->semValue = Stmt\Class_::MODIFIER_FINAL; }, 353 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(2-1)]; + $this->semValue = Stmt\Class_::MODIFIER_READONLY; }, 354 => function ($stackPos) { - $this->semValue = array($this->semStack[$stackPos-(1-1)]); + $this->semValue = $this->semStack[$stackPos-(2-1)]; }, 355 => function ($stackPos) { - $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + $this->semValue = array($this->semStack[$stackPos-(1-1)]); }, 356 => function ($stackPos) { - $this->semValue = new Node\VarLikeIdentifier(substr($this->semStack[$stackPos-(1-1)], 1), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; }, 357 => function ($stackPos) { - $this->semValue = new Stmt\PropertyProperty($this->semStack[$stackPos-(1-1)], null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + $this->semValue = new Node\VarLikeIdentifier(substr($this->semStack[$stackPos-(1-1)], 1), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, 358 => function ($stackPos) { - $this->semValue = new Stmt\PropertyProperty($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Stmt\PropertyProperty($this->semStack[$stackPos-(1-1)], null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, 359 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(2-1)]; + $this->semValue = new Stmt\PropertyProperty($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 360 => function ($stackPos) { $this->semValue = $this->semStack[$stackPos-(2-1)]; }, 361 => function ($stackPos) { - $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + $this->semValue = $this->semStack[$stackPos-(2-1)]; }, 362 => function ($stackPos) { - $this->semValue = array($this->semStack[$stackPos-(1-1)]); + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; }, 363 => function ($stackPos) { - $this->semValue = array(); + $this->semValue = array($this->semStack[$stackPos-(1-1)]); }, 364 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(1-1)]; + $this->semValue = array(); }, 365 => function ($stackPos) { $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 366 => function ($stackPos) { - $this->semValue = new Expr\Assign($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 367 => function ($stackPos) { $this->semValue = new Expr\Assign($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); @@ -2108,430 +2132,430 @@ class Php7 extends \PhpParser\ParserAbstract $this->semValue = new Expr\Assign($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 369 => function ($stackPos) { - $this->semValue = new Expr\AssignRef($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + $this->semValue = new Expr\Assign($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 370 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(1-1)]; + $this->semValue = new Expr\AssignRef($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); }, 371 => function ($stackPos) { $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 372 => function ($stackPos) { - $this->semValue = new Expr\Clone_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 373 => function ($stackPos) { - $this->semValue = new Expr\AssignOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\Clone_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, 374 => function ($stackPos) { - $this->semValue = new Expr\AssignOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\AssignOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 375 => function ($stackPos) { - $this->semValue = new Expr\AssignOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\AssignOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 376 => function ($stackPos) { - $this->semValue = new Expr\AssignOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\AssignOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 377 => function ($stackPos) { - $this->semValue = new Expr\AssignOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\AssignOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 378 => function ($stackPos) { - $this->semValue = new Expr\AssignOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\AssignOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 379 => function ($stackPos) { - $this->semValue = new Expr\AssignOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\AssignOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 380 => function ($stackPos) { - $this->semValue = new Expr\AssignOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\AssignOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 381 => function ($stackPos) { - $this->semValue = new Expr\AssignOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\AssignOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 382 => function ($stackPos) { - $this->semValue = new Expr\AssignOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\AssignOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 383 => function ($stackPos) { - $this->semValue = new Expr\AssignOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\AssignOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 384 => function ($stackPos) { - $this->semValue = new Expr\AssignOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\AssignOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 385 => function ($stackPos) { - $this->semValue = new Expr\AssignOp\Coalesce($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\AssignOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 386 => function ($stackPos) { - $this->semValue = new Expr\PostInc($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + $this->semValue = new Expr\AssignOp\Coalesce($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 387 => function ($stackPos) { - $this->semValue = new Expr\PreInc($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + $this->semValue = new Expr\PostInc($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, 388 => function ($stackPos) { - $this->semValue = new Expr\PostDec($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + $this->semValue = new Expr\PreInc($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, 389 => function ($stackPos) { - $this->semValue = new Expr\PreDec($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + $this->semValue = new Expr\PostDec($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, 390 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\BooleanOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\PreDec($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, 391 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\BooleanAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\BooleanOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 392 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\LogicalOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\BooleanAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 393 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\LogicalAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\LogicalOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 394 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\LogicalXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\LogicalAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 395 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\LogicalXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 396 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 397 => function ($stackPos) { $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 398 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 399 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 400 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 401 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 402 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 403 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 404 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 405 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 406 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 407 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 408 => function ($stackPos) { - $this->semValue = new Expr\UnaryPlus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 409 => function ($stackPos) { - $this->semValue = new Expr\UnaryMinus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + $this->semValue = new Expr\UnaryPlus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, 410 => function ($stackPos) { - $this->semValue = new Expr\BooleanNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + $this->semValue = new Expr\UnaryMinus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, 411 => function ($stackPos) { - $this->semValue = new Expr\BitwiseNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + $this->semValue = new Expr\BooleanNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, 412 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\Identical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\BitwiseNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, 413 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\NotIdentical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\Identical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 414 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\Equal($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\NotIdentical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 415 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\NotEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\Equal($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 416 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\Spaceship($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\NotEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 417 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\Smaller($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\Spaceship($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 418 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\SmallerOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\Smaller($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 419 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\Greater($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\SmallerOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 420 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\GreaterOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\Greater($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 421 => function ($stackPos) { - $this->semValue = new Expr\Instanceof_($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\GreaterOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 422 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(3-2)]; + $this->semValue = new Expr\Instanceof_($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 423 => function ($stackPos) { - $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(5-1)], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes); + $this->semValue = $this->semStack[$stackPos-(3-2)]; }, 424 => function ($stackPos) { - $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(4-1)], null, $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(5-1)], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes); }, 425 => function ($stackPos) { - $this->semValue = new Expr\BinaryOp\Coalesce($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(4-1)], null, $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); }, 426 => function ($stackPos) { - $this->semValue = new Expr\Isset_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + $this->semValue = new Expr\BinaryOp\Coalesce($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 427 => function ($stackPos) { - $this->semValue = new Expr\Empty_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + $this->semValue = new Expr\Isset_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); }, 428 => function ($stackPos) { - $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + $this->semValue = new Expr\Empty_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); }, 429 => function ($stackPos) { - $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE_ONCE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, 430 => function ($stackPos) { - $this->semValue = new Expr\Eval_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE_ONCE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, 431 => function ($stackPos) { - $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + $this->semValue = new Expr\Eval_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); }, 432 => function ($stackPos) { - $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE_ONCE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, 433 => function ($stackPos) { - $this->semValue = new Expr\Cast\Int_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE_ONCE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, 434 => function ($stackPos) { + $this->semValue = new Expr\Cast\Int_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 435 => function ($stackPos) { $attrs = $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes; $attrs['kind'] = $this->getFloatCastKind($this->semStack[$stackPos-(2-1)]); $this->semValue = new Expr\Cast\Double($this->semStack[$stackPos-(2-2)], $attrs); }, - 435 => function ($stackPos) { + 436 => function ($stackPos) { $this->semValue = new Expr\Cast\String_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, - 436 => function ($stackPos) { + 437 => function ($stackPos) { $this->semValue = new Expr\Cast\Array_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, - 437 => function ($stackPos) { + 438 => function ($stackPos) { $this->semValue = new Expr\Cast\Object_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, - 438 => function ($stackPos) { + 439 => function ($stackPos) { $this->semValue = new Expr\Cast\Bool_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, - 439 => function ($stackPos) { + 440 => function ($stackPos) { $this->semValue = new Expr\Cast\Unset_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, - 440 => function ($stackPos) { + 441 => function ($stackPos) { $attrs = $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes; $attrs['kind'] = strtolower($this->semStack[$stackPos-(2-1)]) === 'exit' ? Expr\Exit_::KIND_EXIT : Expr\Exit_::KIND_DIE; $this->semValue = new Expr\Exit_($this->semStack[$stackPos-(2-2)], $attrs); }, - 441 => function ($stackPos) { + 442 => function ($stackPos) { $this->semValue = new Expr\ErrorSuppress($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, - 442 => function ($stackPos) { + 443 => function ($stackPos) { $this->semValue = $this->semStack[$stackPos-(1-1)]; }, - 443 => function ($stackPos) { + 444 => function ($stackPos) { $this->semValue = new Expr\ShellExec($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, - 444 => function ($stackPos) { + 445 => function ($stackPos) { $this->semValue = new Expr\Print_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, - 445 => function ($stackPos) { + 446 => function ($stackPos) { $this->semValue = new Expr\Yield_(null, null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, - 446 => function ($stackPos) { + 447 => function ($stackPos) { $this->semValue = new Expr\Yield_($this->semStack[$stackPos-(2-2)], null, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, - 447 => function ($stackPos) { + 448 => function ($stackPos) { $this->semValue = new Expr\Yield_($this->semStack[$stackPos-(4-4)], $this->semStack[$stackPos-(4-2)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); }, - 448 => function ($stackPos) { + 449 => function ($stackPos) { $this->semValue = new Expr\YieldFrom($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, - 449 => function ($stackPos) { + 450 => function ($stackPos) { $this->semValue = new Expr\Throw_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, - 450 => function ($stackPos) { + 451 => function ($stackPos) { $this->semValue = new Expr\ArrowFunction(['static' => false, 'byRef' => $this->semStack[$stackPos-(8-2)], 'params' => $this->semStack[$stackPos-(8-4)], 'returnType' => $this->semStack[$stackPos-(8-6)], 'expr' => $this->semStack[$stackPos-(8-8)], 'attrGroups' => []], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes); }, - 451 => function ($stackPos) { + 452 => function ($stackPos) { $this->semValue = new Expr\ArrowFunction(['static' => true, 'byRef' => $this->semStack[$stackPos-(9-3)], 'params' => $this->semStack[$stackPos-(9-5)], 'returnType' => $this->semStack[$stackPos-(9-7)], 'expr' => $this->semStack[$stackPos-(9-9)], 'attrGroups' => []], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes); }, - 452 => function ($stackPos) { + 453 => function ($stackPos) { $this->semValue = new Expr\Closure(['static' => false, 'byRef' => $this->semStack[$stackPos-(8-2)], 'params' => $this->semStack[$stackPos-(8-4)], 'uses' => $this->semStack[$stackPos-(8-6)], 'returnType' => $this->semStack[$stackPos-(8-7)], 'stmts' => $this->semStack[$stackPos-(8-8)], 'attrGroups' => []], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes); }, - 453 => function ($stackPos) { + 454 => function ($stackPos) { $this->semValue = new Expr\Closure(['static' => true, 'byRef' => $this->semStack[$stackPos-(9-3)], 'params' => $this->semStack[$stackPos-(9-5)], 'uses' => $this->semStack[$stackPos-(9-7)], 'returnType' => $this->semStack[$stackPos-(9-8)], 'stmts' => $this->semStack[$stackPos-(9-9)], 'attrGroups' => []], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes); }, - 454 => function ($stackPos) { + 455 => function ($stackPos) { $this->semValue = new Expr\ArrowFunction(['static' => false, 'byRef' => $this->semStack[$stackPos-(9-3)], 'params' => $this->semStack[$stackPos-(9-5)], 'returnType' => $this->semStack[$stackPos-(9-7)], 'expr' => $this->semStack[$stackPos-(9-9)], 'attrGroups' => $this->semStack[$stackPos-(9-1)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes); }, - 455 => function ($stackPos) { + 456 => function ($stackPos) { $this->semValue = new Expr\ArrowFunction(['static' => true, 'byRef' => $this->semStack[$stackPos-(10-4)], 'params' => $this->semStack[$stackPos-(10-6)], 'returnType' => $this->semStack[$stackPos-(10-8)], 'expr' => $this->semStack[$stackPos-(10-10)], 'attrGroups' => $this->semStack[$stackPos-(10-1)]], $this->startAttributeStack[$stackPos-(10-1)] + $this->endAttributes); }, - 456 => function ($stackPos) { + 457 => function ($stackPos) { $this->semValue = new Expr\Closure(['static' => false, 'byRef' => $this->semStack[$stackPos-(9-3)], 'params' => $this->semStack[$stackPos-(9-5)], 'uses' => $this->semStack[$stackPos-(9-7)], 'returnType' => $this->semStack[$stackPos-(9-8)], 'stmts' => $this->semStack[$stackPos-(9-9)], 'attrGroups' => $this->semStack[$stackPos-(9-1)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes); }, - 457 => function ($stackPos) { + 458 => function ($stackPos) { $this->semValue = new Expr\Closure(['static' => true, 'byRef' => $this->semStack[$stackPos-(10-4)], 'params' => $this->semStack[$stackPos-(10-6)], 'uses' => $this->semStack[$stackPos-(10-8)], 'returnType' => $this->semStack[$stackPos-(10-9)], 'stmts' => $this->semStack[$stackPos-(10-10)], 'attrGroups' => $this->semStack[$stackPos-(10-1)]], $this->startAttributeStack[$stackPos-(10-1)] + $this->endAttributes); }, - 458 => function ($stackPos) { + 459 => function ($stackPos) { $this->semValue = array(new Stmt\Class_(null, ['type' => 0, 'extends' => $this->semStack[$stackPos-(8-4)], 'implements' => $this->semStack[$stackPos-(8-5)], 'stmts' => $this->semStack[$stackPos-(8-7)], 'attrGroups' => $this->semStack[$stackPos-(8-1)]], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes), $this->semStack[$stackPos-(8-3)]); $this->checkClass($this->semValue[0], -1); }, - 459 => function ($stackPos) { + 460 => function ($stackPos) { $this->semValue = new Expr\New_($this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, - 460 => function ($stackPos) { + 461 => function ($stackPos) { list($class, $ctorArgs) = $this->semStack[$stackPos-(2-2)]; $this->semValue = new Expr\New_($class, $ctorArgs, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, - 461 => function ($stackPos) { + 462 => function ($stackPos) { $this->semValue = array(); }, - 462 => function ($stackPos) { + 463 => function ($stackPos) { $this->semValue = $this->semStack[$stackPos-(4-3)]; }, - 463 => function ($stackPos) { + 464 => function ($stackPos) { $this->semValue = $this->semStack[$stackPos-(2-1)]; }, - 464 => function ($stackPos) { + 465 => function ($stackPos) { $this->semValue = array($this->semStack[$stackPos-(1-1)]); }, - 465 => function ($stackPos) { + 466 => function ($stackPos) { $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; }, - 466 => function ($stackPos) { - $this->semValue = new Expr\ClosureUse($this->semStack[$stackPos-(2-2)], $this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); - }, 467 => function ($stackPos) { - $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + $this->semValue = new Expr\ClosureUse($this->semStack[$stackPos-(2-2)], $this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, 468 => function ($stackPos) { $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, 469 => function ($stackPos) { - $this->semValue = new Expr\StaticCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, 470 => function ($stackPos) { - $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + $this->semValue = new Expr\StaticCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); }, 471 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(1-1)]; + $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, 472 => function ($stackPos) { - $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 473 => function ($stackPos) { $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, 474 => function ($stackPos) { - $this->semValue = new Name\FullyQualified(substr($this->semStack[$stackPos-(1-1)], 1), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, 475 => function ($stackPos) { - $this->semValue = new Name\Relative(substr($this->semStack[$stackPos-(1-1)], 10), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + $this->semValue = new Name\FullyQualified(substr($this->semStack[$stackPos-(1-1)], 1), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, 476 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(1-1)]; + $this->semValue = new Name\Relative(substr($this->semStack[$stackPos-(1-1)], 10), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, 477 => function ($stackPos) { $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 478 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(3-2)]; + $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 479 => function ($stackPos) { - $this->semValue = new Expr\Error($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); $this->errorState = 2; + $this->semValue = $this->semStack[$stackPos-(3-2)]; }, 480 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(1-1)]; + $this->semValue = new Expr\Error($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); $this->errorState = 2; }, 481 => function ($stackPos) { $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 482 => function ($stackPos) { - $this->semValue = null; - }, - 483 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(3-2)]; - }, - 484 => function ($stackPos) { - $this->semValue = array(); - }, - 485 => function ($stackPos) { - $this->semValue = array(new Scalar\EncapsedStringPart(Scalar\String_::parseEscapeSequences($this->semStack[$stackPos-(1-1)], '`'), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes)); - }, - 486 => function ($stackPos) { - foreach ($this->semStack[$stackPos-(1-1)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '`', true); } }; $this->semValue = $this->semStack[$stackPos-(1-1)]; - }, - 487 => function ($stackPos) { - $this->semValue = array(); - }, - 488 => function ($stackPos) { $this->semValue = $this->semStack[$stackPos-(1-1)]; }, + 483 => function ($stackPos) { + $this->semValue = null; + }, + 484 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(3-2)]; + }, + 485 => function ($stackPos) { + $this->semValue = array(); + }, + 486 => function ($stackPos) { + $this->semValue = array(new Scalar\EncapsedStringPart(Scalar\String_::parseEscapeSequences($this->semStack[$stackPos-(1-1)], '`'), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes)); + }, + 487 => function ($stackPos) { + foreach ($this->semStack[$stackPos-(1-1)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '`', true); } }; $this->semValue = $this->semStack[$stackPos-(1-1)]; + }, + 488 => function ($stackPos) { + $this->semValue = array(); + }, 489 => function ($stackPos) { - $this->semValue = new Expr\ConstFetch($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 490 => function ($stackPos) { - $this->semValue = new Scalar\MagicConst\Line($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + $this->semValue = new Expr\ConstFetch($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, 491 => function ($stackPos) { - $this->semValue = new Scalar\MagicConst\File($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + $this->semValue = new Scalar\MagicConst\Line($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, 492 => function ($stackPos) { - $this->semValue = new Scalar\MagicConst\Dir($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + $this->semValue = new Scalar\MagicConst\File($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, 493 => function ($stackPos) { - $this->semValue = new Scalar\MagicConst\Class_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + $this->semValue = new Scalar\MagicConst\Dir($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, 494 => function ($stackPos) { - $this->semValue = new Scalar\MagicConst\Trait_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + $this->semValue = new Scalar\MagicConst\Class_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, 495 => function ($stackPos) { - $this->semValue = new Scalar\MagicConst\Method($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + $this->semValue = new Scalar\MagicConst\Trait_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, 496 => function ($stackPos) { - $this->semValue = new Scalar\MagicConst\Function_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + $this->semValue = new Scalar\MagicConst\Method($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, 497 => function ($stackPos) { - $this->semValue = new Scalar\MagicConst\Namespace_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + $this->semValue = new Scalar\MagicConst\Function_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, 498 => function ($stackPos) { - $this->semValue = new Expr\ClassConstFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Scalar\MagicConst\Namespace_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, 499 => function ($stackPos) { - $this->semValue = new Expr\ClassConstFetch($this->semStack[$stackPos-(3-1)], new Expr\Error($this->startAttributeStack[$stackPos-(3-3)] + $this->endAttributeStack[$stackPos-(3-3)]), $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); $this->errorState = 2; + $this->semValue = new Expr\ClassConstFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 500 => function ($stackPos) { + $this->semValue = new Expr\ClassConstFetch($this->semStack[$stackPos-(3-1)], new Expr\Error($this->startAttributeStack[$stackPos-(3-3)] + $this->endAttributeStack[$stackPos-(3-3)]), $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); $this->errorState = 2; + }, + 501 => function ($stackPos) { $attrs = $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = Expr\Array_::KIND_SHORT; $this->semValue = new Expr\Array_($this->semStack[$stackPos-(3-2)], $attrs); }, - 501 => function ($stackPos) { + 502 => function ($stackPos) { $attrs = $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes; $attrs['kind'] = Expr\Array_::KIND_LONG; $this->semValue = new Expr\Array_($this->semStack[$stackPos-(4-3)], $attrs); }, - 502 => function ($stackPos) { + 503 => function ($stackPos) { $this->semValue = $this->semStack[$stackPos-(1-1)]; }, - 503 => function ($stackPos) { + 504 => function ($stackPos) { $attrs = $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes; $attrs['kind'] = ($this->semStack[$stackPos-(1-1)][0] === "'" || ($this->semStack[$stackPos-(1-1)][1] === "'" && ($this->semStack[$stackPos-(1-1)][0] === 'b' || $this->semStack[$stackPos-(1-1)][0] === 'B')) ? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED); $this->semValue = new Scalar\String_(Scalar\String_::parse($this->semStack[$stackPos-(1-1)]), $attrs); }, - 504 => function ($stackPos) { + 505 => function ($stackPos) { $attrs = $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = Scalar\String_::KIND_DOUBLE_QUOTED; foreach ($this->semStack[$stackPos-(3-2)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '"', true); } }; $this->semValue = new Scalar\Encapsed($this->semStack[$stackPos-(3-2)], $attrs); }, - 505 => function ($stackPos) { + 506 => function ($stackPos) { $this->semValue = $this->parseLNumber($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, - 506 => function ($stackPos) { - $this->semValue = new Scalar\DNumber(Scalar\DNumber::parse($this->semStack[$stackPos-(1-1)]), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); - }, 507 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(1-1)]; + $this->semValue = new Scalar\DNumber(Scalar\DNumber::parse($this->semStack[$stackPos-(1-1)]), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, 508 => function ($stackPos) { $this->semValue = $this->semStack[$stackPos-(1-1)]; @@ -2540,28 +2564,28 @@ class Php7 extends \PhpParser\ParserAbstract $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 510 => function ($stackPos) { - $this->semValue = $this->parseDocString($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes, $this->startAttributeStack[$stackPos-(3-3)] + $this->endAttributeStack[$stackPos-(3-3)], true); + $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 511 => function ($stackPos) { - $this->semValue = $this->parseDocString($this->semStack[$stackPos-(2-1)], '', $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes, $this->startAttributeStack[$stackPos-(2-2)] + $this->endAttributeStack[$stackPos-(2-2)], true); - }, - 512 => function ($stackPos) { $this->semValue = $this->parseDocString($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes, $this->startAttributeStack[$stackPos-(3-3)] + $this->endAttributeStack[$stackPos-(3-3)], true); }, + 512 => function ($stackPos) { + $this->semValue = $this->parseDocString($this->semStack[$stackPos-(2-1)], '', $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes, $this->startAttributeStack[$stackPos-(2-2)] + $this->endAttributeStack[$stackPos-(2-2)], true); + }, 513 => function ($stackPos) { - $this->semValue = null; + $this->semValue = $this->parseDocString($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes, $this->startAttributeStack[$stackPos-(3-3)] + $this->endAttributeStack[$stackPos-(3-3)], true); }, 514 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(1-1)]; + $this->semValue = null; }, 515 => function ($stackPos) { $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 516 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(3-2)]; + $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 517 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(1-1)]; + $this->semValue = $this->semStack[$stackPos-(3-2)]; }, 518 => function ($stackPos) { $this->semValue = $this->semStack[$stackPos-(1-1)]; @@ -2576,34 +2600,34 @@ class Php7 extends \PhpParser\ParserAbstract $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 522 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(3-2)]; + $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 523 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(1-1)]; + $this->semValue = $this->semStack[$stackPos-(3-2)]; }, 524 => function ($stackPos) { $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 525 => function ($stackPos) { - $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 526 => function ($stackPos) { $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); }, 527 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(1-1)]; + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); }, 528 => function ($stackPos) { - $this->semValue = new Expr\MethodCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 529 => function ($stackPos) { - $this->semValue = new Expr\NullsafeMethodCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + $this->semValue = new Expr\MethodCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); }, 530 => function ($stackPos) { - $this->semValue = null; + $this->semValue = new Expr\NullsafeMethodCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); }, 531 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(1-1)]; + $this->semValue = null; }, 532 => function ($stackPos) { $this->semValue = $this->semStack[$stackPos-(1-1)]; @@ -2612,165 +2636,168 @@ class Php7 extends \PhpParser\ParserAbstract $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 534 => function ($stackPos) { - $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 535 => function ($stackPos) { - $this->semValue = new Expr\NullsafePropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 536 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(1-1)]; + $this->semValue = new Expr\NullsafePropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 537 => function ($stackPos) { - $this->semValue = new Expr\Variable($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); - }, - 538 => function ($stackPos) { - $this->semValue = new Expr\Variable($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); - }, - 539 => function ($stackPos) { - $this->semValue = new Expr\Variable(new Expr\Error($this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes), $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); $this->errorState = 2; - }, - 540 => function ($stackPos) { - $var = $this->semStack[$stackPos-(1-1)]->name; $this->semValue = \is_string($var) ? new Node\VarLikeIdentifier($var, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes) : $var; - }, - 541 => function ($stackPos) { - $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); - }, - 542 => function ($stackPos) { $this->semValue = $this->semStack[$stackPos-(1-1)]; }, + 538 => function ($stackPos) { + $this->semValue = new Expr\Variable($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, + 539 => function ($stackPos) { + $this->semValue = new Expr\Variable($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 540 => function ($stackPos) { + $this->semValue = new Expr\Variable(new Expr\Error($this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes), $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); $this->errorState = 2; + }, + 541 => function ($stackPos) { + $var = $this->semStack[$stackPos-(1-1)]->name; $this->semValue = \is_string($var) ? new Node\VarLikeIdentifier($var, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes) : $var; + }, + 542 => function ($stackPos) { + $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + }, 543 => function ($stackPos) { - $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 544 => function ($stackPos) { $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); }, 545 => function ($stackPos) { - $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); }, 546 => function ($stackPos) { - $this->semValue = new Expr\NullsafePropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 547 => function ($stackPos) { - $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\NullsafePropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 548 => function ($stackPos) { $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 549 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(1-1)]; + $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 550 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(3-2)]; + $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 551 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(1-1)]; + $this->semValue = $this->semStack[$stackPos-(3-2)]; }, 552 => function ($stackPos) { $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 553 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(3-2)]; - }, - 554 => function ($stackPos) { $this->semValue = $this->semStack[$stackPos-(1-1)]; }, + 554 => function ($stackPos) { + $this->semValue = $this->semStack[$stackPos-(3-2)]; + }, 555 => function ($stackPos) { - $this->semValue = new Expr\Error($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); $this->errorState = 2; + $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 556 => function ($stackPos) { - $this->semValue = new Expr\List_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + $this->semValue = new Expr\Error($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); $this->errorState = 2; }, 557 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(1-1)]; $end = count($this->semValue)-1; if ($this->semValue[$end] === null) array_pop($this->semValue); + $this->semValue = new Expr\List_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); }, 558 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos]; + $this->semValue = $this->semStack[$stackPos-(1-1)]; $end = count($this->semValue)-1; if ($this->semValue[$end] === null) array_pop($this->semValue); }, 559 => function ($stackPos) { - /* do nothing -- prevent default action of $$=$this->semStack[$1]. See $551. */ + $this->semValue = $this->semStack[$stackPos]; }, 560 => function ($stackPos) { - $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; + /* do nothing -- prevent default action of $$=$this->semStack[$1]. See $551. */ }, 561 => function ($stackPos) { - $this->semValue = array($this->semStack[$stackPos-(1-1)]); + $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)]; }, 562 => function ($stackPos) { - $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + $this->semValue = array($this->semStack[$stackPos-(1-1)]); }, 563 => function ($stackPos) { - $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(2-2)], null, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); - }, - 564 => function ($stackPos) { $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, + 564 => function ($stackPos) { + $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(2-2)], null, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, 565 => function ($stackPos) { - $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(3-3)], $this->semStack[$stackPos-(3-1)], false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, 566 => function ($stackPos) { - $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(4-4)], $this->semStack[$stackPos-(4-1)], true, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); - }, - 567 => function ($stackPos) { $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(3-3)], $this->semStack[$stackPos-(3-1)], false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, + 567 => function ($stackPos) { + $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(4-4)], $this->semStack[$stackPos-(4-1)], true, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + }, 568 => function ($stackPos) { - $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(2-2)], null, false, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(3-3)], $this->semStack[$stackPos-(3-1)], false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 569 => function ($stackPos) { - $this->semValue = null; + $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(2-2)], null, false, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); }, 570 => function ($stackPos) { - $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; + $this->semValue = null; }, 571 => function ($stackPos) { $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; }, 572 => function ($stackPos) { - $this->semValue = array($this->semStack[$stackPos-(1-1)]); + $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; }, 573 => function ($stackPos) { - $this->semValue = array($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)]); + $this->semValue = array($this->semStack[$stackPos-(1-1)]); }, 574 => function ($stackPos) { - $this->semValue = new Scalar\EncapsedStringPart($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + $this->semValue = array($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)]); }, 575 => function ($stackPos) { - $this->semValue = new Expr\Variable($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + $this->semValue = new Scalar\EncapsedStringPart($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, 576 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(1-1)]; + $this->semValue = new Expr\Variable($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, 577 => function ($stackPos) { - $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); + $this->semValue = $this->semStack[$stackPos-(1-1)]; }, 578 => function ($stackPos) { - $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); }, 579 => function ($stackPos) { - $this->semValue = new Expr\NullsafePropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 580 => function ($stackPos) { - $this->semValue = new Expr\Variable($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); + $this->semValue = new Expr\NullsafePropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 581 => function ($stackPos) { $this->semValue = new Expr\Variable($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 582 => function ($stackPos) { - $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-4)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes); + $this->semValue = new Expr\Variable($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); }, 583 => function ($stackPos) { - $this->semValue = $this->semStack[$stackPos-(3-2)]; + $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-4)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes); }, 584 => function ($stackPos) { - $this->semValue = new Scalar\String_($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + $this->semValue = $this->semStack[$stackPos-(3-2)]; }, 585 => function ($stackPos) { - $this->semValue = $this->parseNumString($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); + $this->semValue = new Scalar\String_($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, 586 => function ($stackPos) { - $this->semValue = $this->parseNumString('-' . $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + $this->semValue = $this->parseNumString($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); }, 587 => function ($stackPos) { + $this->semValue = $this->parseNumString('-' . $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); + }, + 588 => function ($stackPos) { $this->semValue = $this->semStack[$stackPos-(1-1)]; }, ]; diff --git a/test/code/parser/stmt/class/property_promotion.test b/test/code/parser/stmt/class/property_promotion.test index e75a324..92b9a91 100644 --- a/test/code/parser/stmt/class/property_promotion.test +++ b/test/code/parser/stmt/class/property_promotion.test @@ -6,7 +6,8 @@ class Point { public function __construct( public float $x = 0.0, protected array $y = [], - private string $z = 'hello' + private string $z = 'hello', + public readonly int $a = 0, ) {} } ----- @@ -81,6 +82,22 @@ array( value: hello ) ) + 3: Param( + attrGroups: array( + ) + flags: MODIFIER_PUBLIC | MODIFIER_READONLY (65) + type: Identifier( + name: int + ) + byRef: false + variadic: false + var: Expr_Variable( + name: a + ) + default: Scalar_LNumber( + value: 0 + ) + ) ) returnType: null stmts: array( diff --git a/test/code/prettyPrinter/stmt/property_promotion.test b/test/code/prettyPrinter/stmt/property_promotion.test index 036cf5e..f5acaa2 100644 --- a/test/code/prettyPrinter/stmt/property_promotion.test +++ b/test/code/prettyPrinter/stmt/property_promotion.test @@ -8,6 +8,7 @@ class Point public float $x = 0.0, protected array $y = [], private string $z = 'hello', + public readonly int $a = 0, ) { } } @@ -15,7 +16,7 @@ class Point !!php7 class Point { - public function __construct(public float $x = 0.0, protected array $y = [], private string $z = 'hello') + public function __construct(public float $x = 0.0, protected array $y = [], private string $z = 'hello', public readonly int $a = 0) { } }