diff options
| -rw-r--r-- | compiler/docgen.nim | 10 | ||||
| -rw-r--r-- | compiler/types.nim | 2 | ||||
| -rw-r--r-- | koch.nim | 5 |
3 files changed, 11 insertions, 6 deletions
diff --git a/compiler/docgen.nim b/compiler/docgen.nim index 343f415b3..c05b55184 100644 --- a/compiler/docgen.nim +++ b/compiler/docgen.nim @@ -42,17 +42,23 @@ proc compilerMsgHandler(filename: string, line, col: int, of mwUnsupportedLanguage: k = warnLanguageXNotSupported globalError(newLineInfo(filename, line, col), k, arg) +proc docgenFindFile(s: string): string {.procvar.} = + result = options.findFile(s) + if result.len == 0: + result = getCurrentDir() / s + if not existsFile(result): result = "" + proc parseRst(text, filename: string, line, column: int, hasToc: var bool, rstOptions: TRstParseOptions): PRstNode = result = rstParse(text, filename, line, column, hasToc, rstOptions, - options.findFile, compilerMsgHandler) + docgenFindFile, compilerMsgHandler) proc newDocumentor*(filename: string, config: PStringTable): PDoc = new(result) initRstGenerator(result[], (if gCmd != cmdRst2tex: outHtml else: outLatex), options.gConfigVars, filename, {roSupportRawDirective}, - options.findFile, compilerMsgHandler) + docgenFindFile, compilerMsgHandler) result.id = 100 proc dispA(dest: var PRope, xml, tex: string, args: openArray[PRope]) = diff --git a/compiler/types.nim b/compiler/types.nim index db75cd3c0..bb9f18dc3 100644 --- a/compiler/types.nim +++ b/compiler/types.nim @@ -857,7 +857,7 @@ proc sameTypeAux(x, y: PType, c: var TSameTypeClosure): bool = if a.kind != b.kind: return false of dcEqOrDistinctOf: while a.kind == tyDistinct: a = a.sons[0] - if a.kind != b.kind: return false + if a.kind != b.kind: return false case a.kind of tyEmpty, tyChar, tyBool, tyNil, tyPointer, tyString, tyCString, tyInt..tyBigNum, tyStmt, tyExpr: diff --git a/koch.nim b/koch.nim index dcb66ae3e..ce01d36a5 100644 --- a/koch.nim +++ b/koch.nim @@ -104,9 +104,8 @@ proc install(args: string) = exec("sh ./install.sh $#" % args) proc web(args: string) = - exec(("$# cc -r tools/nimweb.nim web/nimrod --putenv:nimrodversion=$#" & - " --path:$#") % [findNim(), NimrodVersion, - getCurrentDir().quoteIfContainsWhite]) + exec("$# cc -r tools/nimweb.nim web/nimrod --putenv:nimrodversion=$#" % + [findNim(), NimrodVersion]) # -------------- boot --------------------------------------------------------- |