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

remove meta.*CastToken

Browse Source
This commit is contained in:
z7zmey
2018-10-25 14:04:18 +03:00
parent 33a935c628
commit 837e6a5add
8 changed files with 72 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
printer/printer.go
View File

@@ -1101,70 +1101,49 @@ func (p *Printer) printBinarySpaceship(n node.Node) {
func (p *Printer) printArray(n node.Node) {
nn := n.(*cast.Array)
p.printMeta(nn, meta.NodeStart)
p.printMeta(nn, meta.ArrayCastToken)
p.Print(nn.Expr)
p.printMeta(nn, meta.NodeEnd)
}
func (p *Printer) printBool(n node.Node) {
nn := n.(*cast.Bool)
p.printMeta(nn, meta.NodeStart)
p.printMeta(nn, meta.BoolCastToken)
p.Print(nn.Expr)
p.printMeta(nn, meta.NodeEnd)
}
func (p *Printer) printDouble(n node.Node) {
nn := n.(*cast.Double)
p.printMeta(nn, meta.NodeStart)
p.printMeta(nn, meta.DoubleCastToken)
p.Print(nn.Expr)
p.printMeta(nn, meta.NodeEnd)
}
func (p *Printer) printInt(n node.Node) {
nn := n.(*cast.Int)
p.printMeta(nn, meta.NodeStart)
p.printMeta(nn, meta.IntCastToken)
p.Print(nn.Expr)
p.printMeta(nn, meta.NodeEnd)
}
func (p *Printer) printObject(n node.Node) {
nn := n.(*cast.Object)
p.printMeta(nn, meta.NodeStart)
p.printMeta(nn, meta.ObjectCastToken)
p.Print(nn.Expr)
p.printMeta(nn, meta.NodeEnd)
}
func (p *Printer) printString(n node.Node) {
nn := n.(*cast.String)
p.printMeta(nn, meta.NodeStart)
p.printMeta(nn, meta.StringCastToken)
p.Print(nn.Expr)
p.printMeta(nn, meta.NodeEnd)
}
func (p *Printer) printUnset(n node.Node) {
nn := n.(*cast.Unset)
p.printMeta(nn, meta.NodeStart)
p.printMeta(nn, meta.UnsetCastToken)
p.Print(nn.Expr)
p.printMeta(nn, meta.NodeEnd)
}

28
printer/printer_test.go
View File

@@ -2493,12 +2493,12 @@ func TestPrinterPrintArray(t *testing.T) {
&meta.Data{
Type: meta.WhiteSpaceType,
Value: " ",
TokenName: meta.ArrayCastToken,
TokenName: meta.NodeStart,
},
&meta.Data{
Type: meta.TokenType,
Value: "(array)",
TokenName: meta.ArrayCastToken,
TokenName: meta.NodeStart,
},
},
Expr: &expr.Variable{
@@ -2530,12 +2530,12 @@ func TestPrinterPrintBool(t *testing.T) {
&meta.Data{
Type: meta.WhiteSpaceType,
Value: " ",
TokenName: meta.BoolCastToken,
TokenName: meta.NodeStart,
},
&meta.Data{
Type: meta.TokenType,
Value: "(bool)",
TokenName: meta.BoolCastToken,
TokenName: meta.NodeStart,
},
},
Expr: &expr.Variable{
@@ -2567,12 +2567,12 @@ func TestPrinterPrintDouble(t *testing.T) {
&meta.Data{
Type: meta.WhiteSpaceType,
Value: " ",
TokenName: meta.DoubleCastToken,
TokenName: meta.NodeStart,
},
&meta.Data{
Type: meta.TokenType,
Value: "(float)",
TokenName: meta.DoubleCastToken,
TokenName: meta.NodeStart,
},
},
Expr: &expr.Variable{
@@ -2604,12 +2604,12 @@ func TestPrinterPrintInt(t *testing.T) {
&meta.Data{
Type: meta.WhiteSpaceType,
Value: " ",
TokenName: meta.IntCastToken,
TokenName: meta.NodeStart,
},
&meta.Data{
Type: meta.TokenType,
Value: "(int)",
TokenName: meta.IntCastToken,
TokenName: meta.NodeStart,
},
},
Expr: &expr.Variable{
@@ -2641,12 +2641,12 @@ func TestPrinterPrintObject(t *testing.T) {
&meta.Data{
Type: meta.WhiteSpaceType,
Value: " ",
TokenName: meta.ObjectCastToken,
TokenName: meta.NodeStart,
},
&meta.Data{
Type: meta.TokenType,
Value: "(object)",
TokenName: meta.ObjectCastToken,
TokenName: meta.NodeStart,
},
},
Expr: &expr.Variable{
@@ -2678,12 +2678,12 @@ func TestPrinterPrintString(t *testing.T) {
&meta.Data{
Type: meta.WhiteSpaceType,
Value: " ",
TokenName: meta.StringCastToken,
TokenName: meta.NodeStart,
},
&meta.Data{
Type: meta.TokenType,
Value: "(string)",
TokenName: meta.StringCastToken,
TokenName: meta.NodeStart,
},
},
Expr: &expr.Variable{
@@ -2715,12 +2715,12 @@ func TestPrinterPrintUnset(t *testing.T) {
&meta.Data{
Type: meta.WhiteSpaceType,
Value: " ",
TokenName: meta.UnsetCastToken,
TokenName: meta.NodeStart,
},
&meta.Data{
Type: meta.TokenType,
Value: "(unset)",
TokenName: meta.UnsetCastToken,
TokenName: meta.NodeStart,
},
},
Expr: &expr.Variable{