Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
obsidiansystems
GHC
Commits
393f2662
Commit
393f2662
authored
Aug 07, 2008
by
batterseapower
Browse files
Remove redundant fromIntegral calls
parent
2e065952
Changes
3
Hide whitespace changes
Inline
Side-by-side
compiler/coreSyn/MkCore.lhs
View file @
393f2662
...
...
@@ -7,8 +7,9 @@ module MkCore (
mkCoreLams,
-- * Constructing boxed literals
mkWordExpr,
mkIntExpr, mkIntegerExpr,
mkWordExpr, mkWordExprWord,
mkIntExpr, mkIntExprInt,
mkIntegerExpr,
mkFloatExpr, mkDoubleExpr,
mkCharExpr, mkStringExpr, mkStringExprFS,
...
...
@@ -216,12 +217,20 @@ mkCoreLams = mkLams
\begin{code}
-- | Create a 'CoreExpr' which will evaluate to the given @Int@
mkIntExpr :: Int -> CoreExpr -- Result = I# i :: Int
mkIntExpr i = mkConApp intDataCon [mkIntLitInt i]
mkIntExpr :: Integer -> CoreExpr -- Result = I# i :: Int
mkIntExpr i = mkConApp intDataCon [mkIntLit i]
-- | Create a 'CoreExpr' which will evaluate to the given @Int@
mkIntExprInt :: Int -> CoreExpr -- Result = I# i :: Int
mkIntExprInt i = mkConApp intDataCon [mkIntLitInt i]
-- | Create a 'CoreExpr' which will evaluate to the a @Word@ with the given value
mkWordExpr :: Integer -> CoreExpr
mkWordExpr w = mkConApp wordDataCon [mkWordLit w]
-- | Create a 'CoreExpr' which will evaluate to the given @Word@
mkWordExpr
:: Word -> CoreExpr
mkWordExpr w = mkConApp wordDataCon [mkWordLitWord w]
mkWordExpr
Word
:: Word -> CoreExpr
mkWordExpr
Word
w = mkConApp wordDataCon [mkWordLitWord w]
-- | Create a 'CoreExpr' which will evaluate to the given @Integer@
mkIntegerExpr :: MonadThings m => Integer -> m CoreExpr -- Result :: Integer
...
...
compiler/deSugar/DsMeta.hs
View file @
393f2662
...
...
@@ -1250,7 +1250,7 @@ repNamedTyCon (MkC s) = rep2 conTName [s]
repTupleTyCon
::
Int
->
DsM
(
Core
TH
.
TypeQ
)
-- Note: not Core Int; it's easier to be direct here
repTupleTyCon
i
=
rep2
tupleTName
[
mkIntExpr
(
fromIntegral
i
)
]
repTupleTyCon
i
=
rep2
tupleTName
[
mkIntExpr
Int
i
]
repArrowTyCon
::
DsM
(
Core
TH
.
TypeQ
)
repArrowTyCon
=
rep2
arrowTName
[]
...
...
@@ -1345,7 +1345,7 @@ coreStringLit :: String -> DsM (Core String)
coreStringLit
s
=
do
{
z
<-
mkStringExpr
s
;
return
(
MkC
z
)
}
coreIntLit
::
Int
->
DsM
(
Core
Int
)
coreIntLit
i
=
return
(
MkC
(
mkIntExpr
(
fromIntegral
i
))
)
coreIntLit
i
=
return
(
MkC
(
mkIntExpr
Int
i
))
coreVar
::
Id
->
Core
TH
.
Name
-- The Id has type Name
coreVar
id
=
MkC
(
Var
id
)
...
...
compiler/deSugar/MatchLit.lhs
View file @
393f2662
...
...
@@ -72,7 +72,7 @@ dsLit (HsDoublePrim d) = return (Lit (MachDouble d))
dsLit (HsChar c) = return (mkCharExpr c)
dsLit (HsString str) = mkStringExprFS str
dsLit (HsInteger i _) = mkIntegerExpr i
dsLit (HsInt i) = return (mkIntExpr
(fromIntegral
i)
)
dsLit (HsInt i) = return (mkIntExpr i)
dsLit (HsRat r ty) = do
num <- mkIntegerExpr (numerator r)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment