From: Michael Andreen Date: Thu, 9 Dec 2004 23:18:30 +0000 (+0000) Subject: simple links X-Git-Url: https://ruin.nu/git/?p=yawbih.git;a=commitdiff_plain;h=d18786bdb428f24b6a5aea32c1b1e64339591708 simple links --- diff --git a/Wiki.hs b/Wiki.hs index ab89fff..64c4602 100644 --- a/Wiki.hs +++ b/Wiki.hs @@ -38,7 +38,8 @@ wikiParser :: GenParser Char st Document wikiParser = do s <- (try (pPara) <|> pOneEol - <|> pLinkLong + <|> try (pLinkLong) + <|> pLink <|> pText) ss <- (wikiParser <|> return []) return (s:ss) @@ -63,6 +64,12 @@ pLinkLong = do d <- many1 $ noneOf ['|','[',']'] string "]]" return (Link l d) +pLink = do + string "[[" + l <- many1 $ noneOf ['|','[',']'] + string "]]" + return (Link l l) + pText = do t <- many1 (noneOf ['\n','\r','[',']']) return (Text t)