git.iko.soy/elk
on master help sign in
Update Optimize/* for changes in AST and Regions
commit9fc06130d06ba69967c34ccb802c6c48585944e0 authorEvan Czaplicki <evancz@users.noreply.github.com> dateThu 27 Dec 2018, 11:51 (8 years ago) parent41a1963
4 files changed+9−10
compare with master
unifiedsplit
compiler/src/Optimize/DecisionTree.hs+3−3 compiler/src/Optimize/Expression.hs+1−1 compiler/src/Optimize/Module.hs+3−4 compiler/src/Optimize/Names.hs+2−2
compiler/src/Optimize/DecisionTree.hs+3−3
@@ -27,7 +27,7 @@ import qualified Data.List as List
2727import qualified Data.Maybe as Maybe
2828import qualified Data.Name as Name
2929import qualified Data.Set as Set
30−import Data.Utf8 (Utf8)
30+import qualified Data.Utf8 as Utf8
3131
3232import qualified AST.Canonical as Can
3333import qualified Data.Index as Index
@@ -77,8 +77,8 @@ data Test
7777 | IsNil
7878 | IsTuple
7979 | IsInt Int
80− | IsChr Utf8
81− | IsStr Utf8
80+ | IsChr Utf8.String
81+ | IsStr Utf8.String
8282 | IsBool Bool
8383 deriving (Eq, Ord)
8484
compiler/src/Optimize/Expression.hs+1−1
@@ -170,7 +170,7 @@ optimize cycle (A.At region expression) =
170170 <*> optimize cycle b
171171 <*> traverse (optimize cycle) maybeC
172172
173− Can.Shader _ src (Shader.Shader attributes uniforms _varyings) ->
173+ Can.Shader src (Shader.Types attributes uniforms _varyings) ->
174174 pure (Opt.Shader src (Map.keysSet attributes) (Map.keysSet uniforms))
175175
176176
compiler/src/Optimize/Module.hs+3−4
@@ -24,7 +24,6 @@ import qualified Optimize.Names as Names
2424import qualified Optimize.Port as Port
2525import qualified Reporting.Annotation as A
2626import qualified Reporting.Error.Main as E
27−import qualified Reporting.Region as R
2827import qualified Reporting.Result as Result
2928import qualified Reporting.Warning as W
3029
@@ -42,7 +41,7 @@ type Annotations =
4241
4342
4443optimize :: Annotations -> Can.Module -> Result i [W.Warning] Opt.Graph
45−optimize annotations (Can.Module home _ _ decls unions aliases _ effects) =
44+optimize annotations (Can.Module home _ decls unions aliases _ effects) =
4645 addDecls home annotations decls $
4746 addEffects home effects $
4847 addUnions home unions $
@@ -204,7 +203,7 @@ addDecls home annotations decls graph =
204203 Result.ok graph
205204
206205
207−findMain :: [Can.Def] -> Maybe R.Region
206+findMain :: [Can.Def] -> Maybe A.Region
208207findMain defs =
209208 case defs of
210209 [] ->
@@ -242,7 +241,7 @@ addDef home annotations def graph =
242241 addDefHelp region annotations home name (map fst typedArgs) body graph
243242
244243
245−addDefHelp :: R.Region -> Annotations -> ModuleName.Canonical -> Name.Name -> [Can.Pattern] -> Can.Expr -> Opt.Graph -> Result i w Opt.Graph
244+addDefHelp :: A.Region -> Annotations -> ModuleName.Canonical -> Name.Name -> [Can.Pattern] -> Can.Expr -> Opt.Graph -> Result i w Opt.Graph
246245addDefHelp region annotations home name args body graph@(Opt.Graph mains nodes fieldCounts) =
247246 if name /= Name.main then
248247 Result.ok (addDefNode home name args body Set.empty graph)
compiler/src/Optimize/Names.hs+2−2
@@ -25,7 +25,7 @@ import qualified AST.Optimized as Opt
2525import qualified Data.Index as Index
2626import qualified Elm.ModuleName as ModuleName
2727import qualified Elm.Package as Pkg
28−import qualified Reporting.Region as R
28+import qualified Reporting.Annotation as A
2929
3030
3131
@@ -73,7 +73,7 @@ registerGlobal home name =
7373 ok uid (Set.insert global deps) fields (Opt.VarGlobal global)
7474
7575
76−registerDebug :: Name.Name -> ModuleName.Canonical -> R.Region -> Tracker Opt.Expr
76+registerDebug :: Name.Name -> ModuleName.Canonical -> A.Region -> Tracker Opt.Expr
7777registerDebug name home region =
7878 Tracker $ \uid deps fields ok ->
7979 let global = Opt.Global ModuleName.debug name in