git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Sanitize some modules
6747fb0Phil Freeman
purescript.cabal+34−18
compare with golang
unifiedsplit
@@ -11,28 +11,45 @@ synopsis: PureScript Programming Language Compiler
11description: A small compile-to-JS language with extensible records and type-safe blocks
11description: A small compile-to-JS language with extensible records and type-safe blocks
12author: Phil Freeman <paf31@cantab.net>
12author: Phil Freeman <paf31@cantab.net>
13data-dir: ""
13data-dir: ""
14−
14+category: Language
15+
15library
16library
16 build-depends: base >=4 && <5, syb -any, cmdtheline -any,
17 build-depends: base >=4 && <5, syb -any, cmdtheline -any,
17 containers -any, mtl -any, transformers -any, parsec -any,
18 containers -any, mtl -any, transformers -any, parsec -any,
18 utf8-string -any
19 utf8-string -any
19− exposed-modules: PureScript.CodeGen.Pretty.Values
20+ exposed-modules: Main
21+ Language.PureScript
20− PureScript.CodeGen.Pretty.Types PureScript PureScript.Declarations
22+ Language.PureScript.Declarations
21− PureScript.Names PureScript.TypeChecker.Synonyms
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
22− PureScript.CodeGen.Externs PureScript.CodeGen.JS
33+ Language.PureScript.CodeGen.Externs
34+ Language.PureScript.CodeGen.JS
23− PureScript.CodeGen.Common.Gen PureScript.CodeGen.Common Main
35+ Language.PureScript.CodeGen.Monad
24− PureScript.CodeGen PureScript.Kinds PureScript.Parser
36+ Language.PureScript.Parser
25− PureScript.TypeChecker PureScript.Types PureScript.Values
37+ Language.PureScript.Parser.Common
26− PureScript.Parser.Common PureScript.Parser.Declarations
38+ Language.PureScript.Parser.Declarations
27− PureScript.Parser.Types PureScript.Parser.Values
39+ Language.PureScript.Parser.Types
28− PureScript.TypeChecker.Kinds PureScript.TypeChecker.Monad
40+ Language.PureScript.Parser.Values
29− PureScript.TypeChecker.Types PureScript.Parser.State
41+ Language.PureScript.Parser.State
30− PureScript.Parser.Kinds PureScript.CodeGen.Pretty.Kinds
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
31 exposed: True
48 exposed: True
32 buildable: True
49 buildable: True
33 hs-source-dirs: src
50 hs-source-dirs: src
34− other-modules: PureScript.Pretty
51+ other-modules:
35−
52+
36executable psc
53executable psc
37 build-depends: base >=4 && <5, cmdtheline -any, containers -any,
54 build-depends: base >=4 && <5, cmdtheline -any, containers -any,
38 mtl -any, transformers -any, parsec -any, utf8-string -any,
55 mtl -any, transformers -any, parsec -any, utf8-string -any,
@@ -40,8 +57,7 @@ executable psc
40 main-is: Main.hs
57 main-is: Main.hs
41 buildable: True
58 buildable: True
42 hs-source-dirs: src
59 hs-source-dirs: src
43− other-modules: PureScript.Pretty
60+
44−
45test-suite tests
61test-suite tests
46 build-depends: base >=4 && <5, syb -any, directory -any,
62 build-depends: base >=4 && <5, syb -any, directory -any,
47 filepath -any, containers -any, mtl -any, transformers -any,
63 filepath -any, containers -any, mtl -any, transformers -any,
@@ -49,4 +65,4 @@ test-suite tests
49 type: exitcode-stdio-1.0
65 type: exitcode-stdio-1.0
50 main-is: Main.hs
66 main-is: Main.hs
51 buildable: True
67 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 @@
1-----------------------------------------------------------------------------
1-----------------------------------------------------------------------------
2--
2--
3−-- Module : PureScript.CodeGen
3+-- Module : Language.PureScript.CodeGen
4-- Copyright : (c) Phil Freeman 2013
4-- Copyright : (c) Phil Freeman 2013
5-- License : MIT
5-- License : MIT
6--
6--
@@ -12,10 +12,7 @@
12--
12--
13-----------------------------------------------------------------------------
13-----------------------------------------------------------------------------
14
14
15−module PureScript.CodeGen (
15+module Language.PureScript.CodeGen (module C) where
16− module PureScript.CodeGen.JS,
17− module PureScript.CodeGen.Externs
18−) where
19
16
20−import PureScript.CodeGen.JS
17+import Language.PureScript.CodeGen.JS as C
21−import PureScript.CodeGen.Externs
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 @@
1-----------------------------------------------------------------------------
1-----------------------------------------------------------------------------
2--
2--
3−-- Module : PureScript.CodeGen.Externs
3+-- Module : Language.PureScript.CodeGen.Externs
4-- Copyright : (c) Phil Freeman 2013
4-- Copyright : (c) Phil Freeman 2013
5-- License : MIT
5-- License : MIT
6--
6--
@@ -12,16 +12,15 @@
12--
12--
13-----------------------------------------------------------------------------
13-----------------------------------------------------------------------------
14
14
15−module PureScript.CodeGen.Externs (
15+module Language.PureScript.CodeGen.Externs (
16 externToPs
16 externToPs
17) where
17) where
18
18
19import Data.List (intercalate)
19import Data.List (intercalate)
20import qualified Data.Map as M
20import qualified Data.Map as M
21−import PureScript.Declarations
21+import Language.PureScript.Declarations
22−import PureScript.TypeChecker.Monad
22+import Language.PureScript.TypeChecker.Monad
23−import PureScript.CodeGen.Pretty.Types
24−import PureScript.CodeGen.Pretty.Kinds
23+import Language.PureScript.Pretty
25
24
26externToPs :: Environment -> Declaration -> Maybe String
25externToPs :: Environment -> Declaration -> Maybe String
27externToPs env (ValueDeclaration name _) = do
26externToPs env (ValueDeclaration name _) = do
src/PureScript/CodeGen/JS.hs → src/Language/PureScript/CodeGen/JS.hsrenamed+8−8
@@ -1,6 +1,6 @@
1-----------------------------------------------------------------------------
1-----------------------------------------------------------------------------
2--
2--
3−-- Module : PureScript.CodeGen.JS
3+-- Module : Language.PureScript.CodeGen.JS
4-- Copyright : (c) Phil Freeman 2013
4-- Copyright : (c) Phil Freeman 2013
5-- License : MIT
5-- License : MIT
6--
6--
@@ -12,7 +12,7 @@
12--
12--
13-----------------------------------------------------------------------------
13-----------------------------------------------------------------------------
14
14
15−module PureScript.CodeGen.JS (
15+module Language.PureScript.CodeGen.JS (
16 declToJs
16 declToJs
17) where
17) where
18
18
@@ -24,12 +24,12 @@ import Control.Arrow ((<+>))
24import Control.Monad (forM)
24import Control.Monad (forM)
25import Control.Applicative
25import Control.Applicative
26
26
27−import PureScript.Types
27+import Language.PureScript.Types
28−import PureScript.Values
28+import Language.PureScript.Values
29−import PureScript.Names
29+import Language.PureScript.Names
30−import PureScript.Declarations
30+import Language.PureScript.Declarations
31−import PureScript.CodeGen.Common
31+import Language.PureScript.Pretty.Common
32−import PureScript.CodeGen.Common.Gen
32+import Language.PureScript.CodeGen.Monad
33
33
34declToJs :: Declaration -> Maybe String
34declToJs :: Declaration -> Maybe String
35declToJs (ValueDeclaration ident (Abs args ret)) = Just $ "function " ++ identToJs ident ++ "(" ++ intercalate "," (map identToJs args) ++ ") { return " ++ valueToJs ret ++ "; }"
35declToJs (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 @@
1-----------------------------------------------------------------------------
1-----------------------------------------------------------------------------
2--
2--
3−-- Module : PureScript.CodeGen.Common.Gen
3+-- Module : Language.PureScript.CodeGen.Monad
4-- Copyright : (c) Phil Freeman 2013
4-- Copyright : (c) Phil Freeman 2013
5-- License : MIT
5-- License : MIT
6--
6--
@@ -14,7 +14,7 @@
14
14
15{-# LANGUAGE GeneralizedNewtypeDeriving #-}
15{-# LANGUAGE GeneralizedNewtypeDeriving #-}
16
16
17−module PureScript.CodeGen.Common.Gen where
17+module Language.PureScript.CodeGen.Monad where
18
18
19import Control.Monad.State
19import Control.Monad.State
20import Control.Applicative
20import Control.Applicative
src/PureScript/Declarations.hs → src/Language/PureScript/Declarations.hsrenamed+6−6
@@ -1,6 +1,6 @@
1-----------------------------------------------------------------------------
1-----------------------------------------------------------------------------
2--
2--
3−-- Module : PureScript.Declarations
3+-- Module : Language.PureScript.Declarations
4-- Copyright : (c) Phil Freeman 2013
4-- Copyright : (c) Phil Freeman 2013
5-- License : MIT
5-- License : MIT
6--
6--
@@ -14,12 +14,12 @@
14
14
15{-# LANGUAGE DeriveDataTypeable #-}
15{-# LANGUAGE DeriveDataTypeable #-}
16
16
17−module PureScript.Declarations where
17+module Language.PureScript.Declarations where
18
18
19−import PureScript.Values
19+import Language.PureScript.Values
20−import PureScript.Types
20+import Language.PureScript.Types
21−import PureScript.Names
21+import Language.PureScript.Names
22−import PureScript.Kinds
22+import Language.PureScript.Kinds
23
23
24import qualified Data.Data as D
24import qualified Data.Data as D
25
25
src/PureScript/Kinds.hs → src/Language/PureScript/Kinds.hsrenamed+2−2
@@ -1,6 +1,6 @@
1-----------------------------------------------------------------------------
1-----------------------------------------------------------------------------
2--
2--
3−-- Module : PureScript.Kinds
3+-- Module : Language.PureScript.Kinds
4-- Copyright : (c) Phil Freeman 2013
4-- Copyright : (c) Phil Freeman 2013
5-- License : MIT
5-- License : MIT
6--
6--
@@ -14,7 +14,7 @@
14
14
15{-# LANGUAGE DeriveDataTypeable #-}
15{-# LANGUAGE DeriveDataTypeable #-}
16
16
17−module PureScript.Kinds where
17+module Language.PureScript.Kinds where
18
18
19import Data.Data
19import Data.Data
20
20
src/PureScript/Names.hs → src/Language/PureScript/Names.hsrenamed+2−2
@@ -1,6 +1,6 @@
1-----------------------------------------------------------------------------
1-----------------------------------------------------------------------------
2--
2--
3−-- Module : PureScript.Names
3+-- Module : Language.PureScript.Names
4-- Copyright : (c) Phil Freeman 2013
4-- Copyright : (c) Phil Freeman 2013
5-- License : MIT
5-- License : MIT
6--
6--
@@ -14,7 +14,7 @@
14
14
15{-# LANGUAGE DeriveDataTypeable #-}
15{-# LANGUAGE DeriveDataTypeable #-}
16
16
17−module PureScript.Names where
17+module Language.PureScript.Names where
18
18
19import Data.Data
19import Data.Data
20
20
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 @@
1-----------------------------------------------------------------------------
1-----------------------------------------------------------------------------
2--
2--
3−-- Module : PureScript.Parser.Common
3+-- Module : Language.PureScript.Parser.Common
4-- Copyright : (c) Phil Freeman 2013
4-- Copyright : (c) Phil Freeman 2013
5-- License : MIT
5-- License : MIT
6--
6--
@@ -14,19 +14,19 @@
14
14
15{-# LANGUAGE FlexibleContexts #-}
15{-# LANGUAGE FlexibleContexts #-}
16
16
17−module PureScript.Parser.Common where
17+module Language.PureScript.Parser.Common where
18
18
19import Data.Char (isSpace)
19import Data.Char (isSpace)
20import Control.Applicative
20import Control.Applicative
21import Control.Monad
21import Control.Monad
22import Control.Monad.State
22import Control.Monad.State
23−import PureScript.Parser.State
23+import Language.PureScript.Parser.State
24import qualified Data.Map as M
24import qualified Data.Map as M
25import qualified Text.Parsec as P
25import qualified Text.Parsec as P
26import qualified Text.Parsec.Pos as P
26import qualified Text.Parsec.Pos as P
27import qualified Text.Parsec.Token as PT
27import qualified Text.Parsec.Token as PT
28
28
29−import PureScript.Names
29+import Language.PureScript.Names
30
30
31reservedNames :: [String]
31reservedNames :: [String]
32reservedNames = [ "case"
32reservedNames = [ "case"
src/PureScript/Parser/Declarations.hs → src/Language/PureScript/Parser/Declarations.hsrenamed+10−10
@@ -1,6 +1,6 @@
1-----------------------------------------------------------------------------
1-----------------------------------------------------------------------------
2--
2--
3−-- Module : PureScript.Parser.Declarations
3+-- Module : Language.PureScript.Parser.Declarations
4-- Copyright : (c) Phil Freeman 2013
4-- Copyright : (c) Phil Freeman 2013
5-- License : MIT
5-- License : MIT
6--
6--
@@ -12,7 +12,7 @@
12--
12--
13-----------------------------------------------------------------------------
13-----------------------------------------------------------------------------
14
14
15−module PureScript.Parser.Declarations (
15+module Language.PureScript.Parser.Declarations (
16 parseDeclaration,
16 parseDeclaration,
17 parseDeclarations
17 parseDeclarations
18) where
18) where
@@ -28,14 +28,14 @@ import qualified Data.Map as M
28import qualified Text.Parsec as P
28import qualified Text.Parsec as P
29import qualified Text.Parsec.Pos as P
29import qualified Text.Parsec.Pos as P
30
30
31−import PureScript.Values
31+import Language.PureScript.Values
32−import PureScript.Types
32+import Language.PureScript.Types
33−import PureScript.Parser.State
33+import Language.PureScript.Parser.State
34−import PureScript.Parser.Common
34+import Language.PureScript.Parser.Common
35−import PureScript.Declarations
35+import Language.PureScript.Declarations
36−import PureScript.Parser.Values
36+import Language.PureScript.Parser.Values
37−import PureScript.Parser.Types
37+import Language.PureScript.Parser.Types
38−import PureScript.Parser.Kinds
38+import Language.PureScript.Parser.Kinds
39
39
40parseDataDeclaration :: P.Parsec String ParseState Declaration
40parseDataDeclaration :: P.Parsec String ParseState Declaration
41parseDataDeclaration = do
41parseDataDeclaration = do
src/PureScript/Parser/Kinds.hs → src/Language/PureScript/Parser/Kinds.hsrenamed+5−5
@@ -1,6 +1,6 @@
1-----------------------------------------------------------------------------
1-----------------------------------------------------------------------------
2--
2--
3−-- Module : PureScript.Parser.Kinds
3+-- Module : Language.PureScript.Parser.Kinds
4-- Copyright : (c) Phil Freeman 2013
4-- Copyright : (c) Phil Freeman 2013
5-- License : MIT
5-- License : MIT
6--
6--
@@ -12,13 +12,13 @@
12--
12--
13-----------------------------------------------------------------------------
13-----------------------------------------------------------------------------
14
14
15−module PureScript.Parser.Kinds (
15+module Language.PureScript.Parser.Kinds (
16 parseKind
16 parseKind
17) where
17) where
18
18
19−import PureScript.Kinds
19+import Language.PureScript.Kinds
20−import PureScript.Parser.State
20+import Language.PureScript.Parser.State
21−import PureScript.Parser.Common
21+import Language.PureScript.Parser.Common
22import Control.Applicative
22import Control.Applicative
23import qualified Text.Parsec as P
23import qualified Text.Parsec as P
24import qualified Text.Parsec.Expr as P
24import qualified Text.Parsec.Expr as P
src/PureScript/Parser/State.hs → src/Language/PureScript/Parser/State.hsrenamed+4−4
@@ -1,6 +1,6 @@
1-----------------------------------------------------------------------------
1-----------------------------------------------------------------------------
2--
2--
3−-- Module : PureScript.Parser.State
3+-- Module : Language.PureScript.Parser.State
4-- Copyright : (c) Phil Freeman 2013
4-- Copyright : (c) Phil Freeman 2013
5-- License : MIT
5-- License : MIT
6--
6--
@@ -12,10 +12,10 @@
12--
12--
13-----------------------------------------------------------------------------
13-----------------------------------------------------------------------------
14
14
15−module PureScript.Parser.State where
15+module Language.PureScript.Parser.State where
16
16
17−import PureScript.Names
17+import Language.PureScript.Names
18−import PureScript.Declarations
18+import Language.PureScript.Declarations
19
19
20import qualified Text.Parsec as P
20import qualified Text.Parsec as P
21import qualified Data.Map as M
21import qualified Data.Map as M
src/PureScript/Parser/Types.hs → src/Language/PureScript/Parser/Types.hsrenamed+5−5
@@ -1,6 +1,6 @@
1-----------------------------------------------------------------------------
1-----------------------------------------------------------------------------
2--
2--
3−-- Module : PureScript.Parser.Types
3+-- Module : Language.PureScript.Parser.Types
4-- Copyright : (c) Phil Freeman 2013
4-- Copyright : (c) Phil Freeman 2013
5-- License : MIT
5-- License : MIT
6--
6--
@@ -12,15 +12,15 @@
12--
12--
13-----------------------------------------------------------------------------
13-----------------------------------------------------------------------------
14
14
15−module PureScript.Parser.Types (
15+module Language.PureScript.Parser.Types (
16 parseType,
16 parseType,
17 parsePolyType,
17 parsePolyType,
18 parseRow
18 parseRow
19) where
19) where
20
20
21−import PureScript.Types
21+import Language.PureScript.Types
22−import PureScript.Parser.State
22+import Language.PureScript.Parser.State
23−import PureScript.Parser.Common
23+import Language.PureScript.Parser.Common
24import Control.Applicative
24import Control.Applicative
25import qualified Text.Parsec as P
25import qualified Text.Parsec as P
26import qualified Text.Parsec.Expr as P
26import qualified Text.Parsec.Expr as P
src/PureScript/Parser/Values.hs → src/Language/PureScript/Parser/Values.hsrenamed+9−9
@@ -1,6 +1,6 @@
1-----------------------------------------------------------------------------
1-----------------------------------------------------------------------------
2--
2--
3−-- Module : PureScript.Parser.Values
3+-- Module : Language.PureScript.Parser.Values
4-- Copyright : (c) Phil Freeman 2013
4-- Copyright : (c) Phil Freeman 2013
5-- License : MIT
5-- License : MIT
6--
6--
@@ -12,27 +12,27 @@
12--
12--
13-----------------------------------------------------------------------------
13-----------------------------------------------------------------------------
14
14
15−module PureScript.Parser.Values (
15+module Language.PureScript.Parser.Values (
16 parseValue,
16 parseValue,
17 parseBinder
17 parseBinder
18) where
18) where
19
19
20−import PureScript.Values
20+import Language.PureScript.Values
21−import PureScript.Names
21+import Language.PureScript.Names
22−import PureScript.Declarations
22+import Language.PureScript.Declarations
23−import PureScript.Parser.State
23+import Language.PureScript.Parser.State
24import Data.Function (on)
24import Data.Function (on)
25import Data.List
25import Data.List
26import Data.Functor.Identity
26import Data.Functor.Identity
27import qualified Data.Map as M
27import qualified Data.Map as M
28−import qualified PureScript.Parser.Common as C
28+import qualified Language.PureScript.Parser.Common as C
29import Control.Applicative
29import Control.Applicative
30import qualified Text.Parsec as P
30import qualified Text.Parsec as P
31import Text.Parsec.Expr
31import Text.Parsec.Expr
32import Control.Monad
32import Control.Monad
33import Control.Arrow (Arrow(..))
33import Control.Arrow (Arrow(..))
34−import PureScript.Parser.Types
34+import Language.PureScript.Parser.Types
35−import PureScript.Types
35+import Language.PureScript.Types
36
36
37booleanLiteral :: P.Parsec String ParseState Bool
37booleanLiteral :: P.Parsec String ParseState Bool
38booleanLiteral = (C.reserved "true" >> return True) P.<|> (C.reserved "false" >> return False)
38booleanLiteral = (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 @@
1-----------------------------------------------------------------------------
1-----------------------------------------------------------------------------
2--
2--
3−-- Module : PureScript.Pretty
3+-- Module : Language.PureScript.Pretty
4-- Copyright : (c) Phil Freeman 2013
4-- Copyright : (c) Phil Freeman 2013
5-- License : MIT
5-- License : MIT
6--
6--
@@ -12,11 +12,11 @@
12--
12--
13-----------------------------------------------------------------------------
13-----------------------------------------------------------------------------
14
14
15−module PureScript.Pretty (module P) where
15+module Language.PureScript.Pretty (module P) where
16
16
17−import PureScript.CodeGen.Pretty.Kinds as P
17+import Language.PureScript.Pretty.Kinds as P
18−import PureScript.CodeGen.Pretty.Values as P
18+import Language.PureScript.Pretty.Values as P
19−import PureScript.CodeGen.Pretty.Types as P
19+import Language.PureScript.Pretty.Types as P
20
20
21
21
22
22
src/PureScript/CodeGen/Common.hs → src/Language/PureScript/Pretty/Common.hsrenamed+6−6
@@ -1,6 +1,6 @@
1-----------------------------------------------------------------------------
1-----------------------------------------------------------------------------
2--
2--
3−-- Module : PureScript.CodeGen.Common
3+-- Module : Language.PureScript.Pretty.Common
4-- Copyright : (c) Phil Freeman 2013
4-- Copyright : (c) Phil Freeman 2013
5-- License : MIT
5-- License : MIT
6--
6--
@@ -14,7 +14,7 @@
14
14
15{-# LANGUAGE GeneralizedNewtypeDeriving, GADTs #-}
15{-# LANGUAGE GeneralizedNewtypeDeriving, GADTs #-}
16
16
17−module PureScript.CodeGen.Common where
17+module Language.PureScript.Pretty.Common where
18
18
19import Data.Char
19import Data.Char
20import Data.Maybe (fromMaybe)
20import Data.Maybe (fromMaybe)
@@ -27,10 +27,10 @@ import Control.Category ((>>>))
27import qualified Control.Arrow as A
27import qualified Control.Arrow as A
28import Control.Arrow ((***), (<+>))
28import Control.Arrow ((***), (<+>))
29
29
30−import PureScript.Names
30+import Language.PureScript.Names
31−import PureScript.Values
31+import Language.PureScript.Values
32−import PureScript.Types
32+import Language.PureScript.Types
33−import PureScript.Declarations
33+import Language.PureScript.Declarations
34
34
35identToJs :: Ident -> String
35identToJs :: Ident -> String
36identToJs (Ident name) = name
36identToJs (Ident name) = name
src/PureScript/CodeGen/Pretty/Kinds.hs → src/Language/PureScript/Pretty/Kinds.hsrenamed+4−4
@@ -1,6 +1,6 @@
1-----------------------------------------------------------------------------
1-----------------------------------------------------------------------------
2--
2--
3−-- Module : PureScript.CodeGen.Pretty.Kinds
3+-- Module : Language.PureScript.Pretty.Kinds
4-- Copyright : (c) Phil Freeman 2013
4-- Copyright : (c) Phil Freeman 2013
5-- License : MIT
5-- License : MIT
6--
6--
@@ -12,7 +12,7 @@
12--
12--
13-----------------------------------------------------------------------------
13-----------------------------------------------------------------------------
14
14
15−module PureScript.CodeGen.Pretty.Kinds (
15+module Language.PureScript.Pretty.Kinds (
16 prettyPrintKind
16 prettyPrintKind
17) where
17) where
18
18
@@ -23,8 +23,8 @@ import Control.Arrow ((<+>))
23import qualified Data.Map as M
23import qualified Data.Map as M
24import Control.Applicative
24import Control.Applicative
25
25
26−import PureScript.Kinds
26+import Language.PureScript.Kinds
27−import PureScript.CodeGen.Common
27+import Language.PureScript.Pretty.Common
28
28
29typeLiterals :: Pattern Kind String
29typeLiterals :: Pattern Kind String
30typeLiterals = Pattern $ A.Kleisli match
30typeLiterals = Pattern $ A.Kleisli match
src/PureScript/CodeGen/Pretty/Types.hs → src/Language/PureScript/Pretty/Types.hsrenamed+8−8
@@ -1,6 +1,6 @@
1-----------------------------------------------------------------------------
1-----------------------------------------------------------------------------
2--
2--
3−-- Module : PureScript.CodeGen.Pretty.Types
3+-- Module : Language.PureScript.Pretty.Types
4-- Copyright : (c) Phil Freeman 2013
4-- Copyright : (c) Phil Freeman 2013
5-- License : MIT
5-- License : MIT
6--
6--
@@ -12,7 +12,7 @@
12--
12--
13-----------------------------------------------------------------------------
13-----------------------------------------------------------------------------
14
14
15−module PureScript.CodeGen.Pretty.Types (
15+module Language.PureScript.Pretty.Types (
16 prettyPrintType,
16 prettyPrintType,
17 prettyPrintRow,
17 prettyPrintRow,
18 prettyPrintPolyType
18 prettyPrintPolyType
@@ -25,12 +25,12 @@ import Control.Arrow ((<+>))
25import qualified Data.Map as M
25import qualified Data.Map as M
26import Control.Applicative
26import Control.Applicative
27
27
28−import PureScript.Values
28+import Language.PureScript.Values
29−import PureScript.Types
29+import Language.PureScript.Types
30−import PureScript.Names
30+import Language.PureScript.Names
31−import PureScript.Declarations
31+import Language.PureScript.Declarations
32−import PureScript.TypeChecker.Monad
32+import Language.PureScript.TypeChecker.Monad
33−import PureScript.CodeGen.Common
33+import Language.PureScript.Pretty.Common
34
34
35typeLiterals :: Pattern Type String
35typeLiterals :: Pattern Type String
36typeLiterals = Pattern $ A.Kleisli match
36typeLiterals = Pattern $ A.Kleisli match
src/PureScript/CodeGen/Pretty/Values.hs → src/Language/PureScript/Pretty/Values.hsrenamed+6−6
@@ -1,6 +1,6 @@
1-----------------------------------------------------------------------------
1-----------------------------------------------------------------------------
2--
2--
3−-- Module : PureScript.CodeGen.Pretty.Values
3+-- Module : Language.PureScript.Pretty.Values
4-- Copyright : Kinds.hs(c) Phil Freeman 2013
4-- Copyright : Kinds.hs(c) Phil Freeman 2013
5-- License : MIT
5-- License : MIT
6--
6--
@@ -12,7 +12,7 @@
12--
12--
13-----------------------------------------------------------------------------
13-----------------------------------------------------------------------------
14
14
15−module PureScript.CodeGen.Pretty.Values (
15+module Language.PureScript.Pretty.Values (
16 prettyPrintValue,
16 prettyPrintValue,
17 prettyPrintBinder
17 prettyPrintBinder
18) where
18) where
@@ -24,10 +24,10 @@ import qualified Control.Arrow as A
24import Control.Arrow ((<+>))
24import Control.Arrow ((<+>))
25import Control.Applicative
25import Control.Applicative
26
26
27−import PureScript.Types
27+import Language.PureScript.Types
28−import PureScript.Values
28+import Language.PureScript.Values
29−import PureScript.Names
29+import Language.PureScript.Names
30−import PureScript.CodeGen.Common
30+import Language.PureScript.Pretty.Common
31
31
32literals :: Pattern Value String
32literals :: Pattern Value String
33literals = Pattern $ A.Kleisli match
33literals = Pattern $ A.Kleisli match
src/PureScript/TypeChecker.hs → src/Language/PureScript/TypeChecker.hsrenamed+12−12
@@ -1,6 +1,6 @@
1-----------------------------------------------------------------------------
1-----------------------------------------------------------------------------
2--
2--
3−-- Module : PureScript.TypeChecker
3+-- Module : Language.PureScript.TypeChecker
4-- Copyright : (c) Phil Freeman 2013
4-- Copyright : (c) Phil Freeman 2013
5-- License : MIT
5-- License : MIT
6--
6--
@@ -14,26 +14,26 @@
14
14
15{-# LANGUAGE FlexibleInstances #-}
15{-# LANGUAGE FlexibleInstances #-}
16
16
17−module PureScript.TypeChecker (
17+module Language.PureScript.TypeChecker (
18−module T,
18+ module T,
19 typeCheckAll
19 typeCheckAll
20) where
20) where
21
21
22−import PureScript.TypeChecker.Monad as T
22+import Language.PureScript.TypeChecker.Monad as T
23−import PureScript.TypeChecker.Kinds as T
23+import Language.PureScript.TypeChecker.Kinds as T
24−import PureScript.TypeChecker.Types as T
24+import Language.PureScript.TypeChecker.Types as T
25−import PureScript.TypeChecker.Synonyms as T
25+import Language.PureScript.TypeChecker.Synonyms as T
26
26
27import Data.List
27import Data.List
28import Data.Maybe
28import Data.Maybe
29import Data.Function
29import Data.Function
30import qualified Data.Map as M
30import qualified Data.Map as M
31
31
32−import PureScript.Values
32+import Language.PureScript.Values
33−import PureScript.Types
33+import Language.PureScript.Types
34−import PureScript.Names
34+import Language.PureScript.Names
35−import PureScript.Kinds
35+import Language.PureScript.Kinds
36−import PureScript.Declarations
36+import Language.PureScript.Declarations
37
37
38import Control.Monad (forM_)
38import Control.Monad (forM_)
39import Control.Monad.State
39import Control.Monad.State
src/PureScript/TypeChecker/Kinds.hs → src/Language/PureScript/TypeChecker/Kinds.hsrenamed+7−8
@@ -1,6 +1,6 @@
1-----------------------------------------------------------------------------
1-----------------------------------------------------------------------------
2--
2--
3−-- Module : PureScript.TypeChecker.Kinds
3+-- Module : Language.PureScript.TypeChecker.Kinds
4-- Copyright : (c) Phil Freeman 2013
4-- Copyright : (c) Phil Freeman 2013
5-- License : MIT
5-- License : MIT
6--
6--
@@ -14,7 +14,7 @@
14
14
15{-# LANGUAGE DeriveDataTypeable #-}
15{-# LANGUAGE DeriveDataTypeable #-}
16
16
17−module PureScript.TypeChecker.Kinds (
17+module Language.PureScript.TypeChecker.Kinds (
18 KindConstraint(..),
18 KindConstraint(..),
19 KindSolution(..),
19 KindSolution(..),
20 kindsOf,
20 kindsOf,
@@ -26,12 +26,11 @@ import Data.Maybe (fromMaybe)
26import Data.Function
26import Data.Function
27import Data.Data
27import Data.Data
28
28
29−import PureScript.Types
29+import Language.PureScript.Types
30−import PureScript.Kinds
30+import Language.PureScript.Kinds
31−import PureScript.Declarations
31+import Language.PureScript.Declarations
32−import PureScript.TypeChecker.Monad
32+import Language.PureScript.TypeChecker.Monad
33−import PureScript.CodeGen.Pretty.Kinds
34−import PureScript.CodeGen.Pretty.Types
33+import Language.PureScript.Pretty
35
34
36import Control.Monad.State
35import Control.Monad.State
37import Control.Monad.Error
36import Control.Monad.Error
src/PureScript/TypeChecker/Monad.hs → src/Language/PureScript/TypeChecker/Monad.hsrenamed+5−5
@@ -1,6 +1,6 @@
1-----------------------------------------------------------------------------
1-----------------------------------------------------------------------------
2--
2--
3−-- Module : PureScript.TypeChecker.Monad
3+-- Module : Language.PureScript.TypeChecker.Monad
4-- Copyright : (c) Phil Freeman 2013
4-- Copyright : (c) Phil Freeman 2013
5-- License : MIT
5-- License : MIT
6--
6--
@@ -14,11 +14,11 @@
14
14
15{-# LANGUAGE GeneralizedNewtypeDeriving, FlexibleInstances #-}
15{-# LANGUAGE GeneralizedNewtypeDeriving, FlexibleInstances #-}
16
16
17−module PureScript.TypeChecker.Monad where
17+module Language.PureScript.TypeChecker.Monad where
18
18
19−import PureScript.Types
19+import Language.PureScript.Types
20−import PureScript.Kinds
20+import Language.PureScript.Kinds
21−import PureScript.Names
21+import Language.PureScript.Names
22
22
23import Control.Applicative
23import Control.Applicative
24import Control.Monad.State
24import Control.Monad.State
src/PureScript/TypeChecker/Synonyms.hs → src/Language/PureScript/TypeChecker/Synonyms.hsrenamed+4−4
@@ -1,6 +1,6 @@
1-----------------------------------------------------------------------------
1-----------------------------------------------------------------------------
2--
2--
3−-- Module : PureScript.TypeChecker.Synonyms
3+-- Module : Language.PureScript.TypeChecker.Synonyms
4-- Copyright : (c) Phil Freeman 2013
4-- Copyright : (c) Phil Freeman 2013
5-- License : MIT
5-- License : MIT
6--
6--
@@ -14,13 +14,13 @@
14
14
15{-# LANGUAGE Rank2Types #-}
15{-# LANGUAGE Rank2Types #-}
16
16
17−module PureScript.TypeChecker.Synonyms (
17+module Language.PureScript.TypeChecker.Synonyms (
18 saturateTypeSynonym,
18 saturateTypeSynonym,
19 saturateAllTypeSynonyms
19 saturateAllTypeSynonyms
20) where
20) where
21
21
22−import PureScript.Types
22+import Language.PureScript.Types
23−import PureScript.Declarations
23+import Language.PureScript.Declarations
24
24
25import Data.Maybe (fromMaybe)
25import Data.Maybe (fromMaybe)
26import Data.Data
26import Data.Data
src/PureScript/TypeChecker/Types.hs → src/Language/PureScript/TypeChecker/Types.hsrenamed+10−12
@@ -1,6 +1,6 @@
1-----------------------------------------------------------------------------
1-----------------------------------------------------------------------------
2--
2--
3−-- Module : PureScript.TypeChecker.Types
3+-- Module : Language.PureScript.TypeChecker.Types
4-- Copyright : (c) Phil Freeman 2013
4-- Copyright : (c) Phil Freeman 2013
5-- License : MIT
5-- License : MIT
6--
6--
@@ -14,7 +14,7 @@
14
14
15{-# LANGUAGE DeriveDataTypeable #-}
15{-# LANGUAGE DeriveDataTypeable #-}
16
16
17−module PureScript.TypeChecker.Types (
17+module Language.PureScript.TypeChecker.Types (
18 TypeConstraint(..),
18 TypeConstraint(..),
19 TypeSolution(..),
19 TypeSolution(..),
20 typeOf
20 typeOf
@@ -27,16 +27,14 @@ import Data.Function
27import qualified Data.Data as D
27import qualified Data.Data as D
28import Data.Generics (everywhere, everywhereM, everything, mkT, mkM, mkQ, extM, extQ)
28import Data.Generics (everywhere, everywhereM, everything, mkT, mkM, mkQ, extM, extQ)
29
29
30−import PureScript.Values
30+import Language.PureScript.Values
31−import PureScript.Types
31+import Language.PureScript.Types
32−import PureScript.Kinds
32+import Language.PureScript.Kinds
33−import PureScript.Names
33+import Language.PureScript.Names
34−import PureScript.TypeChecker.Monad
34+import Language.PureScript.TypeChecker.Monad
35−import PureScript.TypeChecker.Kinds
35+import Language.PureScript.TypeChecker.Kinds
36−import PureScript.TypeChecker.Synonyms
36+import Language.PureScript.TypeChecker.Synonyms
37−import PureScript.CodeGen.Pretty.Types
38−import PureScript.CodeGen.Pretty.Kinds
39−import PureScript.CodeGen.Pretty.Values
37+import Language.PureScript.Pretty
40
38
41import Control.Monad.State
39import Control.Monad.State
42import Control.Monad.Error
40import Control.Monad.Error
src/PureScript/Types.hs → src/Language/PureScript/Types.hsrenamed+2−2
@@ -1,6 +1,6 @@
1-----------------------------------------------------------------------------
1-----------------------------------------------------------------------------
2--
2--
3−-- Module : Purescript.Types
3+-- Module : Language.PureScript.Types
4-- Copyright : (c) Phil Freeman 2013
4-- Copyright : (c) Phil Freeman 2013
5-- License : MIT
5-- License : MIT
6--
6--
@@ -14,7 +14,7 @@
14
14
15{-# LANGUAGE DeriveDataTypeable #-}
15{-# LANGUAGE DeriveDataTypeable #-}
16
16
17−module PureScript.Types where
17+module Language.PureScript.Types where
18
18
19import Data.Data
19import Data.Data
20
20
src/PureScript/Values.hs → src/Language/PureScript/Values.hsrenamed+4−4
@@ -1,6 +1,6 @@
1-----------------------------------------------------------------------------
1-----------------------------------------------------------------------------
2--
2--
3−-- Module : PureScript.Values
3+-- Module : Language.PureScript.Values
4-- Copyright : (c) Phil Freeman 2013
4-- Copyright : (c) Phil Freeman 2013
5-- License : MIT
5-- License : MIT
6--
6--
@@ -14,10 +14,10 @@
14
14
15{-# LANGUAGE DeriveDataTypeable #-}
15{-# LANGUAGE DeriveDataTypeable #-}
16
16
17−module PureScript.Values where
17+module Language.PureScript.Values where
18
18
19−import PureScript.Types
19+import Language.PureScript.Types
20−import PureScript.Names
20+import Language.PureScript.Names
21
21
22import Data.Data
22import Data.Data
23
23
src/Main.hs+1−1
@@ -14,7 +14,7 @@
14
14
15module Main where
15module Main where
16
16
17−import PureScript
17+import Language.PureScript
18import Data.Maybe (mapMaybe)
18import Data.Maybe (mapMaybe)
19import Data.List (intercalate)
19import Data.List (intercalate)
20import System.Console.CmdTheLine
20import 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 @@
14
14
15module Main (main) where
15module Main (main) where
16
16
17−import PureScript
17+import Language.PureScript
18−import PureScript.CodeGen.Pretty.Types
19
18
20import Data.List (isSuffixOf)
19import Data.List (isSuffixOf)
21import Control.Applicative
20import Control.Applicative