February 2013 - ghc-devs

[PATCH] GHC_CONVERT_VENDOR: allow 'w64' vendor, like x86_64-w64-mingw32
by Sergei Trofimovich 12 Feb '13

12 Feb '13

From: Sergei Trofimovich <slyfox(a)gentoo.org> Gentoo calls 'w64' a mingw flavour with mingw-w64 runtime. Signed-off-by: Sergei Trofimovich <slyfox(a)gentoo.org> --- aclocal.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aclocal.m4 b/aclocal.m4 index 9f9593a..30d492c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1812,7 +1812,7 @@ case "$1" in # converts vendor from gnu to ghc naming, and assigns the result to $target_var AC_DEFUN([GHC_CONVERT_VENDOR],[ case "$1" in - pc|gentoo) # like i686-pc-linux-gnu and i686-gentoo-freebsd8 + pc|gentoo|w64) # like i686-pc-linux-gnu, i686-gentoo-freebsd8, x86_64-w64-mingw32 $2="unknown" ;; softfloat) # like armv5tel-softfloat-linux-gnueabi -- 1.8.1.1

2 1

RE: GHC 7.8 release?
by Simon Peyton-Jones 12 Feb '13

12 Feb '13

(a) There are packages which tend to track GHC's latest version instead of the HP (yesod used to do this, which was a source of much pain). (b) There are linux distributions which always track the latest everything, often in a rolling-release fashion (notably Arch). They are actively hostile to the Platform, and a source of even greater pain. Many package authors update because Arch users demand it and openly insult anyone who points them to the Platform or any policy which suggests that anything other then the absolutely latest version is acceptable. These must be social questions (what I was earlier calling “signposting”) rather than technical ones. For example, you say that (b) is not subject to any variety of reason, and yet no linux distribution tracks HEAD, does it? They don’t openly insult anyone who points to a release just because HEAD has new cool stuff! No, they track things we call “releases”. Very well, maybe we should call them “previews” instead, and only dignify it as a “release” when, and only when a preview is picked by HP as worthy of incorporation in the next HP. Or something. I’m just looking for a way to reconcile · Release early, release often · Stability for the Haskell Platform It seems to me that such a reconciliation is within reach, and is actually very close to what we do, if we only signpost what is what far more vigorously and clearly than we do now. But maybe I’m wrong. Simon From: Brandon Allbery [mailto:allbery.b@gmail.com] Sent: 11 February 2013 01:15 To: Simon Peyton-Jones Cc: Simon Marlow; Mark Lentczner; Manuel M T Chakravarty; kostirya(a)gmail.com; glasgow-haskell-users; ghc-devs(a)haskell.org; Edsko de Vries Subject: Re: GHC 7.8 release? On Sun, Feb 10, 2013 at 4:02 PM, Simon Peyton-Jones <simonpj(a)microsoft.com<mailto:simonpj@microsoft.com>> wrote: What causes the "wave of package updates"? Just because GHC 7.8 (say) comes out, no package author need lift a finger. The Haskell Platform sets the pace for package updates. When the Haskell Platform comes out, now THAT is indeed a trigger for a wave of updates. Authors of packages in HP are forced to act; authors of other packages want their packages to work with the next HP. (a) There are packages which tend to track GHC's latest version instead of the HP (yesod used to do this, which was a source of much pain). (b) There are linux distributions which always track the latest everything, often in a rolling-release fashion (notably Arch). They are actively hostile to the Platform, and a source of even greater pain. Many package authors update because Arch users demand it and openly insult anyone who points them to the Platform or any policy which suggests that anything other then the absolutely latest version is acceptable. You *might* be able to control expectations with respect to (a); (b) is not subject to any variety of reason. It will produce as much pressure as it has users, plus multiply that pressure by the number of package authors who are also users. -- brandon s allbery kf8nh sine nomine associates allbery.b(a)gmail.com<mailto:allbery.b@gmail.com> ballbery(a)sinenomine.net<mailto:ballbery@sinenomine.net> unix, openafs, kerberos, infrastructure, xmonad http://sinenomine.net

8 9

RFC: Changes to help GHCJS, GHC API multi-target cross compile
by Luite Stegeman 12 Feb '13

12 Feb '13

Hi all, I'm looking for comments on two minor patches that would greatly help GHCJS [1]. The goal is to make a cabal-installable GHCJS compiler that uses the GHC API to generate both JavaScript (always 32 bit) and native code (to run Template Haskell). This way we can release updates frequently and have an easy installation procedure for users. I have an experimental branch [2] that uses the patches below to make working compiler that can generate 32 bit JavaScript from a 64 bit host compiler, with working TH. 1. Add a Way for custom build tags. Since we generate code for two architectures, we need to make sure that we don't mix the native and JavaScript .hi files. Setting the buildTag manually in DynFlags does not work, because it gets reset every time a file is preprocessed (due to OPTIONS pragma handling). This patch adds an extra Way that just adds something to the build tag, it could be extended to also add custom program options and extras. 2. Make GHC.Prim interface overridable. Since JavaScript does not support 64 bit integers, we want to generate 32 bit code, even if our host platform is 64 bit. HEAD has wORD_SIZE_IN_BITS already configurable though DynFlags, but unfortunately the primop interface (GHC.Prim) is also platform dependent, some primops have a different type on a 64 bit system. This patch makes it possible for a GHC API user to supply a custom interface for GHC.Prim. It's rather hacky, requires an extra hs-boot file and requires the user to mess with the NameCache to make it work correctly [3]. Probably a stopgap measure until GHC supports multitarget cross compilation out of the box. Is there a better way of doing this? Luite [1] https://github.com/ghcjs [2] https://github.com/ghcjs/ghcjs/tree/gen2-64 [3] https://github.com/ghcjs/ghcjs/blob/1a84f82fa149b4e9510586c10864694efe7820b…

2 1

RE: [commit: ghc] master: Fix Trac #7681. (7b098b6)
by Simon Peyton-Jones 12 Feb '13

12 Feb '13

Thanks for fixing. You removed lookupType_mod from TrieMap. It was defined and exported but not called. How did validate spot that? I'm sure there are quite a few such functions in GHC. Simon | -----Original Message----- | From: ghc-commits-bounces(a)haskell.org [mailto:ghc-commits- | bounces(a)haskell.org] On Behalf Of Richard Eisenberg | Sent: 12 February 2013 04:10 | To: ghc-commits(a)haskell.org | Subject: [commit: ghc] master: Fix Trac #7681. (7b098b6) | | Repository : ssh://darcs.haskell.org//srv/darcs/ghc | | On branch : master | | http://hackage.haskell.org/trac/ghc/changeset/7b098b6009727a012cb1f3ff0c | a51698d302cae1 | | >--------------------------------------------------------------- | | commit 7b098b6009727a012cb1f3ff0ca51698d302cae1 | Author: Richard Eisenberg <eir(a)cis.upenn.edu> | Date: Mon Feb 11 23:07:25 2013 -0500 | | Fix Trac #7681. | | Removed checks for empty lists for case expressions and lambda-case. | If -XEmptyCase is not enabled, compilation still fails | (appropriately) | in the renamer. | | Had to remove dead code from TrieMap to pass the validator. | | >--------------------------------------------------------------- | | compiler/coreSyn/TrieMap.lhs | 38 +---------------------------------- | --- | compiler/deSugar/DsMeta.hs | 6 ++++-- | compiler/hsSyn/Convert.lhs | 8 ++------ | libraries/random | 2 +- | 4 files changed, 8 insertions(+), 46 deletions(-) | | diff --git a/compiler/coreSyn/TrieMap.lhs b/compiler/coreSyn/TrieMap.lhs | index 148464b..c013b5d 100644 | --- a/compiler/coreSyn/TrieMap.lhs | +++ b/compiler/coreSyn/TrieMap.lhs | @@ -14,7 +14,7 @@ | {-# LANGUAGE TypeFamilies #-} | module TrieMap( | CoreMap, emptyCoreMap, extendCoreMap, lookupCoreMap, foldCoreMap, | - TypeMap, foldTypeMap, lookupTypeMap_mod, | + TypeMap, foldTypeMap, -- lookupTypeMap_mod, | CoercionMap, | MaybeMap, | ListMap, | @@ -32,8 +32,6 @@ import UniqFM | import Unique( Unique ) | import FastString(FastString) | | -import Unify ( niFixTvSubst ) | - | import qualified Data.Map as Map | import qualified Data.IntMap as IntMap | import VarEnv | @@ -632,40 +630,6 @@ lkT env ty m | go (ForAllTy tv ty) = tm_forall >.> lkT (extendCME env tv) ty >=> | lkBndr env tv | | | -lkT_mod :: CmEnv | - -> TyVarEnv Type -- TvSubstEnv | - -> Type | - -> TypeMap b -> Maybe b | -lkT_mod env s ty m | - | EmptyTM <- m = Nothing | - | Just ty' <- coreView ty | - = lkT_mod env s ty' m | - | [] <- candidates | - = go env s ty m | - | otherwise | - = Just $ snd (head candidates) -- Yikes! | - where | - -- Hopefully intersects is much smaller than traversing the whole | vm_fvar | - intersects = eltsUFM $ | - intersectUFM_C (,) s (vm_fvar $ tm_var m) | - candidates = [ (u,ct) | (u,ct) <- intersects | - , Type.substTy (niFixTvSubst s) u `eqType` ty | ] | - | - go env _s (TyVarTy v) = tm_var >.> lkVar env v | - go env s (AppTy t1 t2) = tm_app >.> lkT_mod env s t1 >=> | lkT_mod env s t2 | - go env s (FunTy t1 t2) = tm_fun >.> lkT_mod env s t1 >=> | lkT_mod env s t2 | - go env s (TyConApp tc tys) = tm_tc_app >.> lkNamed tc >=> lkList | (lkT_mod env s) tys | - go _env _s (LitTy l) = tm_tylit >.> lkTyLit l | - go _env _s (ForAllTy _tv _ty) = const Nothing | - | - {- DV TODO: Add proper lookup for ForAll -} | - | -lookupTypeMap_mod :: TyVarEnv a -- A substitution to be applied to the | /keys/ of type map | - -> (a -> Type) | - -> Type | - -> TypeMap b -> Maybe b | -lookupTypeMap_mod s f = lkT_mod emptyCME (mapVarEnv f s) | - | ----------------- | xtT :: CmEnv -> Type -> XT a -> TypeMap a -> TypeMap a xtT env ty f m | diff --git a/compiler/deSugar/DsMeta.hs b/compiler/deSugar/DsMeta.hs | index 9a9f89d..4f5ba2d 100644 | --- a/compiler/deSugar/DsMeta.hs | +++ b/compiler/deSugar/DsMeta.hs | @@ -920,7 +920,8 @@ repE (HsLit l) = do { a <- repLiteral l; | repLit a } | repE (HsLam (MG { mg_alts = [m] })) = repLambda m repE (HsLamCase _ | (MG { mg_alts = ms })) | = do { ms' <- mapM repMatchTup ms | - ; repLamCase (nonEmptyCoreList ms') } | + ; core_ms <- coreList matchQTyConName ms' | + ; repLamCase core_ms } | repE (HsApp x y) = do {a <- repLE x; b <- repLE y; repApp a b} | | repE (OpApp e1 op _ e2) = | @@ -938,7 +939,8 @@ repE (SectionR x y) = do { a <- repLE x; b <- | repLE y; repSectionR a b } | repE (HsCase e (MG { mg_alts = ms })) | = do { arg <- repLE e | ; ms2 <- mapM repMatchTup ms | - ; repCaseE arg (nonEmptyCoreList ms2) } | + ; core_ms2 <- coreList matchQTyConName | ms2 | + ; repCaseE arg core_ms2 } | repE (HsIf _ x y z) = do | a <- repLE x | b <- repLE y | diff --git a/compiler/hsSyn/Convert.lhs b/compiler/hsSyn/Convert.lhs | index a21caf4..ce15071 100644 | --- a/compiler/hsSyn/Convert.lhs | +++ b/compiler/hsSyn/Convert.lhs | @@ -524,9 +524,7 @@ cvtl e = wrapL (cvt e) | cvt (AppE x y) = do { x' <- cvtl x; y' <- cvtl y; return $ | HsApp x' y' } | cvt (LamE ps e) = do { ps' <- cvtPats ps; e' <- cvtl e | ; return $ HsLam (mkMatchGroup | [mkSimpleMatch ps' e']) } | - cvt (LamCaseE ms) | - | null ms = failWith (ptext (sLit "Lambda-case expression | with no alternatives")) | - | otherwise = do { ms' <- mapM cvtMatch ms | + cvt (LamCaseE ms) = do { ms' <- mapM cvtMatch ms | ; return $ HsLamCase placeHolderType | (mkMatchGroup ms') | } | @@ -543,9 +541,7 @@ cvtl e = wrapL (cvt e) | ; return $ HsMultiIf placeHolderType alts' | } | cvt (LetE ds e) = do { ds' <- cvtLocalDecs (ptext (sLit "a let | expression")) ds | ; e' <- cvtl e; return $ HsLet ds' e' } | - cvt (CaseE e ms) | - | null ms = failWith (ptext (sLit "Case expression with no | alternatives")) | - | otherwise = do { e' <- cvtl e; ms' <- mapM cvtMatch ms | + cvt (CaseE e ms) = do { e' <- cvtl e; ms' <- mapM cvtMatch ms | ; return $ HsCase e' (mkMatchGroup ms') } | cvt (DoE ss) = cvtHsDo DoExpr ss | cvt (CompE ss) = cvtHsDo ListComp ss | diff --git a/libraries/random b/libraries/random index 0531d37..69bfde2 | 160000 | --- a/libraries/random | +++ b/libraries/random | @@ -1 +1 @@ | -Subproject commit 0531d37602d6e7c0b2b5adbf2d5fdd2d01830216 | +Subproject commit 69bfde219bab869729fdbe9c1496371f912bf41e | | | | _______________________________________________ | ghc-commits mailing list | ghc-commits(a)haskell.org | http://www.haskell.org/mailman/listinfo/ghc-commits

2 2

Re: Patch to vector
by José Pedro Magalhães 12 Feb '13

12 Feb '13

Hi Roman, Just to remind you of the patch to vector I've previously sent you. Whenever you can apply it, we can remove the "temporary fix" patch on the GHC copy of the repo. Thanks, Pedro On Wed, Nov 28, 2012 at 3:03 PM, José Pedro Magalhães <jpm(a)cs.uu.nl> wrote: > Hi Roman, > > I'm attaching a patch to the vector package to make it derive Typeable > instances instead of defining them manually. GHC HEAD will soon ignore > handwritten Typeable instances, so this replacement is necessary. > > > Thanks, > Pedro > >

2 1

Missing change?
by Simon Peyton-Jones 12 Feb '13

12 Feb '13

Pedro: did you miss something? This is breaking my build. I have your last patch 12ba4321d34d646cf9040ad12810c4257d26ade9 Simon url = http://darcs.haskell.org/libraries/time.git/ libraries/time/Data/Time/Calendar/Days.hs:30:9: `typeOf' is not a (visible) method of class `Typeable' libraries/time/Data/Time/Calendar/Days.hs:30:32: Not in scope: `mkTyCon' Perhaps you meant `mkTyCon3' (imported from Data.Data)

2 2

nofib regressions in HEAD since 7.6.2 release
by Johan Tibell 12 Feb '13

12 Feb '13

Hi all, I just ran nofib on current HEAD and compared it to 7.6.2 on my 64-bit Linux machine. There are some regressions I think we should look into before a release: -------------------------------------------------------------------------------- Program Size Allocs Runtime Elapsed TotalMem -------------------------------------------------------------------------------- anna -0.8% +1.5% 0.08 0.08 +0.0% ansi -0.5% +0.5% 0.00 0.00 +0.0% atom -0.9% -0.0% -3.1% -0.8% +0.0% awards -0.9% +0.1% 0.00 0.00 +0.0% banner +0.1% +2.2% 0.00 0.00 +0.0% bernouilli -0.6% +2.7% 0.12 0.13 +0.0% boyer -0.7% +0.0% 0.03 0.04 +0.0% boyer2 -0.1% +0.0% 0.01 0.01 +0.0% bspt -0.6% -0.0% 0.01 0.02 +0.0% cacheprof -0.9% +6.9% +0.8% +4.0% +0.0% calendar -0.9% +0.1% 0.00 0.00 +0.0% cichelli -0.1% -0.0% 0.06 0.06 +9.4% circsim -0.7% +0.1% +1.6% +7.0% +13.6% clausify -0.8% +0.0% 0.03 0.03 +0.0% comp_lab_zift -0.7% +0.0% 0.14 0.14 -12.5% compress -0.1% +0.0% 0.12 0.13 +0.0% compress2 -0.0% +0.0% 0.12 0.14 +2.3% constraints -0.8% +0.0% -3.3% -0.7% +0.0% cryptarithm1 -0.1% +0.0% +2.1% +4.1% +0.0% cryptarithm2 -0.0% -0.8% 0.01 0.01 +0.0% cse -0.0% -0.0% 0.00 0.00 +0.0% eliza +0.1% +7.7% 0.00 0.00 +0.0% event -0.8% +0.0% 0.09 0.10 -8.7% exp3_8 -0.8% +0.0% 0.15 0.15 +100.0% expert -0.2% +18.4% 0.00 0.00 +0.0% fem +1.5% +0.5% 0.02 0.02 +0.0% fft -0.9% +0.0% 0.02 0.03 +0.0% fft2 +3.7% +31.9% 0.05 0.05 +20.0% fibheaps -1.0% +0.3% 0.03 0.03 +0.0% fish -0.0% -0.0% 0.01 0.01 +0.0% fluid -1.3% +13.0% 0.01 0.01 +0.0% fulsom -0.2% -0.0% 0.19 0.20 +8.3% gamteb -0.7% -0.2% 0.03 0.04 +0.0% gcd -0.8% +0.0% 0.02 0.03 +0.0% gen_regexps +0.0% +2.2% 0.00 0.00 +0.0% genfft -0.8% -0.3% 0.03 0.03 +0.0% gg -0.6% +40.4% 0.01 0.02 +50.0% grep -1.8% +2.3% 0.00 0.00 +0.0% hidden -0.7% +3.5% +4.1% +7.6% +0.0% hpg -1.3% -1.3% 0.05 0.10 +0.0% ida -0.7% -1.0% 0.07 0.08 +11.1% infer -0.9% +0.5% 0.05 0.05 +30.0% integer -0.8% +1.1% +1.1% +2.3% +0.0% integrate -0.9% +56.2% 0.20 0.23 +1.0% kahan -0.9% +144.9% +77.6% +78.4% +0.0% knights -0.1% -0.4% 0.01 0.01 +0.0% lcss -0.7% +0.7% -24.3% -18.4% +1.9% life -0.2% +0.0% 0.16 0.16 +0.0% lift -0.0% +0.1% 0.00 0.00 +0.0% listcompr -0.1% -0.0% 0.06 0.06 +0.0% listcopy -0.1% -0.0% 0.06 0.06 +0.0% maillist +0.0% +1.9% 0.02 0.04 +16.5% mandel -0.8% +0.0% 0.05 0.05 +0.0% mandel2 -0.1% -4.0% 0.00 0.01 +0.0% minimax -0.2% -0.0% 0.00 0.00 +0.0% mkhprog -0.1% +1.1% 0.00 0.00 +0.0% multiplier -1.2% +0.0% 0.07 0.08 +0.0% nucleic2 -3.3% +19.5% 0.05 0.05 +0.0% para -0.0% +25.0% 0.22 0.23 +0.0% paraffins -0.8% +0.0% 0.06 0.08 +7.5% parser -1.3% +22.2% 0.03 0.03 +0.0% parstof -0.5% +4.6% 0.01 0.00 +0.0% pic +0.5% +0.0% 0.00 0.00 +0.0% power -1.0% +0.0% -0.5% +1.0% +0.0% pretty -0.2% +0.0% 0.00 0.00 +0.0% primes -0.8% -0.0% 0.04 0.05 +0.0% primetest -0.7% +0.0% 0.07 0.07 +0.0% prolog -0.2% +16.0% 0.00 0.00 +0.0% puzzle -0.1% -2.1% 0.09 0.10 +0.0% queens -0.8% +0.0% 0.02 0.02 +0.0% reptile -0.8% +0.6% 0.01 0.02 +0.0% rewrite -0.8% +0.7% 0.02 0.02 +0.0% rfib -1.0% +0.4% 0.02 0.02 +0.0% rsa -0.7% +2.5% 0.02 0.02 +0.0% scc -0.1% +0.0% 0.00 0.00 +0.0% sched -0.8% +0.0% 0.01 0.02 +0.0% scs -1.9% +0.8% -5.3% -2.7% +0.0% simple -0.3% -0.0% 0.15 0.16 +6.9% solid -0.7% +0.0% 0.09 0.09 +0.0% sorting +0.0% +55.9% 0.00 0.00 +0.0% sphere -0.9% -1.8% 0.04 0.04 +0.0% symalg -0.8% +0.3% 0.01 0.01 +0.0% tak -0.8% +0.9% 0.01 0.01 +0.0% transform -0.8% +0.0% -3.3% -5.7% +0.0% treejoin +0.1% +109.3% 0.15 0.17 -7.4% typecheck -0.8% +0.0% 0.14 0.15 +0.0% veritas -0.8% +0.0% 0.00 0.00 +0.0% wang -0.9% +0.0% 0.07 0.08 +0.0% wave4main -0.8% +1.8% 0.18 0.19 -7.1% wheel-sieve1 -0.7% +0.0% +0.0% +1.5% -12.5% wheel-sieve2 -0.7% +0.0% 0.11 0.12 +2.1% x2n1 +7.4% +43.3% 0.01 0.01 +200.0% -------------------------------------------------------------------------------- Min -3.3% -4.0% -24.3% -18.4% -12.5% Max +7.4% +144.9% +77.6% +78.4% +200.0% Geometric Mean -0.5% +5.5% +1.8% +4.3% +3.2% I haven't had time to look through the regressions yet, so if someone has time, please grab a benchmark that looks bad and have a look at the Core to see what's going on. I suggest starting with "kahan", which is a relatively simple benchmark. -- Johan

4 14

Re: Patch to time
by José Pedro Magalhães 12 Feb '13

12 Feb '13

Hi Ashley, Just to remind you of the patch to time I've previously sent you. Whenever you can apply it, we can remove the "temporary fix" patch on the GHC copy of the repo. Thanks, Pedro On Wed, Nov 28, 2012 at 3:05 PM, José Pedro Magalhães <jpm(a)cs.uu.nl> wrote: > Hi Ashley, > > I'm attaching a patch to the time package to make it derive Typeable > instances instead of defining them manually. GHC HEAD will soon ignore > handwritten Typeable instances, so this replacement is necessary. > > > Thanks, > Pedro > >

1 0

RE: [commit: vector] master: Implement poly-kinded Typeable (8b27167)
by Simon Peyton-Jones 12 Feb '13

12 Feb '13

Hang on... vector has an upstream repo; see http://hackage.haskell.org/trac/ghc/wiki/Repositories and in particular the "Upstream repo?" bullet. So we may need to do more than push to the mirror? Simon | -----Original Message----- | From: ghc-commits-bounces(a)haskell.org [mailto:ghc-commits- | bounces(a)haskell.org] On Behalf Of José Pedro Magalhães | Sent: 12 February 2013 10:41 | To: ghc-commits(a)haskell.org | Subject: [commit: vector] master: Implement poly-kinded Typeable | (8b27167) | | Repository : ssh://darcs.haskell.org//srv/darcs/packages/vector | | On branch : master | | http://hackage.haskell.org/trac/ghc/changeset/8b271670f79a3b50d7e15ca924 | 878212f042f259 | | >--------------------------------------------------------------- | | commit 8b271670f79a3b50d7e15ca924878212f042f259 | Author: Jose Pedro Magalhaes <jpm(a)cs.ox.ac.uk> | Date: Thu Feb 7 14:00:33 2013 +0000 | | Implement poly-kinded Typeable | | This patch makes the Data.Typeable.Typeable class work with | arguments of any | kind. In particular, this removes the Typeable1..7 class hierarchy, | greatly | simplyfing the whole Typeable story. Also added is the | AutoDeriveTypeable | language extension, which will automatically derive Typeable for all | types and | classes declared in that module. Since there is now no good reason | to give | handwritten instances of the Typeable class, those are ignored (for | backwards | compatibility), and a warning is emitted. | | The old, kind-* Typeable class is now called OldTypeable, and lives | in the | Data.OldTypeable module. It is deprecated, and should be removed in | some future | version of GHC. | | >--------------------------------------------------------------- | | Data/Vector/Generic.hs | 9 +++++++++ | Data/Vector/Unboxed/Base.hs | 14 +++++++++++++- | 2 files changed, 22 insertions(+), 1 deletions(-) | | diff --git a/Data/Vector/Generic.hs b/Data/Vector/Generic.hs index | b8f2e81..f17ff23 100644 | --- a/Data/Vector/Generic.hs | +++ b/Data/Vector/Generic.hs | @@ -194,7 +194,12 @@ import Prelude hiding ( length, null, | showsPrec ) | | import qualified Text.Read as Read | + | +#if __GLASGOW_HASKELL__ >= 707 | +import Data.Typeable ( Typeable, gcast1 ) #else | import Data.Typeable ( Typeable1, gcast1 ) | +#endif | | #include "vector.h" | | @@ -2020,7 +2025,11 @@ mkType :: String -> DataType {-# INLINE mkType | #-} mkType = mkNoRepType | | +#if __GLASGOW_HASKELL__ >= 707 | +dataCast :: (Vector v a, Data a, Typeable v, Typeable t) #else | dataCast :: (Vector v a, Data a, Typeable1 v, Typeable1 t) | +#endif | => (forall d. Data d => c (t d)) -> Maybe (c (v a)) {-# | INLINE dataCast #-} dataCast f = gcast1 f diff --git | a/Data/Vector/Unboxed/Base.hs b/Data/Vector/Unboxed/Base.hs index | 2d9822e..359b001 100644 | --- a/Data/Vector/Unboxed/Base.hs | +++ b/Data/Vector/Unboxed/Base.hs | @@ -1,4 +1,7 @@ | {-# LANGUAGE MultiParamTypeClasses, TypeFamilies, FlexibleContexts #-} | +#if __GLASGOW_HASKELL__ >= 707 | +{-# LANGUAGE DeriveDataTypeable, StandaloneDeriving #-} #endif | {-# OPTIONS_HADDOCK hide #-} | | -- | | @@ -29,6 +32,9 @@ import Data.Word ( Word, Word8, Word16, Word32, Word64 | ) import Data.Int ( Int8, Int16, Int32, Int64 ) import Data.Complex | | +#if __GLASGOW_HASKELL__ >= 707 | +import Data.Typeable ( Typeable ) | +#else | import Data.Typeable ( Typeable1(..), Typeable2(..), mkTyConApp, #if | MIN_VERSION_base(4,4,0) | mkTyCon3 | @@ -36,6 +42,8 @@ import Data.Typeable ( Typeable1(..), Typeable2(..), | mkTyConApp, | mkTyCon | #endif | ) | +#endif | + | import Data.Data ( Data(..) ) | | #include "vector.h" | @@ -53,7 +61,10 @@ class (G.Vector Vector a, M.MVector MVector a) => | Unbox a | -- ----------------- | -- Data and Typeable | -- ----------------- | - | +#if __GLASGOW_HASKELL__ >= 707 | +deriving instance Typeable Vector | +deriving instance Typeable MVector | +#else | #if MIN_VERSION_base(4,4,0) | vectorTyCon = mkTyCon3 "vector" | #else | @@ -65,6 +76,7 @@ instance Typeable1 Vector where | | instance Typeable2 MVector where | typeOf2 _ = mkTyConApp (vectorTyCon "Data.Vector.Unboxed.Mutable" | "MVector") [] | +#endif | | instance (Data a, Unbox a) => Data (Vector a) where | gfoldl = G.gfoldl | | | | _______________________________________________ | ghc-commits mailing list | ghc-commits(a)haskell.org | http://www.haskell.org/mailman/listinfo/ghc-commits

2 1

RE: [commit: base] type-reasoning: Reorganized TypeLits and related files as a strawman proposal. (3b04724)
by Simon Peyton-Jones 12 Feb '13

12 Feb '13

Richard Thanks. I'm content for you, Iavor, Stephanie, Conor, Adam, Pedro, Dimitrios (etc) to figure out what to do here, and merge to HEAD. Simon | -----Original Message----- | From: ghc-commits-bounces(a)haskell.org [mailto:ghc-commits- | bounces(a)haskell.org] On Behalf Of Richard Eisenberg | Sent: 12 February 2013 02:24 | To: ghc-commits(a)haskell.org | Subject: [commit: base] type-reasoning: Reorganized TypeLits and related | files as a strawman proposal. (3b04724) | | Repository : ssh://darcs.haskell.org//srv/darcs/packages/base | | On branch : type-reasoning | | http://hackage.haskell.org/trac/ghc/changeset/3b04724f6060ddde071b41ab9d | d5b73b349bf9a0 | | >--------------------------------------------------------------- | | commit 3b04724f6060ddde071b41ab9dd5b73b349bf9a0 | Author: Richard Eisenberg <eir(a)cis.upenn.edu> | Date: Mon Feb 11 21:21:07 2013 -0500 | | Reorganized TypeLits and related files as a strawman proposal. | | This commit breaks TypeLits up into four new files: | - GHC.TypeEq, which contains definitions relating to (:~:) | - GHC.Singletons, which contains all singletons definitions | that are not specific to type-level literals | - GHC.TypeLits.Internals, which is needed to create an "Unsafe" | module | - GHC.TypeLits.Unsafe, which defines unsafeSingNat and | unsafeSingSymbol. | | These changes are intended purely to provoke discussion, not | properly | as a recommendation of what we should do. | | GHC/Singletons.hs | 109 +++++++++++++++++++++++++ | GHC/TypeEq.hs | 34 ++++++++ | GHC/TypeLits.hs | 198 ++++++++++---------------------------- | ------- | GHC/TypeLits.hs-boot | 10 +++ | GHC/TypeLits/Internals.hs | 17 ++++ | GHC/TypeLits/Unsafe.hs | 17 ++++ | base.cabal | 5 + | 7 files changed, 235 insertions(+), 155 deletions(-) | | | Diff suppressed because of size. To see it, use: | | git show 3b04724f6060ddde071b41ab9dd5b73b349bf9a0 | | _______________________________________________ | ghc-commits mailing list | ghc-commits(a)haskell.org | http://www.haskell.org/mailman/listinfo/ghc-commits

1 0