From 7832af187afa60fee37ab6e598f822b6a6ba6025 Mon Sep 17 00:00:00 2001 From: Araq Date: Sun, 27 Nov 2011 17:34:45 +0100 Subject: [PATCH] argument passing with --run option works again --- compiler/main.nim | 4 ++-- compiler/nimrod.nim | 10 +++++----- todo.txt | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/compiler/main.nim b/compiler/main.nim index 94c1159123..70e1bc06d8 100755 --- a/compiler/main.nim +++ b/compiler/main.nim @@ -96,8 +96,8 @@ proc CommandGenDepend = registerPass(cleanupPass()) compileProject() generateDot(projectFullPath) - execExternalProgram("dot -Tpng -o" & changeFileExt(projectFullPath, "png") & ' ' & - changeFileExt(projectFullPath, "dot")) + execExternalProgram("dot -Tpng -o" & changeFileExt(projectFullPath, "png") & + ' ' & changeFileExt(projectFullPath, "dot")) proc CommandCheck = msgs.gErrorMax = high(int) # do not stop after first error diff --git a/compiler/nimrod.nim b/compiler/nimrod.nim index b71929693d..becf2430f2 100755 --- a/compiler/nimrod.nim +++ b/compiler/nimrod.nim @@ -45,12 +45,12 @@ proc ProcessCmdLine(pass: TCmdLinePass) = options.commandArgs.add p.key if options.projectName == "": - options.projectName = unixToNativePath(p.key) # BUGFIX for portable build scripts + # support UNIX style filenames anywhere for portable build scripts: + options.projectName = unixToNativePath(p.key) + arguments = cmdLineRest(p) - if pass == passCmd2: - arguments = cmdLineRest(p) - echo "Setting args to ", arguments - if optRun notin gGlobalOptions and arguments != "": + if pass == passCmd2: + if optRun notin gGlobalOptions and arguments != "": rawMessage(errArgsNeedRunOption, []) proc prependCurDir(f: string): string = diff --git a/todo.txt b/todo.txt index 76b4460f49..e4d47c4c5a 100755 --- a/todo.txt +++ b/todo.txt @@ -1,7 +1,6 @@ version 0.8.14 ============== -- argument passing with --run option is broken - stdlib and compiler should not use deprecated endOfFile and readline version 0.9.0