From ed935dfef1bd3b43932c3f9190ff68a68213cc3b Mon Sep 17 00:00:00 2001
From: Dominik Picheta <dominikpicheta@googlemail.com>
Date: Sun, 20 Apr 2014 14:38:10 +0100
Subject: [PATCH] Remove echo from => macro and fix tclosuremacro test.

---
 lib/pure/future.nim             |  4 +--
 tests/closure/tclosuremacro.nim | 58 ++++++++++++++++-----------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/lib/pure/future.nim b/lib/pure/future.nim
index 1eb95df2c0..2401c4f722 100644
--- a/lib/pure/future.nim
+++ b/lib/pure/future.nim
@@ -54,7 +54,7 @@ macro `=>`*(p, b: expr): expr {.immediate.} =
   ##
   ##   passTwoAndTwo((x, y) => x + y) # 4
   
-  echo treeRepr(p)
+  #echo treeRepr(p)
   #echo(treeRepr(b))
   var params: seq[PNimrodNode] = @[newIdentNode("auto")]
 
@@ -92,7 +92,7 @@ macro `=>`*(p, b: expr): expr {.immediate.} =
     error("Incorrect procedure parameter list.")
   result = newProc(params = params, body = b, procType = nnkLambda)
   #echo(result.treeRepr)
-  echo(result.toStrLit())
+  #echo(result.toStrLit())
   #return result # TODO: Bug?
 
 macro `->`*(p, b: expr): expr {.immediate.} =
diff --git a/tests/closure/tclosuremacro.nim b/tests/closure/tclosuremacro.nim
index 80d89a0901..008078bbb6 100644
--- a/tests/closure/tclosuremacro.nim
+++ b/tests/closure/tclosuremacro.nim
@@ -10,34 +10,34 @@ noReturn
 
 import future
 
+proc twoParams(x: (int, int) -> int): int =
+  result = x(5, 5)
+
+proc oneParam(x: int -> int): int =
+  x(5)
+
+proc noParams(x: () -> int): int =
+  result = x()
+
+proc noReturn(x: () -> void) =
+  x()
+
+proc doWithOneAndTwo(f: (int, int) -> int): int =
+  f(1,2)
+
+echo twoParams(proc (a, b): auto = a + b)
+echo twoParams((x, y) => x + y)
+
+echo oneParam(x => x+5) 
+
+echo noParams(() => 3)
+
+echo doWithOneAndTwo((x, y) => x + y)
+
+noReturn(() -> void => echo("noReturn"))
+
 when false:
-  proc twoParams(x: (int, int) -> int): int =
-    result = x(5, 5)
+  proc pass2(f: (int, int) -> int): (int) -> int =
+    (x: int) -> int => f(2, x)
 
-  proc oneParam(x: int -> int): int =
-    x(5)
-
-  proc noParams(x: () -> int): int =
-    result = x()
-
-  proc noReturn(x: () -> void) =
-    x()
-
-  proc doWithOneAndTwo(f: (int, int) -> int): int =
-    f(1,2)
-
-  echo twoParams(proc (a, b): auto = a + b)
-  echo twoParams((x, y) => x + y)
-
-  echo oneParam(x => x+5) 
-
-  echo noParams(() => 3)
-
-  echo doWithOneAndTwo((x, y) => x + y)
-
-  noReturn(() -> void => echo("noReturn"))
-
-proc pass2(f: (int, int) -> int): (int) -> int =
-  (x: int) -> int => f(2, x)
-
-#echo pass2((x, y) => x + y)
+  #echo pass2((x, y) => x + y)