[refactoring] update ast structure of "InstanceOf" and "Isset" nodes

2020-12-01 12:16:46 +02:00
parent 9b122de8bf
commit b5ef30eb36
5 changed files with 754 additions and 737 deletions
--- a/pkg/ast/node.go
+++ b/pkg/ast/node.go
@@ -1175,8 +1175,9 @@ func (n *ExprIncludeOnce) Accept(v NodeVisitor) {
 // ExprInstanceOf node
 type ExprInstanceOf struct {
 	Node
-	Expr  Vertex
-	Class Vertex
+	Expr          Vertex
+	InstanceOfTkn *token.Token
+	Class         Vertex
 }

 func (n *ExprInstanceOf) Accept(v NodeVisitor) {
@@ -1186,7 +1187,11 @@ func (n *ExprInstanceOf) Accept(v NodeVisitor) {
 // ExprIsset node
 type ExprIsset struct {
 	Node
-	Vars []Vertex
+	IssetTkn            *token.Token
+	OpenParenthesisTkn  *token.Token
+	Vars                []Vertex
+	SeparatorTkns       []*token.Token
+	CloseParenthesisTkn *token.Token
 }

 func (n *ExprIsset) Accept(v NodeVisitor) {