git.iko.soy/elk
on master help sign in
Fix how kernel data is turned into Obj.Graph info
cff909cEvan Czaplicki
src/Elm/Compiler/Objects.hs+30−2
compare with master
unifiedsplit
@@ -69,14 +69,42 @@ fromKernels kernels =
69 Opt.Graph
69 Opt.Graph
70 Map.empty
70 Map.empty
71 (Map.mapKeys toGlobal (Map.map toNode kernels))
71 (Map.mapKeys toGlobal (Map.map toNode kernels))
72− Map.empty
72+ (Map.foldl' addKernel Map.empty kernels)
73+
74+
75+
76+-- KERNEL TO NODES
73
77
74
78
75toGlobal :: N.Name -> Opt.Global
79toGlobal :: N.Name -> Opt.Global
76toGlobal home =
80toGlobal home =
77− Opt.Global (ModuleName.Canonical Pkg.kernel home) N.dollar
81+ Opt.Global (ModuleName.Canonical Pkg.kernel (ModuleName.getKernel home)) N.dollar
78
82
79
83
80toNode :: Kernel -> Opt.Node
84toNode :: Kernel -> Opt.Node
81toNode (Kernel client server) =
85toNode (Kernel client server) =
82 Opt.Kernel client server
86 Opt.Kernel client server
87+
88+
89+
90+-- KERNEL TO ELM FIELDS
91+
92+
93+addKernel :: Map.Map N.Name Int -> Kernel -> Map.Map N.Name Int
94+addKernel fields (Kernel client maybeServer) =
95+ addContent (maybe fields (addContent fields) maybeServer) client
96+
97+
98+addContent :: Map.Map N.Name Int -> Opt.KContent -> Map.Map N.Name Int
99+addContent fields (Opt.KContent chunks _) =
100+ List.foldl' addChunk fields chunks
101+
102+
103+addChunk :: Map.Map N.Name Int -> Opt.KChunk -> Map.Map N.Name Int
104+addChunk fields chunk =
105+ case chunk of
106+ Opt.ElmField name ->
107+ Map.insertWith (+) name 1 fields
108+
109+ _ ->
110+ fields