From da6b71a772c66eb03c9ced7a6ca0cbbd49013536 Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Mon, 13 Dec 2004 14:26:30 +0000 Subject: [PATCH] More cleanup --- Wiki.hs | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/Wiki.hs b/Wiki.hs index a2b6548..83b14b6 100644 --- a/Wiki.hs +++ b/Wiki.hs @@ -56,7 +56,6 @@ pPara = do pEol return (Paragraph) - pSpace = do space return (Text " ") @@ -92,17 +91,9 @@ pS s f = do s <- pStopAt s return (f s) -pStopAt xs = do - try (string xs >> return []) <|> (do - s <- pMain - ss <- pStopAt xs - return (s:ss)) - -pString xs = do - try (string xs >> return []) <|> (do - s <- anyChar - ss <- pString xs - return (s:ss)) +pStopAt xs = pUntil pMain xs +pString xs = pUntil anyChar xs +pUntil p xs = manyTill p (try $ string xs) pHeading = do many1 pEol @@ -140,18 +131,14 @@ pOtherChar = do return (Text (c:[])) pText = do - t <- many1 alphaNum--(noneOf ['\n','\r','[',']']) + t <- many1 alphaNum return (Text t) - newtype PGB = PGB DBService createPGB :: String -> String -> String -> String -> IO PGB createPGB host database user password = let db = createDBService host database "" user password Nothing in return (PGB db) - -testDB = createPGB "wave" "wiki" "wiki" "12wiki34db" - instance Backend PGB where getCurrent (PGB db) key = do -- 2.39.2