git.iko.soy/elk
on master help sign in
Fix names within modules to match renaming of files.
c25d979evancz
elm/src/Parse/Binops.hs+2−2
compare with master
unifiedsplit
@@ -1,4 +1,4 @@
1−module Binops (binops) where
1+module Parse.Binops (binops) where
2
2
3import Ast
3import Ast
4import Control.Monad (liftM,guard)
4import Control.Monad (liftM,guard)
@@ -8,7 +8,7 @@ import qualified Data.Map as Map
8import Data.Maybe (mapMaybe)
8import Data.Maybe (mapMaybe)
9
9
10import Text.Parsec
10import Text.Parsec
11−import ParseLib
11+import Parse.Library
12
12
13data Assoc = L | N | R deriving (Eq,Show)
13data Assoc = L | N | R deriving (Eq,Show)
14
14
elm/src/Parse/Expr.hs+4−4
@@ -1,4 +1,4 @@
1−module ParseExpr (def,term) where
1+module Parse.Expr (def,term) where
2
2
3import Ast
3import Ast
4import Control.Applicative ((<$>), (<*>))
4import Control.Applicative ((<$>), (<*>))
@@ -8,9 +8,9 @@ import Data.List (foldl')
8import Text.Parsec hiding (newline,spaces)
8import Text.Parsec hiding (newline,spaces)
9import qualified Text.Pandoc as Pan
9import qualified Text.Pandoc as Pan
10
10
11−import ParseLib
11+import Parse.Library
12−import Patterns
12+import Parse.Patterns
13−import Binops
13+import Parse.Binops
14
14
15import Guid
15import Guid
16import Types (Type (VarT), Scheme (Forall))
16import Types (Type (VarT), Scheme (Forall))
elm/src/Parse/Foreign.hs+4−4
@@ -1,14 +1,14 @@
1
1
2−module ParseForeign (foreignDef) where
2+module Parse.Foreign (foreignDef) where
3
3
4import Control.Applicative ((<$>), (<*>))
4import Control.Applicative ((<$>), (<*>))
5import Data.Either (partitionEithers)
5import Data.Either (partitionEithers)
6import Text.Parsec hiding (newline,spaces)
6import Text.Parsec hiding (newline,spaces)
7
7
8import Ast
8import Ast
9−import ParseLib
9+import Parse.Library
10−import ParseExpr (term)
10+import Parse.Expr (term)
11−import ParseTypes
11+import Parse.PTypes
12import Types (signalOf)
12import Types (signalOf)
13
13
14
14
elm/src/Parse/Library.hs+1−1
@@ -1,5 +1,5 @@
1
1
2−module ParseLib where
2+module Parse.Library where
3
3
4import Ast
4import Ast
5import Control.Applicative ((<$>),(<*>))
5import Control.Applicative ((<$>),(<*>))
elm/src/Parse/Modules.hs+2−2
@@ -1,12 +1,12 @@
1
1
2−module ParseModules (moduleDef, imports) where
2+module Parse.Modules (moduleDef, imports) where
3
3
4import Control.Applicative ((<$>), (<*>))
4import Control.Applicative ((<$>), (<*>))
5import Data.List (intercalate)
5import Data.List (intercalate)
6import Text.Parsec hiding (newline,spaces)
6import Text.Parsec hiding (newline,spaces)
7
7
8import Ast
8import Ast
9−import ParseLib
9+import Parse.Library
10
10
11moduleDef :: (Monad m) => ParsecT [Char] u m ([String], [String])
11moduleDef :: (Monad m) => ParsecT [Char] u m ([String], [String])
12moduleDef = do
12moduleDef = do
elm/src/Parse/PTypes.hs+2−2
@@ -1,4 +1,4 @@
1−module ParseTypes where
1+module Parse.PTypes where
2
2
3import Ast
3import Ast
4import Control.Applicative ((<$>),(<*>))
4import Control.Applicative ((<$>),(<*>))
@@ -8,7 +8,7 @@ import Data.Maybe (fromMaybe)
8import Data.List (lookup)
8import Data.List (lookup)
9import Text.Parsec
9import Text.Parsec
10
10
11−import ParseLib
11+import Parse.Library
12import Types hiding (string,parens)
12import Types hiding (string,parens)
13import Guid
13import Guid
14
14
elm/src/Parse/Parser.hs+6−6
@@ -1,4 +1,4 @@
1−module Parser (parseProgram) where
1+module Parse.Parser (parseProgram) where
2
2
3import Ast
3import Ast
4import Control.Applicative ((<$>), (<*>))
4import Control.Applicative ((<$>), (<*>))
@@ -7,11 +7,11 @@ import Data.Char (isSymbol, isDigit)
7import Data.List (foldl')
7import Data.List (foldl')
8import Text.Parsec hiding (newline,spaces)
8import Text.Parsec hiding (newline,spaces)
9
9
10−import ParseLib
10+import Parse.Library
11−import ParseExpr
11+import Parse.Expr
12−import ParseTypes
12+import Parse.PTypes
13−import ParseModules
13+import Parse.Modules
14−import ParseForeign
14+import Parse.Foreign
15
15
16
16
17statement = (:[]) <$> foreignDef
17statement = (:[]) <$> foreignDef
elm/src/Parse/Patterns.hs+2−2
@@ -1,11 +1,11 @@
1−module Patterns (patternTerm, patternExpr, makeLambda, flattenPatterns) where
1+module Parse.Patterns (patternTerm, patternExpr, makeLambda, flattenPatterns) where
2
2
3import Ast
3import Ast
4import Data.Char (isUpper)
4import Data.Char (isUpper)
5import Control.Applicative ((<$>),(<*>))
5import Control.Applicative ((<$>),(<*>))
6import Control.Monad
6import Control.Monad
7import Text.Parsec
7import Text.Parsec
8−import ParseLib
8+import Parse.Library
9
9
10patternBasic :: Monad m => ParsecT [Char] u m Pattern
10patternBasic :: Monad m => ParsecT [Char] u m Pattern
11patternBasic =
11patternBasic =