Remove trivial container/list usage

graph/result_tree_evaluator.go

@@ -14,28 +14,22 @@
 
 package graph
 
-import (
+import "fmt"
-	"container/list"
-	"fmt"
-)
 
 type ResultTree struct {
 	result   TSVal
-	subtrees *list.List
+	subtrees []*ResultTree
 }
 
 func NewResultTree(result TSVal) *ResultTree {
-	var t ResultTree
+	return &ResultTree{result: result}
-	t.subtrees = list.New()
-	t.result = result
-	return &t
 }
 
 func (t *ResultTree) ToString() string {
 	base := fmt.Sprintf("(%d", t.result)
-	if t.subtrees.Len() != 0 {
+	if len(t.subtrees) != 0 {
-		for e := t.subtrees.Front(); e != nil; e = e.Next() {
+		for _, sub := range t.subtrees {
-			base += fmt.Sprintf(" %s", (e.Value.(*ResultTree)).ToString())
+			base += fmt.Sprintf(" %s", sub.ToString())
 		}
 	}
 	base += ")"
@@ -43,7 +37,7 @@ func (t *ResultTree) ToString() string {
 }
 
 func (t *ResultTree) AddSubtree(sub *ResultTree) {
-	t.subtrees.PushBack(sub)
+	t.subtrees = append(t.subtrees, sub)
 }
 
 func StringResultTreeEvaluator(it Iterator) string {