ff7f9cc · elk · git.iko.soy

git.iko.soy/elk

Rename the module `Types` to `Types.Types`. This allows the .cabal file to list fewer source directories. Perhaps this will allow the use of GHCi

commitff7f9cc1f5566967fa3ed7fcd25e3733549c84e3 authorevancz <info@elm-lang.org> dateThu 22 Nov 2012, 20:30 (14 years ago) parent4088c64

11 files changed+17−15

compare with master

unifiedsplit

elm/Elm.cabal+4−4 elm/src/Ast.hs+1−1 elm/src/Initialize.hs+1−1 elm/src/Parse/Expr.hs+1−1 elm/src/Parse/Foreign.hs+1−1 elm/src/Parse/Types.hs+1−1 elm/src/Types/Constrain.hs+4−2 elm/src/Types/Hints.hs+1−1 elm/src/Types/Substitutions.hs+1−1 elm/src/Types/Types.hs+1−1 elm/src/Types/Unify.hs+1−1

elm/Elm.cabal+4−4

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

3232Library

3333 exposed-modules: Language.Elm,

3434 Language.Elm.Quasi

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

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

3636 other-modules: Ast,

3737 CompileToJS,

3838 Cases,

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

5151 Parse.Parser,

5252 Parse.Patterns,

5353 Parse.Types,

54− Types,

54+ Types.Types,

5555 Types.Constrain,

5656 Types.Hints,

5757 Types.Substitutions,

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

7575

7676Executable elm

7777 Main-is: Compiler.hs

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

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

7979 other-modules: Ast,

8080 CompileToJS,

8181 Cases,

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

9494 Parse.Parser,

9595 Parse.Patterns,

9696 Parse.Types,

97− Types,

97+ Types.Types,

9898 Types.Constrain,

9999 Types.Hints,

100100 Types.Substitutions,

elm/src/Ast.hs+1−1

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

44import Data.Char (isDigit)

55import Data.List (intercalate)

6−import Types

6+import Types.Types

77import Guid

88import qualified Text.Pandoc as Pandoc

elm/src/Initialize.hs+1−1

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

77import Ast

88import Parse.Parser (parseProgram)

99import Rename

10−import Types ((-:))

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

1111import Types.Hints (hints)

1212import Types.Unify

1313import Optimize

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

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

1313import Parse.Binops

1414

1515import Guid

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

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

1717

1818import System.IO.Unsafe

1919

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

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

99import Parse.Library

1010import Parse.Expr (term)

1111import Parse.Types

12−import Types (signalOf)

12+import Types.Types (signalOf)

1313

1414

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

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

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

99import Text.Parsec

1010

1111import Parse.Library

12−import Types hiding (string,parens)

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

1313import Guid

1414

1515data ParseType = VarPT String

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

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

22module Types.Constrain (constrain) where

4−import Ast

5−import Types

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

75import qualified Data.Set as Set

86import qualified Data.Map as Map

97import Control.Arrow (second)

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

119import Control.Monad.State (evalState)

10+

11+import Ast

1212import Guid

13+

14+import Types.Types

1315import Types.Substitutions

1416

1517--import System.IO.Unsafe

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

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

44import Control.Monad (liftM,mapM)

55import Control.Arrow (first)

6−import Types

6+import Types.Types

77import Types.Substitutions (rescheme)

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

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

1414import Data.List (foldl')

1515import qualified Data.Set as Set

1616import Guid

17−import Types

17+import Types.Types

1818

1919force x = x `deepseq` x

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

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

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

2−module Types where

2+module Types.Types where

44import Data.Char (isDigit)

55import Data.List (intercalate,isPrefixOf)

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

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

77import qualified Data.Set as Set

88import qualified Data.Map as Map

99import Guid

10−import Types

10+import Types.Types

1111import Types.Constrain

1212import Types.Substitutions

1313