jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove echo from => macro and fix tclosuremacro test.

Browse source
This commit is contained in:
Dominik Picheta 2014-04-20 14:38:10 +01:00
commit ed935dfef1
2 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pure/future.nim
View file

@ -54,7 +54,7 @@ macro `=>`*(p, b: expr): expr {.immediate.} =
## ##
## passTwoAndTwo((x, y) => x + y) # 4 ## passTwoAndTwo((x, y) => x + y) # 4
echo treeRepr(p) #echo treeRepr(p)
#echo(treeRepr(b)) #echo(treeRepr(b))
var params: seq[PNimrodNode] = @[newIdentNode("auto")] var params: seq[PNimrodNode] = @[newIdentNode("auto")]
@ -92,7 +92,7 @@ macro `=>`*(p, b: expr): expr {.immediate.} =
error("Incorrect procedure parameter list.") error("Incorrect procedure parameter list.")
result = newProc(params = params, body = b, procType = nnkLambda) result = newProc(params = params, body = b, procType = nnkLambda)
#echo(result.treeRepr) #echo(result.treeRepr)
echo(result.toStrLit()) #echo(result.toStrLit())
#return result # TODO: Bug? #return result # TODO: Bug?
macro `->`*(p, b: expr): expr {.immediate.} = macro `->`*(p, b: expr): expr {.immediate.} =

2
tests/closure/tclosuremacro.nim
View file

@ -10,7 +10,6 @@ noReturn
import future import future
when false:
proc twoParams(x: (int, int) -> int): int = proc twoParams(x: (int, int) -> int): int =
result = x(5, 5) result = x(5, 5)
@ -37,6 +36,7 @@ when false:
noReturn(() -> void => echo("noReturn")) noReturn(() -> void => echo("noReturn"))
when false:
proc pass2(f: (int, int) -> int): (int) -> int = proc pass2(f: (int, int) -> int): (int) -> int =
(x: int) -> int => f(2, x) (x: int) -> int => f(2, x)