From 5b01d912cec744f41b5e0ba5720d7d641ca08195 Mon Sep 17 00:00:00 2001 From: bringert Date: Thu, 20 Dec 2007 17:34:12 +0000 Subject: Replace all the different ErrM.hs modules with GF.Data.ErrM. --- src/GF/GFCC/Raw/ErrM.hs | 26 -------------------------- src/GF/GFCC/Raw/ParGFCCRaw.hs | 2 +- src/GF/GFCC/Raw/ParGFCCRaw.y | 2 +- 3 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 src/GF/GFCC/Raw/ErrM.hs (limited to 'src/GF/GFCC/Raw') 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 -- cgit v1.2.3