yes push to master! From: José Pedro Magalhães [mailto:[email protected]] Sent: 26 May 2011 17:00 To: Simon Peyton-Jones Cc: [email protected] Subject: Re: FW: [commit: ghc] master's head updated: Merge remote branch 'origin/master' into ghc-generics (97ce7b5)
Hi, 2011/5/26 Simon Peyton-Jones <[email protected]<mailto:[email protected]>> OK folks, I've merged the new generics stuff onto the master branch. Many thanks to Pedro for leading this project! Pedro: is the documentation up to date? Yes, should be ok. I had a patch improving the output of -ddump-deriving for the generic instances waiting; shall I push it to master, now? Cheers, Pedro Simon -----Original Message----- From: [email protected]<mailto:[email protected]> [mailto:[email protected]<mailto:[email protected]>] On Behalf Of Simon Peyton Jones Sent: 26 May 2011 15:58 To: [email protected]<mailto:[email protected]> Subject: [commit: ghc] master's head updated: Merge remote branch 'origin/master' into ghc-generics (97ce7b5) Repository : ssh://darcs.haskell.org//srv/darcs/ghc<http://darcs.haskell.org/srv/darcs/ghc> Branch 'master' now includes: 2a26efb... Initial commit for Pedro's new generic default methods (See his Haskell Symposium 2010 paper "A generic deriving mechaism for Haskell") 83f16ad... Adapt mkGenericDefMethBind to the new generics 8419203... Merge branch 'master' of c:/code/HEAD-git/. into ghc-generics ce2ea82... Small fixes to the generics branch to get rid of warnings, plus a false ASSERT failure 9dcc8bb... More small fixes to generics branch (doesn't compile yet) 02fa8ea... Merge branch 'master' into ghc-generics c9d713b... Merge remote branch 'origin/master' into ghc-generics 3a5c9d4... Make TcClassDcl compile 191292a... Fix Trac #5084 fbff1b7... Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics 60401bf... Use 'default' rather than 'generic' for default-method signatures ff843f7... A few comments and whitespace changes. c88891b... Merge branch 'ghc-generics' of http://darcs.haskell.org/ghc into ghc-generics db46cd4... Remove a lot of stuff from the old generic mechanism. 51d2130... More code cleanup and removing old generics stuff. 6a8dd92... Generate Par0 when appropriate. 91b9cdf... Remove some debug info left lying around. bdaefd5... Add a selector to DerivDecl. bff6e51... Add DeriveRepresentable flag. 1cf00bf... First go at making Representable0 just a standard derivable class. 5c11ece... Remove some files I accidentally added. 9241426... Remove the hasGenerics field of TyCon, improve the way the Generics flags is handled, allow for standalone deriving of Representable0. 646d997... Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics 38fe0c9... Use NoSelector when a constructor does not have fields. 7d54412... Update location of the CString stuff (from GHC.Base to GHC.CString). ada48bb... Add a new flag XDefaultSignatures to enable just the signatures on the default methods. Redefine the behavior of XGenerics to mean enable XDefaultSignatures and XDeriveRepresentable. 91a75b9... Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics fed2522... Remove HsNumTy and TypePati. fbf4bc1... Invert sense of "why" error messages, so that "or" means "or" ffabe3a... Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics ea94a66... Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics 0d3a6d5... Fix a previous incorrect merge. 858cdd2... Merge branch 'ghc-generics' of http://darcs.haskell.org/ghc into ghc-generics 8670207... Update the User Guide with generics stuff. 9b08b5f... Remove comment mentioning the old generic classes. 54ca48a... Do not enable -XGenerics when building the optimized libs. b507042... Merge branch 'ghc-generics' of http://darcs.haskell.org/ghc into ghc-generics 811746d... Rename `Representable0` to `Generic`. cb69857... Deprecate -XGenerics. a5673c5... Improve the error message when we cannot derive Generic. 903619a... "Representable0" -> "Generic" in the user's guide. c7cb47f... Make the errors for DeriveGeneric consistent with other deriving errors. 61d89bc... Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics 9e4c8ad... Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics c25b934... Remove some old code. 1b381af... Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics d872133... Fix some small things broken with the last merge. 2d4d636... Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics d7fb8d3... Simon's fixes to the generated type instances in Generics 6ad311b... Merge branch 'ghc-generics' of http://darcs.haskell.org/ghc into ghc-generics 7fd7192... Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics d9b1118... Fix a bug with standalone deriving of Generic instances. 99e9c36... Remove comment. 8f212ab... Rejig the way in which generic default method signatures are checked 5188e4e... Do not be so eager about loading family-instance modules when doing the overlap check. We only need to load the ones for modules whose family instances we need to compare! 97ce7b5... Merge remote branch 'origin/master' into ghc-generics _______________________________________________ Cvs-ghc mailing list [email protected]<mailto:[email protected]> http://www.haskell.org/mailman/listinfo/cvs-ghc
_______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
