Skip to content

Commit 6747fb0

Browse files
paf31paf31
committed
Sanitize some modules
1 parent f98236e commit 6747fb0

32 files changed

+223
-215
lines changed

‎purescript.cabal‎

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,42 +11,58 @@ synopsis: PureScript Programming Language Compiler
1111
description: A small compile-to-JS language with extensible records and type-safe blocks
1212
author: Phil Freeman <paf31@cantab.net>
1313
data-dir: ""
14-
14+
category: Language
15+
1516
library
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+
3653
executable psc
3754
build-depends: base >=4 && <5, cmdtheline -any, containers -any,
3855
mtl -any, transformers -any, parsec -any, utf8-string -any,
3956
syb -any
4057
main-is: Main.hs
4158
buildable: True
4259
hs-source-dirs: src
43-
other-modules: PureScript.Pretty
44-
60+
4561
test-suite tests
4662
build-depends: base >=4 && <5, syb -any, directory -any,
4763
filepath -any, containers -any, mtl -any, transformers -any,
4864
parsec -any, utf8-string -any, purescript -any
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.hs‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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 renamed to src/Language/PureScript/CodeGen.hs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -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 renamed to src/Language/PureScript/CodeGen/Externs.hs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -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

1919
import Data.List (intercalate)
2020
import 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

2625
externToPs :: Environment -> Declaration -> Maybe String
2726
externToPs env (ValueDeclaration name _) = do

src/PureScript/CodeGen/JS.hs renamed to src/Language/PureScript/CodeGen/JS.hs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -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 ((<+>))
2424
import Control.Monad (forM)
2525
import 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

3434
declToJs :: Declaration -> Maybe String
3535
declToJs (ValueDeclaration ident (Abs args ret)) = Just $ "function " ++ identToJs ident ++ "(" ++ intercalate "," (map identToJs args) ++ ") { return " ++ valueToJs ret ++ "; }"

src/PureScript/CodeGen/Common/Gen.hs renamed to src/Language/PureScript/CodeGen/Monad.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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

1919
import Control.Monad.State
2020
import Control.Applicative

src/PureScript/Declarations.hs renamed to src/Language/PureScript/Declarations.hs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -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

2424
import qualified Data.Data as D
2525

src/PureScript/Kinds.hs renamed to src/Language/PureScript/Kinds.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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

1919
import Data.Data
2020

src/PureScript/Names.hs renamed to src/Language/PureScript/Names.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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

1919
import Data.Data
2020

‎src/Language/PureScript/Parser.hs‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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

0 commit comments

Comments
 (0)