maride/php-parser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ctor_arguments argument_list returns []node.Node

Browse Source
This commit is contained in:
z7zmey 2017-12-18 21:43:53 +02:00
parent 2c6664bdc9
commit 5b54987ddc
2 changed files with 112 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

194
parser/parser.go
View File

@ -604,13 +604,13 @@ var yyAct = [...]int{
807, 197, 199, 198, 332, 607, 795, 610, 608, 308, 807, 197, 199, 198, 332, 607, 795, 610, 608, 308,
766, 718, 669, 279, 280, 642, 817, 633, 628, 785, 766, 718, 669, 279, 280, 642, 817, 633, 628, 785,
229, 564, 812, 824, 810, 825, 554, 118, 231, 409, 229, 564, 812, 824, 810, 825, 554, 118, 231, 409,
1, 831, 221, 519, 659, 544, 255, 256, 835, 803, 1, 831, 529, 221, 659, 544, 255, 256, 519, 803,
842, 365, 804, 830, 848, 813, 578, 846, 833, 651, 842, 835, 365, 830, 804, 813, 578, 846, 833, 848,
855, 144, 841, 687, 688, 689, 686, 685, 684, 748, 855, 651, 841, 687, 688, 689, 686, 685, 684, 144,
864, 854, 167, 168, 161, 162, 160, 163, 165, 166, 864, 854, 167, 168, 161, 162, 160, 163, 165, 166,
863, 178, 141, 321, 872, 148, 873, 800, 868, 666, 863, 178, 748, 141, 872, 321, 873, 148, 868, 800,
877, 829, 250, 164, 861, 37, 879, 681, 679, 678, 877, 666, 829, 164, 861, 250, 879, 37, 681, 679,
223, 42, 855, 912, 782, 878, 529, 570, 882, 41, 678, 223, 855, 42, 782, 878, 912, 570, 882, 41,
15, 14, 606, 854, 888, 889, 266, 48, 890, 87, 15, 14, 606, 854, 888, 889, 266, 48, 890, 87,
88, 89, 90, 91, 47, 107, 49, 82, 73, 74, 88, 89, 90, 91, 47, 107, 49, 82, 73, 74,
80, 75, 71, 247, 896, 893, 61, 264, 897, 60, 80, 75, 71, 247, 896, 893, 61, 264, 897, 60,
@ -1371,12 +1371,12 @@ var yyPgo = [...]int{
904, 9, 903, 902, 896, 894, 13, 48, 889, 887, 904, 9, 903, 902, 896, 894, 13, 48, 889, 887,
111, 98, 197, 886, 883, 882, 8, 880, 81, 43, 111, 98, 197, 886, 883, 882, 8, 880, 81, 43,
877, 55, 47, 876, 875, 874, 867, 866, 97, 862, 877, 55, 47, 876, 875, 874, 867, 866, 97, 862,
103, 1, 861, 860, 7, 19, 38, 859, 857, 83, 103, 1, 861, 860, 7, 19, 38, 859, 857, 10,
856, 10, 4, 853, 86, 851, 850, 42, 32, 41, 4, 856, 853, 851, 42, 32, 41, 2, 16, 850,
2, 16, 849, 848, 847, 5, 775, 845, 670, 842, 849, 848, 5, 775, 847, 670, 845, 28, 842, 841,
28, 841, 839, 837, 90, 835, 31, 833, 832, 25, 839, 90, 837, 31, 835, 833, 25, 29, 832, 819,
29, 819, 811, 809, 24, 804, 802, 801, 549, 798, 811, 24, 809, 804, 802, 549, 801, 18, 798, 793,
18, 793, 792, 44, 790, 37, 12, 44, 86, 83, 792, 790, 37, 12,
} }
var yyR1 = [...]int{ var yyR1 = [...]int{
@ -1388,27 +1388,27 @@ var yyR1 = [...]int{
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6,
6, 6, 6, 6, 6, 6, 7, 7, 70, 70, 6, 6, 6, 6, 6, 6, 7, 7, 70, 70,
100, 100, 9, 9, 9, 8, 8, 8, 8, 8, 97, 97, 9, 9, 9, 8, 8, 8, 8, 8,
8, 8, 8, 8, 8, 8, 8, 8, 8, 96, 8, 8, 8, 8, 8, 8, 8, 8, 8, 93,
96, 16, 16, 18, 18, 125, 125, 110, 110, 109, 93, 16, 16, 18, 18, 125, 125, 107, 107, 106,
109, 118, 118, 17, 17, 20, 20, 19, 19, 104, 106, 115, 115, 17, 17, 20, 20, 19, 19, 101,
104, 71, 71, 22, 22, 22, 22, 22, 22, 10, 101, 71, 71, 22, 22, 22, 22, 22, 22, 10,
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
10, 10, 10, 102, 102, 101, 101, 30, 30, 117, 10, 10, 10, 99, 99, 98, 98, 30, 30, 114,
117, 31, 11, 1, 1, 2, 2, 12, 12, 97, 114, 31, 11, 1, 1, 2, 2, 12, 12, 94,
97, 4, 4, 13, 14, 33, 33, 15, 15, 76, 94, 4, 4, 13, 14, 33, 33, 15, 15, 76,
76, 27, 27, 27, 27, 26, 26, 28, 28, 29, 76, 27, 27, 27, 27, 26, 26, 28, 28, 29,
29, 113, 113, 113, 113, 114, 114, 114, 126, 126, 29, 110, 110, 110, 110, 111, 111, 111, 126, 126,
25, 25, 77, 77, 72, 72, 85, 85, 73, 73, 25, 25, 77, 77, 72, 72, 82, 82, 73, 73,
74, 74, 78, 78, 34, 34, 35, 35, 91, 91, 74, 74, 78, 78, 34, 34, 35, 35, 88, 88,
89, 89, 89, 90, 90, 79, 79, 80, 80, 36, 86, 86, 86, 87, 87, 122, 122, 123, 123, 36,
36, 108, 108, 38, 112, 112, 39, 39, 75, 75, 36, 105, 105, 38, 109, 109, 39, 39, 75, 75,
40, 40, 40, 40, 82, 82, 116, 116, 116, 115, 40, 40, 40, 40, 80, 80, 113, 113, 113, 112,
115, 41, 41, 42, 43, 43, 43, 43, 45, 45, 112, 41, 41, 42, 43, 43, 43, 43, 45, 45,
44, 83, 83, 92, 92, 93, 93, 94, 94, 95, 44, 81, 81, 89, 89, 90, 90, 91, 91, 92,
95, 95, 95, 95, 95, 111, 111, 46, 46, 103, 92, 92, 92, 92, 92, 108, 108, 46, 46, 100,
103, 81, 21, 105, 105, 47, 106, 106, 107, 107, 100, 79, 21, 102, 102, 47, 103, 103, 104, 104,
49, 48, 48, 37, 37, 37, 37, 37, 37, 37, 49, 48, 48, 37, 37, 37, 37, 37, 37, 37,
37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
@ -1417,18 +1417,18 @@ var yyR1 = [...]int{
37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
37, 37, 37, 37, 37, 37, 37, 37, 37, 3, 37, 37, 37, 37, 37, 37, 37, 37, 37, 3,
3, 120, 120, 119, 119, 56, 56, 57, 57, 57, 3, 117, 117, 116, 116, 56, 56, 57, 57, 57,
57, 50, 50, 51, 51, 54, 54, 99, 99, 99, 57, 50, 50, 51, 51, 54, 54, 96, 96, 96,
84, 84, 61, 61, 61, 55, 55, 55, 55, 55, 121, 121, 61, 61, 61, 55, 55, 55, 55, 55,
55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
55, 62, 62, 62, 23, 23, 24, 24, 60, 63, 55, 62, 62, 62, 23, 23, 24, 24, 60, 63,
63, 63, 64, 64, 64, 65, 65, 65, 65, 65, 63, 63, 64, 64, 64, 65, 65, 65, 65, 65,
65, 32, 32, 32, 52, 52, 52, 66, 66, 67, 65, 32, 32, 32, 52, 52, 52, 66, 66, 67,
67, 67, 67, 67, 67, 58, 58, 58, 59, 59, 67, 67, 67, 67, 67, 58, 58, 58, 59, 59,
59, 123, 87, 87, 122, 122, 86, 86, 86, 86, 59, 120, 84, 84, 119, 119, 83, 83, 83, 83,
86, 86, 98, 98, 98, 98, 68, 68, 68, 68, 83, 83, 95, 95, 95, 95, 68, 68, 68, 68,
68, 68, 68, 69, 69, 69, 69, 53, 53, 53, 68, 68, 68, 69, 69, 69, 69, 53, 53, 53,
53, 53, 53, 53, 121, 121, 88, 53, 53, 53, 53, 118, 118, 85,
} }
var yyR2 = [...]int{ var yyR2 = [...]int{
@ -1487,18 +1487,18 @@ var yyChk = [...]int{
-1000, -124, -70, -8, -10, -11, -12, -13, -14, 127, -1000, -124, -70, -8, -10, -11, -12, -13, -14, 127,
154, 120, 114, 161, -72, -73, 97, 96, 99, 106, 154, 120, 114, 161, -72, -73, 97, 96, 99, 106,
110, 111, 115, 122, 76, 95, 90, -23, 124, 101, 110, 111, 115, 122, 76, 95, 90, -23, 124, 101,
103, 163, 116, 119, 112, 86, 113, -97, 128, 129, 103, 163, 116, 119, 112, 86, 113, -94, 128, 129,
130, -77, -85, -32, -37, -4, 83, -65, -66, -63, 130, -77, -82, -32, -37, -4, 83, -65, -66, -63,
134, 69, 71, 58, 59, 49, 50, 55, 57, 164, 134, 69, 71, 58, 59, 49, 50, 55, 57, 164,
-48, -53, 60, 61, 62, 63, 64, 65, 66, 82, -48, -53, 60, 61, 62, 63, 64, 65, 66, 82,
67, -55, 160, 13, 14, 16, 77, 78, -52, -62, 67, -55, 160, 13, 14, 16, 77, 78, -52, -62,
-57, -50, -60, -61, 70, 125, 126, 4, 5, 6, -57, -50, -60, -61, 70, 125, 126, 4, 5, 6,
7, 8, 84, 85, 141, 142, 156, 138, 139, 140, 7, 8, 84, 85, 141, 142, 156, 138, 139, 140,
155, 137, 149, 159, 88, 167, -9, -64, 135, 94, 155, 137, 149, 159, 88, 167, -9, -64, 135, 94,
-100, 157, 164, 157, -100, 161, 86, -18, -96, -118, -97, 157, 164, 157, -97, 161, 86, -18, -93, -115,
-100, 157, 113, 114, -19, -20, -104, -21, 86, -71, -97, 157, 113, 114, -19, -20, -101, -21, 86, -71,
164, -10, 113, 154, 164, 164, -24, -23, 76, -24, 164, -10, 113, 154, 164, 164, -24, -23, 76, -24,
-24, -108, -38, -52, -112, 113, -39, 88, -105, -47, -24, -105, -38, -52, -109, 113, -39, 88, -102, -47,
-23, 163, 33, 34, 10, 12, 11, 35, 37, 36, -23, 163, 33, 34, 10, 12, 11, 35, 37, 36,
51, 49, 50, 52, 68, 53, 54, 47, 48, 40, 51, 49, 50, 52, 68, 53, 54, 47, 48, 40,
41, 38, 39, 43, 44, 45, 46, 42, 56, 30, 41, 38, 39, 43, 44, 45, 46, 42, 56, 30,
@ -1506,26 +1506,26 @@ var yyChk = [...]int{
128, -4, 86, 86, 86, 73, 74, 73, 75, 74, 128, -4, 86, 86, 86, 73, 74, 73, 75, 74,
17, 18, 19, 20, 29, 21, 22, 23, 24, 25, 17, 18, 19, 20, 29, 21, 22, 23, 24, 25,
26, 27, 28, 58, 59, 164, 69, 161, 133, 164, 26, 27, 28, 58, 59, 164, 69, 161, 133, 164,
-123, -122, -87, -86, -23, 37, 134, -23, -32, -62, -120, -119, -84, -83, -23, 37, 134, -23, -32, -62,
164, -61, 76, 69, -32, -23, -23, -23, -23, -23, 164, -61, 76, 69, -32, -23, -23, -23, -23, -23,
-23, -23, -23, -23, -23, -23, -23, -54, 164, -23, -23, -23, -23, -23, -23, -23, -23, -54, 164, -23,
-99, 93, -98, -68, 88, 151, 152, -23, -23, -23, -96, 93, -95, -68, 88, 151, 152, -23, -23, -23,
69, 153, 153, -51, -49, -50, -67, 128, -9, -52, 69, 153, 153, -51, -49, -50, -67, 128, -9, -52,
164, 164, -23, -23, 164, -23, -23, 93, 150, -98, 164, 164, -23, -23, 164, -23, -23, 93, 150, -95,
-98, 93, 161, -52, -79, 164, -79, 164, 157, -100, -95, 93, 161, -52, -122, 164, -122, 164, 157, -97,
165, -100, 163, 161, -70, 163, -16, -118, -100, 157, 165, -97, 163, 161, -70, 163, -16, -115, -97, 157,
163, 9, 157, 105, -100, -20, 163, 9, 17, -22, 163, 9, 157, 105, -97, -20, 163, 9, 17, -22,
162, -10, -11, -12, -13, -14, 127, -23, 97, -3, 162, -10, -11, -12, -13, -14, 127, -23, 97, -3,
-106, -107, -23, -23, 163, 163, 163, 163, 9, 163, -103, -104, -23, -23, 163, 163, 163, 163, 9, 163,
9, -3, 17, 163, 9, -23, -23, -23, -23, -23, 9, -3, 17, 163, 9, -23, -23, -23, -23, -23,
-23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23,
-23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23,
-23, -51, -23, 31, -23, -117, -31, -32, -23, -104, -23, -51, -23, 31, -23, -114, -31, -32, -23, -101,
-71, 163, 163, 86, 164, 86, -33, 131, 161, -15, -71, 163, 163, 86, 164, 86, -33, 131, 161, -15,
131, 164, -10, 164, 163, 31, -23, 37, -23, -23, 131, 164, -10, 164, 163, 31, -23, 37, -23, -23,
-23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23,
-23, -24, -23, -59, 86, 161, -52, -123, 166, 9, -23, -24, -23, -59, 86, 161, -52, -120, 166, 9,
15, -32, 164, -23, -123, 165, -24, 160, -68, -68, 15, -32, 164, -23, -120, 165, -24, 160, -68, -68,
93, 69, 133, -23, 87, -32, 15, -24, -58, -7, 93, 69, 133, -23, 87, -32, 15, -24, -58, -7,
-52, 161, 86, -6, -5, 76, 77, 78, 79, 80, -52, 161, 86, -6, -5, 76, 77, 78, 79, 80,
81, 4, 5, 6, 7, 8, 10, 11, 12, 56, 81, 4, 5, 6, 7, 8, 10, 11, 12, 56,
@ -1535,47 +1535,47 @@ var yyChk = [...]int{
112, 113, 114, 115, 13, 14, 134, 106, 107, 108, 112, 113, 114, 115, 13, 14, 134, 106, 107, 108,
109, 110, 135, 136, 131, 132, 154, 129, 130, 128, 109, 110, 135, 136, 131, 132, 154, 129, 130, 128,
137, 138, 140, 139, 141, 142, 156, 155, -58, -7, 137, 138, 140, 139, 141, 142, 156, 155, -58, -7,
-52, -84, -79, 153, 69, 161, 133, 153, -84, -121, -52, -121, -122, 153, 69, 161, 133, 153, -121, -118,
-88, -23, -23, -23, 150, 150, 159, -23, 165, -80, -85, -23, -23, -23, 150, 150, 159, -23, 165, -123,
-36, -23, 158, -123, 86, 163, -70, 162, 163, 163, -36, -23, 158, -120, 86, 163, -70, 162, 163, 163,
157, -100, -19, 157, -100, 161, 86, 157, -21, -23, 157, -97, -19, 157, -97, 161, 86, 157, -21, -23,
164, 165, 164, 163, 9, 165, -38, -39, 164, -23, 164, 165, 164, 163, 9, 165, -38, -39, 164, -23,
-47, 31, -23, -125, 9, 105, 165, 162, 164, -74, -47, 31, -23, -125, 9, 105, 165, 162, 164, -74,
-78, -34, -35, -91, -89, 30, 135, 136, -9, -33, -78, -34, -35, -88, -86, 30, 135, 136, -9, -33,
-76, 132, -9, -75, 161, -82, -9, -23, -23, -71, -76, 132, -9, -75, 161, -80, -9, -23, -23, -71,
-23, 165, 166, 162, -79, -23, 165, 17, -87, -23, -23, 165, 166, 162, -122, -23, 165, 17, -84, -23,
37, 134, -123, 165, 166, 165, -69, 86, 89, 50, 37, 134, -120, 165, 166, 165, -69, 86, 89, 50,
88, 86, 162, 162, 69, 162, -23, 166, -79, -23, 88, 86, 162, 162, 69, 162, -23, 166, -122, -23,
-79, -52, -24, -23, -59, -52, -33, -125, 9, 165, -122, -52, -24, -23, -59, -52, -33, -125, 9, 165,
165, 162, -125, 9, -23, 165, 162, 161, 157, -110, 165, 162, -125, 9, -23, 165, 162, 161, 157, -107,
-17, -20, -96, 161, 165, -25, -10, 31, -23, -106, -17, -20, -93, 161, 165, -25, -10, 31, -23, -103,
-23, -113, 161, 31, -74, -23, 165, -31, -27, -32, -23, -110, 161, 31, -74, -23, 165, -31, -27, -32,
37, 134, 69, -29, -10, 31, -102, -74, 165, 9, 37, 134, 69, -29, -10, 31, -99, -74, 165, 9,
-1, 37, -89, -76, 161, -82, 162, -40, -92, -93, -1, 37, -86, -76, 161, -80, 162, -40, -89, -90,
120, -94, 123, -95, 81, 80, 79, 76, 77, 78, 120, -91, 123, -92, 81, 80, 79, 76, 77, 78,
-75, 9, 165, 165, 75, -10, 31, 162, 17, -23, -75, 9, 165, 165, 75, -10, 31, 162, 17, -23,
-32, 164, 165, 166, 89, -23, 162, 166, 162, -76, -32, 164, 165, 166, 89, -23, 162, 166, 162, -76,
165, -88, 165, -36, -109, -20, 161, -125, 9, -20, 165, -85, 165, -36, -106, -20, 161, -125, 9, -20,
-110, 163, -71, 165, 163, -114, 163, -114, 163, 165, -107, 163, -71, 165, 163, -111, 163, -111, 163, 165,
163, 165, 15, -32, 164, -123, -71, -30, 117, 118, 163, 165, 15, -32, 164, -120, -71, -30, 117, 118,
165, -120, 120, -34, -2, 158, 161, -75, -111, -46, 165, -117, 120, -34, -2, 158, 161, -75, -108, -46,
88, 114, 113, -82, -95, 162, -9, -10, 31, 163, 88, 114, 113, -80, -92, 162, -9, -10, 31, 163,
-71, -23, -123, 166, 161, -125, 9, -109, 162, -17, -71, -23, -120, 166, 161, -125, 9, -106, 162, -17,
-125, 98, 163, -106, 162, 108, 109, -114, 107, -114, -125, 98, 163, -103, 162, 108, 109, -111, 107, -111,
-120, -28, -10, 31, -27, -123, 166, 104, 164, 161, -117, -28, -10, 31, -27, -120, 166, 104, 164, 161,
-90, 31, -90, 164, 88, -75, 162, 163, 9, 17, -87, 31, -87, 164, 88, -75, 162, 163, 9, 17,
-103, -81, -7, -3, -116, 163, 161, -71, 165, 162, -100, -79, -7, -3, -113, 163, 161, -71, 165, 162,
-75, 162, -20, -125, 162, 163, 165, -23, -126, 31, -75, 162, -20, -125, 162, 163, 165, -23, -126, 31,
163, 162, 163, 107, -90, -71, 165, 165, 163, -101, 163, 162, 163, 107, -87, -71, 165, 165, 163, -98,
-9, -71, 161, -91, 161, -119, -56, 88, 37, 17, -9, -71, 161, -88, 161, -116, -56, 88, 37, 17,
162, -46, -23, 163, 9, 17, -7, 162, -115, -41, 162, -46, -23, 163, 9, 17, -7, 162, -112, -41,
-42, -43, -44, -45, -9, -7, 154, 86, 162, 162, -42, -43, -44, -45, -9, -7, 154, 86, 162, 162,
-26, -10, 31, -126, -71, 163, 161, 102, -28, 88, -26, -10, 31, -126, -71, 163, 161, 102, -28, 88,
35, 162, -71, -71, 165, 9, 88, -23, -81, -23, 35, 162, -71, -71, 165, 9, 88, -23, -79, -23,
164, 162, -41, 163, 163, 121, 105, 153, -71, -71, 164, 162, -41, 163, 163, 121, 105, 153, -71, -71,
-71, 163, 165, -9, 162, 162, -56, -74, -82, 86, -71, 163, 165, -9, 162, 162, -56, -74, -80, 86,
-5, -95, -7, 100, 162, 161, 165, -7, 163, -71, -5, -92, -7, 100, 162, 161, 165, -7, 163, -71,
-90, 162, -83, 163, 161, -71, 162, -87, 162, -81, 163, 161, -71, 162,
} }
var yyDef = [...]int{ var yyDef = [...]int{
@ -3388,25 +3388,25 @@ yydefault:
yyDollar = yyS[yypt-2 : yypt+1] yyDollar = yyS[yypt-2 : yypt+1]
//line parser/parser.y:638 //line parser/parser.y:638
{ {
yyVAL.node = node.NewSimpleNode("ArgumentList") yyVAL.list = []node.Node{}
} }
case 226: case 226:
yyDollar = yyS[yypt-4 : yypt+1] yyDollar = yyS[yypt-4 : yypt+1]
//line parser/parser.y:639 //line parser/parser.y:639
{ {
yyVAL.node = yyDollar[2].node yyVAL.list = yyDollar[2].list
} }
case 227: case 227:
yyDollar = yyS[yypt-1 : yypt+1] yyDollar = yyS[yypt-1 : yypt+1]
//line parser/parser.y:643 //line parser/parser.y:643
{ {
yyVAL.node = node.NewSimpleNode("ArgumentList").Append(yyDollar[1].node) yyVAL.list = []node.Node{yyDollar[1].node}
} }
case 228: case 228:
yyDollar = yyS[yypt-3 : yypt+1] yyDollar = yyS[yypt-3 : yypt+1]
//line parser/parser.y:644 //line parser/parser.y:644
{ {
yyVAL.node = yyDollar[1].node.Append(yyDollar[3].node) yyVAL.list = append(yyDollar[1].list, yyDollar[3].node)
} }
case 229: case 229:
yyDollar = yyS[yypt-1 : yypt+1] yyDollar = yyS[yypt-1 : yypt+1]
@ -3780,14 +3780,14 @@ yydefault:
//line parser/parser.y:805 //line parser/parser.y:805
{ {
{ {
yyVAL.node = stmt.NewClass(yyDollar[1].token, nil, yyDollar[2].node.(node.SimpleNode).Children, yyDollar[3].node, yyDollar[4].node.(node.SimpleNode).Children, yyDollar[6].node.(node.SimpleNode).Children) yyVAL.node = stmt.NewClass(yyDollar[1].token, nil, yyDollar[2].list, yyDollar[3].node, yyDollar[4].node.(node.SimpleNode).Children, yyDollar[6].node.(node.SimpleNode).Children)
} }
} }
case 291: case 291:
yyDollar = yyS[yypt-3 : yypt+1] yyDollar = yyS[yypt-3 : yypt+1]
//line parser/parser.y:811 //line parser/parser.y:811
{ {
yyVAL.node = expr.NewNew(yyDollar[2].node, yyDollar[3].node.(node.SimpleNode).Children) yyVAL.node = expr.NewNew(yyDollar[2].node, yyDollar[3].list)
} }
case 292: case 292:
yyDollar = yyS[yypt-2 : yypt+1] yyDollar = yyS[yypt-2 : yypt+1]
@ -4305,25 +4305,25 @@ yydefault:
yyDollar = yyS[yypt-2 : yypt+1] yyDollar = yyS[yypt-2 : yypt+1]
//line parser/parser.y:929 //line parser/parser.y:929
{ {
yyVAL.node = expr.NewFunctionCall(yyDollar[1].node, yyDollar[2].node.(node.SimpleNode).Children) yyVAL.node = expr.NewFunctionCall(yyDollar[1].node, yyDollar[2].list)
} }
case 378: case 378:
yyDollar = yyS[yypt-4 : yypt+1] yyDollar = yyS[yypt-4 : yypt+1]
//line parser/parser.y:931 //line parser/parser.y:931
{ {
yyVAL.node = expr.NewStaticCall(yyDollar[1].node, yyDollar[3].node, yyDollar[4].node.(node.SimpleNode).Children) yyVAL.node = expr.NewStaticCall(yyDollar[1].node, yyDollar[3].node, yyDollar[4].list)
} }
case 379: case 379:
yyDollar = yyS[yypt-4 : yypt+1] yyDollar = yyS[yypt-4 : yypt+1]
//line parser/parser.y:933 //line parser/parser.y:933
{ {
yyVAL.node = expr.NewStaticCall(yyDollar[1].node, yyDollar[3].node, yyDollar[4].node.(node.SimpleNode).Children) yyVAL.node = expr.NewStaticCall(yyDollar[1].node, yyDollar[3].node, yyDollar[4].list)
} }
case 380: case 380:
yyDollar = yyS[yypt-2 : yypt+1] yyDollar = yyS[yypt-2 : yypt+1]
//line parser/parser.y:934 //line parser/parser.y:934
{ {
yyVAL.node = expr.NewFunctionCall(yyDollar[1].node, yyDollar[2].node.(node.SimpleNode).Children) yyVAL.node = expr.NewFunctionCall(yyDollar[1].node, yyDollar[2].list)
} }
case 381: case 381:
yyDollar = yyS[yypt-1 : yypt+1] yyDollar = yyS[yypt-1 : yypt+1]
@ -4383,13 +4383,13 @@ yydefault:
yyDollar = yyS[yypt-0 : yypt+1] yyDollar = yyS[yypt-0 : yypt+1]
//line parser/parser.y:959 //line parser/parser.y:959
{ {
yyVAL.node = node.NewSimpleNode("ArgumentList") yyVAL.list = nil
} }
case 391: case 391:
yyDollar = yyS[yypt-1 : yypt+1] yyDollar = yyS[yypt-1 : yypt+1]
//line parser/parser.y:960 //line parser/parser.y:960
{ {
yyVAL.node = yyDollar[1].node yyVAL.list = yyDollar[1].list
} }
case 392: case 392:
yyDollar = yyS[yypt-4 : yypt+1] yyDollar = yyS[yypt-4 : yypt+1]
@ -4617,7 +4617,7 @@ yydefault:
yyDollar = yyS[yypt-4 : yypt+1] yyDollar = yyS[yypt-4 : yypt+1]
//line parser/parser.y:1029 //line parser/parser.y:1029
{ {
yyVAL.node = expr.NewMethodCall(yyDollar[1].node, yyDollar[3].node, yyDollar[4].node.(node.SimpleNode).Children) yyVAL.node = expr.NewMethodCall(yyDollar[1].node, yyDollar[3].node, yyDollar[4].list)
} }
case 430: case 430:
yyDollar = yyS[yypt-1 : yypt+1] yyDollar = yyS[yypt-1 : yypt+1]

30
parser/parser.y
View File

@ -211,9 +211,9 @@ func Parse(src io.Reader, fName string) node.Node {
%type <node> alt_if_stmt %type <node> alt_if_stmt
%type <node> parameter_list class_statement_list %type <node> parameter_list class_statement_list
%type <node> implements_list if_stmt_without_else %type <node> implements_list if_stmt_without_else
%type <node> non_empty_parameter_list argument_list non_empty_argument_list %type <node> non_empty_parameter_list
%type <node> class_const_decl name_list method_body %type <node> class_const_decl name_list method_body
%type <node> ctor_arguments alt_if_stmt_without_else %type <node> alt_if_stmt_without_else
%type <node> array_pair possible_array_pair %type <node> array_pair possible_array_pair
%type <node> isset_variable type return_type type_expr %type <node> isset_variable type return_type type_expr
@ -227,7 +227,7 @@ func Parse(src io.Reader, fName string) node.Node {
%type <list> unprefixed_use_declarations inline_use_declarations property_list static_var_list %type <list> unprefixed_use_declarations inline_use_declarations property_list static_var_list
%type <list> switch_case_list case_list trait_adaptation_list trait_adaptations unset_variables %type <list> switch_case_list case_list trait_adaptation_list trait_adaptations unset_variables
%type <list> use_declarations lexical_var_list lexical_vars isset_variables non_empty_array_pair_list %type <list> use_declarations lexical_var_list lexical_vars isset_variables non_empty_array_pair_list
%type <list> array_pair_list %type <list> array_pair_list ctor_arguments argument_list non_empty_argument_list
%% %%
@ -635,13 +635,13 @@ return_type:
; ;
argument_list: argument_list:
'(' ')' { $$ = node.NewSimpleNode("ArgumentList") } '(' ')' { $$ = []node.Node{} }
| '(' non_empty_argument_list possible_comma ')' { $$ = $2; } | '(' non_empty_argument_list possible_comma ')' { $$ = $2; }
; ;
non_empty_argument_list: non_empty_argument_list:
argument { $$ = node.NewSimpleNode("ArgumentList").Append($1) } argument { $$ = []node.Node{$1} }
| non_empty_argument_list ',' argument { $$ = $1.Append($3) } | non_empty_argument_list ',' argument { $$ = append($1, $3) }
; ;
argument: argument:
@ -803,12 +803,12 @@ non_empty_for_exprs:
anonymous_class: anonymous_class:
T_CLASS ctor_arguments extends_from implements_list '{' class_statement_list '}' T_CLASS ctor_arguments extends_from implements_list '{' class_statement_list '}'
{ {
{ $$ = stmt.NewClass($1, nil, $2.(node.SimpleNode).Children, $3, $4.(node.SimpleNode).Children, $6.(node.SimpleNode).Children) } { $$ = stmt.NewClass($1, nil, $2, $3, $4.(node.SimpleNode).Children, $6.(node.SimpleNode).Children) }
} }
; ;
new_expr: new_expr:
T_NEW class_name_reference ctor_arguments { $$ = expr.NewNew($2, $3.(node.SimpleNode).Children) } T_NEW class_name_reference ctor_arguments { $$ = expr.NewNew($2, $3) }
| T_NEW anonymous_class { $$ = expr.NewNew($2, nil) } | T_NEW anonymous_class { $$ = expr.NewNew($2, nil) }
; ;
@ -926,12 +926,12 @@ lexical_var:
; ;
function_call: function_call:
name argument_list { $$ = expr.NewFunctionCall($1, $2.(node.SimpleNode).Children) } name argument_list { $$ = expr.NewFunctionCall($1, $2) }
| class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list | class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list
{ $$ = expr.NewStaticCall($1, $3, $4.(node.SimpleNode).Children) } { $$ = expr.NewStaticCall($1, $3, $4) }
| variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list | variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list
{ $$ = expr.NewStaticCall($1, $3, $4.(node.SimpleNode).Children) } { $$ = expr.NewStaticCall($1, $3, $4) }
| callable_expr argument_list { $$ = expr.NewFunctionCall($1, $2.(node.SimpleNode).Children) } | callable_expr argument_list { $$ = expr.NewFunctionCall($1, $2) }
; ;
class_name: class_name:
@ -956,8 +956,8 @@ backticks_expr:
; ;
ctor_arguments: ctor_arguments:
/* empty */ { $$ = node.NewSimpleNode("ArgumentList") } /* empty */ { $$ = nil }
| argument_list { $$ = $1; } | argument_list { $$ = $1 }
; ;
dereferencable_scalar: dereferencable_scalar:
@ -1026,7 +1026,7 @@ callable_variable:
| constant '[' optional_expr ']' { $$ = expr.NewArrayDimFetch($1, $3) } | constant '[' optional_expr ']' { $$ = expr.NewArrayDimFetch($1, $3) }
| dereferencable '{' expr '}' { $$ = expr.NewArrayDimFetch($1, $3) } | dereferencable '{' expr '}' { $$ = expr.NewArrayDimFetch($1, $3) }
| dereferencable T_OBJECT_OPERATOR property_name argument_list | dereferencable T_OBJECT_OPERATOR property_name argument_list
{ $$ = expr.NewMethodCall($1, $3, $4.(node.SimpleNode).Children) } { $$ = expr.NewMethodCall($1, $3, $4) }
| function_call { $$ = $1; } | function_call { $$ = $1; }
; ;