supports nil literal and ref/ptr types

Author: demotomohiro

compiler/icnif/enum2nif.nim

@@ -1,4 +1,4 @@
-# Generated by enumgen.nim. DO NOT EDIT!
+# Generated by gear2/generator/enumgen.nim in Nimony repo. DO NOT EDIT!
 
 import ".." / [ast, options]
 
@@ -27,7 +27,7 @@ proc toNifTag*(s: TNodeKind): string =
   of nkStrLit: "strlit"
   of nkRStrLit: "rstrlit"
   of nkTripleStrLit: "triplestrlit"
-  of nkNilLit: "nillit"
+  of nkNilLit: "nil"
   of nkComesFrom: "comesfrom"
   of nkDotCall: "dotcall"
   of nkCommand: "cmd"
@@ -197,7 +197,7 @@ proc parseNodeKind*(s: string): TNodeKind =
   of "strlit": nkStrLit
   of "rstrlit": nkRStrLit
   of "triplestrlit": nkTripleStrLit
-  of "nillit": nkNilLit
+  of "nil": nkNilLit
   of "comesfrom": nkComesFrom
   of "dotcall": nkDotCall
   of "cmd": nkCommand
@@ -800,7 +800,7 @@ proc toNifTag*(s: TMagic): string =
   of mString: "string"
   of mCstring: "cstring"
   of mPointer: "pointer"
-  of mNil: "nil"
+  of mNil: "nilm"
   of mExpr: "exprm"
   of mStmt: "stmtm"
   of mTypeDesc: "typedesc"
@@ -1082,7 +1082,7 @@ proc parseMagic*(s: string): TMagic =
   of "string": mString
   of "cstring": mCstring
   of "pointer": mPointer
-  of "nil": mNil
+  of "nilm": mNil
   of "exprm": mExpr
   of "stmtm": mStmt
   of "typedesc": mTypeDesc

compiler/icnif/nifdecoder.nim

@@ -274,6 +274,10 @@ proc fromNif(c: var DecodeContext; n: var Cursor): PNode =
   of ParLe:
     let kind = n.nodeKind
     case kind:
+    of nkNilLit:
+      result = newNode(nkNilLit)
+      inc n
+      skipParRi n
     of nkPostfix, nkTypeSection, nkStmtList:
       result = newNode(kind)
       inc n

compiler/icnif/nifencoder.nim

@@ -202,6 +202,8 @@ proc toNif(c: var EncodeContext; n: PNode) =
     c.b.addStrLit n.strVal, "R"
   of nkTripleStrLit:
     c.b.addStrLit n.strVal, "T"
+  of nkNilLit:
+    c.b.addKeyw toNifTag(nkNilLit)
   of nkIdentDefs:
     c.b.withNode n:
       assert n.len == 3

compiler/icnif/nifencodertypes.nim

@@ -3,10 +3,6 @@
 proc writeTypeFlags(c: var EncodeContext; t: PType) =
   writeFlags c.b, t.flags, "tf"
 
-proc isNominalRef(t: PType): bool {.inline.} =
-  let e = t.elementType
-  t.sym != nil and e.kind == tyObject and (e.sym == nil or sfAnon in e.sym.flags)
-
 template singleElement(keyw: string) {.dirty.} =
   c.b.withTree keyw:
     writeTypeFlags(c, t)
@@ -97,18 +93,12 @@ proc toNif(c: var EncodeContext; t: PType; isTypeSection = false) =
           toNif c, son
     else:
       symToNif c, t.sym
-  of tyPtr:
-    if isNominalRef(t):
-      symToNif c, t.sym
-    else:
-      c.typeHead t:
-        toNif c, t.elementType
-  of tyRef:
-    if isNominalRef(t):
+  of tyRef, tyPtr:
+    if tfRefsAnonObj in t.flags and not isTypeSection:
       symToNif c, t.sym
     else:
       c.typeHead t:
-        toNif c, t.elementType
+        toNif c, t.elementType, isTypeSection
   of tyVar:
     c.b.withTree(if isOutParam(t): "out" else: "mut"):
       toNif c, t.elementType

tests/icnif/testcode/modtestliterals.nim

@@ -25,3 +25,5 @@ var uint64litH = 18446744073709551615'u64
 var floatlit = 1.25
 var float32lit = 1.25'f32
 var float64lit = 1.25'f64
+
+var nillit: ptr int = nil

tests/icnif/testcode/modtesttypesections.nim

@@ -12,9 +12,25 @@ type
   TestObject2* = object
     x: TestObject
 
+  TestRefInt = ref int
+  TestPtrInt = ptr int
+
+  TestRefObj = ref object
+    x: int
+
+  TestPtrObj = ptr object
+    x: int
+
 var x: TestInt
 var testEnum: TestEnum
 var testEnum1 = X
 var testDistinct: TestDistinct
 var testObject: TestObject
 var testObject2*: TestObject2
+
+var testRefInt: TestRefInt = nil
+var testRefInt2: ref int = nil
+var testPtrInt: TestPtrInt = nil
+var testPtrInt2: ptr int = nil
+var testRefObj: TestRefObj = nil
+var testPtrObj: TestPtrObj = nil