Merge branch 'devel' of https://github.com/Araq/Nim into devel

2015-04-20 11:44:54 +02:00 · 2015-04-20 11:44:54 +02:00 · 2b4e233510
commit 2b4e233510
parent 7be092bba5 b4e938ca21
18 changed files with 192 additions and 54 deletions
--- a/lib/core/macros.nim
+++ b/lib/core/macros.nim
@ -88,7 +88,9 @@ type
    ntyBigNum,
    ntyConst, ntyMutable, ntyVarargs,
    ntyIter,
-    ntyError
+    ntyError,
+    ntyBuiltinTypeClass, ntyConcept, ntyConceptInst, ntyComposite,
+    ntyAnd, ntyOr, ntyNot

  TNimTypeKinds* {.deprecated.} = set[NimTypeKind]
  NimSymKind* = enum