Some parsing inside <pre>

[yawbih.git] / Wiki.hs

diff --git a/Wiki.hs b/Wiki.hs
index a2d2ff220b019e2b2b02d791da408f1300938a50..2d394b8243d273dcd3fac82abe0c1b51e9e3d1f2 100644 (file)
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -2,7 +2,7 @@ module Wiki (
        Backend (getCurrent,getList,get,setCurrent,update,listKeys)
        ,PGB
        ,createPGB
-       ,Markup (Text, Paragraph, Link, Bold, Emph, Heading, Url, Underline, Strike, Pre)
+       ,Markup (Text, Paragraph, Link, Bold, Emph, Heading, Url, Underline, Strike, Pre,List)
        ,Document
        ,wikiParser
        ,htmlOutput
@@ -41,79 +41,116 @@ data Markup = Text String
        | Url String
        | Underline [Markup]
        | Strike [Markup]
-       | Pre String
+       | Pre [Markup]
+       | List Bool [[Markup]]
 
 type Document = [Markup]
 
-wikiParser :: GenParser Char st Document       
+wikiParser :: Parser Document  
 wikiParser = many1 pMain
 
-pPara = do
-       pEol
-       pEol
-       return (Paragraph)
-
-pSpace = do
-       c <- space 
-       return (Text (c:[]))
-
-pEol = char '\n' <|> do
-       char '\r'
-       char '\n'
-
-pLinkParser = do try (string "]]" >> return ([],[])) 
-       <|> try (do
-               string " | "
-               d <- pString "]]"
-               return ([],d))
-       <|> (do
-               c <- anyChar
-               (l,d) <- pLinkParser
-               return (c:l,d))
+pPara :: Parser Markup 
+pPara = count 2 pEol >> return (Paragraph)
 
+pLink :: Parser Markup 
 pLink = do
        string "[["
-       (l,d) <- pLinkParser
+       (l,d) <- pLinkContent
        case d of
                [] -> return (Link l l)
                _ -> return (Link l d)
 
-pBold = pS "**" (\s -> Bold s)
-pEmph = pS "//" (\s -> Emph s)
-pUnderline = pS "__" (\s -> Underline s)
-pStrike = pS "--" (\s -> Strike s)
+pList :: Bool -> Parser Markup
+pList enum = do
+       list <- many1 $ try $ pListItem enum
+       return (List enum list)
 
-pS s f = do
-       string s
-       s <- pStopAt s
-       return (f s)
+pListItem :: Bool -> Parser [Markup]
+pListItem enum = do
+       many1 pEol
+       char $ listToken enum
+       many pOneLine
 
-pStopAt xs = pUntil pMain xs
-pString xs = pUntil anyChar xs
-pUntil p xs = manyTill p (try $ string xs)
+listToken True = '#'
+listToken False = '*'
        
+pHeading :: Parser Markup      
 pHeading = do
        many1 pEol
        level <- many1 $ char '='
-       char ' '
-       s <- pStopAt (' ':level)
+       s <- pStopAt level
        return (Heading (length level) s)
 
+pURL :: Parser Markup  
 pURL = do
        proto <- many1 letter
        string "://"
-       s <- many1 (alphaNum <|> oneOf "?.:&-/")
+       s <- many1 (alphaNum <|> oneOf "?.:&-/~%=\\_")
        return (Url (proto++"://"++s))
 
-pPre = do
-       string "<pre>"
-       s <- pString "</pre>"
+pMail :: Parser Markup
+pMail = do
+       user <- many1 (alphaNum <|> oneOf ".-_")
+       char '@'
+       server <- many1 (alphaNum <|> oneOf ".-_")
+       return (Url ("mailto:"++user++"@"++server))
+       
+
+pPre :: Parser Markup  
+pPre = string "<pre>" >> do
+       s <- pUntil (pOneLine <|> pEol) "</pre>"
        return (Pre s)
+
+pBold,pEmph,pUnderline,pStrike :: Parser Markup        
+pBold = pS "**" (\s -> Bold s)
+pEmph = pS "//" (\s -> Emph s)
+pUnderline = pS "__" (\s -> Underline s)
+pStrike = pS "--" (\s -> Strike s)
+pS s f = string s >> do
+       s <- pStopAt s
+       return (f s)
+
+pOtherChar :: Parser Markup    
+pOtherChar = do
+       c <- noneOf "\n\r"
+       return (Text (c:[]))
+
+pText :: Parser Markup 
+pText = do
+       t <- many1 alphaNum
+       return (Text t)
+
+pLinkContent :: Parser (String, String)        
+pLinkContent = do try (string "]]" >> return ([],[])) 
+       <|> try (do
+               string " | "
+               d <- pString "]]"
+               return ([],d))
+       <|> (do
+               c <- anyChar
+               (l,d) <- pLinkContent
+               return (c:l,d))
+
+pStopAt :: String -> Parser Document   
+pStopAt xs = pUntil pOneLine xs
+
+pString :: String -> Parser String     
+pString xs = pUntil anyChar xs
+
+pEol :: Parser Markup  
+pEol = do
+       (string "\n" <|> string "\r\n")
+       return (Text "\r\n")
+
+pUntil :: Parser a -> String -> Parser [a]     
+pUntil p xs = manyTill p (try $ string xs)
        
+pMain :: Parser Markup 
 pMain = choice [
        try (pHeading)
+       ,try $ pList True
+       ,try $ pList False
        ,try (pPara) 
-       ,pSpace 
        ,try(pPre) 
        ,try(pBold) 
        ,try(pEmph) 
@@ -121,17 +158,23 @@ pMain = choice [
        ,try(pStrike) 
        ,try (pLink)
        ,try (pURL)
-       ,pOtherChar
+       ,try (pMail)
        ,pText
+       ,pOtherChar
+       ,pEol
        ]
 
-pOtherChar = do
-       c <- oneOf "*,;.:!?[]()'\"=-%$£<>/\\|"
-       return (Text (c:[]))
-
-pText = do
-       t <- many1 alphaNum
-       return (Text t)
+pOneLine = choice [
+       try pBold
+       ,try pEmph
+       ,try pUnderline
+       ,try pStrike
+       ,try pLink
+       ,try pURL
+       ,try pMail
+       ,pText
+       ,pOtherChar
+       ]
 
 newtype PGB = PGB DBService
 
@@ -186,8 +229,6 @@ instance Backend PGB where
                case list of
                        [[]] -> return []
                        _ -> mapM (\[key] -> return key) list
-               
-                       
 
 tov :: String -> String
 tov s = '\'':escapeQuery s++"'"
@@ -203,11 +244,12 @@ toHtml ((Underline d):xs) = "<u>"++toHtml d++"</u>"++toHtml xs
 toHtml ((Strike d):xs) = "<strike>"++toHtml d++"</strike>"++toHtml xs
 toHtml ((Heading n d):xs) = "\n<h"++show n++">"++toHtml d++"</h"++show n++">\n"++toHtml xs
 toHtml ((Url l):xs) = "<link: "++l++">"++toHtml xs
-toHtml ((Pre s):xs) = "<pre>"++s++"</pre>"++toHtml xs
+toHtml ((Pre s):xs) = "<pre>"++toHtml s++"</pre>"++toHtml xs
+toHtml ((List o l):xs) = "<"++listType o++">\n"++(unlines $ map (\s -> "<li>"++toHtml s++"</li>\n") l) ++ "</"++listType o++">"++toHtml xs
 
+listType True = "ol"
+listType False = "ul"
 
 htmlOutput s = case parse wikiParser "" s of
-                                       Right n -> do 
-                                               putStr (toHtml n)
-                                       Left e -> do
-                                               print e
+                                       Right n -> putStr (toHtml n)
+                                       Left e -> print e