assigns PNode.typ

Author: demotomohiro

compiler/icnif/nifdecoder.nim

@@ -125,6 +125,17 @@ proc fromNifNodeFlags(n: var Cursor): set[TNodeFlag] =
     inc n
     skipParRi n
 
+proc fromNifIntLit(c: var DecodeContext; n: var Cursor): PNode =
+  # See `getIntLitType` proc in semdata.nim
+  # Use intTypeCache?
+  let sysType = c.getSysType(tyInt)
+  var typ = copyType(sysType, c.idgen, sysType.owner)
+  let val = pool.integers[n.intId]
+  inc n
+  result = newIntTypeNode(val, typ)
+  typ.n = newIntTypeNode(val, typ)
+  typ.n.flags = {nfSem}
+
 proc fromNifLocal(c: var DecodeContext; n: var Cursor; kind: TNodeKind): PNode =
   result = newNodeI(kind, unknownLineInfo, 1)
   inc n
@@ -137,7 +148,9 @@ proc fromNifLocal(c: var DecodeContext; n: var Cursor; kind: TNodeKind): PNode =
   if n.kind == DotToken:
     inc n
   else:
-    result[0][0].sym.typ = fromNifType(c, n)
+    let typ = fromNifType(c, n)
+    result[0][0].sym.typ = typ
+    result[0][0].typ = typ
   result[0][2] = fromNif(c, n)
   skipParRi n  # nkIdentDefs
   skipParRi n
@@ -165,7 +178,9 @@ proc fromNifTypeSection(c: var DecodeContext; n: var Cursor): PNode =
 
   # type body
   result[2] = newNode(nkEmpty)
-  sym.sym.typ = fromNifType(c, n)
+  let typ = fromNifType(c, n)
+  sym.sym.typ = typ
+  sym.typ = typ
 
   skipParRi n
 
@@ -192,6 +207,7 @@ proc fromNifSuf(c: var DecodeContext; n: var Cursor): PNode =
         assert false, "Unknown string literal suffix " & suffix
         nkNone
     result = newStrNode(kind, v)
+    result.typ = c.getSysType(tyString)
   of IntLit:
     let v = pool.integers[n.intId]
     incExpect n, StringLit
@@ -234,7 +250,7 @@ proc fromNifSuf(c: var DecodeContext; n: var Cursor): PNode =
       of "f32":
         (nkFloat32Lit, tyFloat32)
       of "f64":
-        (nkFloat64Lit, tyFloat64)
+        (nkFloat64Lit, tyFloat)
       of "f128":
         (nkFloat128Lit, tyFloat128)
       else:
@@ -257,13 +273,14 @@ proc fromNif(c: var DecodeContext; n: var Cursor): PNode =
     result = newSymNode(fromNifSymbol(c, n))
   of StringLit:
     result = newStrNode(nkStrLit, pool.strings[n.litId])
+    result.typ = c.getSysType(tyString)
     inc n
   of CharLit:
     result = newIntNode(nkCharLit, n.charLit.int)
+    result.typ = c.getSysType(tyChar)
     inc n
   of IntLit:
-    result = newIntTypeNode(pool.integers[n.intId], c.getSysType(tyInt))
-    inc n
+    result = fromNifIntLit(c, n)
   of UIntLit:
     result = newIntTypeNode(cast[BiggestInt](pool.uintegers[n.uintId]), c.getSysType(tyUInt))
     inc n

compiler/icnif/nifdecodertypes.nim

@@ -73,6 +73,7 @@ proc fromNifTypeImpl(c: var DecodeContext; n: var Cursor; kind: TTypeKind; res:
     while n.kind != ParRi:
       var sym = fromNifSymDef(c, n, nkEnumTy)
       sym.sym.typ = res
+      sym.typ = res
       res.n.add sym
     inc n
     res.addAllowNil nil
@@ -92,7 +93,9 @@ proc fromNifTypeImpl(c: var DecodeContext; n: var Cursor; kind: TTypeKind; res:
     while n.kind != ParRi:
       var sym = fromNifSymDef(c, n, nkRecList)
       res.n.add sym
-      sym.sym.typ = fromNifType(c, n)
+      let typ = fromNifType(c, n)
+      sym.sym.typ = typ
+      sym.typ = typ
     inc n
   else:
     while n.kind != ParRi:

compiler/icnif/nifencodertypes.nim

@@ -44,8 +44,9 @@ proc toNif(c: var EncodeContext; t: PType; isTypeSection = false) =
   of tyUInt16: atom c, t, "u +16"
   of tyUInt32: atom c, t, "u +32"
   of tyUInt64: atom c, t, "u +64"
-  of tyFloat, tyFloat64: atom c, t, "f -1"
+  of tyFloat: atom c, t, "f -1"
   of tyFloat32: atom c, t, "f +32"
+  of tyFloat64: atom c, t, "f +64"
   of tyFloat128: atom c, t, "f +128"
   of tyAlias:
     c.typeHead t:

tests/icnif/tencode_node2node.nim

@@ -65,6 +65,7 @@ type
     nodeStack: seq[PNode]
     #symStack: seq[PSym]
     typStack: seq[PType]
+    conf: ConfigRef   # used to print the line info when there is a mismatch.
 
 # 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.
@@ -92,6 +93,8 @@ proc eql(x, y: PType; c: var EqlContext): bool =
     c.typStack.add x
     if not eql(x.n, y.n, c):
       echo "type.n mismatch"
+      debug(x.n)
+      debug(y.n)
       result = false
     elif x.kidsLen != y.kidsLen:
       echo "type kidsLen mismatch"
@@ -145,6 +148,8 @@ proc eql(x, y: PNode; c: var EqlContext): bool =
     result = false
   elif x.flags != y.flags:
     echo "node flag mismatch: ", x.flags, "/", y.flags
+    debug(x)
+    debug(y)
     result = false
   elif x.safeLen == y.safeLen:
     if c.nodeStack.len != 0:
@@ -153,43 +158,53 @@ proc eql(x, y: PNode; c: var EqlContext): bool =
           # echo "cycle is detected in PNode"
           return true
     c.nodeStack.add x
-    case x.kind:
-    of nkSym:
-      result = eql(x.sym, y.sym, c)
-      if not result:
-        echo "Symbol mismatch:"
-        debug(x.sym)
-        debug(y.sym)
-        debug(x.sym.typ)
-        debug(y.sym.typ)
-    of nkCharLit .. nkTripleStrLit:
-      result = sameValue(x, y)
-    of nkIdentDefs:
-      assert x.len == 3 and y.len == 3
-      if eql(x[0], y[0], c) and eql(x[2], y[2], c) and y[1].kind == nkEmpty and y[0].sym.typ != nil:
-        result = true
-      else:
-        echo "nkIdentDefs mismatch"
-        result = false
-    of nkTypeDef:
-      assert x.len == 3 and y.len == 3
-      if eql(x[0], y[0], c) and eql(x[1], y[1], c):
-        let sym = if y[0].kind == nkPostfix:
-          y[0][1].sym
-        else:
-          y[0].sym
-        result = y[2].kind == nkEmpty and sym.typ != nil
-      else:
-        result = false
-      if not result:
-        echo "nkTypeDef mismatch"
+    if x.kind != nkNilLit and not eql(x.typ, y.typ, c):
+      # ignore node type if it is nil literal.
+      # current nifencoder doesn't encode the type of nil lit.
+      echo "PNode type mismatch at ", `$`(c.conf, x.info), ":"
+      debug(x)
+      debug(y)
+      debug(x.typ)
+      debug(y.typ)
+      result = false
     else:
-      result = true
-      for i in 0 ..< x.safeLen:
-        if not eql(x[i], y[i], c):
+      case x.kind:
+      of nkSym:
+        result = eql(x.sym, y.sym, c)
+        if not result:
+          echo "Symbol mismatch:"
+          debug(x.sym)
+          debug(y.sym)
+          debug(x.sym.typ)
+          debug(y.sym.typ)
+      of nkCharLit .. nkTripleStrLit:
+        result = sameValue(x, y)
+      of nkIdentDefs:
+        assert x.len == 3 and y.len == 3
+        if eql(x[0], y[0], c) and eql(x[2], y[2], c) and y[1].kind == nkEmpty and y[0].sym.typ != nil:
+          result = true
+        else:
+          echo "nkIdentDefs mismatch"
           result = false
-          break
-    discard c.nodeStack.pop
+      of nkTypeDef:
+        assert x.len == 3 and y.len == 3
+        if eql(x[0], y[0], c) and eql(x[1], y[1], c):
+          let sym = if y[0].kind == nkPostfix:
+            y[0][1].sym
+          else:
+            y[0].sym
+          result = y[2].kind == nkEmpty and sym.typ != nil
+        else:
+          result = false
+        if not result:
+          echo "nkTypeDef mismatch"
+      else:
+        result = true
+        for i in 0 ..< x.safeLen:
+          if not eql(x[i], y[i], c):
+            result = false
+            break
+      discard c.nodeStack.pop
   else:
     echo "node length mismatch"
     debug(x)
@@ -209,6 +224,7 @@ proc testNifEncDec(graph: ModuleGraph; src: string) =
   let n2 = loadNifFromBuffer(nif, fullPath, graphForLoad)
   #debug(n2)
   var c = EqlContext()
+  c.conf = graph.config
   assert eql(n, n2, c)
 
 var conf = newConfigRefForTest()