summaryrefslogtreecommitdiff
path: root/compiler/ghci
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2009-07-30 10:55:32 +0000
committerIan Lynagh <igloo@earth.li>2009-07-30 10:55:32 +0000
commita7e145c050bdf08e4f4dbe4dfa68f3f87dfdeef6 (patch)
tree0e80b11a303705fc0a6c40dd7de32d454f37ef03 /compiler/ghci
parentb7fe69ecd3cff467bb33913c9f36d66f2cf8ac4a (diff)
downloadhaskell-a7e145c050bdf08e4f4dbe4dfa68f3f87dfdeef6.tar.gz
Remove some redundant fromIntegral's
Diffstat (limited to 'compiler/ghci')
-rw-r--r--compiler/ghci/ByteCodeAsm.lhs2
-rw-r--r--compiler/ghci/ByteCodeGen.lhs4
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/ghci/ByteCodeAsm.lhs b/compiler/ghci/ByteCodeAsm.lhs
index 1a99096a9b..5980810f88 100644
--- a/compiler/ghci/ByteCodeAsm.lhs
+++ b/compiler/ghci/ByteCodeAsm.lhs
@@ -174,7 +174,7 @@ mkBitmapArray bsize bitmap
mkInstrArray :: Word16 -> [Word16] -> UArray Word16 Word16
mkInstrArray n_insns asm_insns
- = listArray (0, n_insns) (fromIntegral n_insns : asm_insns)
+ = listArray (0, n_insns) (n_insns : asm_insns)
-- instrs nonptrs ptrs
type AsmState = (SizedSeq Word16,
diff --git a/compiler/ghci/ByteCodeGen.lhs b/compiler/ghci/ByteCodeGen.lhs
index 8a4b5e29a9..4ec8043851 100644
--- a/compiler/ghci/ByteCodeGen.lhs
+++ b/compiler/ghci/ByteCodeGen.lhs
@@ -438,7 +438,7 @@ schemeE d s p (AnnLet binds (_,body))
compile_bind d' fvs x rhs size arity off = do
bco <- schemeR fvs (x,rhs)
- build_thunk (fromIntegral d') fvs size bco off arity
+ build_thunk d' fvs size bco off arity
compile_binds =
[ compile_bind d' fvs x rhs size arity n
@@ -1203,7 +1203,7 @@ pushAtom d p (AnnVar v)
= return (unitOL (PUSH_PRIMOP primop), 1)
| Just d_v <- lookupBCEnv_maybe p v -- v is a local variable
- = let l = d - fromIntegral d_v + sz - 2
+ = let l = d - d_v + sz - 2
in return (toOL (genericReplicate sz (PUSH_L l)), sz)
-- d - d_v the number of words between the TOS
-- and the 1st slot of the object