encodes/decodes symbol's owner

Author: demotomohiro

compiler/icnif/nifdecoder.nim

@@ -1,6 +1,7 @@
 import std / [assertions, tables, parseutils]
-import "../../dist/nimony/src/lib" / [bitabs, nifreader, nifstreams, nifcursors, symparser]
-import ".." / [ast, astalgo, idents, lineinfos, options, modulegraphs, msgs, pathutils]
+import "../../dist/nimony/src/lib" / [bitabs, nifreader, nifstreams, nifcursors]
+import ".." / [ast, astalgo, idents, lineinfos, options, modules, modulegraphs, msgs, pathutils]
+import "../../dist/nimony/src/gear2" / modnames
 import enum2nif
 
 type
@@ -47,6 +48,10 @@ proc splitNifSym(s: string): SplittedNifSym =
 
 proc fromNif(c: var DecodeContext; n: var Cursor): PNode
 
+proc fromNifSymbol(c: var DecodeContext; n: var Cursor): PSym =
+  result = c.nifSymToPSym[pool.syms[n.symId]]
+  inc n
+
 proc fromNifSymDef(c: var DecodeContext; n: var Cursor; kind: TNodeKind): PNode =
   assert n.nodeKind == nkSym
   let symKind = case kind:
@@ -61,20 +66,34 @@ proc fromNifSymDef(c: var DecodeContext; n: var Cursor; kind: TNodeKind): PNode
   assert symdef.name.len != 0
   let ident = c.graph.cache.getIdent(symdef.name)
   inc n
+  assert n.kind == IntLit
+  let itemId = pool.integers[n.intId].int32
+  inc n
+  assert n.kind in {Symbol, DotToken}, $n.kind
+  let owner = if n.kind == Symbol:
+      fromNifSymbol(c, n)
+    else:
+      inc n
+      nil
   assert n.kind in {Ident, DotToken}, $n.kind
   let flags = if n.kind == Ident: pool.strings[n.litId].parseSymFlags else: {}
   inc n
-  var position = 0
-  if symKind == skModule:
-    assert n.kind == StringLit
-    let path = pool.strings[n.litId].AbsoluteFile
-    position = fileInfoIdx(c.graph.config, path).int
-  else:
-    assert n.kind == IntLit
-    position = pool.integers[n.intId]
+  var position = if symKind == skModule:
+      assert n.kind == StringLit
+      let path = pool.strings[n.litId].AbsoluteFile
+      fileInfoIdx(c.graph.config, path).int
+    else:
+      assert n.kind == IntLit
+      pool.integers[n.intId]
   inc n
 
-  let psym = PSym(itemId: ItemId(module: 0, item: symdef.id.int32), kind: symKind, name: ident, flags: flags, position: position)
+  var psym = PSym(itemId: ItemId(module: 0, item: itemId),
+    kind: symKind,
+    name: ident,
+    flags: flags,
+    position: position,
+    disamb: symdef.id.int32)
+  psym.setOwner(owner)
   result = newSymNode(psym)
   let hasSym = c.nifSymToPSym.hasKeyOrPut(nifSym, psym)
   assert not hasSym
@@ -113,9 +132,7 @@ proc fromNif(c: var DecodeContext; n: var Cursor): PNode =
     result = newIntTypeNode(pool.integers[n.intId], getSysType(tyInt))
     inc n
   of Symbol:
-    let sym = c.nifSymToPSym[pool.syms[n.symId]]
-    result = newSymNode(sym)
-    inc n
+    result = newSymNode(fromNifSymbol(c, n))
   of ParLe:
     let kind = n.nodeKind
     case kind:
@@ -134,30 +151,36 @@ proc fromNif(c: var DecodeContext; n: var Cursor): PNode =
   else:
     assert false, "Not yet implemented " & $n.kind
 
-proc loadNif(stream: var Stream; graph: ModuleGraph): PNode =
+proc loadNif(stream: var Stream; modulePath: AbsoluteFile; graph: ModuleGraph): PNode =
   discard processDirectives(stream.r)
 
   var buf = fromStream(stream)
   var n = beginRead(buf)
 
   var c = DecodeContext(graph: graph)
+
+  let modSym = newModule(graph, fileInfoIdx(graph.config, modulePath))
+  let modSuffix = moduleSuffix(modulePath.string, cast[seq[string]](graph.config.searchPaths))
+  let nifModSym = modSym.name.s & '.' & $modSym.disamb & '.' & modSuffix
+  c.nifSymToPSym[nifModSym] = modSym
+
   result = fromNif(c, n)
 
   endRead(buf)
 
 proc loadNifFile*(infile: AbsoluteFile; graph: ModuleGraph): PNode =
   var stream = nifstreams.open(infile.string)
-  result = loadNif(stream, graph)
+  result = loadNif(stream, infile.changeFileExt("nim"), graph)
   stream.close
 
-proc loadNifFromBuffer*(strbuf: sink string; graph: ModuleGraph): PNode =
+proc loadNifFromBuffer*(strbuf: sink string; modulePath: AbsoluteFile; graph: ModuleGraph): PNode =
   var stream = nifstreams.openFromBuffer(strbuf)
-  result = loadNif(stream, graph)
+  result = loadNif(stream, modulePath, graph)
 
 when isMainModule:
   import std/cmdline
 
   if paramCount() > 0:
     var graph = newModuleGraph(newIdentCache(), newConfigRef())
-    var node = loadNifFile(paramStr(1).AbsoluteFile, graph)
+    var node = loadNifFile(paramStr(1).toAbsolute(toAbsoluteDir(".")), graph)
     debug(node)

compiler/icnif/nifencoder.nim

@@ -9,7 +9,7 @@ type
     b: Builder
     conf: ConfigRef
     toSuffix: Table[FileIndex, string]
-    moduleToNifSuffix: Table[ItemId, string] # module PSym -> module suffix
+    moduleToNifSuffix: Table[FileIndex, string] # FileIndex (PSym.position) -> module suffix
 
 proc modname(c: var EncodeContext; idx: FileIndex): string =
   # copied from ../nifgen.nim
@@ -20,21 +20,31 @@ proc modname(c: var EncodeContext; idx: FileIndex): string =
     c.toSuffix[idx] = result
 
 proc toNifSym(c: var EncodeContext; sym: PSym): string =
-  result = sym.name.s & '.' & $sym.itemId.item
-  if sym.owner.kind == skModule:
+  result = sym.name.s & '.' & $sym.disamb
+  let owner = sym.skipGenericOwner()
+  if owner.kind == skModule:
     result.add '.'
-    var modsuf = c.moduleToNifSuffix.getOrDefault(sym.owner.itemId)
+    let fileIndex = FileIndex owner.position
+    var modsuf = c.moduleToNifSuffix.getOrDefault(fileIndex)
     if modsuf.len == 0:
-      modsuf = modname(c, sym.owner.position.FileIndex)
-      c.moduleToNifSuffix[sym.owner.itemId] = modsuf
+      modsuf = modname(c, fileIndex)
+      c.moduleToNifSuffix[fileIndex] = modsuf
     result.add modsuf
 
+proc symToNif(c: var EncodeContext; sym: PSym) =
+  c.b.addSymbol toNifSym(c, sym)
+
 proc symdefToNif(c: var EncodeContext; n: PNode) =
   assert n.kind == nkSym
   let sym = n.sym
   c.b.addTree toNifTag(n.kind)
   var name = toNifSym(c, sym)
   c.b.addSymbolDef name
+  c.b.addIntLit sym.itemId.item
+  if sym.owner == nil or sym.owner.kind == skPackage:
+    c.b.addEmpty
+  else:
+    symToNif(c, sym.owner)
   if sym.flags == {}:
     c.b.addEmpty()
   else:
@@ -88,7 +98,7 @@ proc toNif(c: var EncodeContext; n: PNode) =
           echo "position = ", o.position
         debug(o)
         o = o.owner
-    c.b.addSymbol toNifSym(c, n.sym)
+    symToNif(c, n.sym)
   of nkImportStmt:
     toNifImport(c, n)
   else:

tests/icnif/tencode.nim

@@ -1,22 +1,23 @@
 import std/assertions
 import "../../compiler/icnif" / [nifencoder, nifdecoder]
-import "../../compiler" / [idents, options, modulegraphs]
+import "../../compiler" / [idents, options, pathutils, modulegraphs]
 
 var graph = newModuleGraph(newIdentCache(), newConfigRef())
+graph.config.searchPaths.add AbsoluteDir "/tmp/testnim"
 
 block:
   const TestNif = """
-    (.nif24)
-    (.vendor "nim2")
-    (.dialect "nim2-ic-nif")
-    (stmts
-     (import
-      (sym :testmod2.1 . "/home/nimdev/testnim/testmod2.nim"))
-     (var
-      (identdefs
-       (sym :x.2.tesvp2f3v ueg +0) . +123))
-     (var
-      (identdefs
-       (sym :y.3.tesvp2f3v g +0) . x.2.tesvp2f3v)))"""
+(.nif24)
+(.vendor "nim2")
+(.dialect "nim2-ic-nif")
+(stmts
+ (import
+  (sym :testmod2.0.tesfd9rxn1 +1 . . "/tmp/testnim/testmod2.nim"))
+ (var
+  (identdefs
+   (sym :x.0.tesvp2f3v +2 testmod.0.tesvp2f3v ueg +0) . +123))
+ (var
+  (identdefs
+   (sym :y.0.tesvp2f3v +3 testmod.0.tesvp2f3v g +0) . x.0.tesvp2f3v)))"""
 
-  assert loadNifFromBuffer(TestNif, graph).saveNifToBuffer(graph.config) == TestNif
+  assert loadNifFromBuffer(TestNif, AbsoluteFile"/tmp/testnim/testmod.nim", graph).saveNifToBuffer(graph.config) == TestNif