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

[refactoring] store argument list parenthesis

Browse Source
This commit is contained in:
Vadym Slizov
2020-08-09 01:37:09 +02:00
parent fd5d891037
commit 4aae540aad
7 changed files with 40 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
pkg/printer/printer.go
View File

@@ -1587,12 +1587,9 @@ func (p *Printer) printExprFunctionCall(n ast.Vertex) {
p.Print(nn.Function)
p.printFreeFloating(nn.ArgumentList, token.Start)
io.WriteString(p.w, "(")
p.printFreeFloatingOrDefault(nn.ArgumentList, token.Start, "(")
p.joinPrint(",", nn.ArgumentList.Arguments)
p.printFreeFloating(nn.ArgumentList, token.ArgumentList)
io.WriteString(p.w, ")")
p.printFreeFloating(nn.ArgumentList, token.End)
p.printFreeFloatingOrDefault(nn.ArgumentList, token.End, ")")
p.printFreeFloating(nn, token.End)
}
@@ -1674,12 +1671,9 @@ func (p *Printer) printExprMethodCall(n ast.Vertex) {
io.WriteString(p.w, "->")
p.Print(nn.Method)
p.printFreeFloating(nn.ArgumentList, token.Start)
io.WriteString(p.w, "(")
p.printFreeFloatingOrDefault(nn.ArgumentList, token.Start, "(")
p.joinPrint(",", nn.ArgumentList.Arguments)
p.printFreeFloating(nn.ArgumentList, token.ArgumentList)
io.WriteString(p.w, ")")
p.printFreeFloating(nn.ArgumentList, token.End)
p.printFreeFloatingOrDefault(nn.ArgumentList, token.End, ")")
p.printFreeFloating(nn, token.End)
}
@@ -1693,12 +1687,9 @@ func (p *Printer) printExprNew(n ast.Vertex) {
p.Print(nn.Class)
if nn.ArgumentList != nil {
p.printFreeFloating(nn.ArgumentList, token.Start)
io.WriteString(p.w, "(")
p.printFreeFloatingOrDefault(nn.ArgumentList, token.Start, "(")
p.joinPrint(",", nn.ArgumentList.Arguments)
p.printFreeFloating(nn.ArgumentList, token.ArgumentList)
io.WriteString(p.w, ")")
p.printFreeFloating(nn.ArgumentList, token.End)
p.printFreeFloatingOrDefault(nn.ArgumentList, token.End, ")")
}
p.printFreeFloating(nn, token.End)
@@ -1851,12 +1842,9 @@ func (p *Printer) printExprStaticCall(n ast.Vertex) {
io.WriteString(p.w, "::")
p.Print(nn.Call)
p.printFreeFloating(nn.ArgumentList, token.Start)
io.WriteString(p.w, "(")
p.printFreeFloatingOrDefault(nn.ArgumentList, token.Start, "(")
p.joinPrint(",", nn.ArgumentList.Arguments)
p.printFreeFloating(nn.ArgumentList, token.ArgumentList)
io.WriteString(p.w, ")")
p.printFreeFloating(nn.ArgumentList, token.End)
p.printFreeFloatingOrDefault(nn.ArgumentList, token.End, ")")
p.printFreeFloating(nn, token.End)
}
@@ -2320,12 +2308,9 @@ func (p *Printer) printStmtClass(n ast.Vertex) {
}
if nn.ArgumentList != nil {
p.printFreeFloating(nn.ArgumentList, token.Start)
io.WriteString(p.w, "(")
p.printFreeFloatingOrDefault(nn.ArgumentList, token.Start, "(")
p.joinPrint(",", nn.ArgumentList.Arguments)
p.printFreeFloating(nn.ArgumentList, token.ArgumentList)
io.WriteString(p.w, ")")
p.printFreeFloating(nn.ArgumentList, token.End)
p.printFreeFloatingOrDefault(nn.ArgumentList, token.End, ")")
}
if nn.Extends != nil {