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

remove meta.ConstantEncapsedStringToken and meta.StringToken

Browse Source
This commit is contained in:
z7zmey
2018-10-25 13:08:39 +03:00
parent aa9fb90138
commit 16de29a2a3
12 changed files with 36 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
printer/printer.go
View File

@@ -496,8 +496,6 @@ func (p *Printer) printNameNamePart(n node.Node) {
nn := n.(*name.NamePart)
p.printMeta(nn, meta.NodeStart)
p.printMeta(nn, meta.StringToken)
io.WriteString(p.w, nn.Value)
p.printMeta(nn, meta.NsSeparatorToken)
@@ -509,8 +507,6 @@ func (p *Printer) printNameName(n node.Node) {
nn := n.(*name.Name)
p.printMeta(nn, meta.NodeStart)
p.printMeta(nn, meta.StringToken)
for k, part := range nn.Parts {
if k > 0 {
io.WriteString(p.w, "\\")
@@ -581,8 +577,6 @@ func (p *Printer) printScalarString(n node.Node) {
nn := n.(*scalar.String)
p.printMeta(nn, meta.NodeStart)
p.printMeta(nn, meta.ConstantEncapsedStringToken)
io.WriteString(p.w, nn.Value)
p.printMeta(nn, meta.NodeEnd)

22
printer/printer_test.go
View File

@@ -171,7 +171,7 @@ func TestPrinterPrintParameter(t *testing.T) {
&meta.Data{
Type: meta.WhiteSpaceType,
Value: " ",
TokenName: meta.StringToken,
TokenName: meta.NodeStart,
},
},
Value: "Foo",
@@ -193,7 +193,7 @@ func TestPrinterPrintParameter(t *testing.T) {
&meta.Data{
Type: meta.WhiteSpaceType,
Value: " ",
TokenName: meta.ConstantEncapsedStringToken,
TokenName: meta.NodeStart,
},
},
Value: "'default'",
@@ -271,7 +271,7 @@ func TestPrinterPrintNullable(t *testing.T) {
&meta.Data{
Type: meta.WhiteSpaceType,
Value: " ",
TokenName: meta.ConstantEncapsedStringToken,
TokenName: meta.NodeStart,
},
},
Value: "'default'",
@@ -379,17 +379,17 @@ func TestPrinterPrintNameNamePart(t *testing.T) {
&meta.Data{
Type: meta.WhiteSpaceType,
Value: " ",
TokenName: meta.StringToken,
TokenName: meta.NodeStart,
},
&meta.Data{
Type: meta.CommentType,
Value: "/*comment*/",
TokenName: meta.StringToken,
TokenName: meta.NodeStart,
},
&meta.Data{
Type: meta.WhiteSpaceType,
Value: " ",
TokenName: meta.StringToken,
TokenName: meta.NodeStart,
},
&meta.Data{
Type: meta.WhiteSpaceType,
@@ -417,7 +417,7 @@ func TestPrinterPrintNameName(t *testing.T) {
&meta.Data{
Type: meta.WhiteSpaceType,
Value: " ",
TokenName: meta.StringToken,
TokenName: meta.NodeStart,
},
},
Parts: []node.Node{
@@ -426,12 +426,12 @@ func TestPrinterPrintNameName(t *testing.T) {
&meta.Data{
Type: meta.CommentType,
Value: "/*comment*/",
TokenName: meta.StringToken,
TokenName: meta.NodeStart,
},
&meta.Data{
Type: meta.WhiteSpaceType,
Value: " ",
TokenName: meta.StringToken,
TokenName: meta.NodeStart,
},
&meta.Data{
Type: meta.WhiteSpaceType,
@@ -577,7 +577,7 @@ func TestPrinterPrintScalarString(t *testing.T) {
&meta.Data{
Type: meta.WhiteSpaceType,
Value: " ",
TokenName: meta.ConstantEncapsedStringToken,
TokenName: meta.NodeStart,
},
},
Value: "'hello world'",
@@ -3833,7 +3833,7 @@ func TestPrinterPrintNew(t *testing.T) {
&meta.Data{
Type: meta.WhiteSpaceType,
Value: " ",
TokenName: meta.StringToken,
TokenName: meta.NodeStart,
},
},
Value: "Foo",