diff options
| -rw-r--r-- | compiler/nversion.nim | 2 | ||||
| -rw-r--r-- | compiler/rodread.nim | 23 | ||||
| -rw-r--r-- | lib/pure/streams.nim | 5 |
3 files changed, 17 insertions, 13 deletions
diff --git a/compiler/nversion.nim b/compiler/nversion.nim index 42b0a5f9e..39fcd6c18 100644 --- a/compiler/nversion.nim +++ b/compiler/nversion.nim @@ -18,5 +18,5 @@ const VersionPatch* = 1 VersionAsString* = $VersionMajor & "." & $VersionMinor & "." & $VersionPatch - RodFileVersion* = "1211" # modify this if the rod-format changes! + RodFileVersion* = "1212" # modify this if the rod-format changes! diff --git a/compiler/rodread.nim b/compiler/rodread.nim index 84ef0e1fe..d5eede8a4 100644 --- a/compiler/rodread.nim +++ b/compiler/rodread.nim @@ -126,8 +126,8 @@ type s: cstring # mmap'ed file contents options: TOptions reason: TReasonForRecompile - modDeps: TStringSeq - files: TStringSeq + modDeps: seq[int32] + files: seq[int32] dataIdx: int # offset of start of data section convertersIdx: int # offset of start of converters section initIdx, interfIdx, compilerProcsIdx, methodsIdx: int @@ -586,9 +586,10 @@ proc processRodFile(r: PRodReader, crc: TCrc32) = inc(r.pos, 2) # skip "(\10" inc(r.line) while r.s[r.pos] != ')': - var relativePath = decodeStr(r.s, r.pos) - var resolvedPath = relativePath.findModule - r.files.add(if resolvedPath.len > 0: resolvedPath else: relativePath) + let relativePath = decodeStr(r.s, r.pos) + let resolvedPath = relativePath.findModule + let finalPath = if resolvedPath.len > 0: resolvedPath else: relativePath + r.files.add(finalPath.fileInfoIdx) inc(r.pos) # skip #10 inc(r.line) if r.s[r.pos] == ')': inc(r.pos) @@ -596,7 +597,7 @@ proc processRodFile(r: PRodReader, crc: TCrc32) = inc(r.pos, 2) # skip "(\10" inc(r.line) while r.s[r.pos] != ')': - w = r.files[decodeVInt(r.s, r.pos)] + w = r.files[decodeVInt(r.s, r.pos)].toFullPath inc(r.pos) # skip ' ' inclCrc = decodeVInt(r.s, r.pos) if r.reason == rrNone: @@ -827,8 +828,8 @@ proc checkDep(fileIdx: int32): TReasonForRecompile = # this, since results are cached. var res = checkDep(SystemFileIdx) if res != rrNone: result = rrModDeps - for i in countup(0, high(r.modDeps)): - res = checkDep(r.modDeps[i].fileInfoIdx) + for i in countup(0, high(r.modDeps)): + res = checkDep(r.modDeps[i]) if res != rrNone: result = rrModDeps # we cannot break here, because of side-effects of `checkDep` @@ -1062,11 +1063,11 @@ proc viewFile(rodfile: string) = while r.s[r.pos] != ')': let relativePath = decodeStr(r.s, r.pos) let resolvedPath = relativePath.findModule - let rr = if resolvedPath.len > 0: resolvedPath else: relativePath - r.files.add(rr) + let finalPath = if resolvedPath.len > 0: resolvedPath else: relativePath + r.files.add(finalPath.fileInfoIdx) inc(r.pos) # skip #10 inc(r.line) - outf.writeln(rr) + outf.writeln finalPath if r.s[r.pos] == ')': inc(r.pos) outf.write(")\n") of "INCLUDES": diff --git a/lib/pure/streams.nim b/lib/pure/streams.nim index 581db3163..4a196127c 100644 --- a/lib/pure/streams.nim +++ b/lib/pure/streams.nim @@ -238,7 +238,10 @@ type TFileStream* = object of TStream f: TFile -proc fsClose(s: PStream) = close(PFileStream(s).f) +proc fsClose(s: PStream) = + if PFileStream(s).f != nil: + close(PFileStream(s).f) + PFileStream(s).f = nil proc fsFlush(s: PStream) = flushFile(PFileStream(s).f) proc fsAtEnd(s: PStream): bool = return EndOfFile(PFileStream(s).f) proc fsSetPosition(s: PStream, pos: int) = setFilePos(PFileStream(s).f, pos) |