Remove expr/stmt (#5857)

2017-07-25 09:28:23 +02:00 · 2017-07-25 09:28:23 +02:00 · 000b8afd26
commit 000b8afd26
parent 52ff244d5d
168 changed files with 497 additions and 529 deletions
--- a/tests/ccgbugs/tnocodegen_for_compiletime.nim
+++ b/tests/ccgbugs/tnocodegen_for_compiletime.nim
@ -1,7 +1,7 @@
 # bug #1679
 import macros, tables, hashes
 proc hash(v: NimNode): Hash = 4  # performance is for suckers
-macro test(body: stmt): stmt {.immediate.} =
+macro test(body: untyped): typed =
  var a = initCountTable[NimNode]()
  a.inc(body)

--- a/tests/ccgbugs/tuple_canon.nim
+++ b/tests/ccgbugs/tuple_canon.nim
@ -59,7 +59,7 @@ let
            ((1,1), hiA),
            ((0,1), hiB)]

-template odd*(i: int) : expr =
+template odd*(i: int) : untyped =
    (i and 1) != 0

 proc vidx(hg: HexGrid; col, row: int; i: HexVtxIndex) : Index =