git.iko.soy/elk
on master help sign in
Improve error messages, rm trailing whitespace
4bec310Max Goldstein
compiler/Generate/JavaScript.hs+1−1
compare with master
unifiedsplit
@@ -34,7 +34,7 @@ include alias moduleName =
34
34
35internalImports :: String -> Statement ()
35internalImports :: String -> Statement ()
36internalImports name =
36internalImports name =
37− VarDeclStmt ()
37+ VarDeclStmt ()
38 [ varDecl "_N" (obj "Elm.Native")
38 [ varDecl "_N" (obj "Elm.Native")
39 , include "_U" "_N.Utils"
39 , include "_U" "_N.Utils"
40 , include "_L" "_N.List"
40 , include "_L" "_N.List"
compiler/Generate/JavaScript/Ports.hs+6−6
@@ -38,7 +38,7 @@ inc tipe x =
38
38
39 Data "Json.Value" [] ->
39 Data "Json.Value" [] ->
40 obj "Native.Json.fromJS" <| x
40 obj "Native.Json.fromJS" <| x
41−
41+
42 Data ctor []
42 Data ctor []
43 | ctor == "Int" -> from JSNumber
43 | ctor == "Int" -> from JSNumber
44 | ctor == "Float" -> from JSNumber
44 | ctor == "Float" -> from JSNumber
@@ -71,10 +71,10 @@ inc tipe x =
71 , inc t (BracketRef () x (IntLit () n)))
71 , inc t (BracketRef () x (IntLit () n)))
72
72
73 Data _ _ ->
73 Data _ _ ->
74− error "bad ADT got to port generation code"
74+ error "bad ADT got to incoming port generation code"
75
75
76 Record _ (Just _) ->
76 Record _ (Just _) ->
77− error "bad record got to port generation code"
77+ error "bad record got to incoming port generation code"
78
78
79 Record fields Nothing ->
79 Record fields Nothing ->
80 check x (JSObject (map fst fields)) object
80 check x (JSObject (map fst fields)) object
@@ -128,12 +128,12 @@ out tipe x =
128 | Help.isTuple ctor ->
128 | Help.isTuple ctor ->
129 let convert n t = out t $ DotRef () x $ var ('_':show n)
129 let convert n t = out t $ DotRef () x $ var ('_':show n)
130 in ArrayLit () $ zipWith convert [0..] ts
130 in ArrayLit () $ zipWith convert [0..] ts
131−
131+
132 Data _ _ ->
132 Data _ _ ->
133− error "bad ADT got to port generation code"
133+ error "bad ADT got to outgoing port generation code"
134
134
135 Record _ (Just _) ->
135 Record _ (Just _) ->
136− error "bad record got to port generation code"
136+ error "bad record got to outgoing port generation code"
137
137
138 Record fields Nothing ->
138 Record fields Nothing ->
139 ObjectLit () keys
139 ObjectLit () keys