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

create TraitAdaptationList node

Browse Source
This commit is contained in:
z7zmey
2018-04-29 22:34:24 +03:00
parent 8fc4c60bfe
commit f8d9d6d7c2
14 changed files with 1492 additions and 1326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
node/stmt/n_trait_adaptation_list.go Normal file
View File

@@ -0,0 +1,42 @@
package stmt
import (
"github.com/z7zmey/php-parser/node"
"github.com/z7zmey/php-parser/walker"
)
// TraitAdaptationList node
type TraitAdaptationList struct {
Adaptations []node.Node
}
// NewTraitAdaptationList node constructor
func NewTraitAdaptationList(Adaptations []node.Node) *TraitAdaptationList {
return &TraitAdaptationList{
Adaptations,
}
}
// Attributes returns node attributes as map
func (n *TraitAdaptationList) Attributes() map[string]interface{} {
return nil
}
// Walk traverses nodes
// Walk is invoked recursively until v.EnterNode returns true
func (n *TraitAdaptationList) Walk(v walker.Visitor) {
if v.EnterNode(n) == false {
return
}
if n.Adaptations != nil {
vv := v.GetChildrenVisitor("Adaptations")
for _, nn := range n.Adaptations {
if nn != nil {
nn.Walk(vv)
}
}
}
v.LeaveNode(n)
}

18
node/stmt/n_trait_use.go
View File

@@ -7,15 +7,15 @@ import (
// TraitUse node
type TraitUse struct {
Traits []node.Node
Adaptations []node.Node
Traits []node.Node
TraitAdaptationList *TraitAdaptationList
}
// NewTraitUse node constructor
func NewTraitUse(Traits []node.Node, Adaptations []node.Node) *TraitUse {
func NewTraitUse(Traits []node.Node, InnerAdaptationList *TraitAdaptationList) *TraitUse {
return &TraitUse{
Traits,
Adaptations,
InnerAdaptationList,
}
}
@@ -40,13 +40,9 @@ func (n *TraitUse) Walk(v walker.Visitor) {
}
}
if n.Adaptations != nil {
vv := v.GetChildrenVisitor("Adaptations")
for _, nn := range n.Adaptations {
if nn != nil {
nn.Walk(vv)
}
}
if n.TraitAdaptationList != nil {
vv := v.GetChildrenVisitor("TraitAdaptationList")
n.TraitAdaptationList.Walk(vv)
}
v.LeaveNode(n)

80
node/stmt/t_trait_use_test.go
View File

@@ -2,9 +2,10 @@ package stmt_test
import (
"bytes"
"github.com/z7zmey/php-parser/node/name"
"testing"
"github.com/z7zmey/php-parser/node/name"
"github.com/z7zmey/php-parser/node"
"github.com/z7zmey/php-parser/node/stmt"
"github.com/z7zmey/php-parser/php5"
@@ -106,6 +107,7 @@ func TestTraitsUseEmptyAdaptations(t *testing.T) {
},
},
},
TraitAdaptationList: &stmt.TraitAdaptationList{},
},
},
},
@@ -145,12 +147,14 @@ func TestTraitsUseModifier(t *testing.T) {
},
},
},
Adaptations: []node.Node{
&stmt.TraitUseAlias{
Ref: &stmt.TraitMethodRef{
Method: &node.Identifier{Value: "one"},
TraitAdaptationList: &stmt.TraitAdaptationList{
Adaptations: []node.Node{
&stmt.TraitUseAlias{
Ref: &stmt.TraitMethodRef{
Method: &node.Identifier{Value: "one"},
},
Modifier: &node.Identifier{Value: "public"},
},
Modifier: &node.Identifier{Value: "public"},
},
},
},
@@ -192,13 +196,15 @@ func TestTraitsUseAliasModifier(t *testing.T) {
},
},
},
Adaptations: []node.Node{
&stmt.TraitUseAlias{
Ref: &stmt.TraitMethodRef{
Method: &node.Identifier{Value: "one"},
TraitAdaptationList: &stmt.TraitAdaptationList{
Adaptations: []node.Node{
&stmt.TraitUseAlias{
Ref: &stmt.TraitMethodRef{
Method: &node.Identifier{Value: "one"},
},
Modifier: &node.Identifier{Value: "public"},
Alias: &node.Identifier{Value: "two"},
},
Modifier: &node.Identifier{Value: "public"},
Alias: &node.Identifier{Value: "two"},
},
},
},
@@ -240,39 +246,41 @@ func TestTraitsUseAdaptions(t *testing.T) {
},
},
},
Adaptations: []node.Node{
&stmt.TraitUsePrecedence{
Ref: &stmt.TraitMethodRef{
Trait: &name.Name{
Parts: []node.Node{
&name.NamePart{Value: "Bar"},
TraitAdaptationList: &stmt.TraitAdaptationList{
Adaptations: []node.Node{
&stmt.TraitUsePrecedence{
Ref: &stmt.TraitMethodRef{
Trait: &name.Name{
Parts: []node.Node{
&name.NamePart{Value: "Bar"},
},
},
Method: &node.Identifier{Value: "one"},
},
Method: &node.Identifier{Value: "one"},
},
Insteadof: []node.Node{
&name.Name{
Parts: []node.Node{
&name.NamePart{Value: "Baz"},
Insteadof: []node.Node{
&name.Name{
Parts: []node.Node{
&name.NamePart{Value: "Baz"},
},
},
},
&name.Name{
Parts: []node.Node{
&name.NamePart{Value: "Quux"},
&name.Name{
Parts: []node.Node{
&name.NamePart{Value: "Quux"},
},
},
},
},
},
&stmt.TraitUseAlias{
Ref: &stmt.TraitMethodRef{
Trait: &name.Name{
Parts: []node.Node{
&name.NamePart{Value: "Baz"},
&stmt.TraitUseAlias{
Ref: &stmt.TraitMethodRef{
Trait: &name.Name{
Parts: []node.Node{
&name.NamePart{Value: "Baz"},
},
},
Method: &node.Identifier{Value: "one"},
},
Method: &node.Identifier{Value: "one"},
Alias: &node.Identifier{Value: "two"},
},
Alias: &node.Identifier{Value: "two"},
},
},
},

21
node/stmt/t_visitor_test.go
View File

@@ -92,10 +92,10 @@ var nodesToTest = []struct {
PhpDocComment: "/** */",
ClassName: &node.Identifier{},
Modifiers: []node.Node{&stmt.Expression{}},
ArgumentList: &node.ArgumentList{},
Extends: &node.Identifier{},
Implements: []node.Node{&stmt.Expression{}},
Stmts: []node.Node{&stmt.Expression{}},
ArgumentList: &node.ArgumentList{},
Extends: &node.Identifier{},
Implements: []node.Node{&stmt.Expression{}},
Stmts: []node.Node{&stmt.Expression{}},
},
[]string{"ClassName", "Modifiers", "ArgumentList", "Extends", "Implements", "Stmts"},
map[string]interface{}{"PhpDocComment": "/** */"},
@@ -408,10 +408,10 @@ var nodesToTest = []struct {
},
{
&stmt.TraitUse{
Traits: []node.Node{&stmt.Expression{}},
Adaptations: []node.Node{&stmt.Expression{}},
Traits: []node.Node{&stmt.Expression{}},
TraitAdaptationList: &stmt.TraitAdaptationList{},
},
[]string{"Traits", "Adaptations"},
[]string{"Traits", "TraitAdaptationList"},
map[string]interface{}{},
},
{
@@ -479,6 +479,13 @@ var nodesToTest = []struct {
[]string{"Stmts"},
map[string]interface{}{},
},
{
&stmt.TraitAdaptationList{
Adaptations: []node.Node{&stmt.TraitUsePrecedence{}},
},
[]string{"Adaptations"},
map[string]interface{}{},
},
}
type visitorMock struct {