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

3
pkg/ast/ast.go
View File

@@ -27,11 +27,8 @@ type NodeVisitor interface {
ArgumentList(n *ArgumentList)
Argument(n *Argument)
StmtAltElse(n *StmtAltElse)
StmtAltElseIf(n *StmtAltElseIf)
StmtAltFor(n *StmtAltFor)
StmtAltForeach(n *StmtAltForeach)
StmtAltIf(n *StmtAltIf)
StmtAltSwitch(n *StmtAltSwitch)
StmtAltWhile(n *StmtAltWhile)
StmtBreak(n *StmtBreak)

67
pkg/ast/node.go
View File

@@ -175,27 +175,6 @@ func (n *ScalarString) Accept(v NodeVisitor) {
v.ScalarString(n)
}
// StmtAltElse node
type StmtAltElse struct {
Node
Stmt Vertex
}
func (n *StmtAltElse) Accept(v NodeVisitor) {
v.StmtAltElse(n)
}
// StmtAltElseIf node
type StmtAltElseIf struct {
Node
Cond Vertex
Stmt Vertex
}
func (n *StmtAltElseIf) Accept(v NodeVisitor) {
v.StmtAltElseIf(n)
}
// StmtAltFor node
type StmtAltFor struct {
Node
@@ -222,19 +201,6 @@ func (n *StmtAltForeach) Accept(v NodeVisitor) {
v.StmtAltForeach(n)
}
// StmtAltIf node
type StmtAltIf struct {
Node
Cond Vertex
Stmt Vertex
ElseIf []Vertex
Else Vertex
}
func (n *StmtAltIf) Accept(v NodeVisitor) {
v.StmtAltIf(n)
}
// StmtAltSwitch node
type StmtAltSwitch struct {
Node
@@ -444,7 +410,10 @@ func (n *StmtEcho) Accept(v NodeVisitor) {
// StmtElse node
type StmtElse struct {
Node
Stmt Vertex
Alt bool
ElseTkn *token.Token
ColonTkn *token.Token
Stmt Vertex
}
func (n *StmtElse) Accept(v NodeVisitor) {
@@ -454,8 +423,13 @@ func (n *StmtElse) Accept(v NodeVisitor) {
// StmtElseIf node
type StmtElseIf struct {
Node
Cond Vertex
Stmt Vertex
Alt bool
ElseIfTkn *token.Token
OpenParenthesisTkn *token.Token
Cond Vertex
CloseParenthesisTkn *token.Token
ColonTkn *token.Token
Stmt Vertex
}
func (n *StmtElseIf) Accept(v NodeVisitor) {
@@ -558,10 +532,17 @@ func (n *StmtHaltCompiler) Accept(v NodeVisitor) {
// StmtIf node
type StmtIf struct {
Node
Cond Vertex
Stmt Vertex
ElseIf []Vertex
Else Vertex
Alt bool
IfTkn *token.Token
OpenParenthesisTkn *token.Token
Cond Vertex
CloseParenthesisTkn *token.Token
ColonTkn *token.Token
Stmt Vertex
ElseIf []Vertex
Else Vertex
EndIfTkn *token.Token
SemiColonTkn *token.Token
}
func (n *StmtIf) Accept(v NodeVisitor) {
@@ -1918,7 +1899,9 @@ func (n *ParserNsSeparator) Accept(v NodeVisitor) {
type ParserBrackets struct {
Node
Child Vertex
OpenBracketTkn *token.Token
Child Vertex
CloseBracketTkn *token.Token
}
func (n *ParserBrackets) Accept(v NodeVisitor) {

58
pkg/ast/traverser/dfs.go
View File

@@ -119,35 +119,6 @@ func (t *DFS) Traverse(n ast.Vertex) {
t.Traverse(nn.Expr)
t.visitor.Leave("Expr", true)
}
case *ast.StmtAltElse:
if nn == nil {
return
}
if !t.visitor.EnterNode(nn) {
return
}
if nn.Stmt != nil {
t.visitor.Enter("Stmt", true)
t.Traverse(nn.Stmt)
t.visitor.Leave("Stmt", true)
}
case *ast.StmtAltElseIf:
if nn == nil {
return
}
if !t.visitor.EnterNode(nn) {
return
}
if nn.Cond != nil {
t.visitor.Enter("Cond", true)
t.Traverse(nn.Cond)
t.visitor.Leave("Cond", true)
}
if nn.Stmt != nil {
t.visitor.Enter("Stmt", true)
t.Traverse(nn.Stmt)
t.visitor.Leave("Stmt", true)
}
case *ast.StmtAltFor:
if nn == nil {
return
@@ -208,35 +179,6 @@ func (t *DFS) Traverse(n ast.Vertex) {
t.Traverse(nn.Stmt)
t.visitor.Leave("Stmt", true)
}
case *ast.StmtAltIf:
if nn == nil {
return
}
if !t.visitor.EnterNode(nn) {
return
}
if nn.Cond != nil {
t.visitor.Enter("Cond", true)
t.Traverse(nn.Cond)
t.visitor.Leave("Cond", true)
}
if nn.Stmt != nil {
t.visitor.Enter("Stmt", true)
t.Traverse(nn.Stmt)
t.visitor.Leave("Stmt", true)
}
if nn.ElseIf != nil {
t.visitor.Enter("ElseIf", false)
for _, c := range nn.ElseIf {
t.Traverse(c)
}
t.visitor.Leave("ElseIf", false)
}
if nn.Else != nil {
t.visitor.Enter("Else", true)
t.Traverse(nn.Else)
t.visitor.Leave("Else", true)
}
case *ast.StmtAltSwitch:
if nn == nil {
return

33
pkg/ast/visitor/dump.go
View File

@@ -252,18 +252,6 @@ func (v *Dump) Argument(n *ast.Argument) {
}
}
func (v *Dump) StmtAltElse(n *ast.StmtAltElse) {
v.printIndentIfNotSingle(v.indent - 1)
v.print("&ast.StmtAltElse{\n")
v.printNode(n.GetNode())
}
func (v *Dump) StmtAltElseIf(n *ast.StmtAltElseIf) {
v.printIndentIfNotSingle(v.indent - 1)
v.print("&ast.StmtAltElseIf{\n")
v.printNode(n.GetNode())
}
func (v *Dump) StmtAltFor(n *ast.StmtAltFor) {
v.printIndentIfNotSingle(v.indent - 1)
v.print("&ast.StmtAltFor{\n")
@@ -276,12 +264,6 @@ func (v *Dump) StmtAltForeach(n *ast.StmtAltForeach) {
v.printNode(n.GetNode())
}
func (v *Dump) StmtAltIf(n *ast.StmtAltIf) {
v.printIndentIfNotSingle(v.indent - 1)
v.print("&ast.StmtAltIf{\n")
v.printNode(n.GetNode())
}
func (v *Dump) StmtAltSwitch(n *ast.StmtAltSwitch) {
v.printIndentIfNotSingle(v.indent - 1)
v.print("&ast.StmtAltSwitch{\n")
@@ -404,12 +386,22 @@ func (v *Dump) StmtElse(n *ast.StmtElse) {
v.printIndentIfNotSingle(v.indent - 1)
v.print("&ast.StmtElse{\n")
v.printNode(n.GetNode())
if n.Alt {
v.printIndent(v.indent)
v.print("Alt: true,\n")
}
}
func (v *Dump) StmtElseIf(n *ast.StmtElseIf) {
v.printIndentIfNotSingle(v.indent - 1)
v.print("&ast.StmtElseIf{\n")
v.printNode(n.GetNode())
if n.Alt {
v.printIndent(v.indent)
v.print("Alt: true,\n")
}
}
func (v *Dump) StmtExpression(n *ast.StmtExpression) {
@@ -469,6 +461,11 @@ func (v *Dump) StmtIf(n *ast.StmtIf) {
v.printIndentIfNotSingle(v.indent - 1)
v.print("&ast.StmtIf{\n")
v.printNode(n.GetNode())
if n.Alt {
v.printIndent(v.indent)
v.print("Alt: true,\n")
}
}
func (v *Dump) StmtInlineHtml(n *ast.StmtInlineHtml) {

54
pkg/ast/visitor/filter_parser_nodes.go
View File

@@ -13,60 +13,6 @@ func (v *FilterParserNodes) EnterNode(n ast.Vertex) bool {
return true
}
func (v *FilterParserNodes) StmtAltIf(n *ast.StmtAltIf) {
for {
if nn, ok := n.Cond.(*ast.ParserBrackets); ok {
n.Cond = nn.Child
} else {
break
}
}
if nn, ok := n.Stmt.(*ast.ParserBrackets); ok {
n.Stmt = nn.Child
}
}
func (v *FilterParserNodes) StmtAltElseIf(n *ast.StmtAltElseIf) {
for {
if nn, ok := n.Cond.(*ast.ParserBrackets); ok {
n.Cond = nn.Child
} else {
break
}
}
if nn, ok := n.Stmt.(*ast.ParserBrackets); ok {
n.Stmt = nn.Child
}
}
func (v *FilterParserNodes) StmtAltElse(n *ast.StmtAltElse) {
if nn, ok := n.Stmt.(*ast.ParserBrackets); ok {
n.Stmt = nn.Child
}
}
func (v *FilterParserNodes) StmtIf(n *ast.StmtIf) {
for {
if nn, ok := n.Cond.(*ast.ParserBrackets); ok {
n.Cond = nn.Child
} else {
break
}
}
}
func (v *FilterParserNodes) StmtElseIf(n *ast.StmtElseIf) {
for {
if nn, ok := n.Cond.(*ast.ParserBrackets); ok {
n.Cond = nn.Child
} else {
break
}
}
}
func (v *FilterParserNodes) StmtWhile(n *ast.StmtWhile) {
for {
if nn, ok := n.Cond.(*ast.ParserBrackets); ok {

26
pkg/ast/visitor/filter_tokens.go
View File

@@ -87,3 +87,29 @@ func (v *FilterTokens) StmtStmtList(n *ast.StmtStmtList) {
n.OpenCurlyBracket = nil
n.CloseCurlyBracket = nil
}
func (v *FilterTokens) StmtIf(n *ast.StmtIf) {
n.IfTkn = nil
n.OpenParenthesisTkn = nil
n.CloseParenthesisTkn = nil
n.ColonTkn = nil
n.EndIfTkn = nil
n.SemiColonTkn = nil
}
func (v *FilterTokens) StmtElseIf(n *ast.StmtElseIf) {
n.ElseIfTkn = nil
n.OpenParenthesisTkn = nil
n.CloseParenthesisTkn = nil
n.ColonTkn = nil
}
func (v *FilterTokens) StmtElse(n *ast.StmtElse) {
n.ElseTkn = nil
n.ColonTkn = nil
}
func (v *FilterTokens) ParserBrackets(n *ast.ParserBrackets) {
n.OpenBracketTkn = nil
n.CloseBracketTkn = nil
}

12
pkg/ast/visitor/null.go
View File

@@ -54,14 +54,6 @@ func (v *Null) Argument(_ *ast.Argument) {
// do nothing
}
func (v *Null) StmtAltElse(_ *ast.StmtAltElse) {
// do nothing
}
func (v *Null) StmtAltElseIf(_ *ast.StmtAltElseIf) {
// do nothing
}
func (v *Null) StmtAltFor(_ *ast.StmtAltFor) {
// do nothing
}
@@ -70,10 +62,6 @@ func (v *Null) StmtAltForeach(_ *ast.StmtAltForeach) {
// do nothing
}
func (v *Null) StmtAltIf(_ *ast.StmtAltIf) {
// do nothing
}
func (v *Null) StmtAltSwitch(_ *ast.StmtAltSwitch) {
// do nothing
}