\begin{code}
module RnExpr (
- rnMatch, rnGRHSs, rnPat, rnExpr, rnExprs,
+ rnMatch, rnGRHSs, rnPat, rnExpr, rnExprs, rnStmt,
checkPrecMatch
) where
import RnEnv
import RnHiFiles ( lookupFixityRn )
import CmdLineOpts ( DynFlag(..), opt_IgnoreAsserts )
-import Literal ( inIntRange )
+import Literal ( inIntRange, inCharRange )
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
= rnOverLit lit `thenRn` \ (lit', fvs) ->
lookupOrigName ordClass_RDR `thenRn` \ ord ->
lookupBndrRn name `thenRn` \ name' ->
- lookupOccRn minus `thenRn` \ minus' ->
+ lookupSyntaxName minus `thenRn` \ minus' ->
returnRn (NPlusKPatIn name' lit' minus', fvs `addOneFV` ord `addOneFV` minus')
rnPat (LazyPatIn pat)
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')
= lookupOccRn con `thenRn` \ con' ->
rnRpats rpats `thenRn` \ (rpats', fvs) ->
returnRn (RecPatIn con' rpats', fvs `addOneFV` con')
+
rnPat (TypePatIn name) =
- (rnHsTypeFVs (text "type pattern") name) `thenRn` \ (name', fvs) ->
+ rnHsTypeFVs (text "type pattern") name `thenRn` \ (name', fvs) ->
returnRn (TypePatIn name', fvs)
\end{code}
************************************************************************
\begin{code}
-rnMatch :: RdrNameMatch -> RnMS (RenamedMatch, FreeVars)
+rnMatch :: HsMatchContext RdrName -> RdrNameMatch -> RnMS (RenamedMatch, FreeVars)
-rnMatch match@(Match _ pats maybe_rhs_sig grhss)
+rnMatch ctxt match@(Match _ pats maybe_rhs_sig grhss)
= pushSrcLocRn (getMatchLoc match) $
- -- Find the universally quantified type variables
- -- in the pattern type signatures
- getLocalNameEnv `thenRn` \ name_env ->
+ -- Bind pattern-bound type variables
let
- tyvars_in_sigs = rhs_sig_tyvars `unionLists` tyvars_in_pats
- rhs_sig_tyvars = case maybe_rhs_sig of
+ rhs_sig_tys = case maybe_rhs_sig of
Nothing -> []
- Just ty -> extractHsTyRdrTyVars ty
- 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 "a pattern match"
+ Just ty -> [ty]
+ pat_sig_tys = collectSigTysFromPats pats
+ doc_sig = text "In a result type-signature"
+ doc_pat = pprMatchContext ctxt
in
- bindNakedTyVarsFVRn doc_sig forall_tyvars $ \ sig_tyvars ->
+ bindPatSigTyVars (rhs_sig_tys ++ pat_sig_tys) $ \ sig_tyvars ->
-- Note that we do a single bindLocalsRn for all the
-- matches together, so that we spot the repeated variable in
-- f x x = 1
- bindLocalsFVRn doc_pats (collectPatsBinders pats) $ \ new_binders ->
+ bindLocalsFVRn doc_pat (collectPatsBinders pats) $ \ new_binders ->
mapFvRn rnPat pats `thenRn` \ (pats', pat_fvs) ->
rnGRHSs grhss `thenRn` \ (grhss', grhss_fvs) ->
returnRn (Match sig_tyvars pats' maybe_rhs_sig' grhss', all_fvs)
-- The bindLocals and bindTyVars will remove the bound FVs
+
+
+bindPatSigTyVars :: [RdrNameHsType]
+ -> ([Name] -> RnMS (a, FreeVars))
+ -> RnMS (a, FreeVars)
+ -- Find the type variables in the pattern type
+ -- signatures that must be brought into scope
+bindPatSigTyVars tys thing_inside
+ = getLocalNameEnv `thenRn` \ name_env ->
+ let
+ tyvars_in_sigs = extractHsTysRdrTyVars tys
+ forall_tyvars = filter (not . (`elemFM` name_env)) tyvars_in_sigs
+ doc_sig = text "In a pattern type-signature"
+ in
+ bindNakedTyVarsFVRn doc_sig forall_tyvars thing_inside
\end{code}
%************************************************************************
\begin{code}
rnGRHSs :: RdrNameGRHSs -> RnMS (RenamedGRHSs, FreeVars)
-rnGRHSs (GRHSs grhss binds maybe_ty)
- = ASSERT( not (maybeToBool maybe_ty) )
- rnBinds binds $ \ binds' ->
+rnGRHSs (GRHSs grhss binds _)
+ = rnBinds binds $ \ binds' ->
mapFvRn rnGRHS grhss `thenRn` \ (grhss', fvGRHSs) ->
- returnRn (GRHSs grhss' binds' Nothing, fvGRHSs)
+ returnRn (GRHSs grhss' binds' placeHolderType, fvGRHSs)
rnGRHS (GRHS guarded locn)
= doptRn Opt_GlasgowExts `thenRn` \ opt_GlasgowExts ->
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 [ResultStmt _ _] = True
+ is_standard_guard [ExprStmt _ _ _, ResultStmt _ _] = True
+ is_standard_guard other = False
\end{code}
%************************************************************************
returnRn (HsOverLit lit', fvs)
rnExpr (HsLam match)
- = rnMatch match `thenRn` \ (match', fvMatch) ->
+ = rnMatch LambdaExpr match `thenRn` \ (match', fvMatch) ->
returnRn (HsLam match', fvMatch)
rnExpr (HsApp fun arg)
-- 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 neg_name)
= rnExpr e `thenRn` \ (e', fv_e) ->
- lookupOrigName negate_RDR `thenRn` \ neg ->
- mkNegAppRn e' neg `thenRn` \ final_e ->
- returnRn (final_e, fv_e `addOneFV` neg)
+ lookupSyntaxName neg_name `thenRn` \ neg_name' ->
+ mkNegAppRn e' neg_name' `thenRn` \ final_e ->
+ returnRn (final_e, fv_e `addOneFV` neg_name')
rnExpr (HsPar e)
= rnExpr e `thenRn` \ (e', fvs_e) ->
checkSectionPrec "right" section op' expr' `thenRn_`
returnRn (SectionR op' expr', fvs_op `plusFV` fvs_expr)
-rnExpr (HsCCall fun args may_gc is_casm fake_result_ty)
+rnExpr (HsCCall fun args may_gc is_casm _)
-- Check out the comment on RnIfaces.getNonWiredDataDecl about ccalls
= lookupOrigNames [cCallableClass_RDR,
cReturnableClass_RDR,
ioDataCon_RDR] `thenRn` \ implicit_fvs ->
rnExprs args `thenRn` \ (args', fvs_args) ->
- returnRn (HsCCall fun args' may_gc is_casm fake_result_ty,
+ returnRn (HsCCall fun args' may_gc is_casm placeHolderType,
fvs_args `plusFV` implicit_fvs)
rnExpr (HsSCC lbl expr)
rnExpr (HsCase expr ms src_loc)
= pushSrcLocRn src_loc $
- rnExpr expr `thenRn` \ (new_expr, e_fvs) ->
- mapFvRn rnMatch ms `thenRn` \ (new_ms, ms_fvs) ->
+ rnExpr expr `thenRn` \ (new_expr, e_fvs) ->
+ mapFvRn (rnMatch CaseAlt) ms `thenRn` \ (new_ms, ms_fvs) ->
returnRn (HsCase new_expr new_ms src_loc, e_fvs `plusFV` ms_fvs)
rnExpr (HsLet binds expr)
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)
+ ResultStmt _ _ -> returnRn () ;
+ _ -> addErrRn (doStmtListErr e)
} `thenRn_`
returnRn (HsDo do_or_lc stmts' src_loc, fvs `plusFV` implicit_fvs)
where
-- Oh well.
-rnExpr (ExplicitList exps)
+rnExpr (ExplicitList _ exps)
= rnExprs exps `thenRn` \ (exps', fvs) ->
- returnRn (ExplicitList exps', fvs `addOneFV` listTyCon_name)
+ returnRn (ExplicitList placeHolderType exps', fvs `addOneFV` listTyCon_name)
rnExpr (ExplicitTuple exps boxity)
= rnExprs exps `thenRn` \ (exps', 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) ->
+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_`
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) ->
- bindLocalsFVRn doc binders $ \ new_binders ->
+ rnExpr expr `thenRn` \ (expr', fv_expr) ->
+ bindPatSigTyVars (collectSigTysFromPat pat) $ \ sig_tyvars ->
+ bindLocalsFVRn doc (collectPatBinders pat) $ \ 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"
+ doc = text "In 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) ->
- thing_inside (ExprStmt expr' src_loc) `thenRn` \ (result, fvs) ->
+ rnExpr expr `thenRn` \ (expr', fv_expr) ->
+ thing_inside (ExprStmt expr' placeHolderType src_loc) `thenRn` \ (result, fvs) ->
returnRn (result, fv_expr `plusFV` fvs)
-rnStmt rn_expr (GuardStmt expr src_loc) thing_inside
+rnStmt (ResultStmt 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) ->
+ rnExpr expr `thenRn` \ (expr', fv_expr) ->
+ thing_inside (ResultStmt expr' src_loc) `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 neg_name) 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 neg_name)
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
- | not associate_right -- We *want* right association
+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)
where
= True
-- Parser initially makes negation bind more tightly than any other operator
-mkNegAppRn neg_arg neg_op
+mkNegAppRn neg_arg neg_name
=
#ifdef DEBUG
getModeRn `thenRn` \ mode ->
ASSERT( not_op_app mode neg_arg )
#endif
- returnRn (NegApp neg_arg neg_op)
+ returnRn (NegApp neg_arg neg_name)
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"
are made available.
\begin{code}
-litFVs (HsChar c) = returnRn (unitFV charTyCon_name)
+litFVs (HsChar c)
+ = checkRn (inCharRange c) (bogusCharError c) `thenRn_`
+ returnRn (unitFV charTyCon_name)
+
litFVs (HsCharPrim c) = returnRn (unitFV (getName charPrimTyCon))
litFVs (HsString s) = returnRn (mkFVs [listTyCon_name, charTyCon_name])
litFVs (HsStringPrim s) = returnRn (unitFV (getName addrPrimTyCon))
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 from_integer_name)
+ = lookupSyntaxName from_integer_name `thenRn` \ from_integer_name' ->
+ if inIntRange i then
+ returnRn (HsIntegral i from_integer_name', unitFV from_integer_name')
+ else
+ lookupOrigNames [plusInteger_RDR, timesInteger_RDR] `thenRn` \ ns ->
+ -- Big integer literals are built, using + and *,
+ -- out of small integers (DsUtils.mkIntegerLit)
+ -- [NB: plusInteger, timesInteger aren't rebindable...
+ -- they are used to construct the argument to fromInteger,
+ -- which is the rebindable one.]
+ returnRn (HsIntegral i from_integer_name', ns `addOneFV` from_integer_name')
+
+rnOverLit (HsFractional i from_rat_name)
+ = lookupSyntaxName from_rat_name `thenRn` \ from_rat_name' ->
+ lookupOrigNames [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 from_rat_name', ns `addOneFV` from_rat_name')
\end{code}
%************************************************************************
vname = mkSysLocalName uniq SLIT("v")
expr = HsLam ignorePredMatch
loc = nameSrcLoc vname
- ignorePredMatch = Match [] [WildPatIn, VarPatIn vname] Nothing
- (GRHSs [GRHS [ExprStmt (HsVar vname) loc] loc]
- EmptyBinds Nothing)
+ ignorePredMatch = mkSimpleMatch [WildPatIn, VarPatIn vname] (HsVar vname) placeHolderType loc
in
returnRn (expr, unitFV name)
else
sectionPrecErr op arg_op section
= vcat [ptext SLIT("The operator") <+> ppr_opfix op <+> ptext SLIT("of a section"),
nest 4 (ptext SLIT("must have lower precedence than the operand") <+> ppr_opfix arg_op),
- nest 4 (ptext SLIT("In the section:") <+> quotes (ppr section))]
+ nest 4 (ptext SLIT("in the section:") <+> quotes (ppr section))]
nonStdGuardErr guard
= hang (ptext
doStmtListErr e
= sep [ptext SLIT("`do' statements must end in expression:"),
nest 4 (ppr e)]
+
+bogusCharError c
+ = ptext SLIT("character literal out of range: '\\") <> int c <> char '\''
\end{code}
projects / ghc-hetmet.git / blobdiff