From a7ff060c616ef83fcd3fac49ba1ef874c44ab8b1 Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Mon, 13 Dec 2004 10:25:52 +0000 Subject: [PATCH] cleaner, nicer --- Wiki.hs | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/Wiki.hs b/Wiki.hs index 83827cc..c531f8a 100644 --- a/Wiki.hs +++ b/Wiki.hs @@ -77,30 +77,20 @@ pLink = do [] -> return (Link l l) _ -> return (Link l d) -pBold = do - string "**" - s <- pStringParser "**" - return (Bold s) - -pEmph = do - string "//" - s <- pStringParser "//" - return (Emph s) - -pUnderline = do - string "__" - s <- pStringParser "__" - return (Underline s) - -pStrike = do - string "--" - s <- pStringParser "--" - return (Strike s) - -pStringParser xs = do +pBold = pS "**" (\s -> Bold s) +pEmph = pS "//" (\s -> Emph s) +pUnderline = pS "__" (\s -> Underline s) +pStrike = pS "--" (\s -> Strike s) + +pS s f = do + string s + s <- pStopAt s + return (f s) + +pStopAt xs = do try (string xs >> return []) <|> (do s <- pMain - ss <- pStringParser xs + ss <- pStopAt xs return (s:ss)) pString xs = do @@ -113,7 +103,7 @@ pHeading = do many1 pEol level <- many1 $ char '=' char ' ' - s <- pStringParser (' ':level) + s <- pStopAt (' ':level) return (Heading (length level) s) pURL = do -- 2.39.2