From 5b01d912cec744f41b5e0ba5720d7d641ca08195 Mon Sep 17 00:00:00 2001
From: bringert <bringert@cs.chalmers.se>
Date: Thu, 20 Dec 2007 17:34:12 +0000
Subject: Replace all the different ErrM.hs modules with GF.Data.ErrM.

---
 src/GF/JavaScript/ErrM.hs   | 16 ----------------
 src/GF/JavaScript/ParJS.hs  |  2 +-
 src/GF/JavaScript/ParJS.y   |  2 +-
 src/GF/JavaScript/SkelJS.hs |  2 +-
 src/GF/JavaScript/TestJS.hs |  2 +-
 5 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 src/GF/JavaScript/ErrM.hs

(limited to 'src/GF/JavaScript')

diff --git a/src/GF/JavaScript/ErrM.hs b/src/GF/JavaScript/ErrM.hs
deleted file mode 100644
index 71d3519a2..000000000
--- a/src/GF/JavaScript/ErrM.hs
+++ /dev/null
@@ -1,16 +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.JavaScript.ErrM where
-
--- 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
diff --git a/src/GF/JavaScript/ParJS.hs b/src/GF/JavaScript/ParJS.hs
index 90d0820ca..b7c0d04b0 100644
--- a/src/GF/JavaScript/ParJS.hs
+++ b/src/GF/JavaScript/ParJS.hs
@@ -3,7 +3,7 @@
 module GF.JavaScript.ParJS where
 import GF.JavaScript.AbsJS
 import GF.JavaScript.LexJS
-import GF.JavaScript.ErrM
+import GF.Data.ErrM
 #if __GLASGOW_HASKELL__ >= 503
 import Data.Array
 #else
diff --git a/src/GF/JavaScript/ParJS.y b/src/GF/JavaScript/ParJS.y
index 21d1468b6..bbbb959e5 100644
--- a/src/GF/JavaScript/ParJS.y
+++ b/src/GF/JavaScript/ParJS.y
@@ -4,7 +4,7 @@
 module GF.JavaScript.ParJS where
 import GF.JavaScript.AbsJS
 import GF.JavaScript.LexJS
-import GF.JavaScript.ErrM
+import GF.Data.ErrM
 }
 
 %name pProgram Program
diff --git a/src/GF/JavaScript/SkelJS.hs b/src/GF/JavaScript/SkelJS.hs
index e2022ef8f..fd4a88ebd 100644
--- a/src/GF/JavaScript/SkelJS.hs
+++ b/src/GF/JavaScript/SkelJS.hs
@@ -3,7 +3,7 @@ module GF.JavaScript.SkelJS where
 -- Haskell module generated by the BNF converter
 
 import GF.JavaScript.AbsJS
-import GF.JavaScript.ErrM
+import GF.Data.ErrM
 type Result = Err String
 
 failure :: Show a => a -> Result
diff --git a/src/GF/JavaScript/TestJS.hs b/src/GF/JavaScript/TestJS.hs
index 25e1fc597..3ddb52074 100644
--- a/src/GF/JavaScript/TestJS.hs
+++ b/src/GF/JavaScript/TestJS.hs
@@ -14,7 +14,7 @@ import GF.JavaScript.AbsJS
 
 
 
-import GF.JavaScript.ErrM
+import GF.Data.ErrM
 
 type ParseFun a = [Token] -> Err a
 
-- 
cgit v1.2.3