git.iko.soy/elk
on master help sign in
Only generate message types for now

Also fix a field typo in JSON representing union types

commit7894dacd8cd6e5cf4398325a1627e003a449334a authorEvan Czaplicki <evancz@users.noreply.github.com> dateMon 22 Aug 2016, 14:31 (10 years ago) parent20ab198
2 files changed+7−12
compare with master
unifiedsplit
src/Elm/Compiler/Type.hs+4−6 src/Elm/Compiler/Type/Extract.hs+3−6
src/Elm/Compiler/Type.hs+4−6
@@ -32,8 +32,7 @@ data Type
3232
3333data Program =
3434 Program
35− { _model :: Type
36− , _msg :: Type
35+ { _message :: Type
3736 , _aliases :: [( String, [String], Type )]
3837 , _unions :: [( String, [String], [(String, [Type])] )]
3938 }
@@ -216,10 +215,9 @@ fromRawType (A.A _ astType) =
216215
217216
218217instance Json.ToJSON Program where
219− toJSON (Program model msg aliases unions) =
218+ toJSON (Program msg aliases unions) =
220219 Json.object
221− [ "model" .= model
222− , "message" .= msg
220+ [ "message" .= msg
223221 , "aliases" .= Json.object (map toAliasField aliases)
224222 , "unions" .= Json.object (map toUnionField unions)
225223 ]
@@ -237,7 +235,7 @@ toUnionField :: ( String, [String], [(String, [Type])] ) -> Json.Pair
237235toUnionField ( name, args, constructors ) =
238236 Text.pack name .= Json.object
239237 [ "args" .= args
240− , "type" .= Json.object (map toCtorObject constructors)
238+ , "tags" .= Json.object (map toCtorObject constructors)
241239 ]
242240
243241
src/Elm/Compiler/Type/Extract.hs+3−6
@@ -74,18 +74,15 @@ extractProgram interfaces name =
7474 do iface <- Map.lookup name interfaces
7575 mainType <- Map.lookup "main" (Module.iTypes iface)
7676 case mainType of
77− T.App _program [_flags, model, msg] ->
77+ T.App _program [_flags, _model, msg] ->
7878 let
79− (modelType, modelDeps) =
80− Writer.runWriter (extractHelp model)
81−
8279 (msgType, msgDeps) =
8380 Writer.runWriter (extractHelp msg)
8481
8582 (aliases, unions) =
86− extractTransitive interfaces mempty (mappend modelDeps msgDeps)
83+ extractTransitive interfaces mempty msgDeps
8784 in
88− Just $ Program modelType msgType aliases unions
85+ Just $ Program msgType aliases unions
8986
9087 _ ->
9188 Nothing