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

Merge pull request #1422 from def-/nimrod-run2

Browse source 
Allow arguments for "nimrod run"
This commit is contained in:
Andreas Rumpf 2014-07-29 19:34:11 +02:00
commit 4eccfb979e
3 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/nimrod.nim
View file

@ -58,7 +58,7 @@ proc handleCmdLine() =
if msgs.gErrorCounter == 0: if msgs.gErrorCounter == 0:
when hasTinyCBackend: when hasTinyCBackend:
if gCmd == cmdRun: if gCmd == cmdRun:
tccgen.run() tccgen.run(service.arguments)
if optRun in gGlobalOptions: if optRun in gGlobalOptions:
if gCmd == cmdCompileToJS: if gCmd == cmdCompileToJS:
var ex: string var ex: string

2
compiler/service.nim
View file

@ -59,7 +59,7 @@ proc processCmdLine*(pass: TCmdLinePass, cmd: string) =
inc argsCount inc argsCount
if pass == passCmd2: if pass == passCmd2:
if optRun notin gGlobalOptions and arguments != "": if optRun notin gGlobalOptions and arguments != "" and options.command.normalize != "run":
rawMessage(errArgsNeedRunOption, []) rawMessage(errArgsNeedRunOption, [])
proc serve*(action: proc (){.nimcall.}) = proc serve*(action: proc (){.nimcall.}) =

8
compiler/tccgen.nim
View file

@ -68,11 +68,9 @@ proc compileCCode*(ccode: string) =
setupEnvironment() setupEnvironment()
discard compileString(gTinyC, ccode) discard compileString(gTinyC, ccode)
proc run*() = proc run*(args: string) =
var a: array[0..1, cstring] var s = @[cstring(gProjectName)] & map(split(args), proc(x: string): cstring = cstring(x))
a[0] = "" var err = tinyc.run(gTinyC, cint(len(s)), cast[cstringArray](addr(s[0]))) != 0'i32
a[1] = ""
var err = tinyc.run(gTinyC, 0'i32, cast[cstringArray](addr(a))) != 0'i32
closeCCState(gTinyC) closeCCState(gTinyC)
if err: rawMessage(errExecutionOfProgramFailed, "") if err: rawMessage(errExecutionOfProgramFailed, "")