parser is looking better

[yawbih.git] / Wiki.hs

diff --git a/Wiki.hs b/Wiki.hs
index d6ece0dc5f4d94829dd09bfd86f657be3927f781..ab89fff9de0e8c6a9a6e6bd834b67fd589d26c81 100644 (file)
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -2,11 +2,15 @@ module Wiki (
        Backend (getCurrent,getList,get,setCurrent,update)
        ,PGB
        ,createPGB
+       ,Markup (Text, Paragraph, Link)
+       ,Document
+       ,wikiParser
 
 ) where
 
 import Dbconnect
 import Data.Char
+import Text.ParserCombinators.Parsec
 
 class Backend a where
        --Keyword -> (Full text,date)
@@ -25,11 +29,44 @@ class Backend a where
        update :: a -> String -> String -> String -> String -> IO String
 
 data Markup = Text String
-       | Bold String
-       | Paragraph [Markup]
+       | Paragraph 
+       | Link String String
 
 type Document = [Markup]
 
+wikiParser :: GenParser Char st Document       
+wikiParser = do 
+       s <- (try (pPara) 
+               <|> pOneEol 
+               <|> pLinkLong
+               <|> pText)
+       ss <- (wikiParser <|> return [])
+       return (s:ss)
+
+pPara = do
+       pEol
+       pEol
+       return (Paragraph)
+
+pOneEol = do
+       pEol
+       return (Text " ")
+
+pEol = char '\n' <|> do
+       char '\r'
+       char '\n'
+
+pLinkLong = do
+       string "[["
+       l <- many1 $ noneOf ['|','[',']']
+       char '|'
+       d <- many1 $ noneOf ['|','[',']'] 
+       string "]]"
+       return (Link l d)
+pText = do
+       t <- many1 (noneOf ['\n','\r','[',']'])
+       return (Text t)
+
 newtype PGB = PGB DBService
 
 createPGB :: String -> String -> String -> String -> IO PGB