diff options
author | Stefan Talpalaru <stefantalpalaru@yahoo.com> | 2015-06-15 08:44:02 +0200 |
---|---|---|
committer | Stefan Talpalaru <stefantalpalaru@yahoo.com> | 2015-06-15 08:44:02 +0200 |
commit | bdac85f2cfbff9bab11f06c72f364523936a5487 (patch) | |
tree | 41313479b483459e312280cf42b6f862acba4bd3 /compiler/docgen.nim | |
parent | 657d6f9de2d8fc8960fb703f927db2ff2070d5a4 (diff) | |
parent | 8c671d22d6a7c55e13e7c02eb4fd65bbabb52131 (diff) | |
download | Nim-bdac85f2cfbff9bab11f06c72f364523936a5487.tar.gz |
Merge branch 'devel' into gogc
Diffstat (limited to 'compiler/docgen.nim')
-rw-r--r-- | compiler/docgen.nim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/docgen.nim b/compiler/docgen.nim index f8489d825..4b52b1c92 100644 --- a/compiler/docgen.nim +++ b/compiler/docgen.nim @@ -18,7 +18,7 @@ import type TSections = array[TSymKind, Rope] - TDocumentor = object of rstgen.TRstGenerator + TDocumentor = object of rstgen.RstGenerator modDesc: Rope # module description id: int # for generating IDs toc, section: TSections @@ -29,7 +29,7 @@ type PDoc* = ref TDocumentor ## Alias to type less. proc compilerMsgHandler(filename: string, line, col: int, - msgKind: rst.TMsgKind, arg: string) {.procvar.} = + msgKind: rst.MsgKind, arg: string) {.procvar.} = # translate msg kind: var k: msgs.TMsgKind case msgKind @@ -53,7 +53,7 @@ proc docgenFindFile(s: string): string {.procvar.} = proc parseRst(text, filename: string, line, column: int, hasToc: var bool, - rstOptions: TRstParseOptions): PRstNode = + rstOptions: RstParseOptions): PRstNode = result = rstParse(text, filename, line, column, hasToc, rstOptions, docgenFindFile, compilerMsgHandler) |