From 6abda39ee2abe58bd30604a965dbae35ff93bab5 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Mon, 10 Mar 2008 15:19:28 +0000 Subject: [PATCH] Fixed a couple of uses of the PassM monad that depended on the old mechanism --- backends/GenerateCBased.hs | 2 +- frontends/ParseOccam.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backends/GenerateCBased.hs b/backends/GenerateCBased.hs index d5cb3a3..b7c175a 100644 --- a/backends/GenerateCBased.hs +++ b/backends/GenerateCBased.hs @@ -60,7 +60,7 @@ type CGen' = StateT (Either [String] Handle) PassM type CGen = ReaderT GenOps CGen' instance Die CGen where - dieReport = throwError + dieReport err = lift $ lift $ dieReport err instance CSMR CGen' where getCompState = lift getCompState diff --git a/frontends/ParseOccam.hs b/frontends/ParseOccam.hs index 2388b9a..6a9c7ae 100644 --- a/frontends/ParseOccam.hs +++ b/frontends/ParseOccam.hs @@ -2021,7 +2021,7 @@ parseOccamProgram toks = do cs <- get (p, ws, cs') <- runTockParser toks sourceFile cs put cs' - tell ws + mapM_ warnReport ws return p --}}}