makes using the type defined in type section in var section works

Author: demotomohiro

compiler/icnif/nifdecoder.nim

@@ -106,14 +106,11 @@ proc fromNifLocal(c: var DecodeContext; n: var Cursor; kind: TNodeKind): PNode =
   result[0] = newNodeI(nkIdentDefs, unknownLineInfo, 3)
   inc n
   result[0][0] = fromNifSymDef(c, n, kind)
+  result[0][1] = newNode(nkEmpty)
   if n.kind == DotToken:
-    result[0][1] = newNode(nkEmpty)
     inc n
   else:
-    let typeSym = fromNifType(c, n).sym
-    assert typeSym != nil
-    result[0][1] = typeSym.newSymNode
-    result[0][0].sym.typ = typeSym.typ
+    result[0][0].sym.typ = fromNifType(c, n)
   result[0][2] = fromNif(c, n)
   assert n.kind == ParRi  # nkIdentDefs
   inc n
@@ -142,8 +139,8 @@ proc fromNifTypeSection(c: var DecodeContext; n: var Cursor): PNode =
   result[1] = fromNif(c, n)
 
   # type body
-  result[2] = fromNifType(c, n).sym.newSymNode
-  sym.sym.typ = result[2].sym.typ
+  result[2] = newNode(nkEmpty)
+  sym.sym.typ = fromNifType(c, n)
 
   assert n.kind == ParRi
   inc n

compiler/icnif/nifdecodertypes.nim

@@ -96,17 +96,18 @@ proc fromNifType(c: var DecodeContext; n: var Cursor): PType =
   of Symbol:
     let s = n.symId
     result = c.types.getOrDefault(s)
-    when true:
-      assert result != nil
-    else:
-      if result == nil:
-        let symA = c.syms.getOrDefault(s).sym
-        if symA != nil:
-          assert symA.kind == skType
-          result = symA.typ
-        else:
-          result = loadType(s, c)
-          c.types[s] = LoadedType(state: Loaded, typ: result)
+    if result == nil:
+      let symA = c.nifSymToPSym.getOrDefault(s)
+      if symA != nil:
+        assert symA.kind == skType
+        result = symA.typ
+      assert symA != nil
+      #[
+      else:
+        result = loadType(s, c)
+        c.types[s] = LoadedType(state: Loaded, typ: result)
+      ]#
+    inc n
   of ParLe:
     let tag = pool.tags[n.tag]
     if tag == "missing":

compiler/icnif/nifencoder.nim

@@ -45,7 +45,7 @@ proc toNifSym(c: var EncodeContext; sym: PSym): string =
     result.add modsuf
 
 proc symToNif(c: var EncodeContext; sym: PSym) =
-  if sym.kind == skType and sym.typ != nil:
+  if sfSystemModule in sym.owner.flags and sym.kind == skType and sym.typ != nil:
     toNif c, sym.typ
   else:
     c.b.addSymbol toNifSym(c, sym)
@@ -192,10 +192,11 @@ proc toNif(c: var EncodeContext; n: PNode) =
     c.b.addTree toNifTag(n.kind)
     assert n.len == 3
     symdefToNif(c, n[0])
-    if n[0].kind == nkSym:
-      toNif c, n[0].sym.typ
+    if n[1].kind == nkSym:
+      symToNif c, n[1].sym
     else:
-      toNif c, n[1]
+      assert n[0].kind == nkSym
+      toNif c, n[0].sym.typ
     toNif c, n[2]
     c.b.endTree()
   of nkTypeDef:

tests/icnif/tencode_node2node.nim

@@ -59,6 +59,8 @@ proc sem(graph: ModuleGraph; path: AbsoluteFile): PNode =
 const SysTypeKinds = {tyBool, tyChar, tyString, tyInt .. tyUInt64}
 
 # Compare PType, PSym and PNode but ignores fields nifencoder and nifdecoder doesn't support
+# Assumes `x` is generated by sem.nim and `y` is decoded by icnif/nifdecoder.
+# So `eql(x, y) == eql(y, x)` is not always true.
 proc eql(x, y: PType): bool =
   if x == nil and y == nil:
     result = true
@@ -116,12 +118,15 @@ proc eql(x, y: PNode): bool =
     of nkCharLit .. nkTripleStrLit:
       result = sameValue(x, y)
     of nkIdentDefs:
-      assert x.len == 3
+      assert x.len == 3 and y.len == 3
       if eql(x[0], y[0]) and eql(x[2], y[2]):
-        if x[1].kind == nkEmpty:
-          result = true
-        else:
-          result = eql(x[1], y[1])
+        result = y[1].kind == nkEmpty and y[0].sym.typ != nil
+      else:
+        result = false
+    of nkTypeDef:
+      assert x.len == 3 and y.len == 3
+      if eql(x[0], y[0]) and eql(x[1], y[1]):
+        result = y[2].kind == nkEmpty and y[0].sym.typ != nil
       else:
         result = false
     else:

tests/icnif/testcode/modtesttypesections.nim

@@ -1,4 +1,4 @@
 type
   TestInt = int
 
-#var x: TestInt
+var x: TestInt