Some parsing inside <pre>

[yawbih.git] / Wiki.hs

diff --git a/Wiki.hs b/Wiki.hs
index 1371c453e597351ede57c674fb807afb993ecd5b..2d394b8243d273dcd3fac82abe0c1b51e9e3d1f2 100644 (file)
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -41,18 +41,18 @@ data Markup = Text String
        | Url String
        | Underline [Markup]
        | Strike [Markup]
-       | Pre String
-       | List [[Markup]]
+       | Pre [Markup]
+       | List Bool [[Markup]]
 
 type Document = [Markup]
 
-wikiParser :: GenParser Char st Document       
+wikiParser :: Parser Document  
 wikiParser = many1 pMain
 
-pPara :: GenParser Char st Markup      
+pPara :: Parser Markup 
 pPara = count 2 pEol >> return (Paragraph)
 
-pLink :: GenParser Char st Markup      
+pLink :: Parser Markup 
 pLink = do
        string "[["
        (l,d) <- pLinkContent
@@ -60,33 +60,35 @@ pLink = do
                [] -> return (Link l l)
                _ -> return (Link l d)
 
-pList :: GenParser Char st Markup
-pList = do
-       list <- many1 $ try pListItem 
-       return (List list)
+pList :: Bool -> Parser Markup
+pList enum = do
+       list <- many1 $ try $ pListItem enum
+       return (List enum list)
 
-pListItem :: GenParser Char st [Markup]
-pListItem = do
+pListItem :: Bool -> Parser [Markup]
+pListItem enum = do
        many1 pEol
-       char '*'
+       char $ listToken enum
        many pOneLine
+
+listToken True = '#'
+listToken False = '*'
        
-pHeading :: GenParser Char st Markup   
+pHeading :: Parser Markup      
 pHeading = do
        many1 pEol
        level <- many1 $ char '='
-       char ' '
-       s <- pStopAt (' ':level)
+       s <- pStopAt level
        return (Heading (length level) s)
 
-pURL :: GenParser Char st Markup       
+pURL :: Parser Markup  
 pURL = do
        proto <- many1 letter
        string "://"
-       s <- many1 (alphaNum <|> oneOf "?.:&-/")
+       s <- many1 (alphaNum <|> oneOf "?.:&-/~%=\\_")
        return (Url (proto++"://"++s))
 
-pMail :: GenParser Char st Markup
+pMail :: Parser Markup
 pMail = do
        user <- many1 (alphaNum <|> oneOf ".-_")
        char '@'
@@ -94,12 +96,12 @@ pMail = do
        return (Url ("mailto:"++user++"@"++server))
        
 
-pPre :: GenParser Char st Markup       
+pPre :: Parser Markup  
 pPre = string "<pre>" >> do
-       s <- pString "</pre>"
+       s <- pUntil (pOneLine <|> pEol) "</pre>"
        return (Pre s)
 
-pBold,pEmph,pUnderline,pStrike :: GenParser Char st Markup     
+pBold,pEmph,pUnderline,pStrike :: Parser Markup        
 pBold = pS "**" (\s -> Bold s)
 pEmph = pS "//" (\s -> Emph s)
 pUnderline = pS "__" (\s -> Underline s)
@@ -108,17 +110,17 @@ pS s f = string s >> do
        s <- pStopAt s
        return (f s)
 
-pOtherChar :: GenParser Char st Markup 
+pOtherChar :: Parser Markup    
 pOtherChar = do
        c <- noneOf "\n\r"
        return (Text (c:[]))
 
-pText :: GenParser Char st Markup      
+pText :: Parser Markup 
 pText = do
        t <- many1 alphaNum
        return (Text t)
 
-pLinkContent :: GenParser Char st (String, String)     
+pLinkContent :: Parser (String, String)        
 pLinkContent = do try (string "]]" >> return ([],[])) 
        <|> try (do
                string " | "
@@ -129,24 +131,25 @@ pLinkContent = do try (string "]]" >> return ([],[]))
                (l,d) <- pLinkContent
                return (c:l,d))
 
-pStopAt :: String -> GenParser Char st Document        
+pStopAt :: String -> Parser Document   
 pStopAt xs = pUntil pOneLine xs
 
-pString :: String -> GenParser Char st String  
+pString :: String -> Parser String     
 pString xs = pUntil anyChar xs
 
-pEol :: GenParser Char st Markup       
+pEol :: Parser Markup  
 pEol = do
        (string "\n" <|> string "\r\n")
        return (Text "\r\n")
 
-pUntil :: GenParser Char st a -> String -> GenParser Char st [a]       
+pUntil :: Parser a -> String -> Parser [a]     
 pUntil p xs = manyTill p (try $ string xs)
        
-pMain :: GenParser Char st Markup      
+pMain :: Parser Markup 
 pMain = choice [
        try (pHeading)
-       ,try pList
+       ,try $ pList True
+       ,try $ pList False
        ,try (pPara) 
        ,try(pPre) 
        ,try(pBold) 
@@ -241,8 +244,11 @@ 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 ((List l):xs) = "<ul>\n"++(unlines $ map (\s -> "<li>"++toHtml s++"</li>\n") l) ++ "</ul>"++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 -> putStr (toHtml n)