mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-07-19 23:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3137 from vegansk/findFile_absolute

Browse Source 
Added absolute path support to options.findFile
This commit is contained in:
Andreas Rumpf
2015-07-23 08:42:53 +02:00
parent 5409142120 506b90cea8
commit f052041648
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/options.nim
View File

@@ -330,13 +330,16 @@ proc rawFindFile2(f: string): string =
result = ""
proc findFile*(f: string): string {.procvar.} =
result = f.rawFindFile
if result.len == 0:
result = f.toLower.rawFindFile
if f.isAbsolute:
result = if f.existsFile: f else: ""
else:
result = f.rawFindFile
if result.len == 0:
result = f.rawFindFile2
result = f.toLower.rawFindFile
if result.len == 0:
result = f.toLower.rawFindFile2
result = f.rawFindFile2
if result.len == 0:
result = f.toLower.rawFindFile2
proc findModule*(modulename, currentModule: string): string =
# returns path to module

10
tests/vm/tslurp.nim
View File

@@ -1,6 +1,12 @@
import os
template getScriptDir(): string =
parentDir(instantiationInfo(-1, true).filename)
const
myRes = slurp"../../readme.txt"
relRes = slurp"../../readme.txt"
absRes = slurp(parentDir(parentDir(getScriptDir())) / "readme.txt")
echo myRes
echo relRes
echo absRes