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

Make --backend:cpp|js work for :test: code-blocks as well (#14306)

Browse source 
Continues 9502e39b63

Ref:
- 9502e39b63 (commitcomment-39087584)
- https://github.com/nim-lang/Nim/pull/14278

Fixes https://github.com/nim-lang/Nim/issues/13129 .
This commit is contained in:
Kaushal Modi 2020-05-11 14:45:35 -04:00 • committed by GitHub
commit 86669ef5b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/docgen.nim
View file

@ -216,7 +216,8 @@ proc newDocumentor*(filename: AbsoluteFile; cache: IdentCache; conf: ConfigRef,
# Include the current file if we're parsing a nim file # Include the current file if we're parsing a nim file
let importStmt = if d.isPureRst: "" else: "import \"$1\"\n" % [d.filename.replace("\\", "/")] let importStmt = if d.isPureRst: "" else: "import \"$1\"\n" % [d.filename.replace("\\", "/")]
writeFile(outp, importStmt & content) writeFile(outp, importStmt & content)
let c = if cmd.startsWith("nim "): os.getAppFilename() & cmd.substr(3) let c = if cmd.startsWith("nim <backend> "): os.getAppFilename() & " " & $conf.backend & cmd.substr("nim <backend>".len)
elif cmd.startsWith("nim "): os.getAppFilename() & cmd.substr("nim".len)
else: cmd else: cmd
let c2 = c % quoteShell(outp) let c2 = c % quoteShell(outp)
rawMessage(conf, hintExecuting, c2) rawMessage(conf, hintExecuting, c2)

2
lib/packages/docutils/rstgen.nim
View file

@ -865,7 +865,7 @@ proc parseCodeBlockField(d: PDoc, n: PRstNode, params: var CodeBlockParams) =
of "test": of "test":
params.testCmd = n.getFieldValue.strip params.testCmd = n.getFieldValue.strip
if params.testCmd.len == 0: if params.testCmd.len == 0:
params.testCmd = "nim c -r $1" params.testCmd = "nim <backend> -r $1" # The nim backend is auto-set in docgen.nim
else: else:
params.testCmd = unescape(params.testCmd) params.testCmd = unescape(params.testCmd)
of "status", "exitcode": of "status", "exitcode":