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

pretty printer: update StmtList printer

Browse Source
This commit is contained in:
z7zmey 2018-04-02 22:59:55 +03:00
parent c3664b9fbf
commit 29c79fcf7b
2 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
printer/printer.go
View File

@ -1533,9 +1533,8 @@ func printStmtDeclare(o io.Writer, n node.Node) {
Print(o, s) Print(o, s)
break break
case *stmt.StmtList: case *stmt.StmtList:
io.WriteString(o, " {\n") io.WriteString(o, " ")
printNodes(o, s.Stmts) Print(o, s)
io.WriteString(o, "\n}")
default: default:
io.WriteString(o, "\n") io.WriteString(o, "\n")
Print(o, s) Print(o, s)
@ -1558,9 +1557,9 @@ func printStmtDo(o io.Writer, n node.Node) {
switch s := nn.Stmt.(type) { switch s := nn.Stmt.(type) {
case *stmt.StmtList: case *stmt.StmtList:
io.WriteString(o, " {\n") io.WriteString(o, " ")
printNodes(o, s.Stmts) Print(o, s)
io.WriteString(o, "\n} ") io.WriteString(o, " ")
default: default:
io.WriteString(o, "\n") io.WriteString(o, "\n")
Print(o, s) Print(o, s)
@ -1591,9 +1590,8 @@ func printStmtElseif(o io.Writer, n node.Node) {
Print(o, s) Print(o, s)
break break
case *stmt.StmtList: case *stmt.StmtList:
io.WriteString(o, " {\n") io.WriteString(o, " ")
printNodes(o, s.Stmts) Print(o, s)
io.WriteString(o, "\n}")
default: default:
io.WriteString(o, "\n") io.WriteString(o, "\n")
Print(o, s) Print(o, s)
@ -1610,9 +1608,8 @@ func printStmtElse(o io.Writer, n node.Node) {
Print(o, s) Print(o, s)
break break
case *stmt.StmtList: case *stmt.StmtList:
io.WriteString(o, " {\n") io.WriteString(o, " ")
printNodes(o, s.Stmts) Print(o, s)
io.WriteString(o, "\n}")
default: default:
io.WriteString(o, "\n") io.WriteString(o, "\n")
Print(o, s) Print(o, s)
@ -1651,9 +1648,8 @@ func printStmtFor(o io.Writer, n node.Node) {
Print(o, s) Print(o, s)
break break
case *stmt.StmtList: case *stmt.StmtList:
io.WriteString(o, " {\n") io.WriteString(o, " ")
printNodes(o, s.Stmts) Print(o, s)
io.WriteString(o, "\n}")
default: default:
io.WriteString(o, "\n") io.WriteString(o, "\n")
Print(o, s) Print(o, s)
@ -1683,9 +1679,8 @@ func printStmtForeach(o io.Writer, n node.Node) {
Print(o, s) Print(o, s)
break break
case *stmt.StmtList: case *stmt.StmtList:
io.WriteString(o, " {\n") io.WriteString(o, " ")
printNodes(o, s.Stmts) Print(o, s)
io.WriteString(o, "\n}")
default: default:
io.WriteString(o, "\n") io.WriteString(o, "\n")
Print(o, s) Print(o, s)
@ -1765,9 +1760,8 @@ func printStmtIf(o io.Writer, n node.Node) {
Print(o, s) Print(o, s)
break break
case *stmt.StmtList: case *stmt.StmtList:
io.WriteString(o, " {\n") io.WriteString(o, " ")
printNodes(o, s.Stmts) Print(o, s)
io.WriteString(o, "\n}")
default: default:
io.WriteString(o, "\n") io.WriteString(o, "\n")
Print(o, s) Print(o, s)
@ -1891,7 +1885,9 @@ func printStmtStatic(o io.Writer, n node.Node) {
func printStmtStmtList(o io.Writer, n node.Node) { func printStmtStmtList(o io.Writer, n node.Node) {
nn := n.(*stmt.StmtList) nn := n.(*stmt.StmtList)
io.WriteString(o, "{\n")
printNodes(o, nn.Stmts) printNodes(o, nn.Stmts)
io.WriteString(o, "\n}")
} }
func printStmtSwitch(o io.Writer, n node.Node) { func printStmtSwitch(o io.Writer, n node.Node) {
@ -2045,9 +2041,8 @@ func printStmtWhile(o io.Writer, n node.Node) {
Print(o, s) Print(o, s)
break break
case *stmt.StmtList: case *stmt.StmtList:
io.WriteString(o, " {\n") io.WriteString(o, " ")
printNodes(o, s.Stmts) Print(o, s)
io.WriteString(o, "\n}")
default: default:
io.WriteString(o, "\n") io.WriteString(o, "\n")
Print(o, s) Print(o, s)

6
printer/printer_test.go
View File

@ -3158,8 +3158,10 @@ func TestPrintStmtList(t *testing.T) {
}, },
}) })
expected := `$a; expected := `{
$b;` $a;
$b;
}`
actual := o.String() actual := o.String()
if expected != actual { if expected != actual {