git.iko.soy/haskell-generate
on c129f06 help sign in
7 files changed+16−54
since splitsnapshots
unifiedsplit
.travis.yml+3−5 LICENSE+1−1 README.md+1 haskell-generate.cabal+6−9 src/Language/Haskell/Generate/Monad.hs+3−37 src/Language/Haskell/Generate/PreludeDef.hs−1 tests/doctests.hsc+2−1
.travis.yml+3−5
@@ -1,9 +1,7 @@
11env:
22 - GHCVER=7.4.2 CABALVER=1.16
33 - GHCVER=7.6.3 CABALVER=1.18
4− - GHCVER=7.8.3 CABALVER=1.20
5− - GHCVER=7.10.2 CABALVER=1.22
6− - GHCVER=head CABALVER=1.22
4+ - GHCVER=head CABALVER=1.18
75
86before_install:
97 - sudo add-apt-repository -y ppa:hvr/ghc
@@ -22,5 +20,5 @@ script:
2220
2321matrix:
2422 allow_failures:
25− - env: GHCVER=head CABALVER=1.22
26− fast_finish: true
23+ - env: GHCVER=head CABALVER=1.18
24+ fast_finish: true
LICENSE+1−1
@@ -1,4 +1,4 @@
1−Copyright 2013-2015 Benno Fünfstück
1+Copyright 2013 Benno Fünfstück
22
33All rights reserved.
44
README.md+1
@@ -102,3 +102,4 @@ declareFunction 'permutations -- This generates the same code as above, but is m
102102## Contributing
103103
104104If you have an idea, a question or a bug report, open an issue on github. You can also find me on freenode in the #haskell channel, my nick is bennofs.
105+
haskell-generate.cabal+6−9
@@ -1,5 +1,5 @@
11name: haskell-generate
2−version: 0.2.4
2+version: 0.1
33license: BSD3
44category: Code Generation, Language
55cabal-version: >= 1.10
@@ -9,13 +9,9 @@ maintainer: Benno Fünfstück <benno.fuenfstueck@gmail.com>
99stability: experimental
1010homepage: http://github.com/bennofs/haskell-generate/
1111bug-reports: http://github.com/bennofs/haskell-generate/issues
12−copyright: Copyright (C) 2013-2015 Benno Fünfstück
13−synopsis: Typesafe generation of haskell source code
14−description:
15− This library provides an interface to generate haskell source code, verifying at compile time
16− that the resulting code typechecks.
17− See <https://github.com/bennofs/haskell-generate haskell-generate> for an
18− introduction explaining how to use the library.
12+copyright: Copyright (C) 2013 Benno Fünfstück
13+synopsis: haskell-generate
14+description: haskell-generate
1915build-type: Custom
2016
2117extra-source-files:
@@ -45,7 +41,6 @@ library
4541 Language.Haskell.Generate.Expression
4642 Language.Haskell.Generate.TH
4743 Language.Haskell.Generate.PreludeDef
48− other-extensions: TemplateHaskell
4944
5045test-suite doctests
5146 type: exitcode-stdio-1.0
@@ -57,4 +52,6 @@ test-suite doctests
5752 , doctest >= 0.9.1
5853 , filepath
5954 ghc-options: -Wall -threaded
55+ if impl(ghc<7.6.1)
56+ ghc-options: -Werror
6057 hs-source-dirs: tests
src/Language/Haskell/Generate/Monad.hs+3−37
@@ -3,7 +3,6 @@
33{-# LANGUAGE ScopedTypeVariables #-}
44{-# LANGUAGE UndecidableInstances #-}
55{-# LANGUAGE FlexibleInstances #-}
6−{-# LANGUAGE CPP #-}
76module Language.Haskell.Generate.Monad
87 ( Generate(..), ExpG
98 , runGenerate, newName
@@ -36,27 +35,19 @@ import Language.Haskell.Exts.SrcLoc
3635import Language.Haskell.Exts.Syntax
3736import Language.Haskell.Generate.Expression
3837
39−import Prelude
40−
4138--------------------------------------------------------------------------------
4239-- Generate expressions
4340
44−-- | This monad keeps track of a counter for generating unique names and the set of modules
45−-- that are needed for the expression.
4641newtype Generate a = Generate { unGenerate :: StateT Integer (Writer (S.Set ModuleName)) a } deriving (Functor, Applicative, Monad)
4742
48−-- | Extract the set of modules and the value from a Generate action.
4943runGenerate :: Generate a -> (a, S.Set ModuleName)
5044runGenerate (Generate a) = runWriter $ evalStateT a 0
5145
52−-- | This is a type alias for a Generate action that returns an expression of type 't'.
5346type ExpG t = Generate (Expression t)
5447
55−-- | Use a haskell-src-exts Exp as the result of a Generate action.
5648returnE :: Exp -> ExpG t
5749returnE = return . Expression
5850
59−-- | Pretty print the expression generated by a given action.
6051generateExp :: ExpG t -> String
6152generateExp = prettyPrint . runExpression . fst . runGenerate
6253
@@ -64,13 +55,7 @@ generateExp = prettyPrint . runExpression . fst . runGenerate
6455caseE :: ExpG x -> [(Pat, ExpG t)] -> ExpG t
6556caseE v alt = do
6657 v' <- v
67−#if MIN_VERSION_haskell_src_exts(1,17,0)
68− alt' <- mapM (\(p,a) -> fmap (\a' -> Alt noLoc p (UnGuardedRhs $ runExpression a') Nothing) a) alt
69−#elif MIN_VERSION_haskell_src_exts(1,16,0)
70− alt' <- mapM (\(p,a) -> fmap (\a' -> Alt noLoc p (UnGuardedRhs $ runExpression a') (BDecls [])) a) alt
71−#else
7258 alt' <- mapM (\(p,a) -> fmap (\a' -> Alt noLoc p (UnGuardedAlt $ runExpression a') (BDecls [])) a) alt
73−#endif
7459 return $ Expression $ Case (runExpression v') alt'
7560
7661-- | Import a function from a module. This function is polymorphic in the type of the resulting expression,
@@ -103,16 +88,7 @@ newName pref = Generate $ do
10388 i <- get <* modify succ
10489 return $ Ident $ pref ++ show i
10590
106−-- | Generate a expression from a haskell value. This can for example be used to create lambdas:
107−--
108−-- >>> putStrLn $ generateExp $ expr (\x f -> f <>$ x)
109−-- \ pvar_0 -> \ pvar_1 -> pvar_1 pvar_0
110−--
111−-- Or string literals:
112−--
113−-- >>> putStrLn $ generateExp $ expr "I'm a string!"
114−-- ['I', '\'', 'm', ' ', 'a', ' ', 's', 't', 'r', 'i', 'n', 'g', '!']
115−--
91+-- | Generate a expression from a haskell value.
11692class GenExp t where
11793 type GenExpType t :: *
11894
@@ -153,12 +129,14 @@ instance GenExp x => GenExp (ExpG a -> x) where
153129--------------------------------------------------------------------------------
154130-- Apply functions
155131
132+
156133-- | Apply a function in a haskell expression to a value.
157134applyE :: ExpG (a -> b) -> ExpG a -> ExpG b
158135applyE a b = wrap $ liftM (foldl1 App) $ sequence [unwrap a, unwrap b]
159136 where wrap = fmap Expression
160137 unwrap = fmap runExpression
161138
139+
162140-- | Operator for 'applyE'.
163141(<>$) :: ExpG (a -> b) -> ExpG a -> ExpG b
164142(<>$) = applyE
@@ -214,31 +192,19 @@ instance GenExp (FunRef t) where
214192
215193-- | Generate a ExportSpec for a given function item.
216194exportFun :: FunRef t -> ExportSpec
217−#if MIN_VERSION_haskell_src_exts(1,16,0) && !MIN_VERSION_haskell_src_exts(1,17,0)
218−exportFun (FunRef name) = EVar NoNamespace (UnQual name)
219−#else
220195exportFun (FunRef name) = EVar (UnQual name)
221−#endif
222196
223197-- | Add a declaration to the module. Return a reference to it that can be used to either apply the function to some values or export it.
224198addDecl :: Name -> ExpG t -> ModuleM (FunRef t)
225199addDecl name e = ModuleM $ do
226200 let (body, mods) = runGenerate e
227−#if MIN_VERSION_haskell_src_exts(1,17,0)
228− tell (mods, [FunBind [Match noLoc name [] Nothing (UnGuardedRhs $ runExpression body) Nothing]])
229−#else
230201 tell (mods, [FunBind [Match noLoc name [] Nothing (UnGuardedRhs $ runExpression body) $ BDecls []]])
231−#endif
232202 return $ FunRef name
233203
234204-- | Extract the Module from a module generator.
235205runModuleM :: ModuleG -> String -> Module
236206runModuleM (ModuleM act) name =
237−#if MIN_VERSION_haskell_src_exts(1,16,0)
238− Module noLoc (ModuleName name) [] Nothing export (map (\md -> ImportDecl noLoc md True False False Nothing Nothing Nothing) $ S.toList imps) decls
239−#else
240207 Module noLoc (ModuleName name) [] Nothing export (map (\md -> ImportDecl noLoc md True False Nothing Nothing Nothing) $ S.toList imps) decls
241−#endif
242208 where (export, (imps, decls)) = runWriter act
243209
244210-- | Generate the source code for a module.
src/Language/Haskell/Generate/PreludeDef.hs−1
@@ -60,7 +60,6 @@ fmap concat $ mapM declareNamedSymbol
6060 , ('(++), "append'")
6161 , ('(!!), "index'")
6262 , ('(==), "equal'")
63− , ('(/=), "notequal'")
6463 ]
6564
6665(<>.) :: ExpG (b -> c) -> ExpG (a -> b) -> ExpG (a -> c)
tests/doctests.hsc+2−1
@@ -20,17 +20,18 @@ import Data.List
2020import System.Directory
2121import System.FilePath
2222import Test.DocTest
23−import Prelude
2423
2524##ifdef mingw32_HOST_ARCH
2625##ifdef i386_HOST_ARCH
2726##define USE_CP
27+import Control.Applicative
2828import Control.Exception
2929import Foreign.C.Types
3030foreign import stdcall "windows.h SetConsoleCP" c_SetConsoleCP :: CUInt -> IO Bool
3131foreign import stdcall "windows.h GetConsoleCP" c_GetConsoleCP :: IO CUInt
3232##elif defined(x86_64_HOST_ARCH)
3333##define USE_CP
34+import Control.Applicative
3435import Control.Exception
3536import Foreign.C.Types
3637foreign import ccall "windows.h SetConsoleCP" c_SetConsoleCP :: CUInt -> IO Bool