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

Merge branch 'php5syntax'

Browse Source
This commit is contained in:
z7zmey
2018-02-04 21:48:38 +02:00
parent ca889c1e78 3eb29f456a
commit 048e281914
29 changed files with 13434 additions and 2801 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
node/stmt/alt_if.go
View File

@@ -14,12 +14,12 @@ type AltIf struct {
}
// NewAltIf node constuctor
func NewAltIf(Cond node.Node, Stmt node.Node) *AltIf {
func NewAltIf(Cond node.Node, Stmt node.Node, ElseIf []node.Node, Else node.Node) *AltIf {
return &AltIf{
Cond,
Stmt,
nil,
nil,
ElseIf,
Else,
}
}

10
node/stmt/alt_if_test.go
View File

@@ -10,7 +10,7 @@ import (
"github.com/kylelemons/godebug/pretty"
"github.com/z7zmey/php-parser/node"
"github.com/z7zmey/php-parser/node/stmt"
"github.com/z7zmey/php-parser/parser"
"github.com/z7zmey/php-parser/php7"
)
func assertEqual(t *testing.T, expected interface{}, actual interface{}) {
@@ -41,7 +41,7 @@ func TestAltIf(t *testing.T) {
},
}
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@@ -68,7 +68,7 @@ func TestAltElseIf(t *testing.T) {
},
}
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@@ -92,7 +92,7 @@ func TestAltElse(t *testing.T) {
},
}
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@@ -128,7 +128,7 @@ func TestAltElseElseIf(t *testing.T) {
},
}
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

16
node/stmt/if.go
View File

@@ -10,16 +10,16 @@ type If struct {
Cond node.Node
Stmt node.Node
ElseIf []node.Node
_else node.Node
Else node.Node
}
// NewIf node constuctor
func NewIf(Cond node.Node, Stmt node.Node) *If {
func NewIf(Cond node.Node, Stmt node.Node, ElseIf []node.Node, Else node.Node) *If {
return &If{
Cond,
Stmt,
nil,
nil,
ElseIf,
Else,
}
}
@@ -38,8 +38,8 @@ func (n *If) AddElseIf(ElseIf node.Node) node.Node {
return n
}
func (n *If) SetElse(_else node.Node) node.Node {
n._else = _else
func (n *If) SetElse(Else node.Node) node.Node {
n.Else = Else
return n
}
@@ -70,9 +70,9 @@ func (n *If) Walk(v walker.Visitor) {
}
}
if n._else != nil {
if n.Else != nil {
vv := v.GetChildrenVisitor("else")
n._else.Walk(vv)
n.Else.Walk(vv)
}
v.LeaveNode(n)