diff options
| author | Araq <rumpf_a@web.de> | 2013-12-05 00:03:27 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2013-12-05 00:03:27 +0100 |
| commit | 5eba93d584d5446256d05f0eef111ace5e12bac3 (patch) | |
| tree | 7b638031f3e77c16ca0c27b9c83630d78846f19e /lib/core | |
| parent | 9035d15ed22de1f80486d94ec63e720a4d04cbc0 (diff) | |
| parent | 2264875237cb72cf0288f2bd3d4a930c2a1acc50 (diff) | |
| download | Nim-5eba93d584d5446256d05f0eef111ace5e12bac3.tar.gz | |
Merge branch 'master' into vm2
Conflicts: compiler/sem.nim
Diffstat (limited to 'lib/core')
| -rw-r--r-- | lib/core/macros.nim | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/core/macros.nim b/lib/core/macros.nim index 0ac3d9b1b..fb47ba3a8 100644 --- a/lib/core/macros.nim +++ b/lib/core/macros.nim @@ -500,7 +500,7 @@ const from strutils import cmpIgnoreStyle, format -proc ExpectKind*(n: PNimrodNode; k: set[TNimrodNodeKind]) {.compileTime.} = +proc expectKind*(n: PNimrodNode; k: set[TNimrodNodeKind]) {.compileTime.} = assert n.kind in k, "Expected one of $1, got $2".format(k, n.kind) proc newProc*(name = newEmptyNode(); params: openarray[PNimrodNode] = []; |