encodes and decodes Node flags

Author: demotomohiro

compiler/icnif/nifdecoder.nim

@@ -100,9 +100,19 @@ proc fromNifSymDef(c: var DecodeContext; n: var Cursor; kind: TNodeKind): PNode
 
 include nifdecodertypes
 
+proc fromNifNodeFlags(n: var Cursor): set[TNodeFlag] =
+  result = {}
+  if n.kind == ParLe and pool.tags[n.tag] == "nf":
+    inc n
+    assert n.kind == Ident
+    result = parseNodeFlags(pool.strings[n.litId])
+    inc n
+    expect n, ParRi
+
 proc fromNifLocal(c: var DecodeContext; n: var Cursor; kind: TNodeKind): PNode =
   result = newNodeI(kind, unknownLineInfo, 1)
   inc n
+  result.flags = fromNifNodeFlags(n)
   assert n.nodeKind == nkIdentDefs
   result[0] = newNodeI(nkIdentDefs, unknownLineInfo, 3)
   inc n
@@ -259,6 +269,7 @@ proc fromNif(c: var DecodeContext; n: var Cursor): PNode =
     of nkPostfix, nkTypeSection, nkStmtList:
       result = newNode(kind)
       inc n
+      result.flags = fromNifNodeFlags(n)
       while n.kind != ParRi:
         result.add fromNif(c, n)
       inc n

compiler/icnif/nifencoder.nim

@@ -29,6 +29,13 @@ proc addFloatLit(b: var Builder; f: float; suffix: string) =
     addFloatLit(b, f)
     addStrLit(b, suffix)
 
+proc writeFlags[E](b: var Builder; flags: set[E]; tag: string) =
+  var flagsAsIdent = ""
+  genFlags(flags, flagsAsIdent)
+  if flagsAsIdent.len > 0:
+    b.withTree tag:
+      b.addIdent flagsAsIdent
+
 proc toNif(c: var EncodeContext; n: PNode)
 proc toNif(c: var EncodeContext; t: PType; isTypeSection = false)
 
@@ -79,6 +86,15 @@ proc symdefToNif(c: var EncodeContext; n: PNode) =
 
 include nifencodertypes
 
+proc writeNodeFlags(b: var Builder; flags: set[TNodeFlag]) {.inline.} =
+  writeFlags b, flags, "nf"
+
+template withNode(b: var Builder; n: PNode; body: untyped) =
+  addTree b, toNifTag(n.kind)
+  writeNodeFlags(b, n.flags)
+  body
+  endTree b
+
 proc toNifTypeSection(c: var EncodeContext; n: PNode) =
   assert n.len == 3
 
@@ -187,26 +203,24 @@ proc toNif(c: var EncodeContext; n: PNode) =
   of nkTripleStrLit:
     c.b.addStrLit n.strVal, "T"
   of nkIdentDefs:
-    c.b.addTree toNifTag(n.kind)
-    assert n.len == 3
-    symdefToNif(c, n[0])
-    if n[1].kind == nkSym:
-      symToNif c, n[1].sym
-    else:
-      assert n[0].kind == nkSym
-      toNif c, n[0].sym.typ
-    toNif c, n[2]
-    c.b.endTree()
+    c.b.withNode n:
+      assert n.len == 3
+      symdefToNif(c, n[0])
+      if n[1].kind == nkSym:
+        symToNif c, n[1].sym
+      else:
+        assert n[0].kind == nkSym
+        toNif c, n[0].sym.typ
+      toNif c, n[2]
   of nkTypeDef:
     toNifTypeSection(c, n)
   of nkImportStmt:
     toNifImport(c, n)
   else:
     assert n.len > 0, $n.kind
-    c.b.addTree toNifTag(n.kind)
-    for i in 0 ..< n.len:
-      toNif c, n[i]
-    c.b.endTree()
+    c.b.withNode(n):
+      for i in 0 ..< n.len:
+        toNif c, n[i]
 
 proc saveNif(c: var EncodeContext; n: PNode) =
   c.b.addHeader "nim2", "nim2-ic-nif"

compiler/icnif/nifencodertypes.nim

@@ -1,12 +1,5 @@
 # included from nifencoder
 
-proc writeFlags[E](b: var Builder; flags: set[E]; tag: string) =
-  var flagsAsIdent = ""
-  genFlags(flags, flagsAsIdent)
-  if flagsAsIdent.len > 0:
-    b.withTree tag:
-      b.addIdent flagsAsIdent
-
 proc writeTypeFlags(c: var EncodeContext; t: PType) =
   writeFlags c.b, t.flags, "tf"
 

tests/icnif/tencode_node2node.nim

@@ -105,7 +105,7 @@ proc eql(x, y: PNode): bool =
     result = true
   elif x == nil or y == nil:
     result = false
-  elif x.kind == y.kind and x.safeLen == y.safeLen:
+  elif x.kind == y.kind and x.safeLen == y.safeLen and x.flags == y.flags:
     case x.kind:
     of nkSym:
       result = eql(x.sym, y.sym)