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

[refactoring] update ast structure of "Foreach" node

Browse Source
This commit is contained in:
Vadym Slizov
2020-09-14 18:36:55 +03:00
parent 62fc16da97
commit 69bc0af2be
19 changed files with 1202 additions and 1406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/ast/ast.go
View File

@@ -27,7 +27,6 @@ type NodeVisitor interface {
ArgumentList(n *ArgumentList)
Argument(n *Argument)
StmtAltForeach(n *StmtAltForeach)
StmtBreak(n *StmtBreak)
StmtCase(n *StmtCase)
StmtCatch(n *StmtCatch)

30
pkg/ast/node.go
View File

@@ -175,19 +175,6 @@ func (n *ScalarString) Accept(v NodeVisitor) {
v.ScalarString(n)
}
// StmtAltForeach node
type StmtAltForeach struct {
Node
Expr Vertex
Key Vertex
Var Vertex
Stmt Vertex
}
func (n *StmtAltForeach) Accept(v NodeVisitor) {
v.StmtAltForeach(n)
}
// StmtBreak node
type StmtBreak struct {
Node
@@ -452,10 +439,19 @@ func (n *StmtFor) Accept(v NodeVisitor) {
// StmtForeach node
type StmtForeach struct {
Node
Expr Vertex
Key Vertex
Var Vertex
Stmt Vertex
Alt bool
ForeachTkn *token.Token
OpenParenthesisTkn *token.Token
Expr Vertex
AsTkn *token.Token
Key Vertex
DoubleArrowTkn *token.Token
Var Vertex
CloseParenthesisTkn *token.Token
ColonTkn *token.Token
Stmt Vertex
EndForeachTkn *token.Token
SemiColonTkn *token.Token
}
func (n *StmtForeach) Accept(v NodeVisitor) {

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

@@ -119,33 +119,6 @@ func (t *DFS) Traverse(n ast.Vertex) {
t.Traverse(nn.Expr)
t.visitor.Leave("Expr", true)
}
case *ast.StmtAltForeach:
if nn == nil {
return
}
if !t.visitor.EnterNode(nn) {
return
}
if nn.Expr != nil {
t.visitor.Enter("Expr", true)
t.Traverse(nn.Expr)
t.visitor.Leave("Expr", true)
}
if nn.Key != nil {
t.visitor.Enter("Key", true)
t.Traverse(nn.Key)
t.visitor.Leave("Key", true)
}
if nn.Var != nil {
t.visitor.Enter("Var", true)
t.Traverse(nn.Var)
t.visitor.Leave("Var", true)
}
if nn.Stmt != nil {
t.visitor.Enter("Stmt", true)
t.Traverse(nn.Stmt)
t.visitor.Leave("Stmt", true)
}
case *ast.StmtBreak:
if nn == nil {
return

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

@@ -252,12 +252,6 @@ func (v *Dump) Argument(n *ast.Argument) {
}
}
func (v *Dump) StmtAltForeach(n *ast.StmtAltForeach) {
v.printIndentIfNotSingle(v.indent - 1)
v.print("&ast.StmtAltForeach{\n")
v.printNode(n.GetNode())
}
func (v *Dump) StmtBreak(n *ast.StmtBreak) {
v.printIndentIfNotSingle(v.indent - 1)
v.print("&ast.StmtBreak{\n")

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

@@ -111,26 +111,6 @@ func (v *FilterParserNodes) StmtReturn(n *ast.StmtReturn) {
}
}
func (v *FilterParserNodes) StmtForeach(n *ast.StmtForeach) {
for {
if nn, ok := n.Expr.(*ast.ParserBrackets); ok {
n.Expr = nn.Child
} else {
break
}
}
}
func (v *FilterParserNodes) StmtAltForeach(n *ast.StmtAltForeach) {
for {
if nn, ok := n.Expr.(*ast.ParserBrackets); ok {
n.Expr = nn.Child
} else {
break
}
}
}
func (v *FilterParserNodes) ExprYield(n *ast.ExprYield) {
for {
if nn, ok := n.Key.(*ast.ParserBrackets); ok {

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

@@ -213,3 +213,14 @@ func (v *FilterTokens) StmtUnset(n *ast.StmtUnset) {
n.SemiColonTkn = nil
n.SemiColonTkn = nil
}
func (v *FilterTokens) StmtForeach(n *ast.StmtForeach) {
n.ForeachTkn = nil
n.OpenParenthesisTkn = nil
n.AsTkn = nil
n.DoubleArrowTkn = nil
n.CloseParenthesisTkn = nil
n.ColonTkn = nil
n.EndForeachTkn = nil
n.SemiColonTkn = nil
}

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

@@ -54,10 +54,6 @@ func (v *Null) Argument(_ *ast.Argument) {
// do nothing
}
func (v *Null) StmtAltForeach(_ *ast.StmtAltForeach) {
// do nothing
}
func (v *Null) StmtBreak(_ *ast.StmtBreak) {
// do nothing
}

55
pkg/printer/pretty_printer.go
View File

@@ -297,8 +297,6 @@ func (p *PrettyPrinter) printNode(n ast.Vertex) {
// stmt
case *ast.StmtAltForeach:
p.printStmtAltForeach(n)
case *ast.StmtBreak:
p.printStmtBreak(n)
case *ast.StmtCase:
@@ -1359,30 +1357,6 @@ func (p *PrettyPrinter) printStmtAltElse(n ast.Vertex) {
}
}
func (p *PrettyPrinter) printStmtAltForeach(n ast.Vertex) {
nn := n.(*ast.StmtAltForeach)
io.WriteString(p.w, "foreach (")
p.Print(nn.Expr)
io.WriteString(p.w, " as ")
if nn.Key != nil {
p.Print(nn.Key)
io.WriteString(p.w, " => ")
}
p.Print(nn.Var)
io.WriteString(p.w, ") :\n")
s := nn.Stmt.(*ast.StmtStmtList)
p.printNodes(s.Stmts)
io.WriteString(p.w, "\n")
p.printIndent()
io.WriteString(p.w, "endforeach;")
}
func (p *PrettyPrinter) printStmtAltIf(n ast.Vertex) {
nn := n.(*ast.StmtIf)
@@ -1749,6 +1723,11 @@ func (p *PrettyPrinter) printStmtAltFor(n ast.Vertex) {
func (p *PrettyPrinter) printStmtForeach(n ast.Vertex) {
nn := n.(*ast.StmtForeach)
if nn.Alt {
p.printStmtAltForeach(n)
return
}
io.WriteString(p.w, "foreach (")
p.Print(nn.Expr)
io.WriteString(p.w, " as ")
@@ -1777,6 +1756,30 @@ func (p *PrettyPrinter) printStmtForeach(n ast.Vertex) {
}
}
func (p *PrettyPrinter) printStmtAltForeach(n ast.Vertex) {
nn := n.(*ast.StmtForeach)
io.WriteString(p.w, "foreach (")
p.Print(nn.Expr)
io.WriteString(p.w, " as ")
if nn.Key != nil {
p.Print(nn.Key)
io.WriteString(p.w, " => ")
}
p.Print(nn.Var)
io.WriteString(p.w, ") :\n")
s := nn.Stmt.(*ast.StmtStmtList)
p.printNodes(s.Stmts)
io.WriteString(p.w, "\n")
p.printIndent()
io.WriteString(p.w, "endforeach;")
}
func (p *PrettyPrinter) printStmtFunction(n ast.Vertex) {
nn := n.(*ast.StmtFunction)

3
pkg/printer/pretty_printer_test.go
View File

@@ -2210,7 +2210,8 @@ func TestPrintAltForeach(t *testing.T) {
p := printer.NewPrettyPrinter(o, " ")
p.Print(&ast.StmtNamespace{
Stmts: []ast.Vertex{
&ast.StmtAltForeach{
&ast.StmtForeach{
Alt: true,
Expr: &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("var")}},
Key: &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("key")}},
Var: &ast.ExprReference{Var: &ast.ExprVariable{VarName: &ast.Identifier{Value: []byte("val")}}},

118
pkg/printer/printer.go
View File

@@ -386,8 +386,6 @@ func (p *Printer) printNode(n ast.Vertex) {
// stmt
case *ast.StmtAltForeach:
p.printStmtAltForeach(n)
case *ast.StmtBreak:
p.printStmtBreak(n)
case *ast.StmtCase:
@@ -1996,54 +1994,6 @@ func (p *Printer) printExprYield(n ast.Vertex) {
// smtm
func (p *Printer) printStmtAltForeach(n ast.Vertex) {
nn := n.(*ast.StmtAltForeach)
p.printFreeFloating(nn, token.Start)
p.write([]byte("foreach"))
p.printFreeFloating(nn, token.Foreach)
p.write([]byte("("))
p.Print(nn.Expr)
p.printFreeFloating(nn, token.Expr)
if nn.GetNode().Tokens.IsEmpty() {
p.write([]byte(" "))
}
p.write([]byte("as"))
if nn.Key != nil {
if nn.Key.GetNode().Tokens.IsEmpty() {
p.write([]byte(" "))
}
p.Print(nn.Key)
p.printFreeFloating(nn, token.Key)
p.write([]byte("=>"))
} else {
if nn.Var.GetNode().Tokens.IsEmpty() {
p.write([]byte(" "))
}
}
p.Print(nn.Var)
p.printFreeFloating(nn, token.Var)
p.write([]byte(")"))
p.printFreeFloating(nn, token.Cond)
p.write([]byte(":"))
s := nn.Stmt.(*ast.StmtStmtList)
p.printNodes(s.Stmts)
p.printFreeFloating(nn, token.Stmts)
p.write([]byte("endforeach"))
p.printFreeFloating(nn, token.AltEnd)
p.printFreeFloating(nn, token.SemiColon)
if nn.GetNode().Tokens.IsEmpty() {
p.write([]byte(";"))
}
p.printFreeFloating(nn, token.End)
}
func (p *Printer) printStmtBreak(n *ast.StmtBreak) {
p.printToken(n.BreakTkn, "break")
@@ -2407,42 +2357,50 @@ func (p *Printer) printStmtAltFor(n *ast.StmtFor) {
p.printToken(n.SemiColonTkn, ";")
}
func (p *Printer) printStmtForeach(n ast.Vertex) {
nn := n.(*ast.StmtForeach)
p.printFreeFloating(nn, token.Start)
p.write([]byte("foreach"))
p.printFreeFloating(nn, token.Foreach)
p.write([]byte("("))
p.Print(nn.Expr)
p.printFreeFloating(nn, token.Expr)
if nn.GetNode().Tokens.IsEmpty() {
p.write([]byte(" "))
func (p *Printer) printStmtForeach(n *ast.StmtForeach) {
if n.Alt {
p.printStmtAltForeach(n)
return
}
p.write([]byte("as"))
p.printToken(n.ForeachTkn, "foreach")
p.printToken(n.OpenParenthesisTkn, "(")
p.Print(n.Expr)
p.bufStart = " "
p.printToken(n.AsTkn, "as")
p.bufStart = " "
if n.Key != nil {
p.Print(n.Key)
p.printToken(n.DoubleArrowTkn, "=>")
}
p.Print(n.Var)
p.printToken(n.CloseParenthesisTkn, ")")
p.Print(n.Stmt)
}
if nn.Key != nil {
if nn.Key.GetNode().Tokens.IsEmpty() {
p.write([]byte(" "))
}
p.Print(nn.Key)
p.printFreeFloating(nn, token.Key)
p.write([]byte("=>"))
func (p *Printer) printStmtAltForeach(n *ast.StmtForeach) {
p.printToken(n.ForeachTkn, "foreach")
p.printToken(n.OpenParenthesisTkn, "(")
p.Print(n.Expr)
p.bufStart = " "
p.printToken(n.AsTkn, "as")
p.bufStart = " "
if n.Key != nil {
p.Print(n.Key)
p.printToken(n.DoubleArrowTkn, "=>")
}
p.Print(n.Var)
p.printToken(n.CloseParenthesisTkn, ")")
p.printToken(n.ColonTkn, ":")
if stmtList, ok := n.Stmt.(*ast.StmtStmtList); ok {
p.printNodes(stmtList.Stmts)
} else {
if nn.Var.GetNode().Tokens.IsEmpty() {
p.write([]byte(" "))
}
p.Print(n.Stmt)
}
p.Print(nn.Var)
p.printFreeFloating(nn, token.Var)
p.write([]byte(")"))
p.Print(nn.Stmt)
p.printFreeFloating(nn, token.End)
p.printToken(n.EndForeachTkn, "endforeach")
p.printToken(n.SemiColonTkn, ";")
}
func (p *Printer) printStmtFunction(n ast.Vertex) {

3
pkg/printer/printer_test.go
View File

@@ -2667,7 +2667,8 @@ func TestPrinterPrintAltForeach(t *testing.T) {
o := bytes.NewBufferString("")
p := printer.NewPrinter(o)
p.Print(&ast.StmtAltForeach{
p.Print(&ast.StmtForeach{
Alt: true,
Expr: &ast.ExprVariable{
VarName: &ast.Identifier{Value: []byte("$var")},
},