Replace all the different ErrM.hs modules with GF.Data.ErrM.

8 files changed, 6 insertions, 58 deletions

diff --git a/src/GF/GFCC/API.hs b/src/GF/GFCC/API.hs
index e3a7fc3c9..111857b18 100644
--- a/src/GF/GFCC/API.hs
+++ b/src/GF/GFCC/API.hs
@@ -24,7 +24,7 @@ import GF.GFCC.Raw.ConvertGFCC
 import GF.GFCC.Raw.ParGFCCRaw
 import GF.Command.PPrTree
 
-import GF.GFCC.ErrM
+import GF.Data.ErrM
 
 import GF.Parsing.FCFG
 import GF.Conversion.SimpleToFCFG (convertGrammar)
diff --git a/src/GF/GFCC/CheckGFCC.hs b/src/GF/GFCC/CheckGFCC.hs
index a6fd0332d..dfd9b2a0e 100644
--- a/src/GF/GFCC/CheckGFCC.hs
+++ b/src/GF/GFCC/CheckGFCC.hs
@@ -3,7 +3,7 @@ module GF.GFCC.CheckGFCC (checkGFCC, checkGFCCio, checkGFCCmaybe) where
 import GF.GFCC.CId
 import GF.GFCC.Macros
 import GF.GFCC.DataGFCC
-import GF.GFCC.ErrM
+import GF.Data.ErrM
 
 import qualified Data.Map as Map
 import Control.Monad
diff --git a/src/GF/GFCC/ErrM.hs b/src/GF/GFCC/ErrM.hs
deleted file mode 100644
index 15b014ae7..000000000
--- a/src/GF/GFCC/ErrM.hs
+++ /dev/null
@@ -1,26 +0,0 @@
--- BNF Converter: Error Monad
--- Copyright (C) 2004  Author:  Aarne Ranta
-
--- This file comes with NO WARRANTY and may be used FOR ANY PURPOSE.
-module GF.GFCC.ErrM where
-
--- the Error monad: like Maybe type with error msgs
-
-import Control.Monad (MonadPlus(..), liftM)
-
-data Err a = Ok a | Bad String
-  deriving (Read, Show, Eq, Ord)
-
-instance Monad Err where
-  return      = Ok
-  fail        = Bad
-  Ok a  >>= f = f a
-  Bad s >>= f = Bad s
-
-instance Functor Err where
-  fmap = liftM
-
-instance MonadPlus Err where
-  mzero = Bad "Err.mzero"
-  mplus (Bad _) y = y
-  mplus x       _ = x
diff --git a/src/GF/GFCC/Raw/ErrM.hs b/src/GF/GFCC/Raw/ErrM.hs
deleted file mode 100644
index ce9401669..000000000
--- a/src/GF/GFCC/Raw/ErrM.hs
+++ /dev/null
@@ -1,26 +0,0 @@
--- BNF Converter: Error Monad
--- Copyright (C) 2004  Author:  Aarne Ranta
-
--- This file comes with NO WARRANTY and may be used FOR ANY PURPOSE.
-module GF.GFCC.Raw.ErrM where
-
--- the Error monad: like Maybe type with error msgs
-
-import Control.Monad (MonadPlus(..), liftM)
-
-data Err a = Ok a | Bad String
-  deriving (Read, Show, Eq, Ord)
-
-instance Monad Err where
-  return      = Ok
-  fail        = Bad
-  Ok a  >>= f = f a
-  Bad s >>= f = Bad s
-
-instance Functor Err where
-  fmap = liftM
-
-instance MonadPlus Err where
-  mzero = Bad "Err.mzero"
-  mplus (Bad _) y = y
-  mplus x       _ = x
diff --git a/src/GF/GFCC/Raw/ParGFCCRaw.hs b/src/GF/GFCC/Raw/ParGFCCRaw.hs
index 16a15cba1..dd3f42991 100644
--- a/src/GF/GFCC/Raw/ParGFCCRaw.hs
+++ b/src/GF/GFCC/Raw/ParGFCCRaw.hs
@@ -3,7 +3,7 @@
 module GF.GFCC.Raw.ParGFCCRaw (parseGrammar) where
 import GF.GFCC.Raw.AbsGFCCRaw
 import GF.GFCC.Raw.LexGFCCRaw
-import GF.GFCC.Raw.ErrM
+import GF.Data.ErrM
 #if __GLASGOW_HASKELL__ >= 503
 import Data.Array
 #else
diff --git a/src/GF/GFCC/Raw/ParGFCCRaw.y b/src/GF/GFCC/Raw/ParGFCCRaw.y
index 80643d6d0..630d65a9d 100644
--- a/src/GF/GFCC/Raw/ParGFCCRaw.y
+++ b/src/GF/GFCC/Raw/ParGFCCRaw.y
@@ -4,7 +4,7 @@
 module GF.GFCC.Raw.ParGFCCRaw (parseGrammar) where
 import GF.GFCC.Raw.AbsGFCCRaw
 import GF.GFCC.Raw.LexGFCCRaw
-import GF.GFCC.Raw.ErrM
+import GF.Data.ErrM
 }
 
 %name pGrammar Grammar
diff --git a/src/GF/GFCC/SkelGFCC.hs b/src/GF/GFCC/SkelGFCC.hs
index f9fffa217..6972fd3c3 100644
--- a/src/GF/GFCC/SkelGFCC.hs
+++ b/src/GF/GFCC/SkelGFCC.hs
@@ -3,7 +3,7 @@ module GF.GFCC.SkelGFCC where
 -- Haskell module generated by the BNF converter
 
 import GF.GFCC.AbsGFCC
-import GF.GFCC.ErrM
+import GF.Data.ErrM
 type Result = Err String
 
 failure :: Show a => a -> Result
diff --git a/src/GF/GFCC/TestGFCC.hs b/src/GF/GFCC/TestGFCC.hs
index 761e1db5f..c379a687a 100644
--- a/src/GF/GFCC/TestGFCC.hs
+++ b/src/GF/GFCC/TestGFCC.hs
@@ -14,7 +14,7 @@ import GF.GFCC.AbsGFCC
 
 
 
-import GF.GFCC.ErrM
+import GF.Data.ErrM
 
 type ParseFun a = [Token] -> Err a