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

[refactoring] update ast structure of "ClassMethod", "Function", "ArrowFunction" and "Closure" nodes

Browse Source
This commit is contained in:
Vadym Slizov
2020-11-22 14:26:24 +02:00
parent 4c54c56af5
commit 2d6ae3a9a2
8 changed files with 1204 additions and 1303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/printer/pretty_printer.go
View File

@@ -1015,13 +1015,13 @@ func (p *PrettyPrinter) printExprClosureUse(n ast.Vertex) {
func (p *PrettyPrinter) printExprClosure(n ast.Vertex) {
nn := n.(*ast.ExprClosure)
if nn.Static {
if nn.StaticTkn != nil {
io.WriteString(p.w, "static ")
}
io.WriteString(p.w, "function ")
if nn.ReturnsRef {
if nn.AmpersandTkn != nil {
io.WriteString(p.w, "&")
}
@@ -1432,7 +1432,7 @@ func (p *PrettyPrinter) printStmtClassMethod(n ast.Vertex) {
}
io.WriteString(p.w, "function ")
if nn.ReturnsRef {
if nn.AmpersandTkn != nil {
io.WriteString(p.w, "&")
}
@@ -1785,7 +1785,7 @@ func (p *PrettyPrinter) printStmtFunction(n ast.Vertex) {
io.WriteString(p.w, "function ")
if nn.ReturnsRef {
if nn.AmpersandTkn != nil {
io.WriteString(p.w, "&")
}

16
pkg/printer/printer.go
View File

@@ -1405,18 +1405,18 @@ func (p *Printer) printExprArrowFunction(n ast.Vertex) {
nn := n.(*ast.ExprArrowFunction)
p.printFreeFloating(nn, token.Start)
if nn.Static {
if nn.StaticTkn != nil {
p.write([]byte("static"))
}
p.printFreeFloating(nn, token.Static)
if nn.Static && n.GetNode().Tokens.IsEmpty() {
if nn.StaticTkn != nil && n.GetNode().Tokens.IsEmpty() {
p.write([]byte(" "))
}
p.write([]byte("fn"))
p.printFreeFloating(nn, token.Function)
if nn.ReturnsRef {
if nn.AmpersandTkn != nil {
p.write([]byte("&"))
}
p.printFreeFloating(nn, token.Ampersand)
@@ -1496,18 +1496,18 @@ func (p *Printer) printExprClosure(n ast.Vertex) {
nn := n.(*ast.ExprClosure)
p.printFreeFloating(nn, token.Start)
if nn.Static {
if nn.StaticTkn != nil {
p.write([]byte("static"))
}
p.printFreeFloating(nn, token.Static)
if nn.Static && n.GetNode().Tokens.IsEmpty() {
if nn.StaticTkn != nil && n.GetNode().Tokens.IsEmpty() {
p.write([]byte(" "))
}
p.write([]byte("function"))
p.printFreeFloating(nn, token.Function)
if nn.ReturnsRef {
if nn.AmpersandTkn != nil {
p.write([]byte("&"))
}
p.printFreeFloating(nn, token.Ampersand)
@@ -2040,7 +2040,7 @@ func (p *Printer) printStmtClassMethod(n ast.Vertex) {
p.write([]byte("function"))
p.printFreeFloating(nn, token.Function)
if nn.ReturnsRef {
if nn.AmpersandTkn != nil {
if nn.GetNode().Tokens.IsEmpty() {
p.write([]byte(" "))
}
@@ -2384,7 +2384,7 @@ func (p *Printer) printStmtFunction(n ast.Vertex) {
p.write([]byte("function"))
p.printFreeFloating(nn, token.Function)
if nn.ReturnsRef {
if nn.AmpersandTkn != nil {
if nn.GetNode().Tokens.IsEmpty() {
p.write([]byte(" "))
}