git.iko.soy/elk
on master help sign in
Get markdown to work properly
af4af9bEvan Czaplicki
compiler/Generate/JavaScript.hs+3−3
compare with master
unifiedsplit
@@ -183,7 +183,7 @@ expression (A region expr) =
183
183
184 Markdown uid doc es ->
184 Markdown uid doc es ->
185 do es' <- mapM expression es
185 do es' <- mapM expression es
186− return $ obj ["Text","markdown"] `call` (string md : string uid : es')
186+ return $ Var.value "Text" "markdown" `call` (string md : string uid : es')
187 where
187 where
188 pad = "<div style=\"height:0;width:0;\">&nbsp;</div>"
188 pad = "<div style=\"height:0;width:0;\">&nbsp;</div>"
189 md = pad ++ MD.toHtml doc ++ pad
189 md = pad ++ MD.toHtml doc ++ pad
@@ -356,8 +356,8 @@ generate modul =
356 case value of
356 case value of
357 Var.Alias _ -> []
357 Var.Alias _ -> []
358 Var.Value x | Help.isOp x -> []
358 Var.Value x | Help.isOp x -> []
359− | otherwise -> [x]
359+ | otherwise -> [Var.varName x]
360− Var.ADT _ (Var.Listing ctors _) -> ctors
360+ Var.ADT _ (Var.Listing ctors _) -> map Var.varName ctors
361
361
362 assign path expr =
362 assign path expr =
363 case path of
363 case path of
compiler/Transform/Canonicalize.hs+3−1
@@ -235,7 +235,9 @@ expression env (A.A ann expr) =
235 branch (p,b) = (,) <$> format (pattern env p)
235 branch (p,b) = (,) <$> format (pattern env p)
236 <*> expression (update p env) b
236 <*> expression (update p env) b
237
237
238+ Markdown uid md es ->
239+ do Env.uses "Text"
238− Markdown uid md es -> Markdown uid md <$> mapM go es
240+ Markdown uid md <$> mapM go es
239
241
240 PortIn name st -> PortIn name <$> tipe' env st
242 PortIn name st -> PortIn name <$> tipe' env st
241
243