96f6750 · elk · git.iko.soy

git.iko.soy/elk

on master help sign in

Move runtime errors to Native.Utils

96f6750Evan Czaplicki12 years ago

compiler/Generate/JavaScript.hs+3−4

compare with master

unifiedsplit

@@ -34,7 +34,6 @@ internalImports name =

34 [ varDecl "_N" (obj ["Elm","Native"])

35 , include "_U" "Utils"

36 , include "_L" "List"

37− , include "_E" "Error"

38 , varDecl Help.localModuleName (string (Module.nameToString name))

37 , varDecl Help.localModuleName (string (Module.nameToString name))

39 ]

38 ]

40 where

39 where

@@ -150,7 +149,7 @@ expression (A region expr) =

150 (A _ (Var (Var.Canonical (Var.Module ["Basics"]) "otherwise")), _) ->

149 (A _ (Var (Var.Canonical (Var.Module ["Basics"]) "otherwise")), _) ->

151 safeIfs branches'

150 safeIfs branches'

152 (A _ (Literal (Boolean True)), _) -> safeIfs branches'

151 (A _ (Literal (Boolean True)), _) -> safeIfs branches'

153− _ -> ifs branches' (throw "If" region)

152+ _ -> ifs branches' (throw "badIf" region)

154 where

153 where

155 safeIfs branches = ifs (init branches) (snd (last branches))

154 safeIfs branches = ifs (init branches) (snd (last branches))

156 ifs branches finally = foldr iff finally branches

155 ifs branches finally = foldr iff finally branches

@@ -230,7 +229,7 @@ definition (Canonical.Definition pattern expr@(A region _) _) = do

230

229

231 safeAssign = varDecl "$" (CondExpr () if' (ref "_raw") exception)

230 safeAssign = varDecl "$" (CondExpr () if' (ref "_raw") exception)

232 if' = InfixExpr () OpStrictEq (obj ["_raw","ctor"]) (string name)

231 if' = InfixExpr () OpStrictEq (obj ["_raw","ctor"]) (string name)

233− exception = Help.throw "Case" region

232+ exception = Help.throw "badCase" region

234

233

235 _ ->

234 _ ->

236 do defs' <- concat <$> mapM toDef vars

235 do defs' <- concat <$> mapM toDef vars

@@ -262,7 +261,7 @@ match region mtch =

262 | otherwise = e

261 | otherwise = e

263

262

264 Case.Fail ->

263 Case.Fail ->

265− return [ ExprStmt () (Help.throw "Case" region) ]

264+ return [ ExprStmt () (Help.throw "badCase" region) ]

266

265

267 Case.Break -> return [BreakStmt () Nothing]

266 Case.Break -> return [BreakStmt () Nothing]

268

267

compiler/Generate/JavaScript/Helpers.hs+1−1

@@ -30,7 +30,7 @@ localModuleName = "$moduleName"

31throw :: String -> Region -> Expression ()

32throw kind region =

33− obj ["_E",kind] `call` [ ref localModuleName, string (PP.renderPretty region) ]

33+ obj ["_U",kind] `call` [ ref localModuleName, string (PP.renderPretty region) ]

35-- Function Calls