remove name field

node/name/fully_qualified.go

@@ -5,13 +5,12 @@ import (
 )
 
 type FullyQualified struct {
-	NameNode
+	Name
 }
 
 func NewFullyQualified(parts []node.Node) node.Node {
 	return FullyQualified{
-		NameNode{
-			"FullyQualifiedName",
+		Name{
 			map[string]interface{}{},
 			nil,
 			parts,
@@ -19,10 +18,6 @@ func NewFullyQualified(parts []node.Node) node.Node {
 	}
 }
 
-func (n FullyQualified) Name() string {
-	return "FullyQualified"
-}
-
 func (n FullyQualified) Attributes() map[string]interface{} {
 	return n.attributes
 }

node/name/name.go

@@ -4,49 +4,43 @@ import (
 	"github.com/z7zmey/php-parser/node"
 )
 
-type NameNode struct {
-	name       string
+type Name struct {
 	attributes map[string]interface{}
 	position   *node.Position
 	parts      []node.Node
 }
 
 func NewName(parts []node.Node) node.Node {
-	return NameNode{
-		"Name",
+	return Name{
 		map[string]interface{}{},
 		nil,
 		parts,
 	}
 }
 
-func (n NameNode) Name() string {
-	return "Name"
-}
-
-func (n NameNode) Attributes() map[string]interface{} {
+func (n Name) Attributes() map[string]interface{} {
 	return n.attributes
 }
 
-func (n NameNode) Attribute(key string) interface{} {
+func (n Name) Attribute(key string) interface{} {
 	return n.attributes[key]
 }
 
-func (n NameNode) SetAttribute(key string, value interface{}) node.Node {
+func (n Name) SetAttribute(key string, value interface{}) node.Node {
 	n.attributes[key] = value
 	return n
 }
 
-func (n NameNode) Position() *node.Position {
+func (n Name) Position() *node.Position {
 	return n.position
 }
 
-func (n NameNode) SetPosition(p *node.Position) node.Node {
+func (n Name) SetPosition(p *node.Position) node.Node {
 	n.position = p
 	return n
 }
 
-func (n NameNode) Walk(v node.Visitor) {
+func (n Name) Walk(v node.Visitor) {
 	if v.EnterNode(n) == false {
 		return
 	}

node/name/name_part.go

@@ -5,14 +5,12 @@ import (
 )
 
 type NamePart struct {
-	name       string
 	attributes map[string]interface{}
 	position   *node.Position
 }
 
 func NewNamePart(value string) node.Node {
 	return NamePart{
-		"NamePart",
 		map[string]interface{}{
 			"value": value,
 		},
@@ -20,10 +18,6 @@ func NewNamePart(value string) node.Node {
 	}
 }
 
-func (n NamePart) Name() string {
-	return "NamePart"
-}
-
 func (n NamePart) Attributes() map[string]interface{} {
 	return n.attributes
 }

node/name/relative.go

@@ -5,13 +5,12 @@ import (
 )
 
 type Relative struct {
-	NameNode
+	Name
 }
 
 func NewRelative(parts []node.Node) node.Node {
 	return Relative{
-		NameNode{
-			"RelativeName",
+		Name{
 			map[string]interface{}{},
 			nil,
 			parts,
@@ -19,10 +18,6 @@ func NewRelative(parts []node.Node) node.Node {
 	}
 }
 
-func (n Relative) Name() string {
-	return "Relative"
-}
-
 func (n Relative) Attributes() map[string]interface{} {
 	return n.attributes
 }