git.iko.soy/elk
on master help sign in
Finally get rid of Build/ directory, it's all in elm-make!
commited1aeb68027eb069b2b235877dcc343a6b8c709c authorEvan Czaplicki <info@elm-lang.org> dateMon 10 Nov 2014, 18:30 (12 years ago) parent58175b2
3 files changed+9−8
compare with master
unifiedsplit
elm-compiler.cabal+1−1 src/Build/Source.hs → src/Compile.hs+4−3 src/Elm/Compiler.hs+4−4
elm-compiler.cabal+1−1
@@ -62,6 +62,7 @@ Library
6262 AST.PrettyPrint,
6363 AST.Type,
6464 AST.Variable,
65+ Compile,
6566 Generate.JavaScript,
6667 Generate.JavaScript.Helpers,
6768 Generate.JavaScript.Ports,
@@ -102,7 +103,6 @@ Library
102103 Type.State,
103104 Type.Type,
104105 Type.Unify,
105− Build.Source,
106106 Paths_elm_compiler
107107
108108 Build-depends:
src/Build/Source.hs → src/Compile.hsrenamed+4−3
@@ -1,4 +1,4 @@
1−module Build.Source (build) where
1+module Compile (compile) where
22
33import qualified Data.Map as Map
44import Text.PrettyPrint (Doc)
@@ -10,8 +10,9 @@ import qualified Transform.Check as Check
1010import qualified Type.Inference as TI
1111import qualified Transform.Canonicalize as Canonical
1212
13−build :: Bool -> Module.Interfaces -> String -> Either [Doc] Module.CanonicalModule
14−build noPrelude interfaces source =
13+
14+compile :: Bool -> Module.Interfaces -> String -> Either [Doc] Module.CanonicalModule
15+compile noPrelude interfaces source =
1516 do let infixes = Map.fromList . map (\(assoc,lvl,op) -> (op,(lvl,assoc)))
1617 . concatMap Module.iFixities $ Map.elems interfaces
1718
src/Elm/Compiler.hs+4−4
@@ -8,14 +8,14 @@ import qualified Data.Map as Map
88import qualified Text.PrettyPrint as P
99
1010import qualified AST.Module as Module (HeaderAndImports(HeaderAndImports), toInterface)
11−import qualified Build.Source as Source
11+import qualified Compile
1212import qualified Elm.Compiler.Module as PublicModule
1313import qualified Elm.Compiler.Version as Version
1414import qualified Elm.Utils as Utils
1515import qualified Generate.JavaScript as JS
1616import qualified Parse.Helpers as Help
1717import qualified Parse.Module as Parse
18−import qualified Paths_elm_compiler as Compiler
18+import qualified Paths_elm_compiler as Paths
1919
2020
2121-- VERSION
@@ -51,7 +51,7 @@ compile
5151 -> Map.Map PublicModule.Name PublicModule.Interface
5252 -> Either String (PublicModule.Interface, String)
5353compile source interfaces =
54− case Source.build False unwrappedInterfaces source of
54+ case Compile.compile False unwrappedInterfaces source of
5555 Left docs -> Left . unlines . List.intersperse "" $ map P.render docs
5656 Right modul -> Right (Module.toInterface modul, JS.generate modul)
5757 where
@@ -65,4 +65,4 @@ compile source interfaces =
6565-}
6666runtimePath :: IO FilePath
6767runtimePath =
68− Utils.getAsset "compiler" Compiler.getDataFileName "runtime/core.js"
68+ Utils.getAsset "compiler" Paths.getDataFileName "runtime/core.js"