[clean ups and remove unused module, make selftest work with the new ghc
John Meacham <john@repetae.net>**20101206122555
 Ignore-this: 5b56d3dcd7186aeab6e3b42c57db0f99
] hunk ./Makefile.am 1
-
hunk ./Makefile.am 5
-jhc_SOURCES = src/Main.hs  $(HSFILES) $(BUILT_SOURCES) $(HSBOOT) $(DRIFTFILES)
+jhc_SOURCES = src/Main.hs $(HSFILES) $(BUILT_SOURCES) $(HSBOOT) $(DRIFTFILES)
hunk ./Makefile.am 12
+CC = $(HC)
hunk ./Makefile.am 41
-
hunk ./Makefile.am 45
-GHCINC=  -i -i$(srcdir)/drift_processed  \
-	 -i$(srcdir)/src  -i$(builddir)/src -odir $(builddir)/src -hidir $(builddir)/src
+GHCINC=  -i -i$(srcdir)/drift_processed \
+	 -i$(srcdir)/src -i$(builddir)/src -odir $(builddir)/src -hidir $(builddir)/src
hunk ./Makefile.am 49
-          -package bytestring -package binary -package pretty -package mtl -package containers   \
-	  -package unix  -package haskell98 -package utf8-string  -package zlib
+          -package bytestring -package binary -package pretty -package mtl -package containers \
+	  -package unix -package haskell98 -package utf8-string -package zlib
hunk ./Makefile.am 53
-GHCOPTS= $(HSOPTS) -XBangPatterns -O @GHCFLAGS@  $(GHCDEBUGOPTS) $(GHCINC) $(PACKAGES) $(GHCLANG)
+GHCOPTS= $(HSOPTS) -XBangPatterns -O @GHCFLAGS@ $(GHCDEBUGOPTS) $(GHCINC) $(PACKAGES) $(GHCLANG)
hunk ./Makefile.am 55
-JHC_LIBS =  jhc-1.0.hl base-1.0.hl haskell98-1.0.hl applicative-1.0.hl flat-foreign-1.0.hl
+JHC_LIBS = jhc-1.0.hl base-1.0.hl haskell98-1.0.hl applicative-1.0.hl flat-foreign-1.0.hl
hunk ./Makefile.am 59
-             lib/jhc lib/base lib/haskell98 lib/flat-foreign $(JHC_LIBS) $(JHC_EXT_LIBS)  \
+             lib/jhc lib/base lib/haskell98 lib/flat-foreign $(JHC_LIBS) $(JHC_EXT_LIBS) \
hunk ./Makefile.am 61
-	     src/StringTable/Atom.hsc jhc.spec lib/applicative/applicative.cabal  \
+	     src/StringTable/Atom.hsc jhc.spec lib/applicative/applicative.cabal \
hunk ./Makefile.am 65
-CC = $(HC)
-
hunk ./Makefile.am 69
-	find $(distdir) \( -name _darcs -o -name \*.ho \)  -print | xargs rm -rf --
+	find $(distdir) \( -name _darcs -o -name \*.ho \) -print | xargs rm -rf --
hunk ./Makefile.am 77
-	for lib in $(JHC_LIBS) $(JHC_EXT_LIBS); do  \
+	for lib in $(JHC_LIBS) $(JHC_EXT_LIBS); do \
hunk ./Makefile.am 86
-	for lib in $(JHC_LIBS) $(JHC_EXT_LIBS); do  \
+	for lib in $(JHC_LIBS) $(JHC_EXT_LIBS); do \
hunk ./Makefile.am 142
-	perl $(srcdir)/utils/opt_sets.prl -n $< $<  > $@
+	perl $(srcdir)/utils/opt_sets.prl -n $< $< > $@
hunk ./Makefile.am 145
-	perl $(srcdir)/utils/opt_sets.prl -f f -m -n $< $<  > $@
+	perl $(srcdir)/utils/opt_sets.prl -f f -m -n $< $< > $@
hunk ./Makefile.am 156
-src/RawFiles.hs:  utils/op_raw.prl $(RAWFILES)
-	perl $< $(basename $@)  $(RAWFILES) > $@
+src/RawFiles.hs: utils/op_raw.prl $(RAWFILES)
+	perl $< $(basename $@) $(RAWFILES) > $@
hunk ./Makefile.am 159
-src/RtsFiles.hs:  utils/op_raw.prl $(RTSFILES)
-	perl $< -c $(basename $@)  $(RTSFILES) > $@
+src/RtsFiles.hs: utils/op_raw.prl $(RTSFILES)
+	perl $< -c $(basename $@) $(RTSFILES) > $@
hunk ./Makefile.am 215
-
hunk ./Makefile.am 242
-	pandoc $<  -f markdown -t html >> $@
+	pandoc $< -f markdown -t html >> $@
hunk ./Makefile.am 255
-jhc_man.mkd:  utils/stitch.prl  docs/man_header.mkd $(JHC_MANUAL_FILES)
+jhc_man.mkd: utils/stitch.prl docs/man_header.mkd $(JHC_MANUAL_FILES)
hunk ./Makefile.am 258
-man:  jhc_man.mkd
+man: jhc_man.mkd
hunk ./Makefile.am 278
-	./jhc  -L- -L. $(JHC_TEST) $< -o $@ 2>&1 | tee $@.log
+	./jhc -L- -L. $(JHC_TEST) $< -o $@ 2>&1 | tee $@.log
hunk ./selftest/SelfTest.hs 1
-
hunk ./selftest/SelfTest.hs 19
-import Util.ArbitraryInstances()
hunk ./selftest/SelfTest.hs 26
-
-
-type Prop = Info.Types.Property
-
hunk ./selftest/SelfTest.hs 112
-        prop_enum :: Prop -> Prop -> Bool
+        prop_enum :: Info.Types.Property -> Info.Types.Property -> Bool
hunk ./src/Util/ArbitraryInstances.hs 1
-module Util.ArbitraryInstances() where
-
-import Test.QuickCheck
-import Monad
-import Char(chr)
-
---instance Arbitrary a => Arbitrary (Maybe a) where
---    arbitrary = do
---        i <- choose ((0::Int),7)
---        if i == 0 then return Nothing else do
---            x <- arbitrary
---            return (Just x)
-    --coarbitrary Nothing = variant 0 . coarbitrary
---instance (Arbitrary a, Arbitrary b) => Arbitrary (Either a b) where
---    arbitrary = do
---        i <- choose ((0::Int),1)
---        case i of
---            0 -> liftM Left arbitrary
---            1 -> liftM Right arbitrary
---
-instance Arbitrary Char where
-    arbitrary = g where
-        g = do
-            c <- choose (0x20, 0xFF)
-            if c > 0x7E && c < 0xA0 then g else return (chr c)
rmfile ./src/Util/ArbitraryInstances.hs