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

Renderer bug fixes (#8804)

Browse source 
Fixes #8763: render bug: pure enums not handled correctly
Fixes #8762: render bug: binary operators called with quotes rendered incorrectly
FIxes #8761: render bug: inversion of operator priorities
This commit is contained in:
cooldome 2018-09-07 00:52:42 +01:00 • committed by Andreas Rumpf
commit c033ff990a
4 changed files with 151 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

47
tests/macros/tmacrostmt.nim
View file

@ -43,6 +43,10 @@ macro repr_and_parse(fn: typed): typed =
echo fn_impl.repr
result = parseStmt(fn_impl.repr)
macro repr_to_string(fn: typed): string =
let fn_impl = fn.getImpl
result = newStrLitNode(fn_impl.repr)
repr_and_parse(f)
@ -70,8 +74,49 @@ proc test_cond_stmtlist(x, y: int): int =
result = x
#------------------------------------
# bug #8762
proc t2(a, b: int): int =
`+`(a, b)
#------------------------------------
# bug #8761
proc fn1(x, y: int):int =
2 * (x + y)
proc fn2(x, y: float): float =
(y + 2 * x) / (x - y)
proc fn3(x, y: int): bool =
(((x and 3) div 4) or (x mod (y xor -1))) == 0 or y notin [1,2]
static:
let fn1s = "proc fn1(x, y: int): int =\n result = 2 * (x + y)\n"
let fn2s = "proc fn2(x, y: float): float =\n result = (y + 2.0 * x) / (x - y)\n"
let fn3s = "proc fn3(x, y: int): bool =\n result = ((x and 3) div 4 or x mod (y xor -1)) == 0 or not contains([1, 2], y)\n"
doAssert fn1.repr_to_string == fn1s
doAssert fn2.repr_to_string == fn2s
doAssert fn3.repr_to_string == fn3s
#------------------------------------
# bug #8763
type
A {.pure.} = enum
X, Y
B {.pure.} = enum
X, Y
proc test_pure_enums(a: B) =
case a
of B.X: echo B.X
of B.Y: echo B.Y
repr_and_parse(one_if_proc)
repr_and_parse(test_block)
repr_and_parse(test_cond_stmtlist)
repr_and_parse(t2)
repr_and_parse(test_pure_enums)