projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2003-12-10 14:15:16 by simonmar]
[ghc-hetmet.git]
/
ghc
/
compiler
/
deSugar
/
DsGRHSs.lhs
diff --git
a/ghc/compiler/deSugar/DsGRHSs.lhs
b/ghc/compiler/deSugar/DsGRHSs.lhs
index
918ec65
..
60c67bc
100644
(file)
--- a/
ghc/compiler/deSugar/DsGRHSs.lhs
+++ b/
ghc/compiler/deSugar/DsGRHSs.lhs
@@
-8,18
+8,23
@@
module DsGRHSs ( dsGuarded, dsGRHSs ) where
#include "HsVersions.h"
#include "HsVersions.h"
-import {-# SOURCE #-} DsExpr ( dsExpr, dsLet )
+import {-# SOURCE #-} DsExpr ( dsLExpr, dsLet )
import {-# SOURCE #-} Match ( matchSinglePat )
import {-# SOURCE #-} Match ( matchSinglePat )
-import HsSyn ( Stmt(..), HsExpr(..), GRHSs(..), GRHS(..), HsMatchContext(..) )
-import TcHsSyn ( TypecheckedGRHSs, TypecheckedPat, TypecheckedStmt )
+import HsSyn ( Stmt(..), HsExpr(..), GRHSs(..), GRHS(..),
+ HsMatchContext(..), Pat(..), LStmt )
import CoreSyn ( CoreExpr )
import Type ( Type )
import CoreSyn ( CoreExpr )
import Type ( Type )
+import Var ( Id )
import DsMonad
import DsUtils
import DsMonad
import DsUtils
+import Unique ( Uniquable(..) )
import PrelInfo ( nON_EXHAUSTIVE_GUARDS_ERROR_ID )
import PrelInfo ( nON_EXHAUSTIVE_GUARDS_ERROR_ID )
-import PrelNames ( otherwiseIdKey, trueDataConKey, hasKey )
+import TysWiredIn ( trueDataConId )
+import PrelNames ( otherwiseIdKey, hasKey )
+import Name ( Name )
+import SrcLoc ( unLoc, Located(..) )
\end{code}
@dsGuarded@ is used for both @case@ expressions and pattern bindings.
\end{code}
@dsGuarded@ is used for both @case@ expressions and pattern bindings.
@@
-34,7
+39,7
@@
producing an expression with a runtime error in the corner if
necessary. The type argument gives the type of the @ei@.
\begin{code}
necessary. The type argument gives the type of the @ei@.
\begin{code}
-dsGuarded :: TypecheckedGRHSs -> DsM CoreExpr
+dsGuarded :: GRHSs Id -> DsM CoreExpr
dsGuarded grhss
= dsGRHSs PatBindRhs [] grhss `thenDs` \ (err_ty, match_result) ->
dsGuarded grhss
= dsGRHSs PatBindRhs [] grhss `thenDs` \ (err_ty, match_result) ->
@@
-45,12
+50,12
@@
dsGuarded grhss
In contrast, @dsGRHSs@ produces a @MatchResult@.
\begin{code}
In contrast, @dsGRHSs@ produces a @MatchResult@.
\begin{code}
-dsGRHSs :: HsMatchContext -> [TypecheckedPat] -- These are to build a MatchContext from
- -> TypecheckedGRHSs -- Guarded RHSs
+dsGRHSs :: HsMatchContext Name -> [Pat Id] -- These are to build a MatchContext from
+ -> GRHSs Id -- Guarded RHSs
-> DsM (Type, MatchResult)
-> DsM (Type, MatchResult)
-dsGRHSs kind pats (GRHSs grhss binds (Just ty))
- = mapDs (dsGRHS kind pats) grhss `thenDs` \ match_results ->
+dsGRHSs kind pats (GRHSs grhss binds ty)
+ = mappM (dsGRHS kind pats) grhss `thenDs` \ match_results ->
let
match_result1 = foldr1 combineMatchResults match_results
match_result2 = adjustMatchResultDs (dsLet binds) match_result1
let
match_result1 = foldr1 combineMatchResults match_results
match_result2 = adjustMatchResultDs (dsLet binds) match_result1
@@
-58,8
+63,8
@@
dsGRHSs kind pats (GRHSs grhss binds (Just ty))
in
returnDs (ty, match_result2)
in
returnDs (ty, match_result2)
-dsGRHS kind pats (GRHS guard locn)
- = matchGuard guard (DsMatchContext kind pats locn)
+dsGRHS kind pats (L loc (GRHS guard))
+ = matchGuard (map unLoc guard) (DsMatchContext kind pats loc)
\end{code}
\end{code}
@@
-70,27
+75,29
@@
dsGRHS kind pats (GRHS guard locn)
%************************************************************************
\begin{code}
%************************************************************************
\begin{code}
-matchGuard :: [TypecheckedStmt] -- Guard
+matchGuard :: [Stmt Id] -- Guard
-> DsMatchContext -- Context
-> DsM MatchResult
-> DsMatchContext -- Context
-> DsM MatchResult
--- See comments with HsExpr.HsStmt re what an ExprStmt means
+-- See comments with HsExpr.Stmt re what an ExprStmt means
-- Here we must be in a guard context (not do-expression, nor list-comp)
-- Here we must be in a guard context (not do-expression, nor list-comp)
-matchGuard [ExprStmt expr locn] ctx
- = putSrcLocDs locn (dsExpr expr) `thenDs` \ core_expr ->
+matchGuard [ResultStmt expr] ctx
+ = dsLExpr expr `thenDs` \ core_expr ->
returnDs (cantFailMatchResult core_expr)
returnDs (cantFailMatchResult core_expr)
- -- Other ExprStmts must be guards
+ -- ExprStmts must be guards
-- Turn an "otherwise" guard is a no-op
-- Turn an "otherwise" guard is a no-op
-matchGuard (ExprStmt (HsVar v) _ : stmts) ctx
+matchGuard (ExprStmt (L _ (HsVar v)) _ : stmts) ctx
| v `hasKey` otherwiseIdKey
| v `hasKey` otherwiseIdKey
- || v `hasKey` trueDataConKey
+ || v `hasKey` getUnique trueDataConId
+ -- trueDataConId doesn't have the same
+ -- unique as trueDataCon
= matchGuard stmts ctx
= matchGuard stmts ctx
-matchGuard (ExprStmt expr locn : stmts) ctx
- = matchGuard stmts ctx `thenDs` \ match_result ->
- putSrcLocDs locn (dsExpr expr) `thenDs` \ pred_expr ->
+matchGuard (ExprStmt expr _ : stmts) ctx
+ = matchGuard stmts ctx `thenDs` \ match_result ->
+ dsLExpr expr `thenDs` \ pred_expr ->
returnDs (mkGuardedMatchResult pred_expr match_result)
matchGuard (LetStmt binds : stmts) ctx
returnDs (mkGuardedMatchResult pred_expr match_result)
matchGuard (LetStmt binds : stmts) ctx
@@
-98,9
+105,9
@@
matchGuard (LetStmt binds : stmts) ctx
returnDs (adjustMatchResultDs (dsLet binds) match_result)
-- NB the dsLet occurs inside the match_result
returnDs (adjustMatchResultDs (dsLet binds) match_result)
-- NB the dsLet occurs inside the match_result
-matchGuard (BindStmt pat rhs locn : stmts) ctx
+matchGuard (BindStmt pat rhs : stmts) ctx
= matchGuard stmts ctx `thenDs` \ match_result ->
= matchGuard stmts ctx `thenDs` \ match_result ->
- putSrcLocDs locn (dsExpr rhs) `thenDs` \ core_rhs ->
+ dsLExpr rhs `thenDs` \ core_rhs ->
matchSinglePat core_rhs ctx pat match_result
\end{code}
matchSinglePat core_rhs ctx pat match_result
\end{code}