[Removed support for GHC 6.2. Bumped version to 1.1.0. Nils Anders Danielsson **20050622112055 - Only supporting one version of GHC means that CPP is no longer needed. - Note that 1.1.0 is not finished yet, it is only the Cabal version tag that has been increased. ] { hunk ./ChasingBottoms.cabal 2 -version: 1.0.0 +version: 1.1.0 hunk ./ChasingBottoms.cabal 16 -tested-with: GHC==6.2.2, GHC==6.4 +tested-with: GHC==6.4 hunk ./Header 84 -The code is developed and tested under GHC 6.2 and 6.4. Most parts can +The code is developed and tested under GHC 6.4. Most parts can hunk ./Makefile 20 -# Paths to GHC 6.4 and 6.2.2, used to run the tests. +# Path to GHC 6.4, used to run the tests. hunk ./Makefile 22 -GHC_622 ?= _ghc_6.2.2 hunk ./Makefile 42 -CPPHS_PROCESSED_SUFFIX = .processed - -# CPP is used for conditional compilation. Different code is selected -# dependent on the version of GHC used. That does not affect the -# comments, though, so we can just run cpphs without bothering about -# GHC versions. -%.hs$(CPPHS_PROCESSED_SUFFIX) : %.hs - cpphs --noline $^ -O$@ - -$(DOCDIR) : $(addprefix Test/,$(EXPOSED_SOURCES:=$(CPPHS_PROCESSED_SUFFIX))) \ - Header +$(DOCDIR) : $(addprefix Test/,$(EXPOSED_SOURCES)) Header hunk ./Makefile 55 - -rm $(addprefix Test/,$(EXPOSED_SOURCES:=$(CPPHS_PROCESSED_SUFFIX))) hunk ./Makefile 57 -# Runs all tests using both GHC 6.2.2 and GHC 6.4. +# Runs all tests using GHC 6.4. hunk ./Makefile 65 - $(call testWithCompiler,$(GHC_622)) hunk ./Test/ChasingBottoms/Approx.hs 1 -{-# OPTIONS -fglasgow-exts -fallow-undecidable-instances -cpp #-} +{-# OPTIONS -fglasgow-exts -fallow-undecidable-instances #-} hunk ./Test/ChasingBottoms/Approx.hs 104 - -#if __GLASGOW_HASKELL__ <= 602 - -instance Eq DataType where - d1 == d2 = dataTypeCons d1 =|= dataTypeCons d2 - --- (=|=) implements equality on unordered lists. It is comparable in --- efficiency to (==) if the two lists are equal as lists. -(=|=) :: Eq a => [a] -> [a] -> Bool -xs =|= ys = case xs of - [] -> null ys - x:xs' -> if x `elem` ys then - xs' =|= List.delete x ys - else - False - -#else hunk ./Test/ChasingBottoms/Approx.hs 107 - -#endif hunk ./Test/ChasingBottoms/ApproxShow.hs 1 -{-# OPTIONS -fglasgow-exts -fallow-undecidable-instances -cpp #-} +{-# OPTIONS -fglasgow-exts -fallow-undecidable-instances #-} hunk ./Test/ChasingBottoms/ApproxShow.hs 126 + where + showConstr' a + | dataTypeRep (dataTypeOf a) == dataTypeRep (dataTypeOf 'c') = + "'" ++ showConstr (toConstr a) ++ "'" + | otherwise = showConstr $ toConstr a hunk ./Test/ChasingBottoms/ApproxShow.hs 139 - ------------------------------------------------------------------------- --- Compatibility functions - -#if __GLASGOW_HASKELL__ <= 602 - -showConstr' a = conString $ toConstr a -isAlgType d = maxConIndex d > 0 -constrFixity = conFixity - -#else - -showConstr' a - | dataTypeRep (dataTypeOf a) == dataTypeRep (dataTypeOf 'c') = - "'" ++ showConstr (toConstr a) ++ "'" - | otherwise = showConstr $ toConstr a - -#endif hunk ./Test/ChasingBottoms/ApproxShow/Tests.hs 1 -{-# OPTIONS -fglasgow-exts -cpp #-} +{-# OPTIONS -fglasgow-exts #-} hunk ./Test/ChasingBottoms/IsType.hs 1 -{-# OPTIONS -cpp #-} +{-# OPTIONS #-} hunk ./Test/ChasingBottoms/IsType.hs 44 - ------------------------------------------------------------------------- --- Compatibility functions - -#if __GLASGOW_HASKELL__ <= 602 - -typeRepTyCon = typerepTyCon -tyConString = tyconString -typeRepArgs = typerepArgs - -#endif hunk ./Test/ChasingBottoms/Nat.hs 1 -{-# OPTIONS -cpp -fglasgow-exts #-} +{-# OPTIONS -fglasgow-exts #-} hunk ./Test/ChasingBottoms/Nat.hs 18 -#if __GLASGOW_HASKELL__ <= 602 -import Debug.QuickCheck -#else hunk ./Test/ChasingBottoms/Nat.hs 19 -#endif hunk ./Test/ChasingBottoms/Nat/Tests.hs 1 -{-# OPTIONS -fglasgow-exts -cpp #-} +{-# OPTIONS -fglasgow-exts #-} hunk ./Test/ChasingBottoms/Nat/Tests.hs 12 -#if __GLASGOW_HASKELL__ <= 602 -import Debug.QuickCheck -import Debug.QuickCheck.Batch -#else hunk ./Test/ChasingBottoms/Nat/Tests.hs 14 -#endif hunk ./Test/ChasingBottoms/SemanticOrd.hs 1 -{-# OPTIONS -fglasgow-exts -fallow-undecidable-instances -cpp #-} +{-# OPTIONS -fglasgow-exts -fallow-undecidable-instances #-} hunk ./Test/ChasingBottoms/SemanticOrd.hs 268 - ------------------------------------------------------------------------- --- Compatibility functions - -#if __GLASGOW_HASKELL__ <= 602 - -gzipWithT :: GenericQ GenericT -> GenericQ GenericT -gzipWithT = tmapT -gzipWithM :: Monad m => GenericQ (GenericM m) -> GenericQ (GenericM m) -gzipWithM = tmapM -gzipWithQ :: GenericQ (GenericQ r) -> GenericQ (GenericQ [r]) -gzipWithQ q = tmapQl (++) [] (\x y -> [q x y]) - -#endif hunk ./Test/ChasingBottoms/SemanticOrd/Tests.hs 1 -{-# OPTIONS -fglasgow-exts -cpp #-} +{-# OPTIONS -fglasgow-exts #-} hunk ./Test/ChasingBottoms/SemanticOrd/Tests.hs 15 -#if __GLASGOW_HASKELL__ <= 602 -import Debug.QuickCheck -import Debug.QuickCheck.Batch (run) -#else hunk ./Test/ChasingBottoms/SemanticOrd/Tests.hs 17 -#endif hunk ./Test/ChasingBottoms/TestLibraryWhenCompiling.hs 1 -{-# OPTIONS -fth -cpp #-} +{-# OPTIONS -fth #-} hunk ./Test/ChasingBottoms/TestLibraryWhenCompiling.hs 10 -#if __GLASGOW_HASKELL__ <= 602 -import qualified Language.Haskell.THSyntax as TH -#else hunk ./Test/ChasingBottoms/TestLibraryWhenCompiling.hs 11 -#endif hunk ./Test/ChasingBottoms/TestLibraryWhenCompiling.hs 13 -#if __GLASGOW_HASKELL__ <= 602 - let runIO = TH.qIO -#else - let runIO = TH.runIO -#endif - b <- runIO $ do putStr "----- Testing the library. -----\n\n" - b <- Tests.main - IO.hFlush IO.stdout - return b + b <- TH.runIO $ do putStr "----- Testing the library. -----\n\n" + b <- Tests.main + IO.hFlush IO.stdout + return b hunk ./Test/ChasingBottoms/TestUtilities.hs 1 -{-# OPTIONS -cpp #-} - hunk ./Test/ChasingBottoms/TestUtilities.hs 26 -#if __GLASGOW_HASKELL__ <= 602 -import Debug.QuickCheck -import Debug.QuickCheck.Batch -#else hunk ./Test/ChasingBottoms/TestUtilities.hs 28 -#endif hunk ./Test/ChasingBottoms/Tests.hs 1 -{-# OPTIONS -fglasgow-exts -cpp #-} +{-# OPTIONS -fglasgow-exts #-} }