ff7f9cc · elk · git.iko.soy

elm/Elm.cabal+4−4

compare with master

unifiedsplit

@@ -32,7 +32,7 @@ source-repository head

32Library

33 exposed-modules: Language.Elm,

34 Language.Elm.Quasi

35− Hs-Source-Dirs: src, src/Types, src/Gen

35+ Hs-Source-Dirs: src, src/Gen

36 other-modules: Ast,

37 CompileToJS,

38 Cases,

@@ -51,7 +51,7 @@ Library

51 Parse.Parser,

52 Parse.Patterns,

53 Parse.Types,

54− Types,

54+ Types.Types,

55 Types.Constrain,

56 Types.Hints,

57 Types.Substitutions,

@@ -75,7 +75,7 @@ Library

75

76Executable elm

77 Main-is: Compiler.hs

78− Hs-Source-Dirs: src, src/Types, src/Gen

78+ Hs-Source-Dirs: src, src/Gen

79 other-modules: Ast,

80 CompileToJS,

81 Cases,

@@ -94,7 +94,7 @@ Executable elm

94 Parse.Parser,

95 Parse.Patterns,

96 Parse.Types,

97− Types,

97+ Types.Types,

98 Types.Constrain,

99 Types.Hints,

100 Types.Substitutions,

elm/src/Ast.hs+1−1

@@ -3,7 +3,7 @@ module Ast where

3

4import Data.Char (isDigit)

5import Data.List (intercalate)

6−import Types

6+import Types.Types

7import Guid

8import qualified Text.Pandoc as Pandoc

9

elm/src/Initialize.hs+1−1

@@ -7,7 +7,7 @@ import Data.List (lookup)

7import Ast

8import Parse.Parser (parseProgram)

9import Rename

10−import Types ((-:))

10+import Types.Types ((-:))

11import Types.Hints (hints)

12import Types.Unify

13import Optimize

elm/src/Parse/Expr.hs+1−1

@@ -13,7 +13,7 @@ import Parse.Patterns

13import Parse.Binops

14

15import Guid

16−import Types (Type (VarT), Scheme (Forall))

16+import Types.Types (Type (VarT), Scheme (Forall))

17

18import System.IO.Unsafe

19

elm/src/Parse/Foreign.hs+1−1

@@ -9,7 +9,7 @@ import Ast

9import Parse.Library

10import Parse.Expr (term)

11import Parse.Types

12−import Types (signalOf)

12+import Types.Types (signalOf)

13

14

15foreignDef = do try (reserved "foreign") ; whitespace

elm/src/Parse/Types.hs+1−1

@@ -9,7 +9,7 @@ import Data.List (lookup)

9import Text.Parsec

10

11import Parse.Library

12−import Types hiding (string,parens)

12+import Types.Types hiding (string,parens)

13import Guid

14

15data ParseType = VarPT String

elm/src/Types/Constrain.hs+4−2

@@ -1,15 +1,17 @@

1

2module Types.Constrain (constrain) where

3

4−import Ast

5−import Types

6import Data.List (foldl',sort,group,isPrefixOf,intercalate,isSuffixOf)

4import Data.List (foldl',sort,group,isPrefixOf,intercalate,isSuffixOf)

7import qualified Data.Set as Set

5import qualified Data.Set as Set

8import qualified Data.Map as Map

6import qualified Data.Map as Map

9import Control.Arrow (second)

7import Control.Arrow (second)

10import Control.Monad (liftM,mapM,zipWithM,foldM)

8import Control.Monad (liftM,mapM,zipWithM,foldM)

11import Control.Monad.State (evalState)

9import Control.Monad.State (evalState)

10+

11+import Ast

12import Guid

13+

14+import Types.Types

13import Types.Substitutions

15import Types.Substitutions

14

16

15--import System.IO.Unsafe

17--import System.IO.Unsafe

elm/src/Types/Hints.hs+1−1

@@ -3,7 +3,7 @@ module Types.Hints (hints) where

3

4import Control.Monad (liftM,mapM)

5import Control.Arrow (first)

6−import Types

6+import Types.Types

7import Types.Substitutions (rescheme)

8

9

elm/src/Types/Substitutions.hs+1−1

@@ -14,7 +14,7 @@ import Control.Monad (liftM)

14import Data.List (foldl')

15import qualified Data.Set as Set

16import Guid

17−import Types

17+import Types.Types

18

19force x = x `deepseq` x

20a ++++ b = foldl' (\tl hd -> hd : tl) b a

elm/src/Types/Types.hs+1−1

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

1

2−module Types where

2+module Types.Types where

3

4import Data.Char (isDigit)

5import Data.List (intercalate,isPrefixOf)

elm/src/Types/Unify.hs+1−1

@@ -7,7 +7,7 @@ import Data.List (foldl')

7import qualified Data.Set as Set

8import qualified Data.Map as Map

9import Guid

10−import Types

10+import Types.Types

11import Types.Constrain

12import Types.Substitutions

13