From 8481e9ff14f39dab98c65e4c618fb8a847444b7d Mon Sep 17 00:00:00 2001
From: Yuriy Glukhov <yglukhov@users.noreply.github.com>
Date: Sun, 30 Jul 2017 12:10:07 +0300
Subject: [PATCH] Fixed NimTypeKind enum, added missing values. (#6157)

---
 lib/core/macros.nim       | 5 +++--
 tests/macros/tgettype.nim | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/core/macros.nim b/lib/core/macros.nim
index 409948629..0dbd8234d 100644
--- a/lib/core/macros.nim
+++ b/lib/core/macros.nim
@@ -94,8 +94,9 @@ type
     ntyVarargs,
     ntyUnused,
     ntyError,
-    ntyBuiltinTypeClass, ntyConcept, ntyConceptInst, ntyComposite,
-    ntyAnd, ntyOr, ntyNot
+    ntyBuiltinTypeClass, ntyUserTypeClass, ntyUserTypeClassInst,
+    ntyCompositeTypeClass, ntyInferred, ntyAnd, ntyOr, ntyNot,
+    ntyAnything, ntyStatic, ntyFromExpr, ntyFieldAccessor, ntyVoid
 
   TNimTypeKinds* {.deprecated.} = set[NimTypeKind]
   NimSymKind* = enum
diff --git a/tests/macros/tgettype.nim b/tests/macros/tgettype.nim
index 8b787b022..fa02bce57 100644
--- a/tests/macros/tgettype.nim
+++ b/tests/macros/tgettype.nim
@@ -18,3 +18,10 @@ macro testGeneric(T: typedesc[Model]): string=
 
 echo testUser
 echo User.testGeneric
+
+macro assertVoid(e: typed): untyped =
+  assert(getTypeInst(e).typeKind == ntyVoid)
+
+proc voidProc() = discard
+
+assertVoid voidProc()