jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

unary <; countup two type parameters; --recursivePath should work now

Browse source
This commit is contained in:
Araq 2011-01-29 14:18:43 +01:00
commit 36accda8aa
13 changed files with 69 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

17
rod/commands.nim
View file

@ -274,10 +274,18 @@ proc processPath(path: string): string =
result = UnixToNativePath(path % ["nimrod", getPrefixDir(), "lib", libpath,
"home", removeTrailingDirSep(os.getHomeDir())])
proc addPath(path: string) =
proc addPath(path: string, info: TLineInfo) =
if not contains(options.searchPaths, path):
lists.PrependStr(options.searchPaths, path)
proc addPathRec(dir: string, info: TLineInfo) =
for k,p in os.walkDir(dir):
if k == pcDir and '.' notin p:
addPathRec(p, info)
if not contains(options.searchPaths, p):
liMessage(info, hintPath, p)
lists.PrependStr(options.searchPaths, p)
proc processSwitch(switch, arg: string, pass: TCmdlinePass, info: TLineInfo) =
var
theOS: TSystemOS
@ -286,13 +294,12 @@ proc processSwitch(switch, arg: string, pass: TCmdlinePass, info: TLineInfo) =
case whichKeyword(switch)
of wPath, wP:
expectArg(switch, arg, pass, info)
addPath(processPath(arg))
#discard lists.IncludeStr(options.searchPaths, path)
addPath(processPath(arg), info)
of wRecursivePath:
expectArg(switch, arg, pass, info)
var path = processPath(arg)
for p in os.walkDirRec(path, {pcDir}): addPath(p)
addPath(path)
addPathRec(path, info)
addPath(path, info)
of wOut, wO:
expectArg(switch, arg, pass, info)
options.outFile = arg