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

5 files changed, 4 insertions, 30 deletions

diff --git a/src/GF/Command/Commands.hs b/src/GF/Command/Commands.hs
index d8d77bc11..f89a3d111 100644
--- a/src/GF/Command/Commands.hs
+++ b/src/GF/Command/Commands.hs
@@ -18,7 +18,7 @@ import GF.GFCC.Macros
 import GF.Devel.PrintGFCC
 import GF.GFCC.DataGFCC ----
 
-import GF.Command.ErrM ----
+import GF.Data.ErrM ----
 
 import qualified Data.Map as Map
 
diff --git a/src/GF/Command/ErrM.hs b/src/GF/Command/ErrM.hs
deleted file mode 100644
index b1f6329c2..000000000
--- a/src/GF/Command/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.Command.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/Command/Interpreter.hs b/src/GF/Command/Interpreter.hs
index ab6ee7f44..10730e7ef 100644
--- a/src/GF/Command/Interpreter.hs
+++ b/src/GF/Command/Interpreter.hs
@@ -11,7 +11,7 @@ import GF.GFCC.API
 import GF.GFCC.Macros
 import GF.GFCC.DataGFCC
 
-import GF.Command.ErrM ----
+import GF.Data.ErrM ----
 
 import qualified Data.Map as Map
 
diff --git a/src/GF/Command/PPrTree.hs b/src/GF/Command/PPrTree.hs
index 4067fdec6..7372c722d 100644
--- a/src/GF/Command/PPrTree.hs
+++ b/src/GF/Command/PPrTree.hs
@@ -6,7 +6,7 @@ import GF.GFCC.Macros
 import qualified GF.Command.ParGFShell as P
 import GF.Command.PrintGFShell
 import GF.Command.AbsGFShell
-import GF.Command.ErrM
+import GF.Data.ErrM
 
 pTree :: String -> Exp
 pTree s = case P.pTree (P.myLexer s) of
diff --git a/src/GF/Command/ParGFShell.hs b/src/GF/Command/ParGFShell.hs
index a334c3179..1fc85b4b7 100644
--- a/src/GF/Command/ParGFShell.hs
+++ b/src/GF/Command/ParGFShell.hs
@@ -3,7 +3,7 @@
 module GF.Command.ParGFShell where
 import GF.Command.AbsGFShell
 import GF.Command.LexGFShell
-import GF.Command.ErrM
+import GF.Data.ErrM
 #if __GLASGOW_HASKELL__ >= 503
 import Data.Array
 #else