supports object types partially

Author: demotomohiro

compiler/icnif/nifdecoder.nim

@@ -75,6 +75,7 @@ proc fromNifSymDef(c: var DecodeContext; n: var Cursor; kind: TNodeKind): PNode
     of nkLetSection: skLet
     of nkImportStmt: skModule
     of nkEnumTy: skEnumField
+    of nkRecList: skField
     else: skConst
   incExpect n, SymbolDef
   let nifSymId = n.symId

compiler/icnif/nifdecodertypes.nim

@@ -12,6 +12,9 @@ proc getSysTypeSym(c: var DecodeContext; typeKind: TTypeKind): PSym =
     var typ = newType(typeKind, c.idgen, nil)
     typ.sym = result
     result.typ = typ
+    if typeKind == tyString:
+      var charSym = getSysTypeSym(c, tyChar)
+      result.typ.add charSym.typ
     c.sysTypes[typeKind] = result
 
 proc getSysType(c: var DecodeContext; typeKind: TTypeKind): PType =
@@ -72,15 +75,25 @@ proc fromNifTypeImpl(c: var DecodeContext; n: var Cursor; kind: TTypeKind; res:
       sym.sym.typ = res
       res.n.add sym
     inc n
+    res.addAllowNil nil
   of tyFromExpr:
     res.n = fromNif(c, n)
   of tyStatic:
     res.addAllowNil fromNifType(c, n)
     res.n = fromNif(c, n)
   of tyObject:
-    # inheritance:
-    res.addAllowNil fromNifType(c, n)
-    res.n = fromNif(c, n)
+    # TODO: inheritance:
+    if n.kind == DotToken:
+      res.addAllowNil nil
+      inc n
+    else:
+      res.addAllowNil fromNifType(c, n)
+    res.n = newNode(nkRecList)
+    while n.kind != ParRi:
+      var sym = fromNifSymDef(c, n, nkRecList)
+      res.n.add sym
+      sym.sym.typ = fromNifType(c, n)
+    inc n
   else:
     while n.kind != ParRi:
       res.addAllowNil fromNifType(c, n)

compiler/icnif/nifencodertypes.nim

@@ -225,7 +225,19 @@ proc toNif(c: var EncodeContext; t: PType; isTypeSection = false) =
   of tyPointer: atom c, t
   of tyString: atom c, t
   of tyCstring: atom c, t
-  of tyObject: symToNif c, t.sym
+  of tyObject:
+    if isTypeSection:
+      c.typeHead t:
+        # TODO: inheritance:
+        c.b.addEmpty
+        for son in t.n:
+          symdefToNif c, son
+          if son.typ == nil:
+            c.b.addEmpty
+          else:
+            toNif c, son.typ
+    else:
+      symToNif c, t.sym
   of tyForward: atom c, t
   of tyError: atom c, t
   of tyBuiltInTypeClass:

tests/icnif/tencode_node2node.nim

@@ -58,26 +58,61 @@ proc sem(graph: ModuleGraph; path: AbsoluteFile): PNode =
 
 const SysTypeKinds = {tyBool, tyChar, tyString, tyInt .. tyUInt64}
 
+type
+  # Nim's AST has cycles that causes infinite recursive loop in eql procs.
+  # this is used to prevent that happen.
+  EqlContext = object
+    nodeStack: seq[PNode]
+    #symStack: seq[PSym]
+    typStack: seq[PType]
+
 # 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 =
+proc eql(x, y: PNode; c: var EqlContext): bool
+
+proc eql(x, y: PType; c: var EqlContext): bool =
   if x == nil and y == nil:
     result = true
   elif x == nil or y == nil:
+    echo "type is missing"
     result = false
-  elif x.kind == y.kind:
-    result = true
-  else:
+  elif x.kind != y.kind:
     echo "type kind mismatch: ", x.kind, "/", y.kind
     result = false
+  elif x.flags != y.flags:
+    echo "flag mismatch: ", x.flags, "/", y.flags
+    result = false
+  else:
+    if c.typStack.len != 0:
+      for i in countDown(c.typStack.len - 1, 0):
+        if x == c.typStack[i]:
+          # echo "cycle is detected in PType"
+          return true
+    c.typStack.add x
+    if not eql(x.n, y.n, c):
+      echo "type.n mismatch"
+      result = false
+    elif x.kidsLen != y.kidsLen:
+      echo "type kidsLen mismatch"
+      result = false
+    else:
+      result = true
+      for i in 0 ..< x.kidsLen:
+        if not eql(x[i], y[i], c):
+          echo "type kids mismatch: "
+          debug(x[i])
+          debug(y[i])
+          result = false
+          break
+    discard c.typStack.pop
 
-proc eql(x, y: PSym): bool =
+proc eql(x, y: PSym; c: var EqlContext): bool =
   if x == nil and y == nil:
     result = true
   elif x == nil or y == nil:
     result = false
-  elif x.kind == y.kind and eql(x.typ, y.typ) and x.name.s == y.name.s:
+  elif x.kind == y.kind and eql(x.typ, y.typ, c) and x.name.s == y.name.s:
     if (x.itemId.item == y.itemId.item and x.disamb == y.disamb and x.flags == y.flags) or (x.kind == skType and x.typ.kind in SysTypeKinds):
       if x.owner == nil and y.owner == nil:
         result = true
@@ -100,15 +135,21 @@ proc eql(x, y: PSym): bool =
   else:
     result = false
 
-proc eql(x, y: PNode): bool =
+proc eql(x, y: PNode; c: var EqlContext): bool =
   if x == nil and y == nil:
     result = true
   elif x == nil or y == nil:
     result = false
   elif x.kind == y.kind and x.safeLen == y.safeLen and x.flags == y.flags:
+    if c.nodeStack.len != 0:
+      for i in countDown(c.nodeStack.len - 1, 0):
+        if x == c.nodeStack[i]:
+          # echo "cycle is detected in PNode"
+          return true
+    c.nodeStack.add x
     case x.kind:
     of nkSym:
-      result = eql(x.sym, y.sym)
+      result = eql(x.sym, y.sym, c)
       if not result:
         echo "Symbol mismatch:"
         debug(x.sym)
@@ -119,22 +160,23 @@ proc eql(x, y: PNode): bool =
       result = sameValue(x, y)
     of nkIdentDefs:
       assert x.len == 3 and y.len == 3
-      if eql(x[0], y[0]) and eql(x[2], y[2]):
+      if eql(x[0], y[0], c) and eql(x[2], y[2], c):
         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]):
+      if eql(x[0], y[0], c) and eql(x[1], y[1], c):
         result = y[2].kind == nkEmpty and y[0].sym.typ != nil
       else:
         result = false
     else:
       result = true
       for i in 0 ..< x.safeLen:
-        if not eql(x[i], y[i]):
+        if not eql(x[i], y[i], c):
           result = false
           break
+    discard c.nodeStack.pop
   else:
     result = false
 
@@ -143,13 +185,15 @@ proc testNifEncDec(graph: ModuleGraph; src: string) =
   let n = sem(graph, fullPath)
   let nif = saveNifToBuffer(n, graph.config)
   #debug(n)
+  #debug(n[0][0][0].typ)
   #echo nif
 
   # Don't reuse the ModuleGraph used for semcheck when load NIF.
   var graphForLoad = newModuleGraph(newIdentCache(), newConfigRefForTest())
   let n2 = loadNifFromBuffer(nif, fullPath, graphForLoad)
   #debug(n2)
-  assert eql(n, n2)
+  var c = EqlContext()
+  assert eql(n, n2, c)
 
 var conf = newConfigRefForTest()
 var cache = newIdentCache()

tests/icnif/testcode/modtesttypesections.nim

@@ -5,7 +5,12 @@ type
     Y
   TestDistinct = distinct int
 
+  TestObject = object
+    x*: int
+    y: int
+
 var x: TestInt
 var testEnum: TestEnum
 var testEnum1 = X
 var testDistinct: TestDistinct
+var testObject: TestObject