diff --git a/grammar/zend_language_parser.phpy b/grammar/zend_language_parser.phpy index 324902c..42310ee 100644 --- a/grammar/zend_language_parser.phpy +++ b/grammar/zend_language_parser.phpy @@ -539,9 +539,7 @@ lexical_var_list: function_call: name '(' function_call_argument_list ')' { $$ = Expr_FuncCall[$1, $3]; } - | class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING '(' function_call_argument_list ')' - { $$ = Expr_StaticCall[$1, $3, $5]; } - | reference_variable T_PAAMAYIM_NEKUDOTAYIM T_STRING '(' function_call_argument_list ')' + | class_name_or_var T_PAAMAYIM_NEKUDOTAYIM T_STRING '(' function_call_argument_list ')' { $$ = Expr_StaticCall[$1, $3, $5]; } | static_property '(' function_call_argument_list ')' { if ($1 instanceof PHPParser_Node_Expr_StaticPropertyFetch) { @@ -583,6 +581,11 @@ dynamic_class_name_reference: | base_variable { $$ = $1; } ; +class_name_or_var: + class_name { $$ = $1; } + | reference_variable { $$ = $1; } +; + object_access_for_dcnr: | base_variable T_OBJECT_OPERATOR object_property { $$ = Expr_PropertyFetch[$1, $3]; } @@ -638,7 +641,7 @@ static_scalar: /* compile-time evaluated scalars */ scalar: T_STRING_VARNAME { $$ = Scalar_String[$1]; } - | class_constant { $$ = $1; } + | class_name_or_var T_PAAMAYIM_NEKUDOTAYIM T_STRING { $$ = Expr_ClassConstFetch[$1, $3]; } | name { $$ = Expr_ConstFetch[$1]; } | common_scalar { $$ = $1; } | '"' encaps_list '"' @@ -693,21 +696,15 @@ base_variable: ; static_property: - class_name T_PAAMAYIM_NEKUDOTAYIM '$' reference_variable - { $$ = Expr_StaticPropertyFetch[$1, $4]; } - | reference_variable T_PAAMAYIM_NEKUDOTAYIM '$' reference_variable + class_name_or_var T_PAAMAYIM_NEKUDOTAYIM '$' reference_variable { $$ = Expr_StaticPropertyFetch[$1, $4]; } | static_property_with_arrays { $$ = $1; } ; static_property_with_arrays: - class_name T_PAAMAYIM_NEKUDOTAYIM T_VARIABLE + class_name_or_var T_PAAMAYIM_NEKUDOTAYIM T_VARIABLE { $$ = Expr_StaticPropertyFetch[$1, parseVar($3)]; } - | reference_variable T_PAAMAYIM_NEKUDOTAYIM T_VARIABLE - { $$ = Expr_StaticPropertyFetch[$1, parseVar($3)]; } - | class_name T_PAAMAYIM_NEKUDOTAYIM '$' '{' expr '}' - { $$ = Expr_StaticPropertyFetch[$1, $5]; } - | reference_variable T_PAAMAYIM_NEKUDOTAYIM '$' '{' expr '}' + | class_name_or_var T_PAAMAYIM_NEKUDOTAYIM '$' '{' expr '}' { $$ = Expr_StaticPropertyFetch[$1, $5]; } | static_property_with_arrays '[' dim_offset ']' { $$ = Expr_ArrayDimFetch[$1, $3]; } | static_property_with_arrays '{' expr '}' { $$ = Expr_ArrayDimFetch[$1, $3]; } @@ -782,9 +779,4 @@ encaps_var_offset: | T_VARIABLE { $$ = Expr_Variable[parseVar($1)]; } ; -class_constant: - class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING { $$ = Expr_ClassConstFetch[$1, $3]; } - | reference_variable T_PAAMAYIM_NEKUDOTAYIM T_STRING { $$ = Expr_ClassConstFetch[$1, $3]; } -; - %% diff --git a/lib/PHPParser/Parser.php b/lib/PHPParser/Parser.php index c6a5b25..302d197 100644 --- a/lib/PHPParser/Parser.php +++ b/lib/PHPParser/Parser.php @@ -10,11 +10,11 @@ class PHPParser_Parser const YYMAXLEX = 383; const YYTERMS = 146; const YYNONTERMS = 90; - const YYLAST = 888; - const YY2TBLSTATE = 330; - const YYGLAST = 382; - const YYSTATES = 747; - const YYNLSTATES = 525; + const YYLAST = 885; + const YY2TBLSTATE = 320; + const YYGLAST = 377; + const YYSTATES = 732; + const YYNLSTATES = 513; const YYINTERRTOK = 1; const YYUNEXPECTED = 32767; const YYDEFAULT = -32766; @@ -342,247 +342,245 @@ class PHPParser_Parser ); protected static $yyaction = array( - 56, 57, 362, 58, 59,-32766,-32766,-32766, 245, 60, - -32767,-32767,-32767,-32767, 99, 100, 101, 102, 103, 846, - 275,-32766, 0,-32766,-32766, 45, 107, 108, 109, 110, - 111, 112, 113, 114, 115, 116, 117, 296, 82, 61, - 62, 876, 268, 878, 877, 63, 226, 64, 235, 236, - 65, 66, 67, 68, 69, 70, 71, 72, 29, 237, - 73, 335, 363, 701, 703, 360, 790, 791, 364, 809, - 846, 619, 571,-32766, 792, 51, 26, 365, 416, 366, - 356, 367, 437, 368, 270, 480, 369,-32766,-32766, 268, - 40, 41, 370, 339, 336, 42, 371, 336, 74, 295, - 294, 337, 21, 372, 373, 207, 372, 373, 374, 375, - 376, 252, 554, 593, 377, 554, 593, 377, 378, 379, - 850, 796, 797, 798, 793, 794, 253, 199, 83, 84, - 85, 385, 799, 795, 338, 578, 503, 124, 75, 410, - 268, 332, 256, 260, 44, 54, 86, 87, 88, 89, - 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, - 100, 101, 102, 103, 104, 105, 106, 568, 241, 672, - 673, 674, 671, 670, 669, 529,-32766, 52,-32766,-32766, - -32766, 53, 529, 620, 242, 246,-32766, 55, 125,-32766, - -32766,-32766, 268,-32766,-32766,-32766,-32766,-32766, 350, 760, - -32766,-32766,-32766,-32766,-32766,-32766,-32766, 492, 768,-32766, - -32766, 197,-32766, 311,-32766, 768, 20,-32766,-32766,-32766, - -32766,-32766,-32766, 120, 529,-32766, 243, 846,-32766, 538, - 846,-32766,-32766,-32766, 345,-32766, 505,-32766, 385,-32766, - 333, 338,-32766, 639, 640, 258,-32766,-32766,-32766,-32766, - -32766,-32766,-32766, 664,-32766, 118,-32766, 768, 846, 119, - -32766, 34, 208, -107,-32766, 121, 529, 347, 247, 569, - -32766, 81, 240,-32766,-32766,-32766, 244,-32766, 413,-32766, - 39,-32766, 47, 591,-32766,-32766,-32766,-32766,-32766,-32766, - -32766,-32766,-32766,-32766,-32766,-32766,-32766, 268,-32766, 768, - 268,-32766,-32766, 104, 105, 106,-32766, 241, 529, 649, - 228, 351,-32766, 639, 640,-32766,-32766,-32766, 867,-32766, - 122,-32766, 209,-32766, 123, 846,-32766, 838, 268, 200, - -32766,-32766,-32766,-32766,-32766,-32766,-32766, 658,-32766, 839, - -32766, 768, 333, 846,-32766,-32766,-32766,-32766,-32766, 520, - 529, 519, 238, 198,-32766, 664, 203,-32766,-32766,-32766, - 131,-32766, 204,-32766, 206,-32766, 589, 460,-32766, 101, - 102, 103,-32766,-32766,-32766,-32766,-32766,-32766,-32766, 227, - -32766, 867,-32766, 768, 515, 592,-32766, 511, 813, 127, - -32766, 582, 529, 510, 261, 452,-32766, 276, 508,-32766, - -32766,-32766, 128,-32766, 523,-32766, 241,-32766, 872, 277, - -32766, 485, 486, 268,-32766,-32766,-32766,-32766,-32766,-32766, - -32766, 801,-32766, 494,-32766, 768, 477, 27,-32766, 132, - 300, 488,-32766, 455, 529, 814, 661, 524,-32766, 535, - 506,-32766,-32766,-32766, 434,-32766, 433,-32766, 801,-32766, - 498, 396,-32766, 425, 407, 406,-32766,-32766,-32766,-32766, - -32766,-32766,-32766, 543,-32766, 529,-32766, 768, 530, 427, - -32766, 545, 808, 395,-32766, 346, 529, 417, 344, 761, - -32766, 762, -138,-32766,-32766,-32766, 497,-32766, 491,-32766, - 490,-32766, 472, 444,-32766, 397, 484, 273,-32766,-32766, - -32766,-32766,-32766,-32766,-32766, 783,-32766, 274,-32766, 768, - 867, 462,-32766, 403, 229, 443,-32766, 408, 529, 46, - 481, 359,-32766, 205, 314,-32766,-32766,-32766,-32766,-32766, - 470,-32766, 267,-32766, 659, 269,-32766, 737, 756, 0, - -32766,-32766,-32766,-32766,-32766,-32766,-32766, 594,-32766, -244, - -32766, 768, 595, 266,-32766, 0, 475, 257,-32766, 259, - 529, 0, 0, 0,-32766, 800, 0,-32766,-32766,-32766, - 0,-32766, 313,-32766, 287,-32766, 461, 286,-32766, 285, - 563, 284,-32766,-32766,-32766, 562,-32766,-32766,-32766, 400, - -32766, 345,-32766, 768, 343, 522,-32766, 539, 570, 49, - -32766, 580, 529, 567, 565, 605,-32766, 607, 557,-32766, - -32766,-32766, 615,-32766, 614,-32766, 609,-32766, 622, 559, - -32766, 573, 581, 514,-32766,-32766,-32766, 564,-32766,-32766, - -32766, 513,-32766, 50,-32766, 768, 572, 613,-32766, 517, - 516, 512,-32766, 507, 529, 504, 129, 82,-32766, 130, - 36,-32766,-32766,-32766, 874,-32766, 875,-32766, 841,-32766, - 201, 202,-32766, 840, 851, 651,-32766,-32766,-32766, 566, - -32766,-32766,-32766, 873,-32766, 847,-32766, 768, 845, 195, - -32766,-32766,-32766, 830,-32766, 843, 781, 790, 791, 612, - 445, 76, 48, 35, 33, 792,-32766, 32,-32766,-32766, - -32766,-32766,-32766,-32767,-32767,-32767,-32767, 31,-32766,-32766, - -32766,-32766,-32766, 336, 331, 30, 43, 38, 342, 293, - 334, 271, 372, 373,-32766, 251,-32766,-32766,-32766,-32766, - -32766, 534, 593, 377, 250, 78, 249, 79, 80, 126, - 440, 133, 796, 797, 798, 793, 794, 322, 239, 336, - 331, 272, 234, 799, 795, 293, 233, 537, 372, 373, - -32766,-32766,-32766, 225, 336, 331, 37, 534, 593, 377, - 293, 77, 224, 372, 373, 196,-32766, 134,-32766,-32766, - -32766,-32766, 534, 593, 377, 336, 856, 272, 336, 447, - 784, 336, 741, 536, 372, 373, 734, 372, 373, 500, - 372, 373, 272, 554, 593, 377, 554, 593, 377, 554, - 593, 377, 468, 807, 297, 28, 25, 19, 336, 478, - 23, 336, 22, 24, 738, 806, 765, 372, 373, 555, - 372, 373, 662, 764, 336, 590, 554, 593, 377, 554, - 593, 377, 827, 372, 373, 501, 789, 828, 767, 766, - 495, 763, 554, 593, 377, 754, 496, 469, 336, 352, - 301, 336, 585, 871, 336, 758, 0, 372, 373, 0, - 372, 373, 780, 372, 373, 842, 554, 593, 377, 554, - 593, 377, 554, 593, 377, 829, 844, 755 + 55, 56, 352, 57, 58,-32766,-32766,-32766, 242, 59, + -32767,-32767,-32767,-32767, 98, 99, 100, 101, 102, 832, + 836,-32766, 272,-32766,-32766, 44, 106, 107, 108, 109, + 110, 111, 112, 113, 114, 115, 116, 287, 0, 60, + 61, 862, 53, 864, 863, 62, 249, 63, 232, 233, + 64, 65, 66, 67, 68, 69, 70, 71, 29, 234, + 72, 325, 353, 689, 691, 426, 779, 780, 354, 798, + 832, 607, 559,-32766, 781, 50, 26, 355, 223, 356, + 407, 357, 350, 358, 194, 468, 359, 121, 124, 265, + 39, 40, 360, 329, 326, 41, 361, 326, 73, 480, + 286, 327, 337, 362, 363, 346, 362, 363, 364, 365, + 366, 46, 542, 581, 367, 542, 581, 367, 368, 369, + 119, 785, 786, 787, 782, 783, 250, 21, 82, 83, + 84, 375, 788, 784, 328, 566, 491, 123, 74, 401, + 265, 746, 253, 257, 43, 51, 85, 86, 87, 88, + 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, + 99, 100, 101, 102, 103, 104, 105, 526, 238, 660, + 661, 662, 659, 658, 657, 517,-32766, 129,-32766,-32766, + -32766, 52, 517, 608, 225, 243,-32766, 54, 288,-32766, + -32766,-32766, 853,-32766,-32766,-32766,-32766,-32766, 340, 20, + -32766,-32766,-32766,-32766,-32766,-32766,-32766, 128, 755,-32766, + -32766, 441,-32766, 303,-32766, 755, 748,-32766,-32766,-32766, + -32766,-32766,-32766, 117, 517,-32766, 240, 832,-32766, 646, + 832,-32766,-32766,-32766, 335,-32766, 493,-32766, 375,-32766, + 323, 328,-32766, 627, 628, 255,-32766,-32766,-32766,-32766, + -32766,-32766,-32766, 652,-32766, 637,-32766, 755, 832, 118, + -32766, 34, 802, -107,-32766, 120, 517, 826, 244, 557, + -32766, 80, 237,-32766,-32766,-32766, 38,-32766, 404,-32766, + 241,-32766, 267, 580,-32766,-32766,-32766,-32766,-32766,-32766, + -32766,-32766,-32766,-32766,-32766,-32766,-32766, 265,-32766, 755, + 265,-32766,-32766, 103, 104, 105,-32766, 238, 517, 832, + 239, 341,-32766, 627, 628,-32766,-32766,-32766, 556,-32766, + 196,-32766, 197,-32766, 122, 224,-32766, 449, 265, 200, + -32766,-32766,-32766,-32766,-32766,-32766,-32766, 273,-32766, 853, + -32766, 755, 323, 258,-32766,-32766,-32766,-32766,-32766, 507, + 517, 201, 235, 203,-32766, 652, 204,-32766,-32766,-32766, + 205,-32766, 206,-32766, 195,-32766,-32766,-32766,-32766, 100, + 101, 102,-32766,-32766,-32766,-32766,-32766,-32766,-32766, 265, + -32766, 790,-32766, 755, 503, 579,-32766, 570, 465, 27, + -32766, 511, 517, 803, 473, 474,-32766, 790, 499,-32766, + -32766,-32766, 496,-32766, 508,-32766, 127,-32766, 130, 292, + -32766, 649, 512, 498,-32766,-32766,-32766,-32766,-32766,-32766, + -32766, 577,-32766, 238,-32766, 755, 523, 494,-32766, 126, + 482, 858,-32766, 394, 517, 533, 226, 797,-32766, 451, + 518,-32766,-32766,-32766, 486,-32766, 444,-32766, 423,-32766, + 416, 349,-32766, 398, 517, 531,-32766,-32766,-32766,-32766, + -32766,-32766,-32766, 397,-32766, 387,-32766, 755, 386, 336, + -32766, 334, 749, 399,-32766, 750, 517, 408, 469, 388, + -32766, -138, 485,-32766,-32766,-32766, 479,-32766, 478,-32766, + 472,-32766, 460, 433,-32766, 432, 583, 853,-32766,-32766, + -32766,-32766,-32766,-32766,-32766, 772,-32766, 270,-32766, 755, + 271, 582,-32766, 476, 458,-32766,-32766, 0, 517, 264, + 263, 266,-32766, 789, 450,-32766,-32766,-32766, 305,-32766, + 202,-32766, 0,-32766, 45, 256,-32766, 254, 0, 0, + -32766,-32766,-32766,-32766,-32766,-32766,-32766, 0,-32766, 0, + -32766, 755, 0, 0,-32766, -251, 0, 279,-32766, 278, + 517, -243, -252, 603,-32766, 647, 0,-32766,-32766,-32766, + 391,-32766, 333,-32766, 335,-32766, 602, 558,-32766, 48, + 545, 49,-32766,-32766,-32766, 554,-32766,-32766,-32766, 501, + -32766, 502,-32766, 755, 568, 555,-32766, 553, 569, 561, + -32766, 547, 517, 593, 610, 527,-32766, 597, 551,-32766, + -32766,-32766, 595,-32766, 560,-32766, 504,-32766, 510, 495, + -32766, 505, 492, 81,-32766,-32766,-32766,-32766,-32766,-32766, + -32766, 500,-32766, 860,-32766, 755, 601, 861,-32766, 827, + 837, 859,-32766, 833, 517, 831, 819, 829,-32766, 770, + 639,-32766,-32766,-32766, 600,-32766, 35,-32766, 30,-32766, + 198, 199,-32766, 33, 324, 332,-32766,-32766,-32766, 550, + -32766,-32766,-32766, 31,-32766, 32,-32766, 755, 36, 192, + -32766,-32766,-32766, 42,-32766, 247, 246, 779, 780, 236, + 231, 248, 230, 47, 75, 781,-32766, 76,-32766,-32766, + -32766,-32766,-32766,-32767,-32767,-32767,-32767, 77,-32766,-32766, + -32766, 552,-32766, 326, 321, 222, 221, 193, 132, 285, + 37, 268, 362, 363,-32766, 131,-32766,-32766,-32766,-32766, + -32766, 522, 581, 367, 125, 79, 78, 744, 725, 434, + 429, 842, 785, 786, 787, 782, 783, 313, 436, 326, + 321, 269, 726, 788, 784, 285, 22, 524, 362, 363, + -32766,-32766,-32766, 773, 326, 321, 729, 522, 581, 367, + 285, 722, 488, 362, 363, 456,-32766, 289,-32766,-32766, + -32766,-32766, 522, 581, 367, 326, 795, 269, 326, 752, + 816, 326, 778, 525, 362, 363, 817, 362, 363, 754, + 362, 363, 269, 542, 581, 367, 542, 581, 367, 542, + 581, 367, 753, 463, 751, 742, 484, 457, 326, 466, + 342, 326, 293, 23, 24, 28, 25, 362, 363, 578, + 362, 363, 543, 19, 326, 322, 542, 581, 367, 542, + 581, 367, 796, 362, 363, 489, 857, 769, 828, 818, + 483, 830, 542, 581, 367, 743, 0, 0, 326, 0, + 0, 326, 573, 0, 326, 650, 0, 362, 363, 0, + 362, 363, 0, 362, 363, 0, 542, 581, 367, 542, + 581, 367, 542, 581, 367 ); protected static $yycheck = array( 2, 3, 4, 5, 6, 8, 9, 10, 61, 11, 35, 36, 37, 38, 39, 40, 41, 42, 43, 72, - 60, 24, 0, 26, 27, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 22, 23, 7, 138, 41, - 42, 70, 142, 72, 73, 47, 7, 49, 50, 51, + 70, 24, 60, 26, 27, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, 22, 23, 7, 0, 41, + 42, 70, 60, 72, 73, 47, 7, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 50, 51, 7, 68, 69, 70, 71, - 72, 25, 74, 8, 76, 77, 78, 79, 118, 81, - 119, 83, 7, 85, 7, 86, 88, 8, 9, 142, + 72, 25, 74, 8, 76, 77, 78, 79, 7, 81, + 118, 83, 7, 85, 7, 86, 88, 7, 138, 142, 92, 93, 94, 95, 95, 97, 98, 95, 100, 7, - 102, 103, 141, 104, 105, 12, 104, 105, 110, 111, + 102, 103, 7, 104, 105, 119, 104, 105, 110, 111, 112, 7, 113, 114, 115, 113, 114, 115, 120, 121, - 70, 123, 124, 125, 126, 127, 128, 12, 8, 9, + 138, 123, 124, 125, 126, 127, 128, 141, 8, 9, 10, 133, 134, 135, 136, 137, 138, 25, 140, 7, 142, 139, 144, 145, 24, 60, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 137, 48, 103, - 104, 105, 106, 107, 108, 70, 64, 60, 8, 9, - 10, 60, 70, 137, 30, 30, 74, 60, 138, 77, - 78, 79, 142, 81, 24, 83, 26, 85, 25, 141, - 88, 8, 9, 10, 92, 93, 94, 7, 103, 97, - 98, 7, 100, 72, 102, 103, 141, 24, 64, 26, + 104, 105, 106, 107, 108, 70, 64, 12, 8, 9, + 10, 60, 70, 137, 30, 30, 74, 60, 7, 77, + 78, 79, 75, 81, 24, 83, 26, 85, 25, 141, + 88, 8, 9, 10, 92, 93, 94, 138, 103, 97, + 98, 142, 100, 72, 102, 103, 141, 24, 64, 26, 27, 28, 110, 138, 70, 103, 30, 72, 74, 137, 72, 77, 78, 79, 136, 81, 138, 83, 133, 85, 96, 136, 88, 121, 122, 118, 92, 93, 94, 137, - 138, 97, 98, 109, 100, 138, 102, 103, 72, 138, - 64, 140, 12, 141, 110, 138, 70, 7, 30, 137, + 138, 97, 98, 109, 100, 72, 102, 103, 72, 138, + 64, 140, 145, 141, 110, 138, 70, 72, 30, 137, 74, 130, 131, 77, 78, 79, 7, 81, 120, 83, 7, 85, 7, 139, 88, 8, 9, 10, 92, 93, 94, 137, 138, 97, 98, 103, 100, 142, 102, 103, 142, 24, 64, 44, 45, 46, 110, 48, 70, 72, - 30, 138, 74, 121, 122, 77, 78, 79, 75, 81, - 7, 83, 12, 85, 138, 72, 88, 72, 142, 12, - 92, 93, 94, 137, 138, 97, 98, 137, 100, 72, - 102, 103, 96, 72, 64, 8, 9, 10, 110, 25, - 70, 25, 30, 12, 74, 109, 12, 77, 78, 79, - 12, 81, 12, 83, 12, 85, 30, 75, 88, 41, + 30, 138, 74, 121, 122, 77, 78, 79, 137, 81, + 12, 83, 12, 85, 138, 142, 88, 75, 142, 12, + 92, 93, 94, 137, 138, 97, 98, 142, 100, 75, + 102, 103, 96, 75, 64, 8, 9, 10, 110, 25, + 70, 12, 30, 12, 74, 109, 12, 77, 78, 79, + 12, 81, 12, 83, 12, 85, 8, 9, 88, 41, 42, 43, 92, 93, 94, 137, 138, 97, 98, 142, - 100, 75, 102, 103, 25, 139, 64, 25, 145, 60, - 110, 25, 70, 25, 75, 142, 74, 142, 25, 77, - 78, 79, 25, 81, 25, 83, 48, 85, 70, 142, - 88, 65, 66, 142, 92, 93, 94, 137, 138, 97, - 98, 129, 100, 67, 102, 103, 65, 66, 64, 90, - 91, 89, 110, 70, 70, 129, 137, 138, 74, 137, - 138, 77, 78, 79, 70, 81, 70, 83, 129, 85, - 70, 70, 88, 70, 70, 70, 92, 93, 94, 137, + 100, 129, 102, 103, 25, 139, 64, 25, 65, 66, + 110, 25, 70, 129, 65, 66, 74, 129, 25, 77, + 78, 79, 25, 81, 25, 83, 25, 85, 90, 91, + 88, 137, 138, 25, 92, 93, 94, 137, 138, 97, + 98, 30, 100, 48, 102, 103, 137, 138, 64, 60, + 67, 70, 110, 79, 70, 70, 87, 70, 74, 99, + 70, 77, 78, 79, 70, 81, 70, 83, 70, 85, + 70, 95, 88, 70, 70, 70, 92, 93, 94, 137, 138, 97, 98, 70, 100, 70, 102, 103, 70, 70, - 64, 70, 70, 70, 110, 70, 70, 71, 70, 72, + 64, 70, 72, 87, 110, 72, 70, 71, 89, 72, 74, 72, 72, 77, 78, 79, 72, 81, 72, 83, - 72, 85, 72, 72, 88, 72, 72, 75, 92, 93, + 72, 85, 72, 72, 88, 87, 114, 75, 92, 93, 94, 137, 138, 97, 98, 141, 100, 75, 102, 103, - 75, 99, 64, 79, 87, 87, 110, 87, 70, 119, - 89, 95, 74, 119, 132, 77, 78, 79, 103, 81, - 101, 83, 117, 85, 137, 116, 88, 141, 144, -1, - 92, 93, 94, 137, 138, 97, 98, 114, 100, 132, - 102, 103, 114, 116, 64, -1, 143, 118, 110, 118, - 70, -1, -1, -1, 74, 129, -1, 77, 78, 79, - -1, 81, 132, 83, 132, 85, 132, 132, 88, 132, - 137, 132, 92, 93, 94, 137, 138, 97, 98, 136, - 100, 136, 102, 103, 136, 138, 64, 137, 137, 137, + 75, 114, 64, 89, 101, 103, 110, -1, 70, 117, + 116, 116, 74, 129, 132, 77, 78, 79, 132, 81, + 119, 83, -1, 85, 119, 118, 88, 118, -1, -1, + 92, 93, 94, 137, 138, 97, 98, -1, 100, -1, + 102, 103, -1, -1, 64, 132, -1, 132, 110, 132, + 70, 132, 132, 137, 74, 137, -1, 77, 78, 79, + 136, 81, 136, 83, 136, 85, 137, 137, 88, 137, + 137, 137, 92, 93, 94, 137, 138, 97, 98, 137, + 100, 137, 102, 103, 137, 137, 64, 137, 137, 137, 110, 137, 70, 137, 137, 137, 74, 137, 137, 77, - 78, 79, 137, 81, 137, 83, 137, 85, 137, 137, - 88, 137, 137, 137, 92, 93, 94, 137, 138, 97, - 98, 137, 100, 137, 102, 103, 137, 139, 64, 138, - 138, 138, 110, 138, 70, 138, 138, 138, 74, 138, - 140, 77, 78, 79, 139, 81, 139, 83, 139, 85, - 41, 42, 88, 139, 139, 139, 92, 93, 94, 137, - 138, 97, 98, 139, 100, 139, 102, 103, 139, 60, - 8, 9, 10, 139, 110, 139, 139, 68, 69, 139, - 141, 140, 140, 140, 140, 76, 24, 140, 26, 27, + 78, 79, 137, 81, 137, 83, 138, 85, 138, 138, + 88, 138, 138, 138, 92, 93, 94, 137, 138, 97, + 98, 138, 100, 139, 102, 103, 139, 139, 64, 139, + 139, 139, 110, 139, 70, 139, 139, 139, 74, 139, + 139, 77, 78, 79, 139, 81, 140, 83, 140, 85, + 41, 42, 88, 140, 140, 140, 92, 93, 94, 137, + 138, 97, 98, 140, 100, 140, 102, 103, 140, 60, + 8, 9, 10, 140, 110, 140, 140, 68, 69, 140, + 140, 140, 140, 140, 140, 76, 24, 140, 26, 27, 28, 29, 30, 31, 32, 33, 34, 140, 8, 9, 10, 137, 138, 95, 96, 140, 140, 140, 140, 101, 140, 140, 104, 105, 24, 140, 26, 27, 28, 29, - 30, 113, 114, 115, 140, 140, 140, 140, 140, 140, - 121, 140, 123, 124, 125, 126, 127, 128, 140, 95, - 96, 133, 140, 134, 135, 101, 140, 139, 104, 105, - 8, 9, 10, 140, 95, 96, 140, 113, 114, 115, - 101, 140, 140, 104, 105, 140, 24, 140, 26, 27, + 30, 113, 114, 115, 140, 140, 140, 144, 141, 141, + 121, 141, 123, 124, 125, 126, 127, 128, 141, 95, + 96, 133, 141, 134, 135, 101, 141, 139, 104, 105, + 8, 9, 10, 141, 95, 96, 141, 113, 114, 115, + 101, 141, 141, 104, 105, 141, 24, 141, 26, 27, 28, 29, 113, 114, 115, 95, 141, 133, 95, 141, 141, 95, 141, 139, 104, 105, 141, 104, 105, 141, 104, 105, 133, 113, 114, 115, 113, 114, 115, 113, 114, 115, 141, 143, 141, 141, 141, 141, 95, 80, 141, 95, 141, 141, 141, 141, 141, 104, 105, 139, 104, 105, 139, 141, 95, 139, 113, 114, 115, 113, - 114, 115, 141, 104, 105, 82, 141, 141, 141, 141, - 84, 141, 113, 114, 115, 141, 141, 141, 95, 141, - 141, 95, 139, 143, 95, 139, -1, 104, 105, -1, - 104, 105, 143, 104, 105, 143, 113, 114, 115, 113, - 114, 115, 113, 114, 115, 143, 143, 143 + 114, 115, 143, 104, 105, 82, 143, 143, 143, 143, + 84, 143, 113, 114, 115, 143, -1, -1, 95, -1, + -1, 95, 139, -1, 95, 139, -1, 104, 105, -1, + 104, 105, -1, 104, 105, -1, 113, 114, 115, 113, + 114, 115, 113, 114, 115 ); protected static $yybase = array( - 0, 618, 654, 669, 690, 2, 739, -1, 766, 696, - 726, 763, 723, 693, 769, 769, 769, 769, 769, 368, - 362, 359, 359, 324, 359, 373, -2, -2, -2, 322, - 322, 154, 154, 154, 154, 154, 154, 154, 154, 322, - 448, 490, 532, 364, 112, 280, 196, 238, 574, 574, - 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, - 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, - 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, - 574, 406, 574, 574, 574, 574, 574, 574, 574, 574, - 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, - 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, - 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, - 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, - 574, 574, 574, 574, 574, 46, 499, 400, 443, 467, - 466, 464, 655, 651, 649, 675, 676, 427, 673, 534, - 536, 377, 539, 544, 546, 547, 526, 525, 671, 413, - 524, 519, 674, 658, 120, 120, 120, 120, 120, 120, - 120, 120, 120, 120, 65, 79, 337, 337, 337, 337, - 337, 337, 337, 337, 337, 337, 337, 337, 337, 337, - 337, 277, 277, 170, -3, 619, 619, 619, 619, 619, - 619, 619, 619, 619, 619, 619, 619, 619, 619, 619, - 193, 752, 700, 672, 672, 672, 672, 13, -25, -25, - -25, -25, 246, 144, 158, 158, 158, 186, -53, 155, - 410, 328, 328, 271, 271, 271, 271, 271, 271, 271, - 271, 271, 271, 271, 271, 271, 271, 271, 271, 122, - 122, 122, 192, 319, 306, 243, 422, 50, 50, 50, - 432, 436, 435, 259, 259, 259, 425, 425, -100, 425, - 425, 425, 98, 141, 141, -29, 508, 511, 447, 121, - 442, 392, 127, 302, 383, 399, 376, 374, -39, 431, - 550, 342, 498, 458, 237, 458, 237, 173, 361, 346, - 46, 299, 417, 85, 461, 384, 460, 430, 92, 30, - 132, -40, 117, 255, 267, 75, 428, 549, 396, 683, - 648, 517, 292, 117, 117, 645, 681, 397, 200, 682, - 58, 381, 412, 381, 336, 576, 336, 423, 395, 336, - 273, 553, 385, 395, 437, 395, 419, 381, 415, 336, - 494, 486, 429, 204, 412, 553, 336, 336, 424, 336, - 336, 22, 551, 631, 366, 595, 552, 597, 578, 598, - 403, 507, 433, 438, 616, 612, 608, 408, 632, 575, - 453, 405, 449, 557, 554, 455, 358, 439, 567, 445, - 439, 744, 440, 441, 434, 485, 341, 115, 453, 394, - 398, 596, 439, 599, 462, 313, 317, 594, 393, 439, - 421, 439, 505, 623, 439, 714, 338, 329, 453, 358, - 358, 358, 510, 710, 275, 626, 743, 577, 708, 707, - 742, 706, 732, 626, 577, 705, 729, 363, 718, 104, - 635, 417, 444, 401, 344, 484, 77, 348, 720, 439, - 439, 503, 509, 439, 496, 350, 716, 420, 404, 670, - 436, 402, 581, 439, 701, 77, 692, 685, 482, 502, - 580, 501, 352, 684, 426, 515, 439, 601, 481, 679, - 479, 477, 418, 416, 93, 637, 326, 356, 475, 409, - 250, 715, 414, 380, 471, 470, 457, 310, 585, 407, - 379, 468, 719, 0, 0, 0, 0, 0, 0, 0, + 0, 654, 618, 669, 693, 696, 739, -1, 766, 690, + 2, 763, 723, 726, 769, 769, 769, 769, 769, 388, + 373, 359, 359, 379, 359, 377, -2, -2, -2, 322, + 322, 280, 280, 280, 280, 280, 280, 280, 322, 532, + 574, 448, 364, 112, 154, 196, 238, 490, 490, 490, + 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, + 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, + 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, + 406, 490, 490, 490, 490, 490, 490, 490, 490, 490, + 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, + 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, + 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, + 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, + 490, 490, 490, 46, 477, 415, 471, 460, 458, 457, + 630, 625, 622, 685, 692, 349, 636, 502, 504, 381, + 506, 507, 508, 510, 511, 501, 634, 670, 500, 684, + 631, 120, 120, 120, 120, 120, 120, 120, 120, 120, + 120, 65, 358, 337, 337, 337, 337, 337, 337, 337, + 337, 337, 337, 337, 337, 337, 337, 337, 277, 277, + 170, -3, 619, 619, 619, 619, 619, 619, 619, 619, + 619, 619, 619, 619, 619, 619, 619, 193, 752, 700, + 672, 672, 672, 672, 13, -25, -25, -25, -25, 144, + 246, 158, 158, 158, 186, -53, 155, 409, 328, 328, + 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, + 237, 237, 237, 237, 237, 237, 122, 122, 122, 192, + 268, 264, 117, 432, -50, -50, -50, 435, 394, 422, + 259, 259, 259, 412, 412, 485, 412, 412, 412, 98, + 141, 141, -29, 69, 430, 121, 127, 289, 380, 378, + -14, 389, 515, 424, 497, 436, 183, 436, 183, 173, + 323, 329, 46, 274, 429, -18, 440, 383, 468, 386, + 30, 181, 132, -38, 85, 195, 58, 408, 598, 597, + 611, 607, 498, 252, 85, 600, 615, 428, 92, 683, + 75, 395, 340, 395, 391, 543, 391, 407, 384, 391, + 269, 516, 393, 384, 404, 384, 405, 395, 402, 391, + 452, 454, 413, 77, 340, 516, 391, 391, 418, 391, + 391, 38, 554, 557, 362, 567, 553, 596, 525, 595, + 398, 484, 397, 382, 552, 550, 549, 401, 576, 518, + 434, 399, 427, 535, 523, 438, 375, 419, 533, 425, + 419, 712, 396, 423, 417, 354, 461, 352, 308, 434, + 593, 370, 546, 419, 594, 442, 80, 310, 545, 385, + 419, 421, 419, 481, 575, 419, 674, 361, 369, 434, + 375, 375, 375, 538, 673, 104, 580, 671, 658, 708, + 706, 655, 705, 580, 651, 704, 376, 679, 39, 577, + 429, 392, 365, 317, 462, 275, 165, 703, 419, 419, + 493, 485, 419, 444, 339, 676, 420, 411, 699, 394, + 367, 581, 419, 649, 275, 648, 464, 478, 524, 483, + 341, 645, 356, 494, 419, 585, 467, 682, 470, 439, + 416, 414, 344, 578, 324, 363, 426, 403, 348, 675, + 410, 374, 443, 475, 480, 350, 551, 400, 366, 466, + 681, 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, -2, -2, -2, -2, - -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, - -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, - -2, 0, 0, 0, -2, -2, -2, -2, -2, -2, + 0, 0, 0, 0, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, + -2, -2, -2, -2, -2, -2, -2, -2, -2, 0, + 0, 0, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, @@ -592,35 +590,35 @@ class PHPParser_Parser -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, + -2, -2, -2, -2, -2, -2, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, - 120, 120, 120, 120, 120, 120, 120, 120, 120, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 120, - 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, + 120, 120, 120, 120, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, + 120, 120, 120, 120, 120, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, - 105, 105, 105, 105, 105, 120, 120, 120, 120, 120, - 120, 120, 439, 259, 259, 259, 259, 66, 66, 105, - 105, 105, 105, 105, 105, 66, 259, 259, 105, 105, + 120, 120, 120, 120, 120, 120, 120, 419, 259, 259, + 259, 259, 66, 66, 105, 105, 105, 105, 105, 105, + 66, 259, 259, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, - 105, 105, 105, 105, 105, 105, 105, 105, 141, 141, - 141, 141, 253, 253, 253, 141, 141, 141, 0, 0, - 0, 105, 105, 253, 105, 105, 105, 395, 0, 0, - 0, 253, 253, 117, 0, 117, 117, 0, 453, 255, - 267, 255, 267, 439, 339, 339, 339, 339, 395, 0, - 395, 0, 0, 0, 0, 0, 0, 567, 0, 313, - 596, 260, 453, 0, 0, 0, 0, 0, 0, 0, - 0, 453, 269, 269, 439, 39, 439, 0, 0, 0, - 39, 439, 260, 0, 439 + 105, 105, 105, 141, 141, 141, 141, 237, 237, 237, + 141, 141, 141, 0, 0, 0, 105, 105, 237, 105, + 105, 105, 384, 0, 0, 0, 237, 85, 0, 0, + 434, 195, 195, 419, 318, 318, 318, 318, 384, 0, + 384, 0, 0, 0, 0, 0, 0, 533, 0, 80, + 546, 95, 434, 0, 0, 0, 0, 0, 0, 0, + 434, 273, 273, 419, 71, 419, 0, 0, 71, 419, + 95, 0, 419 ); protected static $yydefault = array( 3,32767,32767, 1,32767,32767,32767,32767,32767,32767, 32767,32767,32767,32767, 100, 93, 105, 92, 101,32767, - 32767,32767,32767,32767,32767,32767,32767,32767,32767, 333, - 333, 117, 117, 117, 117, 117, 117, 117, 117, 293, - 32767,32767,32767,32767,32767,32767,32767,32767, 156, 156, - 156,32767, 323, 323, 323, 323,32767,32767,32767,32767, + 32767,32767,32767,32767,32767,32767,32767,32767,32767, 331, + 331, 117, 117, 117, 117, 117, 117, 117, 294,32767, + 32767,32767,32767,32767,32767,32767,32767, 156, 156, 156, + 32767, 321, 321, 321, 321,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, @@ -628,88 +626,86 @@ class PHPParser_Parser 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,32767,32767, 338,32767,32767, + 32767,32767,32767,32767,32767, 336,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, 214, 215, 217, 218, 155, 118, - 324, 337, 154, 120, 182, 184, 232, 183, 160, 165, - 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, - 159, 211, 210, 180, 181, 290, 290, 293,32767,32767, + 32767, 214, 215, 217, 218, 155, 118, 322, 335, 154, + 120, 182, 184, 232, 183, 160, 165, 166, 167, 168, + 169, 170, 171, 172, 173, 174, 175, 159, 211, 210, + 180, 181, 291, 291, 294,32767,32767,32767,32767,32767, + 32767,32767,32767,32767,32767,32767,32767, 185, 187, 186, + 202, 203, 200, 201, 158, 204, 205, 206, 207, 140, + 140, 330, 330, 330,32767,32767,32767, 141, 194, 195, + 32767,32767,32767,32767, 253,32767,32767,32767, 253,32767, + 32767,32767, 253,32767,32767,32767, 112, 112, 112, 112, + 32767,32767,32767, 261,32767,32767,32767,32767,32767, 263, + 189, 190, 188,32767,32767,32767,32767,32767,32767,32767, + 262,32767,32767,32767, 307, 299, 249,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 185, 187, 186, 202, 203, 200, 201, 158, 204, 205, - 206, 207, 140, 140, 332, 332, 332,32767,32767,32767, - 141, 194, 195,32767,32767,32767,32767, 252,32767,32767, - 32767, 252,32767,32767,32767, 252,32767,32767,32767, 112, - 112, 112, 112,32767,32767,32767, 260,32767,32767,32767, - 32767,32767, 262, 189, 190, 188,32767,32767,32767,32767, - 32767,32767,32767, 261,32767,32767,32767,32767, 306, 298, - 306, 306, 250,32767,32767,32767,32767,32767,32767,32767, - 32767,32767,32767,32767,32767,32767,32767,32767, 102, 104, - 32767,32767, 286, 312,32767,32767,32767, 17,32767,32767, - 32767, 345, 306,32767,32767,32767, 19,32767,32767,32767, - 32767,32767,32767, 310, 311,32767,32767,32767,32767,32767, - 32767,32767,32767,32767, 63, 257, 63, 243,32767, 63, - 292, 263,32767,32767, 73,32767, 71,32767, 75, 63, - 91, 91, 234, 292, 54, 263, 63, 63,32767, 63, + 102, 104,32767,32767, 287, 312,32767,32767,32767, 17, + 32767,32767,32767, 343, 307,32767,32767, 19,32767,32767, + 32767,32767,32767,32767, 311,32767,32767,32767,32767,32767, + 32767,32767,32767,32767, 63, 258, 63, 242,32767, 63, + 293, 264,32767,32767, 73,32767, 71,32767, 75, 63, + 91, 91, 234, 293, 54, 264, 63, 63,32767, 63, 63,32767,32767,32767, 4,32767,32767,32767,32767,32767, 32767,32767,32767,32767,32767,32767,32767,32767,32767,32767, - 245,32767,32767, 309, 308,32767, 198, 177, 244,32767, - 179,32767, 248, 251,32767,32767,32767, 129, 246,32767, - 32767,32767, 340,32767,32767, 157,32767,32767,32767, 125, - 32767, 61,32767,32767, 330,32767,32767, 284, 247, 191, - 192, 193, 301,32767, 116, 354,32767, 355,32767,32767, - 32767,32767,32767,32767,32767,32767,32767,32767,32767, 106, - 32767, 278,32767,32767, 127,32767, 74,32767,32767, 161, - 119,32767,32767, 339,32767,32767,32767,32767, 297,32767, - 32767,32767,32767, 62,32767, 76,32767,32767,32767,32767, - 32767,32767, 108,32767,32767,32767, 121,32767,32767,32767, - 32767,32767,32767,32767, 152,32767,32767,32767,32767,32767, - 110,32767,32767,32767,32767,32767,32767, 150,32767,32767, - 32767,32767,32767, 25, 25, 3, 3, 132, 25, 98, - 25, 25, 132, 91, 91, 25, 25, 25, 25, 25, - 25, 25, 25, 25, 25 + 244,32767,32767, 310, 309,32767, 198, 177, 243,32767, + 179,32767,32767, 247, 250,32767,32767,32767, 129, 245, + 32767,32767,32767, 338,32767,32767, 157,32767,32767,32767, + 125,32767, 61,32767,32767, 328,32767,32767, 285, 246, + 191, 192, 193, 302,32767, 116, 286,32767,32767,32767, + 32767,32767,32767,32767,32767,32767,32767,32767, 106,32767, + 279,32767,32767, 127,32767, 74,32767,32767, 161, 119, + 32767,32767, 337,32767,32767,32767,32767, 298,32767,32767, + 32767,32767, 62,32767, 76,32767,32767,32767,32767,32767, + 108,32767,32767,32767, 121,32767,32767,32767,32767,32767, + 32767,32767, 152,32767,32767,32767,32767,32767, 110,32767, + 32767,32767,32767,32767,32767, 150,32767,32767,32767,32767, + 32767, 25, 25, 3, 3, 132, 25, 98, 25, 25, + 132, 91, 91, 25, 25, 25, 25, 25, 25, 25, + 25, 25, 25 ); protected static $yygoto = array( - 137, 137, 169, 169, 169, 169, 169, 169, 169, 169, - 137, 138, 139, 140, 144, 151, 178, 171, 173, 168, - 168, 168, 168, 170, 170, 170, 170, 164, 165, 166, - 167, 176, 721, 722, 386, 724, 744, 745, 746, 747, - 748, 749, 750, 752, 689, 141, 142, 143, 145, 146, - 147, 148, 149, 150, 174, 175, 177, 193, 194, 210, - 211, 212, 213, 214, 215, 216, 218, 219, 220, 221, - 231, 232, 263, 264, 265, 419, 420, 421, 179, 180, - 181, 182, 183, 184, 185, 186, 187, 188, 189, 152, - 153, 154, 155, 172, 156, 191, 157, 158, 159, 192, - 160, 161, 190, 135, 162, 163, 441, 441, 441, 441, - 441, 441, 441, 441, 441, 441, 441, 441, 441, 441, - 441, 548, 655, 610, 804, 805, 653, 611, 821, 634, - 678, 636, 676, 454, 479, 388, 388, 388, 388, 388, - 388, 532, 532, 532, 388, 388, 388, 388, 769, 388, - 388, 388, 769, 388, 388, 388, 769, 388, 388, 388, - 638, 638, 638, 638, 428, 429, 431, 435, 464, 466, - 467, 834, 533, 533, 533, 834, 415, 602, 602, 834, - 597, 603, 483, 442, 442, 442, 442, 442, 442, 442, - 442, 442, 442, 442, 442, 442, 442, 442, 290, 866, - 866, 393, 430, 432, 436, 393, 869, 866, 575, 393, - 576, 860, 389, 389, 389, 389, 389, 389, 869, 869, - 304, 389, 389, 389, 389, 392, 389, 389, 389, 392, - 389, 389, 389, 392, 389, 389, 389, 280, 280, 280, - 280, 280, 280, 456, 502, 473, 280, 280, 280, 280, - 281, 280, 280, 280, 281, 280, 280, 280, 281, 280, - 280, 280, 779, 778, 414, 414, 414, 409, 449, 288, - 312, 312, 312, 411, 411, 387, 390, 819, 402, 319, - 321, 312, 450, 453, 463, 325, 326, 476, 329, 323, - 324, 802, 802, 802, 802, 802, 802, 802, 802, 802, - 802, 802, 802, 802, 802, 802, 5, 733, 283, 853, - 14, 355, 6, 7, 531, 531, 531, 8, 9, 10, - 15, 16, 11, 17, 12, 18, 13, 1, 2, 307, - 668, 307, 621, 608, 606, 606, 604, 606, 509, 394, - 628, 624, 833, 262, 318, 305, 833, 255, 401, 357, - 833, 540, 465, 647, 518, 327, 816, 546, 457, 584, - 291, 292, 852, 852, 852, 248, 482, 687, 493, 499, - 223, 0, 0, 832, 398, 0, 0, 0, 0, 316, - 0, 418 + 135, 135, 166, 166, 166, 166, 166, 166, 166, 135, + 136, 137, 138, 142, 149, 175, 168, 170, 165, 165, + 165, 165, 167, 167, 167, 167, 161, 162, 163, 164, + 173, 709, 710, 376, 712, 732, 733, 734, 735, 736, + 737, 738, 740, 677, 139, 140, 141, 143, 144, 145, + 146, 147, 148, 171, 172, 174, 190, 191, 207, 208, + 209, 210, 211, 212, 213, 215, 216, 217, 218, 228, + 229, 260, 261, 262, 410, 411, 412, 176, 177, 178, + 179, 180, 181, 182, 183, 184, 185, 186, 150, 151, + 152, 153, 169, 154, 188, 155, 156, 157, 189, 158, + 187, 133, 159, 160, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 536, + 643, 598, 793, 794, 641, 599, 810, 622, 666, 624, + 664, 443, 467, 378, 378, 378, 378, 378, 378, 282, + 445, 490, 378, 378, 378, 378, 756, 378, 378, 378, + 756, 378, 378, 378, 756, 378, 378, 378, 626, 626, + 626, 626, 417, 418, 421, 424, 453, 455, 406, 384, + 521, 521, 521, 384, 846, 590, 590, 384, 585, 591, + 471, 379, 379, 379, 379, 379, 379, 520, 520, 520, + 379, 379, 379, 379, 382, 379, 379, 379, 382, 379, + 379, 379, 382, 379, 379, 379, 405, 405, 405, 400, + 438, 280, 420, 422, 425, 402, 402, 377, 380, 721, + 393, 310, 312, 345, 439, 442, 452, 296, 316, 464, + 319, 431, 431, 431, 431, 431, 431, 431, 431, 431, + 431, 431, 431, 431, 431, 431, 791, 791, 791, 791, + 791, 791, 791, 791, 791, 791, 791, 791, 791, 791, + 791, 461, 823, 304, 304, 304, 823, 259, 768, 767, + 823, 252, 5, 383, 304, 808, 14, 383, 6, 7, + 315, 383, 314, 8, 9, 10, 15, 16, 11, 17, + 12, 18, 13, 519, 519, 519, 563, 839, 564, 283, + 284, 822, 1, 2, 656, 822, 309, 454, 347, 822, + 277, 609, 596, 594, 594, 592, 594, 497, 385, 616, + 612, 838, 838, 838, 297, 528, 299, 392, 299, 506, + 635, 317, 821, 852, 852, 805, 534, 446, 572, 220, + 855, 852, 675, 0, 245, 470, 0, 481, 487, 0, + 0, 0, 855, 855, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 389, + 0, 0, 0, 0, 307, 0, 409 ); protected static $yygcheck = array( @@ -723,59 +719,58 @@ class PHPParser_Parser 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 35, 35, 35, 35, + 15, 15, 15, 15, 35, 35, 35, 35, 35, 35, + 35, 35, 35, 35, 35, 35, 35, 35, 35, 12, + 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, + 12, 21, 21, 35, 35, 35, 35, 35, 35, 43, + 36, 36, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 12, 12, 12, 12, 12, 12, 12, 12, 12, - 12, 12, 12, 21, 21, 35, 35, 35, 35, 35, - 35, 6, 6, 6, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 47, 47, 47, 47, 47, 47, - 47, 69, 7, 7, 7, 69, 62, 35, 35, 69, - 35, 35, 35, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 43, 88, - 88, 73, 75, 75, 75, 73, 88, 88, 29, 73, - 29, 87, 67, 67, 67, 67, 67, 67, 88, 88, - 26, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 68, 68, 68, - 68, 68, 68, 36, 36, 78, 68, 68, 68, 68, - 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, - 68, 68, 74, 74, 28, 28, 28, 28, 28, 28, - 68, 68, 68, 28, 28, 28, 28, 82, 28, 28, - 28, 68, 28, 28, 28, 57, 28, 28, 28, 68, - 68, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 13, 58, 4, 85, - 13, 58, 13, 13, 5, 5, 5, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 2, 2, 4, - 56, 4, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 70, 76, 27, 30, 70, 76, 30, 46, - 70, 10, 42, 49, 44, 9, 81, 11, 30, 34, - 43, 43, 70, 70, 70, 30, 30, 59, 30, 30, - 40, -1, -1, 70, 4, -1, -1, -1, -1, 4, - -1, 4 + 35, 35, 47, 47, 47, 47, 47, 47, 62, 73, + 7, 7, 7, 73, 87, 35, 35, 73, 35, 35, + 35, 67, 67, 67, 67, 67, 67, 6, 6, 6, + 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, + 67, 67, 67, 67, 67, 67, 28, 28, 28, 28, + 28, 28, 76, 76, 76, 28, 28, 28, 28, 58, + 28, 28, 28, 58, 28, 28, 28, 26, 28, 28, + 28, 70, 70, 70, 70, 70, 70, 70, 70, 70, + 70, 70, 70, 70, 70, 70, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 79, 68, 74, 74, 74, 68, 77, 75, 75, + 68, 77, 13, 70, 74, 82, 13, 70, 13, 13, + 57, 70, 74, 13, 13, 13, 13, 13, 13, 13, + 13, 13, 13, 5, 5, 5, 29, 85, 29, 43, + 43, 69, 2, 2, 56, 69, 27, 42, 46, 69, + 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 69, 69, 69, 30, 10, 4, 30, 4, 44, + 49, 9, 69, 88, 88, 81, 11, 30, 34, 40, + 88, 88, 59, -1, 30, 30, -1, 30, 30, -1, + -1, -1, 88, 88, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, + -1, -1, -1, -1, 4, -1, 4 ); protected static $yygbase = array( - 0, 0, -178, 0, 36, 313, 140, 171, 0, 22, - 56, 10, -77, -198, 0, -29, 0, 0, 0, 0, - 0, 84, 0, 0, 0, 0, 169, 110, 40, 186, - 9, 0, 0, 0, 5, -89, -7, 0, 0, 0, - -142, 0, 85, -153, 54, 0, 97, 132, 0, 57, - 0, 0, 0, 0, 0, 0, 100, 60, 66, 12, - 0, 0, 146, 0, 0, 0, 0, -12, 13, -66, - 105, 0, 0, -36, 4, 149, 87, 96, 49, 0, - 0, 3, 80, 0, 0, 83, 0, 172, -55, 0 + 0, 0, -191, 0, 41, 292, 186, 169, 0, 8, + 38, -1, -76, -220, 0, -29, 0, 0, 0, 0, + 0, 83, 0, 0, 0, 0, 177, 75, -15, 274, + -2, 0, 0, 0, -6, -88, -107, 0, 0, 0, + -161, 0, 43, -202, 37, 0, 59, 130, 0, 42, + 0, 0, 0, 0, 0, 0, 77, 58, -19, -3, + 0, 0, 138, 0, 0, 0, 0, -40, 28, 67, + 39, 0, 0, -65, 9, 13, 160, 14, 54, 68, + 0, -8, 81, 0, 0, 74, 0, 136, 82, 0 ); protected static $yygdefault = array( - -32768, 361, 3, 527, 380, 551, 552, 553, 308, 306, - 541, 547, 458, 4, 549, 136, 298, 556, 299, 487, - 558, 404, 560, 561, 309, 310, 405, 317, 217, 574, - 489, 315, 577, 354, 583, 302, 438, 381, 348, 451, - 222, 412, 446, 289, 521, 439, 349, 423, 424, 648, - 656, 358, 328, 474, 660, 230, 667, 320, 341, 688, - 751, 753, 391, 399, 471, 330, 825, 382, 278, 383, - 384, 774, 282, 824, 422, 426, 254, 812, 459, 810, - 353, 859, 820, 279, 303, 854, 340, 861, 868, 448 + -32768, 351, 3, 515, 370, 539, 540, 541, 300, 298, + 529, 535, 447, 4, 537, 134, 290, 544, 291, 475, + 546, 395, 548, 549, 301, 302, 396, 308, 214, 562, + 477, 306, 565, 344, 571, 294, 427, 371, 338, 440, + 219, 403, 435, 281, 509, 428, 339, 414, 415, 636, + 644, 348, 318, 462, 648, 227, 655, 311, 331, 676, + 739, 741, 381, 390, 459, 320, 814, 372, 373, 374, + 764, 761, 276, 813, 274, 413, 419, 251, 801, 448, + 343, 845, 809, 275, 295, 840, 330, 847, 854, 437 ); protected static $yylhs = array( @@ -803,18 +798,18 @@ class PHPParser_Parser 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 64, 64, 65, 65, 66, 66, - 66, 66, 66, 67, 67, 35, 35, 35, 58, 58, - 71, 71, 72, 72, 72, 72, 72, 60, 60, 60, - 63, 63, 63, 59, 59, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 12, 12, 12, - 12, 12, 12, 12, 61, 61, 61, 61, 61, 61, - 78, 78, 81, 81, 80, 80, 82, 82, 28, 28, - 28, 83, 83, 83, 83, 83, 70, 70, 73, 73, - 69, 69, 69, 84, 84, 84, 84, 84, 84, 68, - 68, 68, 68, 75, 75, 74, 74, 74, 57, 57, - 85, 85, 85, 62, 62, 86, 86, 87, 87, 87, - 87, 76, 76, 76, 76, 88, 88, 88, 88, 88, - 88, 89, 89, 89, 79, 79 + 66, 66, 70, 70, 35, 35, 35, 58, 58, 71, + 71, 67, 67, 72, 72, 72, 72, 72, 60, 60, + 60, 63, 63, 63, 59, 59, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 12, 12, + 12, 12, 12, 12, 12, 61, 61, 61, 61, 61, + 61, 79, 79, 81, 81, 80, 80, 82, 82, 28, + 28, 28, 83, 83, 83, 83, 83, 69, 69, 73, + 73, 68, 68, 84, 84, 84, 84, 74, 74, 74, + 74, 76, 76, 75, 75, 75, 57, 57, 85, 85, + 85, 62, 62, 86, 86, 87, 87, 87, 87, 77, + 77, 77, 77, 88, 88, 88, 88, 88, 88, 89, + 89, 89 ); protected static $yylen = array( @@ -842,18 +837,18 @@ class PHPParser_Parser 5, 4, 4, 4, 2, 2, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 4, 3, 3, 2, 9, 0, 4, 4, 2, 4, 6, - 6, 4, 4, 1, 1, 1, 2, 3, 1, 1, - 1, 1, 0, 3, 3, 4, 4, 0, 2, 3, - 0, 1, 1, 0, 3, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 3, 2, 1, 1, 2, - 2, 4, 3, 3, 1, 1, 1, 1, 3, 3, - 0, 2, 0, 1, 3, 1, 3, 1, 1, 1, - 1, 3, 6, 4, 4, 4, 1, 2, 1, 1, - 4, 4, 1, 3, 3, 6, 6, 4, 4, 4, - 4, 1, 4, 0, 1, 1, 3, 1, 3, 1, - 1, 4, 0, 0, 2, 3, 1, 3, 1, 4, - 2, 2, 2, 1, 2, 1, 4, 3, 3, 6, - 3, 1, 1, 1, 3, 3 + 4, 4, 1, 1, 1, 2, 3, 1, 1, 1, + 1, 1, 1, 0, 3, 3, 4, 4, 0, 2, + 3, 0, 1, 1, 0, 3, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 3, 2, 1, 1, + 2, 2, 4, 3, 3, 1, 3, 1, 1, 3, + 3, 0, 2, 0, 1, 3, 1, 3, 1, 1, + 1, 1, 3, 6, 4, 4, 4, 1, 2, 1, + 1, 4, 1, 3, 6, 4, 4, 4, 4, 1, + 4, 0, 1, 1, 3, 1, 3, 1, 1, 4, + 0, 0, 2, 3, 1, 3, 1, 4, 2, 2, + 2, 1, 2, 1, 4, 3, 3, 6, 3, 1, + 1, 1 ); protected $yyval; @@ -1941,10 +1936,6 @@ class PHPParser_Parser } protected function yyn240($line, $docComment) { - $this->yyval = new PHPParser_Node_Expr_StaticCall($this->yyastk[$this->yysp-(6-1)], $this->yyastk[$this->yysp-(6-3)], $this->yyastk[$this->yysp-(6-5)], $line, $docComment); - } - - protected function yyn241($line, $docComment) { if ($this->yyastk[$this->yysp-(4-1)] instanceof PHPParser_Node_Expr_StaticPropertyFetch) { $this->yyval = new PHPParser_Node_Expr_StaticCall($this->yyastk[$this->yysp-(4-1)]->class, new PHPParser_Node_Expr_Variable($this->yyastk[$this->yysp-(4-1)]->name, $line, $docComment), $this->yyastk[$this->yysp-(4-3)], $line, $docComment); @@ -1962,30 +1953,34 @@ class PHPParser_Parser } - protected function yyn242($line, $docComment) { + protected function yyn241($line, $docComment) { $this->yyval = new PHPParser_Node_Expr_FuncCall($this->yyastk[$this->yysp-(4-1)], $this->yyastk[$this->yysp-(4-3)], $line, $docComment); } - protected function yyn243($line, $docComment) { + protected function yyn242($line, $docComment) { $this->yyval = new PHPParser_Node_Name('static', $line, $docComment); } - protected function yyn244($line, $docComment) { + protected function yyn243($line, $docComment) { $this->yyval = $this->yyastk[$this->yysp-(1-1)]; } - protected function yyn245($line, $docComment) { + protected function yyn244($line, $docComment) { $this->yyval = new PHPParser_Node_Name($this->yyastk[$this->yysp-(1-1)], $line, $docComment); } - protected function yyn246($line, $docComment) { + protected function yyn245($line, $docComment) { $this->yyval = new PHPParser_Node_Name_FullyQualified($this->yyastk[$this->yysp-(2-2)], $line, $docComment); } - protected function yyn247($line, $docComment) { + protected function yyn246($line, $docComment) { $this->yyval = new PHPParser_Node_Name_Relative($this->yyastk[$this->yysp-(3-3)], $line, $docComment); } + protected function yyn247($line, $docComment) { + $this->yyval = $this->yyastk[$this->yysp-(1-1)]; + } + protected function yyn248($line, $docComment) { $this->yyval = $this->yyastk[$this->yysp-(1-1)]; } @@ -2002,12 +1997,12 @@ class PHPParser_Parser $this->yyval = $this->yyastk[$this->yysp-(1-1)]; } - protected function yyn252() { - $this->yyval = $this->yyastk[$this->yysp]; + protected function yyn252($line, $docComment) { + $this->yyval = $this->yyastk[$this->yysp-(1-1)]; } - protected function yyn253($line, $docComment) { - $this->yyval = new PHPParser_Node_Expr_PropertyFetch($this->yyastk[$this->yysp-(3-1)], $this->yyastk[$this->yysp-(3-3)], $line, $docComment); + protected function yyn253() { + $this->yyval = $this->yyastk[$this->yysp]; } protected function yyn254($line, $docComment) { @@ -2015,7 +2010,7 @@ class PHPParser_Parser } protected function yyn255($line, $docComment) { - $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch($this->yyastk[$this->yysp-(4-1)], $this->yyastk[$this->yysp-(4-3)], $line, $docComment); + $this->yyval = new PHPParser_Node_Expr_PropertyFetch($this->yyastk[$this->yysp-(3-1)], $this->yyastk[$this->yysp-(3-3)], $line, $docComment); } protected function yyn256($line, $docComment) { @@ -2023,7 +2018,7 @@ class PHPParser_Parser } protected function yyn257($line, $docComment) { - $this->yyval = null; + $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch($this->yyastk[$this->yysp-(4-1)], $this->yyastk[$this->yysp-(4-3)], $line, $docComment); } protected function yyn258($line, $docComment) { @@ -2031,163 +2026,163 @@ class PHPParser_Parser } protected function yyn259($line, $docComment) { - $this->yyval = $this->yyastk[$this->yysp-(3-2)]; + $this->yyval = null; } protected function yyn260($line, $docComment) { - $this->yyval = array(); - } - - protected function yyn261($line, $docComment) { - $this->yyval = array(PHPParser_Node_Scalar_String::parseEscapeSequences($this->yyastk[$this->yysp-(1-1)], '`')); - } - - protected function yyn262($line, $docComment) { - foreach ($this->yyastk[$this->yysp-(1-1)] as &$s) { if (is_string($s)) { $s = PHPParser_Node_Scalar_String::parseEscapeSequences($s, '`'); } }; $this->yyval = $this->yyastk[$this->yysp-(1-1)]; - } - - protected function yyn263($line, $docComment) { - $this->yyval = array(); - } - - protected function yyn264($line, $docComment) { $this->yyval = $this->yyastk[$this->yysp-(3-2)]; } - protected function yyn265($line, $docComment) { - $this->yyval = new PHPParser_Node_Scalar_LNumber((int) $this->yyastk[$this->yysp-(1-1)], $line, $docComment); - } - - protected function yyn266($line, $docComment) { - $this->yyval = new PHPParser_Node_Scalar_DNumber((double) $this->yyastk[$this->yysp-(1-1)], $line, $docComment); - } - - protected function yyn267($line, $docComment) { - $this->yyval = PHPParser_Node_Scalar_String::create($this->yyastk[$this->yysp-(1-1)], $line, $docComment); - } - - protected function yyn268($line, $docComment) { - $this->yyval = new PHPParser_Node_Scalar_LineConst($line, $docComment); - } - - protected function yyn269($line, $docComment) { - $this->yyval = new PHPParser_Node_Scalar_FileConst($line, $docComment); - } - - protected function yyn270($line, $docComment) { - $this->yyval = new PHPParser_Node_Scalar_DirConst($line, $docComment); - } - - protected function yyn271($line, $docComment) { - $this->yyval = new PHPParser_Node_Scalar_ClassConst($line, $docComment); - } - - protected function yyn272($line, $docComment) { - $this->yyval = new PHPParser_Node_Scalar_MethodConst($line, $docComment); - } - - protected function yyn273($line, $docComment) { - $this->yyval = new PHPParser_Node_Scalar_FuncConst($line, $docComment); - } - - protected function yyn274($line, $docComment) { - $this->yyval = new PHPParser_Node_Scalar_NSConst($line, $docComment); - } - - protected function yyn275($line, $docComment) { - $this->yyval = new PHPParser_Node_Scalar_String(PHPParser_Node_Scalar_String::parseEscapeSequences($this->yyastk[$this->yysp-(3-2)], null), $line, $docComment); - } - - protected function yyn276($line, $docComment) { - $this->yyval = new PHPParser_Node_Scalar_String('', $line, $docComment); - } - - protected function yyn277($line, $docComment) { - $this->yyval = $this->yyastk[$this->yysp-(1-1)]; - } - - protected function yyn278($line, $docComment) { - $this->yyval = new PHPParser_Node_Expr_ConstFetch($this->yyastk[$this->yysp-(1-1)], $line, $docComment); - } - - protected function yyn279($line, $docComment) { - $this->yyval = new PHPParser_Node_Expr_UnaryPlus($this->yyastk[$this->yysp-(2-2)], $line, $docComment); - } - - protected function yyn280($line, $docComment) { - $this->yyval = new PHPParser_Node_Expr_UnaryMinus($this->yyastk[$this->yysp-(2-2)], $line, $docComment); - } - - protected function yyn281($line, $docComment) { - $this->yyval = new PHPParser_Node_Expr_Array($this->yyastk[$this->yysp-(4-3)], $line, $docComment); - } - - protected function yyn282($line, $docComment) { - $this->yyval = new PHPParser_Node_Expr_Array($this->yyastk[$this->yysp-(3-2)], $line, $docComment); - } - - protected function yyn283($line, $docComment) { - $this->yyval = new PHPParser_Node_Expr_ClassConstFetch($this->yyastk[$this->yysp-(3-1)], $this->yyastk[$this->yysp-(3-3)], $line, $docComment); - } - - protected function yyn284($line, $docComment) { - $this->yyval = new PHPParser_Node_Scalar_String($this->yyastk[$this->yysp-(1-1)], $line, $docComment); - } - - protected function yyn285($line, $docComment) { - $this->yyval = $this->yyastk[$this->yysp-(1-1)]; - } - - protected function yyn286($line, $docComment) { - $this->yyval = new PHPParser_Node_Expr_ConstFetch($this->yyastk[$this->yysp-(1-1)], $line, $docComment); - } - - protected function yyn287($line, $docComment) { - $this->yyval = $this->yyastk[$this->yysp-(1-1)]; - } - - protected function yyn288($line, $docComment) { - foreach ($this->yyastk[$this->yysp-(3-2)] as &$s) { if (is_string($s)) { $s = PHPParser_Node_Scalar_String::parseEscapeSequences($s, '"'); } }; $this->yyval = new PHPParser_Node_Scalar_Encapsed($this->yyastk[$this->yysp-(3-2)], $line, $docComment); - } - - protected function yyn289($line, $docComment) { - foreach ($this->yyastk[$this->yysp-(3-2)] as &$s) { if (is_string($s)) { $s = PHPParser_Node_Scalar_String::parseEscapeSequences($s, null); } }; $this->yyval = new PHPParser_Node_Scalar_Encapsed($this->yyastk[$this->yysp-(3-2)], $line, $docComment); - } - - protected function yyn290($line, $docComment) { + protected function yyn261($line, $docComment) { $this->yyval = array(); } - protected function yyn291($line, $docComment) { - $this->yyval = $this->yyastk[$this->yysp-(2-1)]; + protected function yyn262($line, $docComment) { + $this->yyval = array(PHPParser_Node_Scalar_String::parseEscapeSequences($this->yyastk[$this->yysp-(1-1)], '`')); } - protected function yyn292() { - $this->yyval = $this->yyastk[$this->yysp]; + protected function yyn263($line, $docComment) { + foreach ($this->yyastk[$this->yysp-(1-1)] as &$s) { if (is_string($s)) { $s = PHPParser_Node_Scalar_String::parseEscapeSequences($s, '`'); } }; $this->yyval = $this->yyastk[$this->yysp-(1-1)]; + } + + protected function yyn264($line, $docComment) { + $this->yyval = array(); + } + + protected function yyn265($line, $docComment) { + $this->yyval = $this->yyastk[$this->yysp-(3-2)]; + } + + protected function yyn266($line, $docComment) { + $this->yyval = new PHPParser_Node_Scalar_LNumber((int) $this->yyastk[$this->yysp-(1-1)], $line, $docComment); + } + + protected function yyn267($line, $docComment) { + $this->yyval = new PHPParser_Node_Scalar_DNumber((double) $this->yyastk[$this->yysp-(1-1)], $line, $docComment); + } + + protected function yyn268($line, $docComment) { + $this->yyval = PHPParser_Node_Scalar_String::create($this->yyastk[$this->yysp-(1-1)], $line, $docComment); + } + + protected function yyn269($line, $docComment) { + $this->yyval = new PHPParser_Node_Scalar_LineConst($line, $docComment); + } + + protected function yyn270($line, $docComment) { + $this->yyval = new PHPParser_Node_Scalar_FileConst($line, $docComment); + } + + protected function yyn271($line, $docComment) { + $this->yyval = new PHPParser_Node_Scalar_DirConst($line, $docComment); + } + + protected function yyn272($line, $docComment) { + $this->yyval = new PHPParser_Node_Scalar_ClassConst($line, $docComment); + } + + protected function yyn273($line, $docComment) { + $this->yyval = new PHPParser_Node_Scalar_MethodConst($line, $docComment); + } + + protected function yyn274($line, $docComment) { + $this->yyval = new PHPParser_Node_Scalar_FuncConst($line, $docComment); + } + + protected function yyn275($line, $docComment) { + $this->yyval = new PHPParser_Node_Scalar_NSConst($line, $docComment); + } + + protected function yyn276($line, $docComment) { + $this->yyval = new PHPParser_Node_Scalar_String(PHPParser_Node_Scalar_String::parseEscapeSequences($this->yyastk[$this->yysp-(3-2)], null), $line, $docComment); + } + + protected function yyn277($line, $docComment) { + $this->yyval = new PHPParser_Node_Scalar_String('', $line, $docComment); + } + + protected function yyn278($line, $docComment) { + $this->yyval = $this->yyastk[$this->yysp-(1-1)]; + } + + protected function yyn279($line, $docComment) { + $this->yyval = new PHPParser_Node_Expr_ConstFetch($this->yyastk[$this->yysp-(1-1)], $line, $docComment); + } + + protected function yyn280($line, $docComment) { + $this->yyval = new PHPParser_Node_Expr_UnaryPlus($this->yyastk[$this->yysp-(2-2)], $line, $docComment); + } + + protected function yyn281($line, $docComment) { + $this->yyval = new PHPParser_Node_Expr_UnaryMinus($this->yyastk[$this->yysp-(2-2)], $line, $docComment); + } + + protected function yyn282($line, $docComment) { + $this->yyval = new PHPParser_Node_Expr_Array($this->yyastk[$this->yysp-(4-3)], $line, $docComment); + } + + protected function yyn283($line, $docComment) { + $this->yyval = new PHPParser_Node_Expr_Array($this->yyastk[$this->yysp-(3-2)], $line, $docComment); + } + + protected function yyn284($line, $docComment) { + $this->yyval = new PHPParser_Node_Expr_ClassConstFetch($this->yyastk[$this->yysp-(3-1)], $this->yyastk[$this->yysp-(3-3)], $line, $docComment); + } + + protected function yyn285($line, $docComment) { + $this->yyval = new PHPParser_Node_Scalar_String($this->yyastk[$this->yysp-(1-1)], $line, $docComment); + } + + protected function yyn286($line, $docComment) { + $this->yyval = new PHPParser_Node_Expr_ClassConstFetch($this->yyastk[$this->yysp-(3-1)], $this->yyastk[$this->yysp-(3-3)], $line, $docComment); + } + + protected function yyn287($line, $docComment) { + $this->yyval = new PHPParser_Node_Expr_ConstFetch($this->yyastk[$this->yysp-(1-1)], $line, $docComment); + } + + protected function yyn288($line, $docComment) { + $this->yyval = $this->yyastk[$this->yysp-(1-1)]; + } + + protected function yyn289($line, $docComment) { + foreach ($this->yyastk[$this->yysp-(3-2)] as &$s) { if (is_string($s)) { $s = PHPParser_Node_Scalar_String::parseEscapeSequences($s, '"'); } }; $this->yyval = new PHPParser_Node_Scalar_Encapsed($this->yyastk[$this->yysp-(3-2)], $line, $docComment); + } + + protected function yyn290($line, $docComment) { + foreach ($this->yyastk[$this->yysp-(3-2)] as &$s) { if (is_string($s)) { $s = PHPParser_Node_Scalar_String::parseEscapeSequences($s, null); } }; $this->yyval = new PHPParser_Node_Scalar_Encapsed($this->yyastk[$this->yysp-(3-2)], $line, $docComment); + } + + protected function yyn291($line, $docComment) { + $this->yyval = array(); + } + + protected function yyn292($line, $docComment) { + $this->yyval = $this->yyastk[$this->yysp-(2-1)]; } protected function yyn293() { $this->yyval = $this->yyastk[$this->yysp]; } - protected function yyn294($line, $docComment) { - $this->yyastk[$this->yysp-(3-1)][] = $this->yyastk[$this->yysp-(3-3)]; $this->yyval = $this->yyastk[$this->yysp-(3-1)]; + protected function yyn294() { + $this->yyval = $this->yyastk[$this->yysp]; } protected function yyn295($line, $docComment) { - $this->yyval = array($this->yyastk[$this->yysp-(1-1)]); + $this->yyastk[$this->yysp-(3-1)][] = $this->yyastk[$this->yysp-(3-3)]; $this->yyval = $this->yyastk[$this->yysp-(3-1)]; } protected function yyn296($line, $docComment) { - $this->yyval = new PHPParser_Node_Expr_ArrayItem($this->yyastk[$this->yysp-(3-3)], $this->yyastk[$this->yysp-(3-1)], false, $line, $docComment); + $this->yyval = array($this->yyastk[$this->yysp-(1-1)]); } protected function yyn297($line, $docComment) { - $this->yyval = new PHPParser_Node_Expr_ArrayItem($this->yyastk[$this->yysp-(1-1)], null, false, $line, $docComment); + $this->yyval = new PHPParser_Node_Expr_ArrayItem($this->yyastk[$this->yysp-(3-3)], $this->yyastk[$this->yysp-(3-1)], false, $line, $docComment); } protected function yyn298($line, $docComment) { - $this->yyval = $this->yyastk[$this->yysp-(1-1)]; + $this->yyval = new PHPParser_Node_Expr_ArrayItem($this->yyastk[$this->yysp-(1-1)], null, false, $line, $docComment); } protected function yyn299($line, $docComment) { @@ -2199,19 +2194,19 @@ class PHPParser_Parser } protected function yyn301($line, $docComment) { - $this->yyval = new PHPParser_Node_Expr_PropertyFetch($this->yyastk[$this->yysp-(3-1)], $this->yyastk[$this->yysp-(3-3)], $line, $docComment); + $this->yyval = $this->yyastk[$this->yysp-(1-1)]; } protected function yyn302($line, $docComment) { - $this->yyval = new PHPParser_Node_Expr_MethodCall($this->yyastk[$this->yysp-(6-1)], $this->yyastk[$this->yysp-(6-3)], $this->yyastk[$this->yysp-(6-5)], $line, $docComment); + $this->yyval = new PHPParser_Node_Expr_PropertyFetch($this->yyastk[$this->yysp-(3-1)], $this->yyastk[$this->yysp-(3-3)], $line, $docComment); } protected function yyn303($line, $docComment) { - $this->yyval = new PHPParser_Node_Expr_FuncCall($this->yyastk[$this->yysp-(4-1)], $this->yyastk[$this->yysp-(4-3)], $line, $docComment); + $this->yyval = new PHPParser_Node_Expr_MethodCall($this->yyastk[$this->yysp-(6-1)], $this->yyastk[$this->yysp-(6-3)], $this->yyastk[$this->yysp-(6-5)], $line, $docComment); } protected function yyn304($line, $docComment) { - $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch($this->yyastk[$this->yysp-(4-1)], $this->yyastk[$this->yysp-(4-3)], $line, $docComment); + $this->yyval = new PHPParser_Node_Expr_FuncCall($this->yyastk[$this->yysp-(4-1)], $this->yyastk[$this->yysp-(4-3)], $line, $docComment); } protected function yyn305($line, $docComment) { @@ -2219,15 +2214,15 @@ class PHPParser_Parser } protected function yyn306($line, $docComment) { - $this->yyval = $this->yyastk[$this->yysp-(1-1)]; + $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch($this->yyastk[$this->yysp-(4-1)], $this->yyastk[$this->yysp-(4-3)], $line, $docComment); } protected function yyn307($line, $docComment) { - $this->yyval = new PHPParser_Node_Expr_Variable($this->yyastk[$this->yysp-(2-2)], $line, $docComment); + $this->yyval = $this->yyastk[$this->yysp-(1-1)]; } protected function yyn308($line, $docComment) { - $this->yyval = $this->yyastk[$this->yysp-(1-1)]; + $this->yyval = new PHPParser_Node_Expr_Variable($this->yyastk[$this->yysp-(2-2)], $line, $docComment); } protected function yyn309($line, $docComment) { @@ -2235,7 +2230,7 @@ class PHPParser_Parser } protected function yyn310($line, $docComment) { - $this->yyval = new PHPParser_Node_Expr_StaticPropertyFetch($this->yyastk[$this->yysp-(4-1)], $this->yyastk[$this->yysp-(4-4)], $line, $docComment); + $this->yyval = $this->yyastk[$this->yysp-(1-1)]; } protected function yyn311($line, $docComment) { @@ -2251,15 +2246,15 @@ class PHPParser_Parser } protected function yyn314($line, $docComment) { - $this->yyval = new PHPParser_Node_Expr_StaticPropertyFetch($this->yyastk[$this->yysp-(3-1)], substr($this->yyastk[$this->yysp-(3-3)], 1), $line, $docComment); + $this->yyval = new PHPParser_Node_Expr_StaticPropertyFetch($this->yyastk[$this->yysp-(6-1)], $this->yyastk[$this->yysp-(6-5)], $line, $docComment); } protected function yyn315($line, $docComment) { - $this->yyval = new PHPParser_Node_Expr_StaticPropertyFetch($this->yyastk[$this->yysp-(6-1)], $this->yyastk[$this->yysp-(6-5)], $line, $docComment); + $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch($this->yyastk[$this->yysp-(4-1)], $this->yyastk[$this->yysp-(4-3)], $line, $docComment); } protected function yyn316($line, $docComment) { - $this->yyval = new PHPParser_Node_Expr_StaticPropertyFetch($this->yyastk[$this->yysp-(6-1)], $this->yyastk[$this->yysp-(6-5)], $line, $docComment); + $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch($this->yyastk[$this->yysp-(4-1)], $this->yyastk[$this->yysp-(4-3)], $line, $docComment); } protected function yyn317($line, $docComment) { @@ -2271,150 +2266,134 @@ class PHPParser_Parser } protected function yyn319($line, $docComment) { - $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch($this->yyastk[$this->yysp-(4-1)], $this->yyastk[$this->yysp-(4-3)], $line, $docComment); - } - - protected function yyn320($line, $docComment) { - $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch($this->yyastk[$this->yysp-(4-1)], $this->yyastk[$this->yysp-(4-3)], $line, $docComment); - } - - protected function yyn321($line, $docComment) { $this->yyval = new PHPParser_Node_Expr_Variable(substr($this->yyastk[$this->yysp-(1-1)], 1), $line, $docComment); } - protected function yyn322($line, $docComment) { + protected function yyn320($line, $docComment) { $this->yyval = new PHPParser_Node_Expr_Variable($this->yyastk[$this->yysp-(4-3)], $line, $docComment); } - protected function yyn323($line, $docComment) { + protected function yyn321($line, $docComment) { $this->yyval = null; } - protected function yyn324($line, $docComment) { + protected function yyn322($line, $docComment) { $this->yyval = $this->yyastk[$this->yysp-(1-1)]; } + protected function yyn323($line, $docComment) { + $this->yyval = $this->yyastk[$this->yysp-(1-1)]; + } + + protected function yyn324($line, $docComment) { + $this->yyval = $this->yyastk[$this->yysp-(3-2)]; + } + protected function yyn325($line, $docComment) { $this->yyval = $this->yyastk[$this->yysp-(1-1)]; } protected function yyn326($line, $docComment) { - $this->yyval = $this->yyastk[$this->yysp-(3-2)]; + $this->yyastk[$this->yysp-(3-1)][] = $this->yyastk[$this->yysp-(3-3)]; $this->yyval = $this->yyastk[$this->yysp-(3-1)]; } protected function yyn327($line, $docComment) { - $this->yyval = $this->yyastk[$this->yysp-(1-1)]; + $this->yyval = array($this->yyastk[$this->yysp-(1-1)]); } protected function yyn328($line, $docComment) { - $this->yyastk[$this->yysp-(3-1)][] = $this->yyastk[$this->yysp-(3-3)]; $this->yyval = $this->yyastk[$this->yysp-(3-1)]; - } - - protected function yyn329($line, $docComment) { - $this->yyval = array($this->yyastk[$this->yysp-(1-1)]); - } - - protected function yyn330($line, $docComment) { $this->yyval = $this->yyastk[$this->yysp-(1-1)]; } - protected function yyn331($line, $docComment) { + protected function yyn329($line, $docComment) { $this->yyval = $this->yyastk[$this->yysp-(4-3)]; } - protected function yyn332($line, $docComment) { + protected function yyn330($line, $docComment) { $this->yyval = null; } - protected function yyn333($line, $docComment) { + protected function yyn331($line, $docComment) { $this->yyval = array(); } - protected function yyn334($line, $docComment) { + protected function yyn332($line, $docComment) { $this->yyval = $this->yyastk[$this->yysp-(2-1)]; } - protected function yyn335($line, $docComment) { + protected function yyn333($line, $docComment) { $this->yyastk[$this->yysp-(3-1)][] = $this->yyastk[$this->yysp-(3-3)]; $this->yyval = $this->yyastk[$this->yysp-(3-1)]; } - protected function yyn336($line, $docComment) { + protected function yyn334($line, $docComment) { $this->yyval = array($this->yyastk[$this->yysp-(1-1)]); } - protected function yyn337($line, $docComment) { + protected function yyn335($line, $docComment) { $this->yyval = new PHPParser_Node_Expr_ArrayItem($this->yyastk[$this->yysp-(3-3)], $this->yyastk[$this->yysp-(3-1)], false, $line, $docComment); } - protected function yyn338($line, $docComment) { + protected function yyn336($line, $docComment) { $this->yyval = new PHPParser_Node_Expr_ArrayItem($this->yyastk[$this->yysp-(1-1)], null, false, $line, $docComment); } - protected function yyn339($line, $docComment) { + protected function yyn337($line, $docComment) { $this->yyval = new PHPParser_Node_Expr_ArrayItem($this->yyastk[$this->yysp-(4-4)], $this->yyastk[$this->yysp-(4-1)], true, $line, $docComment); } - protected function yyn340($line, $docComment) { + protected function yyn338($line, $docComment) { $this->yyval = new PHPParser_Node_Expr_ArrayItem($this->yyastk[$this->yysp-(2-2)], null, true, $line, $docComment); } + protected function yyn339($line, $docComment) { + $this->yyastk[$this->yysp-(2-1)][] = $this->yyastk[$this->yysp-(2-2)]; $this->yyval = $this->yyastk[$this->yysp-(2-1)]; + } + + protected function yyn340($line, $docComment) { + $this->yyastk[$this->yysp-(2-1)][] = $this->yyastk[$this->yysp-(2-2)]; $this->yyval = $this->yyastk[$this->yysp-(2-1)]; + } + protected function yyn341($line, $docComment) { - $this->yyastk[$this->yysp-(2-1)][] = $this->yyastk[$this->yysp-(2-2)]; $this->yyval = $this->yyastk[$this->yysp-(2-1)]; - } - - protected function yyn342($line, $docComment) { - $this->yyastk[$this->yysp-(2-1)][] = $this->yyastk[$this->yysp-(2-2)]; $this->yyval = $this->yyastk[$this->yysp-(2-1)]; - } - - protected function yyn343($line, $docComment) { $this->yyval = array($this->yyastk[$this->yysp-(1-1)]); } - protected function yyn344($line, $docComment) { + protected function yyn342($line, $docComment) { $this->yyval = array($this->yyastk[$this->yysp-(2-1)], $this->yyastk[$this->yysp-(2-2)]); } - protected function yyn345($line, $docComment) { + protected function yyn343($line, $docComment) { $this->yyval = new PHPParser_Node_Expr_Variable(substr($this->yyastk[$this->yysp-(1-1)], 1), $line, $docComment); } - protected function yyn346($line, $docComment) { + protected function yyn344($line, $docComment) { $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch(new PHPParser_Node_Expr_Variable(substr($this->yyastk[$this->yysp-(4-1)], 1), $line, $docComment), $this->yyastk[$this->yysp-(4-3)], $line, $docComment); } - protected function yyn347($line, $docComment) { + protected function yyn345($line, $docComment) { $this->yyval = new PHPParser_Node_Expr_PropertyFetch(new PHPParser_Node_Expr_Variable(substr($this->yyastk[$this->yysp-(3-1)], 1), $line, $docComment), $this->yyastk[$this->yysp-(3-3)], $line, $docComment); } - protected function yyn348($line, $docComment) { + protected function yyn346($line, $docComment) { $this->yyval = new PHPParser_Node_Expr_Variable($this->yyastk[$this->yysp-(3-2)], $line, $docComment); } - protected function yyn349($line, $docComment) { + protected function yyn347($line, $docComment) { $this->yyval = new PHPParser_Node_Expr_ArrayDimFetch(new PHPParser_Node_Expr_Variable($this->yyastk[$this->yysp-(6-2)], $line, $docComment), $this->yyastk[$this->yysp-(6-4)], $line, $docComment); } - protected function yyn350($line, $docComment) { + protected function yyn348($line, $docComment) { $this->yyval = $this->yyastk[$this->yysp-(3-2)]; } - protected function yyn351($line, $docComment) { + protected function yyn349($line, $docComment) { $this->yyval = new PHPParser_Node_Scalar_String($this->yyastk[$this->yysp-(1-1)], $line, $docComment); } - protected function yyn352($line, $docComment) { + protected function yyn350($line, $docComment) { $this->yyval = new PHPParser_Node_Scalar_LNumber((int) $this->yyastk[$this->yysp-(1-1)], $line, $docComment); } - protected function yyn353($line, $docComment) { + protected function yyn351($line, $docComment) { $this->yyval = new PHPParser_Node_Expr_Variable(substr($this->yyastk[$this->yysp-(1-1)], 1), $line, $docComment); } - - protected function yyn354($line, $docComment) { - $this->yyval = new PHPParser_Node_Expr_ClassConstFetch($this->yyastk[$this->yysp-(3-1)], $this->yyastk[$this->yysp-(3-3)], $line, $docComment); - } - - protected function yyn355($line, $docComment) { - $this->yyval = new PHPParser_Node_Expr_ClassConstFetch($this->yyastk[$this->yysp-(3-1)], $this->yyastk[$this->yysp-(3-3)], $line, $docComment); - } } diff --git a/lib/PHPParser/Parser/Debug.php b/lib/PHPParser/Parser/Debug.php index ecce3fd..01f3074 100644 --- a/lib/PHPParser/Parser/Debug.php +++ b/lib/PHPParser/Parser/Debug.php @@ -246,8 +246,7 @@ class PHPParser_Parser_Debug extends PHPParser_Parser "lexical_var_list : lexical_var_list ',' optional_ref T_VARIABLE", "lexical_var_list : optional_ref T_VARIABLE", "function_call : name '(' function_call_argument_list ')'", - "function_call : class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING '(' function_call_argument_list ')'", - "function_call : reference_variable T_PAAMAYIM_NEKUDOTAYIM T_STRING '(' function_call_argument_list ')'", + "function_call : class_name_or_var T_PAAMAYIM_NEKUDOTAYIM T_STRING '(' function_call_argument_list ')'", "function_call : static_property '(' function_call_argument_list ')'", "function_call : variable_without_objects '(' function_call_argument_list ')'", "class_name : T_STATIC", @@ -259,6 +258,8 @@ class PHPParser_Parser_Debug extends PHPParser_Parser "class_name_reference : dynamic_class_name_reference", "dynamic_class_name_reference : object_access_for_dcnr", "dynamic_class_name_reference : base_variable", + "class_name_or_var : class_name", + "class_name_or_var : reference_variable", "object_access_for_dcnr : /* empty */", "object_access_for_dcnr : base_variable T_OBJECT_OPERATOR object_property", "object_access_for_dcnr : object_access_for_dcnr T_OBJECT_OPERATOR object_property", @@ -292,7 +293,7 @@ class PHPParser_Parser_Debug extends PHPParser_Parser "static_scalar : '[' static_array_pair_list ']'", "static_scalar : class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING", "scalar : T_STRING_VARNAME", - "scalar : class_constant", + "scalar : class_name_or_var T_PAAMAYIM_NEKUDOTAYIM T_STRING", "scalar : name", "scalar : common_scalar", "scalar : '\"' encaps_list '\"'", @@ -317,13 +318,10 @@ class PHPParser_Parser_Debug extends PHPParser_Parser "variable_without_objects : '$' variable_without_objects", "base_variable : variable_without_objects", "base_variable : static_property", - "static_property : class_name T_PAAMAYIM_NEKUDOTAYIM '$' reference_variable", - "static_property : reference_variable T_PAAMAYIM_NEKUDOTAYIM '$' reference_variable", + "static_property : class_name_or_var T_PAAMAYIM_NEKUDOTAYIM '$' reference_variable", "static_property : static_property_with_arrays", - "static_property_with_arrays : class_name T_PAAMAYIM_NEKUDOTAYIM T_VARIABLE", - "static_property_with_arrays : reference_variable T_PAAMAYIM_NEKUDOTAYIM T_VARIABLE", - "static_property_with_arrays : class_name T_PAAMAYIM_NEKUDOTAYIM '$' '{' expr '}'", - "static_property_with_arrays : reference_variable T_PAAMAYIM_NEKUDOTAYIM '$' '{' expr '}'", + "static_property_with_arrays : class_name_or_var T_PAAMAYIM_NEKUDOTAYIM T_VARIABLE", + "static_property_with_arrays : class_name_or_var T_PAAMAYIM_NEKUDOTAYIM '$' '{' expr '}'", "static_property_with_arrays : static_property_with_arrays '[' dim_offset ']'", "static_property_with_arrays : static_property_with_arrays '{' expr '}'", "reference_variable : reference_variable '[' dim_offset ']'", @@ -360,9 +358,7 @@ class PHPParser_Parser_Debug extends PHPParser_Parser "encaps_var : T_CURLY_OPEN variable '}'", "encaps_var_offset : T_STRING", "encaps_var_offset : T_NUM_STRING", - "encaps_var_offset : T_VARIABLE", - "class_constant : class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING", - "class_constant : reference_variable T_PAAMAYIM_NEKUDOTAYIM T_STRING" + "encaps_var_offset : T_VARIABLE" ); protected function yyprintln($msg) {