handle nodes positions

node/expr/class_const_fetch.go

@@ -4,6 +4,28 @@ import (
 	"github.com/z7zmey/php-parser/node"
 )
 
+type ClassConstFetch struct {
+	name         string
+	attributes   map[string]interface{}
+	position     *node.Position
+	class        node.Node
+	constantName node.Node
+}
+
+func NewClassConstFetch(class node.Node, constantName node.Node) node.Node {
+	return ClassConstFetch{
+		"ClassConstFetch",
+		map[string]interface{}{},
+		nil,
+		class,
+		constantName,
+	}
+}
+
+func (n ClassConstFetch) Name() string {
+	return "ClassConstFetch"
+}
+
 func (n ClassConstFetch) Attributes() map[string]interface{} {
 	return n.attributes
 }
@@ -25,28 +47,6 @@ func (n ClassConstFetch) SetPosition(p *node.Position) node.Node {
 	return n
 }
 
-func (n ClassConstFetch) Name() string {
-	return "ClassConstFetch"
-}
-
-type ClassConstFetch struct {
-	name         string
-	attributes   map[string]interface{}
-	position *node.Position
-	class        node.Node
-	constantName node.Node
-}
-
-func NewClassConstFetch(class node.Node, constantName node.Node) node.Node {
-	return ClassConstFetch{
-		"ClassConstFetch",
-		map[string]interface{}{},
-		nil,
-		class,
-		constantName,
-	}
-}
-
 func (n ClassConstFetch) Walk(v node.Visitor) {
 	if v.EnterNode(n) == false {
 		return

node/scalar/encapsed.go

@@ -7,7 +7,7 @@ import (
 type Encapsed struct {
 	name       string
 	attributes map[string]interface{}
-	position *node.Position
+	position   *node.Position
 	parts      []node.Node
 }
 

node/stmt/switch.go

@@ -5,6 +5,30 @@ import (
 	"github.com/z7zmey/php-parser/token"
 )
 
+type Switch struct {
+	name       string
+	attributes map[string]interface{}
+	position   *node.Position
+	token      token.Token
+	cond       node.Node
+	cases      []node.Node
+}
+
+func NewSwitch(token token.Token, cond node.Node, cases []node.Node) node.Node {
+	return Switch{
+		"Switch",
+		map[string]interface{}{},
+		nil,
+		token,
+		cond,
+		cases,
+	}
+}
+
+func (n Switch) Name() string {
+	return "Switch"
+}
+
 func (n Switch) Attributes() map[string]interface{} {
 	return n.attributes
 }
@@ -26,30 +50,6 @@ func (n Switch) SetPosition(p *node.Position) node.Node {
 	return n
 }
 
-func (n Switch) Name() string {
-	return "Switch"
-}
-
-type Switch struct {
-	name       string
-	attributes map[string]interface{}
-	position *node.Position
-	token      token.Token
-	cond       node.Node
-	cases      []node.Node
-}
-
-func NewSwitch(token token.Token, cond node.Node, cases []node.Node) node.Node {
-	return Switch{
-		"Switch",
-		map[string]interface{}{},
-		nil,
-		token,
-		cond,
-		cases,
-	}
-}
-
 func (n Switch) Walk(v node.Visitor) {
 	if v.EnterNode(n) == false {
 		return