supports enum types

Author: demotomohiro

compiler/icnif/nifdecoder.nim

@@ -43,8 +43,6 @@ proc splitNifSym(s: string): SplittedNifSym =
 proc fromNif(c: var DecodeContext; n: var Cursor): PNode
 proc fromNifType(c: var DecodeContext; n: var Cursor): PType
 
-include nifdecodertypes
-
 proc fromNifSymbol(c: var DecodeContext; n: var Cursor): PSym =
   result = c.nifSymToPSym[n.symId]
   inc n
@@ -56,6 +54,7 @@ proc fromNifSymDef(c: var DecodeContext; n: var Cursor; kind: TNodeKind): PNode
     of nkVarSection: skVar
     of nkLetSection: skLet
     of nkImportStmt: skModule
+    of nkEnumTy: skEnumField
     else: skConst
   inc n
   assert n.kind == SymbolDef
@@ -99,6 +98,8 @@ proc fromNifSymDef(c: var DecodeContext; n: var Cursor; kind: TNodeKind): PNode
   assert n.kind == ParRi
   inc n
 
+include nifdecodertypes
+
 proc fromNifLocal(c: var DecodeContext; n: var Cursor; kind: TNodeKind): PNode =
   result = newNodeI(kind, unknownLineInfo, 1)
   inc n

compiler/icnif/nifdecodertypes.nim

@@ -77,7 +77,14 @@ proc readTypeKind(n: var Cursor; tag: string): TTypeKind =
 
 proc fromNifTypeImpl(c: var DecodeContext; n: var Cursor; kind: TTypeKind; res: PType) =
   case kind
-  of tyFromExpr, tyEnum:
+  of tyEnum:
+    res.n = newNode(nkEnumTy)
+    while n.kind != ParRi:
+      var sym = fromNifSymDef(c, n, nkEnumTy)
+      sym.sym.typ = res
+      res.n.add sym
+    expect n, ParRi
+  of tyFromExpr:
     res.n = fromNif(c, n)
   of tyStatic:
     res.addAllowNil fromNifType(c, n)

compiler/icnif/nifencoder.nim

@@ -30,7 +30,7 @@ proc addFloatLit(b: var Builder; f: float; suffix: string) =
     addStrLit(b, suffix)
 
 proc toNif(c: var EncodeContext; n: PNode)
-proc toNif(c: var EncodeContext; t: PType)
+proc toNif(c: var EncodeContext; t: PType; isTypeSection = false)
 
 proc toNifSym(c: var EncodeContext; sym: PSym): string =
   result = sym.name.s & '.' & $sym.disamb
@@ -115,9 +115,9 @@ 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
+        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:
-        toNif c, name.sym.typ
+        toNif c, name.sym.typ, true
       else:
         toNif c, last
     else:

compiler/icnif/nifencodertypes.nim

@@ -35,7 +35,7 @@ template typeHead(c: var EncodeContext; t: PType; body: untyped) =
     writeTypeFlags(c, t)
     body
 
-proc toNif(c: var EncodeContext; t: PType) =
+proc toNif(c: var EncodeContext; t: PType; isTypeSection = false) =
   if t == nil:
     c.b.addKeyw "missing"
     return
@@ -91,11 +91,12 @@ proc toNif(c: var EncodeContext; t: PType) =
     c.typeHead t:
       for _, son in t.ikids: toNif c, son
   of tyDistinct, tyEnum:
-    if t.sym != nil:
-      symToNif c, t.sym
-    else:
+    if isTypeSection:
       c.typeHead t:
-        for _, son in t.ikids: toNif c, son
+        for son in t.n:
+          symdefToNif c, son
+    else:
+      symToNif c, t.sym
   of tyPtr:
     if isNominalRef(t):
       symToNif c, t.sym

tests/icnif/testcode/modtesttypesections.nim

@@ -1,4 +1,9 @@
 type
   TestInt = int
+  TestEnum = enum
+    X
+    Y
 
 var x: TestInt
+var testEnum: TestEnum
+var testEnum1 = X