diff options
| author | Zahary Karadjov <zahary@gmail.com> | 2013-12-09 00:26:04 +0200 |
|---|---|---|
| committer | Zahary Karadjov <zahary@gmail.com> | 2013-12-09 00:26:04 +0200 |
| commit | 95a6e01ea8f7409e205455c42a3db9b399b3e353 (patch) | |
| tree | f7e3270dd7e631365f1b4ab777464320f6a6352b /lib/packages/docutils/rst.nim | |
| parent | de3b7cd413e02498c0ee5554f55f9c92d2baa9ab (diff) | |
| parent | 7e9f158494315abff712110a23f1d5ceb3df4206 (diff) | |
| download | Nim-95a6e01ea8f7409e205455c42a3db9b399b3e353.tar.gz | |
Merge branch 'master' of github.com:Araq/Nimrod into upstream
Diffstat (limited to 'lib/packages/docutils/rst.nim')
| -rw-r--r-- | lib/packages/docutils/rst.nim | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/packages/docutils/rst.nim b/lib/packages/docutils/rst.nim index 91664cd50..6dd407155 100644 --- a/lib/packages/docutils/rst.nim +++ b/lib/packages/docutils/rst.nim @@ -868,6 +868,12 @@ proc parseLine(p: var TRstParser, father: PRstNode) = case p.tok[p.idx].kind of tkWhite, tkWord, tkOther, tkPunct: parseInline(p, father) else: break + +proc parseUntilNewline(p: var TRstParser, father: PRstNode) = + while True: + case p.tok[p.idx].kind + of tkWhite, tkWord, tkAdornment, tkOther, tkPunct: parseInline(p, father) + of tkEof, tkIndent: break proc parseSection(p: var TRstParser, result: PRstNode) proc parseField(p: var TRstParser): PRstNode = @@ -1078,7 +1084,7 @@ proc parseParagraph(p: var TRstParser, result: PRstNode) = proc parseHeadline(p: var TRstParser): PRstNode = result = newRstNode(rnHeadline) - parseLine(p, result) + parseUntilNewLine(p, result) assert(p.tok[p.idx].kind == tkIndent) assert(p.tok[p.idx + 1].kind == tkAdornment) var c = p.tok[p.idx + 1].symbol[0] @@ -1172,7 +1178,7 @@ proc parseOverline(p: var TRstParser): PRstNode = inc(p.idx, 2) result = newRstNode(rnOverline) while true: - parseLine(p, result) + parseUntilNewline(p, result) if p.tok[p.idx].kind == tkIndent: inc(p.idx) if p.tok[p.idx - 1].ival > currInd(p): |