projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ccaf705
)
[project @ 2002-02-12 09:43:08 by simonmar]
author
simonmar
<unknown>
Tue, 12 Feb 2002 09:43:08 +0000
(09:43 +0000)
committer
simonmar
<unknown>
Tue, 12 Feb 2002 09:43:08 +0000
(09:43 +0000)
fromInt ==> fromIntegral
ghc/compiler/typecheck/TcGenDeriv.lhs
patch
|
blob
|
history
diff --git
a/ghc/compiler/typecheck/TcGenDeriv.lhs
b/ghc/compiler/typecheck/TcGenDeriv.lhs
index
ac77456
..
175973b
100644
(file)
--- 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 )
import Maybes ( maybeToBool )
import Constants
import List ( partition, intersperse )
-
-#if __GLASGOW_HASKELL__ >= 404
-import GlaExts ( fromInt )
-#endif
\end{code}
%************************************************************************
\end{code}
%************************************************************************
@@
-1034,12
+1030,12
@@
getLRPrecs is_infix get_fixity nm = [lp, rp]
| otherwise = paren_con_prec + 1
defaultPrecedence :: Integer
| 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
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 =
isLRAssoc :: FixityEnv -> Name -> (Bool, Bool)
isLRAssoc get_fixity nm =