X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcMonad.lhs;h=3fe3ac5446be024219ca7210ed024564acfaa3a6;hb=d3e697b8d842bd43329d470f2bc424a6dcb88d89;hp=fa642c55ec061067ec41db5323cd3d2f7b753733;hpb=9d4c03805bafb6b1e1d47306b6a6c591c998e517;p=ghc-hetmet.git diff --git a/ghc/compiler/typecheck/TcMonad.lhs b/ghc/compiler/typecheck/TcMonad.lhs index fa642c5..3fe3ac5 100644 --- a/ghc/compiler/typecheck/TcMonad.lhs +++ b/ghc/compiler/typecheck/TcMonad.lhs @@ -1,20 +1,22 @@ \begin{code} -#include "HsVersions.h" - module TcMonad( - SYN_IE(TcM), SYN_IE(NF_TcM), TcDown, TcEnv, + TcM, NF_TcM, TcDown, TcEnv, SST_R, FSST_R, initTc, returnTc, thenTc, thenTc_, mapTc, listTc, foldrTc, foldlTc, mapAndUnzipTc, mapAndUnzip3Tc, - mapBagTc, fixTc, tryTc, + mapBagTc, fixTc, tryTc, getErrsTc, + + uniqSMToTcM, + + returnNF_Tc, thenNF_Tc, thenNF_Tc_, mapNF_Tc, + fixNF_Tc, forkNF_Tc, foldrNF_Tc, foldlNF_Tc, - returnNF_Tc, thenNF_Tc, thenNF_Tc_, mapNF_Tc, fixNF_Tc, listNF_Tc, mapAndUnzipNF_Tc, mapBagNF_Tc, checkTc, checkTcM, checkMaybeTc, checkMaybeTcM, - failTc, warnTc, recoverTc, recoverNF_Tc, + failTc, failWithTc, addErrTc, warnTc, recoverTc, checkNoErrsTc, recoverNF_Tc, discardErrsTc, tcGetEnv, tcSetEnv, tcGetDefaultTys, tcSetDefaultTys, @@ -24,50 +26,33 @@ module TcMonad( tcAddErrCtxtM, tcSetErrCtxtM, tcAddErrCtxt, tcSetErrCtxt, - tcNewMutVar, tcReadMutVar, tcWriteMutVar, - - rnMtoTcM, + tcNewMutVar, tcReadMutVar, tcWriteMutVar, TcRef, - SYN_IE(TcError), SYN_IE(TcWarning), - mkTcErr, arityErr, - - -- For closure - SYN_IE(MutableVar), -#if __GLASGOW_HASKELL__ >= 200 - GHCbase.MutableArray -#else - _MutableArray -#endif + TcError, TcWarning, + arityErr ) where -IMP_Ubiq(){-uitous-} +#include "HsVersions.h" -IMPORT_DELOOPER(TcMLoop) ( TcEnv, initEnv, TcMaybe ) -- We need the type TcEnv and an initial Env +import {-# SOURCE #-} TcEnv ( TcEnv ) -import Type ( SYN_IE(Type), GenType ) -import TyVar ( SYN_IE(TyVar), GenTyVar ) -import Usage ( SYN_IE(Usage), GenUsage ) -import ErrUtils ( SYN_IE(Error), SYN_IE(Message), SYN_IE(Warning) ) +import Type ( Type, GenType ) +import ErrUtils ( addShortErrLocLine, addShortWarnLocLine, ErrMsg, Message, WarnMsg ) +import CmdLineOpts ( opt_PprStyle_All ) import SST -import RnMonad ( SYN_IE(RnM), RnDown, initRn, setExtraRn, - returnRn, thenRn, getImplicitUpRn - ) -import RnUtils ( SYN_IE(RnEnv) ) - import Bag ( Bag, emptyBag, isEmptyBag, foldBag, unitBag, unionBags, snocBag ) -import FiniteMap ( FiniteMap, emptyFM, isEmptyFM, keysFM{-ToDo:rm-} ) ---import Outputable ( Outputable(..), NamedThing(..), ExportFlag ) -import Maybes ( MaybeErr(..) ) ---import Name ( Name ) -import SrcLoc ( SrcLoc, mkUnknownSrcLoc ) +import SrcLoc ( SrcLoc, noSrcLoc ) import UniqFM ( UniqFM, emptyUFM ) -import UniqSupply ( UniqSupply, getUnique, getUniques, splitUniqSupply ) +import UniqSupply ( UniqSupply, getUnique, getUniques, splitUniqSupply, + UniqSM, initUs ) import Unique ( Unique ) import Util -import Pretty -import PprStyle ( PprStyle(..) ) +import Outputable + +import GlaExts ( State#, RealWorld ) + infixr 9 `thenTc`, `thenTc_`, `thenNF_Tc`, `thenNF_Tc_` \end{code} @@ -82,30 +67,26 @@ type TcM s r = TcDown s -> TcEnv s -> FSST s r () \end{code} \begin{code} -#if __GLASGOW_HASKELL__ >= 200 -# define REAL_WORLD RealWorld -#else -# define REAL_WORLD _RealWorld -#endif - -- With a builtin polymorphic type for runSST the type for -- initTc should use TcM s r instead of TcM RealWorld r +-- initEnv is passed in to avoid module recursion between TcEnv & TcMonad. + initTc :: UniqSupply - -> TcM REAL_WORLD r - -> MaybeErr (r, Bag Warning) - (Bag Error, Bag Warning) + -> (TcRef RealWorld (UniqFM a) -> TcEnv RealWorld) + -> TcM RealWorld r + -> (Maybe r, Bag WarnMsg, Bag ErrMsg) -initTc us do_this +initTc us initenv do_this = runSST ( newMutVarSST us `thenSST` \ us_var -> newMutVarSST (emptyBag,emptyBag) `thenSST` \ errs_var -> newMutVarSST emptyUFM `thenSST` \ tvs_var -> let init_down = TcDown [] us_var - mkUnknownSrcLoc + noSrcLoc [] errs_var - init_env = initEnv tvs_var + init_env = initenv tvs_var in recoverSST (\_ -> returnSST Nothing) @@ -113,9 +94,7 @@ initTc us do_this returnFSST (Just res)) `thenSST` \ maybe_res -> readMutVarSST errs_var `thenSST` \ (warns,errs) -> - case (maybe_res, isEmptyBag errs) of - (Just res, True) -> returnSST (Succeeded (res, warns)) - _ -> returnSST (Failed (errs, warns)) + returnSST (maybe_res, warns, errs) ) thenNF_Tc :: NF_TcM s a @@ -149,6 +128,16 @@ mapNF_Tc f (x:xs) = f x `thenNF_Tc` \ r -> mapNF_Tc f xs `thenNF_Tc` \ rs -> returnNF_Tc (r:rs) +foldrNF_Tc :: (a -> b -> NF_TcM s b) -> b -> [a] -> NF_TcM s b +foldrNF_Tc k z [] = returnNF_Tc z +foldrNF_Tc k z (x:xs) = foldrNF_Tc k z xs `thenNF_Tc` \r -> + k x r + +foldlNF_Tc :: (a -> b -> NF_TcM s a) -> a -> [b] -> NF_TcM s a +foldlNF_Tc k z [] = returnNF_Tc z +foldlNF_Tc k z (x:xs) = k z x `thenNF_Tc` \r -> + foldlNF_Tc k r xs + listNF_Tc :: [NF_TcM s a] -> NF_TcM s [a] listNF_Tc [] = returnNF_Tc [] listNF_Tc (x:xs) = x `thenNF_Tc` \ r -> @@ -229,12 +218,20 @@ fixTc :: (a -> TcM s a) -> TcM s a fixTc m env down = fixFSST (\ loop -> m loop env down) \end{code} -@forkNF_Tc@ runs a sub-typecheck action in a separate state thread. -This elegantly ensures that it can't zap any type variables that -belong to the main thread. We throw away any error messages! +@forkNF_Tc@ runs a sub-typecheck action *lazily* in a separate state +thread. Ideally, this elegantly ensures that it can't zap any type +variables that belong to the main thread. But alas, the environment +contains TyCon and Class environments that include (TcKind s) stuff, +which is a Royal Pain. By the time this fork stuff is used they'll +have been unified down so there won't be any kind variables, but we +can't express that in the current typechecker framework. + +So we compromise and use unsafeInterleaveSST. -\begin{pseudocode} -forkNF_Tc :: NF_TcM s' r -> NF_TcM s r +We throw away any error messages! + +\begin{code} +forkNF_Tc :: NF_TcM s r -> NF_TcM s r forkNF_Tc m (TcDown deflts u_var src_loc err_cxt err_var) env = -- Get a fresh unique supply readMutVarSST u_var `thenSST` \ us -> @@ -242,68 +239,71 @@ forkNF_Tc m (TcDown deflts u_var src_loc err_cxt err_var) env (us1, us2) = splitUniqSupply us in writeMutVarSST u_var us1 `thenSST_` - returnSST ( runSST ( - newMutVarSST us2 `thenSST` \ u_var' -> + + unsafeInterleaveSST ( + newMutVarSST us2 `thenSST` \ us_var' -> newMutVarSST (emptyBag,emptyBag) `thenSST` \ err_var' -> newMutVarSST emptyUFM `thenSST` \ tv_var' -> let - down' = TcDown deflts us_var src_loc err_cxt err_var' - env' = forkEnv env tv_var' + down' = TcDown deflts us_var' src_loc err_cxt err_var' in - m down' env' - + m down' env -- ToDo: optionally dump any error messages - )) -\end{pseudocode} + ) +\end{code} -@forkTcDown@ makes a new "down" blob for a lazily-computed fork -of the type checker. -\begin{pseudocode} -forkTcDown (TcDown deflts u_var src_loc err_cxt err_var) - = -- Get a fresh unique supply - readMutVarSST u_var `thenSST` \ us -> - let - (us1, us2) = splitUniqSupply us - in - writeMutVarSST u_var us1 `thenSST_` +Error handling +~~~~~~~~~~~~~~ +\begin{code} +getErrsTc :: NF_TcM s (Bag ErrMsg, Bag WarnMsg) +getErrsTc down env + = readMutVarSST errs_var + where + errs_var = getTcErrs down - -- Make fresh MutVars for the unique supply and errors - newMutVarSST us2 `thenSST` \ u_var' -> - newMutVarSST (emptyBag, emptyBag) `thenSST` \ err_var' -> - -- Done - returnSST (TcDown deflts u_var' src_loc err_cxt err_var') -\end{pseudocode} +failTc :: TcM s a +failTc down env + = failFSST () +failWithTc :: Message -> TcM s a -- Add an error message and fail +failWithTc err_msg + = addErrTc err_msg `thenNF_Tc_` + failTc -Error handling -~~~~~~~~~~~~~~ -\begin{code} -failTc :: Message -> TcM s a -failTc err_msg down env +addErrTc :: Message -> NF_TcM s () -- Add an error message but don't fail +addErrTc err_msg down env = readMutVarSST errs_var `thenSST` \ (warns,errs) -> listNF_Tc ctxt down env `thenSST` \ ctxt_msgs -> let - err = mkTcErr loc ctxt_msgs err_msg + err = addShortErrLocLine loc $ + vcat (err_msg : ctxt_to_use ctxt_msgs) in writeMutVarSST errs_var (warns, errs `snocBag` err) `thenSST_` - failFSST () + returnSST () where errs_var = getTcErrs down ctxt = getErrCtxt down loc = getLoc down warnTc :: Bool -> Message -> NF_TcM s () -warnTc warn_if_true warn down env +warnTc warn_if_true warn_msg down env = if warn_if_true then - readMutVarSST errs_var `thenSST` \ (warns,errs) -> + readMutVarSST errs_var `thenSST` \ (warns,errs) -> + listNF_Tc ctxt down env `thenSST` \ ctxt_msgs -> + let + warn = addShortWarnLocLine loc $ + vcat (warn_msg : ctxt_to_use ctxt_msgs) + in writeMutVarSST errs_var (warns `snocBag` warn, errs) `thenSST_` returnSST () else returnSST () where errs_var = getTcErrs down + ctxt = getErrCtxt down + loc = getLoc down recoverTc :: TcM s r -> TcM s r -> TcM s r recoverTc recover m down env @@ -313,6 +313,40 @@ recoverNF_Tc :: NF_TcM s r -> TcM s r -> NF_TcM s r recoverNF_Tc recover m down env = recoverSST (\ _ -> recover down env) (m down env) +-- (checkNoErrsTc m) succeeds iff m succeeds and generates no errors +-- If m fails then (checkNoErrsTc m) fails. +-- If m succeeds, it checks whether m generated any errors messages +-- (it might have recovered internally) +-- If so, it fails too. +-- Regardless, any errors generated by m are propagated to the enclosing +-- context. + +checkNoErrsTc :: TcM s r -> TcM s r +checkNoErrsTc m down env + = newMutVarSST (emptyBag,emptyBag) `thenSST` \ m_errs_var -> + let + errs_var = getTcErrs down + propagate_errs _ + = readMutVarSST m_errs_var `thenSST` \ (m_warns, m_errs) -> + readMutVarSST errs_var `thenSST` \ (warns, errs) -> + writeMutVarSST errs_var (warns `unionBags` m_warns, + errs `unionBags` m_errs) `thenSST_` + failFSST() + in + + recoverFSST propagate_errs $ + + m (setTcErrs down m_errs_var) env `thenFSST` \ result -> + + -- Check that m has no errors; if it has internal recovery + -- mechanisms it might "succeed" but having found a bunch of + -- errors along the way. + readMutVarSST m_errs_var `thenSST` \ (m_warns, m_errs) -> + if isEmptyBag m_errs then + returnFSST result + else + failFSST () -- This triggers the recoverFSST + -- (tryTc r m) tries m; if it succeeds it returns it, -- otherwise it returns r. Any error messages added by m are discarded, -- whether or not m succeeds. @@ -321,7 +355,6 @@ tryTc recover m down env = recoverFSST (\ _ -> recover down env) $ newMutVarSST (emptyBag,emptyBag) `thenSST` \ new_errs_var -> - m (setTcErrs down new_errs_var) env `thenFSST` \ result -> -- Check that m has no errors; if it has internal recovery @@ -334,9 +367,18 @@ tryTc recover m down env else recover down env +-- Run the thing inside, but throw away all its error messages. +-- discardErrsTc :: TcM s r -> TcM s r +-- discardErrsTc :: NF_TcM s r -> NF_TcM s r +discardErrsTc :: (TcDown s -> TcEnv s -> State# s -> a) + -> (TcDown s -> TcEnv s -> State# s -> a) +discardErrsTc m down env + = newMutVarSST (emptyBag,emptyBag) `thenSST` \ new_errs_var -> + m (setTcErrs down new_errs_var) env + checkTc :: Bool -> Message -> TcM s () -- Check that the boolean is true checkTc True err = returnTc () -checkTc False err = failTc err +checkTc False err = failWithTc err checkTcM :: Bool -> TcM s () -> TcM s () -- Check that the boolean is true checkTcM True err = returnTc () @@ -344,7 +386,7 @@ checkTcM False err = err checkMaybeTc :: Maybe val -> Message -> TcM s val checkMaybeTc (Just val) err = returnTc val -checkMaybeTc Nothing err = failTc err +checkMaybeTc Nothing err = failWithTc err checkMaybeTcM :: Maybe val -> TcM s val -> TcM s val checkMaybeTcM (Just val) err = returnTc val @@ -354,13 +396,15 @@ checkMaybeTcM Nothing err = err Mutable variables ~~~~~~~~~~~~~~~~~ \begin{code} -tcNewMutVar :: a -> NF_TcM s (MutableVar s a) +type TcRef s a = SSTRef s a + +tcNewMutVar :: a -> NF_TcM s (TcRef s a) tcNewMutVar val down env = newMutVarSST val -tcWriteMutVar :: MutableVar s a -> a -> NF_TcM s () +tcWriteMutVar :: TcRef s a -> a -> NF_TcM s () tcWriteMutVar var val down env = writeMutVarSST var val -tcReadMutVar :: MutableVar s a -> NF_TcM s a +tcReadMutVar :: TcRef s a -> NF_TcM s a tcReadMutVar var down env = readMutVarSST var \end{code} @@ -371,7 +415,12 @@ Environment tcGetEnv :: NF_TcM s (TcEnv s) tcGetEnv down env = returnSST env -tcSetEnv :: TcEnv s -> TcM s a -> TcM s a +tcSetEnv :: TcEnv s + -> (TcDown s -> TcEnv s -> State# s -> b) + -> TcDown s -> TcEnv s -> State# s -> b +-- tcSetEnv :: TcEnv s -> TcM s a -> TcM s a +-- tcSetEnv :: TcEnv s -> NF_TcM s a -> NF_TcM s a + tcSetEnv new_env m down old_env = m down new_env \end{code} @@ -385,7 +434,10 @@ tcGetDefaultTys down env = returnSST (getDefaultTys down) tcSetDefaultTys :: [Type] -> TcM s r -> TcM s r tcSetDefaultTys tys m down env = m (setDefaultTys down tys) env -tcAddSrcLoc :: SrcLoc -> TcM s a -> TcM s a +-- tcAddSrcLoc :: SrcLoc -> TcM s a -> TcM s a +-- tcAddSrcLoc :: SrcLoc -> NF_TcM s a -> NF_TcM s a +tcAddSrcLoc :: SrcLoc -> (TcDown s -> env -> result) + -> (TcDown s -> env -> result) tcAddSrcLoc loc m down env = m (setLoc down loc) env tcGetSrcLoc :: NF_TcM s SrcLoc @@ -395,7 +447,11 @@ tcSetErrCtxtM, tcAddErrCtxtM :: NF_TcM s Message -> TcM s a -> TcM s a tcSetErrCtxtM msg m down env = m (setErrCtxt down msg) env tcAddErrCtxtM msg m down env = m (addErrCtxt down msg) env -tcSetErrCtxt, tcAddErrCtxt :: Message -> TcM s a -> TcM s a +tcSetErrCtxt, tcAddErrCtxt + :: Message + -> (TcDown s -> TcEnv s -> State# s -> b) + -> TcDown s -> TcEnv s -> State# s -> b +-- Usual thing tcSetErrCtxt msg m down env = m (setErrCtxt down (returnNF_Tc msg)) env tcAddErrCtxt msg m down env = m (addErrCtxt down (returnNF_Tc msg)) env \end{code} @@ -427,6 +483,17 @@ tcGetUniques n down env returnSST uniqs where u_var = getUniqSupplyVar down + +uniqSMToTcM :: UniqSM a -> NF_TcM s a +uniqSMToTcM m down env + = readMutVarSST u_var `thenSST` \ uniq_supply -> + let + (new_uniq_supply, uniq_s) = splitUniqSupply uniq_supply + in + writeMutVarSST u_var new_uniq_supply `thenSST_` + returnSST (initUs uniq_s m) + where + u_var = getUniqSupplyVar down \end{code} @@ -438,12 +505,12 @@ data TcDown s = TcDown [Type] -- Types used for defaulting - (MutableVar s UniqSupply) -- Unique supply + (TcRef s UniqSupply) -- Unique supply SrcLoc -- Source location (ErrCtxt s) -- Error context - (MutableVar s (Bag Warning, - Bag Error)) + (TcRef s (Bag WarnMsg, + Bag ErrMsg)) type ErrCtxt s = [NF_TcM s Message] -- Innermost first. Monadic so that we have a chance -- to deal with bound type variables just before error @@ -470,39 +537,6 @@ getErrCtxt (TcDown def us loc ctxt errs) = ctxt \end{code} -\section{rn4MtoTcM} -%~~~~~~~~~~~~~~~~~~ - -\begin{code} -rnMtoTcM :: RnEnv -> RnM REAL_WORLD a -> NF_TcM s (a, Bag Error) - -rnMtoTcM rn_env rn_action down env - = readMutVarSST u_var `thenSST` \ uniq_supply -> - let - (new_uniq_supply, uniq_s) = splitUniqSupply uniq_supply - in - writeMutVarSST u_var new_uniq_supply `thenSST_` - let - (rn_result, rn_errs, rn_warns) - = initRn False{-*interface* mode! so we can see the builtins-} - (panic "rnMtoTcM:module") - rn_env uniq_s ( - rn_action `thenRn` \ result -> - - -- Though we are in "interface mode", we must - -- not have added anything to the ImplicitEnv! - getImplicitUpRn `thenRn` \ implicit_env@(v_env,tc_env) -> - if (isEmptyFM v_env && isEmptyFM tc_env) - then returnRn result - else pprPanic "rnMtoTcM: non-empty ImplicitEnv!" - (ppAboves ([ ppCat [ppPStr m, ppPStr n] | (OrigName m n) <- keysFM v_env] - ++ [ ppCat [ppPStr m, ppPStr n] | (OrigName m n) <- keysFM tc_env])) - ) - in - returnSST (rn_result, rn_errs) - where - u_var = getUniqSupplyVar down -\end{code} TypeChecking Errors @@ -512,26 +546,21 @@ TypeChecking Errors type TcError = Message type TcWarning = Message -mkTcErr :: SrcLoc -- Where - -> [Message] -- Context - -> Message -- What went wrong - -> TcError -- The complete error report - -mkTcErr locn ctxt msg sty - = ppHang (ppBesides [ppr PprForUser locn, ppStr ": ", msg sty]) - 4 (ppAboves [msg sty | msg <- ctxt]) - - -arityErr kind name n m sty - = ppBesides [ ppStr "`", ppr sty name, ppStr "' should have ", - n_arguments, ppStr ", but has been given ", ppInt m, ppChar '.'] +ctxt_to_use ctxt | opt_PprStyle_All = ctxt + | otherwise = takeAtMost 3 ctxt + where + takeAtMost :: Int -> [a] -> [a] + takeAtMost 0 ls = [] + takeAtMost n [] = [] + takeAtMost n (x:xs) = x:takeAtMost (n-1) xs + +arityErr kind name n m + = hsep [ ppr name, ptext SLIT("should have"), + n_arguments <> comma, text "but has been given", int m, char '.'] where - errmsg = kind ++ " has too " ++ quantity ++ " arguments" - quantity | m < n = "few" - | otherwise = "many" - n_arguments | n == 0 = ppStr "no arguments" - | n == 1 = ppStr "1 argument" - | True = ppCat [ppInt n, ppStr "arguments"] + n_arguments | n == 0 = ptext SLIT("no arguments") + | n == 1 = ptext SLIT("1 argument") + | True = hsep [int n, ptext SLIT("arguments")] \end{code}