From ea2494b9b89928bdc462315cd2dfa14159c6300d Mon Sep 17 00:00:00 2001 From: vadim Date: Wed, 6 Dec 2017 20:52:51 +0200 Subject: [PATCH] constant and declare nodes --- node/node.go | 21 - node/stmt/constant.go | 30 + node/stmt/declare.go | 43 ++ node/stmt/stmt_const.go | 34 ++ parser/parser.go | 1282 +++++++++++++++++++-------------------- parser/parser.y | 45 +- 6 files changed, 771 insertions(+), 684 deletions(-) create mode 100644 node/stmt/constant.go create mode 100644 node/stmt/declare.go create mode 100644 node/stmt/stmt_const.go diff --git a/node/node.go b/node/node.go index b8636ea..0998c33 100644 --- a/node/node.go +++ b/node/node.go @@ -4,8 +4,6 @@ import ( "bytes" "fmt" "io" - - "github.com/z7zmey/php-parser/token" ) type Node interface { @@ -20,11 +18,6 @@ type SimpleNode struct { Attributes map[string]string } -type tokenNode struct { - *SimpleNode - token token.Token -} - func (n SimpleNode) String() string { buf := new(bytes.Buffer) n.Print(buf, " ") @@ -46,20 +39,6 @@ func NewSimpleNode(name string) Node { return SimpleNode{Name: name, Attributes: make(map[string]string)} } -func TokenNode(name string, t token.Token) Node { - return tokenNode{ - &SimpleNode{Name: name, Attributes: make(map[string]string)}, - t, - } -} - -func (n tokenNode) Print(out io.Writer, indent string) { - fmt.Fprintf(out, "\n%v%v [%d %d] %q", indent, n.Name, n.token.StartLine, n.token.EndLine, n.token.Value) - for _, nn := range n.Children { - nn.Print(out, indent+" ") - } -} - func (n SimpleNode) Append(nn ...Node) Node { n.Children = append(n.Children, nn...) return n diff --git a/node/stmt/constant.go b/node/stmt/constant.go new file mode 100644 index 0000000..e7d298c --- /dev/null +++ b/node/stmt/constant.go @@ -0,0 +1,30 @@ +package stmt + +import ( + "fmt" + "io" + + "github.com/z7zmey/php-parser/node" + "github.com/z7zmey/php-parser/token" +) + +type Constant struct { + node.SimpleNode + token token.Token + expr node.Node +} + +func NewConstant(token token.Token, expr node.Node) node.Node { + return Constant{ + node.SimpleNode{Name: "Constant", Attributes: make(map[string]string)}, + token, + expr, + } +} + +func (n Constant) Print(out io.Writer, indent string) { + fmt.Fprintf(out, "\n%v%v [%d %d] %q", indent, n.Name, n.token.StartLine, n.token.EndLine, n.token.Value) + + fmt.Fprintf(out, "\n%vexpr:", indent+" ") + n.expr.Print(out, indent+" ") +} diff --git a/node/stmt/declare.go b/node/stmt/declare.go new file mode 100644 index 0000000..240515b --- /dev/null +++ b/node/stmt/declare.go @@ -0,0 +1,43 @@ +package stmt + +import ( + "fmt" + "io" + + "github.com/z7zmey/php-parser/node" + "github.com/z7zmey/php-parser/token" +) + +type Declare struct { + node.SimpleNode + token token.Token + consts []node.Node + stmts []node.Node +} + +func NewDeclare(token token.Token, consts []node.Node, stmts []node.Node) node.Node { + return Declare{ + node.SimpleNode{Name: "Declare", Attributes: make(map[string]string)}, + token, + consts, + stmts, + } +} + +func (n Declare) Print(out io.Writer, indent string) { + fmt.Fprintf(out, "\n%v%v [%d %d] %q", indent, n.Name, n.token.StartLine, n.token.EndLine, n.token.Value) + + if n.consts != nil { + fmt.Fprintf(out, "\n%vconsts:", indent+" ") + for _, nn := range n.consts { + nn.Print(out, indent+" ") + } + } + + if n.stmts != nil { + fmt.Fprintf(out, "\n%vstmts:", indent+" ") + for _, nn := range n.stmts { + nn.Print(out, indent+" ") + } + } +} diff --git a/node/stmt/stmt_const.go b/node/stmt/stmt_const.go new file mode 100644 index 0000000..80f79bc --- /dev/null +++ b/node/stmt/stmt_const.go @@ -0,0 +1,34 @@ +package stmt + +import ( + "fmt" + "io" + + "github.com/z7zmey/php-parser/node" + "github.com/z7zmey/php-parser/token" +) + +type StmtConst struct { + node.SimpleNode + token token.Token + consts []node.Node +} + +func NewStmtConst(token token.Token, consts []node.Node) node.Node { + return StmtConst{ + node.SimpleNode{Name: "StmtConst", Attributes: make(map[string]string)}, + token, + consts, + } +} + +func (n StmtConst) Print(out io.Writer, indent string) { + fmt.Fprintf(out, "\n%v%v [%d %d] %q", indent, n.Name, n.token.StartLine, n.token.EndLine, n.token.Value) + + if n.consts != nil { + fmt.Fprintf(out, "\n%vconsts:", indent+" ") + for _, nn := range n.consts { + nn.Print(out, indent+" ") + } + } +} diff --git a/parser/parser.go b/parser/parser.go index 3d4d0af..4060850 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -346,7 +346,7 @@ const yyEofCode = 1 const yyErrCode = 2 const yyInitialStackSize = 16 -//line parser/parser.y:1166 +//line parser/parser.y:1167 //line yacctab:1 var yyExca = [...]int{ @@ -601,11 +601,11 @@ var yyAct = [...]int{ 229, 308, 812, 824, 810, 825, 642, 691, 231, 766, 718, 831, 669, 633, 659, 544, 255, 256, 118, 803, 842, 628, 564, 830, 554, 813, 578, 846, 833, 409, - 855, 1, 841, 687, 688, 689, 686, 685, 684, 666, - 864, 854, 829, 163, 165, 166, 250, 178, 255, 256, - 863, 37, 681, 679, 872, 678, 873, 221, 868, 164, - 877, 223, 835, 848, 861, 42, 879, 321, 912, 804, - 800, 748, 855, 529, 782, 878, 570, 41, 882, 365, + 855, 1, 841, 687, 688, 689, 686, 685, 684, 800, + 864, 854, 666, 163, 165, 166, 829, 178, 255, 256, + 863, 250, 37, 681, 872, 679, 873, 678, 868, 164, + 877, 221, 223, 835, 861, 848, 879, 42, 321, 912, + 804, 748, 855, 529, 782, 878, 570, 41, 882, 365, 148, 144, 141, 854, 888, 889, 651, 15, 890, 87, 88, 89, 90, 91, 14, 519, 606, 266, 73, 74, 48, 75, 47, 107, 896, 893, 49, 82, 897, 80, @@ -1357,19 +1357,19 @@ var yyPact = [...]int{ } var yyPgo = [...]int{ - 0, 940, 939, 46, 737, 6, 938, 937, 14, 27, - 79, 77, 70, 51, 933, 921, 29, 20, 919, 94, - 15, 25, 78, 918, 0, 62, 917, 913, 17, 11, - 912, 911, 36, 61, 49, 33, 910, 35, 908, 72, - 50, 906, 9, 904, 903, 902, 901, 13, 48, 899, - 898, 111, 98, 197, 897, 896, 894, 8, 889, 81, - 43, 887, 55, 47, 886, 883, 882, 880, 877, 97, - 876, 875, 103, 541, 90, 1, 874, 867, 31, 866, + 0, 940, 939, 46, 737, 6, 938, 3, 937, 14, + 27, 79, 77, 70, 51, 933, 921, 29, 20, 919, + 94, 15, 25, 78, 918, 0, 62, 917, 913, 17, + 11, 912, 911, 36, 61, 49, 33, 910, 35, 908, + 72, 50, 906, 9, 904, 903, 902, 901, 13, 48, + 899, 898, 111, 98, 197, 897, 896, 894, 8, 889, + 81, 43, 887, 55, 47, 886, 883, 882, 880, 877, + 97, 876, 875, 103, 541, 1, 874, 867, 31, 866, 862, 861, 860, 859, 7, 19, 38, 24, 857, 856, - 83, 853, 851, 850, 10, 4, 849, 848, 847, 86, - 845, 843, 18, 842, 841, 837, 44, 42, 32, 41, - 2, 16, 3, 835, 833, 832, 5, 786, 831, 664, - 826, 28, 822, 819, 811, 37, 12, + 83, 853, 851, 10, 4, 850, 849, 848, 86, 847, + 845, 18, 843, 842, 841, 44, 42, 32, 41, 2, + 16, 837, 835, 833, 5, 786, 832, 664, 831, 28, + 826, 822, 819, 90, 811, 37, 12, } var yyR1 = [...]int{ @@ -1380,48 +1380,48 @@ 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, - 6, 6, 6, 6, 6, 6, 112, 112, 72, 72, - 121, 121, 8, 8, 8, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 117, - 117, 15, 15, 18, 18, 125, 125, 16, 16, 21, - 21, 73, 73, 17, 17, 20, 20, 19, 19, 74, - 74, 75, 75, 23, 23, 23, 23, 23, 23, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 123, 123, 122, 122, 31, 31, 83, - 83, 32, 10, 1, 1, 2, 2, 11, 11, 118, - 118, 4, 4, 12, 13, 34, 34, 14, 14, 86, - 86, 28, 28, 28, 28, 27, 27, 29, 29, 30, - 30, 79, 79, 79, 79, 87, 87, 87, 126, 126, - 26, 26, 88, 88, 76, 76, 100, 100, 77, 77, - 84, 84, 89, 89, 35, 35, 36, 36, 111, 111, - 109, 109, 109, 110, 110, 90, 90, 91, 91, 37, - 37, 80, 80, 39, 81, 81, 40, 40, 85, 85, - 41, 41, 41, 41, 95, 95, 96, 96, 96, 101, - 101, 42, 42, 43, 44, 44, 44, 44, 46, 46, - 45, 97, 97, 113, 113, 114, 114, 115, 115, 116, - 116, 116, 116, 116, 116, 92, 92, 47, 47, 93, - 93, 94, 22, 82, 82, 48, 78, 78, 98, 98, - 50, 49, 49, 38, 38, 38, 38, 38, 38, 38, - 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, - 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, - 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, - 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, - 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, - 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, - 38, 38, 38, 38, 38, 38, 38, 38, 38, 3, - 3, 102, 102, 103, 103, 57, 57, 58, 58, 58, - 58, 51, 51, 52, 52, 55, 55, 120, 120, 120, - 99, 99, 62, 62, 62, 56, 56, 56, 56, 56, - 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, - 56, 63, 63, 63, 24, 24, 25, 25, 61, 64, - 64, 64, 65, 65, 65, 66, 66, 66, 66, 66, - 66, 33, 33, 33, 53, 53, 53, 67, 67, 68, - 68, 68, 68, 68, 68, 59, 59, 59, 60, 60, - 60, 106, 107, 107, 105, 105, 104, 104, 104, 104, - 104, 104, 119, 119, 119, 119, 69, 69, 69, 69, - 69, 69, 69, 70, 70, 70, 70, 54, 54, 54, - 54, 54, 54, 54, 71, 71, 108, + 6, 6, 6, 6, 6, 6, 7, 7, 73, 73, + 119, 119, 9, 9, 9, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 115, + 115, 16, 16, 19, 19, 125, 125, 17, 17, 22, + 22, 74, 74, 18, 18, 21, 21, 20, 20, 123, + 123, 75, 75, 24, 24, 24, 24, 24, 24, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 121, 121, 120, 120, 32, 32, 83, + 83, 33, 11, 1, 1, 2, 2, 12, 12, 116, + 116, 4, 4, 13, 14, 35, 35, 15, 15, 86, + 86, 29, 29, 29, 29, 28, 28, 30, 30, 31, + 31, 79, 79, 79, 79, 87, 87, 87, 126, 126, + 27, 27, 88, 88, 76, 76, 99, 99, 77, 77, + 84, 84, 89, 89, 36, 36, 37, 37, 110, 110, + 108, 108, 108, 109, 109, 90, 90, 91, 91, 38, + 38, 80, 80, 40, 81, 81, 41, 41, 85, 85, + 42, 42, 42, 42, 94, 94, 95, 95, 95, 100, + 100, 43, 43, 44, 45, 45, 45, 45, 47, 47, + 46, 96, 96, 111, 111, 112, 112, 113, 113, 114, + 114, 114, 114, 114, 114, 92, 92, 48, 48, 122, + 122, 93, 23, 82, 82, 49, 78, 78, 97, 97, + 51, 50, 50, 39, 39, 39, 39, 39, 39, 39, + 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, + 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, + 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, + 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, + 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, + 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, + 39, 39, 39, 39, 39, 39, 39, 39, 39, 3, + 3, 101, 101, 102, 102, 58, 58, 59, 59, 59, + 59, 52, 52, 53, 53, 56, 56, 118, 118, 118, + 98, 98, 63, 63, 63, 57, 57, 57, 57, 57, + 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, + 57, 64, 64, 64, 25, 25, 26, 26, 62, 65, + 65, 65, 66, 66, 66, 67, 67, 67, 67, 67, + 67, 34, 34, 34, 54, 54, 54, 68, 68, 69, + 69, 69, 69, 69, 69, 60, 60, 60, 61, 61, + 61, 105, 106, 106, 104, 104, 103, 103, 103, 103, + 103, 103, 117, 117, 117, 117, 70, 70, 70, 70, + 70, 70, 70, 71, 71, 71, 71, 55, 55, 55, + 55, 55, 55, 55, 72, 72, 107, } var yyR2 = [...]int{ @@ -1477,98 +1477,98 @@ var yyR2 = [...]int{ } var yyChk = [...]int{ - -1000, -124, -72, -7, -9, -10, -11, -12, -13, 127, + -1000, -124, -73, -8, -10, -11, -12, -13, -14, 127, 154, 120, 114, 164, -76, -77, 97, 96, 99, 106, - 110, 111, 115, 122, 76, 95, 90, -24, 124, 101, - 103, 163, 116, 119, 112, 86, 113, -118, 128, 129, - 130, -88, -100, -33, -38, -4, 83, -66, -67, -64, + 110, 111, 115, 122, 76, 95, 90, -25, 124, 101, + 103, 163, 116, 119, 112, 86, 113, -116, 128, 129, + 130, -88, -99, -34, -39, -4, 83, -67, -68, -65, 134, 69, 71, 58, 59, 49, 50, 55, 57, 161, - -49, -54, 60, 61, 62, 63, 64, 65, 66, 82, - 67, -56, 160, 13, 14, 16, 77, 78, -53, -63, - -58, -51, -61, -62, 70, 125, 126, 4, 5, 6, + -50, -55, 60, 61, 62, 63, 64, 65, 66, 82, + 67, -57, 160, 13, 14, 16, 77, 78, -54, -64, + -59, -52, -62, -63, 70, 125, 126, 4, 5, 6, 7, 8, 84, 85, 141, 142, 156, 138, 139, 140, - 155, 137, 149, 159, 88, 167, -8, -65, 135, 94, - -121, 157, 161, 157, -121, 164, 86, -18, -117, -73, - -121, 157, 113, 114, -19, -20, -74, -22, 86, -75, - 161, -9, 113, 154, 161, 161, -25, -24, 76, -25, - -25, -80, -39, -53, -81, 113, -40, 88, -82, -48, - -24, 163, 33, 34, 10, 12, 11, 35, 37, 36, + 155, 137, 149, 159, 88, 167, -9, -66, 135, 94, + -119, 157, 161, 157, -119, 164, 86, -19, -115, -74, + -119, 157, 113, 114, -20, -21, -123, -23, 86, -75, + 161, -10, 113, 154, 161, 161, -26, -25, 76, -26, + -26, -80, -40, -54, -81, 113, -41, 88, -82, -49, + -25, 163, 33, 34, 10, 12, 11, 35, 37, 36, 51, 49, 50, 52, 68, 53, 54, 47, 48, 40, 41, 38, 39, 43, 44, 45, 46, 42, 56, 30, - 32, 161, 161, 161, 164, -24, 86, 31, -3, 37, + 32, 161, 161, 161, 164, -25, 86, 31, -3, 37, 128, -4, 86, 86, 86, 73, 74, 73, 75, 74, 17, 18, 19, 20, 29, 21, 22, 23, 24, 25, 26, 27, 28, 58, 59, 161, 69, 164, 133, 161, - -106, -105, -107, -104, -24, 37, 134, -24, -33, -63, - 161, -62, 76, 69, -33, -24, -24, -24, -24, -24, - -24, -24, -24, -24, -24, -24, -24, -55, 161, -24, - -120, 93, -119, -69, 88, 151, 152, -24, -24, -24, - 69, 153, 153, -52, -50, -51, -68, 128, -8, -53, - 161, 161, -24, -24, 161, -24, -24, 93, 150, -119, - -119, 93, 164, -53, -90, 161, -90, 161, 157, -121, - 162, -121, 163, 164, -72, 163, -15, -73, -121, 157, - 163, 9, 157, 105, -121, -20, 163, 9, 17, -23, - 165, -9, -10, -11, -12, -13, 127, -24, 97, -3, - -78, -98, -24, -24, 163, 163, 163, 163, 9, 163, - 9, -3, 17, 163, 9, -24, -24, -24, -24, -24, - -24, -24, -24, -24, -24, -24, -24, -24, -24, -24, - -24, -24, -24, -24, -24, -24, -24, -24, -24, -24, - -24, -52, -24, 31, -24, -83, -32, -33, -24, -74, - -75, 163, 163, 86, 161, 86, -34, 131, 164, -14, - 131, 161, -9, 161, 163, 31, -24, 37, -24, -24, - -24, -24, -24, -24, -24, -24, -24, -24, -24, -24, - -24, -25, -24, -60, 86, 164, -53, -106, 166, 9, - 15, -33, 161, -24, -106, 162, -25, 160, -69, -69, - 93, 69, 133, -24, 87, -33, 15, -25, -59, -112, - -53, 164, 86, -6, -5, 76, 77, 78, 79, 80, + -105, -104, -106, -103, -25, 37, 134, -25, -34, -64, + 161, -63, 76, 69, -34, -25, -25, -25, -25, -25, + -25, -25, -25, -25, -25, -25, -25, -56, 161, -25, + -118, 93, -117, -70, 88, 151, 152, -25, -25, -25, + 69, 153, 153, -53, -51, -52, -69, 128, -9, -54, + 161, 161, -25, -25, 161, -25, -25, 93, 150, -117, + -117, 93, 164, -54, -90, 161, -90, 161, 157, -119, + 162, -119, 163, 164, -73, 163, -16, -74, -119, 157, + 163, 9, 157, 105, -119, -21, 163, 9, 17, -24, + 165, -10, -11, -12, -13, -14, 127, -25, 97, -3, + -78, -97, -25, -25, 163, 163, 163, 163, 9, 163, + 9, -3, 17, 163, 9, -25, -25, -25, -25, -25, + -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, + -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, + -25, -53, -25, 31, -25, -83, -33, -34, -25, -123, + -75, 163, 163, 86, 161, 86, -35, 131, 164, -15, + 131, 161, -10, 161, 163, 31, -25, 37, -25, -25, + -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, + -25, -26, -25, -61, 86, 164, -54, -105, 166, 9, + 15, -34, 161, -25, -105, 162, -26, 160, -70, -70, + 93, 69, 133, -25, 87, -34, 15, -26, -60, -7, + -54, 164, 86, -6, -5, 76, 77, 78, 79, 80, 81, 4, 5, 6, 7, 8, 10, 11, 12, 56, 70, 71, 82, 83, 73, 74, 75, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 111, 112, 113, 114, 115, 13, 14, 134, 106, 107, 108, 109, 110, 135, 136, 131, 132, 154, 129, 130, 128, - 137, 138, 140, 139, 141, 142, 156, 155, -59, -112, - -53, -99, -90, 153, 69, 164, 133, 153, -99, -71, - -108, -24, -24, -24, 150, 150, 159, -24, 162, -91, - -37, -24, 158, -106, 86, 163, -72, 165, 163, 163, - 157, -121, -19, 157, -121, 164, 86, 157, -22, -24, - 161, 162, 161, 163, 9, 162, -39, -40, 161, -24, - -48, 31, -24, -125, 9, 105, 162, 165, 161, -84, - -89, -35, -36, -111, -109, 30, 135, 136, -8, -34, - -86, 132, -8, -85, 164, -95, -8, -24, -24, -75, - -24, 162, 166, 165, -90, -24, 162, 17, -107, -24, - 37, 134, -106, 162, 166, 162, -70, 86, 89, 50, - 88, 86, 165, 165, 69, 165, -24, 166, -90, -24, - -90, -53, -25, -24, -60, -53, -34, -125, 9, 162, - 162, 165, -125, 9, -24, 162, 165, 164, 157, -16, - -17, -20, -117, 164, 162, -26, -9, 31, -24, -78, - -24, -79, 164, 31, -84, -24, 162, -32, -28, -33, - 37, 134, 69, -30, -9, 31, -123, -84, 162, 9, - -1, 37, -109, -86, 164, -95, 165, -41, -113, -114, - 120, -115, 123, -116, 81, 80, 79, 76, 77, 78, - -85, 9, 162, 162, 75, -9, 31, 165, 17, -24, - -33, 161, 162, 166, 89, -24, 165, 166, 165, -86, - 162, -108, 162, -37, -21, -20, 164, -125, 9, -20, - -16, 163, -75, 162, 163, -87, 163, -87, 163, 162, - 163, 162, 15, -33, 161, -106, -75, -31, 117, 118, - 162, -102, 120, -35, -2, 158, 164, -85, -92, -47, - 88, 114, 113, -95, -116, 165, -8, -9, 31, 163, - -75, -24, -106, 166, 164, -125, 9, -21, 165, -17, + 137, 138, 140, 139, 141, 142, 156, 155, -60, -7, + -54, -98, -90, 153, 69, 164, 133, 153, -98, -72, + -107, -25, -25, -25, 150, 150, 159, -25, 162, -91, + -38, -25, 158, -105, 86, 163, -73, 165, 163, 163, + 157, -119, -20, 157, -119, 164, 86, 157, -23, -25, + 161, 162, 161, 163, 9, 162, -40, -41, 161, -25, + -49, 31, -25, -125, 9, 105, 162, 165, 161, -84, + -89, -36, -37, -110, -108, 30, 135, 136, -9, -35, + -86, 132, -9, -85, 164, -94, -9, -25, -25, -75, + -25, 162, 166, 165, -90, -25, 162, 17, -106, -25, + 37, 134, -105, 162, 166, 162, -71, 86, 89, 50, + 88, 86, 165, 165, 69, 165, -25, 166, -90, -25, + -90, -54, -26, -25, -61, -54, -35, -125, 9, 162, + 162, 165, -125, 9, -25, 162, 165, 164, 157, -17, + -18, -21, -115, 164, 162, -27, -10, 31, -25, -78, + -25, -79, 164, 31, -84, -25, 162, -33, -29, -34, + 37, 134, 69, -31, -10, 31, -121, -84, 162, 9, + -1, 37, -108, -86, 164, -94, 165, -42, -111, -112, + 120, -113, 123, -114, 81, 80, 79, 76, 77, 78, + -85, 9, 162, 162, 75, -10, 31, 165, 17, -25, + -34, 161, 162, 166, 89, -25, 165, 166, 165, -86, + 162, -107, 162, -38, -22, -21, 164, -125, 9, -21, + -17, 163, -75, 162, 163, -87, 163, -87, 163, 162, + 163, 162, 15, -34, 161, -105, -75, -32, 117, 118, + 162, -101, 120, -36, -2, 158, 164, -85, -92, -48, + 88, 114, 113, -94, -114, 165, -9, -10, 31, 163, + -75, -25, -105, 166, 164, -125, 9, -22, 165, -18, -125, 98, 163, -78, 165, 108, 109, -87, 107, -87, - -102, -29, -9, 31, -28, -106, 166, 104, 161, 164, - -110, 31, -110, 161, 88, -85, 165, 163, 9, 17, - -93, -94, -112, -3, -96, 163, 164, -75, 162, 165, - -85, 165, -20, -125, 165, 163, 162, -24, -126, 31, - 163, 165, 163, 107, -110, -75, 162, 162, 163, -122, - -8, -75, 164, -111, 164, -103, -57, 88, 37, 17, - 165, -47, -24, 163, 9, 17, -112, 165, -101, -42, - -43, -44, -45, -46, -8, -112, 154, 86, 165, 165, - -27, -9, 31, -126, -75, 163, 164, 102, -29, 88, - 35, 165, -75, -75, 162, 9, 88, -24, -94, -24, - 161, 165, -42, 163, 163, 121, 105, 153, -75, -75, - -75, 163, 162, -8, 165, 165, -57, -84, -95, 86, - -5, -116, -112, 100, 165, 164, 162, -112, 163, -75, - -110, 165, -97, 163, 164, -75, 165, + -101, -30, -10, 31, -29, -105, 166, 104, 161, 164, + -109, 31, -109, 161, 88, -85, 165, 163, 9, 17, + -122, -93, -7, -3, -95, 163, 164, -75, 162, 165, + -85, 165, -21, -125, 165, 163, 162, -25, -126, 31, + 163, 165, 163, 107, -109, -75, 162, 162, 163, -120, + -9, -75, 164, -110, 164, -102, -58, 88, 37, 17, + 165, -48, -25, 163, 9, 17, -7, 165, -100, -43, + -44, -45, -46, -47, -9, -7, 154, 86, 165, 165, + -28, -10, 31, -126, -75, 163, 164, 102, -30, 88, + 35, 165, -75, -75, 162, 9, 88, -25, -93, -25, + 161, 165, -43, 163, 163, 121, 105, 153, -75, -75, + -75, 163, 162, -9, 165, 165, -58, -84, -94, 86, + -5, -114, -7, 100, 165, 164, 162, -7, 163, -75, + -109, 165, -96, 163, 164, -75, 165, } var yyDef = [...]int{ @@ -2041,781 +2041,781 @@ yydefault: case 1: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:221 + //line parser/parser.y:222 { rootnode = yyDollar[1].node } case 2: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:225 + //line parser/parser.y:226 { yyVAL.token = yyDollar[1].token } case 3: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:225 + //line parser/parser.y:226 { yyVAL.token = yyDollar[1].token } case 4: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:225 + //line parser/parser.y:226 { yyVAL.token = yyDollar[1].token } case 5: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:225 + //line parser/parser.y:226 { yyVAL.token = yyDollar[1].token } case 6: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:225 + //line parser/parser.y:226 { yyVAL.token = yyDollar[1].token } case 7: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:225 + //line parser/parser.y:226 { yyVAL.token = yyDollar[1].token } case 8: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:225 + //line parser/parser.y:226 { yyVAL.token = yyDollar[1].token } case 9: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:225 + //line parser/parser.y:226 { yyVAL.token = yyDollar[1].token } case 10: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:226 + //line parser/parser.y:227 { yyVAL.token = yyDollar[1].token } case 11: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:226 + //line parser/parser.y:227 { yyVAL.token = yyDollar[1].token } case 12: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:226 + //line parser/parser.y:227 { yyVAL.token = yyDollar[1].token } case 13: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:226 + //line parser/parser.y:227 { yyVAL.token = yyDollar[1].token } case 14: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:226 + //line parser/parser.y:227 { yyVAL.token = yyDollar[1].token } case 15: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:226 + //line parser/parser.y:227 { yyVAL.token = yyDollar[1].token } case 16: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:226 + //line parser/parser.y:227 { yyVAL.token = yyDollar[1].token } case 17: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:226 + //line parser/parser.y:227 { yyVAL.token = yyDollar[1].token } case 18: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:226 + //line parser/parser.y:227 { yyVAL.token = yyDollar[1].token } case 19: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:226 + //line parser/parser.y:227 { yyVAL.token = yyDollar[1].token } case 20: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:226 + //line parser/parser.y:227 { yyVAL.token = yyDollar[1].token } case 21: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:226 + //line parser/parser.y:227 { yyVAL.token = yyDollar[1].token } case 22: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:227 + //line parser/parser.y:228 { yyVAL.token = yyDollar[1].token } case 23: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:227 + //line parser/parser.y:228 { yyVAL.token = yyDollar[1].token } case 24: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:227 + //line parser/parser.y:228 { yyVAL.token = yyDollar[1].token } case 25: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:227 + //line parser/parser.y:228 { yyVAL.token = yyDollar[1].token } case 26: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:227 + //line parser/parser.y:228 { yyVAL.token = yyDollar[1].token } case 27: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:227 + //line parser/parser.y:228 { yyVAL.token = yyDollar[1].token } case 28: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:227 + //line parser/parser.y:228 { yyVAL.token = yyDollar[1].token } case 29: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:227 + //line parser/parser.y:228 { yyVAL.token = yyDollar[1].token } case 30: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:227 + //line parser/parser.y:228 { yyVAL.token = yyDollar[1].token } case 31: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:227 + //line parser/parser.y:228 { yyVAL.token = yyDollar[1].token } case 32: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:228 + //line parser/parser.y:229 { yyVAL.token = yyDollar[1].token } case 33: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:228 + //line parser/parser.y:229 { yyVAL.token = yyDollar[1].token } case 34: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:228 + //line parser/parser.y:229 { yyVAL.token = yyDollar[1].token } case 35: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:228 + //line parser/parser.y:229 { yyVAL.token = yyDollar[1].token } case 36: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:228 + //line parser/parser.y:229 { yyVAL.token = yyDollar[1].token } case 37: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:228 + //line parser/parser.y:229 { yyVAL.token = yyDollar[1].token } case 38: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:228 + //line parser/parser.y:229 { yyVAL.token = yyDollar[1].token } case 39: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:228 + //line parser/parser.y:229 { yyVAL.token = yyDollar[1].token } case 40: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:228 + //line parser/parser.y:229 { yyVAL.token = yyDollar[1].token } case 41: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:228 + //line parser/parser.y:229 { yyVAL.token = yyDollar[1].token } case 42: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:229 + //line parser/parser.y:230 { yyVAL.token = yyDollar[1].token } case 43: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:229 + //line parser/parser.y:230 { yyVAL.token = yyDollar[1].token } case 44: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:229 + //line parser/parser.y:230 { yyVAL.token = yyDollar[1].token } case 45: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:229 + //line parser/parser.y:230 { yyVAL.token = yyDollar[1].token } case 46: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:229 + //line parser/parser.y:230 { yyVAL.token = yyDollar[1].token } case 47: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:229 + //line parser/parser.y:230 { yyVAL.token = yyDollar[1].token } case 48: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:229 + //line parser/parser.y:230 { yyVAL.token = yyDollar[1].token } case 49: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:229 + //line parser/parser.y:230 { yyVAL.token = yyDollar[1].token } case 50: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:229 + //line parser/parser.y:230 { yyVAL.token = yyDollar[1].token } case 51: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:229 + //line parser/parser.y:230 { yyVAL.token = yyDollar[1].token } case 52: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:229 + //line parser/parser.y:230 { yyVAL.token = yyDollar[1].token } case 53: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:230 + //line parser/parser.y:231 { yyVAL.token = yyDollar[1].token } case 54: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:230 + //line parser/parser.y:231 { yyVAL.token = yyDollar[1].token } case 55: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:230 + //line parser/parser.y:231 { yyVAL.token = yyDollar[1].token } case 56: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:230 + //line parser/parser.y:231 { yyVAL.token = yyDollar[1].token } case 57: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:230 + //line parser/parser.y:231 { yyVAL.token = yyDollar[1].token } case 58: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:230 + //line parser/parser.y:231 { yyVAL.token = yyDollar[1].token } case 59: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:230 + //line parser/parser.y:231 { yyVAL.token = yyDollar[1].token } case 60: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:230 + //line parser/parser.y:231 { yyVAL.token = yyDollar[1].token } case 61: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:231 + //line parser/parser.y:232 { yyVAL.token = yyDollar[1].token } case 62: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:231 + //line parser/parser.y:232 { yyVAL.token = yyDollar[1].token } case 63: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:231 + //line parser/parser.y:232 { yyVAL.token = yyDollar[1].token } case 64: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:231 + //line parser/parser.y:232 { yyVAL.token = yyDollar[1].token } case 65: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:231 + //line parser/parser.y:232 { yyVAL.token = yyDollar[1].token } case 66: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:231 + //line parser/parser.y:232 { yyVAL.token = yyDollar[1].token } case 67: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:231 + //line parser/parser.y:232 { yyVAL.token = yyDollar[1].token } case 68: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:231 + //line parser/parser.y:232 { yyVAL.token = yyDollar[1].token } case 69: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:235 + //line parser/parser.y:236 { yyVAL.token = yyDollar[1].token } case 70: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:236 + //line parser/parser.y:237 { yyVAL.token = yyDollar[1].token } case 71: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:236 + //line parser/parser.y:237 { yyVAL.token = yyDollar[1].token } case 72: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:236 + //line parser/parser.y:237 { yyVAL.token = yyDollar[1].token } case 73: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:236 + //line parser/parser.y:237 { yyVAL.token = yyDollar[1].token } case 74: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:236 + //line parser/parser.y:237 { yyVAL.token = yyDollar[1].token } case 75: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:236 + //line parser/parser.y:237 { yyVAL.token = yyDollar[1].token } case 76: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:240 + //line parser/parser.y:241 { - yyVAL.node = node.TokenNode("identifier", yyDollar[1].token) + yyVAL.token = yyDollar[1].token } case 77: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:241 + //line parser/parser.y:242 { - yyVAL.node = node.TokenNode("identifier", yyDollar[1].token) + yyVAL.token = yyDollar[1].token } case 78: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:245 + //line parser/parser.y:246 { yyVAL.node = yyDollar[1].node.Append(yyDollar[2].node) } case 79: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:246 + //line parser/parser.y:247 { yyVAL.node = node.NewSimpleNode("Statements") } case 80: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:250 + //line parser/parser.y:251 { yyVAL.list = []node.Node{name.NewNamePart(yyDollar[1].token)} } case 81: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:251 + //line parser/parser.y:252 { yyVAL.list = append(yyDollar[1].list, name.NewNamePart(yyDollar[3].token)) } case 82: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:255 + //line parser/parser.y:256 { yyVAL.node = name.NewName(yyDollar[1].list) } case 83: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:256 + //line parser/parser.y:257 { yyVAL.node = name.NewRelative(yyDollar[3].list) } case 84: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:257 + //line parser/parser.y:258 { yyVAL.node = name.NewFullyQualified(yyDollar[2].list) } case 85: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:261 + //line parser/parser.y:262 { yyVAL.node = yyDollar[1].node } case 86: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:262 + //line parser/parser.y:263 { yyVAL.node = yyDollar[1].node } case 87: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:263 + //line parser/parser.y:264 { yyVAL.node = yyDollar[1].node } case 88: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:264 + //line parser/parser.y:265 { yyVAL.node = yyDollar[1].node } case 89: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:265 + //line parser/parser.y:266 { yyVAL.node = yyDollar[1].node } case 90: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:266 + //line parser/parser.y:267 { yyVAL.node = node.NewSimpleNode("THaltCompiler") } case 91: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:267 + //line parser/parser.y:268 { yyVAL.node = node.NewSimpleNode("Namespace").Append(name.NewName(yyDollar[2].list)) } case 92: yyDollar = yyS[yypt-5 : yypt+1] - //line parser/parser.y:269 + //line parser/parser.y:270 { yyVAL.node = node.NewSimpleNode("Namespace").Append(name.NewName(yyDollar[2].list)).Append(yyDollar[4].node) } case 93: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:270 + //line parser/parser.y:271 { yyVAL.node = node.NewSimpleNode("Namespace").Append(yyDollar[3].node) } case 94: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:271 + //line parser/parser.y:272 { yyVAL.node = yyDollar[2].node } case 95: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:272 + //line parser/parser.y:273 { yyVAL.node = yyDollar[3].node.Append(yyDollar[2].node) } case 96: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:273 + //line parser/parser.y:274 { yyVAL.node = yyDollar[2].node } case 97: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:274 + //line parser/parser.y:275 { yyVAL.node = yyDollar[3].node.Append(yyDollar[2].node) } case 98: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:275 + //line parser/parser.y:276 { - yyVAL.node = yyDollar[2].node + yyVAL.node = stmt.NewStmtConst(yyDollar[1].token, yyDollar[2].list) } case 99: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:279 + //line parser/parser.y:280 { yyVAL.node = node.NewSimpleNode("FuncUseType") } case 100: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:280 + //line parser/parser.y:281 { yyVAL.node = node.NewSimpleNode("ConstUseType") } case 101: yyDollar = yyS[yypt-6 : yypt+1] - //line parser/parser.y:285 + //line parser/parser.y:286 { yyVAL.node = node.NewSimpleNode("GroupUse").Append(name.NewName(yyDollar[1].list)).Append(yyDollar[4].node) } case 102: yyDollar = yyS[yypt-7 : yypt+1] - //line parser/parser.y:287 + //line parser/parser.y:288 { yyVAL.node = node.NewSimpleNode("GroupUse").Append(name.NewName(yyDollar[2].list)).Append(yyDollar[5].node) } case 103: yyDollar = yyS[yypt-6 : yypt+1] - //line parser/parser.y:292 + //line parser/parser.y:293 { yyVAL.node = node.NewSimpleNode("MixedGroupUse").Append(name.NewName(yyDollar[1].list)).Append(yyDollar[4].node) } case 104: yyDollar = yyS[yypt-7 : yypt+1] - //line parser/parser.y:294 + //line parser/parser.y:295 { yyVAL.node = node.NewSimpleNode("MixedGroupUse").Append(name.NewName(yyDollar[2].list)).Append(yyDollar[5].node) } case 107: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:304 + //line parser/parser.y:305 { yyVAL.node = yyDollar[1].node.Append(yyDollar[3].node) } case 108: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:305 + //line parser/parser.y:306 { yyVAL.node = node.NewSimpleNode("UseList").Append(yyDollar[1].node) } case 109: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:310 + //line parser/parser.y:311 { yyVAL.node = yyDollar[1].node.Append(yyDollar[3].node) } case 110: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:311 + //line parser/parser.y:312 { yyVAL.node = node.NewSimpleNode("UseList").Append(yyDollar[1].node) } case 111: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:315 + //line parser/parser.y:316 { yyVAL.node = yyDollar[1].node.Append(yyDollar[3].node) } case 112: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:316 + //line parser/parser.y:317 { yyVAL.node = node.NewSimpleNode("UseList").Append(yyDollar[1].node) } case 113: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:320 + //line parser/parser.y:321 { yyVAL.node = yyDollar[1].node } case 114: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:321 + //line parser/parser.y:322 { yyVAL.node = yyDollar[2].node.Append(yyDollar[1].node) } case 115: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:325 + //line parser/parser.y:326 { yyVAL.node = node.NewSimpleNode("UseElem").Append(name.NewName(yyDollar[1].list)) } case 116: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:326 + //line parser/parser.y:327 { yyVAL.node = node.NewSimpleNode("UseElem").Append(name.NewName(yyDollar[1].list)).Append(node.NewSimpleNode("as").Attribute("value", yyDollar[3].token.String())) } case 117: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:330 + //line parser/parser.y:331 { yyVAL.node = yyDollar[1].node } case 118: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:331 + //line parser/parser.y:332 { yyVAL.node = yyDollar[2].node } case 119: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:335 + //line parser/parser.y:336 { - yyVAL.node = yyDollar[1].node.Append(yyDollar[3].node) + yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) } case 120: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:336 + //line parser/parser.y:337 { - yyVAL.node = node.NewSimpleNode("ConstList").Append(yyDollar[1].node) + yyVAL.list = []node.Node{yyDollar[1].node} } case 121: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:340 + //line parser/parser.y:341 { yyVAL.node = yyDollar[1].node.Append(yyDollar[2].node) } case 122: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:341 + //line parser/parser.y:342 { yyVAL.node = node.NewSimpleNode("stmt") } case 123: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:345 + //line parser/parser.y:346 { yyVAL.node = yyDollar[1].node } case 124: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:346 + //line parser/parser.y:347 { yyVAL.node = yyDollar[1].node } case 125: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:347 + //line parser/parser.y:348 { yyVAL.node = yyDollar[1].node } case 126: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:348 + //line parser/parser.y:349 { yyVAL.node = yyDollar[1].node } case 127: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:349 + //line parser/parser.y:350 { yyVAL.node = yyDollar[1].node } case 128: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:350 + //line parser/parser.y:351 { yyVAL.node = node.NewSimpleNode("THaltCompiler") } case 129: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:353 + //line parser/parser.y:354 { yyVAL.node = yyDollar[2].node } case 130: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:354 + //line parser/parser.y:355 { yyVAL.node = yyDollar[1].node } case 131: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:355 + //line parser/parser.y:356 { yyVAL.node = yyDollar[1].node } case 132: yyDollar = yyS[yypt-5 : yypt+1] - //line parser/parser.y:357 + //line parser/parser.y:358 { yyVAL.node = node.NewSimpleNode("While"). Append(node.NewSimpleNode("expr").Append(yyDollar[3].node)). @@ -2823,7 +2823,7 @@ yydefault: } case 133: yyDollar = yyS[yypt-7 : yypt+1] - //line parser/parser.y:363 + //line parser/parser.y:364 { yyVAL.node = node.NewSimpleNode("DoWhile"). Append(node.NewSimpleNode("expr").Append(yyDollar[5].node)). @@ -2831,7 +2831,7 @@ yydefault: } case 134: yyDollar = yyS[yypt-9 : yypt+1] - //line parser/parser.y:369 + //line parser/parser.y:370 { yyVAL.node = node.NewSimpleNode("For"). Append(node.NewSimpleNode("expr1").Append(yyDollar[3].node)). @@ -2841,67 +2841,67 @@ yydefault: } case 135: yyDollar = yyS[yypt-5 : yypt+1] - //line parser/parser.y:376 + //line parser/parser.y:377 { yyVAL.node = node.NewSimpleNode("Switch").Append(node.NewSimpleNode("expr").Append(yyDollar[3].node)).Append(yyDollar[5].node) } case 136: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:377 + //line parser/parser.y:378 { yyVAL.node = stmt.NewBreak(yyDollar[1].token, yyDollar[2].node) } case 137: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:378 + //line parser/parser.y:379 { yyVAL.node = node.NewSimpleNode("Continue").Append(yyDollar[2].node) } case 138: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:379 + //line parser/parser.y:380 { yyVAL.node = node.NewSimpleNode("Return").Append(yyDollar[2].node) } case 139: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:380 + //line parser/parser.y:381 { yyVAL.node = yyDollar[2].node } case 140: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:381 + //line parser/parser.y:382 { yyVAL.node = yyDollar[2].node } case 141: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:382 + //line parser/parser.y:383 { yyVAL.node = yyDollar[2].node } case 142: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:383 + //line parser/parser.y:384 { yyVAL.node = node.NewSimpleNode("Echo").Append(node.NewSimpleNode("InlineHtml").Attribute("value", yyDollar[1].token.String())) } case 143: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:384 + //line parser/parser.y:385 { yyVAL.node = yyDollar[1].node } case 144: yyDollar = yyS[yypt-6 : yypt+1] - //line parser/parser.y:386 + //line parser/parser.y:387 { yyVAL.node = node.NewSimpleNode("Unset").Append(yyDollar[3].node) } case 145: yyDollar = yyS[yypt-7 : yypt+1] - //line parser/parser.y:388 + //line parser/parser.y:389 { yyVAL.node = node.NewSimpleNode("Foreach"). Append(node.NewSimpleNode("expr").Append(yyDollar[3].node)). @@ -2910,7 +2910,7 @@ yydefault: } case 146: yyDollar = yyS[yypt-9 : yypt+1] - //line parser/parser.y:395 + //line parser/parser.y:396 { yyVAL.node = node.NewSimpleNode("Foreach"). Append(node.NewSimpleNode("expr").Append(yyDollar[3].node)). @@ -2920,97 +2920,97 @@ yydefault: } case 147: yyDollar = yyS[yypt-5 : yypt+1] - //line parser/parser.y:402 + //line parser/parser.y:403 { - yyVAL.node = node.NewSimpleNode("Declare").Append(yyDollar[3].node).Append(yyDollar[5].node) + yyVAL.node = stmt.NewDeclare(yyDollar[1].token, yyDollar[3].list, yyDollar[5].node.(node.SimpleNode).Children) } case 148: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:403 + //line parser/parser.y:404 { yyVAL.node = node.NewSimpleNode("") } case 149: yyDollar = yyS[yypt-6 : yypt+1] - //line parser/parser.y:405 + //line parser/parser.y:406 { yyVAL.node = stmt.NewTry(yyDollar[1].token, yyDollar[3].node.(node.SimpleNode).Children, yyDollar[5].list, yyDollar[6].node) } case 150: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:408 + //line parser/parser.y:409 { yyVAL.node = node.NewSimpleNode("Throw").Append(yyDollar[2].node) } case 151: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:409 + //line parser/parser.y:410 { yyVAL.node = node.NewSimpleNode("GoTo").Attribute("Label", yyDollar[2].token.String()) } case 152: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:410 + //line parser/parser.y:411 { yyVAL.node = node.NewSimpleNode("Label").Attribute("name", yyDollar[1].token.String()) } case 153: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:413 + //line parser/parser.y:414 { yyVAL.list = []node.Node{} } case 154: yyDollar = yyS[yypt-9 : yypt+1] - //line parser/parser.y:415 + //line parser/parser.y:416 { yyVAL.list = append(yyDollar[1].list, stmt.NewCatch(yyDollar[2].token, yyDollar[4].list, expr.NewVariable(yyDollar[5].token), yyDollar[8].node.(node.SimpleNode).Children)) } case 155: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:418 + //line parser/parser.y:419 { yyVAL.list = []node.Node{yyDollar[1].node} } case 156: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:419 + //line parser/parser.y:420 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) } case 157: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:423 + //line parser/parser.y:424 { yyVAL.node = nil } case 158: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:424 + //line parser/parser.y:425 { yyVAL.node = stmt.NewFinally(yyDollar[1].token, yyDollar[3].node.(node.SimpleNode).Children) } case 159: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:428 + //line parser/parser.y:429 { yyVAL.node = node.NewSimpleNode("UnsetVariablesList").Append(yyDollar[1].node) } case 160: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:429 + //line parser/parser.y:430 { yyVAL.node = yyDollar[1].node.Append(yyDollar[3].node) } case 161: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:433 + //line parser/parser.y:434 { yyVAL.node = yyDollar[1].node } case 162: yyDollar = yyS[yypt-10 : yypt+1] - //line parser/parser.y:438 + //line parser/parser.y:439 { yyVAL.node = node.NewSimpleNode("Function"). Attribute("name", yyDollar[3].token.String()). @@ -3021,73 +3021,73 @@ yydefault: } case 163: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:449 + //line parser/parser.y:450 { yyVAL.value = "false" } case 164: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:450 + //line parser/parser.y:451 { yyVAL.value = "true" } case 165: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:454 + //line parser/parser.y:455 { yyVAL.value = "false" } case 166: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:455 + //line parser/parser.y:456 { yyVAL.value = "true" } case 167: yyDollar = yyS[yypt-8 : yypt+1] - //line parser/parser.y:460 + //line parser/parser.y:461 { yyVAL.node = stmt.NewClass(yyDollar[3].token, yyDollar[1].strings, nil, yyDollar[4].node, yyDollar[5].node.(node.SimpleNode).Children, yyDollar[7].node.(node.SimpleNode).Children) } case 168: yyDollar = yyS[yypt-7 : yypt+1] - //line parser/parser.y:462 + //line parser/parser.y:463 { yyVAL.node = stmt.NewClass(yyDollar[2].token, nil, nil, yyDollar[3].node, yyDollar[4].node.(node.SimpleNode).Children, yyDollar[6].node.(node.SimpleNode).Children) } case 169: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:466 + //line parser/parser.y:467 { yyVAL.strings = []string{yyDollar[1].value} } case 170: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:467 + //line parser/parser.y:468 { yyVAL.strings = append(yyDollar[1].strings, yyDollar[2].value) } case 171: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:471 + //line parser/parser.y:472 { yyVAL.value = "abstract" } case 172: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:472 + //line parser/parser.y:473 { yyVAL.value = "final" } case 173: yyDollar = yyS[yypt-5 : yypt+1] - //line parser/parser.y:476 + //line parser/parser.y:477 { yyVAL.node = node.NewSimpleNode("Trait").Attribute("name", yyDollar[2].token.String()).Append(yyDollar[4].node) } case 174: yyDollar = yyS[yypt-6 : yypt+1] - //line parser/parser.y:481 + //line parser/parser.y:482 { yyVAL.node = node.NewSimpleNode("Interface"). Attribute("name", yyDollar[2].token.String()). @@ -3096,229 +3096,229 @@ yydefault: } case 175: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:490 + //line parser/parser.y:491 { yyVAL.node = nil } case 176: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:491 + //line parser/parser.y:492 { yyVAL.node = yyDollar[2].node } case 177: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:495 + //line parser/parser.y:496 { yyVAL.node = node.NewSimpleNode("") } case 178: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:496 + //line parser/parser.y:497 { yyVAL.node = yyDollar[2].node } case 179: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:500 + //line parser/parser.y:501 { yyVAL.node = node.NewSimpleNode("") } case 180: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:501 + //line parser/parser.y:502 { yyVAL.node = yyDollar[2].node } case 181: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:505 + //line parser/parser.y:506 { yyVAL.node = yyDollar[1].node } case 182: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:506 + //line parser/parser.y:507 { yyVAL.node = node.NewSimpleNode("Ref").Append(yyDollar[2].node) } case 183: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:507 + //line parser/parser.y:508 { yyVAL.node = node.NewSimpleNode("List").Append(yyDollar[3].node) } case 184: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:508 + //line parser/parser.y:509 { yyVAL.node = node.NewSimpleNode("ShortList").Append(yyDollar[2].node) } case 185: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:512 + //line parser/parser.y:513 { yyVAL.node = yyDollar[1].node } case 186: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:513 + //line parser/parser.y:514 { yyVAL.node = yyDollar[2].node } case 187: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:517 + //line parser/parser.y:518 { yyVAL.node = yyDollar[1].node } case 188: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:518 + //line parser/parser.y:519 { yyVAL.node = yyDollar[2].node } case 189: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:522 + //line parser/parser.y:523 { yyVAL.node = yyDollar[1].node } case 190: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:523 + //line parser/parser.y:524 { yyVAL.node = yyDollar[2].node } case 191: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:527 + //line parser/parser.y:528 { yyVAL.node = yyDollar[2].node } case 192: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:528 + //line parser/parser.y:529 { yyVAL.node = yyDollar[3].node } case 193: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:529 + //line parser/parser.y:530 { yyVAL.node = yyDollar[2].node } case 194: yyDollar = yyS[yypt-5 : yypt+1] - //line parser/parser.y:530 + //line parser/parser.y:531 { yyVAL.node = yyDollar[3].node } case 195: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:534 + //line parser/parser.y:535 { yyVAL.node = node.NewSimpleNode("CaseList") } case 196: yyDollar = yyS[yypt-5 : yypt+1] - //line parser/parser.y:536 + //line parser/parser.y:537 { yyVAL.node = yyDollar[1].node.Append(stmt.NewCase(yyDollar[2].token, yyDollar[3].node, yyDollar[5].node.(node.SimpleNode).Children)) } case 197: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:540 + //line parser/parser.y:541 { yyVAL.node = yyDollar[1].node.Append(stmt.NewDefault(yyDollar[2].token, yyDollar[4].node.(node.SimpleNode).Children)) } case 200: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:551 + //line parser/parser.y:552 { yyVAL.node = yyDollar[1].node } case 201: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:552 + //line parser/parser.y:553 { yyVAL.node = yyDollar[2].node } case 202: yyDollar = yyS[yypt-5 : yypt+1] - //line parser/parser.y:557 + //line parser/parser.y:558 { yyVAL.node = node.NewSimpleNode("If").Append(node.NewSimpleNode("expr").Append(yyDollar[3].node)).Append(node.NewSimpleNode("stmt").Append(yyDollar[5].node)) } case 203: yyDollar = yyS[yypt-6 : yypt+1] - //line parser/parser.y:561 + //line parser/parser.y:562 { yyVAL.node = yyDollar[1].node.Append(node.NewSimpleNode("ElseIf").Append(node.NewSimpleNode("expr").Append(yyDollar[4].node)).Append(node.NewSimpleNode("stmt").Append(yyDollar[6].node))) } case 204: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:567 + //line parser/parser.y:568 { yyVAL.node = yyDollar[1].node } case 205: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:569 + //line parser/parser.y:570 { yyVAL.node = yyDollar[1].node.Append(node.NewSimpleNode("Else").Append(node.NewSimpleNode("stmt").Append(yyDollar[3].node))) } case 206: yyDollar = yyS[yypt-6 : yypt+1] - //line parser/parser.y:576 + //line parser/parser.y:577 { yyVAL.node = node.NewSimpleNode("AltIf").Append(node.NewSimpleNode("expr").Append(yyDollar[3].node)).Append(node.NewSimpleNode("stmt").Append(yyDollar[6].node)) } case 207: yyDollar = yyS[yypt-7 : yypt+1] - //line parser/parser.y:580 + //line parser/parser.y:581 { yyVAL.node = yyDollar[1].node.Append(node.NewSimpleNode("AltElseIf").Append(node.NewSimpleNode("expr").Append(yyDollar[4].node)).Append(node.NewSimpleNode("stmt").Append(yyDollar[7].node))) } case 208: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:586 + //line parser/parser.y:587 { yyVAL.node = yyDollar[1].node } case 209: yyDollar = yyS[yypt-6 : yypt+1] - //line parser/parser.y:588 + //line parser/parser.y:589 { yyVAL.node = yyDollar[1].node.Append(node.NewSimpleNode("AltElse").Append(node.NewSimpleNode("stmt").Append(yyDollar[4].node))) } case 210: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:594 + //line parser/parser.y:595 { yyVAL.node = yyDollar[1].node } case 211: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:595 + //line parser/parser.y:596 { yyVAL.node = node.NewSimpleNode("Parameter list") } case 212: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:599 + //line parser/parser.y:600 { yyVAL.node = node.NewSimpleNode("Parameter list").Append(yyDollar[1].node) } case 213: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:600 + //line parser/parser.y:601 { yyVAL.node = yyDollar[1].node.Append(yyDollar[3].node) } case 214: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:605 + //line parser/parser.y:606 { yyVAL.node = node.NewSimpleNode("Parameter"). Append(yyDollar[1].node). @@ -3328,7 +3328,7 @@ yydefault: } case 215: yyDollar = yyS[yypt-6 : yypt+1] - //line parser/parser.y:613 + //line parser/parser.y:614 { yyVAL.node = node.NewSimpleNode("Parameter"). Append(yyDollar[1].node). @@ -3339,174 +3339,174 @@ yydefault: } case 216: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:624 + //line parser/parser.y:625 { yyVAL.node = node.NewSimpleNode("No type") } case 217: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:625 + //line parser/parser.y:626 { yyVAL.node = yyDollar[1].node } case 218: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:629 + //line parser/parser.y:630 { yyVAL.node = yyDollar[1].node } case 219: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:630 + //line parser/parser.y:631 { yyVAL.node = yyDollar[2].node yyVAL.node.Attribute("nullable", "true") } case 220: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:634 + //line parser/parser.y:635 { yyVAL.node = node.NewSimpleNode("array type") } case 221: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:635 + //line parser/parser.y:636 { yyVAL.node = node.NewSimpleNode("callable type") } case 222: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:636 + //line parser/parser.y:637 { yyVAL.node = yyDollar[1].node } case 223: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:640 + //line parser/parser.y:641 { yyVAL.node = node.NewSimpleNode("No return type") } case 224: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:641 + //line parser/parser.y:642 { yyVAL.node = yyDollar[2].node } case 225: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:645 + //line parser/parser.y:646 { yyVAL.node = node.NewSimpleNode("ArgumentList") } case 226: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:646 + //line parser/parser.y:647 { yyVAL.node = yyDollar[2].node } case 227: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:650 + //line parser/parser.y:651 { yyVAL.node = node.NewSimpleNode("ArgumentList").Append(yyDollar[1].node) } case 228: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:651 + //line parser/parser.y:652 { yyVAL.node = yyDollar[1].node.Append(yyDollar[3].node) } case 229: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:655 + //line parser/parser.y:656 { yyVAL.node = yyDollar[1].node } case 230: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:656 + //line parser/parser.y:657 { yyVAL.node = node.NewSimpleNode("Unpack").Append(yyDollar[2].node) } case 231: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:660 + //line parser/parser.y:661 { yyVAL.node = yyDollar[1].node.Append(yyDollar[3].node) } case 232: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:661 + //line parser/parser.y:662 { yyVAL.node = node.NewSimpleNode("GlobalVarList").Append(yyDollar[1].node) } case 233: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:665 + //line parser/parser.y:666 { yyVAL.node = yyDollar[1].node } case 234: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:669 + //line parser/parser.y:670 { yyVAL.node = yyDollar[1].node.Append(yyDollar[3].node) } case 235: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:670 + //line parser/parser.y:671 { yyVAL.node = node.NewSimpleNode("StaticVarList").Append(yyDollar[1].node) } case 236: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:674 + //line parser/parser.y:675 { yyVAL.node = node.NewSimpleNode("StaticVariable").Attribute("Name", yyDollar[1].token.String()) } case 237: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:675 + //line parser/parser.y:676 { yyVAL.node = node.NewSimpleNode("StaticVariable").Attribute("Name", yyDollar[1].token.String()).Append(node.NewSimpleNode("expr").Append(yyDollar[3].node)) } case 238: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:679 + //line parser/parser.y:680 { yyVAL.node = yyDollar[1].node.Append(yyDollar[2].node) } case 239: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:680 + //line parser/parser.y:681 { yyVAL.node = node.NewSimpleNode("Stmt") } case 240: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:684 + //line parser/parser.y:685 { yyVAL.node = yyDollar[2].node.Append(yyDollar[1].node) } case 241: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:685 + //line parser/parser.y:686 { - yyVAL.node = stmt.NewClassConst(yyDollar[2].token, yyDollar[1].node.(node.SimpleNode).Children, yyDollar[3].node.(node.SimpleNode).Children) + yyVAL.node = stmt.NewClassConst(yyDollar[2].token, yyDollar[1].node.(node.SimpleNode).Children, yyDollar[3].list) } case 242: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:686 + //line parser/parser.y:687 { yyVAL.node = node.NewSimpleNode("Use").Append(yyDollar[2].node).Append(yyDollar[3].node) } case 243: yyDollar = yyS[yypt-9 : yypt+1] - //line parser/parser.y:689 + //line parser/parser.y:690 { yyVAL.node = node.NewSimpleNode("Function"). Append(yyDollar[1].node). - Append(node.NewSimpleNode("name").Append(yyDollar[4].node)). + Attribute("name", yyDollar[4].token.Value). Attribute("returns_ref", yyDollar[3].value). Append(yyDollar[6].node). Append(yyDollar[8].node). @@ -3514,283 +3514,283 @@ yydefault: } case 244: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:701 + //line parser/parser.y:702 { yyVAL.node = node.NewSimpleNode("NameList").Append(yyDollar[1].node) } case 245: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:702 + //line parser/parser.y:703 { yyVAL.node = yyDollar[1].node.Append(yyDollar[3].node) } case 246: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:706 + //line parser/parser.y:707 { yyVAL.node = node.NewSimpleNode("") } case 247: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:707 + //line parser/parser.y:708 { yyVAL.node = node.NewSimpleNode("") } case 248: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:708 + //line parser/parser.y:709 { yyVAL.node = yyDollar[2].node } case 249: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:712 + //line parser/parser.y:713 { yyVAL.node = node.NewSimpleNode("TraitAdaptionList").Append(yyDollar[1].node) } case 250: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:713 + //line parser/parser.y:714 { yyVAL.node = yyDollar[1].node.Append(yyDollar[2].node) } case 251: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:717 + //line parser/parser.y:718 { yyVAL.node = yyDollar[1].node } case 252: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:718 + //line parser/parser.y:719 { yyVAL.node = yyDollar[1].node } case 253: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:723 + //line parser/parser.y:724 { yyVAL.node = node.NewSimpleNode("TraitPrecedence").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 254: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:727 + //line parser/parser.y:728 { yyVAL.node = yyDollar[1].node.Append(node.NewSimpleNode("as").Attribute("value", yyDollar[3].token.String())) } case 255: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:729 + //line parser/parser.y:730 { yyVAL.node = yyDollar[1].node.Append(node.NewSimpleNode("as").Append(node.NewSimpleNode("reservedNonModifiers"))) } case 256: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:731 + //line parser/parser.y:732 { - yyVAL.node = yyDollar[1].node.Append(yyDollar[3].node).Append(yyDollar[4].node) + yyVAL.node = yyDollar[1].node.Append(yyDollar[3].node).Attribute("as", yyDollar[4].token.Value) } case 257: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:732 + //line parser/parser.y:733 { yyVAL.node = yyDollar[1].node.Append(yyDollar[3].node) } case 258: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:736 + //line parser/parser.y:737 { - yyVAL.node = node.NewSimpleNode("TraitMethodRef").Append(yyDollar[1].node) + yyVAL.node = node.NewSimpleNode("TraitMethodRef").Attribute("value", yyDollar[1].token.Value) } case 259: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:737 + //line parser/parser.y:738 { yyVAL.node = yyDollar[1].node } case 260: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:741 + //line parser/parser.y:742 { - yyVAL.node = node.NewSimpleNode("TraitMethodRef").Append(yyDollar[1].node).Append(yyDollar[3].node) + yyVAL.node = node.NewSimpleNode("TraitMethodRef").Append(yyDollar[1].node).Attribute("value", yyDollar[3].token.Value) } case 261: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:745 + //line parser/parser.y:746 { yyVAL.node = node.NewSimpleNode("") } case 262: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:746 + //line parser/parser.y:747 { yyVAL.node = yyDollar[2].node } case 263: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:750 + //line parser/parser.y:751 { yyVAL.node = yyDollar[1].node } case 264: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:751 + //line parser/parser.y:752 { yyVAL.node = node.NewSimpleNode("VarMemberModifier") } case 265: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:755 + //line parser/parser.y:756 { yyVAL.node = node.NewSimpleNode("MemberModifiers").Append(node.NewSimpleNode("PublicMemberModifier")) } case 266: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:756 + //line parser/parser.y:757 { yyVAL.node = yyDollar[1].node } case 267: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:760 + //line parser/parser.y:761 { yyVAL.node = node.NewSimpleNode("MemberModifiers").Append(yyDollar[1].node) } case 268: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:761 + //line parser/parser.y:762 { yyVAL.node = yyDollar[1].node.Append(yyDollar[2].node) } case 269: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:765 + //line parser/parser.y:766 { yyVAL.node = node.NewSimpleNode("PublicMemberModifier") } case 270: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:766 + //line parser/parser.y:767 { yyVAL.node = node.NewSimpleNode("ProtectedMemberModifier") } case 271: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:767 + //line parser/parser.y:768 { yyVAL.node = node.NewSimpleNode("PrivateMemberModifier") } case 272: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:768 + //line parser/parser.y:769 { yyVAL.node = node.NewSimpleNode("StaticMemberModifier") } case 273: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:769 + //line parser/parser.y:770 { yyVAL.node = node.NewSimpleNode("AbstractMemberModifier") } case 274: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:770 + //line parser/parser.y:771 { yyVAL.node = node.NewSimpleNode("FinalMemberModifier") } case 275: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:774 + //line parser/parser.y:775 { yyVAL.node = yyDollar[1].node.Append(yyDollar[3].node) } case 276: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:775 + //line parser/parser.y:776 { yyVAL.node = node.NewSimpleNode("PropertyList").Append(yyDollar[1].node) } case 277: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:779 + //line parser/parser.y:780 { yyVAL.node = node.NewSimpleNode("Property").Attribute("name", yyDollar[1].token.String()) } case 278: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:780 + //line parser/parser.y:781 { yyVAL.node = node.NewSimpleNode("Property").Attribute("name", yyDollar[1].token.String()).Append(node.NewSimpleNode("Default").Append(yyDollar[3].node)) } case 279: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:784 + //line parser/parser.y:785 { - yyVAL.node = yyDollar[1].node.Append(yyDollar[3].node) + yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) } case 280: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:785 + //line parser/parser.y:786 { - yyVAL.node = node.NewSimpleNode("ConstList").Append(yyDollar[1].node) + yyVAL.list = []node.Node{yyDollar[1].node} } case 281: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:789 + //line parser/parser.y:790 { - yyVAL.node = node.NewSimpleNode("Const").Append(yyDollar[1].node).Append(yyDollar[3].node) + yyVAL.node = stmt.NewConstant(yyDollar[1].token, yyDollar[3].node) } case 282: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:793 + //line parser/parser.y:794 { - yyVAL.node = node.NewSimpleNode("Const").Attribute("name", yyDollar[1].token.String()).Append(yyDollar[3].node) + yyVAL.node = stmt.NewConstant(yyDollar[1].token, yyDollar[3].node) } case 283: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:797 + //line parser/parser.y:798 { yyVAL.node = yyDollar[1].node.Append(yyDollar[3].node) } case 284: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:798 + //line parser/parser.y:799 { yyVAL.node = node.NewSimpleNode("EchoList").Append(yyDollar[1].node) } case 285: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:802 + //line parser/parser.y:803 { yyVAL.node = node.NewSimpleNode("Echo").Append(yyDollar[1].node) } case 286: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:806 + //line parser/parser.y:807 { yyVAL.node = node.NewSimpleNode("") } case 287: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:807 + //line parser/parser.y:808 { yyVAL.node = yyDollar[1].node } case 288: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:810 + //line parser/parser.y:811 { yyVAL.node = yyDollar[1].node.Append(yyDollar[3].node) } case 289: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:811 + //line parser/parser.y:812 { yyVAL.node = node.NewSimpleNode("ExpressionList").Append(yyDollar[1].node) } case 290: yyDollar = yyS[yypt-7 : yypt+1] - //line parser/parser.y:816 + //line parser/parser.y:817 { { 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) @@ -3798,463 +3798,463 @@ yydefault: } case 291: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:822 + //line parser/parser.y:823 { yyVAL.node = node.NewSimpleNode("New").Append(yyDollar[2].node).Append(yyDollar[3].node) } case 292: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:823 + //line parser/parser.y:824 { yyVAL.node = node.NewSimpleNode("New").Append(yyDollar[2].node) } case 293: yyDollar = yyS[yypt-6 : yypt+1] - //line parser/parser.y:827 + //line parser/parser.y:828 { yyVAL.node = node.NewSimpleNode("Assign").Append(yyDollar[3].node).Append(yyDollar[6].node) } case 294: yyDollar = yyS[yypt-5 : yypt+1] - //line parser/parser.y:828 + //line parser/parser.y:829 { yyVAL.node = node.NewSimpleNode("Assign").Append(yyDollar[2].node).Append(yyDollar[5].node) } case 295: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:829 + //line parser/parser.y:830 { yyVAL.node = node.NewSimpleNode("Assign").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 296: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:830 + //line parser/parser.y:831 { yyVAL.node = node.NewSimpleNode("AssignRef").Append(yyDollar[1].node).Append(yyDollar[4].node) } case 297: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:831 + //line parser/parser.y:832 { yyVAL.node = node.NewSimpleNode("Clone").Append(yyDollar[2].node) } case 298: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:832 + //line parser/parser.y:833 { yyVAL.node = node.NewSimpleNode("AssignAdd").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 299: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:833 + //line parser/parser.y:834 { yyVAL.node = node.NewSimpleNode("AssignSub").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 300: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:834 + //line parser/parser.y:835 { yyVAL.node = node.NewSimpleNode("AssignMul").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 301: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:835 + //line parser/parser.y:836 { yyVAL.node = node.NewSimpleNode("AssignPow").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 302: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:836 + //line parser/parser.y:837 { yyVAL.node = node.NewSimpleNode("AssignDiv").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 303: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:837 + //line parser/parser.y:838 { yyVAL.node = node.NewSimpleNode("AssignConcat").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 304: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:838 + //line parser/parser.y:839 { yyVAL.node = node.NewSimpleNode("AssignMod").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 305: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:839 + //line parser/parser.y:840 { yyVAL.node = node.NewSimpleNode("AssignAnd").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 306: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:840 + //line parser/parser.y:841 { yyVAL.node = node.NewSimpleNode("AssignOr").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 307: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:841 + //line parser/parser.y:842 { yyVAL.node = node.NewSimpleNode("AssignXor").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 308: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:842 + //line parser/parser.y:843 { yyVAL.node = node.NewSimpleNode("AssignShiftLeft").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 309: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:843 + //line parser/parser.y:844 { yyVAL.node = node.NewSimpleNode("AssignShiftRight").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 310: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:844 + //line parser/parser.y:845 { yyVAL.node = node.NewSimpleNode("PostIncrement").Append(yyDollar[1].node) } case 311: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:845 + //line parser/parser.y:846 { yyVAL.node = node.NewSimpleNode("PreIncrement").Append(yyDollar[2].node) } case 312: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:846 + //line parser/parser.y:847 { yyVAL.node = node.NewSimpleNode("PostDecrement").Append(yyDollar[1].node) } case 313: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:847 + //line parser/parser.y:848 { yyVAL.node = node.NewSimpleNode("PreDecrement").Append(yyDollar[2].node) } case 314: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:848 + //line parser/parser.y:849 { yyVAL.node = node.NewSimpleNode("Or").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 315: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:849 + //line parser/parser.y:850 { yyVAL.node = node.NewSimpleNode("And").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 316: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:850 + //line parser/parser.y:851 { yyVAL.node = node.NewSimpleNode("Or").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 317: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:851 + //line parser/parser.y:852 { yyVAL.node = node.NewSimpleNode("And").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 318: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:852 + //line parser/parser.y:853 { yyVAL.node = node.NewSimpleNode("Xor").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 319: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:853 + //line parser/parser.y:854 { yyVAL.node = node.NewSimpleNode("BitwiseOr").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 320: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:854 + //line parser/parser.y:855 { yyVAL.node = node.NewSimpleNode("BitwiseAnd").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 321: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:855 + //line parser/parser.y:856 { yyVAL.node = node.NewSimpleNode("BitwiseXor").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 322: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:856 + //line parser/parser.y:857 { yyVAL.node = node.NewSimpleNode("Concat").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 323: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:857 + //line parser/parser.y:858 { yyVAL.node = node.NewSimpleNode("Add").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 324: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:858 + //line parser/parser.y:859 { yyVAL.node = node.NewSimpleNode("Sub").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 325: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:859 + //line parser/parser.y:860 { yyVAL.node = node.NewSimpleNode("Mul").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 326: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:860 + //line parser/parser.y:861 { yyVAL.node = node.NewSimpleNode("Pow").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 327: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:861 + //line parser/parser.y:862 { yyVAL.node = node.NewSimpleNode("Div").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 328: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:862 + //line parser/parser.y:863 { yyVAL.node = node.NewSimpleNode("Mod").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 329: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:863 + //line parser/parser.y:864 { yyVAL.node = node.NewSimpleNode("ShiftLeft").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 330: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:864 + //line parser/parser.y:865 { yyVAL.node = node.NewSimpleNode("ShiftRight").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 331: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:865 + //line parser/parser.y:866 { yyVAL.node = node.NewSimpleNode("UnaryPlus").Append(yyDollar[2].node) } case 332: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:866 + //line parser/parser.y:867 { yyVAL.node = node.NewSimpleNode("UnaryMinus").Append(yyDollar[2].node) } case 333: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:867 + //line parser/parser.y:868 { yyVAL.node = node.NewSimpleNode("BooleanNot").Append(yyDollar[2].node) } case 334: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:868 + //line parser/parser.y:869 { yyVAL.node = node.NewSimpleNode("BitwiseNot").Append(yyDollar[2].node) } case 335: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:869 + //line parser/parser.y:870 { yyVAL.node = node.NewSimpleNode("Identical").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 336: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:870 + //line parser/parser.y:871 { yyVAL.node = node.NewSimpleNode("NotIdentical").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 337: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:871 + //line parser/parser.y:872 { yyVAL.node = node.NewSimpleNode("Equal").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 338: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:872 + //line parser/parser.y:873 { yyVAL.node = node.NewSimpleNode("NotEqual").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 339: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:873 + //line parser/parser.y:874 { yyVAL.node = node.NewSimpleNode("Smaller").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 340: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:874 + //line parser/parser.y:875 { yyVAL.node = node.NewSimpleNode("SmallerOrEqual").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 341: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:875 + //line parser/parser.y:876 { yyVAL.node = node.NewSimpleNode("Greater").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 342: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:876 + //line parser/parser.y:877 { yyVAL.node = node.NewSimpleNode("GreaterOrEqual").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 343: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:877 + //line parser/parser.y:878 { yyVAL.node = node.NewSimpleNode("Spaceship").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 344: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:878 + //line parser/parser.y:879 { yyVAL.node = node.NewSimpleNode("InstanceOf").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 345: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:879 + //line parser/parser.y:880 { yyVAL.node = yyDollar[2].node } case 346: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:880 + //line parser/parser.y:881 { yyVAL.node = yyDollar[1].node } case 347: yyDollar = yyS[yypt-5 : yypt+1] - //line parser/parser.y:881 + //line parser/parser.y:882 { yyVAL.node = node.NewSimpleNode("Ternary").Append(yyDollar[1].node).Append(yyDollar[3].node).Append(yyDollar[5].node) } case 348: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:882 + //line parser/parser.y:883 { yyVAL.node = node.NewSimpleNode("Ternary").Append(yyDollar[1].node).Append(yyDollar[4].node) } case 349: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:883 + //line parser/parser.y:884 { yyVAL.node = node.NewSimpleNode("Coalesce").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 350: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:884 + //line parser/parser.y:885 { yyVAL.node = yyDollar[1].node } case 351: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:885 + //line parser/parser.y:886 { yyVAL.node = node.NewSimpleNode("CastInt").Append(yyDollar[2].node) } case 352: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:886 + //line parser/parser.y:887 { yyVAL.node = node.NewSimpleNode("CastDouble").Append(yyDollar[2].node) } case 353: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:887 + //line parser/parser.y:888 { yyVAL.node = node.NewSimpleNode("CastString").Append(yyDollar[2].node) } case 354: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:888 + //line parser/parser.y:889 { yyVAL.node = node.NewSimpleNode("CastArray").Append(yyDollar[2].node) } case 355: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:889 + //line parser/parser.y:890 { yyVAL.node = node.NewSimpleNode("CastObject").Append(yyDollar[2].node) } case 356: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:890 + //line parser/parser.y:891 { yyVAL.node = node.NewSimpleNode("CastBool").Append(yyDollar[2].node) } case 357: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:891 + //line parser/parser.y:892 { yyVAL.node = node.NewSimpleNode("CastUnset").Append(yyDollar[2].node) } case 358: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:892 + //line parser/parser.y:893 { yyVAL.node = node.NewSimpleNode("Exit").Append(yyDollar[2].node) } case 359: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:893 + //line parser/parser.y:894 { yyVAL.node = node.NewSimpleNode("Silence").Append(yyDollar[2].node) } case 360: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:894 + //line parser/parser.y:895 { yyVAL.node = yyDollar[1].node } case 361: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:895 + //line parser/parser.y:896 { yyVAL.node = node.NewNodeExprShellExec(yyDollar[1].token, yyDollar[2].list, yyDollar[3].token) } case 362: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:896 + //line parser/parser.y:897 { yyVAL.node = node.NewSimpleNode("Print").Append(yyDollar[2].node) } case 363: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:897 + //line parser/parser.y:898 { yyVAL.node = node.NewSimpleNode("Yield") } case 364: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:898 + //line parser/parser.y:899 { yyVAL.node = node.NewSimpleNode("Yield").Append(yyDollar[2].node) } case 365: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:899 + //line parser/parser.y:900 { yyVAL.node = node.NewSimpleNode("Yield").Append(yyDollar[2].node).Append(yyDollar[4].node) } case 366: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:900 + //line parser/parser.y:901 { yyVAL.node = node.NewSimpleNode("YieldFrom").Append(yyDollar[2].node) } case 367: yyDollar = yyS[yypt-10 : yypt+1] - //line parser/parser.y:902 + //line parser/parser.y:903 { yyVAL.node = node.NewSimpleNode("Closure"). Attribute("returns_ref", yyDollar[2].value). @@ -4265,7 +4265,7 @@ yydefault: } case 368: yyDollar = yyS[yypt-11 : yypt+1] - //line parser/parser.y:911 + //line parser/parser.y:912 { yyVAL.node = node.NewSimpleNode("StaticClosure"). Attribute("returns_ref", yyDollar[3].value). @@ -4276,553 +4276,553 @@ yydefault: } case 369: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:922 + //line parser/parser.y:923 { yyVAL.value = "false" } case 370: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:923 + //line parser/parser.y:924 { yyVAL.value = "true" } case 371: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:927 + //line parser/parser.y:928 { yyVAL.node = node.NewSimpleNode("") } case 372: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:928 + //line parser/parser.y:929 { yyVAL.node = yyDollar[3].node } case 373: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:932 + //line parser/parser.y:933 { yyVAL.node = yyDollar[1].node.Append(yyDollar[3].node) } case 374: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:933 + //line parser/parser.y:934 { yyVAL.node = node.NewSimpleNode("ClosureUses").Append(yyDollar[1].node) } case 375: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:937 + //line parser/parser.y:938 { yyVAL.node = node.NewSimpleNode("Variable").Attribute("value", yyDollar[1].token.String()) } case 376: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:938 + //line parser/parser.y:939 { yyVAL.node = node.NewSimpleNode("Variable").Attribute("value", yyDollar[2].token.String()).Attribute("ref", "true") } case 377: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:942 + //line parser/parser.y:943 { yyVAL.node = node.NewSimpleNode("FunctionCall").Append(yyDollar[1].node).Append(yyDollar[2].node) } case 378: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:944 + //line parser/parser.y:945 { yyVAL.node = node.NewSimpleNode("StaticCall").Append(yyDollar[1].node).Append(yyDollar[3].node).Append(yyDollar[4].node) } case 379: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:946 + //line parser/parser.y:947 { yyVAL.node = node.NewSimpleNode("StaticCall").Append(yyDollar[1].node).Append(yyDollar[3].node).Append(yyDollar[4].node) } case 380: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:947 + //line parser/parser.y:948 { yyVAL.node = node.NewSimpleNode("Call").Append(yyDollar[1].node).Append(yyDollar[2].node) } case 381: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:951 + //line parser/parser.y:952 { yyVAL.node = node.NewSimpleNode("Static") } case 382: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:952 + //line parser/parser.y:953 { yyVAL.node = yyDollar[1].node } case 383: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:956 + //line parser/parser.y:957 { yyVAL.node = yyDollar[1].node } case 384: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:957 + //line parser/parser.y:958 { yyVAL.node = yyDollar[1].node } case 385: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:961 + //line parser/parser.y:962 { yyVAL.node = node.NewSimpleNode("") } case 386: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:962 + //line parser/parser.y:963 { yyVAL.node = yyDollar[2].node } case 387: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:966 + //line parser/parser.y:967 { yyVAL.list = []node.Node{} } case 388: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:967 + //line parser/parser.y:968 { yyVAL.list = []node.Node{scalar.NewEncapsedStringPart(yyDollar[1].token)} } case 389: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:968 + //line parser/parser.y:969 { yyVAL.list = yyDollar[1].list } case 390: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:972 + //line parser/parser.y:973 { yyVAL.node = node.NewSimpleNode("ArgumentList") } case 391: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:973 + //line parser/parser.y:974 { yyVAL.node = yyDollar[1].node } case 392: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:977 + //line parser/parser.y:978 { yyVAL.node = yyDollar[3].node } case 393: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:978 + //line parser/parser.y:979 { yyVAL.node = yyDollar[2].node } case 394: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:979 + //line parser/parser.y:980 { yyVAL.node = scalar.NewString(yyDollar[1].token) } case 395: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:983 + //line parser/parser.y:984 { yyVAL.node = scalar.NewLnumber(yyDollar[1].token) } case 396: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:984 + //line parser/parser.y:985 { yyVAL.node = scalar.NewDnumber(yyDollar[1].token) } case 397: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:985 + //line parser/parser.y:986 { yyVAL.node = scalar.NewMagicConstant(yyDollar[1].token) } case 398: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:986 + //line parser/parser.y:987 { yyVAL.node = scalar.NewMagicConstant(yyDollar[1].token) } case 399: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:987 + //line parser/parser.y:988 { yyVAL.node = scalar.NewMagicConstant(yyDollar[1].token) } case 400: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:988 + //line parser/parser.y:989 { yyVAL.node = scalar.NewMagicConstant(yyDollar[1].token) } case 401: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:989 + //line parser/parser.y:990 { yyVAL.node = scalar.NewMagicConstant(yyDollar[1].token) } case 402: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:990 + //line parser/parser.y:991 { yyVAL.node = scalar.NewMagicConstant(yyDollar[1].token) } case 403: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:991 + //line parser/parser.y:992 { yyVAL.node = scalar.NewMagicConstant(yyDollar[1].token) } case 404: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:992 + //line parser/parser.y:993 { yyVAL.node = scalar.NewMagicConstant(yyDollar[1].token) } case 405: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:994 + //line parser/parser.y:995 { yyVAL.node = scalar.NewString(yyDollar[2].token) /* TODO: mark as Heredoc*/ } case 406: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:996 + //line parser/parser.y:997 { yyVAL.node = scalar.NewEncapsed(yyDollar[1].token, nil, yyDollar[2].token) } case 407: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:997 + //line parser/parser.y:998 { yyVAL.node = scalar.NewEncapsed(yyDollar[1].token, yyDollar[2].list, yyDollar[3].token) } case 408: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:998 + //line parser/parser.y:999 { yyVAL.node = scalar.NewEncapsed(yyDollar[1].token, yyDollar[2].list, yyDollar[3].token) } case 409: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:999 + //line parser/parser.y:1000 { yyVAL.node = yyDollar[1].node } case 410: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1000 + //line parser/parser.y:1001 { yyVAL.node = yyDollar[1].node } case 411: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1004 + //line parser/parser.y:1005 { yyVAL.node = node.NewSimpleNode("Const").Append(yyDollar[1].node) } case 412: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1005 + //line parser/parser.y:1006 { - yyVAL.node = node.NewSimpleNode("Const").Append(yyDollar[1].node).Append(yyDollar[3].node) + yyVAL.node = node.NewSimpleNode("Const").Append(yyDollar[1].node).Attribute("value", yyDollar[3].token.Value) } case 413: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1007 + //line parser/parser.y:1008 { - yyVAL.node = node.NewSimpleNode("Const").Append(yyDollar[1].node).Append(yyDollar[3].node) + yyVAL.node = node.NewSimpleNode("Const").Append(yyDollar[1].node).Attribute("value", yyDollar[3].token.Value) } case 414: - yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1011 - { - yyVAL.node = yyDollar[1].node - } - case 415: yyDollar = yyS[yypt-1 : yypt+1] //line parser/parser.y:1012 { yyVAL.node = yyDollar[1].node } + case 415: + yyDollar = yyS[yypt-1 : yypt+1] + //line parser/parser.y:1013 + { + yyVAL.node = yyDollar[1].node + } case 416: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:1016 + //line parser/parser.y:1017 { yyVAL.node = node.NewSimpleNode("") } case 417: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1017 + //line parser/parser.y:1018 { yyVAL.node = yyDollar[1].node } case 418: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1021 + //line parser/parser.y:1022 { yyVAL.node = yyDollar[1].node } case 419: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1025 + //line parser/parser.y:1026 { yyVAL.node = yyDollar[1].node } case 420: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1026 + //line parser/parser.y:1027 { yyVAL.node = yyDollar[2].node } case 421: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1027 + //line parser/parser.y:1028 { yyVAL.node = yyDollar[1].node } case 422: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1031 + //line parser/parser.y:1032 { yyVAL.node = yyDollar[1].node } case 423: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1032 + //line parser/parser.y:1033 { yyVAL.node = yyDollar[2].node } case 424: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1033 + //line parser/parser.y:1034 { yyVAL.node = yyDollar[1].node } case 425: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1037 + //line parser/parser.y:1038 { yyVAL.node = yyDollar[1].node } case 426: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1038 + //line parser/parser.y:1039 { yyVAL.node = node.NewSimpleNode("Dim").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 427: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1039 + //line parser/parser.y:1040 { yyVAL.node = node.NewSimpleNode("Dim").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 428: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1040 + //line parser/parser.y:1041 { yyVAL.node = node.NewSimpleNode("Dim").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 429: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1042 + //line parser/parser.y:1043 { yyVAL.node = node.NewSimpleNode("MethodCall").Append(yyDollar[1].node).Append(yyDollar[3].node).Append(yyDollar[4].node) } case 430: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1043 + //line parser/parser.y:1044 { yyVAL.node = yyDollar[1].node } case 431: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1047 + //line parser/parser.y:1048 { yyVAL.node = yyDollar[1].node } case 432: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1048 + //line parser/parser.y:1049 { yyVAL.node = yyDollar[1].node } case 433: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1049 + //line parser/parser.y:1050 { yyVAL.node = node.NewSimpleNode("Property").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 434: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1053 + //line parser/parser.y:1054 { yyVAL.node = node.NewSimpleNode("Variable").Attribute("name", yyDollar[1].token.String()) } case 435: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1054 + //line parser/parser.y:1055 { yyVAL.node = node.NewSimpleNode("Variable").Append(yyDollar[3].node) } case 436: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1055 + //line parser/parser.y:1056 { yyVAL.node = node.NewSimpleNode("Variable").Append(yyDollar[2].node) } case 437: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1060 + //line parser/parser.y:1061 { yyVAL.node = node.NewSimpleNode("StaticProp").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 438: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1062 + //line parser/parser.y:1063 { yyVAL.node = node.NewSimpleNode("StaticProp").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 439: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1066 + //line parser/parser.y:1067 { yyVAL.node = yyDollar[1].node } case 440: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1067 + //line parser/parser.y:1068 { yyVAL.node = node.NewSimpleNode("Dim").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 441: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1068 + //line parser/parser.y:1069 { yyVAL.node = node.NewSimpleNode("Dim").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 442: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1069 + //line parser/parser.y:1070 { yyVAL.node = node.NewSimpleNode("Property").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 443: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1071 + //line parser/parser.y:1072 { yyVAL.node = node.NewSimpleNode("StaticProperty").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 444: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1073 + //line parser/parser.y:1074 { yyVAL.node = node.NewSimpleNode("StaticProperty").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 445: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1077 + //line parser/parser.y:1078 { - yyVAL.node = yyDollar[1].node + yyVAL.node = node.NewSimpleNode("MemberName").Attribute("value", yyDollar[1].token.Value) } case 446: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1078 + //line parser/parser.y:1079 { yyVAL.node = yyDollar[2].node } case 447: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1079 + //line parser/parser.y:1080 { yyVAL.node = yyDollar[1].node } case 448: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1083 + //line parser/parser.y:1084 { yyVAL.node = node.NewSimpleNode("PropertyName").Attribute("value", yyDollar[1].token.String()) } case 449: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1084 + //line parser/parser.y:1085 { yyVAL.node = yyDollar[2].node } case 450: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1085 + //line parser/parser.y:1086 { yyVAL.node = yyDollar[1].node } case 451: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1089 + //line parser/parser.y:1090 { /* TODO: allow single trailing comma */ yyVAL.node = yyDollar[1].node } case 452: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:1093 + //line parser/parser.y:1094 { yyVAL.node = node.NewSimpleNode("") } case 453: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1094 + //line parser/parser.y:1095 { yyVAL.node = yyDollar[1].node } case 454: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1099 + //line parser/parser.y:1100 { yyVAL.node = yyDollar[1].node.Append(yyDollar[3].node) } case 455: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1100 + //line parser/parser.y:1101 { yyVAL.node = node.NewSimpleNode("ArrayPairList").Append(yyDollar[1].node) } case 456: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1104 + //line parser/parser.y:1105 { yyVAL.node = node.NewSimpleNode("ArrayElement").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 457: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1105 + //line parser/parser.y:1106 { yyVAL.node = node.NewSimpleNode("ArrayElement").Append(yyDollar[1].node) } case 458: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1106 + //line parser/parser.y:1107 { yyVAL.node = node.NewSimpleNode("ArrayElement").Append(yyDollar[1].node).Append(node.NewSimpleNode("Ref").Append(yyDollar[4].node)) } case 459: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1107 + //line parser/parser.y:1108 { yyVAL.node = node.NewSimpleNode("ArrayElement").Append(node.NewSimpleNode("Ref").Append(yyDollar[2].node)) } case 460: yyDollar = yyS[yypt-6 : yypt+1] - //line parser/parser.y:1109 + //line parser/parser.y:1110 { yyVAL.node = node.NewSimpleNode("ArrayElement"). Append(yyDollar[1].node). @@ -4830,158 +4830,158 @@ yydefault: } case 461: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1115 + //line parser/parser.y:1116 { yyVAL.node = node.NewSimpleNode("ArrayElement"). Append(node.NewSimpleNode("ArrayList").Append(yyDollar[3].node)) } case 462: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1122 + //line parser/parser.y:1123 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].node) } case 463: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1123 + //line parser/parser.y:1124 { yyVAL.list = append(yyDollar[1].list, scalar.NewEncapsedStringPart(yyDollar[2].token)) } case 464: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1124 + //line parser/parser.y:1125 { yyVAL.list = []node.Node{yyDollar[1].node} } case 465: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1125 + //line parser/parser.y:1126 { yyVAL.list = []node.Node{scalar.NewEncapsedStringPart(yyDollar[1].token), yyDollar[2].node} } case 466: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1129 + //line parser/parser.y:1130 { yyVAL.node = node.NewSimpleNode("Variable").Attribute("value", yyDollar[1].token.String()) } case 467: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1130 + //line parser/parser.y:1131 { yyVAL.node = node.NewSimpleNode("Variable").Attribute("value", yyDollar[1].token.String()).Append(node.NewSimpleNode("offset").Append(yyDollar[3].node)) } case 468: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1131 + //line parser/parser.y:1132 { yyVAL.node = node.NewSimpleNode("Variable").Attribute("value", yyDollar[1].token.String()).Append(node.NewSimpleNode("property").Attribute("value", yyDollar[3].token.String())) } case 469: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1132 + //line parser/parser.y:1133 { yyVAL.node = node.NewSimpleNode("Variable").Append(node.NewSimpleNode("expr").Append(yyDollar[2].node)) } case 470: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1133 + //line parser/parser.y:1134 { yyVAL.node = node.NewSimpleNode("Variable").Attribute("value", yyDollar[2].token.String()) } case 471: yyDollar = yyS[yypt-6 : yypt+1] - //line parser/parser.y:1135 + //line parser/parser.y:1136 { yyVAL.node = node.NewSimpleNode("Variable").Attribute("value", yyDollar[2].token.String()).Append(node.NewSimpleNode("offset").Append(yyDollar[4].node)) } case 472: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1136 + //line parser/parser.y:1137 { yyVAL.node = yyDollar[2].node } case 473: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1139 + //line parser/parser.y:1140 { yyVAL.node = node.NewSimpleNode("OffsetString").Attribute("value", yyDollar[1].token.String()) } case 474: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1140 + //line parser/parser.y:1141 { yyVAL.node = node.NewSimpleNode("OffsetNumString").Attribute("value", yyDollar[1].token.String()) } case 475: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1141 + //line parser/parser.y:1142 { yyVAL.node = node.NewSimpleNode("OffsetNegateNumString").Attribute("value", yyDollar[2].token.String()) } case 476: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1142 + //line parser/parser.y:1143 { yyVAL.node = node.NewSimpleNode("OffsetVariable").Attribute("value", yyDollar[1].token.String()) } case 477: yyDollar = yyS[yypt-5 : yypt+1] - //line parser/parser.y:1146 + //line parser/parser.y:1147 { yyVAL.node = yyDollar[3].node } case 478: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1147 + //line parser/parser.y:1148 { yyVAL.node = node.NewSimpleNode("Empty").Append(yyDollar[3].node) } case 479: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1148 + //line parser/parser.y:1149 { yyVAL.node = node.NewSimpleNode("Include").Append(yyDollar[2].node) } case 480: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1149 + //line parser/parser.y:1150 { yyVAL.node = node.NewSimpleNode("IncludeOnce").Append(yyDollar[2].node) } case 481: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1150 + //line parser/parser.y:1151 { yyVAL.node = node.NewSimpleNode("Eval").Append(yyDollar[3].node) } case 482: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1151 + //line parser/parser.y:1152 { yyVAL.node = node.NewSimpleNode("Require").Append(yyDollar[2].node) } case 483: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1152 + //line parser/parser.y:1153 { yyVAL.node = node.NewSimpleNode("RequireOnce").Append(yyDollar[2].node) } case 484: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1156 + //line parser/parser.y:1157 { yyVAL.node = yyDollar[1].node } case 485: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1157 + //line parser/parser.y:1158 { yyVAL.node = node.NewSimpleNode("AndIsset").Append(yyDollar[1].node).Append(yyDollar[3].node) } case 486: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1161 + //line parser/parser.y:1162 { yyVAL.node = node.NewSimpleNode("Isset").Append(yyDollar[1].node) } diff --git a/parser/parser.y b/parser/parser.y index cafb52e..dd04b26 100644 --- a/parser/parser.y +++ b/parser/parser.y @@ -176,6 +176,7 @@ func Parse(src io.Reader, fName string) node.Node { %type reserved_non_modifiers %type semi_reserved +%type identifier %type top_statement name statement function_declaration_statement %type class_declaration_statement trait_declaration_statement @@ -194,24 +195,24 @@ func Parse(src io.Reader, fName string) node.Node { %type variable_class_name dereferencable_scalar constant dereferencable %type callable_expr callable_variable static_member new_variable %type encaps_var encaps_var_offset isset_variables -%type top_statement_list use_declarations const_list inner_statement_list if_stmt +%type top_statement_list use_declarations inner_statement_list if_stmt %type alt_if_stmt for_exprs switch_case_list global_var_list static_var_list %type echo_expr_list unset_variables parameter_list class_statement_list %type implements_list case_list if_stmt_without_else %type non_empty_parameter_list argument_list non_empty_argument_list property_list -%type class_const_list class_const_decl name_list trait_adaptations method_body non_empty_for_exprs +%type class_const_decl name_list trait_adaptations method_body non_empty_for_exprs %type ctor_arguments alt_if_stmt_without_else trait_adaptation_list lexical_vars %type lexical_var_list %type array_pair non_empty_array_pair_list array_pair_list possible_array_pair %type isset_variable type return_type type_expr -%type identifier %type variable_modifiers %type method_modifiers non_empty_member_modifiers member_modifier %type use_type %type class_modifiers -%type encaps_list backticks_expr namespace_name catch_name_list catch_list +%type encaps_list backticks_expr namespace_name catch_name_list catch_list class_const_list +%type const_list %% @@ -237,8 +238,8 @@ semi_reserved: ; identifier: - T_STRING { $$ = node.TokenNode("identifier", $1) } - | semi_reserved { $$ = node.TokenNode("identifier", $1) } + T_STRING { $$ = $1 } + | semi_reserved { $$ = $1 } ; top_statement_list: @@ -272,7 +273,7 @@ top_statement: | T_USE use_type group_use_declaration ';' { $$ = $3.Append($2) } | T_USE use_declarations ';' { $$ = $2; } | T_USE use_type use_declarations ';' { $$ = $3.Append($2) } - | T_CONST const_list ';' { $$ = $2; } + | T_CONST const_list ';' { $$ = stmt.NewStmtConst($1, $2) } ; use_type: @@ -332,8 +333,8 @@ use_declaration: ; const_list: - const_list ',' const_decl { $$ = $1.Append($3) } - | const_decl { $$ = node.NewSimpleNode("ConstList").Append($1) } + const_list ',' const_decl { $$ = append($1, $3) } + | const_decl { $$ = []node.Node{$1} } ; inner_statement_list: @@ -399,7 +400,7 @@ statement: Append(node.NewSimpleNode("ForeachVariable").Append($7)). Append($9); } - | T_DECLARE '(' const_list ')' declare_statement { $$ = node.NewSimpleNode("Declare").Append($3).Append($5) } + | T_DECLARE '(' const_list ')' declare_statement { $$ = stmt.NewDeclare($1, $3, $5.(node.SimpleNode).Children) } | ';' /* empty statement */ { $$ = node.NewSimpleNode(""); } | T_TRY '{' inner_statement_list '}' catch_list finally_statement { @@ -682,14 +683,14 @@ class_statement_list: class_statement: variable_modifiers property_list ';' { $$ = $2.Append($1) } - | method_modifiers T_CONST class_const_list ';' { $$ = stmt.NewClassConst($2, $1.(node.SimpleNode).Children, $3.(node.SimpleNode).Children); } + | method_modifiers T_CONST class_const_list ';' { $$ = stmt.NewClassConst($2, $1.(node.SimpleNode).Children, $3); } | T_USE name_list trait_adaptations { $$ = node.NewSimpleNode("Use").Append($2).Append($3); } | method_modifiers T_FUNCTION returns_ref identifier '(' parameter_list ')' return_type method_body { $$ = node.NewSimpleNode("Function"). Append($1). - Append(node.NewSimpleNode("name").Append($4)). + Attribute("name", $4.Value). Attribute("returns_ref", $3). Append($6). Append($8). @@ -728,17 +729,17 @@ trait_alias: | trait_method_reference T_AS reserved_non_modifiers { $$ = $1.Append(node.NewSimpleNode("as").Append(node.NewSimpleNode("reservedNonModifiers"))); } | trait_method_reference T_AS member_modifier identifier - { $$ = $1.Append($3).Append($4); } + { $$ = $1.Append($3).Attribute("as", $4.Value); } | trait_method_reference T_AS member_modifier { $$ = $1.Append($3); } ; trait_method_reference: - identifier { $$ = node.NewSimpleNode("TraitMethodRef").Append($1); } + identifier { $$ = node.NewSimpleNode("TraitMethodRef").Attribute("value", $1.Value); } | absolute_trait_method_reference { $$ = $1; } ; absolute_trait_method_reference: - name T_PAAMAYIM_NEKUDOTAYIM identifier { $$ = node.NewSimpleNode("TraitMethodRef").Append($1).Append($3) } + name T_PAAMAYIM_NEKUDOTAYIM identifier { $$ = node.NewSimpleNode("TraitMethodRef").Append($1).Attribute("value", $3.Value) } ; method_body: @@ -781,16 +782,16 @@ property: ; class_const_list: - class_const_list ',' class_const_decl { $$ = $1.Append($3) } - | class_const_decl { $$ = node.NewSimpleNode("ConstList").Append($1) } + class_const_list ',' class_const_decl { $$ = append($1, $3) } + | class_const_decl { $$ = []node.Node{$1} } ; class_const_decl: - identifier '=' expr { $$ = node.NewSimpleNode("Const").Append($1).Append($3) } + identifier '=' expr { $$ = stmt.NewConstant($1, $3) } ; const_decl: - T_STRING '=' expr { $$ = node.NewSimpleNode("Const").Attribute("name", $1.String()).Append($3) } + T_STRING '=' expr { $$ = stmt.NewConstant($1, $3) } ; echo_expr_list: @@ -1002,9 +1003,9 @@ scalar: constant: name { $$ = node.NewSimpleNode("Const").Append($1) } - | class_name T_PAAMAYIM_NEKUDOTAYIM identifier { $$ = node.NewSimpleNode("Const").Append($1).Append($3) } + | class_name T_PAAMAYIM_NEKUDOTAYIM identifier { $$ = node.NewSimpleNode("Const").Append($1).Attribute("value", $3.Value) } | variable_class_name T_PAAMAYIM_NEKUDOTAYIM identifier - { $$ = node.NewSimpleNode("Const").Append($1).Append($3) } + { $$ = node.NewSimpleNode("Const").Append($1).Attribute("value", $3.Value) } ; expr: @@ -1074,7 +1075,7 @@ new_variable: ; member_name: - identifier { $$ = $1; } + identifier { $$ = node.NewSimpleNode("MemberName").Attribute("value", $1.Value); } | '{' expr '}' { $$ = $2; } | simple_variable { $$ = $1 } ;