X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=GHC%2FInt.hs;h=27ee9906cd89b6e9bf1cea1f4576f0369ca0a79b;hb=7dbb606d7b57cdad87a0ffbdb6ea4a274ebca7c0;hp=146bf66e48b75ee7643f831bb4c288b4d7805249;hpb=e95046ebf2e4833b56c6ddaf5b3108390cee08a5;p=ghc-base.git diff --git a/GHC/Int.hs b/GHC/Int.hs index 146bf66..27ee990 100644 --- a/GHC/Int.hs +++ b/GHC/Int.hs @@ -42,8 +42,7 @@ import GHC.Err import GHC.Word hiding (uncheckedShiftL64#, uncheckedShiftRL64#) import GHC.Show import GHC.Float () -- for RealFrac methods --- For defining instances for the new generic deriving mechanism ---import GHC.Generics (Arity(..), Associativity(..), Fixity(..)) + ------------------------------------------------------------------------ -- type Int8 @@ -911,29 +910,6 @@ instance Ix Int64 where unsafeIndex (m,_) i = fromIntegral i - fromIntegral m inRange (m,n) i = m <= i && i <= n ------------------------------------------------------------------------- --- Generic deriving ------------------------------------------------------------------------- - --- We need instances for some basic datatypes, but some of those use Int, --- so we have to put the instances here -{- -deriving instance Eq Arity -deriving instance Eq Associativity -deriving instance Eq Fixity - -deriving instance Ord Arity -deriving instance Ord Associativity -deriving instance Ord Fixity - -deriving instance Read Arity -deriving instance Read Associativity -deriving instance Read Fixity - -deriving instance Show Arity -deriving instance Show Associativity -deriving instance Show Fixity --} {- Note [Order of tests]