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

[refactoring] update ast structure of "HaltCompiler" node

Browse Source
This commit is contained in:
Vadym Slizov 2020-08-24 21:41:06 +03:00
parent c1b3e6f5b2
commit 0285900fe5
9 changed files with 56 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
internal/php5/php5.go generated
View File

Binary file not shown.

34
internal/php5/php5.y
View File

@ -344,14 +344,15 @@ top_statement:
}
| T_HALT_COMPILER '(' ')' ';'
{
$$ = &ast.StmtHaltCompiler{ast.Node{}}
// save position
$$.GetNode().Position = position.NewTokensPosition($1, $4)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setFreeFloatingTokens($$, token.End, append($2.SkippedTokens, append($3.SkippedTokens, $4.SkippedTokens...)...))
$$ = &ast.StmtHaltCompiler{
Node: ast.Node{
Position: position.NewTokensPosition($1, $4),
},
HaltCompilerTkn: $1,
OpenParenthesisTkn: $2,
CloseParenthesisTkn: $3,
SemiColonTkn: $4,
}
}
| T_NAMESPACE namespace_name ';'
{
@ -799,14 +800,15 @@ inner_statement:
}
| T_HALT_COMPILER '(' ')' ';'
{
$$ = &ast.StmtHaltCompiler{ast.Node{}}
// save position
$$.GetNode().Position = position.NewTokensPosition($1, $4)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setFreeFloatingTokens($$, token.End, append($2.SkippedTokens, append($3.SkippedTokens, $4.SkippedTokens...)...))
$$ = &ast.StmtHaltCompiler{
Node: ast.Node{
Position: position.NewTokensPosition($1, $4),
},
HaltCompilerTkn: $1,
OpenParenthesisTkn: $2,
CloseParenthesisTkn: $3,
SemiColonTkn: $4,
}
}
;

BIN
internal/php7/php7.go generated
View File

Binary file not shown.

34
internal/php7/php7.y
View File

@ -434,14 +434,15 @@ top_statement:
}
| T_HALT_COMPILER '(' ')' ';'
{
$$ = &ast.StmtHaltCompiler{ast.Node{}}
// save position
$$.GetNode().Position = position.NewTokensPosition($1, $4)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setFreeFloatingTokens($$, token.End, append($2.SkippedTokens, append($3.SkippedTokens, $4.SkippedTokens...)...))
$$ = &ast.StmtHaltCompiler{
Node: ast.Node{
Position: position.NewTokensPosition($1, $4),
},
HaltCompilerTkn: $1,
OpenParenthesisTkn: $2,
CloseParenthesisTkn: $3,
SemiColonTkn: $4,
}
}
| T_NAMESPACE namespace_name ';'
{
@ -838,14 +839,15 @@ inner_statement:
}
| T_HALT_COMPILER '(' ')' ';'
{
$$ = &ast.StmtHaltCompiler{ast.Node{}}
// save position
$$.GetNode().Position = position.NewTokensPosition($1, $4)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setFreeFloatingTokens($$, token.End, append($2.SkippedTokens, append($3.SkippedTokens, $4.SkippedTokens...)...))
$$ = &ast.StmtHaltCompiler{
Node: ast.Node{
Position: position.NewTokensPosition($1, $4),
},
HaltCompilerTkn: $1,
OpenParenthesisTkn: $2,
CloseParenthesisTkn: $3,
SemiColonTkn: $4,
}
}
statement:

4
pkg/ast/node.go
View File

@ -539,6 +539,10 @@ func (n *StmtGoto) Accept(v NodeVisitor) {
// StmtHaltCompiler node
type StmtHaltCompiler struct {
Node
HaltCompilerTkn *token.Token
OpenParenthesisTkn *token.Token
CloseParenthesisTkn *token.Token
SemiColonTkn *token.Token
}
func (n *StmtHaltCompiler) Accept(v NodeVisitor) {

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

@ -60,3 +60,10 @@ func (v *FilterTokens) StmtNamespace(n *ast.StmtNamespace) {
n.CloseCurlyBracket = nil
n.SemiColonTkn = nil
}
func (v *FilterTokens) StmtHaltCompiler(n *ast.StmtHaltCompiler) {
n.HaltCompilerTkn = nil
n.OpenParenthesisTkn = nil
n.CloseParenthesisTkn = nil
n.SemiColonTkn = nil
}

12
pkg/printer/printer.go
View File

@ -2823,13 +2823,11 @@ func (p *Printer) printStmtGoto(n ast.Vertex) {
p.printFreeFloating(nn, token.End)
}
func (p *Printer) printStmtHaltCompiler(n ast.Vertex) {
nn := n.(*ast.StmtHaltCompiler)
p.printFreeFloating(nn, token.Start)
io.WriteString(p.w, "__halt_compiler")
p.printFreeFloatingOrDefault(nn, token.End, "();")
func (p *Printer) printStmtHaltCompiler(n *ast.StmtHaltCompiler) {
p.printToken(n.HaltCompilerTkn, "__halt_compiler")
p.printToken(n.OpenParenthesisTkn, "(")
p.printToken(n.CloseParenthesisTkn, ")")
p.printToken(n.SemiColonTkn, ";")
}
func (p *Printer) printStmtIf(n ast.Vertex) {

3
pkg/printer/printer_parsed_php5_test.go
View File

@ -1049,7 +1049,8 @@ func TestParseAndPrintPhp5Goto(t *testing.T) {
}
func TestParseAndPrintPhp5HaltCompiler(t *testing.T) {
src := `<?php
// TODO: remove ; after <?php
src := `<?php ;
__halt_compiler ( ) ;
this text is ignored by parser
`

3
pkg/printer/printer_parsed_php7_test.go
View File

@ -1182,7 +1182,8 @@ func TestParseAndPrintGroupUse(t *testing.T) {
}
func TestParseAndPrintHaltCompiler(t *testing.T) {
src := `<?php
// TODO: remove ; after <?php
src := `<?php ;
__halt_compiler ( ) ;
this text is ignored by parser
`