@@ -1,5 +1,6 @@
11module Parse.Expression (def,term) where
22
3+import Control.Arrow ((***))
34import Control.Applicative ((<$>), (<*>))
45import Data.List (foldl')
56import Text.Parsec hiding (newline,spaces)
@@ -51,15 +52,28 @@ negative = do
5152-------- Complex Terms --------
5253
5354listTerm :: IParser (Expr t v)
54−listTerm =
55− (do { try $ string "[markdown|"
56− ; md <- filter (/='\r') <$> manyTill anyChar (try $ string "|]")
57− ; return . Markdown $ Pan.readMarkdown Pan.def md })
58− <|> (braces $ choice
59− [ try $ do { lo <- expr; whitespace; string ".." ; whitespace
60− ; Range lo <$> expr }
61− , ExplicitList <$> commaSep expr
62− ])
55+listTerm = markdown <|> braces (range <|> ExplicitList <$> commaSep expr)
56+ where
57+ range = try $ do lo <- expr
58+ whitespace >> string ".." >> whitespace
59+ Range lo <$> expr
60+
61+ markdown = try (string "[markdown|") >> closeMarkdown "" []
62+ where
63+ closeMarkdown md exprs =
64+ choice [ do try (string "|]")
65+ let toMD = Pan.readMarkdown Pan.def . filter (/='\r')
66+ return $ Markdown (toMD md) (reverse exprs)
67+ , do try (string "{{")
68+ whitespace
69+ e <- expr
70+ whitespace
71+ string "}}"
72+ let span = "<span id=\"md" ++ show (length exprs) ++ "\"></span>"
73+ closeMarkdown (md ++ span) (e:exprs)
74+ , do c <- anyChar
75+ closeMarkdown (md ++ [c]) exprs
76+ ]
6377
6478parensTerm :: IParser (LExpr t v)
6579parensTerm = try (parens opFn) <|> parens (tupleFn <|> parened)