get rid of exxtra prints

jmoiron · May 28, 2014 · 4e2aa3c · 4e2aa3c
1 parent 0efeedd
commit 4e2aa3c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/neo/ast.go b/neo/ast.go
@@ -242,8 +242,16 @@ func (m *MapExpr) append(n *MapElem) {
 }
 
 func (m *MapExpr) String() string {
-	// FIXME: do it right
-	return fmt.Sprintf("{%s}", m.Elems)
+	b := new(bytes.Buffer)
+	b.WriteString("{")
+	for i, n := range m.Elems {
+		fmt.Fprint(b, n)
+		if i != len(m.Elems)-1 {
+			b.WriteString(", ")
+		}
+	}
+	b.WriteString("}")
+	return b.String()
 }
 
 func (m *MapExpr) Copy() Node {

diff --git a/neo/ast_test.go b/neo/ast_test.go
@@ -1,9 +1,6 @@
 package jigo
 
-import (
-	"fmt"
-	"testing"
-)
+import "testing"
 
 func TestStack(t *testing.T) {
 	var p Pos
@@ -47,5 +44,4 @@ func TestStack(t *testing.T) {
 	if s.len() != 1 {
 		t.Errorf("Expected len of 1, got %d\n", s.len())
 	}
-	fmt.Println(s)
 }
diff --git a/neo/parse.go b/neo/parse.go
@@ -297,7 +297,6 @@ func (t *Tree) parse() (next Node) {
 		switch t.peek().typ {
 		case tokenBlockBegin:
 			// the start of a {% .. %} tag block.
-			fmt.Println("Got BlockBegin")
 			continue
 
 		case tokenVariableBegin:
@@ -410,7 +409,6 @@ func (t *Tree) parseExpr(stack *nodeStack, terminator itemType) Node {
 				fmt.Printf("Stack: %#v\n", stack)
 				t.unexpected(token, "zero length expression")
 			}
-			fmt.Println(stack, stack.len())
 			return stack.pop()
 		case tokenName:
 			stack.push(t.lookupExpr())
@@ -449,7 +447,6 @@ func (t *Tree) parseExpr(stack *nodeStack, terminator itemType) Node {
 				lhs := stack.pop()
 				rhs := t.parseExpr(stack, terminator)
 				// we know this strongly binds ltr so no need to peek
-				fmt.Println(lhs, rhs)
 				stack.push(newMulExpr(lhs, rhs, token))
 			} else {
 				t.unexpected(token, "binary op")