\begin{code}
module RnExpr (
- rnMatch, rnGRHSs, rnPat, rnExpr, rnExprs,
+ rnMatch, rnGRHSs, rnPat, rnExpr, rnExprs, rnStmt,
checkPrecMatch
) where
import CmdLineOpts ( DynFlag(..), opt_IgnoreAsserts )
import Literal ( inIntRange )
import BasicTypes ( Fixity(..), FixityDirection(..), defaultFixity, negateFixity )
-import PrelNames ( hasKey, assertIdKey,
+import PrelNames ( hasKey, assertIdKey, minusName, negateName, fromIntegerName,
eqClass_RDR, foldr_RDR, build_RDR, eqString_RDR,
cCallableClass_RDR, cReturnableClass_RDR,
monadClass_RDR, enumClass_RDR, ordClass_RDR,
- ratioDataCon_RDR, negate_RDR, assertErr_RDR,
- ioDataCon_RDR, plusInteger_RDR, timesInteger_RDR
+ ratioDataCon_RDR, assertErr_RDR,
+ ioDataCon_RDR, plusInteger_RDR, timesInteger_RDR,
+ fromInteger_RDR, fromRational_RDR,
)
import TysPrim ( charPrimTyCon, addrPrimTyCon, intPrimTyCon,
floatPrimTyCon, doublePrimTyCon
lookupOrigName eqClass_RDR `thenRn` \ eq -> -- Needed to find equality on pattern
returnRn (NPatIn lit', fvs1 `addOneFV` eq)
-rnPat (NPlusKPatIn name lit minus)
+rnPat (NPlusKPatIn name lit)
= rnOverLit lit `thenRn` \ (lit', fvs) ->
lookupOrigName ordClass_RDR `thenRn` \ ord ->
lookupBndrRn name `thenRn` \ name' ->
- lookupOccRn minus `thenRn` \ minus' ->
- returnRn (NPlusKPatIn name' lit' minus', fvs `addOneFV` ord `addOneFV` minus')
+ returnRn (NPlusKPatIn name' lit', fvs `addOneFV` ord `addOneFV` minusName)
rnPat (LazyPatIn pat)
= rnPat pat `thenRn` \ (pat', fvs) ->
getModeRn `thenRn` \ mode ->
-- See comments with rnExpr (OpApp ...)
- (case mode of
- InterfaceMode -> returnRn (ConOpPatIn pat1' con' defaultFixity pat2')
- SourceMode -> lookupFixityRn con' `thenRn` \ fixity ->
- mkConOpPatRn pat1' con' fixity pat2'
+ (if isInterfaceMode mode
+ then returnRn (ConOpPatIn pat1' con' defaultFixity pat2')
+ else lookupFixityRn con' `thenRn` \ fixity ->
+ mkConOpPatRn pat1' con' fixity pat2'
) `thenRn` \ pat' ->
returnRn (pat', fvs1 `plusFV` fvs2 `addOneFV` con')
tyvars_in_pats = extractPatsTyVars pats
forall_tyvars = filter (not . (`elemFM` name_env)) tyvars_in_sigs
doc_sig = text "a pattern type-signature"
- doc_pats = text "in a pattern match"
+ doc_pats = text "a pattern match"
in
bindNakedTyVarsFVRn doc_sig forall_tyvars $ \ sig_tyvars ->
returnRn ()
) `thenRn_`
- rnStmts rnExpr guarded `thenRn` \ ((_, guarded'), fvs) ->
+ rnStmts guarded `thenRn` \ ((_, guarded'), fvs) ->
returnRn (GRHS guarded' locn, fvs)
where
-- Standard Haskell 1.4 guards are just a single boolean
-- expression, rather than a list of qualifiers as in the
-- Glasgow extension
- is_standard_guard [ExprStmt _ _] = True
- is_standard_guard [GuardStmt _ _, ExprStmt _ _] = True
- is_standard_guard other = False
+ is_standard_guard [ExprStmt _ _] = True
+ is_standard_guard [ExprStmt _ _, ExprStmt _ _] = True
+ is_standard_guard other = False
\end{code}
%************************************************************************
-- that the deriving code generator got the association correct
-- Don't even look up the fixity when in interface mode
getModeRn `thenRn` \ mode ->
- (case mode of
- SourceMode -> lookupFixityRn op_name `thenRn` \ fixity ->
- mkOpAppRn e1' op' fixity e2'
- InterfaceMode -> returnRn (OpApp e1' op' defaultFixity e2')
+ (if isInterfaceMode mode
+ then returnRn (OpApp e1' op' defaultFixity e2')
+ else lookupFixityRn op_name `thenRn` \ fixity ->
+ mkOpAppRn e1' op' fixity e2'
) `thenRn` \ final_e ->
returnRn (final_e,
fv_e1 `plusFV` fv_op `plusFV` fv_e2)
-rnExpr (NegApp e n)
+rnExpr (NegApp e)
= rnExpr e `thenRn` \ (e', fv_e) ->
- lookupOrigName negate_RDR `thenRn` \ neg ->
- mkNegAppRn e' neg `thenRn` \ final_e ->
- returnRn (final_e, fv_e `addOneFV` neg)
+ mkNegAppRn e' `thenRn` \ final_e ->
+ returnRn (final_e, fv_e `addOneFV` negateName)
rnExpr (HsPar e)
= rnExpr e `thenRn` \ (e', fvs_e) ->
rnExpr e@(HsDo do_or_lc stmts src_loc)
= pushSrcLocRn src_loc $
lookupOrigNames implicit_rdr_names `thenRn` \ implicit_fvs ->
- rnStmts rnExpr stmts `thenRn` \ ((_, stmts'), fvs) ->
+ rnStmts stmts `thenRn` \ ((_, stmts'), fvs) ->
-- check the statement list ends in an expression
case last stmts' of {
ExprStmt _ _ -> returnRn () ;
- ReturnStmt _ -> returnRn () ; -- for list comprehensions
_ -> addErrRn (doStmtListErr e)
} `thenRn_`
returnRn (HsDo do_or_lc stmts' src_loc, fvs `plusFV` implicit_fvs)
Quals.
\begin{code}
-type RnExprTy = RdrNameHsExpr -> RnMS (RenamedHsExpr, FreeVars)
-
-rnStmts :: RnExprTy
- -> [RdrNameStmt]
+rnStmts :: [RdrNameStmt]
-> RnMS (([Name], [RenamedStmt]), FreeVars)
-rnStmts rn_expr []
+rnStmts []
= returnRn (([], []), emptyFVs)
-rnStmts rn_expr (stmt:stmts)
+rnStmts (stmt:stmts)
= getLocalNameEnv `thenRn` \ name_env ->
- rnStmt rn_expr stmt $ \ stmt' ->
- rnStmts rn_expr stmts `thenRn` \ ((binders, stmts'), fvs) ->
+ rnStmt stmt $ \ stmt' ->
+ rnStmts stmts `thenRn` \ ((binders, stmts'), fvs) ->
returnRn ((binders, stmt' : stmts'), fvs)
-rnStmt :: RnExprTy -> RdrNameStmt
+rnStmt :: RdrNameStmt
-> (RenamedStmt -> RnMS (([Name], a), FreeVars))
-> RnMS (([Name], a), FreeVars)
+-- The thing list of names returned is the list returned by the
+-- thing_inside, plus the binders of the arguments stmt
+
-- Because of mutual recursion we have to pass in rnExpr.
-rnStmt rn_expr (ParStmt stmtss) thing_inside
- = mapFvRn (rnStmts rn_expr) stmtss `thenRn` \ (bndrstmtss, fv_stmtss) ->
- let (binderss, stmtss') = unzip bndrstmtss
+rnStmt (ParStmt stmtss) thing_inside
+ = mapFvRn rnStmts stmtss `thenRn` \ (bndrstmtss, fv_stmtss) ->
+ let binderss = map fst bndrstmtss
checkBndrs all_bndrs bndrs
= checkRn (null (intersectBy eqOcc all_bndrs bndrs)) err `thenRn_`
returnRn (bndrs ++ all_bndrs)
eqOcc n1 n2 = nameOccName n1 == nameOccName n2
err = text "duplicate binding in parallel list comprehension"
in
- foldlRn checkBndrs [] binderss `thenRn` \ binders ->
- bindLocalNamesFV binders $
+ foldlRn checkBndrs [] binderss `thenRn` \ new_binders ->
+ bindLocalNamesFV new_binders $
thing_inside (ParStmtOut bndrstmtss)`thenRn` \ ((rest_bndrs, result), fv_rest) ->
- returnRn ((rest_bndrs ++ binders, result), fv_stmtss `plusFV` fv_rest)
+ returnRn ((new_binders ++ rest_bndrs, result), fv_stmtss `plusFV` fv_rest)
-rnStmt rn_expr (BindStmt pat expr src_loc) thing_inside
+rnStmt (BindStmt pat expr src_loc) thing_inside
= pushSrcLocRn src_loc $
- rn_expr expr `thenRn` \ (expr', fv_expr) ->
+ rnExpr expr `thenRn` \ (expr', fv_expr) ->
bindLocalsFVRn doc binders $ \ new_binders ->
rnPat pat `thenRn` \ (pat', fv_pat) ->
thing_inside (BindStmt pat' expr' src_loc) `thenRn` \ ((rest_binders, result), fvs) ->
-- ZZ is shadowing handled correctly?
- returnRn ((rest_binders ++ new_binders, result),
+ returnRn ((new_binders ++ rest_binders, result),
fv_expr `plusFV` fvs `plusFV` fv_pat)
where
binders = collectPatBinders pat
doc = text "a pattern in do binding"
-rnStmt rn_expr (ExprStmt expr src_loc) thing_inside
+rnStmt (ExprStmt expr src_loc) thing_inside
= pushSrcLocRn src_loc $
- rn_expr expr `thenRn` \ (expr', fv_expr) ->
+ rnExpr expr `thenRn` \ (expr', fv_expr) ->
thing_inside (ExprStmt expr' src_loc) `thenRn` \ (result, fvs) ->
returnRn (result, fv_expr `plusFV` fvs)
-rnStmt rn_expr (GuardStmt expr src_loc) thing_inside
- = pushSrcLocRn src_loc $
- rn_expr expr `thenRn` \ (expr', fv_expr) ->
- thing_inside (GuardStmt expr' src_loc) `thenRn` \ (result, fvs) ->
- returnRn (result, fv_expr `plusFV` fvs)
-
-rnStmt rn_expr (ReturnStmt expr) thing_inside
- = rn_expr expr `thenRn` \ (expr', fv_expr) ->
- thing_inside (ReturnStmt expr') `thenRn` \ (result, fvs) ->
- returnRn (result, fv_expr `plusFV` fvs)
-
-rnStmt rn_expr (LetStmt binds) thing_inside
+rnStmt (LetStmt binds) thing_inside
= rnBinds binds $ \ binds' ->
- thing_inside (LetStmt binds')
-
+ let new_binders = collectHsBinders binds' in
+ thing_inside (LetStmt binds') `thenRn` \ ((rest_binders, result), fvs) ->
+ returnRn ((new_binders ++ rest_binders, result), fvs )
\end{code}
%************************************************************************
---------------------------
-- (- neg_arg) `op` e2
-mkOpAppRn e1@(NegApp neg_arg neg_op) op2 fix2 e2
+mkOpAppRn e1@(NegApp neg_arg) op2 fix2 e2
| nofix_error
= addErrRn (precParseErr (pp_prefix_minus,negateFixity) (ppr_op op2,fix2)) `thenRn_`
returnRn (OpApp e1 op2 fix2 e2)
| associate_right
= mkOpAppRn neg_arg op2 fix2 e2 `thenRn` \ new_e ->
- returnRn (NegApp new_e neg_op)
+ returnRn (NegApp new_e)
where
(nofix_error, associate_right) = compareFixity negateFixity fix2
---------------------------
-- e1 `op` - neg_arg
-mkOpAppRn e1 op1 fix1 e2@(NegApp neg_arg neg_op) -- NegApp can occur on the right
+mkOpAppRn e1 op1 fix1 e2@(NegApp neg_arg) -- NegApp can occur on the right
| not associate_right -- We *want* right association
= addErrRn (precParseErr (ppr_op op1, fix1) (pp_prefix_minus, negateFixity)) `thenRn_`
returnRn (OpApp e1 op1 fix1 e2)
= True
-- Parser initially makes negation bind more tightly than any other operator
-mkNegAppRn neg_arg neg_op
+mkNegAppRn neg_arg
=
#ifdef DEBUG
getModeRn `thenRn` \ mode ->
ASSERT( not_op_app mode neg_arg )
#endif
- returnRn (NegApp neg_arg neg_op)
+ returnRn (NegApp neg_arg)
not_op_app SourceMode (OpApp _ _ _ _) = False
not_op_app mode other = True
-- True indicates an infix lhs
= getModeRn `thenRn` \ mode ->
-- See comments with rnExpr (OpApp ...)
- case mode of
- InterfaceMode -> returnRn ()
- SourceMode -> checkPrec op p1 False `thenRn_`
- checkPrec op p2 True
+ if isInterfaceMode mode
+ then returnRn ()
+ else checkPrec op p1 False `thenRn_`
+ checkPrec op p2 True
checkPrecMatch True op _ = panic "checkPrecMatch"
checkSectionPrec left_or_right section op arg
= case arg of
OpApp _ op fix _ -> go_for_it (ppr_op op) fix
- NegApp _ _ -> go_for_it pp_prefix_minus negateFixity
+ NegApp _ -> go_for_it pp_prefix_minus negateFixity
other -> returnRn ()
where
HsVar op_name = op
litFVs lit = pprPanic "RnExpr.litFVs" (ppr lit) -- HsInteger and HsRat only appear
-- in post-typechecker translations
-rnOverLit (HsIntegral i from_integer)
- = lookupOccRn from_integer `thenRn` \ from_integer' ->
- (if inIntRange i then
- returnRn emptyFVs
- else
- lookupOrigNames [plusInteger_RDR, timesInteger_RDR]
- ) `thenRn` \ ns ->
- returnRn (HsIntegral i from_integer', ns `addOneFV` from_integer')
-
-rnOverLit (HsFractional i n)
- = lookupOccRn n `thenRn` \ n' ->
- lookupOrigNames [ratioDataCon_RDR, plusInteger_RDR, timesInteger_RDR] `thenRn` \ ns' ->
+rnOverLit (HsIntegral i)
+ | inIntRange i
+ = returnRn (HsIntegral i, unitFV fromIntegerName)
+ | otherwise
+ = lookupOrigNames [fromInteger_RDR, plusInteger_RDR, timesInteger_RDR] `thenRn` \ ns ->
+ -- Big integers are built, using + and *, out of small integers
+ -- [No particular reason why we use fromIntegerName in one case can
+ -- fromInteger_RDR in the other; but plusInteger_RDR means we
+ -- can get away without plusIntegerName altogether.]
+ returnRn (HsIntegral i, ns)
+
+rnOverLit (HsFractional i)
+ = lookupOrigNames [fromRational_RDR, ratioDataCon_RDR,
+ plusInteger_RDR, timesInteger_RDR] `thenRn` \ ns ->
-- We have to make sure that the Ratio type is imported with
-- its constructor, because literals of type Ratio t are
-- built with that constructor.
-- when fractionalClass does.
-- The plus/times integer operations may be needed to construct the numerator
-- and denominator (see DsUtils.mkIntegerLit)
- returnRn (HsFractional i n', ns' `addOneFV` n')
+ returnRn (HsFractional i, ns)
\end{code}
%************************************************************************
projects / ghc-hetmet.git / blobdiff