git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Create Prim module
commita36f24fea4dde249f46e797740bfb9c607541ef8 authorGary Burgess <gary.burgess@gmail.com> dateWed 5 Mar 2014, 20:18 (13 years ago) parent7790de9
12 files changed+86−52
compare with golang
unifiedsplit
purescript.cabal+1 src/Language/PureScript/CodeGen/JS.hs+1 src/Language/PureScript/CodeGen/Optimize.hs+1 src/Language/PureScript/Parser/Types.hs+5−2 src/Language/PureScript/Pretty/Types.hs+1 src/Language/PureScript/Prim.hs+69 src/Language/PureScript/Sugar/Names.hs+3−3 src/Language/PureScript/Sugar/TypeClasses.hs+1 src/Language/PureScript/TypeChecker.hs+1 src/Language/PureScript/TypeChecker/Monad.hs+2−11 src/Language/PureScript/TypeChecker/Types.hs+1 src/Language/PureScript/Types.hs−36
purescript.cabal+1
@@ -64,6 +64,7 @@ library
6464 Language.PureScript.Pretty.Kinds
6565 Language.PureScript.Pretty.Types
6666 Language.PureScript.Pretty.Values
67+ Language.PureScript.Prim
6768 Language.PureScript.TypeChecker
6869 Language.PureScript.TypeChecker.Kinds
6970 Language.PureScript.TypeChecker.Monad
src/Language/PureScript/CodeGen/JS.hs+1
@@ -43,6 +43,7 @@ import Language.PureScript.CodeGen.JS.AST as AST
4343import Language.PureScript.Types
4444import Language.PureScript.CodeGen.Optimize
4545import Language.PureScript.CodeGen.Common
46+import Language.PureScript.Prim
4647
4748-- |
4849-- Generate code in the simplified Javascript intermediate representation for all declarations in a
src/Language/PureScript/CodeGen/Optimize.hs+1
@@ -47,6 +47,7 @@ import Language.PureScript.CodeGen.JS.AST
4747import Language.PureScript.Options
4848import Language.PureScript.CodeGen.Common (identToJs)
4949import Language.PureScript.Types
50+import Language.PureScript.Prim
5051
5152-- |
5253-- Apply a series of optimizer passes to simplified Javascript code
src/Language/PureScript/Parser/Types.hs+5−2
@@ -19,13 +19,16 @@ module Language.PureScript.Parser.Types (
1919 parseTypeAtom
2020) where
2121
22+import Control.Applicative
23+import Control.Monad (when, unless)
24+
2225import Language.PureScript.Types
2326import Language.PureScript.Parser.State
2427import Language.PureScript.Parser.Common
25−import Control.Applicative
28+import Language.PureScript.Prim
29+
2630import qualified Text.Parsec as P
2731import qualified Text.Parsec.Expr as P
28−import Control.Monad (when, unless)
2932
3033parseNumber :: P.Parsec String ParseState Type
3134parseNumber = const tyNumber <$> reserved "Number"
src/Language/PureScript/Pretty/Types.hs+1
@@ -28,6 +28,7 @@ import Control.Monad.Unify
2828
2929import Language.PureScript.Types
3030import Language.PureScript.Pretty.Common
31+import Language.PureScript.Prim
3132
3233typeLiterals :: Pattern () Type String
3334typeLiterals = mkPattern match
src/Language/PureScript/Prim.hsnew file+69
@@ -0,0 +1,69 @@
1+-----------------------------------------------------------------------------
2+--
3+-- Module : Language.PureScript.Prim
4+-- Copyright : (c) 2013-14 Phil Freeman, (c) 2014 Gary Burgess, and other contributors
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.Prim where
16+
17+import Language.PureScript.Kinds
18+import Language.PureScript.Names
19+import Language.PureScript.Types
20+
21+import qualified Data.Map as M
22+
23+-- |
24+-- Type constructor for functions
25+--
26+tyFunction :: Type
27+tyFunction = TypeConstructor $ (Qualified $ Just $ ModuleName [ProperName "Prim"]) (ProperName "Function")
28+
29+-- |
30+-- Type constructor for strings
31+--
32+tyString :: Type
33+tyString = TypeConstructor $ (Qualified $ Just $ ModuleName [ProperName "Prim"]) (ProperName "String")
34+
35+-- |
36+-- Type constructor for numbers
37+--
38+tyNumber :: Type
39+tyNumber = TypeConstructor $ (Qualified $ Just $ ModuleName [ProperName "Prim"]) (ProperName "Number")
40+
41+-- |
42+-- Type constructor for booleans
43+--
44+tyBoolean :: Type
45+tyBoolean = TypeConstructor $ (Qualified $ Just $ ModuleName [ProperName "Prim"]) (ProperName "Boolean")
46+
47+-- |
48+-- Type constructor for arrays
49+--
50+tyArray :: Type
51+tyArray = TypeConstructor $ (Qualified $ Just $ ModuleName [ProperName "Prim"]) (ProperName "Array")
52+
53+-- |
54+-- Smart constructor for function types
55+--
56+function :: Type -> Type -> Type
57+function t1 = TypeApp (TypeApp tyFunction t1)
58+
59+-- |
60+-- The primitive types in the external javascript environment with their associated kinds.
61+--
62+primTypes :: M.Map (Qualified ProperName) Kind
63+primTypes = M.fromList [ (primName "Function" , FunKind Star (FunKind Star Star))
64+ , (primName "Array" , FunKind Star Star)
65+ , (primName "String" , Star)
66+ , (primName "Number" , Star)
67+ , (primName "Boolean" , Star) ]
68+ where
69+ primName name = Qualified (Just $ ModuleName [ProperName "Prim"]) (ProperName name)
src/Language/PureScript/Sugar/Names.hs+3−3
@@ -33,8 +33,7 @@ import Language.PureScript.Declarations
3333import Language.PureScript.Names
3434import Language.PureScript.Types
3535import Language.PureScript.Values
36−
37−import Language.PureScript.TypeChecker.Monad (jsTypes)
36+import Language.PureScript.Prim
3837
3938-- |
4039-- The global export environment - every declaration exported from every module.
@@ -226,7 +225,8 @@ findExports :: [Module] -> Either String ExportEnvironment
226225findExports = foldM addModule $ M.singleton (ModuleName [ProperName "Prim"]) primExports
227226 where
228227
229− primExports = Exports (S.fromList $ (\(Qualified _ name) -> (name, [])) `map` (M.keys jsTypes)) S.empty S.empty
228+ -- The exported types from the Prim module
229+ primExports = Exports (S.fromList $ (\(Qualified _ name) -> (name, [])) `map` (M.keys primTypes)) S.empty S.empty
230230
231231 -- Add all of the exported declarations from a module to the global export environment
232232 addModule :: ExportEnvironment -> Module -> Either String ExportEnvironment
src/Language/PureScript/Sugar/TypeClasses.hs+1
@@ -25,6 +25,7 @@ import Language.PureScript.Types
2525import Language.PureScript.Values
2626import Language.PureScript.CodeGen.JS.AST
2727import Language.PureScript.Sugar.CaseDeclarations
28+import Language.PureScript.Prim
2829
2930import qualified Data.Map as M
3031
src/Language/PureScript/TypeChecker.hs+1
@@ -37,6 +37,7 @@ import Language.PureScript.Values
3737import Language.PureScript.Kinds
3838import Language.PureScript.Declarations
3939import Language.PureScript.Sugar.TypeClasses
40+import Language.PureScript.Prim
4041
4142addDataType :: ModuleName -> ProperName -> [String] -> [(ProperName, [Type])] -> Kind -> Check ()
4243addDataType moduleName name args dctors ctorKind = do
src/Language/PureScript/TypeChecker/Monad.hs+2−11
@@ -23,6 +23,7 @@ import Language.PureScript.Kinds
2323import Language.PureScript.Values
2424import Language.PureScript.Names
2525import Language.PureScript.Declarations
26+import Language.PureScript.Prim
2627
2728import Data.Data
2829import Data.Maybe
@@ -83,21 +84,11 @@ data Environment = Environment {
8384 , typeClassDictionaries :: [TypeClassDictionaryInScope]
8485 } deriving (Show)
8586
86−-- |
87−-- The basic types existing in the external javascript environment
88−--
89−jsTypes ::M.Map (Qualified ProperName) Kind
90−jsTypes = M.fromList [ (Qualified (Just $ ModuleName [ProperName "Prim"]) (ProperName "Function"), FunKind Star (FunKind Star Star))
91− , (Qualified (Just $ ModuleName [ProperName "Prim"]) (ProperName "Array"), FunKind Star Star)
92− , (Qualified (Just $ ModuleName [ProperName "Prim"]) (ProperName "String"), Star)
93− , (Qualified (Just $ ModuleName [ProperName "Prim"]) (ProperName "Number"), Star)
94− , (Qualified (Just $ ModuleName [ProperName "Prim"]) (ProperName "Boolean"), Star) ]
95−
9687-- |
9788-- The initial environment with no values and only the default javascript types defined
9889--
9990initEnvironment :: Environment
100−initEnvironment = Environment M.empty jsTypes M.empty M.empty []
91+initEnvironment = Environment M.empty primTypes M.empty M.empty []
10192
10293-- |
10394-- Temporarily bind a collection of names to values
src/Language/PureScript/TypeChecker/Types.hs+1
@@ -56,6 +56,7 @@ import Language.PureScript.TypeChecker.Monad
5656import Language.PureScript.TypeChecker.Kinds
5757import Language.PureScript.TypeChecker.Synonyms
5858import Language.PureScript.Pretty
59+import Language.PureScript.Prim
5960
6061import Control.Monad.State
6162import Control.Monad.Error
src/Language/PureScript/Types.hs−36
@@ -88,42 +88,6 @@ data Type
8888 --
8989 | PrettyPrintArray Type deriving (Show, Eq, Data, Typeable)
9090
91−-- |
92−-- Type constructor for functions
93−--
94−tyFunction :: Type
95−tyFunction = TypeConstructor $ (Qualified $ Just $ ModuleName [ProperName "Prim"]) (ProperName "Function")
96−
97−-- |
98−-- Type constructor for strings
99−--
100−tyString :: Type
101−tyString = TypeConstructor $ (Qualified $ Just $ ModuleName [ProperName "Prim"]) (ProperName "String")
102−
103−-- |
104−-- Type constructor for numbers
105−--
106−tyNumber :: Type
107−tyNumber = TypeConstructor $ (Qualified $ Just $ ModuleName [ProperName "Prim"]) (ProperName "Number")
108−
109−-- |
110−-- Type constructor for booleans
111−--
112−tyBoolean :: Type
113−tyBoolean = TypeConstructor $ (Qualified $ Just $ ModuleName [ProperName "Prim"]) (ProperName "Boolean")
114−
115−-- |
116−-- Type constructor for arrays
117−--
118−tyArray :: Type
119−tyArray = TypeConstructor $ (Qualified $ Just $ ModuleName [ProperName "Prim"]) (ProperName "Array")
120−
121−-- |
122−-- Smart constructor for function types
123−--
124−function :: Type -> Type -> Type
125−function t1 = TypeApp (TypeApp tyFunction t1)
126−
12791-- |
12892-- Convert a row to a list of pairs of labels and types
12993--