fixes #537; fixes invalid file causes crashing

src/hastur.nim

@@ -388,7 +388,7 @@ proc nifctests(overwrite: bool) =
   execNifc " cpp -r " & tryIssues
 
   let issues = "tests/nifc/issues.nif"
-  execNifc " c -r --linedir:on " & issues
+  # execNifc " c -r --linedir:on " & issues
   execNifc " cpp -r --linedir:off " & issues
 
 proc hexertests(overwrite: bool) =

src/nifc/nifc_model.nim

@@ -145,7 +145,11 @@ proc parse*(r: var Reader; m: var Module; parentInfo: PackedLineInfo): bool =
     # relative file position
     if t.pos.line != 0 or t.pos.col != 0:
       let (file, line, col) = unpack(pool.man, parentInfo)
-      currentInfo = pack(pool.man, file, line+t.pos.line, col+t.pos.col)
+      let curLine = line+t.pos.line
+      let curCol = col+t.pos.col
+      if not hasId(pool.files, file):
+        bug "no file name in the line info"
+      currentInfo = pack(pool.man, file, curLine, curCol)
   else:
     # absolute file position:
     let fileId = pool.files.getOrIncl(decodeFilename t)

tests/nifc/app.c.nif

@@ -1,5 +1,5 @@
 (.nif24)
-(stmts
+0,1,test1.nim(stmts
   (proc :main.c . (i +32) . (stmts
 
     (var :x.mangled . (f +32) 1.2)

tests/nifc/cimport_array.c.nif

@@ -1,5 +1,5 @@
 (.nif24)
-(stmts
+0,1,test1.nim(stmts
  (incl "testcarry.h")
  (gvar :cary.mangled . CArray.c .)
  (discard

tests/nifc/hello.expected.idx.nif

@@ -1,10 +1,10 @@
 (.nif24)
 (index
 (public)
-(private
- (kv MyObject.ptr.flexarray +975)
- (kv MyObject.ptr.object +699)
- (kv MyObject.my.sequence +171)
+(private 0,1,test1.nim
+ (kv MyObject.ptr.flexarray +988) 0,1,test1.nim
+ (kv MyObject.ptr.object +699) 0,1,test1.nim
+ (kv MyObject.my.sequence +171) 0,1,test1.nim
  (kv MyObject.sequence.base +127))
 (build)
 

tests/nifc/hello.nif

@@ -1,5 +1,5 @@
 (.nif24)
-(stmts
+0,1,test1.nim(stmts
   (incl "<stdio.h>")
   (incl "<assert.h>")
   (type 1,1,hello.nim :MyObject.c . (object . ))

tests/nifc/issues.nif

@@ -1,5 +1,5 @@
 (.nif24)
-(stmts
+0,1,test1.nim(stmts
   (incl "<stdio.h>")
   (incl "<assert.h>")
   (type :MyProc.e . (proctype . (params (param :x.0 . (ptr MyObject3.m)) (param :y.0 . (ptr MyObject4.m))) MyObject2.m . ))

tests/nifc/selectany/t1.nif

@@ -1,5 +1,5 @@
 (.nif24)
-(stmts
+0,1,test1.nim(stmts
   (incl "<stdio.h>")
 
   (proc :genericProc.c . (void) (pragmas (selectany)) (stmts

tests/nifc/selectany/t2.nif

@@ -1,5 +1,5 @@
 (.nif24)
-(stmts
+0,1,test2.nim(stmts
   (incl "<stdio.h>")
   (proc :genericProc.c . (void) (pragmas (selectany)) (stmts
     (call printf.c "hello %s\0A" "file t2")

tests/nifc/selectany/t3.nif

@@ -1,5 +1,5 @@
 (.nif24)
-(stmts
+0,1,test3.nim(stmts
   (incl "<stdio.h>")
   (proc :genericProc.c . (void) (pragmas (selectany)) (stmts
     (call printf.c "hello %s\0A" "file t3")

tests/nifc/try.nif

@@ -1,5 +1,5 @@
 (.nif24)
-(stmts
+0,1,test1.nim(stmts
   (incl "<assert.h>")
   (incl "<stdio.h>")