import RnHsSyn
import RnMonad
import RnEnv
+import CmdLineOpts ( opt_GlasgowExts )
import PrelInfo ( numClass_RDR, fractionalClass_RDR, eqClass_RDR, ccallableClass_RDR,
- creturnableClass_RDR, monadZeroClass_RDR, enumClass_RDR,
- negate_RDR
+ creturnableClass_RDR, monadZeroClass_RDR, enumClass_RDR, ordClass_RDR,
+ ratioDataCon_RDR, negate_RDR
)
import TysPrim ( charPrimTyCon, addrPrimTyCon, intPrimTyCon,
floatPrimTyCon, doublePrimTyCon
)
import TyCon ( TyCon )
+import Id ( GenId )
import ErrUtils ( addErrLoc, addShortErrLocLine )
import Name
import Pretty
)
import PprStyle ( PprStyle(..) )
import Util ( Ord3(..), removeDups, panic, pprPanic, assertPanic )
+import Outputable
+
\end{code}
rnPat WildPatIn = returnRn WildPatIn
rnPat (VarPatIn name)
- = lookupRn name `thenRn` \ vname ->
+ = lookupBndrRn name `thenRn` \ vname ->
returnRn (VarPatIn vname)
rnPat (LitPatIn lit)
rnPat (AsPatIn name pat)
= rnPat pat `thenRn` \ pat' ->
- lookupRn name `thenRn` \ vname ->
+ lookupBndrRn name `thenRn` \ vname ->
returnRn (AsPatIn vname pat')
rnPat (ConPatIn con pats)
- = lookupRn con `thenRn` \ con' ->
+ = lookupOccRn con `thenRn` \ con' ->
mapRn rnPat pats `thenRn` \ patslist ->
returnRn (ConPatIn con' patslist)
rnPat (ConOpPatIn pat1 con _ pat2)
= rnPat pat1 `thenRn` \ pat1' ->
- lookupRn con `thenRn` \ con' ->
+ lookupOccRn con `thenRn` \ con' ->
lookupFixity con `thenRn` \ fixity ->
rnPat pat2 `thenRn` \ pat2' ->
mkConOpPatRn pat1' con' fixity pat2'
= rnPat pat `thenRn` \ pat' ->
returnRn (ParPatIn pat')
+rnPat (NPlusKPatIn name lit)
+ = litOccurrence lit `thenRn_`
+ lookupImplicitOccRn ordClass_RDR `thenRn_`
+ lookupBndrRn name `thenRn` \ name' ->
+ returnRn (NPlusKPatIn name' lit)
+
rnPat (ListPatIn pats)
= addImplicitOccRn listType_name `thenRn_`
mapRn rnPat pats `thenRn` \ patslist ->
returnRn (TuplePatIn patslist)
rnPat (RecPatIn con rpats)
- = lookupRn con `thenRn` \ con' ->
+ = lookupOccRn con `thenRn` \ con' ->
rnRpats rpats `thenRn` \ rpats' ->
returnRn (RecPatIn con' rpats')
\end{code}
************************************************************************
\begin{code}
-rnMatch :: RdrNameMatch -> RnMS s (RenamedMatch, FreeVars)
+--rnMatch :: RdrNameMatch -> RnMS s (RenamedMatch, FreeVars)
rnMatch (PatMatch pat match)
= bindLocalsRn "pattern" binders $ \ new_binders ->
%************************************************************************
\begin{code}
-rnGRHSsAndBinds :: RdrNameGRHSsAndBinds -> RnMS s (RenamedGRHSsAndBinds, FreeVars)
+--rnGRHSsAndBinds :: RdrNameGRHSsAndBinds -> RnMS s (RenamedGRHSsAndBinds, FreeVars)
rnGRHSsAndBinds (GRHSsAndBindsIn grhss binds)
= rnBinds binds $ \ binds' ->
rnGRHS (GRHS guard expr locn)
= pushSrcLocRn locn $
- rnExpr guard `thenRn` \ (guard', fvsg) ->
+ (if not (opt_GlasgowExts || is_standard_guard guard) then
+ addWarnRn (nonStdGuardErr guard)
+ else
+ returnRn ()
+ ) `thenRn_`
+
+ (rnStmts rnExpr guard $ \ guard' ->
+ -- This nested thing deals with scope and
+ -- the free vars of the guard, and knocking off the
+ -- free vars of the rhs that are bound by the guard
+
rnExpr expr `thenRn` \ (expr', fvse) ->
- returnRn (GRHS guard' expr' locn, fvsg `unionNameSets` fvse)
+ returnRn (GRHS guard' expr' locn, fvse))
rnGRHS (OtherwiseGRHS expr locn)
= pushSrcLocRn locn $
rnExpr expr `thenRn` \ (expr', fvs) ->
- returnRn (OtherwiseGRHS expr' locn, fvs)
+ returnRn (GRHS [] expr' locn, fvs)
+
+ -- 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 [GuardStmt _ _] = True
+ is_standard_guard other = False
\end{code}
%************************************************************************
%************************************************************************
\begin{code}
-rnExprs :: [RdrNameHsExpr] -> RnMS s ([RenamedHsExpr], FreeVars)
-
-rnExprs [] = returnRn ([], emptyNameSet)
-
-rnExprs (expr:exprs)
- = rnExpr expr `thenRn` \ (expr', fvExpr) ->
- rnExprs exprs `thenRn` \ (exprs', fvExprs) ->
- returnRn (expr':exprs', fvExpr `unionNameSets` fvExprs)
+--rnExprs :: [RdrNameHsExpr] -> RnMS s ([RenamedHsExpr], FreeVars)
+rnExprs ls =
+ rnExprs' ls [] `thenRn` \ (exprs, fvExprs) ->
+ returnRn (exprs, unionManyNameSets fvExprs)
+
+rnExprs' [] acc = returnRn ([], acc)
+rnExprs' (expr:exprs) acc
+ = rnExpr expr `thenRn` \ (expr', fvExpr) ->
+ rnExprs' exprs (fvExpr:acc) `thenRn` \ (exprs', fvExprs) ->
+ returnRn (expr':exprs', fvExprs)
\end{code}
Variables. We look up the variable and return the resulting name. The
rnExpr expr `thenRn` \ (expr',fvExpr) ->
returnRn (HsLet binds' expr', fvExpr)
-rnExpr (HsDo stmts src_loc)
+rnExpr (HsDo do_or_lc stmts src_loc)
= pushSrcLocRn src_loc $
lookupImplicitOccRn monadZeroClass_RDR `thenRn_` -- Forces Monad to come too
- rnStmts stmts `thenRn` \ (stmts', fvStmts) ->
- returnRn (HsDo stmts' src_loc, fvStmts)
-
-rnExpr (ListComp expr quals)
- = addImplicitOccRn listType_name `thenRn_`
- rnQuals expr quals `thenRn` \ ((expr', quals'), fvs) ->
- returnRn (ListComp expr' quals', fvs)
+ (rnStmts rnExpr stmts $ \ stmts' ->
+ returnRn (HsDo do_or_lc stmts' src_loc, emptyNameSet))
rnExpr (ExplicitList exps)
= addImplicitOccRn listType_name `thenRn_`
returnRn (RecordUpd expr' rbinds', fvExpr `unionNameSets` fvRbinds)
rnExpr (ExprWithTySig expr pty)
- = rnExpr expr `thenRn` \ (expr', fvExpr) ->
- rnHsType pty `thenRn` \ pty' ->
+ = rnExpr expr `thenRn` \ (expr', fvExpr) ->
+ rnHsSigType (\ sty -> text "an expression") pty `thenRn` \ pty' ->
returnRn (ExprWithTySig expr' pty', fvExpr)
rnExpr (HsIf p b1 b2 src_loc)
field_dup_err dups = addErrRn (dupFieldErr str dups)
rn_rbind (field, expr, pun)
- = lookupOccRn field `thenRn` \ fieldname ->
+ = lookupGlobalOccRn field `thenRn` \ fieldname ->
rnExpr expr `thenRn` \ (expr', fvExpr) ->
returnRn ((fieldname, expr', pun), fvExpr)
field_dup_err dups = addErrRn (dupFieldErr "pattern" dups)
rn_rpat (field, pat, pun)
- = lookupOccRn field `thenRn` \ fieldname ->
+ = lookupGlobalOccRn field `thenRn` \ fieldname ->
rnPat pat `thenRn` \ pat' ->
returnRn (fieldname, pat', pun)
\end{code}
%************************************************************************
%* *
-\subsubsection{@Qualifier@s: in list comprehensions}
+\subsubsection{@Stmt@s: in @do@ expressions}
%* *
%************************************************************************
Quals.
\begin{code}
-rnQuals :: RdrNameHsExpr -> [RdrNameQual]
- -> RnMS s ((RenamedHsExpr, [RenamedQual]), FreeVars)
-
-rnQuals expr [qual] -- must be at least one qual
- = rnQual qual $ \ new_qual ->
- rnExpr expr `thenRn` \ (expr', fvs) ->
- returnRn ((expr', [new_qual]), fvs)
+type RnExprTy s = RdrNameHsExpr -> RnMS s (RenamedHsExpr, FreeVars)
-rnQuals expr (qual: quals)
- = rnQual qual $ \ qual' ->
- rnQuals expr quals `thenRn` \ ((expr', quals'), fv_quals) ->
- returnRn ((expr', qual' : quals'), fv_quals)
+rnStmts :: RnExprTy s
+ -> [RdrNameStmt]
+ -> ([RenamedStmt] -> RnMS s (a, FreeVars))
+ -> RnMS s (a, FreeVars)
+rnStmts rn_expr [] thing_inside
+ = thing_inside []
--- rnQual :: RdrNameQual
--- -> (RenamedQual -> RnMS s (a,FreeVars))
--- -> RnMS s (a,FreeVars)
--- Because of mutual recursion the actual type is a bit less general than this [Haskell 1.2]
+rnStmts rn_expr (stmt:stmts) thing_inside
+ = rnStmt rn_expr stmt $ \ stmt' ->
+ rnStmts rn_expr stmts $ \ stmts' ->
+ thing_inside (stmt' : stmts')
-rnQual (GeneratorQual pat expr) thing_inside
- = rnExpr expr `thenRn` \ (expr', fv_expr) ->
- bindLocalsRn "pattern in list comprehension" binders $ \ new_binders ->
- rnPat pat `thenRn` \ pat' ->
+rnStmt :: RnExprTy s -> RdrNameStmt -> (RenamedStmt -> RnMS s (a, FreeVars)) -> RnMS s (a, FreeVars)
+-- Because of mutual recursion we have to pass in rnExpr.
- thing_inside (GeneratorQual pat' expr') `thenRn` \ (result, fvs) ->
- returnRn (result, fv_expr `unionNameSets` (fvs `minusNameSet` mkNameSet new_binders))
- where
- binders = collectPatBinders pat
-
-rnQual (FilterQual expr) thing_inside
- = rnExpr expr `thenRn` \ (expr', fv_expr) ->
- thing_inside (FilterQual expr') `thenRn` \ (result, fvs) ->
- returnRn (result, fv_expr `unionNameSets` fvs)
-
-rnQual (LetQual binds) thing_inside
- = rnBinds binds $ \ binds' ->
- thing_inside (LetQual binds')
-\end{code}
-
-
-%************************************************************************
-%* *
-\subsubsection{@Stmt@s: in @do@ expressions}
-%* *
-%************************************************************************
-
-\begin{code}
-rnStmts :: [RdrNameStmt] -> RnMS s ([RenamedStmt], FreeVars)
-
-rnStmts [stmt@(ExprStmt expr src_loc)] -- last stmt must be ExprStmt
- = pushSrcLocRn src_loc $
- rnExpr expr `thenRn` \ (expr', fv_expr) ->
- returnRn ([ExprStmt expr' src_loc], fv_expr)
-
-rnStmts (stmt:stmts)
- = rnStmt stmt $ \ stmt' ->
- rnStmts stmts `thenRn` \ (stmts', fv_stmts) ->
- returnRn (stmt':stmts', fv_stmts)
-
-
--- rnStmt :: RdrNameStmt -> (RenamedStmt -> RnMS s (a, FreeVars)) -> RnMS s (a, FreeVars)
--- Because of mutual recursion the actual type is a bit less general than this [Haskell 1.2]
-
-rnStmt (BindStmt pat expr src_loc) thing_inside
+rnStmt rn_expr (BindStmt pat expr src_loc) thing_inside
= pushSrcLocRn src_loc $
- rnExpr expr `thenRn` \ (expr', fv_expr) ->
+ rn_expr expr `thenRn` \ (expr', fv_expr) ->
bindLocalsRn "pattern in do binding" binders $ \ new_binders ->
rnPat pat `thenRn` \ pat' ->
where
binders = collectPatBinders pat
-rnStmt (ExprStmt expr src_loc) thing_inside
+rnStmt rn_expr (ExprStmt expr src_loc) thing_inside
= pushSrcLocRn src_loc $
- rnExpr expr `thenRn` \ (expr', fv_expr) ->
+ rn_expr expr `thenRn` \ (expr', fv_expr) ->
thing_inside (ExprStmt expr' src_loc) `thenRn` \ (result, fvs) ->
returnRn (result, fv_expr `unionNameSets` fvs)
-rnStmt (LetStmt binds) thing_inside
+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 `unionNameSets` 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 `unionNameSets` fvs)
+
+rnStmt rn_expr (LetStmt binds) thing_inside
= rnBinds binds $ \ binds' ->
thing_inside (LetStmt binds')
\end{code}
returnRn (OpApp e11 op1 fix1 new_e)
where
(nofix_error, rearrange_me) = compareFixity fix1 fix2
- get (HsVar n) = n
-mkOpAppRn e1@(NegApp neg_arg neg_id)
+mkOpAppRn e1@(NegApp neg_arg neg_op)
op2
fix2@(Fixity prec2 dir2)
e2
- | prec2 > 6 -- Precedence of unary - is wired in as 6!
+ | nofix_error
+ = addErrRn (precParseErr (get neg_op,fix_neg) (get op2,fix2)) `thenRn_`
+ returnRn (OpApp e1 op2 fix2 e2)
+
+ | rearrange_me
= mkOpAppRn neg_arg op2 fix2 e2 `thenRn` \ new_e ->
- returnRn (NegApp new_e neg_id)
+ returnRn (NegApp new_e neg_op)
+ where
+ fix_neg = Fixity 6 InfixL -- Precedence of unary negate is wired in as infixl 6!
+ (nofix_error, rearrange_me) = compareFixity fix_neg fix2
mkOpAppRn e1 op fix e2 -- Default case, no rearrangment
= ASSERT( right_op_ok fix e2 )
returnRn (OpApp e1 op fix e2)
+get (HsVar n) = n
+
-- Parser left-associates everything, but
-- derived instances may have correctly-associated things to
-- in the right operarand. So we just check that the right operand is OK
= True
-- Parser initially makes negation bind more tightly than any other operator
-mkNegAppRn mode neg_arg neg_id
+mkNegAppRn mode neg_arg neg_op
= ASSERT( not_op_app mode neg_arg )
- returnRn (NegApp neg_arg neg_id)
+ returnRn (NegApp neg_arg neg_op)
not_op_app SourceMode (OpApp _ _ _ _) = False
not_op_app mode other = True
= addImplicitOccRn (getName addrPrimTyCon)
litOccurrence (HsInt _)
- = lookupImplicitOccRn numClass_RDR `thenRn_` -- Int and Integer are forced in by Num
- returnRn ()
+ = lookupImplicitOccRn numClass_RDR -- Int and Integer are forced in by Num
litOccurrence (HsFrac _)
- = lookupImplicitOccRn fractionalClass_RDR `thenRn_` -- ... similarly Rational
- returnRn ()
-
+ = lookupImplicitOccRn fractionalClass_RDR `thenRn_`
+ lookupImplicitOccRn ratioDataCon_RDR
+ -- 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.
+
litOccurrence (HsIntPrim _)
= addImplicitOccRn (getName intPrimTyCon)
= addImplicitOccRn (getName doublePrimTyCon)
litOccurrence (HsLitLit _)
- = lookupImplicitOccRn ccallableClass_RDR `thenRn_`
- returnRn ()
+ = lookupImplicitOccRn ccallableClass_RDR
\end{code}
\begin{code}
dupFieldErr str (dup:rest) sty
- = ppBesides [ppStr "duplicate field name `", ppr sty dup, ppStr "' in record ", ppStr str]
+ = hcat [ptext SLIT("duplicate field name `"),
+ ppr sty dup,
+ ptext SLIT("' in record "), text str]
negPatErr pat sty
- = ppSep [ppStr "prefix `-' not applied to literal in pattern", ppr sty pat]
+ = sep [ptext SLIT("prefix `-' not applied to literal in pattern"), ppr sty pat]
precParseNegPatErr op sty
- = ppHang (ppStr "precedence parsing error")
- 4 (ppBesides [ppStr "prefix `-' has lower precedence than ", pp_op sty op, ppStr " in pattern"])
+ = hang (ptext SLIT("precedence parsing error"))
+ 4 (hcat [ptext SLIT("prefix `-' has lower precedence than "),
+ pp_op sty op,
+ ptext SLIT(" in pattern")])
precParseErr op1 op2 sty
- = ppHang (ppStr "precedence parsing error")
- 4 (ppBesides [ppStr "cannot mix ", pp_op sty op1, ppStr " and ", pp_op sty op2,
- ppStr " in the same infix expression"])
+ = hang (ptext SLIT("precedence parsing error"))
+ 4 (hcat [ptext SLIT("cannot mix "), pp_op sty op1, ptext SLIT(" and "), pp_op sty op2,
+ ptext SLIT(" in the same infix expression")])
+
+nonStdGuardErr guard sty
+ = hang (ptext SLIT("accepting non-standard pattern guards (-fglasgow-exts to suppress this message)"))
+ 4 (ppr sty guard)
-pp_op sty (op, fix) = ppBesides [pprSym sty op, ppLparen, ppr sty fix, ppRparen]
+pp_op sty (op, fix) = hcat [ppr sty op, space, parens (ppr sty fix)]
\end{code}
projects / ghc-hetmet.git / blobdiff