diff --git a/ghc-syb.cabal b/ghc-syb.cabal --- a/ghc-syb.cabal +++ b/ghc-syb.cabal @@ -1,5 +1,5 @@ name: ghc-syb -version: 0.1.2.1 +version: 0.1.2.2 license: BSD3 license-file: LICENSE author: Claus Reinke @@ -12,19 +12,23 @@ stability: provisional build-type: Simple cabal-version: >= 1.2.3 -tested-with: GHC ==6.10.1 +tested-with: GHC ==6.10.1, GHC ==6.10.4 -- extra-source-files: README library build-depends: base >= 4 && < 5, syb >= 0.1 && < 0.2, - ghc >= 6.10 && < 6.12 + ghc >= 6.10 && < 6.14 hs-source-dirs: src extensions: CPP, TypeSynonymInstances, StandaloneDeriving, DeriveDataTypeable, ScopedTypeVariables, RankNTypes exposed-modules: GHC.SYB.Instances, GHC.SYB.Utils + if impl(ghc >= 6.12) + cpp-options: -DCAN_SPELL -DHAS_SIMPLE_DOCS -DHAS_TUPARG + if impl(ghc < 6.12) + cpp-options: -DHAS_DN_STUFF -DHAS_FOTYPE if impl(ghc > 6.11.20081030) cpp-options: -DHAS_ANNOTATIONS if impl(ghc >= 6.11.20090318) diff --git a/src/GHC/SYB/Instances.hs b/src/GHC/SYB/Instances.hs --- a/src/GHC/SYB/Instances.hs +++ b/src/GHC/SYB/Instances.hs @@ -17,7 +17,7 @@ -- don't traverse? toConstr _ = abstractConstr "SrcSpan" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "SrcSpan" + dataTypeOf _ = mkNoRepType "SrcSpan" @ - abstract traversal: 'NameSet', 'Bag' @@ -27,7 +27,7 @@ gfoldl k z s = z mkNameSet `k` nameSetToList s -- traverse abstractly toConstr _ = abstractConstr "NameSet" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "NameSet" + dataTypeOf _ = mkNoRepType "NameSet" @ Please report any issues, either with these abstract instances or with @@ -65,6 +65,10 @@ abstractConstr n = mkConstr (abstractDataType n) ("{abstract:"++n++"}") [] Prefix abstractDataType n = mkDataType n [abstractConstr n] +#ifndef CAN_SPELL +mkNoRepType = mkNorepType +#endif + -- Typeable0 INSTANCE_TYPEABLE0(SrcSpan,srcSpanTc,"SrcSpan") @@ -72,21 +76,21 @@ -- don't traverse? toConstr _ = abstractConstr "SrcSpan" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "SrcSpan" + dataTypeOf _ = mkNoRepType "SrcSpan" INSTANCE_TYPEABLE0(Module,moduleTc,"Module") instance Data Module where -- don't traverse? toConstr _ = abstractConstr "Module" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "Module" + dataTypeOf _ = mkNoRepType "Module" INSTANCE_TYPEABLE0(ModuleName,moduleNameTc,"ModuleName") instance Data ModuleName where -- don't traverse? toConstr _ = abstractConstr "ModuleName" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "ModuleName" + dataTypeOf _ = mkNoRepType "ModuleName" deriving instance Typeable RdrName deriving instance Data RdrName @@ -96,21 +100,21 @@ -- don't traverse? toConstr _ = abstractConstr "OccName" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "OccName" + dataTypeOf _ = mkNoRepType "OccName" INSTANCE_TYPEABLE0(Name,nameTc,"Name") instance Data Name where -- don't traverse? toConstr _ = abstractConstr "Name" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "Name" + dataTypeOf _ = mkNoRepType "Name" deriving instance Typeable FastString instance Data FastString where -- don't traverse? toConstr _ = abstractConstr "FastString" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "FastString" + dataTypeOf _ = mkNoRepType "FastString" deriving instance Typeable HsExplicitForAll deriving instance Data HsExplicitForAll @@ -141,14 +145,14 @@ -- don't traverse? toConstr _ = abstractConstr "DataCon" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "DataCon" + dataTypeOf _ = mkNoRepType "DataCon" INSTANCE_TYPEABLE0(Var,varTc,"Var") instance Data Var where -- don't traverse? toConstr _ = abstractConstr "Var" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "Var" + dataTypeOf _ = mkNoRepType "Var" deriving instance Typeable InlineSpec deriving instance Data InlineSpec @@ -173,8 +177,10 @@ deriving instance Typeable CExportSpec deriving instance Data CExportSpec +#if HAS_DN_STUFF deriving instance Typeable DNCallSpec deriving instance Data DNCallSpec +#endif deriving instance Typeable Safety deriving instance Data Safety @@ -182,11 +188,13 @@ deriving instance Typeable CCallConv deriving instance Data CCallConv +#if HAS_DN_STUFF deriving instance Typeable DNKind deriving instance Data DNKind deriving instance Typeable DNType deriving instance Data DNType +#endif deriving instance Typeable CCallTarget deriving instance Data CCallTarget @@ -199,10 +207,12 @@ gfoldl k z s = z mkNameSet `k` nameSetToList s -- traverse abstractly toConstr _ = abstractConstr "NameSet" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "NameSet" + dataTypeOf _ = mkNoRepType "NameSet" +#if HAS_FOTYPE deriving instance Typeable FoType deriving instance Data FoType +#endif deriving instance Typeable FamilyFlavour deriving instance Data FamilyFlavour @@ -215,14 +225,14 @@ -- don't traverse? toConstr _ = abstractConstr "TyCon.TyCon" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "TyCon.TyCon" + dataTypeOf _ = mkNoRepType "TyCon.TyCon" INSTANCE_TYPEABLE0(Class,classTc,"Class") instance Data Class where -- don't traverse? toConstr _ = abstractConstr "Class" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "Class" + dataTypeOf _ = mkNoRepType "Class" deriving instance Typeable Prag deriving instance Data Prag @@ -262,7 +272,17 @@ deriving instance Typeable IsCafCC deriving instance Data IsCafCC +#if HAS_SIMPLE_DOCS +deriving instance Typeable HsDocString +deriving instance Data HsDocString +deriving instance Typeable DocDecl +deriving instance Data DocDecl +#else +deriving instance Typeable1 DocDecl +deriving instance Data a => Data (DocDecl a) +#endif + -- Typeable1 deriving instance Typeable1 Located @@ -271,11 +291,13 @@ deriving instance Typeable1 HsModule deriving instance Data a => Data (HsModule a) +#if !HAS_SIMPLE_DOCS deriving instance Typeable1 HsDoc deriving instance Data a => Data (HsDoc a) deriving instance Typeable1 HaddockModInfo deriving instance Data a => Data (HaddockModInfo a) +#endif deriving instance Typeable1 HsDecl deriving instance Data a => Data (HsDecl a) @@ -289,9 +311,6 @@ deriving instance Typeable1 TyClDecl deriving instance Data a => Data (TyClDecl a) -deriving instance Typeable1 DocDecl -deriving instance Data a => Data (DocDecl a) - deriving instance Typeable1 SpliceDecl deriving instance Data a => Data (SpliceDecl a) @@ -333,7 +352,7 @@ gfoldl k z b = z listToBag `k` bagToList b -- traverse abstract type abstractly toConstr _ = abstractConstr $ "Bag("++show (typeOf (undefined::a))++")" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "Bag" + dataTypeOf _ = mkNoRepType "Bag" deriving instance Typeable1 HsTyVarBndr deriving instance Data a => Data (HsTyVarBndr a) @@ -413,6 +432,11 @@ deriving instance Typeable1 Expr deriving instance Data a => Data (Expr a) +#if HAS_TUPARG +deriving instance Typeable1 HsTupArg +deriving instance Data a => Data (HsTupArg a) +#endif + -- Typeable2 deriving instance Typeable2 HsBindLR @@ -444,5 +468,6 @@ deriving instance Typeable1 AnnProvenance #endif -#endif +-- end of ifdef __HADDOCK__ +#endif