Skip to content

Commit

Permalink
Merge pull request #41 from zedeus/arc
Browse files Browse the repository at this point in the history
Fix compatibility with --gc:arc
  • Loading branch information
soasme authored Dec 30, 2019
2 parents 52d0d92 + 2c29906 commit 8cbc5c9
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions src/markdown.nim
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
##

import re
from sequtils import map, keepIf
from sequtils import map, keepIf, anyIt
from sugar import `->`, `=>`
from strformat import fmt, `&`
from uri import encodeUrl
Expand Down Expand Up @@ -735,12 +735,11 @@ method parse*(this: UlParser, doc: string, start: int): ParseResult =
if itemSize == -1:
break

var listItem = Li(
listItems.add Li(
doc: listItemDoc.strip(chars={'\n'}),
verbatim: listItemDoc,
marker: marker
)
listItems.add(listItem)

pos += itemSize

Expand Down Expand Up @@ -775,12 +774,11 @@ method parse*(this: OlParser, doc: string, start: int): ParseResult =
startIndex = index
found = true

var listItem = Li(
listItems.add Li(
doc: listItemDoc.strip(chars={'\n'}),
verbatim: listItemDoc,
marker: marker
)
listItems.add(listItem)

pos += itemSize

Expand Down Expand Up @@ -1491,11 +1489,12 @@ method parse*(this: ParagraphParser, doc: string, start: int): ParseResult =
p &= line

size = p.len
let trailing = doc[start ..< start+size].findAll(re"\n*$")
return ParseResult(
token: Paragraph(
doc: doc[start ..< start+size].replace(re"\n\s*", "\n").strip,
loose: true,
trailing: doc[start ..< start+size].findAll(re"\n*$").join(""),
trailing: if trailing.anyIt(it.len > 0): trailing.join() else: trailing[0]
),
pos: start+size
)
Expand Down

0 comments on commit 8cbc5c9

Please sign in to comment.