Refactored ast nodes into seperate package.

elliotchance · Apr 16, 2017 · 75540be · 75540be
1 parent c7b9916
commit 75540be
Show file tree

Hide file tree

Showing 68 changed files with 769 additions and 595 deletions.
diff --git a/ast.go b/ast.go
diff --git a/always_inline_attr.go → ast/always_inline_attr.go b/always_inline_attr.go → ast/always_inline_attr.go
@@ -1,4 +1,4 @@
-package main
+package ast
 
 type AlwaysInlineAttr struct {
 	Address  string
@@ -18,3 +18,7 @@ func parseAlwaysInlineAttr(line string) *AlwaysInlineAttr {
 		Children: []interface{}{},
 	}
 }
+
+func (n *AlwaysInlineAttr) render(ast *Ast) (string, string) {
+	return "", ""
+}
diff --git a/array_subscript_expr.go → ast/array_subscript_expr.go b/array_subscript_expr.go → ast/array_subscript_expr.go
@@ -1,4 +1,4 @@
-package main
+package ast
 
 import "fmt"
 
@@ -7,7 +7,7 @@ type ArraySubscriptExpr struct {
 	Position string
 	Type     string
 	Kind     string
-	Children []interface{}
+	Children []Node
 }
 
 func parseArraySubscriptExpr(line string) *ArraySubscriptExpr {
@@ -21,12 +21,14 @@ func parseArraySubscriptExpr(line string) *ArraySubscriptExpr {
 		Position: groups["position"],
 		Type:     groups["type"],
 		Kind:     groups["kind"],
-		Children: []interface{}{},
+		Children: []Node{},
 	}
 }
 
-func (n *ArraySubscriptExpr) Render() []string {
+func (n *ArraySubscriptExpr) render(ast *Ast) (string, string) {
 	children := n.Children
-	return []string{fmt.Sprintf("%s[%s]", renderExpression(children[0])[0],
-		renderExpression(children[1])[0]), "unknown1"}
+	expression, _ := renderExpression(ast, children[0])
+	index, _ := renderExpression(ast, children[1])
+	src := fmt.Sprintf("%s[%s]", expression, index)
+	return src, "unknown1"
 }
diff --git a/asm_label_attr.go → ast/asm_label_attr.go b/asm_label_attr.go → ast/asm_label_attr.go
@@ -1,4 +1,4 @@
-package main
+package ast
 
 type AsmLabelAttr struct {
 	Address      string
@@ -20,3 +20,7 @@ func parseAsmLabelAttr(line string) *AsmLabelAttr {
 		Children:     []interface{}{},
 	}
 }
+
+func (n *AsmLabelAttr) render(ast *Ast) (string, string) {
+	return "", ""
+}