git.iko.soy/elk
on master help sign in
Allow specific values for Obj.Roots

Also add some hidden dependencies in all cases. They are needed for equality and for toString

commit179ab457d4d64c3ccc6d0433d4622aa3b0e68816 authorEvan Czaplicki <evancz@users.noreply.github.com> dateFri 14 Apr 2017, 16:22 (10 years ago) parent3c71d93
2 files changed+24−3
compare with master
unifiedsplit
src/Elm/Compiler/Objects.hs+1 src/Elm/Compiler/Objects/Internal.hs+23−3
src/Elm/Compiler/Objects.hs+1
@@ -8,6 +8,7 @@ module Elm.Compiler.Objects
88 , unions
99 , Roots
1010 , mains
11+ , value
1112 )
1213 where
1314
src/Elm/Compiler/Objects/Internal.hs+23−3
@@ -11,6 +11,7 @@ module Elm.Compiler.Objects.Internal
1111 , lookup
1212 , Roots
1313 , mains
14+ , value
1415 , toGlobals
1516 )
1617 where
@@ -21,6 +22,7 @@ import Control.Arrow (first)
2122import Control.Monad (liftM, liftM2)
2223import Data.Binary
2324import qualified Data.Map as Map
25+import qualified Data.Text as Text
2426
2527import qualified AST.Expression.Optimized as Opt
2628import qualified AST.Module.Name as ModuleName
@@ -92,6 +94,7 @@ lookup var (SymbolTable symbols) =
9294
9395data Roots
9496 = Mains [ModuleName.Canonical]
97+ | Value ModuleName.Canonical Text.Text
9598
9699
97100mains :: [ModuleName.Canonical] -> Roots
@@ -99,11 +102,28 @@ mains =
99102 Mains
100103
101104
105+value :: ModuleName.Canonical -> String -> Roots
106+value home name =
107+ Value home (Text.pack name)
108+
109+
102110toGlobals :: Roots -> [Var.Global]
103111toGlobals roots =
104− case roots of
105− Mains modules ->
106− map (\home -> Var.Global home "main") modules
112+ hiddenDependencies ++
113+ case roots of
114+ Mains modules ->
115+ map (\home -> Var.Global home "main") modules
116+
117+ Value home name ->
118+ [ Var.Global home name ]
119+
120+
121+-- needed for (==) and toString
122+hiddenDependencies :: [Var.Global]
123+hiddenDependencies =
124+ [ Var.Global (ModuleName.inCore "Dict") "toList"
125+ , Var.Global (ModuleName.inCore "Set") "toList"
126+ ]
107127
108128
109129