[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

[John Goerzen]

The following commit has been merged in the master branch:
commit 47b805c1f17e486e42ccf5cd190137ba1085ee18
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Nov 30 22:08:41 2004 +0100

    Fix compilation errors
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--0.5--patch-120)

diff --git a/ChangeLog b/ChangeLog
index ed286e0..91405c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,19 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--0.5
 #
 
+2004-11-30 15:08:41 GMT	John Goerzen <jgoerzen at complete.org>	patch-120
+
+    Summary:
+      Fix compilation errors
+    Revision:
+      missingh--head--0.5--patch-120
+
+
+    modified files:
+     ChangeLog libsrc/MissingH/ConfigParser.hs
+     libsrc/MissingH/Either.hs
+
+
 2004-11-30 15:05:43 GMT	John Goerzen <jgoerzen at complete.org>	patch-119
 
     Summary:
diff --git a/libsrc/MissingH/ConfigParser.hs b/libsrc/MissingH/ConfigParser.hs
index f4efe49..6eed7f6 100644
--- a/libsrc/MissingH/ConfigParser.hs
+++ b/libsrc/MissingH/ConfigParser.hs
@@ -118,11 +118,7 @@ readfile cp fp = do n <- parse_file fp
                                 return $ readutil cp y
 -}
 readfile cp fp = do n <- parse_file fp
-                    return $ retdata cp n
-
-retdata :: ConfigParser -> CPResult ParseOutput -> CPResult ConfigParser
-retdata cp x = do d <- x
-                  return $ readutil cp d
+                    return $ n >>= (return . (readutil cp))
 
 {- | Like 'readfile', but uses an already-open handle.  You should
 use 'readfile' instead of this if possible, since it will be able to
diff --git a/libsrc/MissingH/Either.hs b/libsrc/MissingH/Either.hs
index c2014b8..b25b608 100644
--- a/libsrc/MissingH/Either.hs
+++ b/libsrc/MissingH/Either.hs
@@ -41,7 +41,9 @@ as the Left value if the Maybe is Nothing.
 
 This function can be interpreted as:
 
- at matbeToEither :: e -> Maybe a -> Either e a
+ at maybeToEither :: e -> Maybe a -> Either e a@
+
+Its definition is given as it is so that it can be used in the Error and related monads.
 
 -}
 maybeToEither :: MonadError e m =>

-- 
haskell-testpack