fixes std imports (#567)

* always add lib/ to the search path

Author: Araq

src/gear2/modnames.nim

@@ -59,5 +59,7 @@ proc moduleSuffix*(path: string; searchPaths: openArray[string]): string =
     id = id div 36'u32
 
 when isMainModule:
-  echo moduleSuffix("/Users/rumpf/projects/nim/lib/system.nim")
-  echo moduleSuffix("/Users/araq/projects/nim/lib/system.nim")
+  #echo moduleSuffix("/Users/rumpf/projects/nim/lib/system.nim")
+  #echo moduleSuffix("/Users/araq/projects/nim/lib/system.nim")
+  echo moduleSuffix("/Users/rumpf/projects/nimony/lib/std/system.nim", [])
+  echo moduleSuffix("/Users/rumpf/projects/nimony/lib/std/system.nim", ["/Users/rumpf/projects/nimony/lib"])

src/hexer/lifter.nim

@@ -18,7 +18,7 @@ import std/[assertions, tables]
 
 include nifprelude
 import nifindexes, symparser, treemangler, typekeys
-import ".." / nimony / [nimony_model, decls, programs, typenav, expreval, xints]
+import ".." / nimony / [nimony_model, decls, programs, typenav, expreval, xints, builtintypes]
 
 type
   TypeCursor = Cursor
@@ -63,8 +63,7 @@ proc hasHook(c: var LiftingCtx; s: SymId): bool =
   false
 
 proc getCompilerProc(c: var LiftingCtx; name: string): SymId =
-  const systemSuffix = "sys9azlf"
-  result = pool.syms.getOrIncl(name & ".0." & systemSuffix)
+  result = pool.syms.getOrIncl(name & ".0." & SystemModuleSuffix)
 
 proc isTrivialForFields(c: var LiftingCtx; n: Cursor): bool =
   var n = n

src/nimony/builtintypes.nim

@@ -21,7 +21,7 @@ proc tagToken(tag: string; info: PackedLineInfo = NoLineInfo): PackedToken {.inl
   parLeToken(pool.tags.getOrIncl(tag), info)
 
 const
-  SystemModuleSuffix* = "sys9azlf"
+  SystemModuleSuffix* = "sysvq0asl" # "sys9azlf"
   StringName* = "string.0." & SystemModuleSuffix
   StringAField* = "a.0." & SystemModuleSuffix
   StringIField* = "i.0." & SystemModuleSuffix

src/nimony/nimony.nim

@@ -139,11 +139,8 @@ proc handleCmdLine() =
     quit "too few command line arguments"
   elif args.len > 2 - int(cmd == FullProject):
     quit "too many command line arguments"
-  if useEnv:
-    let nimPath = getEnv("NIMPATH")
-    for entry in split(nimPath, PathSep):
-      if entry.strip != "":
-        config.paths.add entry
+  semos.setupPaths(config, useEnv)
+
   case cmd
   of None:
     quit "command missing"

src/nimony/nimsem.nim

@@ -105,11 +105,7 @@ proc handleCmdLine() =
     of cmdEnd: assert false, "cannot happen"
   if args.len != 3:
     quit "want exactly 3 command line arguments"
-  if useEnv:
-    let nimPath = getEnv("NIMPATH")
-    for entry in split(nimPath, PathSep):
-      if entry.strip != "":
-        config.paths.add entry
+  semos.setupPaths(config, useEnv)
   case cmd
   of None:
     quit "command missing"

src/nimony/semos.nim

@@ -6,7 +6,7 @@
 
 ## Path handling and `exec` like features as `sem.nim` needs it.
 
-from std / strutils import multiReplace
+from std / strutils import multiReplace, split, strip
 import std / [tables, sets, os, syncio, formatfloat, assertions]
 include nifprelude
 import ".." / lib / nifchecksums
@@ -17,13 +17,27 @@ import nimony_model, symtabs, builtintypes, decls, symparser, asthelpers,
 
 import ".." / gear2 / modnames
 
-proc stdlibFile*(f: string): string =
+proc stdlibDir*(): string =
   let appDir = getAppDir()
   let (head, tail) = splitPath(appDir)
   if tail == "bin":
-    result = head / "lib" / f
+    result = head / "lib"
+  else:
+    result = appDir / "lib"
+
+proc setupPaths*(config: var NifConfig; useEnv: bool) =
+  if useEnv:
+    let nimPath = getEnv("NIMPATH")
+    for entry in split(nimPath, PathSep):
+      if entry.strip != "":
+        config.paths.add entry
+    if config.paths.len == 0:
+      config.paths.add stdlibDir()
   else:
-    result = appDir / "lib" / f
+    config.paths.add stdlibDir()
+
+proc stdlibFile*(f: string): string =
+  result = stdlibDir() / f
 
 proc binDir*(): string =
   let appDir = getAppDir()

tests/nimony/generics/texplicitprocinst.nif

@@ -32,11 +32,11 @@
    (discard .))) 8,4
  (proc :foo.3.texhjoap . ~8,~3 .
   (at foo.1.texhjoap 4,~1
-   (i -1) 9 string.0.sys9azlf) 6,~3
+   (i -1) 9 string.0.sysvq0asl) 6,~3
   (params 1
    (param :x.6 . . ~3,2
     (i -1) .) 7
-   (param :y.2 . . ~4,3 string.0.sys9azlf .)) ~8,~3 . ~8,~3 . ~8,~3 . 21,~3
+   (param :y.2 . . ~4,3 string.0.sysvq0asl .)) ~8,~3 . ~8,~3 . ~8,~3 . 21,~3
   (stmts
    (discard .))) 28,10
  (proc :importedGeneric.0.texhjoap . 0,1,tests/nimony/generics/deps/mgenericproc.nim .

tests/nimony/nosystem/t2.nif

@@ -23,7 +23,7 @@
   (typedesc 1 T.1.t2er4ggt1) 35
   (pragmas 2
    (magic 7 TypeOf)) . .) 10,9
- (type ~8 :string.0.t2er4ggt1 x . . string.0.sys9azlf) ,12
+ (type ~8 :string.0.t2er4ggt1 x . . string.0.sysvq0asl) ,12
  (proc 5 :\2B.0.t2er4ggt1
   (add -3) . . 9
   (params 1
@@ -38,12 +38,12 @@
   (params 1
    (param :x.2 . . 3
     (i -1) .) 9
-   (param :y.1 . . string.0.sys9azlf .)) 21
+   (param :y.1 . . string.0.sysvq0asl .)) 21
   (i -1) . . 2,1
   (stmts 4
    (result :result.0 . . 10,~3
     (i -1) .) 4
-   (var :x.4 . . string.0.sys9azlf 4 "abc") 7,1
+   (var :x.4 . . string.0.sysvq0asl 4 "abc") 7,1
    (asgn ~7 result.0 2 +4) 2,2
    (asgn ~2 x.4 2 "34") ~2,~1
    (ret result.0))) ,19

tests/nimony/nosystem/tbool.nif

@@ -17,9 +17,9 @@
  (proc :dollar`.bool.0.tbokvwxm9 x . .
   (params
    (param :e.0 . .
-    (bool) .)) string.0.sys9azlf . .
+    (bool) .)) string.0.sysvq0asl . .
   (stmts 23
-   (result :result.0 . . string.0.sys9azlf .) 23
+   (result :result.0 . . string.0.sysvq0asl .) 23
    (case e.0 ~18,1
     (of
      (ranges ~8

tests/nimony/nosystem/tdistinct.nif

@@ -31,7 +31,7 @@
   (typedesc 1 T.1.tdiuhv8dm) 35
   (pragmas 2
    (magic 7 TypeOf)) . .) 10,11
- (type ~8 :string.0.tdiuhv8dm x . . string.0.sys9azlf) ,13
+ (type ~8 :string.0.tdiuhv8dm x . . string.0.sysvq0asl) ,13
  (proc 5 :\2B.0.tdiuhv8dm
   (add -3) . . 9
   (params 1