From: simonmar Date: Tue, 12 Feb 2002 09:43:08 +0000 (+0000) Subject: [project @ 2002-02-12 09:43:08 by simonmar] X-Git-Tag: Approximately_9120_patches~98 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;ds=sidebyside;h=505f84a8711baf64165a171824a256e75f253cd4;hp=ccaf705775714bc5a8ffc9ea4f68fffcbf1e5b7c;p=ghc-hetmet.git [project @ 2002-02-12 09:43:08 by simonmar] fromInt ==> fromIntegral --- diff --git a/ghc/compiler/typecheck/TcGenDeriv.lhs b/ghc/compiler/typecheck/TcGenDeriv.lhs index ac77456..175973b 100644 --- a/ghc/compiler/typecheck/TcGenDeriv.lhs +++ b/ghc/compiler/typecheck/TcGenDeriv.lhs @@ -64,10 +64,6 @@ import Panic ( panic, assertPanic ) import Maybes ( maybeToBool ) import Constants import List ( partition, intersperse ) - -#if __GLASGOW_HASKELL__ >= 404 -import GlaExts ( fromInt ) -#endif \end{code} %************************************************************************ @@ -1034,12 +1030,12 @@ getLRPrecs is_infix get_fixity nm = [lp, rp] | otherwise = paren_con_prec + 1 defaultPrecedence :: Integer -defaultPrecedence = fromInt maxPrecedence +defaultPrecedence = fromIntegral maxPrecedence getPrecedence :: FixityEnv -> Name -> Integer getPrecedence get_fixity nm = case lookupFixity get_fixity nm of - Fixity x _ -> fromInt x + Fixity x _ -> fromIntegral x isLRAssoc :: FixityEnv -> Name -> (Bool, Bool) isLRAssoc get_fixity nm =