From e4ffd5179740cb5b68f6d96d279bff439b549f44 Mon Sep 17 00:00:00 2001
From: bringert <bringert@cs.chalmers.se>
Date: Thu, 20 Dec 2007 17:41:31 +0000
Subject: [PATCH] Moved Err definition to GF.Data.ErrM from GF.Data.Operations.
 This means the GF-embed does not have to include GF.Data.Operations.

---
 src/GF/Data/ErrM.hs       | 26 ++++++++++++++++++++++----
 src/GF/Data/Operations.hs | 23 ++---------------------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/src/GF/Data/ErrM.hs b/src/GF/Data/ErrM.hs
index f588df1c0..e8cea12d4 100644
--- a/src/GF/Data/ErrM.hs
+++ b/src/GF/Data/ErrM.hs
@@ -12,9 +12,27 @@
 -- hack for BNFC generated files. AR 21/9/2003
 -----------------------------------------------------------------------------
 
-module GF.Data.ErrM (
-		     module GF.Data.Operations
-	    ) where
+module GF.Data.ErrM (Err(..)) where
 
-import GF.Data.Operations (Err(..))
+import Control.Monad (MonadPlus(..))
 
+-- | like @Maybe@ type with error msgs
+data Err a = Ok a | Bad String
+  deriving (Read, Show, Eq)
+
+instance Monad Err where
+  return      = Ok
+  fail        = Bad
+  Ok a  >>= f = f a
+  Bad s >>= f = Bad s
+
+-- | added 2\/10\/2003 by PEB
+instance Functor Err where
+  fmap f (Ok a) = Ok (f a)
+  fmap f (Bad s) = Bad s
+
+-- | added by KJ
+instance MonadPlus Err where
+    mzero = Bad "error (no reason given)"
+    mplus (Ok a)  _ = Ok a
+    mplus (Bad s) b = b
diff --git a/src/GF/Data/Operations.hs b/src/GF/Data/Operations.hs
index c6def01a8..1b2033d69 100644
--- a/src/GF/Data/Operations.hs
+++ b/src/GF/Data/Operations.hs
@@ -80,6 +80,8 @@ import Data.List (nub, sortBy, sort, deleteBy, nubBy)
 --import Data.FiniteMap
 import Control.Monad (liftM,liftM2, MonadPlus, mzero, mplus)
 
+import GF.Data.ErrM
+
 infixr 5 +++
 infixr 5 ++-
 infixr 5 ++++
@@ -94,27 +96,6 @@ onSnd f (x, y) = (x, f y)
 
 -- the Error monad
 
--- | like @Maybe@ type with error msgs
-data Err a = Ok a | Bad String
-  deriving (Read, Show, Eq)
-
-instance Monad Err where
-  return      = Ok
-  fail        = Bad
-  Ok a  >>= f = f a
-  Bad s >>= f = Bad s
-
--- | added 2\/10\/2003 by PEB
-instance Functor Err where
-  fmap f (Ok a) = Ok (f a)
-  fmap f (Bad s) = Bad s
-
--- | added by KJ
-instance MonadPlus Err where
-    mzero = Bad "error (no reason given)"
-    mplus (Ok a)  _ = Ok a
-    mplus (Bad s) b = b
-
 -- | analogue of @maybe@
 err :: (String -> b) -> (a -> b) -> Err a -> b 
 err d f e = case e of