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