fixes local type decls by lifting them into top levels (#1175)

It lifts local type decls before hexer handling. In sem phases, every
type decls have gotten a global name. All is left to do is to lift them
to the top levels. It alleviates pain for hexer. e.g. in
`collectMethods`, only top level type decls are handled. But vtable
infos are still needed for inherited objects for display checking at
least. It's better to lift them instead of special cases local type
decls in the multiple hexer phases

Author: ringabout

src/hexer/desugar.nim

@@ -13,6 +13,7 @@ type
     thisModuleSuffix: string
     tempUseBufStack: seq[TokenBuf]
     activeChecks: set[CheckMode]
+    pending: TokenBuf
 
 proc declareTemp(c: var Context; dest: var TokenBuf; typ: Cursor; info: PackedLineInfo): SymId =
   let s = "`desugar." & $c.counter & "." & c.thisModuleSuffix
@@ -67,12 +68,12 @@ proc skipParRi(n: var Cursor) =
   else:
     bug "expected ')', but got: ", n
 
-proc tr(c: var Context; dest: var TokenBuf; n: var Cursor)
+proc tr(c: var Context; dest: var TokenBuf; n: var Cursor; isTopScope = false)
 
-proc trSons(c: var Context; dest: var TokenBuf; n: var Cursor) =
+proc trSons(c: var Context; dest: var TokenBuf; n: var Cursor; isTopScope = false) =
   copyInto dest, n:
     while n.kind != ParRi:
-      tr(c, dest, n)
+      tr(c, dest, n, isTopScope)
 
 proc trLocal(c: var Context; dest: var TokenBuf; n: var Cursor) =
   let kind = n.symKind
@@ -702,7 +703,7 @@ proc trExpr(c: var Context; dest: var TokenBuf; n: var Cursor) =
     skipParRi n
     dec nestedExpr
 
-proc tr(c: var Context; dest: var TokenBuf; n: var Cursor) =
+proc tr(c: var Context; dest: var TokenBuf; n: var Cursor; isTopScope = false) =
   case n.kind
   of DotToken, UnknownToken, EofToken, Ident, Symbol, SymbolDef, IntLit, UIntLit, FloatLit, CharLit, StringLit:
     takeTree dest, n
@@ -734,15 +735,22 @@ proc tr(c: var Context; dest: var TokenBuf; n: var Cursor) =
         trLocal c, dest, n
       of ProcS, FuncS, MacroS, MethodS, ConverterS:
         trProc c, dest, n
-      of IteratorS, TemplateS, TypeS, EmitS, BreakS, ContinueS,
+      of IteratorS, TemplateS, EmitS, BreakS, ContinueS,
         ForS, CmdS, IncludeS, ImportS, FromimportS, ImportExceptS,
         ExportS, CommentS,
         PragmasS:
         takeTree dest, n
+      of TypeS:
+        if isTopScope:
+          takeTree dest, n
+        else:
+          takeTree c.pending, n
       of ScopeS:
         c.typeCache.openScope()
         trSons(c, dest, n)
         c.typeCache.closeScope()
+      of StmtsS:
+        trSons(c, dest, n, isTopScope = isTopScope)
       else:
         trSons(c, dest, n)
     of SetConstrX:
@@ -770,9 +778,16 @@ proc tr(c: var Context; dest: var TokenBuf; n: var Cursor) =
     bug "unexpected ')' inside"
 
 proc desugar*(n: Cursor; moduleSuffix: string; activeChecks: set[CheckMode]): TokenBuf =
-  var c = Context(counter: 0, typeCache: createTypeCache(), thisModuleSuffix: moduleSuffix, activeChecks: activeChecks)
+  var c = Context(counter: 0, typeCache: createTypeCache(), thisModuleSuffix: moduleSuffix, activeChecks: activeChecks, pending: createTokenBuf())
   c.typeCache.openScope()
   result = createTokenBuf(300)
   var n = n
-  tr c, result, n
+  tr c, result, n, isTopScope = true
+
+  assert result[result.len-1].kind == ParRi
+  shrink(result, result.len-1)
+
+  result.add c.pending
+  result.addParRi()
+
   c.typeCache.closeScope()

src/hexer/duplifier.nim

@@ -865,21 +865,9 @@ proc trDeref(c: var Context; n: var Cursor) =
     c.dest.addIntLit(0, info) # inheritance
   takeParRi c.dest, n
 
-proc trTypeDecl(c: var Context; n: var Cursor) =
-  var iter = n
-  inc iter
-  let symId = iter.symId
-  var dest = createTokenBuf()
-  takeTree(dest, n)
-  c.dest.add dest
-  if isLocalDecl(symId):
-    publish(symId, dest)
-
 proc tr(c: var Context; n: var Cursor; e: Expects) =
   if n.kind == Symbol:
     trLocation c, n, e
-  elif n.stmtKind == TypeS:
-    trTypeDecl c, n
   elif n.kind in {Ident, SymbolDef, IntLit, UIntLit, CharLit, StringLit, FloatLit, DotToken} or isDeclarative(n):
     takeTree c.dest, n
   else:

src/hexer/nifcgen.nim

@@ -1911,4 +1911,4 @@ proc expand*(infile: string; bits: int; flags: set[CheckMode]) =
   c.closeMangleScope()
 
 when isMainModule:
-  echo splitModulePath("/abc/def/name.4.nif")
+  echo splitModulePath("/abc/def/name.4.nif")

tests/nimony/object/tinheritance.nim

@@ -13,4 +13,57 @@ let
 
 # object construction:
 student = Student(name: "Anton", age: 5, id: 2)
-assert student.name == "Anton"
+assert student.name == "Anton"
+
+
+
+type
+  TestTestObj = object of RootObj
+    id: int
+
+var x = TestTestObj(id: 12)
+assert x.id == 12
+
+
+proc foo =
+  type
+    TestTestObj = object of RootObj
+      id: int
+
+  var x = TestTestObj(id: 12)
+  assert x.id == 12
+
+  block:
+    type
+      TestTestObj = object of RootObj
+        id: int
+
+    var x = TestTestObj(id: 12)
+    assert x.id == 12
+
+  block:
+    type
+      TestTestObj = object
+        id: int
+
+    var x = TestTestObj(id: 12)
+    assert x.id == 12
+
+foo()
+
+block:
+  type
+    TestTestObj = object of RootObj
+      id: int
+
+  var x = TestTestObj(id: 12)
+  assert x.id == 12
+
+
+block:
+  type
+    TestTestObj = object of RootObj
+      id: int
+
+  var x = TestTestObj(id: 12)
+  assert x.id == 12