From 62e7037f2056c0e43d2a33fa4216a45510a15878 Mon Sep 17 00:00:00 2001
From: kortschak <dan.kortschak@adelaide.edu.au>
Date: Tue, 26 Aug 2014 11:19:22 +0930
Subject: [PATCH] Remove unnecessary indirection

---
 query/gremlin/finals.go  |  4 ++--
 query/gremlin/session.go | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/query/gremlin/finals.go b/query/gremlin/finals.go
index c1d7ca7..c4813c5 100644
--- a/query/gremlin/finals.go
+++ b/query/gremlin/finals.go
@@ -289,7 +289,7 @@ func (wk *worker) runIterator(it graph.Iterator) {
 		}
 		tags := make(map[string]graph.Value)
 		it.TagResults(tags)
-		if !wk.send(&Result{actualResults: &tags}) {
+		if !wk.send(&Result{actualResults: tags}) {
 			break
 		}
 		for it.NextPath() {
@@ -300,7 +300,7 @@ func (wk *worker) runIterator(it graph.Iterator) {
 			}
 			tags := make(map[string]graph.Value)
 			it.TagResults(tags)
-			if !wk.send(&Result{actualResults: &tags}) {
+			if !wk.send(&Result{actualResults: tags}) {
 				break
 			}
 		}
diff --git a/query/gremlin/session.go b/query/gremlin/session.go
index 2d1c359..852dcce 100644
--- a/query/gremlin/session.go
+++ b/query/gremlin/session.go
@@ -59,7 +59,7 @@ type Result struct {
 	metaresult    bool
 	err           error
 	val           *otto.Value
-	actualResults *map[string]graph.Value
+	actualResults map[string]graph.Value
 }
 
 func (s *Session) ToggleDebug() {
@@ -179,9 +179,9 @@ func (s *Session) ToText(result interface{}) string {
 	out = fmt.Sprintln("****")
 	if data.val == nil {
 		tags := data.actualResults
-		tagKeys := make([]string, len(*tags))
+		tagKeys := make([]string, len(tags))
 		i := 0
-		for k, _ := range *tags {
+		for k, _ := range tags {
 			tagKeys[i] = k
 			i++
 		}
@@ -190,7 +190,7 @@ func (s *Session) ToText(result interface{}) string {
 			if k == "$_" {
 				continue
 			}
-			out += fmt.Sprintf("%s : %s\n", k, s.ts.NameOf((*tags)[k]))
+			out += fmt.Sprintf("%s : %s\n", k, s.ts.NameOf(tags[k]))
 		}
 	} else {
 		if data.val.IsObject() {
@@ -214,15 +214,15 @@ func (s *Session) BuildJson(result interface{}) {
 		if data.val == nil {
 			obj := make(map[string]string)
 			tags := data.actualResults
-			tagKeys := make([]string, len(*tags))
+			tagKeys := make([]string, len(tags))
 			i := 0
-			for k, _ := range *tags {
+			for k, _ := range tags {
 				tagKeys[i] = k
 				i++
 			}
 			sort.Strings(tagKeys)
 			for _, k := range tagKeys {
-				obj[k] = s.ts.NameOf((*tags)[k])
+				obj[k] = s.ts.NameOf(tags[k])
 			}
 			s.dataOutput = append(s.dataOutput, obj)
 		} else {