clean up code

Author: demotomohiro

compiler/icnif/nifdecoder.nim

@@ -17,25 +17,6 @@ proc nodeKind(n: Cursor): TNodeKind {.inline.} =
   assert n.kind == ParLe
   pool.tags[n.tagId].parseNodeKind()
 
-const SysTypeKinds = {tyBool, tyChar, tyString, tyInt .. tyUInt64}
-
-proc getSysTypeSym(c: var DecodeContext; typeKind: TTypeKind): PSym =
-  assert typeKind in SysTypeKinds
-  if typeKind in c.sysTypes:
-    result = c.sysTypes[typeKind]
-  else:
-    let ident = c.graph.cache.getIdent(toNifTag typeKind)
-    result = newSym(skType, ident, c.idgen, c.owner, unknownLineInfo)
-    var typ = newType(typeKind, c.idgen, nil)
-    typ.sym = result
-    result.typ = typ
-    c.sysTypes[typeKind] = result
-
-proc getSysType(c: var DecodeContext; typeKind: TTypeKind): PType =
-  # This will be replaced with magicsys.getSysType
-  assert typeKind in SysTypeKinds
-  getSysTypeSym(c, typeKind).typ
-
 type
   SplittedNifSym = object
     name: string

compiler/icnif/nifdecodertypes.nim

@@ -8,6 +8,25 @@ proc expect(n: var Cursor; k: NifKind) =
       writeStackTrace()
     quit "[NIF decoder] expected: " & $k & " but got: " & $n.kind & toString n
 
+const SysTypeKinds = {tyBool, tyChar, tyString, tyInt .. tyUInt64}
+
+proc getSysTypeSym(c: var DecodeContext; typeKind: TTypeKind): PSym =
+  assert typeKind in SysTypeKinds
+  if typeKind in c.sysTypes:
+    result = c.sysTypes[typeKind]
+  else:
+    let ident = c.graph.cache.getIdent(toNifTag typeKind)
+    result = newSym(skType, ident, c.idgen, c.owner, unknownLineInfo)
+    var typ = newType(typeKind, c.idgen, nil)
+    typ.sym = result
+    result.typ = typ
+    c.sysTypes[typeKind] = result
+
+proc getSysType(c: var DecodeContext; typeKind: TTypeKind): PType =
+  # This will be replaced with magicsys.getSysType
+  assert typeKind in SysTypeKinds
+  getSysTypeSym(c, typeKind).typ
+
 proc readTypeKind(n: var Cursor; tag: string): TTypeKind =
   if tag.len == 1:
     case tag[0]

compiler/icnif/nifencoder.nim

@@ -83,8 +83,8 @@ proc toNifTypeSection(c: var EncodeContext; n: PNode) =
   assert n.len == 3
 
   var name: PNode
-  var visibility: PNode
-  var pragma: PNode
+  var visibility: PNode = nil
+  var pragma: PNode = nil
   if n[0].kind == nkPragmaExpr:
     pragma = n[0][1]
     if n[0][0].kind == nkPostfix:

compiler/icnif/nifencodertypes.nim

@@ -41,8 +41,8 @@ proc toNif(c: var EncodeContext; t: PType) =
     return
 
   case t.kind
-  of tyNone: atom c, t 
-  of tyBool: atom c, t 
+  of tyNone: atom c, t
+  of tyBool: atom c, t
   of tyChar: atom c, t, "c +8"
   of tyEmpty: c.b.addEmpty
   of tyInt: atom c, t, "i -1"

tests/icnif/tencode_node2node.nim

@@ -14,7 +14,7 @@ proc newConfigRefForTest(): ConfigRef =
   excl(conf.notes, hintProcessing)
   excl(conf.mainPackageNotes, hintProcessing)
   result = conf
- 
+
 proc newModuleGraphForSem(cache: IdentCache; conf: ConfigRef): ModuleGraph =
   var graph = newModuleGraph(cache, conf)
   graph.setPipeLinePass(SemPass)