node attributes

node/scalar/dnumber.go

@@ -2,23 +2,28 @@ package scalar
 
 import (
 	"github.com/z7zmey/php-parser/node"
-	"github.com/z7zmey/php-parser/token"
 )
 
+type Dnumber struct {
+	name       string
+	attributes map[string]interface{}
+}
+
+func NewDnumber(value string) node.Node {
+	return Dnumber{
+		"Dnumber",
+		map[string]interface{}{
+			"value": value,
+		},
+	}
+}
+
 func (n Dnumber) Name() string {
 	return "Dnumber"
 }
 
-type Dnumber struct {
-	name  string
-	token token.Token
-}
-
-func NewDnumber(token token.Token) node.Node {
-	return Dnumber{
-		"Dnumber",
-		token,
-	}
+func (n Dnumber) Attributes() map[string]interface{} {
+	return nil
 }
 
 func (n Dnumber) Walk(v node.Visitor) {
@@ -26,5 +31,5 @@ func (n Dnumber) Walk(v node.Visitor) {
 		return
 	}
 
-	v.Scalar("token", n.token.Value)
+	v.LeaveNode(n)
 }

node/scalar/encapsed.go

@@ -2,27 +2,26 @@ package scalar
 
 import (
 	"github.com/z7zmey/php-parser/node"
-	"github.com/z7zmey/php-parser/token"
 )
 
+type Encapsed struct {
+	name  string
+	parts []node.Node
+}
+
+func NewEncapsed(parts []node.Node) node.Node {
+	return Encapsed{
+		"Encapsed",
+		parts,
+	}
+}
+
 func (n Encapsed) Name() string {
 	return "Encapsed"
 }
 
-type Encapsed struct {
-	name       string
-	startToken token.Token
-	endToken   token.Token
-	parts      []node.Node
-}
-
-func NewEncapsed(startToken token.Token, parts []node.Node, endToken token.Token) node.Node {
-	return Encapsed{
-		"Encapsed",
-		startToken,
-		endToken,
-		parts,
-	}
+func (n Encapsed) Attributes() map[string]interface{} {
+	return nil
 }
 
 func (n Encapsed) Walk(v node.Visitor) {

node/scalar/encapsed_string_part.go

@@ -2,23 +2,28 @@ package scalar
 
 import (
 	"github.com/z7zmey/php-parser/node"
-	"github.com/z7zmey/php-parser/token"
 )
 
+type EncapsedStringPart struct {
+	name       string
+	attributes map[string]interface{}
+}
+
+func NewEncapsedStringPart(value string) node.Node {
+	return EncapsedStringPart{
+		"EncapsedStringPart",
+		map[string]interface{}{
+			"value": value,
+		},
+	}
+}
+
 func (n EncapsedStringPart) Name() string {
 	return "EncapsedStringPart"
 }
 
-type EncapsedStringPart struct {
-	name  string
-	token token.Token
-}
-
-func NewEncapsedStringPart(t token.Token) node.Node {
-	return EncapsedStringPart{
-		"EncapsedStringPart",
-		t,
-	}
+func (n EncapsedStringPart) Attributes() map[string]interface{} {
+	return nil
 }
 
 func (n EncapsedStringPart) Walk(v node.Visitor) {
@@ -26,5 +31,5 @@ func (n EncapsedStringPart) Walk(v node.Visitor) {
 		return
 	}
 
-	v.Scalar("token", n.token.Value)
+	v.LeaveNode(n)
 }

node/scalar/lnumber.go

@@ -2,23 +2,28 @@ package scalar
 
 import (
 	"github.com/z7zmey/php-parser/node"
-	"github.com/z7zmey/php-parser/token"
 )
 
+type Lnumber struct {
+	name       string
+	attributes map[string]interface{}
+}
+
+func NewLnumber(value string) node.Node {
+	return Lnumber{
+		"Lnumber",
+		map[string]interface{}{
+			"value": value,
+		},
+	}
+}
+
 func (n Lnumber) Name() string {
 	return "Lnumber"
 }
 
-type Lnumber struct {
-	name  string
-	token token.Token
-}
-
-func NewLnumber(token token.Token) node.Node {
-	return Lnumber{
-		"Lnumber",
-		token,
-	}
+func (n Lnumber) Attributes() map[string]interface{} {
+	return nil
 }
 
 func (n Lnumber) Walk(v node.Visitor) {
@@ -26,5 +31,5 @@ func (n Lnumber) Walk(v node.Visitor) {
 		return
 	}
 
-	v.Scalar("token", n.token.Value)
+	v.LeaveNode(n)
 }

node/scalar/magic_constant.go

@@ -2,23 +2,28 @@ package scalar
 
 import (
 	"github.com/z7zmey/php-parser/node"
-	"github.com/z7zmey/php-parser/token"
 )
 
+type MagicConstant struct {
+	name       string
+	attributes map[string]interface{}
+}
+
+func NewMagicConstant(value string) node.Node {
+	return MagicConstant{
+		"MagicConstant",
+		map[string]interface{}{
+			"value": value,
+		},
+	}
+}
+
 func (n MagicConstant) Name() string {
 	return "MagicConstant"
 }
 
-type MagicConstant struct {
-	name  string
-	token token.Token
-}
-
-func NewMagicConstant(token token.Token) node.Node {
-	return MagicConstant{
-		"MagicConstant",
-		token,
-	}
+func (n MagicConstant) Attributes() map[string]interface{} {
+	return nil
 }
 
 func (n MagicConstant) Walk(v node.Visitor) {
@@ -26,5 +31,5 @@ func (n MagicConstant) Walk(v node.Visitor) {
 		return
 	}
 
-	v.Scalar("token", n.token.Value)
+	v.LeaveNode(n)
 }

node/scalar/string.go

@@ -2,23 +2,29 @@ package scalar
 
 import (
 	"github.com/z7zmey/php-parser/node"
-	"github.com/z7zmey/php-parser/token"
 )
 
+type String struct {
+	name       string
+	attributes map[string]interface{}
+}
+
+func NewString(value string) node.Node {
+	return String{
+		"String",
+
+		map[string]interface{}{
+			"value": value,
+		},
+	}
+}
+
 func (n String) Name() string {
 	return "String"
 }
 
-type String struct {
-	name  string
-	token token.Token
-}
-
-func NewString(token token.Token) node.Node {
-	return String{
-		"String",
-		token,
-	}
+func (n String) Attributes() map[string]interface{} {
+	return nil
 }
 
 func (n String) Walk(v node.Visitor) {
@@ -26,5 +32,5 @@ func (n String) Walk(v node.Visitor) {
 		return
 	}
 
-	v.Scalar("token", n.token.Value)
+	v.LeaveNode(n)
 }