Reduced clutter in monadic code

+ Eliminated vairous ad-hoc coersion functions between specific monads 
  (IO, Err, IOE, Check) in favor of more general lifting functions
  (liftIO, liftErr).
+ Generalized many basic monadic operations from specific monads to
  arbitrary monads in the appropriate class (MonadIO and/or ErrorMonad),
  thereby completely eliminating the need for lifting functions in lots
  of places.

This can be considered a small step forward towards a cleaner
compiler API and more malleable compiler code in general.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/compiler/GF/Grammar/Grammar.hs b/src/compiler/GF/Grammar/Grammar.hs
index 8db78a0f0..7400ff09b 100644
--- a/src/compiler/GF/Grammar/Grammar.hs
+++ b/src/compiler/GF/Grammar/Grammar.hs
@@ -195,17 +195,17 @@ mGrammar ms = MGrammar (Map.fromList ms) ms
 
 -- | we store the module type with the identifier
 
-abstractOfConcrete :: SourceGrammar -> Ident -> Err Ident
+abstractOfConcrete :: ErrorMonad m => SourceGrammar -> Ident -> m Ident
 abstractOfConcrete gr c = do
   n <- lookupModule gr c
   case mtype n of
     MTConcrete a -> return a
-    _ -> Bad $ render (text "expected concrete" <+> ppIdent c)
+    _ -> raise $ render (text "expected concrete" <+> ppIdent c)
 
-lookupModule :: SourceGrammar -> Ident -> Err SourceModInfo
+lookupModule :: ErrorMonad m => SourceGrammar -> Ident -> m SourceModInfo
 lookupModule gr m = case Map.lookup m (moduleMap gr) of
   Just i  -> return i
-  Nothing -> Bad $ render (text "unknown module" <+> ppIdent m <+> text "among" <+> hsep (map (ppIdent . fst) (modules gr)))
+  Nothing -> raise $ render (text "unknown module" <+> ppIdent m <+> text "among" <+> hsep (map (ppIdent . fst) (modules gr)))
 
 isModAbs :: SourceModInfo -> Bool
 isModAbs m =