supports distinct types

Author: demotomohiro

compiler/icnif/nifdecodertypes.nim

@@ -121,6 +121,7 @@ proc fromNifType(c: var DecodeContext; n: var Cursor): PType =
       result = nil
     else:
       let k = readTypeKind(n, tag)
+      assert k != tyNone
       if k in SysTypeKinds:
         result = getSysType(c, k)
       else:

compiler/icnif/nifencoder.nim

@@ -114,9 +114,7 @@ proc toNifTypeSection(c: var EncodeContext; n: PNode) =
 
     let last = n[2]
     if name.kind == nkSym:
-      if last.kind == nkEmpty and name.sym.typ != nil:
-        toNif c, name.sym.typ, true
-      elif name.sym.typ != nil and name.sym.typ.kind in {tyEnum, tyObject} and name.sym.typ.n != nil:
+      if name.sym.typ != nil:
         toNif c, name.sym.typ, true
       else:
         toNif c, last

compiler/icnif/nifencodertypes.nim

@@ -90,13 +90,20 @@ proc toNif(c: var EncodeContext; t: PType; isTypeSection = false) =
     #toNif c, t.last
     c.typeHead t:
       for _, son in t.ikids: toNif c, son
-  of tyDistinct, tyEnum:
+  of tyEnum:
     if isTypeSection:
       c.typeHead t:
         for son in t.n:
           symdefToNif c, son
     else:
       symToNif c, t.sym
+  of tyDistinct:
+    if isTypeSection:
+      c.typeHead t:
+        for son in t.kids:
+          toNif c, son
+    else:
+      symToNif c, t.sym
   of tyPtr:
     if isNominalRef(t):
       symToNif c, t.sym

tests/icnif/testcode/modtesttypesections.nim

@@ -3,7 +3,9 @@ type
   TestEnum = enum
     X
     Y
+  TestDistinct = distinct int
 
 var x: TestInt
 var testEnum: TestEnum
 var testEnum1 = X
+var testDistinct: TestDistinct