[refactoring] update ast structure of "Class" and "Trait" nodes

2020-11-22 02:03:39 +02:00
parent 3bda40e8ce
commit fe2e097d8f
7 changed files with 1257 additions and 1233 deletions
--- a/pkg/ast/node.go
+++ b/pkg/ast/node.go
@@ -238,12 +238,15 @@ func (n *StmtCatch) Accept(v NodeVisitor) {
 // StmtClass node
 type StmtClass struct {
 	Node
-	ClassName    Vertex
-	Modifiers    []Vertex
-	ArgumentList *ArgumentList
-	Extends      *StmtClassExtends
-	Implements   *StmtClassImplements
-	Stmts        []Vertex
+	Modifiers         []Vertex
+	ClassTkn          *token.Token
+	ClassName         Vertex
+	ArgumentList      Vertex
+	Extends           *StmtClassExtends
+	Implements        *StmtClassImplements
+	OpenCurlyBracket  *token.Token
+	Stmts             []Vertex
+	CloseCurlyBracket *token.Token
 }

 func (n *StmtClass) Accept(v NodeVisitor) {
@@ -741,8 +744,13 @@ func (n *StmtThrow) Accept(v NodeVisitor) {
 // StmtTrait node
 type StmtTrait struct {
 	Node
-	TraitName Vertex
-	Stmts     []Vertex
+	TraitTkn          *token.Token
+	TraitName         Vertex
+	Extends           *StmtClassExtends
+	Implements        *StmtClassImplements
+	OpenCurlyBracket  *token.Token
+	Stmts             []Vertex
+	CloseCurlyBracket *token.Token
 }

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