1347951 · elk · git.iko.soy

git.iko.soy/elk

Move Canonicalization code into its own subtree

commit13479516f1ea62a4fbc0f2681ab0020d87e2ebe1 authorEvan Czaplicki <info@elm-lang.org> dateMon 4 May 2015, 09:19 (11 years ago) parentb4657b9

9 files changed+30−30

compare with master

unifiedsplit

elm-compiler.cabal+6−6 src/Transform/Canonicalize.hs → src/Canonicalize.hs+7−7 src/Transform/Canonicalize/Environment.hs → src/Canonicalize/Environment.hs+1−1 src/Transform/Canonicalize/Port.hs → src/Canonicalize/Port.hs+2−2 src/Transform/Canonicalize/Result.hs → src/Canonicalize/Result.hs+1−1 src/Transform/Canonicalize/Setup.hs → src/Canonicalize/Setup.hs+4−4 src/Transform/Canonicalize/Type.hs → src/Canonicalize/Type.hs+4−4 src/Transform/Canonicalize/Variable.hs → src/Canonicalize/Variable.hs+3−3 src/Compile.hs+2−2

elm-compiler.cabal+6−6

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

5757 AST.Pattern,

5858 AST.Type,

5959 AST.Variable,

60+ Canonicalize,

61+ Canonicalize.Environment,

62+ Canonicalize.Port,

63+ Canonicalize.Setup,

64+ Canonicalize.Type,

65+ Canonicalize.Variable,

6066 Compile,

6167 Elm.Compiler.Type.Extract,

6268 Elm.Compiler.Version,

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

6672 Generate.JavaScript.Variable,

6773 Generate.Cases,

6874 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,

7575 Transform.Interface,

7676 Transform.SortDefinitions,

7777 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

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

44import qualified Data.List as List

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

2323import qualified Reporting.Error.Canonicalize as CError

2424import qualified Reporting.Result as R

2525import qualified Reporting.Warning as Warning

26−import qualified Transform.Canonicalize.Environment as Env

27−import qualified Transform.Canonicalize.Port as Port

28−import qualified Transform.Canonicalize.Result as Result

29−import qualified Transform.Canonicalize.Setup as Setup

30−import qualified Transform.Canonicalize.Type as Canonicalize

31−import qualified Transform.Canonicalize.Variable as Canonicalize

26+import qualified Canonicalize.Environment as Env

27+import qualified Canonicalize.Port as Port

28+import qualified Canonicalize.Result as Result

29+import qualified Canonicalize.Setup as Setup

30+import qualified Canonicalize.Type as Canonicalize

31+import qualified Canonicalize.Variable as Canonicalize

3232import qualified Transform.SortDefinitions as Transform

3333import qualified Transform.Declaration as Transform

3434

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

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

11{-# OPTIONS_GHC -Wall #-}

2−module Transform.Canonicalize.Environment where

2+module Canonicalize.Environment where

44import qualified Data.List as List

55import 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

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

44import qualified Data.Foldable as Foldable

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

1010import qualified AST.Variable as Var

1111import qualified Reporting.Annotation as A

1212import qualified Reporting.Error.Canonicalize as Error

13−import qualified Transform.Canonicalize.Result as Result

13+import qualified Canonicalize.Result as Result

1414

1515

1616-- CHECK FOR PORT

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

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

11{-# OPTIONS_GHC -Wall #-}

2−module Transform.Canonicalize.Result where

2+module Canonicalize.Result where

44import Prelude hiding (foldl)

55import qualified Control.Applicative as A

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

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

11{-# OPTIONS_GHC -Wall #-}

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

2+module Canonicalize.Setup (environment) where

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

55import Control.Arrow (second)

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

1818import qualified Reporting.Annotation as A

1919import qualified Reporting.Error.Canonicalize as Error

2020import qualified Reporting.Region as R

21−import qualified Transform.Canonicalize.Environment as Env

22−import qualified Transform.Canonicalize.Result as Result

23−import qualified Transform.Canonicalize.Type as Canonicalize

21+import qualified Canonicalize.Environment as Env

22+import qualified Canonicalize.Result as Result

23+import qualified Canonicalize.Type as Canonicalize

2424import qualified Transform.Interface as Interface

2525

2626

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

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

11{-# OPTIONS_GHC -Wall #-}

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

2+module Canonicalize.Type (tipe) where

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

55import qualified Data.Traversable as Trav

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

1010import qualified Reporting.Annotation as A

1111import qualified Reporting.Error.Canonicalize as Error

1212import qualified Reporting.Region as R

13−import qualified Transform.Canonicalize.Environment as Env

14−import qualified Transform.Canonicalize.Result as Result

15−import qualified Transform.Canonicalize.Variable as Canonicalize

13+import qualified Canonicalize.Environment as Env

14+import qualified Canonicalize.Result as Result

15+import qualified Canonicalize.Variable as Canonicalize

1616

1717

1818tipe

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

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

11{-# OPTIONS_GHC -Wall #-}

2−module Transform.Canonicalize.Variable where

2+module Canonicalize.Variable where

44import qualified Data.Either as Either

55import qualified Data.Map as Map

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

1212import qualified Reporting.Annotation as A

1313import qualified Reporting.Error.Canonicalize as Error

1414import qualified Reporting.Region as R

15−import qualified Transform.Canonicalize.Environment as Env

16−import qualified Transform.Canonicalize.Result as Result

15+import qualified Canonicalize.Environment as Env

16+import qualified Canonicalize.Result as Result

1717import Elm.Utils ((|>))

1818

1919

src/Compile.hs+2−2

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

1010import qualified Reporting.Result as Result

1111import qualified Reporting.Warning as Warning

1212import qualified Type.Inference as TI

13−import qualified Transform.Canonicalize as Canonical

13+import qualified Canonicalize

1414

1515

1616compile

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

3434

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

3636 canonicalModule <-

37− Canonical.module' interfaces validModule

37+ Canonicalize.module' interfaces validModule

3838

3939 -- Run type inference on the program.

4040 types <-