refactorings and import handling (#1157)

Author: Araq

src/nimony/derefs.nim

@@ -715,7 +715,7 @@ proc tr(c: var Context; n: var Cursor; e: Expects) =
   case n.kind
   of Symbol:
     let localInfo = c.typeCache.getLocalInfo(n.symId)
-    if localInfo.crossedProc:
+    if localInfo.crossedProc and localInfo.kind in {VarY, LetY, ParamY, ResultY}:
       let info = n.info
       c.dest.buildTree ErrT, info:
         c.dest.addSubtree n

src/nimony/semimport.nim

@@ -97,12 +97,7 @@ proc doImports(c: var SemContext; files: seq[ImportedFilename]; mode: ImportFilt
   for f in files:
     importSingleFileConsiderExports c, f, origin, mode, info
 
-proc semImport(c: var SemContext; it: var Item) =
-  let info = it.n.info
-  var x = it.n
-  skip it.n
-  inc x # skip the `import`
-
+template maybeCyclic(c: var SemContext; x: var Cursor) =
   if x.kind == ParLe and x.exprKind == PragmaxX:
     inc x
     var y = x
@@ -113,6 +108,13 @@ proc semImport(c: var SemContext; it: var Item) =
         cyclicImport(c, x)
         return
 
+proc semImport(c: var SemContext; it: var Item) =
+  let info = it.n.info
+  var x = it.n
+  skip it.n
+  inc x # skip the `import`
+  maybeCyclic(c, x)
+
   var files: seq[ImportedFilename] = @[]
   var hasError = false
   while x.kind != ParRi:
@@ -130,15 +132,7 @@ proc semImportExcept(c: var SemContext; it: var Item) =
   skip it.n
   inc x # skip the `importexcept`
 
-  if x.kind == ParLe and x.exprKind == PragmaxX:
-    inc x
-    var y = x
-    skip y
-    if y.substructureKind == PragmasU:
-      inc y
-      if y.kind == Ident and pool.strings[y.litId] == "cyclic":
-        cyclicImport(c, x)
-        return
+  maybeCyclic(c, x)
 
   var files: seq[ImportedFilename] = @[]
   var hasError = false
@@ -159,15 +153,7 @@ proc semFromImport(c: var SemContext; it: var Item) =
   skip it.n
   inc x # skip the `from`
 
-  if x.kind == ParLe and x.exprKind == PragmaxX:
-    inc x
-    var y = x
-    skip y
-    if y.substructureKind == PragmasU:
-      inc y
-      if y.kind == Ident and pool.strings[y.litId] == "cyclic":
-        cyclicImport(c, x)
-        return
+  maybeCyclic(c, x)
 
   var files: seq[ImportedFilename] = @[]
   var hasError = false

src/nimony/typenav.nim

@@ -98,7 +98,7 @@ proc getLocalInfo*(c: var TypeCache; s: SymId): LocalInfo =
     if it.kind == compareTo:
       crossedProc = true
     if res.kind != NoSym:
-      res.crossedProc = crossedProc and res.kind in {VarY, LetY, ParamY, ResultY}
+      res.crossedProc = crossedProc
       return res
     it = it.parent
     compareTo = ProcScope