1347951 · elk · git.iko.soy

elm-compiler.cabal+6−6

compare with master

unifiedsplit

@@ -57,6 +57,12 @@ Library

57 AST.Pattern,

58 AST.Type,

59 AST.Variable,

60+ Canonicalize,

61+ Canonicalize.Environment,

62+ Canonicalize.Port,

63+ Canonicalize.Setup,

64+ Canonicalize.Type,

65+ Canonicalize.Variable,

60 Compile,

66 Compile,

61 Elm.Compiler.Type.Extract,

67 Elm.Compiler.Type.Extract,

62 Elm.Compiler.Version,

68 Elm.Compiler.Version,

@@ -66,12 +72,6 @@ Library

66 Generate.JavaScript.Variable,

72 Generate.JavaScript.Variable,

67 Generate.Cases,

73 Generate.Cases,

68 Transform.AddDefaultImports,

74 Transform.AddDefaultImports,

69− Transform.Canonicalize,

70− Transform.Canonicalize.Environment,

71− Transform.Canonicalize.Port,

72− Transform.Canonicalize.Setup,

73− Transform.Canonicalize.Type,

74− Transform.Canonicalize.Variable,

75 Transform.Interface,

76 Transform.SortDefinitions,

77 Transform.Substitute,

src/Transform/Canonicalize.hs → src/Canonicalize.hsrenamed+7−7

@@ -1,4 +1,4 @@

1−module Transform.Canonicalize (module') where

1+module Canonicalize (module') where

2

3import Control.Applicative ((<$>),(<*>))

4import qualified Data.List as List

@@ -23,12 +23,12 @@ import qualified Reporting.Error as Error

23import qualified Reporting.Error.Canonicalize as CError

24import qualified Reporting.Result as R

25import qualified Reporting.Warning as Warning

26−import qualified Transform.Canonicalize.Environment as Env

26+import qualified Canonicalize.Environment as Env

27−import qualified Transform.Canonicalize.Port as Port

27+import qualified Canonicalize.Port as Port

28−import qualified Transform.Canonicalize.Result as Result

28+import qualified Canonicalize.Result as Result

29−import qualified Transform.Canonicalize.Setup as Setup

29+import qualified Canonicalize.Setup as Setup

30−import qualified Transform.Canonicalize.Type as Canonicalize

30+import qualified Canonicalize.Type as Canonicalize

31−import qualified Transform.Canonicalize.Variable as Canonicalize

31+import qualified Canonicalize.Variable as Canonicalize

32import qualified Transform.SortDefinitions as Transform

33import qualified Transform.Declaration as Transform

34

src/Transform/Canonicalize/Environment.hs → src/Canonicalize/Environment.hsrenamed+1−1

@@ -1,5 +1,5 @@

1{-# OPTIONS_GHC -Wall #-}

2−module Transform.Canonicalize.Environment where

2+module Canonicalize.Environment where

3

4import qualified Data.List as List

5import qualified Data.Map as Map

src/Transform/Canonicalize/Port.hs → src/Canonicalize/Port.hsrenamed+2−2

@@ -1,4 +1,4 @@

1−module Transform.Canonicalize.Port (check) where

1+module Canonicalize.Port (check) where

2

3import Control.Applicative ((<$>))

4import qualified Data.Foldable as Foldable

@@ -10,7 +10,7 @@ import qualified AST.Type as T

10import qualified AST.Variable as Var

11import qualified Reporting.Annotation as A

12import qualified Reporting.Error.Canonicalize as Error

13−import qualified Transform.Canonicalize.Result as Result

13+import qualified Canonicalize.Result as Result

14

15

16-- CHECK FOR PORT

src/Transform/Canonicalize/Result.hs → src/Canonicalize/Result.hsrenamed+1−1

@@ -1,5 +1,5 @@

1{-# OPTIONS_GHC -Wall #-}

2−module Transform.Canonicalize.Result where

2+module Canonicalize.Result where

3

4import Prelude hiding (foldl)

5import qualified Control.Applicative as A

src/Transform/Canonicalize/Setup.hs → src/Canonicalize/Setup.hsrenamed+4−4

@@ -1,5 +1,5 @@

1{-# OPTIONS_GHC -Wall #-}

2−module Transform.Canonicalize.Setup (environment) where

2+module Canonicalize.Setup (environment) where

3

4import Control.Applicative ((<$>))

5import Control.Arrow (second)

@@ -18,9 +18,9 @@ import Elm.Utils ((|>))

18import qualified Reporting.Annotation as A

19import qualified Reporting.Error.Canonicalize as Error

20import qualified Reporting.Region as R

21−import qualified Transform.Canonicalize.Environment as Env

21+import qualified Canonicalize.Environment as Env

22−import qualified Transform.Canonicalize.Result as Result

22+import qualified Canonicalize.Result as Result

23−import qualified Transform.Canonicalize.Type as Canonicalize

23+import qualified Canonicalize.Type as Canonicalize

24import qualified Transform.Interface as Interface

25

26

src/Transform/Canonicalize/Type.hs → src/Canonicalize/Type.hsrenamed+4−4

@@ -1,5 +1,5 @@

1{-# OPTIONS_GHC -Wall #-}

2−module Transform.Canonicalize.Type (tipe) where

2+module Canonicalize.Type (tipe) where

3

4import Control.Applicative ((<$>),(<*>))

5import qualified Data.Traversable as Trav

@@ -10,9 +10,9 @@ import qualified AST.Variable as Var

10import qualified Reporting.Annotation as A

11import qualified Reporting.Error.Canonicalize as Error

12import qualified Reporting.Region as R

13−import qualified Transform.Canonicalize.Environment as Env

13+import qualified Canonicalize.Environment as Env

14−import qualified Transform.Canonicalize.Result as Result

14+import qualified Canonicalize.Result as Result

15−import qualified Transform.Canonicalize.Variable as Canonicalize

15+import qualified Canonicalize.Variable as Canonicalize

16

17

18tipe

src/Transform/Canonicalize/Variable.hs → src/Canonicalize/Variable.hsrenamed+3−3

@@ -1,5 +1,5 @@

1{-# OPTIONS_GHC -Wall #-}

2−module Transform.Canonicalize.Variable where

2+module Canonicalize.Variable where

3

4import qualified Data.Either as Either

5import qualified Data.Map as Map

@@ -12,8 +12,8 @@ import qualified AST.Variable as Var

12import qualified Reporting.Annotation as A

13import qualified Reporting.Error.Canonicalize as Error

14import qualified Reporting.Region as R

15−import qualified Transform.Canonicalize.Environment as Env

15+import qualified Canonicalize.Environment as Env

16−import qualified Transform.Canonicalize.Result as Result

16+import qualified Canonicalize.Result as Result

17import Elm.Utils ((|>))

18

19

src/Compile.hs+2−2

@@ -10,7 +10,7 @@ import qualified Reporting.Error as Error

10import qualified Reporting.Result as Result

11import qualified Reporting.Warning as Warning

12import qualified Type.Inference as TI

13−import qualified Transform.Canonicalize as Canonical

13+import qualified Canonicalize

14

15

16compile

@@ -34,7 +34,7 @@ compile user projectName interfaces source =

34

35 -- Canonicalize all variables, pinning down where they came from.

36 canonicalModule <-

37− Canonical.module' interfaces validModule

37+ Canonicalize.module' interfaces validModule

38

39 -- Run type inference on the program.

40 types <-