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

refactoring: update ast structure of "Variable" node

Browse Source
This commit is contained in:
Vadym Slizov 2020-12-27 21:55:36 +02:00
parent 69919594fd
commit 2c09138600
No known key found for this signature in database
GPG Key ID: AEA2A9388EF42A4A
12 changed files with 164 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
internal/php5/parser_test.go
View File

@ -16726,90 +16726,82 @@ func TestStmtGlobal_Vars(t *testing.T) {
}, },
}, },
}, },
VarName: &ast.ParserBrackets{ OpenCurlyBracketTkn: &token.Token{
ID: token.ID(123),
Value: []byte("{"),
Position: &position.Position{ Position: &position.Position{
StartLine: 1, StartLine: 1,
EndLine: 1, EndLine: 1,
StartPos: 24, StartPos: 24,
EndPos: 31, EndPos: 25,
}, },
OpenBracketTkn: &token.Token{ },
ID: token.ID(123), VarName: &ast.ExprFunctionCall{
Value: []byte("{"), Position: &position.Position{
Position: &position.Position{ StartLine: 1,
StartLine: 1, EndLine: 1,
EndLine: 1, StartPos: 25,
StartPos: 24, EndPos: 30,
EndPos: 25,
},
}, },
Child: &ast.ExprFunctionCall{ Function: &ast.NameName{
Position: &position.Position{ Position: &position.Position{
StartLine: 1, StartLine: 1,
EndLine: 1, EndLine: 1,
StartPos: 25, StartPos: 25,
EndPos: 30, EndPos: 28,
}, },
Function: &ast.NameName{ Parts: []ast.Vertex{
Position: &position.Position{ &ast.NameNamePart{
StartLine: 1, Position: &position.Position{
EndLine: 1, StartLine: 1,
StartPos: 25, EndLine: 1,
EndPos: 28, StartPos: 25,
}, EndPos: 28,
Parts: []ast.Vertex{ },
&ast.NameNamePart{ StringTkn: &token.Token{
ID: token.T_STRING,
Value: []byte("foo"),
Position: &position.Position{ Position: &position.Position{
StartLine: 1, StartLine: 1,
EndLine: 1, EndLine: 1,
StartPos: 25, StartPos: 25,
EndPos: 28, EndPos: 28,
}, },
StringTkn: &token.Token{
ID: token.T_STRING,
Value: []byte("foo"),
Position: &position.Position{
StartLine: 1,
EndLine: 1,
StartPos: 25,
EndPos: 28,
},
},
Value: []byte("foo"),
}, },
}, Value: []byte("foo"),
},
OpenParenthesisTkn: &token.Token{
ID: token.ID(40),
Value: []byte("("),
Position: &position.Position{
StartLine: 1,
EndLine: 1,
StartPos: 28,
EndPos: 29,
},
},
CloseParenthesisTkn: &token.Token{
ID: token.ID(41),
Value: []byte(")"),
Position: &position.Position{
StartLine: 1,
EndLine: 1,
StartPos: 29,
EndPos: 30,
}, },
}, },
}, },
CloseBracketTkn: &token.Token{ OpenParenthesisTkn: &token.Token{
ID: token.ID(125), ID: token.ID(40),
Value: []byte("}"), Value: []byte("("),
Position: &position.Position{ Position: &position.Position{
StartLine: 1, StartLine: 1,
EndLine: 1, EndLine: 1,
StartPos: 30, StartPos: 28,
EndPos: 31, EndPos: 29,
}, },
}, },
CloseParenthesisTkn: &token.Token{
ID: token.ID(41),
Value: []byte(")"),
Position: &position.Position{
StartLine: 1,
EndLine: 1,
StartPos: 29,
EndPos: 30,
},
},
},
CloseCurlyBracketTkn: &token.Token{
ID: token.ID(125),
Value: []byte("}"),
Position: &position.Position{
StartLine: 1,
EndLine: 1,
StartPos: 30,
EndPos: 31,
},
}, },
}, },
}, },

BIN
internal/php5/php5.go generated
View File

Binary file not shown.

26
internal/php5/php5.y
View File

@ -2022,14 +2022,11 @@ global_var:
| '$' '{' expr '}' | '$' '{' expr '}'
{ {
$$ = &ast.ExprVariable{ $$ = &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokensPosition($1, $4), Position: yylex.(*Parser).builder.NewTokensPosition($1, $4),
DollarTkn: $1, DollarTkn: $1,
VarName: &ast.ParserBrackets{ OpenCurlyBracketTkn: $2,
Position: yylex.(*Parser).builder.NewTokensPosition($2, $4), VarName: $3,
OpenBracketTkn: $2, CloseCurlyBracketTkn: $4,
Child: $3,
CloseBracketTkn: $4,
},
} }
} }
; ;
@ -5017,14 +5014,11 @@ compound_variable:
| '$' '{' expr '}' | '$' '{' expr '}'
{ {
$$ = &ast.ExprVariable{ $$ = &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokensPosition($1, $4), Position: yylex.(*Parser).builder.NewTokensPosition($1, $4),
DollarTkn: $1, DollarTkn: $1,
VarName: &ast.ParserBrackets{ OpenCurlyBracketTkn: $2,
Position: yylex.(*Parser).builder.NewTokensPosition($2, $4), VarName: $3,
OpenBracketTkn: $2, CloseCurlyBracketTkn: $4,
Child: $3,
CloseBracketTkn: $4,
},
} }
} }
; ;

108
internal/php7/parser_test.go
View File

@ -18412,90 +18412,82 @@ func TestStmtGlobal_Vars(t *testing.T) {
}, },
}, },
}, },
VarName: &ast.ParserBrackets{ OpenCurlyBracketTkn: &token.Token{
ID: token.ID(123),
Value: []byte("{"),
Position: &position.Position{ Position: &position.Position{
StartLine: 1, StartLine: 1,
EndLine: 1, EndLine: 1,
StartPos: 24, StartPos: 24,
EndPos: 31, EndPos: 25,
}, },
OpenBracketTkn: &token.Token{ },
ID: token.ID(123), VarName: &ast.ExprFunctionCall{
Value: []byte("{"), Position: &position.Position{
Position: &position.Position{ StartLine: 1,
StartLine: 1, EndLine: 1,
EndLine: 1, StartPos: 25,
StartPos: 24, EndPos: 30,
EndPos: 25,
},
}, },
Child: &ast.ExprFunctionCall{ Function: &ast.NameName{
Position: &position.Position{ Position: &position.Position{
StartLine: 1, StartLine: 1,
EndLine: 1, EndLine: 1,
StartPos: 25, StartPos: 25,
EndPos: 30, EndPos: 28,
}, },
Function: &ast.NameName{ Parts: []ast.Vertex{
Position: &position.Position{ &ast.NameNamePart{
StartLine: 1, Position: &position.Position{
EndLine: 1, StartLine: 1,
StartPos: 25, EndLine: 1,
EndPos: 28, StartPos: 25,
}, EndPos: 28,
Parts: []ast.Vertex{ },
&ast.NameNamePart{ StringTkn: &token.Token{
ID: token.T_STRING,
Value: []byte("foo"),
Position: &position.Position{ Position: &position.Position{
StartLine: 1, StartLine: 1,
EndLine: 1, EndLine: 1,
StartPos: 25, StartPos: 25,
EndPos: 28, EndPos: 28,
}, },
StringTkn: &token.Token{
ID: token.T_STRING,
Value: []byte("foo"),
Position: &position.Position{
StartLine: 1,
EndLine: 1,
StartPos: 25,
EndPos: 28,
},
},
Value: []byte("foo"),
}, },
}, Value: []byte("foo"),
},
OpenParenthesisTkn: &token.Token{
ID: token.ID(40),
Value: []byte("("),
Position: &position.Position{
StartLine: 1,
EndLine: 1,
StartPos: 28,
EndPos: 29,
},
},
CloseParenthesisTkn: &token.Token{
ID: token.ID(41),
Value: []byte(")"),
Position: &position.Position{
StartLine: 1,
EndLine: 1,
StartPos: 29,
EndPos: 30,
}, },
}, },
}, },
CloseBracketTkn: &token.Token{ OpenParenthesisTkn: &token.Token{
ID: token.ID(125), ID: token.ID(40),
Value: []byte("}"), Value: []byte("("),
Position: &position.Position{ Position: &position.Position{
StartLine: 1, StartLine: 1,
EndLine: 1, EndLine: 1,
StartPos: 30, StartPos: 28,
EndPos: 31, EndPos: 29,
}, },
}, },
CloseParenthesisTkn: &token.Token{
ID: token.ID(41),
Value: []byte(")"),
Position: &position.Position{
StartLine: 1,
EndLine: 1,
StartPos: 29,
EndPos: 30,
},
},
},
CloseCurlyBracketTkn: &token.Token{
ID: token.ID(125),
Value: []byte("}"),
Position: &position.Position{
StartLine: 1,
EndLine: 1,
StartPos: 30,
EndPos: 31,
},
}, },
}, },
}, },

BIN
internal/php7/php7.go generated
View File

Binary file not shown.

13
internal/php7/php7.y
View File

@ -3790,14 +3790,11 @@ simple_variable:
| '$' '{' expr '}' | '$' '{' expr '}'
{ {
$$ = &ast.ExprVariable{ $$ = &ast.ExprVariable{
Position: yylex.(*Parser).builder.NewTokensPosition($1, $4), Position: yylex.(*Parser).builder.NewTokensPosition($1, $4),
DollarTkn: $1, DollarTkn: $1,
VarName: &ast.ParserBrackets{ OpenCurlyBracketTkn: $2,
Position: yylex.(*Parser).builder.NewTokensPosition($2, $4), VarName: $3,
OpenBracketTkn: $2, CloseCurlyBracketTkn: $4,
Child: $3,
CloseBracketTkn: $4,
},
} }
} }
| '$' simple_variable | '$' simple_variable

8
pkg/ast/node.go
View File

@ -1761,9 +1761,11 @@ func (n *ExprUnaryPlus) GetPosition() *position.Position {
// ExprVariable node // ExprVariable node
type ExprVariable struct { type ExprVariable struct {
Position *position.Position Position *position.Position
DollarTkn *token.Token DollarTkn *token.Token
VarName Vertex OpenCurlyBracketTkn *token.Token
VarName Vertex
CloseCurlyBracketTkn *token.Token
} }
func (n *ExprVariable) Accept(v NodeVisitor) { func (n *ExprVariable) Accept(v NodeVisitor) {

2
pkg/ast/visitor/dumper.go
View File

@ -1537,7 +1537,9 @@ func (v *Dumper) ExprVariable(n *ast.ExprVariable) {
v.dumpPosition(n.Position) v.dumpPosition(n.Position)
v.dumpToken("DollarTkn", n.DollarTkn) v.dumpToken("DollarTkn", n.DollarTkn)
v.dumpToken("OpenCurlyBracketTkn", n.OpenCurlyBracketTkn)
v.dumpVertex("VarName", n.VarName) v.dumpVertex("VarName", n.VarName)
v.dumpToken("CloseCurlyBracketTkn", n.CloseCurlyBracketTkn)
v.indent-- v.indent--
v.print(v.indent, "},\n") v.print(v.indent, "},\n")

10
pkg/ast/visitor/formatter.go
View File

@ -1417,6 +1417,16 @@ func (f *formatter) ExprVariable(n *ast.ExprVariable) {
n.DollarTkn = f.newToken('$', []byte("$")) n.DollarTkn = f.newToken('$', []byte("$"))
} }
n.OpenCurlyBracketTkn = nil
n.CloseCurlyBracketTkn = nil
switch n.VarName.(type) {
case *ast.Identifier:
case *ast.ExprVariable:
default:
n.OpenCurlyBracketTkn = f.newToken('{', []byte("{"))
n.CloseCurlyBracketTkn = f.newToken('}', []byte("}"))
}
n.VarName.Accept(f) n.VarName.Accept(f)
} }

23
pkg/ast/visitor/formatter_test.go
View File

@ -4877,6 +4877,29 @@ func TestFormatter_ExprVariable_Variable(t *testing.T) {
} }
} }
func TestFormatter_ExprVariable_Expression(t *testing.T) {
o := bytes.NewBufferString("")
n := &ast.ExprVariable{
VarName: &ast.ScalarString{
Value: []byte("'foo'"),
},
}
f := visitor.NewFormatter().WithState(visitor.FormatterStatePHP).WithIndent(1)
n.Accept(f)
p := visitor.NewPrinter(o).WithState(visitor.PrinterStatePHP)
n.Accept(p)
expected := `${'foo'}`
actual := o.String()
if expected != actual {
t.Errorf("\nexpected: %s\ngot: %s\n", expected, actual)
}
}
func TestFormatter_ExprYield(t *testing.T) { func TestFormatter_ExprYield(t *testing.T) {
o := bytes.NewBufferString("") o := bytes.NewBufferString("")

2
pkg/ast/visitor/printer.go
View File

@ -868,7 +868,9 @@ func (p *printer) ExprUnaryPlus(n *ast.ExprUnaryPlus) {
func (p *printer) ExprVariable(n *ast.ExprVariable) { func (p *printer) ExprVariable(n *ast.ExprVariable) {
p.printToken(n.DollarTkn, nil) p.printToken(n.DollarTkn, nil)
p.printToken(n.OpenCurlyBracketTkn, nil)
p.printNode(n.VarName) p.printNode(n.VarName)
p.printToken(n.CloseCurlyBracketTkn, nil)
} }
func (p *printer) ExprYield(n *ast.ExprYield) { func (p *printer) ExprYield(n *ast.ExprYield) {

8
pkg/ast/visitor/printer_test.go
View File

@ -2609,13 +2609,19 @@ func TestPrinterPrintVariable(t *testing.T) {
DollarTkn: &token.Token{ DollarTkn: &token.Token{
Value: []byte("$"), Value: []byte("$"),
}, },
OpenCurlyBracketTkn: &token.Token{
Value: []byte("{"),
},
VarName: &ast.ExprVariable{ VarName: &ast.ExprVariable{
VarName: &ast.Identifier{Value: []byte("$var")}, VarName: &ast.Identifier{Value: []byte("$var")},
}, },
CloseCurlyBracketTkn: &token.Token{
Value: []byte("}"),
},
} }
n.Accept(p) n.Accept(p)
expected := `$$var` expected := `${$var}`
actual := o.String() actual := o.String()
if expected != actual { if expected != actual {