diff options
| author | Araq <rumpf_a@web.de> | 2018-06-26 01:34:59 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2018-06-26 01:34:59 +0200 |
| commit | aef441101fcfd8390f9a28777ae2bef8b1c5b5b2 (patch) | |
| tree | 23f3ade490f6fb60b6b381eb1b4f3011fb1dc421 | |
| parent | 1be82d96a682338ba53832bcc2772b7865b47b57 (diff) | |
| download | Nim-aef441101fcfd8390f9a28777ae2bef8b1c5b5b2.tar.gz | |
fixes docgen regression caused by refactorings; fixes #8097
| -rw-r--r-- | compiler/docgen.nim | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/compiler/docgen.nim b/compiler/docgen.nim index d463dc3c0..db4e301d4 100644 --- a/compiler/docgen.nim +++ b/compiler/docgen.nim @@ -582,7 +582,7 @@ proc traceDeps(d: PDoc, it: PNode) = if d.section[k] != nil: add(d.section[k], ", ") dispA(d.conf, d.section[k], "<a class=\"reference external\" href=\"$1.html\">$1</a>", - "$1", [rope(getModuleName(d.conf, it))]) + "$1", [rope(splitFile(getModuleName(d.conf, it)).name)]) proc generateDoc*(d: PDoc, n: PNode) = case n.kind @@ -780,13 +780,11 @@ proc getOutFile2(conf: ConfigRef; filename, ext, dir: string): string = proc writeOutput*(d: PDoc, filename, outExt: string, useWarning = false) = var content = genOutFile(d) var success = true - var filename: string if optStdout in d.conf.globalOptions: writeRope(stdout, content) - filename = "<stdout>" else: - filename = getOutFile2(d.conf, filename, outExt, "htmldocs") - success = writeRope(content, filename) + let outfile = getOutFile2(d.conf, filename, outExt, "htmldocs") + success = writeRope(content, outfile) if not success: rawMessage(d.conf, if useWarning: warnCannotOpenFile else: errCannotOpenFile, filename) |