git.iko.soy/elk
on master help sign in
Merge branch 'stable'
commit62498fc79cdd9c16e15469b56caa4c0a0c981f07 authorEvan Czaplicki <info@elm-lang.org> dateMon 31 Mar 2014, 11:49 (13 years ago) parent5cdb8f34e88d39
2 files changed+22−16
compare with master
unifiedsplit
compiler/Generate/Cases.hs+14−11 compiler/Generate/JavaScript.hs+8−5
compiler/Generate/Cases.hs+14−11
@@ -13,7 +13,6 @@ import qualified SourceSyntax.Pattern as P
1313import qualified SourceSyntax.Variable as V
1414import Transform.Substitute
1515
16−
1716toMatch :: [(P.Pattern, Expr)] -> State Int (String, Match)
1817toMatch patterns = do
1918 v <- newVar
@@ -37,16 +36,19 @@ data Clause =
3736 deriving Show
3837
3938matchSubst :: [(String,String)] -> Match -> Match
40−matchSubst _ Break = Break
41−matchSubst _ Fail = Fail
42−matchSubst pairs (Seq ms) = Seq (map (matchSubst pairs) ms)
43−matchSubst pairs (Other (A a e)) =
44− Other . A a $ foldr ($) e $ map (\(x,y) -> subst x (rawVar y)) pairs
45−matchSubst pairs (Match n cs m) =
46− Match (varSubst n) (map clauseSubst cs) (matchSubst pairs m)
47− where varSubst v = fromMaybe v (lookup v pairs)
48− clauseSubst (Clause c vs m) =
49− Clause c (map varSubst vs) (matchSubst pairs m)
39+matchSubst pairs match =
40+ case match of
41+ Break -> Break
42+ Fail -> Fail
43+ Seq ms -> Seq (map (matchSubst pairs) ms)
44+ Other (A a e) ->
45+ Other . A a $ foldr ($) e $ map (\(x,y) -> subst x (rawVar y)) pairs
46+ Match n cs m ->
47+ Match (varSubst n) (map clauseSubst cs) (matchSubst pairs m)
48+ where
49+ varSubst v = fromMaybe v (lookup v pairs)
50+ clauseSubst (Clause c vs m) =
51+ Clause c (map varSubst vs) (matchSubst pairs m)
5052
5153isCon (p:_, _) =
5254 case p of
@@ -68,6 +70,7 @@ match vs@(v:_) cs def
6870 where
6971 cs' = map (dealias v) cs
7072
73+dealias :: String -> ([P.Pattern],Expr) -> ([P.Pattern],Expr)
7174dealias v c@(p:ps, A a e) =
7275 case p of
7376 P.Alias x pattern -> (pattern:ps, A a $ subst x (rawVar v) e)
compiler/Generate/JavaScript.hs+8−5
@@ -55,6 +55,7 @@ expression :: Expr -> State Int (Expression ())
5555expression (A region expr) =
5656 case expr of
5757 Var (V.Raw x) -> return $ obj x
58+
5859 Literal lit -> return $ literal lit
5960
6061 Range lo hi ->
@@ -215,19 +216,19 @@ definition (Definition pattern expr@(A region _) _) = do
215216 decl x n = varDecl x (dotSep ["$","_" ++ show n])
216217 setup vars
217218 | Help.isTuple name = assign "$" : vars
218− | otherwise = assign "$raw" : safeAssign : vars
219+ | otherwise = assign "_raw" : safeAssign : vars
219220
220− safeAssign = varDecl "$" (CondExpr () if' (obj "$raw") exception)
221− if' = InfixExpr () OpStrictEq (obj "$raw.ctor") (string name)
221+ safeAssign = varDecl "$" (CondExpr () if' (obj "_raw") exception)
222+ if' = InfixExpr () OpStrictEq (obj "_raw.ctor") (string name)
222223 exception = obj "_E.Case" `call` [ref "$moduleName", string (renderPretty region)]
223224
224225 _ ->
225226 do defs' <- concat <$> mapM toDef vars
226− return (VarDeclStmt () [assign "$"] : defs')
227+ return (VarDeclStmt () [assign "_"] : defs')
227228 where
228229 vars = P.boundVarList pattern
229230 mkVar = A region . rawVar
230− toDef y = let expr = A region $ Case (mkVar "$") [(pattern, mkVar y)]
231+ toDef y = let expr = A region $ Case (mkVar "_") [(pattern, mkVar y)]
231232 in definition $ Definition (P.Var y) expr Nothing
232233
233234match :: Region -> Case.Match -> State Int [Statement ()]
@@ -254,9 +255,11 @@ match region mtch =
254255 return [ ExprStmt () (obj "_E.Case" `call` [ref "$moduleName", string (renderPretty region)]) ]
255256
256257 Case.Break -> return [BreakStmt () Nothing]
258+
257259 Case.Other e ->
258260 do e' <- expression e
259261 return [ ret e' ]
262+
260263 Case.Seq ms -> concat <$> mapM (match region) (dropEnd [] ms)
261264 where
262265 dropEnd acc [] = acc