Mon May 18 13:09:03 BST 2009 Simon Marlow * abstractify ModName, PkgName and OccName; drop dependency on packedstring New patches: [abstractify ModName, PkgName and OccName; drop dependency on packedstring Simon Marlow **20090518120903 Ignore-this: 72eecae0e69859c56ae0125e5c5262f8 ] { adddir ./Language/Haskell/TH/Syntax hunk ./Language/Haskell/TH/Syntax.hs 52 PkgName, mkPkgName, pkgString ) where -import Data.PackedString import GHC.Base ( Int(..), Int#, (<#), (==#) ) hunk ./Language/Haskell/TH/Syntax.hs 54 +import Language.Haskell.TH.Syntax.Internals import Data.Data (Data(..), Typeable, mkConstr, mkDataType, constrIndex) import qualified Data.Data as Data import Data.IORef hunk ./Language/Haskell/TH/Syntax.hs 285 -- Names and uniques ----------------------------------------------------- -type ModName = PackedString -- Module name - mkModName :: String -> ModName hunk ./Language/Haskell/TH/Syntax.hs 286 -mkModName s = packString s +mkModName s = ModName s modString :: ModName -> String hunk ./Language/Haskell/TH/Syntax.hs 289 -modString m = unpackPS m - +modString (ModName m) = m hunk ./Language/Haskell/TH/Syntax.hs 291 -type PkgName = PackedString -- package name mkPkgName :: String -> PkgName hunk ./Language/Haskell/TH/Syntax.hs 293 -mkPkgName s = packString s +mkPkgName s = PkgName s pkgString :: PkgName -> String hunk ./Language/Haskell/TH/Syntax.hs 296 -pkgString m = unpackPS m +pkgString (PkgName m) = m ----------------------------------------------------- hunk ./Language/Haskell/TH/Syntax.hs 303 -- OccName ----------------------------------------------------- -type OccName = PackedString - mkOccName :: String -> OccName hunk ./Language/Haskell/TH/Syntax.hs 304 -mkOccName s = packString s +mkOccName s = OccName s occString :: OccName -> String hunk ./Language/Haskell/TH/Syntax.hs 307 -occString occ = unpackPS occ +occString (OccName occ) = occ ----------------------------------------------------- addfile ./Language/Haskell/TH/Syntax/Internals.hs hunk ./Language/Haskell/TH/Syntax/Internals.hs 1 +{-# LANGUAGE GeneralizedNewtypeDeriving,DeriveDataTypeable #-} +----------------------------------------------------------------------------- +-- | +-- Module : Language.Haskell.Syntax.Internals +-- Copyright : (c) The University of Glasgow 2009 +-- License : BSD-style (see the file libraries/base/LICENSE) +-- +-- Maintainer : libraries@haskell.org +-- Stability : experimental +-- Portability : portable +-- +-- Abstract syntax definitions for Template Haskell. +-- +----------------------------------------------------------------------------- + +module Language.Haskell.TH.Syntax.Internals ( + ModName(..), PkgName(..), OccName(..) + ) where + +import Data.Typeable +import Data.Data + +newtype ModName = ModName String -- Module name + deriving (Eq,Ord,Typeable,Data) + +newtype PkgName = PkgName String -- package name + deriving (Eq,Ord,Typeable,Data) + +newtype OccName = OccName String + deriving (Eq,Ord,Typeable,Data) hunk ./template-haskell.cabal 2 name: template-haskell -version: 2.3.0.0 +version: 2.4.0.0 license: BSD3 license-file: LICENSE maintainer: libraries@haskell.org hunk ./template-haskell.cabal 13 Cabal-Version: >= 1.6 Library - build-depends: base, pretty, packedstring, containers + build-depends: base, pretty, containers exposed-modules: hunk ./template-haskell.cabal 15 + Language.Haskell.TH.Syntax.Internals Language.Haskell.TH.Syntax Language.Haskell.TH.PprLib Language.Haskell.TH.Ppr } Context: [Add liftString, to match the "improve lifting for strings" patch in the compiler simonpj@microsoft.com**20090527180613 Ignore-this: 2096d87c13ee904932362b8e8c4892ba ] [Added bang patterns Manuel M T Chakravarty **20090326100706 Ignore-this: 30dd82e3eeac529fdddafd87be6164b4 ] [Template Haskell: kind annotations Manuel M T Chakravarty **20090326093236 Ignore-this: bfa56c07445855d52c7cedd849071630 - Kind annotations at variables in type declarations - Kind signatures in types *** This patch changes the API! Existing client code will break! *** ] [Added INLINE and SPECIALISE pragmas as declaration forms Manuel M T Chakravarty **20090324233521 Ignore-this: bab99fb3df6e41993ddce3786d980546 ] [Adding equality constraints Manuel M T Chakravarty **20090319131054 Ignore-this: fabdcf21bf536bbc5a16f6868e2177ea - This patch adds equality constraints - This requires an incompatible change of the type TH.Cxt - hence: *** This patch changes the API! Existing client code will break! *** - I took the opportunity to sanitise the definition of contexts a bit. ] [Added type family declarations forms Manuel M T Chakravarty **20090319054003 Ignore-this: c280194ef348c681b942d1f76db56d21 - Adds type family and instance declarations, both on the top level and as associated types - No equality constraints yet ] [get unsafePerformIO from a documented location Simon Marlow **20090121212755] [Require Cabal version >= 1.6 Ian Lynagh **20090122011329] [Add "bug-reports" and "source-repository" info to the Cabal file Ian Lynagh **20090121182826 Also switched to the modern Cabal file format ] [#2875: Correct SYB's representation of Char jpm@cs.uu.nl**20090119112409] [Fix the definitions of trueName and falseName Ian Lynagh **20081112135645] [Make NameFlavour have a full Data instance so annotations can deserialize it Max Bolingbroke **20081016122501] [Fix Trac #2700: pretty-printing of types simonpj@microsoft.com**20081025164428] [eliminate dependency on syb Ross Paterson **20081005092520] [Bump version number to 2.3.0.0 Ian Lynagh **20080920160243] [TAG 6.10 branch has been forked Ian Lynagh **20080919123439] [Add a dep on syb Ian Lynagh **20080825214350] [Follow tuple datatype movements Ian Lynagh **20080805102948] [Follow flag name change Ian Lynagh **20080719215337] [Make the package -Wall clean Ian Lynagh **20080619001100] [Make the StringConstr [] case of dataToQa fail rather than be an unhandled case Ian Lynagh **20080619001004] [Make rename of a SigP fail properly, rather than just being an unhandled case Ian Lynagh **20080619000806] [We only need -fno-warn-deprecations, not -w Ian Lynagh **20080616233139] [List exact extensions used rather than using -fglasgow-exts Ian Lynagh **20080616233016] [TAG 2008-05-28 Ian Lynagh **20080528004440] Patch bundle hash: 0d8d88aa898e5c26286749d0b6c60cde1a88c552