Some fixes to hackage benchmarks
authorDavid Terei <davidterei@gmail.com>
Thu, 29 Mar 2012 06:32:51 +0000 (23:32 -0700)
committerDavid Terei <davidterei@gmail.com>
Thu, 29 Mar 2012 06:32:51 +0000 (23:32 -0700)
14 files changed:
fibon/.gitignore
fibon/Hackage/Bzlib/Codec/Compression/BZip/Stream.hsc
fibon/Hackage/QuickCheck/Fibon/Instance.hs [deleted file]
fibon/Hackage/QuickCheck/Fibon/data/ref/output/qc.stdout.expected [deleted file]
fibon/Hackage/QuickCheck/Fibon/data/test/output/qc.stdout.expected [deleted file]
fibon/Hackage/QuickCheck/Makefile
fibon/Hackage/QuickCheck/QuickCheck.cabal [deleted file]
fibon/Hackage/QuickCheck/Setup.lhs [deleted file]
fibon/Hackage/QuickCheck/Test/QuickCheck/Exception.hs
fibon/Hackage/QuickCheck/examples/ExHeap.hs
fibon/Hackage/QuickCheck/examples/ExMerge.hs
fibon/Hackage/QuickCheck/examples/ExSet.hs
fibon/Hackage/QuickCheck/examples/ExSet2.hs
fibon/Hackage/QuickCheck/examples/Set.hs

index 199c70e..4e3682e 100644 (file)
@@ -1,3 +1,5 @@
+cachegrind.out.*
+cachegrind.out.summary
 Shootout/BinaryTrees/BinaryTrees
 Shootout/ChameneosRedux/ChameneosRedux
 Shootout/Fannkuch/Fannkuch
@@ -5,3 +7,8 @@ Shootout/Mandelbrot/Mandelbrot
 Shootout/Nbody/Nbody
 Shootout/Pidigits/Pidigits
 Shootout/SpectralNorm/SpectralNorm
+Hackage/Bzlib/Codec/Compression/BZip/Stream.hs
+Hackage/Bzlib/Codec/Compression/BZip/Stream_hsc.c
+Hackage/Gf/src/compiler/GF/Grammar/Lexer.hs
+Hackage/Gf/src/compiler/GF/Grammar/Parser.hs
+
index 68451da..b19bb62 100644 (file)
@@ -58,21 +58,21 @@ module Codec.Compression.BZip.Stream (
 import Foreign
          ( Word8, Ptr, nullPtr, plusPtr, peekByteOff, pokeByteOff, mallocBytes
          , ForeignPtr, FinalizerPtr, newForeignPtr_, addForeignPtrFinalizer
-         , finalizeForeignPtr, withForeignPtr, touchForeignPtr
-         , unsafeForeignPtrToPtr, unsafePerformIO )
+         , finalizeForeignPtr, withForeignPtr, touchForeignPtr )
 import Foreign.C
-         ( CInt, CUInt )
+         ( CInt(..), CUInt )
+import Foreign.ForeignPtr.Unsafe ( unsafeForeignPtrToPtr )
 #ifdef BYTESTRING_IN_BASE
-import Data.ByteString.Base (nullForeignPtr)
+import Data.ByteString.Base ( nullForeignPtr )
 #else
-import Data.ByteString.Internal (nullForeignPtr)
+import Data.ByteString.Internal ( nullForeignPtr )
 #endif
-import System.IO.Unsafe (unsafeInterleaveIO)
-import System.IO (hPutStrLn, stderr)
-import Control.Monad (liftM)
-import Control.Exception (assert)
+import System.IO.Unsafe ( unsafeInterleaveIO, unsafePerformIO )
+import System.IO ( hPutStrLn, stderr )
+import Control.Monad ( liftM )
+import Control.Exception ( assert )
 
-import Prelude hiding (length)
+import Prelude hiding ( length )
 
 #include "bzlib.h"
 
diff --git a/fibon/Hackage/QuickCheck/Fibon/Instance.hs b/fibon/Hackage/QuickCheck/Fibon/Instance.hs
deleted file mode 100644 (file)
index f08891e..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-{-# OPTIONS_GHC -fno-warn-missing-signatures #-}
-module Fibon.Benchmarks.Hackage.QuickCheck.Fibon.Instance(
-  mkInstance
-)
-where
-import Fibon.BenchmarkInstance
-
-sharedConfig = BenchmarkInstance {
-    flagConfig = FlagConfig {
-        configureFlags = []
-      , buildFlags     = []
-      , runFlags       = []
-      }
-    , stdinInput     = Nothing
-    , output         = [(Stdout, Diff "qc.stdout.expected")]
-    , exeName        = "qc"
-  }
-flgCfg = flagConfig sharedConfig
-
-mkInstance Test = sharedConfig {
-        flagConfig = flgCfg {runFlags = ["10"]}
-    }
-mkInstance Ref  = sharedConfig {
-        flagConfig = flgCfg {runFlags = ["100000"]}
-    }
-
diff --git a/fibon/Hackage/QuickCheck/Fibon/data/ref/output/qc.stdout.expected b/fibon/Hackage/QuickCheck/Fibon/data/ref/output/qc.stdout.expected
deleted file mode 100644 (file)
index 8b6352a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Result: \c.c
diff --git a/fibon/Hackage/QuickCheck/Fibon/data/test/output/qc.stdout.expected b/fibon/Hackage/QuickCheck/Fibon/data/test/output/qc.stdout.expected
deleted file mode 100644 (file)
index 8b6352a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Result: \c.c
index 4ba6122..571c56f 100644 (file)
@@ -16,5 +16,5 @@ SRCS = Test/QuickCheck/Exception.hs \
        examples/ExHeap.hs \
        examples/Main.hs
 PROG_ARGS += 100000
-HC_OPTS += -iexamples -i. -package base -package containers -package extensible-exceptions -package ghc -package mtl -package random
+HC_OPTS += -iexamples -i. -package base -package containers -package ghc -package mtl -package random
 include $(TOP)/mk/target.mk
diff --git a/fibon/Hackage/QuickCheck/QuickCheck.cabal b/fibon/Hackage/QuickCheck/QuickCheck.cabal
deleted file mode 100644 (file)
index e326f9c..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-Name: QuickCheck
-Version: 2.3
-Cabal-Version: >= 1.2
-Build-type: Simple
-License: BSD3
-License-file: LICENSE
-Extra-source-files: README
-Copyright: Koen Claessen <koen@chalmers.se>
-Author: Koen Claessen <koen@chalmers.se>
-Maintainer: QuickCheck developers <quickcheck@projects.haskell.org>
-Homepage: http://code.haskell.org/QuickCheck
-Category:          Testing
-Synopsis:          Automatic testing of Haskell programs
-Description:
-        QuickCheck is a library for random testing of program properties.
-        .
-       The programmer provides a specification of the program, in
-       the form of properties which functions should satisfy, and
-       QuickCheck then tests that the properties hold in a large number
-       of randomly generated cases.  
-        .
-        Specifications are expressed in
-       Haskell, using combinators defined in the QuickCheck library.
-       QuickCheck provides combinators to define properties, observe
-       the distribution of test data, and define test
-       data generators.
-
-flag splitBase
-  Description: Choose the new smaller, split-up base package.
-
-flag extensibleExceptions
-  Description: Choose the even newer, even smaller, split-up base package.
-
-library
-  Buildable: False
-  Build-depends: mtl
-  if flag(extensibleExceptions)
-    Build-depends: base >= 4 && < 5, random
-  else
-    if flag(splitBase)
-      Build-depends: base >= 3 && < 4, random
-    else
-      Build-depends: base < 3
-  if impl(ghc >= 6.7) && impl(ghc < 6.13)
-      Build-depends: ghc
-  if impl(ghc >= 6.9)
-    Build-depends: extensible-exceptions
-  Exposed-Modules:
-    Test.QuickCheck,
-    Test.QuickCheck.Arbitrary,
-    Test.QuickCheck.Function,
-    Test.QuickCheck.Gen,
-    Test.QuickCheck.Monadic,
-    Test.QuickCheck.Modifiers,
-    Test.QuickCheck.Property,
-    Test.QuickCheck.Test,
-    Test.QuickCheck.Text,
-    Test.QuickCheck.Poly,
-    Test.QuickCheck.State
-  Other-Modules:
-    Test.QuickCheck.Exception
-  GHC-options:
-
-executable qc
-  main-is:        Main.hs
-  hs-source-dirs: examples, .
-  build-depends:       base > 3 && < 5, random, containers, mtl
-  if impl(ghc >= 6.7) && impl(ghc < 6.13)
-      Build-depends: ghc
-  if impl(ghc >= 6.9)
-    Build-depends: extensible-exceptions
diff --git a/fibon/Hackage/QuickCheck/Setup.lhs b/fibon/Hackage/QuickCheck/Setup.lhs
deleted file mode 100644 (file)
index e2c31e7..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env runghc
-
-> module Main where
-
-> import Distribution.Simple
-
-> main :: IO ()
-> main = defaultMain
index 548f933..47550c6 100644 (file)
@@ -16,7 +16,7 @@ module Test.QuickCheck.Exception where
 #if defined OLD_EXCEPTIONS
 import Control.Exception(evaluate, try, Exception(..))
 #else
-import Control.Exception.Extensible(evaluate, try, SomeException(SomeException)
+import Control.Exception(evaluate, try, SomeException(SomeException)
 #if defined(GHC_INTERRUPT)
   , AsyncException(UserInterrupt)
 #endif
index f16cca8..19d96e0 100644 (file)
@@ -1,4 +1,4 @@
-{-# OPTIONS -fglasgow-exts #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 module ExHeap where
 
 --------------------------------------------------------------------------
index 069d875..ecf752c 100644 (file)
@@ -1,4 +1,4 @@
-{-# OPTIONS -fglasgow-exts #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 module ExMerge where
 
 --------------------------------------------------------------------------
index c59a1c6..bd884f0 100644 (file)
@@ -1,4 +1,4 @@
-{-# OPTIONS -fglasgow-exts #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 module ExSet where
 
 --------------------------------------------------------------------------
index e512c22..226555b 100644 (file)
@@ -1,4 +1,3 @@
-{-# OPTIONS -fglasgow-exts #-}
 module Main where
 
 --------------------------------------------------------------------------
index d088420..533583a 100644 (file)
@@ -1,4 +1,3 @@
-{-# OPTIONS -fglasgow-exts #-}
 module Set where
 
 import Data.FiniteMap