git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Sanitize some modules
commit6747fb0b193bbf3f71f5ac980bcfa4e294598bf9 authorPhil Freeman <paf31@cantab.net> dateFri 1 Nov 2013, 12:10 (13 years ago) parentf98236e
32 files changed+223−215
compare with golang
unifiedsplit
purescript.cabal+34−18 src/Language/PureScript.hs+26 src/PureScript/CodeGen.hs → src/Language/PureScript/CodeGen.hs+4−7 src/PureScript/CodeGen/Externs.hs → src/Language/PureScript/CodeGen/Externs.hs+5−6 src/PureScript/CodeGen/JS.hs → src/Language/PureScript/CodeGen/JS.hs+8−8 src/PureScript/CodeGen/Common/Gen.hs → src/Language/PureScript/CodeGen/Monad.hs+2−2 src/PureScript/Declarations.hs → src/Language/PureScript/Declarations.hs+6−6 src/PureScript/Kinds.hs → src/Language/PureScript/Kinds.hs+2−2 src/PureScript/Names.hs → src/Language/PureScript/Names.hs+2−2 src/Language/PureScript/Parser.hs+22 src/PureScript/Parser/Common.hs → src/Language/PureScript/Parser/Common.hs+4−4 src/PureScript/Parser/Declarations.hs → src/Language/PureScript/Parser/Declarations.hs+10−10 src/PureScript/Parser/Kinds.hs → src/Language/PureScript/Parser/Kinds.hs+5−5 src/PureScript/Parser/State.hs → src/Language/PureScript/Parser/State.hs+4−4 src/PureScript/Parser/Types.hs → src/Language/PureScript/Parser/Types.hs+5−5 src/PureScript/Parser/Values.hs → src/Language/PureScript/Parser/Values.hs+9−9 src/PureScript/Pretty.hs → src/Language/PureScript/Pretty.hs+5−5 src/PureScript/CodeGen/Common.hs → src/Language/PureScript/Pretty/Common.hs+6−6 src/PureScript/CodeGen/Pretty/Kinds.hs → src/Language/PureScript/Pretty/Kinds.hs+4−4 src/PureScript/CodeGen/Pretty/Types.hs → src/Language/PureScript/Pretty/Types.hs+8−8 src/PureScript/CodeGen/Pretty/Values.hs → src/Language/PureScript/Pretty/Values.hs+6−6 src/PureScript/TypeChecker.hs → src/Language/PureScript/TypeChecker.hs+12−12 src/PureScript/TypeChecker/Kinds.hs → src/Language/PureScript/TypeChecker/Kinds.hs+7−8 src/PureScript/TypeChecker/Monad.hs → src/Language/PureScript/TypeChecker/Monad.hs+5−5 src/PureScript/TypeChecker/Synonyms.hs → src/Language/PureScript/TypeChecker/Synonyms.hs+4−4 src/PureScript/TypeChecker/Types.hs → src/Language/PureScript/TypeChecker/Types.hs+10−12 src/PureScript/Types.hs → src/Language/PureScript/Types.hs+2−2 src/PureScript/Values.hs → src/Language/PureScript/Values.hs+4−4 src/Main.hs+1−1 src/PureScript.hs−26 src/PureScript/Parser.hs−22 tests/Main.hs+1−2
purescript.cabal+34−18
@@ -11,28 +11,45 @@ synopsis: PureScript Programming Language Compiler
1111description: A small compile-to-JS language with extensible records and type-safe blocks
1212author: Phil Freeman <paf31@cantab.net>
1313data-dir: ""
14−
14+category: Language
15+
1516library
1617 build-depends: base >=4 && <5, syb -any, cmdtheline -any,
1718 containers -any, mtl -any, transformers -any, parsec -any,
1819 utf8-string -any
19− exposed-modules: PureScript.CodeGen.Pretty.Values
20− PureScript.CodeGen.Pretty.Types PureScript PureScript.Declarations
21− PureScript.Names PureScript.TypeChecker.Synonyms
22− PureScript.CodeGen.Externs PureScript.CodeGen.JS
23− PureScript.CodeGen.Common.Gen PureScript.CodeGen.Common Main
24− PureScript.CodeGen PureScript.Kinds PureScript.Parser
25− PureScript.TypeChecker PureScript.Types PureScript.Values
26− PureScript.Parser.Common PureScript.Parser.Declarations
27− PureScript.Parser.Types PureScript.Parser.Values
28− PureScript.TypeChecker.Kinds PureScript.TypeChecker.Monad
29− PureScript.TypeChecker.Types PureScript.Parser.State
30− PureScript.Parser.Kinds PureScript.CodeGen.Pretty.Kinds
20+ exposed-modules: Main
21+ Language.PureScript
22+ Language.PureScript.Declarations
23+ Language.PureScript.Names
24+ Language.PureScript.Types
25+ Language.PureScript.Values
26+ Language.PureScript.Kinds
27+ Language.PureScript.Pretty
28+ Language.PureScript.Pretty.Common
29+ Language.PureScript.Pretty.Values
30+ Language.PureScript.Pretty.Types
31+ Language.PureScript.Pretty.Kinds
32+ Language.PureScript.CodeGen
33+ Language.PureScript.CodeGen.Externs
34+ Language.PureScript.CodeGen.JS
35+ Language.PureScript.CodeGen.Monad
36+ Language.PureScript.Parser
37+ Language.PureScript.Parser.Common
38+ Language.PureScript.Parser.Declarations
39+ Language.PureScript.Parser.Types
40+ Language.PureScript.Parser.Values
41+ Language.PureScript.Parser.State
42+ Language.PureScript.Parser.Kinds
43+ Language.PureScript.TypeChecker
44+ Language.PureScript.TypeChecker.Kinds
45+ Language.PureScript.TypeChecker.Monad
46+ Language.PureScript.TypeChecker.Types
47+ Language.PureScript.TypeChecker.Synonyms
3148 exposed: True
3249 buildable: True
3350 hs-source-dirs: src
34− other-modules: PureScript.Pretty
35−
51+ other-modules:
52+
3653executable psc
3754 build-depends: base >=4 && <5, cmdtheline -any, containers -any,
3855 mtl -any, transformers -any, parsec -any, utf8-string -any,
@@ -40,8 +57,7 @@ executable psc
4057 main-is: Main.hs
4158 buildable: True
4259 hs-source-dirs: src
43− other-modules: PureScript.Pretty
44−
60+
4561test-suite tests
4662 build-depends: base >=4 && <5, syb -any, directory -any,
4763 filepath -any, containers -any, mtl -any, transformers -any,
@@ -49,4 +65,4 @@ test-suite tests
4965 type: exitcode-stdio-1.0
5066 main-is: Main.hs
5167 buildable: True
52− hs-source-dirs: tests
68+ hs-source-dirs: tests
src/Language/PureScript.hsnew file+26
@@ -0,0 +1,26 @@
1+-----------------------------------------------------------------------------
2+--
3+-- Module : Language.PureScript
4+-- Copyright : (c) Phil Freeman 2013
5+-- License : MIT
6+--
7+-- Maintainer : Phil Freeman <paf31@cantab.net>
8+-- Stability : experimental
9+-- Portability :
10+--
11+-- |
12+--
13+-----------------------------------------------------------------------------
14+
15+module Language.PureScript (module P) where
16+
17+import Language.PureScript.Values as P
18+import Language.PureScript.Types as P
19+import Language.PureScript.Kinds as P
20+import Language.PureScript.Declarations as P
21+import Language.PureScript.Names as P
22+import Language.PureScript.Parser as P
23+import Language.PureScript.CodeGen as P
24+import Language.PureScript.TypeChecker as P
25+import Language.PureScript.Pretty as P
26+
src/PureScript/CodeGen.hs → src/Language/PureScript/CodeGen.hsrenamed+4−7
@@ -1,6 +1,6 @@
11-----------------------------------------------------------------------------
22--
3−-- Module : PureScript.CodeGen
3+-- Module : Language.PureScript.CodeGen
44-- Copyright : (c) Phil Freeman 2013
55-- License : MIT
66--
@@ -12,10 +12,7 @@
1212--
1313-----------------------------------------------------------------------------
1414
15−module PureScript.CodeGen (
16− module PureScript.CodeGen.JS,
17− module PureScript.CodeGen.Externs
18−) where
15+module Language.PureScript.CodeGen (module C) where
1916
20−import PureScript.CodeGen.JS
21−import PureScript.CodeGen.Externs
17+import Language.PureScript.CodeGen.JS as C
18+import Language.PureScript.CodeGen.Externs as C
src/PureScript/CodeGen/Externs.hs → src/Language/PureScript/CodeGen/Externs.hsrenamed+5−6
@@ -1,6 +1,6 @@
11-----------------------------------------------------------------------------
22--
3−-- Module : PureScript.CodeGen.Externs
3+-- Module : Language.PureScript.CodeGen.Externs
44-- Copyright : (c) Phil Freeman 2013
55-- License : MIT
66--
@@ -12,16 +12,15 @@
1212--
1313-----------------------------------------------------------------------------
1414
15−module PureScript.CodeGen.Externs (
15+module Language.PureScript.CodeGen.Externs (
1616 externToPs
1717) where
1818
1919import Data.List (intercalate)
2020import qualified Data.Map as M
21−import PureScript.Declarations
22−import PureScript.TypeChecker.Monad
23−import PureScript.CodeGen.Pretty.Types
24−import PureScript.CodeGen.Pretty.Kinds
21+import Language.PureScript.Declarations
22+import Language.PureScript.TypeChecker.Monad
23+import Language.PureScript.Pretty
2524
2625externToPs :: Environment -> Declaration -> Maybe String
2726externToPs env (ValueDeclaration name _) = do
src/PureScript/CodeGen/JS.hs → src/Language/PureScript/CodeGen/JS.hsrenamed+8−8
@@ -1,6 +1,6 @@
11-----------------------------------------------------------------------------
22--
3−-- Module : PureScript.CodeGen.JS
3+-- Module : Language.PureScript.CodeGen.JS
44-- Copyright : (c) Phil Freeman 2013
55-- License : MIT
66--
@@ -12,7 +12,7 @@
1212--
1313-----------------------------------------------------------------------------
1414
15−module PureScript.CodeGen.JS (
15+module Language.PureScript.CodeGen.JS (
1616 declToJs
1717) where
1818
@@ -24,12 +24,12 @@ import Control.Arrow ((<+>))
2424import Control.Monad (forM)
2525import Control.Applicative
2626
27−import PureScript.Types
28−import PureScript.Values
29−import PureScript.Names
30−import PureScript.Declarations
31−import PureScript.CodeGen.Common
32−import PureScript.CodeGen.Common.Gen
27+import Language.PureScript.Types
28+import Language.PureScript.Values
29+import Language.PureScript.Names
30+import Language.PureScript.Declarations
31+import Language.PureScript.Pretty.Common
32+import Language.PureScript.CodeGen.Monad
3333
3434declToJs :: Declaration -> Maybe String
3535declToJs (ValueDeclaration ident (Abs args ret)) = Just $ "function " ++ identToJs ident ++ "(" ++ intercalate "," (map identToJs args) ++ ") { return " ++ valueToJs ret ++ "; }"
src/PureScript/CodeGen/Common/Gen.hs → src/Language/PureScript/CodeGen/Monad.hsrenamed+2−2
@@ -1,6 +1,6 @@
11-----------------------------------------------------------------------------
22--
3−-- Module : PureScript.CodeGen.Common.Gen
3+-- Module : Language.PureScript.CodeGen.Monad
44-- Copyright : (c) Phil Freeman 2013
55-- License : MIT
66--
@@ -14,7 +14,7 @@
1414
1515{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1616
17−module PureScript.CodeGen.Common.Gen where
17+module Language.PureScript.CodeGen.Monad where
1818
1919import Control.Monad.State
2020import Control.Applicative
src/PureScript/Declarations.hs → src/Language/PureScript/Declarations.hsrenamed+6−6
@@ -1,6 +1,6 @@
11-----------------------------------------------------------------------------
22--
3−-- Module : PureScript.Declarations
3+-- Module : Language.PureScript.Declarations
44-- Copyright : (c) Phil Freeman 2013
55-- License : MIT
66--
@@ -14,12 +14,12 @@
1414
1515{-# LANGUAGE DeriveDataTypeable #-}
1616
17−module PureScript.Declarations where
17+module Language.PureScript.Declarations where
1818
19−import PureScript.Values
20−import PureScript.Types
21−import PureScript.Names
22−import PureScript.Kinds
19+import Language.PureScript.Values
20+import Language.PureScript.Types
21+import Language.PureScript.Names
22+import Language.PureScript.Kinds
2323
2424import qualified Data.Data as D
2525
src/PureScript/Kinds.hs → src/Language/PureScript/Kinds.hsrenamed+2−2
@@ -1,6 +1,6 @@
11-----------------------------------------------------------------------------
22--
3−-- Module : PureScript.Kinds
3+-- Module : Language.PureScript.Kinds
44-- Copyright : (c) Phil Freeman 2013
55-- License : MIT
66--
@@ -14,7 +14,7 @@
1414
1515{-# LANGUAGE DeriveDataTypeable #-}
1616
17−module PureScript.Kinds where
17+module Language.PureScript.Kinds where
1818
1919import Data.Data
2020
src/PureScript/Names.hs → src/Language/PureScript/Names.hsrenamed+2−2
@@ -1,6 +1,6 @@
11-----------------------------------------------------------------------------
22--
3−-- Module : PureScript.Names
3+-- Module : Language.PureScript.Names
44-- Copyright : (c) Phil Freeman 2013
55-- License : MIT
66--
@@ -14,7 +14,7 @@
1414
1515{-# LANGUAGE DeriveDataTypeable #-}
1616
17−module PureScript.Names where
17+module Language.PureScript.Names where
1818
1919import Data.Data
2020
src/Language/PureScript/Parser.hsnew file+22
@@ -0,0 +1,22 @@
1+-----------------------------------------------------------------------------
2+--
3+-- Module : Language.PureScript.Parser
4+-- Copyright : (c) Phil Freeman 2013
5+-- License : MIT
6+--
7+-- Maintainer : Phil Freeman <paf31@cantab.net>
8+-- Stability : experimental
9+-- Portability :
10+--
11+-- |
12+--
13+-----------------------------------------------------------------------------
14+
15+module Language.PureScript.Parser (module P) where
16+
17+import Language.PureScript.Parser.Common as P
18+import Language.PureScript.Parser.Types as P
19+import Language.PureScript.Parser.Values as P
20+import Language.PureScript.Parser.State as P
21+import Language.PureScript.Parser.Kinds as P
22+import Language.PureScript.Parser.Declarations as P
src/PureScript/Parser/Common.hs → src/Language/PureScript/Parser/Common.hsrenamed+4−4
@@ -1,6 +1,6 @@
11-----------------------------------------------------------------------------
22--
3−-- Module : PureScript.Parser.Common
3+-- Module : Language.PureScript.Parser.Common
44-- Copyright : (c) Phil Freeman 2013
55-- License : MIT
66--
@@ -14,19 +14,19 @@
1414
1515{-# LANGUAGE FlexibleContexts #-}
1616
17−module PureScript.Parser.Common where
17+module Language.PureScript.Parser.Common where
1818
1919import Data.Char (isSpace)
2020import Control.Applicative
2121import Control.Monad
2222import Control.Monad.State
23−import PureScript.Parser.State
23+import Language.PureScript.Parser.State
2424import qualified Data.Map as M
2525import qualified Text.Parsec as P
2626import qualified Text.Parsec.Pos as P
2727import qualified Text.Parsec.Token as PT
2828
29−import PureScript.Names
29+import Language.PureScript.Names
3030
3131reservedNames :: [String]
3232reservedNames = [ "case"
src/PureScript/Parser/Declarations.hs → src/Language/PureScript/Parser/Declarations.hsrenamed+10−10
@@ -1,6 +1,6 @@
11-----------------------------------------------------------------------------
22--
3−-- Module : PureScript.Parser.Declarations
3+-- Module : Language.PureScript.Parser.Declarations
44-- Copyright : (c) Phil Freeman 2013
55-- License : MIT
66--
@@ -12,7 +12,7 @@
1212--
1313-----------------------------------------------------------------------------
1414
15−module PureScript.Parser.Declarations (
15+module Language.PureScript.Parser.Declarations (
1616 parseDeclaration,
1717 parseDeclarations
1818) where
@@ -28,14 +28,14 @@ import qualified Data.Map as M
2828import qualified Text.Parsec as P
2929import qualified Text.Parsec.Pos as P
3030
31−import PureScript.Values
32−import PureScript.Types
33−import PureScript.Parser.State
34−import PureScript.Parser.Common
35−import PureScript.Declarations
36−import PureScript.Parser.Values
37−import PureScript.Parser.Types
38−import PureScript.Parser.Kinds
31+import Language.PureScript.Values
32+import Language.PureScript.Types
33+import Language.PureScript.Parser.State
34+import Language.PureScript.Parser.Common
35+import Language.PureScript.Declarations
36+import Language.PureScript.Parser.Values
37+import Language.PureScript.Parser.Types
38+import Language.PureScript.Parser.Kinds
3939
4040parseDataDeclaration :: P.Parsec String ParseState Declaration
4141parseDataDeclaration = do
src/PureScript/Parser/Kinds.hs → src/Language/PureScript/Parser/Kinds.hsrenamed+5−5
@@ -1,6 +1,6 @@
11-----------------------------------------------------------------------------
22--
3−-- Module : PureScript.Parser.Kinds
3+-- Module : Language.PureScript.Parser.Kinds
44-- Copyright : (c) Phil Freeman 2013
55-- License : MIT
66--
@@ -12,13 +12,13 @@
1212--
1313-----------------------------------------------------------------------------
1414
15−module PureScript.Parser.Kinds (
15+module Language.PureScript.Parser.Kinds (
1616 parseKind
1717) where
1818
19−import PureScript.Kinds
20−import PureScript.Parser.State
21−import PureScript.Parser.Common
19+import Language.PureScript.Kinds
20+import Language.PureScript.Parser.State
21+import Language.PureScript.Parser.Common
2222import Control.Applicative
2323import qualified Text.Parsec as P
2424import qualified Text.Parsec.Expr as P
src/PureScript/Parser/State.hs → src/Language/PureScript/Parser/State.hsrenamed+4−4
@@ -1,6 +1,6 @@
11-----------------------------------------------------------------------------
22--
3−-- Module : PureScript.Parser.State
3+-- Module : Language.PureScript.Parser.State
44-- Copyright : (c) Phil Freeman 2013
55-- License : MIT
66--
@@ -12,10 +12,10 @@
1212--
1313-----------------------------------------------------------------------------
1414
15−module PureScript.Parser.State where
15+module Language.PureScript.Parser.State where
1616
17−import PureScript.Names
18−import PureScript.Declarations
17+import Language.PureScript.Names
18+import Language.PureScript.Declarations
1919
2020import qualified Text.Parsec as P
2121import qualified Data.Map as M
src/PureScript/Parser/Types.hs → src/Language/PureScript/Parser/Types.hsrenamed+5−5
@@ -1,6 +1,6 @@
11-----------------------------------------------------------------------------
22--
3−-- Module : PureScript.Parser.Types
3+-- Module : Language.PureScript.Parser.Types
44-- Copyright : (c) Phil Freeman 2013
55-- License : MIT
66--
@@ -12,15 +12,15 @@
1212--
1313-----------------------------------------------------------------------------
1414
15−module PureScript.Parser.Types (
15+module Language.PureScript.Parser.Types (
1616 parseType,
1717 parsePolyType,
1818 parseRow
1919) where
2020
21−import PureScript.Types
22−import PureScript.Parser.State
23−import PureScript.Parser.Common
21+import Language.PureScript.Types
22+import Language.PureScript.Parser.State
23+import Language.PureScript.Parser.Common
2424import Control.Applicative
2525import qualified Text.Parsec as P
2626import qualified Text.Parsec.Expr as P
src/PureScript/Parser/Values.hs → src/Language/PureScript/Parser/Values.hsrenamed+9−9
@@ -1,6 +1,6 @@
11-----------------------------------------------------------------------------
22--
3−-- Module : PureScript.Parser.Values
3+-- Module : Language.PureScript.Parser.Values
44-- Copyright : (c) Phil Freeman 2013
55-- License : MIT
66--
@@ -12,27 +12,27 @@
1212--
1313-----------------------------------------------------------------------------
1414
15−module PureScript.Parser.Values (
15+module Language.PureScript.Parser.Values (
1616 parseValue,
1717 parseBinder
1818) where
1919
20−import PureScript.Values
21−import PureScript.Names
22−import PureScript.Declarations
23−import PureScript.Parser.State
20+import Language.PureScript.Values
21+import Language.PureScript.Names
22+import Language.PureScript.Declarations
23+import Language.PureScript.Parser.State
2424import Data.Function (on)
2525import Data.List
2626import Data.Functor.Identity
2727import qualified Data.Map as M
28−import qualified PureScript.Parser.Common as C
28+import qualified Language.PureScript.Parser.Common as C
2929import Control.Applicative
3030import qualified Text.Parsec as P
3131import Text.Parsec.Expr
3232import Control.Monad
3333import Control.Arrow (Arrow(..))
34−import PureScript.Parser.Types
35−import PureScript.Types
34+import Language.PureScript.Parser.Types
35+import Language.PureScript.Types
3636
3737booleanLiteral :: P.Parsec String ParseState Bool
3838booleanLiteral = (C.reserved "true" >> return True) P.<|> (C.reserved "false" >> return False)
src/PureScript/Pretty.hs → src/Language/PureScript/Pretty.hsrenamed+5−5
@@ -1,6 +1,6 @@
11-----------------------------------------------------------------------------
22--
3−-- Module : PureScript.Pretty
3+-- Module : Language.PureScript.Pretty
44-- Copyright : (c) Phil Freeman 2013
55-- License : MIT
66--
@@ -12,11 +12,11 @@
1212--
1313-----------------------------------------------------------------------------
1414
15−module PureScript.Pretty (module P) where
15+module Language.PureScript.Pretty (module P) where
1616
17−import PureScript.CodeGen.Pretty.Kinds as P
18−import PureScript.CodeGen.Pretty.Values as P
19−import PureScript.CodeGen.Pretty.Types as P
17+import Language.PureScript.Pretty.Kinds as P
18+import Language.PureScript.Pretty.Values as P
19+import Language.PureScript.Pretty.Types as P
2020
2121
2222
src/PureScript/CodeGen/Common.hs → src/Language/PureScript/Pretty/Common.hsrenamed+6−6
@@ -1,6 +1,6 @@
11-----------------------------------------------------------------------------
22--
3−-- Module : PureScript.CodeGen.Common
3+-- Module : Language.PureScript.Pretty.Common
44-- Copyright : (c) Phil Freeman 2013
55-- License : MIT
66--
@@ -14,7 +14,7 @@
1414
1515{-# LANGUAGE GeneralizedNewtypeDeriving, GADTs #-}
1616
17−module PureScript.CodeGen.Common where
17+module Language.PureScript.Pretty.Common where
1818
1919import Data.Char
2020import Data.Maybe (fromMaybe)
@@ -27,10 +27,10 @@ import Control.Category ((>>>))
2727import qualified Control.Arrow as A
2828import Control.Arrow ((***), (<+>))
2929
30−import PureScript.Names
31−import PureScript.Values
32−import PureScript.Types
33−import PureScript.Declarations
30+import Language.PureScript.Names
31+import Language.PureScript.Values
32+import Language.PureScript.Types
33+import Language.PureScript.Declarations
3434
3535identToJs :: Ident -> String
3636identToJs (Ident name) = name
src/PureScript/CodeGen/Pretty/Kinds.hs → src/Language/PureScript/Pretty/Kinds.hsrenamed+4−4
@@ -1,6 +1,6 @@
11-----------------------------------------------------------------------------
22--
3−-- Module : PureScript.CodeGen.Pretty.Kinds
3+-- Module : Language.PureScript.Pretty.Kinds
44-- Copyright : (c) Phil Freeman 2013
55-- License : MIT
66--
@@ -12,7 +12,7 @@
1212--
1313-----------------------------------------------------------------------------
1414
15−module PureScript.CodeGen.Pretty.Kinds (
15+module Language.PureScript.Pretty.Kinds (
1616 prettyPrintKind
1717) where
1818
@@ -23,8 +23,8 @@ import Control.Arrow ((<+>))
2323import qualified Data.Map as M
2424import Control.Applicative
2525
26−import PureScript.Kinds
27−import PureScript.CodeGen.Common
26+import Language.PureScript.Kinds
27+import Language.PureScript.Pretty.Common
2828
2929typeLiterals :: Pattern Kind String
3030typeLiterals = Pattern $ A.Kleisli match
src/PureScript/CodeGen/Pretty/Types.hs → src/Language/PureScript/Pretty/Types.hsrenamed+8−8
@@ -1,6 +1,6 @@
11-----------------------------------------------------------------------------
22--
3−-- Module : PureScript.CodeGen.Pretty.Types
3+-- Module : Language.PureScript.Pretty.Types
44-- Copyright : (c) Phil Freeman 2013
55-- License : MIT
66--
@@ -12,7 +12,7 @@
1212--
1313-----------------------------------------------------------------------------
1414
15−module PureScript.CodeGen.Pretty.Types (
15+module Language.PureScript.Pretty.Types (
1616 prettyPrintType,
1717 prettyPrintRow,
1818 prettyPrintPolyType
@@ -25,12 +25,12 @@ import Control.Arrow ((<+>))
2525import qualified Data.Map as M
2626import Control.Applicative
2727
28−import PureScript.Values
29−import PureScript.Types
30−import PureScript.Names
31−import PureScript.Declarations
32−import PureScript.TypeChecker.Monad
33−import PureScript.CodeGen.Common
28+import Language.PureScript.Values
29+import Language.PureScript.Types
30+import Language.PureScript.Names
31+import Language.PureScript.Declarations
32+import Language.PureScript.TypeChecker.Monad
33+import Language.PureScript.Pretty.Common
3434
3535typeLiterals :: Pattern Type String
3636typeLiterals = Pattern $ A.Kleisli match
src/PureScript/CodeGen/Pretty/Values.hs → src/Language/PureScript/Pretty/Values.hsrenamed+6−6
@@ -1,6 +1,6 @@
11-----------------------------------------------------------------------------
22--
3−-- Module : PureScript.CodeGen.Pretty.Values
3+-- Module : Language.PureScript.Pretty.Values
44-- Copyright : Kinds.hs(c) Phil Freeman 2013
55-- License : MIT
66--
@@ -12,7 +12,7 @@
1212--
1313-----------------------------------------------------------------------------
1414
15−module PureScript.CodeGen.Pretty.Values (
15+module Language.PureScript.Pretty.Values (
1616 prettyPrintValue,
1717 prettyPrintBinder
1818) where
@@ -24,10 +24,10 @@ import qualified Control.Arrow as A
2424import Control.Arrow ((<+>))
2525import Control.Applicative
2626
27−import PureScript.Types
28−import PureScript.Values
29−import PureScript.Names
30−import PureScript.CodeGen.Common
27+import Language.PureScript.Types
28+import Language.PureScript.Values
29+import Language.PureScript.Names
30+import Language.PureScript.Pretty.Common
3131
3232literals :: Pattern Value String
3333literals = Pattern $ A.Kleisli match
src/PureScript/TypeChecker.hs → src/Language/PureScript/TypeChecker.hsrenamed+12−12
@@ -1,6 +1,6 @@
11-----------------------------------------------------------------------------
22--
3−-- Module : PureScript.TypeChecker
3+-- Module : Language.PureScript.TypeChecker
44-- Copyright : (c) Phil Freeman 2013
55-- License : MIT
66--
@@ -14,26 +14,26 @@
1414
1515{-# LANGUAGE FlexibleInstances #-}
1616
17−module PureScript.TypeChecker (
18−module T,
17+module Language.PureScript.TypeChecker (
18+ module T,
1919 typeCheckAll
2020) where
2121
22−import PureScript.TypeChecker.Monad as T
23−import PureScript.TypeChecker.Kinds as T
24−import PureScript.TypeChecker.Types as T
25−import PureScript.TypeChecker.Synonyms as T
22+import Language.PureScript.TypeChecker.Monad as T
23+import Language.PureScript.TypeChecker.Kinds as T
24+import Language.PureScript.TypeChecker.Types as T
25+import Language.PureScript.TypeChecker.Synonyms as T
2626
2727import Data.List
2828import Data.Maybe
2929import Data.Function
3030import qualified Data.Map as M
3131
32−import PureScript.Values
33−import PureScript.Types
34−import PureScript.Names
35−import PureScript.Kinds
36−import PureScript.Declarations
32+import Language.PureScript.Values
33+import Language.PureScript.Types
34+import Language.PureScript.Names
35+import Language.PureScript.Kinds
36+import Language.PureScript.Declarations
3737
3838import Control.Monad (forM_)
3939import Control.Monad.State
src/PureScript/TypeChecker/Kinds.hs → src/Language/PureScript/TypeChecker/Kinds.hsrenamed+7−8
@@ -1,6 +1,6 @@
11-----------------------------------------------------------------------------
22--
3−-- Module : PureScript.TypeChecker.Kinds
3+-- Module : Language.PureScript.TypeChecker.Kinds
44-- Copyright : (c) Phil Freeman 2013
55-- License : MIT
66--
@@ -14,7 +14,7 @@
1414
1515{-# LANGUAGE DeriveDataTypeable #-}
1616
17−module PureScript.TypeChecker.Kinds (
17+module Language.PureScript.TypeChecker.Kinds (
1818 KindConstraint(..),
1919 KindSolution(..),
2020 kindsOf,
@@ -26,12 +26,11 @@ import Data.Maybe (fromMaybe)
2626import Data.Function
2727import Data.Data
2828
29−import PureScript.Types
30−import PureScript.Kinds
31−import PureScript.Declarations
32−import PureScript.TypeChecker.Monad
33−import PureScript.CodeGen.Pretty.Kinds
34−import PureScript.CodeGen.Pretty.Types
29+import Language.PureScript.Types
30+import Language.PureScript.Kinds
31+import Language.PureScript.Declarations
32+import Language.PureScript.TypeChecker.Monad
33+import Language.PureScript.Pretty
3534
3635import Control.Monad.State
3736import Control.Monad.Error
src/PureScript/TypeChecker/Monad.hs → src/Language/PureScript/TypeChecker/Monad.hsrenamed+5−5
@@ -1,6 +1,6 @@
11-----------------------------------------------------------------------------
22--
3−-- Module : PureScript.TypeChecker.Monad
3+-- Module : Language.PureScript.TypeChecker.Monad
44-- Copyright : (c) Phil Freeman 2013
55-- License : MIT
66--
@@ -14,11 +14,11 @@
1414
1515{-# LANGUAGE GeneralizedNewtypeDeriving, FlexibleInstances #-}
1616
17−module PureScript.TypeChecker.Monad where
17+module Language.PureScript.TypeChecker.Monad where
1818
19−import PureScript.Types
20−import PureScript.Kinds
21−import PureScript.Names
19+import Language.PureScript.Types
20+import Language.PureScript.Kinds
21+import Language.PureScript.Names
2222
2323import Control.Applicative
2424import Control.Monad.State
src/PureScript/TypeChecker/Synonyms.hs → src/Language/PureScript/TypeChecker/Synonyms.hsrenamed+4−4
@@ -1,6 +1,6 @@
11-----------------------------------------------------------------------------
22--
3−-- Module : PureScript.TypeChecker.Synonyms
3+-- Module : Language.PureScript.TypeChecker.Synonyms
44-- Copyright : (c) Phil Freeman 2013
55-- License : MIT
66--
@@ -14,13 +14,13 @@
1414
1515{-# LANGUAGE Rank2Types #-}
1616
17−module PureScript.TypeChecker.Synonyms (
17+module Language.PureScript.TypeChecker.Synonyms (
1818 saturateTypeSynonym,
1919 saturateAllTypeSynonyms
2020) where
2121
22−import PureScript.Types
23−import PureScript.Declarations
22+import Language.PureScript.Types
23+import Language.PureScript.Declarations
2424
2525import Data.Maybe (fromMaybe)
2626import Data.Data
src/PureScript/TypeChecker/Types.hs → src/Language/PureScript/TypeChecker/Types.hsrenamed+10−12
@@ -1,6 +1,6 @@
11-----------------------------------------------------------------------------
22--
3−-- Module : PureScript.TypeChecker.Types
3+-- Module : Language.PureScript.TypeChecker.Types
44-- Copyright : (c) Phil Freeman 2013
55-- License : MIT
66--
@@ -14,7 +14,7 @@
1414
1515{-# LANGUAGE DeriveDataTypeable #-}
1616
17−module PureScript.TypeChecker.Types (
17+module Language.PureScript.TypeChecker.Types (
1818 TypeConstraint(..),
1919 TypeSolution(..),
2020 typeOf
@@ -27,16 +27,14 @@ import Data.Function
2727import qualified Data.Data as D
2828import Data.Generics (everywhere, everywhereM, everything, mkT, mkM, mkQ, extM, extQ)
2929
30−import PureScript.Values
31−import PureScript.Types
32−import PureScript.Kinds
33−import PureScript.Names
34−import PureScript.TypeChecker.Monad
35−import PureScript.TypeChecker.Kinds
36−import PureScript.TypeChecker.Synonyms
37−import PureScript.CodeGen.Pretty.Types
38−import PureScript.CodeGen.Pretty.Kinds
39−import PureScript.CodeGen.Pretty.Values
30+import Language.PureScript.Values
31+import Language.PureScript.Types
32+import Language.PureScript.Kinds
33+import Language.PureScript.Names
34+import Language.PureScript.TypeChecker.Monad
35+import Language.PureScript.TypeChecker.Kinds
36+import Language.PureScript.TypeChecker.Synonyms
37+import Language.PureScript.Pretty
4038
4139import Control.Monad.State
4240import Control.Monad.Error
src/PureScript/Types.hs → src/Language/PureScript/Types.hsrenamed+2−2
@@ -1,6 +1,6 @@
11-----------------------------------------------------------------------------
22--
3−-- Module : Purescript.Types
3+-- Module : Language.PureScript.Types
44-- Copyright : (c) Phil Freeman 2013
55-- License : MIT
66--
@@ -14,7 +14,7 @@
1414
1515{-# LANGUAGE DeriveDataTypeable #-}
1616
17−module PureScript.Types where
17+module Language.PureScript.Types where
1818
1919import Data.Data
2020
src/PureScript/Values.hs → src/Language/PureScript/Values.hsrenamed+4−4
@@ -1,6 +1,6 @@
11-----------------------------------------------------------------------------
22--
3−-- Module : PureScript.Values
3+-- Module : Language.PureScript.Values
44-- Copyright : (c) Phil Freeman 2013
55-- License : MIT
66--
@@ -14,10 +14,10 @@
1414
1515{-# LANGUAGE DeriveDataTypeable #-}
1616
17−module PureScript.Values where
17+module Language.PureScript.Values where
1818
19−import PureScript.Types
20−import PureScript.Names
19+import Language.PureScript.Types
20+import Language.PureScript.Names
2121
2222import Data.Data
2323
src/Main.hs+1−1
@@ -14,7 +14,7 @@
1414
1515module Main where
1616
17−import PureScript
17+import Language.PureScript
1818import Data.Maybe (mapMaybe)
1919import Data.List (intercalate)
2020import System.Console.CmdTheLine
src/PureScript.hsdeleted−26
@@ -1,26 +0,0 @@
1−-----------------------------------------------------------------------------
2−--
3−-- Module : PureScript
4−-- Copyright : (c) Phil Freeman 2013
5−-- License : MIT
6−--
7−-- Maintainer : Phil Freeman <paf31@cantab.net>
8−-- Stability : experimental
9−-- Portability :
10−--
11−-- |
12−--
13−-----------------------------------------------------------------------------
14−
15−module PureScript (module P) where
16−
17−import PureScript.Values as P
18−import PureScript.Types as P
19−import PureScript.Kinds as P
20−import PureScript.Declarations as P
21−import PureScript.Names as P
22−import PureScript.Parser as P
23−import PureScript.CodeGen as P
24−import PureScript.TypeChecker as P
25−import PureScript.Pretty as P
26−
src/PureScript/Parser.hsdeleted−22
@@ -1,22 +0,0 @@
1−-----------------------------------------------------------------------------
2−--
3−-- Module : PureScript.Parser
4−-- Copyright : (c) Phil Freeman 2013
5−-- License : MIT
6−--
7−-- Maintainer : Phil Freeman <paf31@cantab.net>
8−-- Stability : experimental
9−-- Portability :
10−--
11−-- |
12−--
13−-----------------------------------------------------------------------------
14−
15−module PureScript.Parser (module P) where
16−
17−import PureScript.Parser.Common as P
18−import PureScript.Parser.Types as P
19−import PureScript.Parser.Values as P
20−import PureScript.Parser.State as P
21−import PureScript.Parser.Kinds as P
22−import PureScript.Parser.Declarations as P
tests/Main.hs+1−2
@@ -14,8 +14,7 @@
1414
1515module Main (main) where
1616
17−import PureScript
18−import PureScript.CodeGen.Pretty.Types
17+import Language.PureScript
1918
2019import Data.List (isSuffixOf)
2120import Control.Applicative