7c159b2 · elk · git.iko.soy

compiler/Generate/JavaScript.hs+1−1

compare with master

unifiedsplit

@@ -226,7 +226,7 @@ instance ToJS (Expr t v) where

226 _ -> jsObj $ ("ctor:" ++ show name) : fields

227 where fields = zipWith (\n e -> "_" ++ show n ++ ":" ++ e) [0..] fs

228

229− Markdown doc -> return $ "Text.text('" ++ pad ++ md ++ pad ++ "')"

229+ Markdown doc _ -> return $ "Text.text('" ++ pad ++ md ++ pad ++ "')"

230 where pad = "<div style=\"height:0;width:0;\"> </div>"

231 md = formatMarkdown $ Pan.writeHtmlString Pan.def doc

232

compiler/Generate/Noscript.hs+1−1

@@ -49,7 +49,7 @@ instance Extract (Expr t v) where

49 Case e cases -> concatMap (f . snd) cases

50 Data _ es -> concatMap f es

51 MultiIf es -> concatMap (f . snd) es

52− Markdown doc -> [ Pan.writeHtmlString Pan.def doc ]

52+ Markdown doc _ -> [ Pan.writeHtmlString Pan.def doc ]

53 _ -> []

54

55extractLink src txt =

compiler/Parse/Expression.hs+23−9

@@ -1,5 +1,6 @@

1module Parse.Expression (def,term) where

2

3+import Control.Arrow ((***))

3import Control.Applicative ((<$>), (<*>))

4import Control.Applicative ((<$>), (<*>))

4import Data.List (foldl')

5import Data.List (foldl')

5import Text.Parsec hiding (newline,spaces)

6import Text.Parsec hiding (newline,spaces)

@@ -51,15 +52,28 @@ negative = do

51-------- Complex Terms --------

52-------- Complex Terms --------

52

53

53listTerm :: IParser (Expr t v)

54listTerm :: IParser (Expr t v)

54−listTerm =

55+listTerm = markdown <|> braces (range <|> ExplicitList <$> commaSep expr)

55− (do { try $ string "[markdown|"

56+ where

56− ; md <- filter (/='\r') <$> manyTill anyChar (try $ string "|]")

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')

57− ; return . Markdown $ Pan.readMarkdown Pan.def md })

66+ return $ Markdown (toMD md) (reverse exprs)

58− <|> (braces $ choice

67+ , do try (string "{{")

59− [ try $ do { lo <- expr; whitespace; string ".." ; whitespace

68+ whitespace

60− ; Range lo <$> expr }

69+ e <- expr

61− , ExplicitList <$> commaSep expr

70+ whitespace

62− ])

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+ ]

63

77

64parensTerm :: IParser (LExpr t v)

78parensTerm :: IParser (LExpr t v)

65parensTerm = try (parens opFn) <|> parens (tupleFn <|> parened)

79parensTerm = try (parens opFn) <|> parens (tupleFn <|> parened)

compiler/SourceSyntax/Expression.hs+2−2

@@ -30,7 +30,7 @@ data Expr t v

30 | Insert (LExpr t v) String (LExpr t v)

31 | Modify (LExpr t v) [(String, LExpr t v)]

32 | Record [(String, LExpr t v)]

33− | Markdown Pandoc.Pandoc

33+ | Markdown Pandoc.Pandoc [LExpr t v]

34 deriving (Eq, Show, Data, Typeable)

35

36data Def tipe var

@@ -94,7 +94,7 @@ instance Pretty (Expr t v) where

94 where

95 field (x,e) = variable x <+> P.text "=" <+> pretty e

96

97− Markdown _ -> P.text "[markdown| ... |]"

97+ Markdown _ _ -> P.text "[markdown| ... |]"

98

99instance Pretty (Def t v) where

100 pretty def =

compiler/Transform/Canonicalize.hs+1−1

@@ -164,7 +164,7 @@ rename env lexpr@(L s expr) =

164 branch (pattern,e) = (,) `liftM` format (renamePattern env pattern)

165 `ap` rename (extend env pattern) e

166

167− Markdown _ -> return expr

167+ Markdown md es -> Markdown md `liftM` mapM rnm es

168

169

170renamePattern :: Env -> Pattern -> Either String Pattern

compiler/Transform/SortDefinitions.hs+1−1

@@ -97,7 +97,7 @@ reorder lexpr@(L s expr) =

97 Record fields ->

98 Record `liftM` mapM reorderField fields

99

100− Markdown _ -> return expr

100+ Markdown md es -> Markdown md <$> mapM reorder es

101

102 -- Actually do some reordering

103 Let defs body ->

compiler/Transform/Substitute.hs+1−1

@@ -27,4 +27,4 @@ subst old new expr =

27 Modify r fs -> Modify (f r) (map (second f) fs)

28 Record fs -> Record (map (second f) fs)

29 Literal _ -> expr

30− Markdown _ -> expr

30+ Markdown md es -> Markdown md (map f es)

compiler/Type/Constrain/Expression.hs+5−2

@@ -134,8 +134,11 @@ constrain env (L span expr) tipe =

134 recordType = record fields' (TermN EmptyRecord1)

135 return . ex vars . and $ tipe === recordType : cs

136

137− Markdown _ ->

137+ Markdown _ es ->

138+ do vars <- forM es $ \_ -> liftIO (var Flexible)

139+ let tvars = map VarN vars

140+ cs <- zipWithM (constrain env) es tvars

138− return ("Graphics.Element.markdown" <? tipe)

141+ return . ex vars $ and ("Graphics.Element.markdown" <? tipe : cs)

139

142

140 Let defs body ->

143 Let defs body ->

141 do c <- constrain env body tipe

144 do c <- constrain env body tipe