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

[refactoring] update ast structure of "If", "ElseIf", "Else" nodes

Browse Source
This commit is contained in:
Vadym Slizov
2020-09-03 22:18:06 +03:00
parent 954208510e
commit 6976388a82
21 changed files with 1777 additions and 1817 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/php5/parser_test.go
+18 -9
View File
@@ -3660,7 +3660,7 @@ func TestStmtAltIf_AltIf(t *testing.T) {
},
},
Stmts: []ast.Vertex{
&ast.StmtAltIf{
&ast.StmtIf{
Node: ast.Node{
Position: &position.Position{
StartLine: 2,
@@ -3669,6 +3669,7 @@ func TestStmtAltIf_AltIf(t *testing.T) {
EndPos: 23,
},
},
Alt: true,
Cond: &ast.ExprVariable{
Node: ast.Node{
Position: &position.Position{
@@ -3731,7 +3732,7 @@ func TestStmtAltIf_AltElseIf(t *testing.T) {
},
},
Stmts: []ast.Vertex{
&ast.StmtAltIf{
&ast.StmtIf{
Node: ast.Node{
Position: &position.Position{
StartLine: 2,
@@ -3740,6 +3741,7 @@ func TestStmtAltIf_AltElseIf(t *testing.T) {
EndPos: 38,
},
},
Alt: true,
Cond: &ast.ExprVariable{
Node: ast.Node{
Position: &position.Position{
@@ -3773,7 +3775,7 @@ func TestStmtAltIf_AltElseIf(t *testing.T) {
Stmts: []ast.Vertex{},
},
ElseIf: []ast.Vertex{
&ast.StmtAltElseIf{
&ast.StmtElseIf{
Node: ast.Node{
Position: &position.Position{
StartLine: 3,
@@ -3782,6 +3784,7 @@ func TestStmtAltIf_AltElseIf(t *testing.T) {
EndPos: -1,
},
},
Alt: true,
Cond: &ast.ExprVariable{
Node: ast.Node{
Position: &position.Position{
@@ -3846,7 +3849,7 @@ func TestStmtAltIf_AltElse(t *testing.T) {
},
},
Stmts: []ast.Vertex{
&ast.StmtAltIf{
&ast.StmtIf{
Node: ast.Node{
Position: &position.Position{
StartLine: 2,
@@ -3855,6 +3858,7 @@ func TestStmtAltIf_AltElse(t *testing.T) {
EndPos: 31,
},
},
Alt: true,
Cond: &ast.ExprVariable{
Node: ast.Node{
Position: &position.Position{
@@ -3887,7 +3891,7 @@ func TestStmtAltIf_AltElse(t *testing.T) {
},
Stmts: []ast.Vertex{},
},
Else: &ast.StmtAltElse{
Else: &ast.StmtElse{
Node: ast.Node{
Position: &position.Position{
StartLine: 3,
@@ -3896,6 +3900,7 @@ func TestStmtAltIf_AltElse(t *testing.T) {
EndPos: -1,
},
},
Alt: true,
Stmt: &ast.StmtStmtList{
Node: ast.Node{
Position: &position.Position{
@@ -3940,7 +3945,7 @@ func TestStmtAltIf_AltElseElseIf(t *testing.T) {
},
},
Stmts: []ast.Vertex{
&ast.StmtAltIf{
&ast.StmtIf{
Node: ast.Node{
Position: &position.Position{
StartLine: 2,
@@ -3949,6 +3954,7 @@ func TestStmtAltIf_AltElseElseIf(t *testing.T) {
EndPos: 61,
},
},
Alt: true,
Cond: &ast.ExprVariable{
Node: ast.Node{
Position: &position.Position{
@@ -3982,7 +3988,7 @@ func TestStmtAltIf_AltElseElseIf(t *testing.T) {
Stmts: []ast.Vertex{},
},
ElseIf: []ast.Vertex{
&ast.StmtAltElseIf{
&ast.StmtElseIf{
Node: ast.Node{
Position: &position.Position{
StartLine: 3,
@@ -3991,6 +3997,7 @@ func TestStmtAltIf_AltElseElseIf(t *testing.T) {
EndPos: -1,
},
},
Alt: true,
Cond: &ast.ExprVariable{
Node: ast.Node{
Position: &position.Position{
@@ -4024,7 +4031,7 @@ func TestStmtAltIf_AltElseElseIf(t *testing.T) {
Stmts: []ast.Vertex{},
},
},
&ast.StmtAltElseIf{
&ast.StmtElseIf{
Node: ast.Node{
Position: &position.Position{
StartLine: 4,
@@ -4033,6 +4040,7 @@ func TestStmtAltIf_AltElseElseIf(t *testing.T) {
EndPos: -1,
},
},
Alt: true,
Cond: &ast.ExprVariable{
Node: ast.Node{
Position: &position.Position{
@@ -4067,7 +4075,7 @@ func TestStmtAltIf_AltElseElseIf(t *testing.T) {
},
},
},
Else: &ast.StmtAltElse{
Else: &ast.StmtElse{
Node: ast.Node{
Position: &position.Position{
StartLine: 5,
@@ -4076,6 +4084,7 @@ func TestStmtAltIf_AltElseElseIf(t *testing.T) {
EndPos: -1,
},
},
Alt: true,
Stmt: &ast.StmtStmtList{
Node: ast.Node{
Position: &position.Position{