[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 8710f73a333d5ae00ad3ebdf76c323a897bd5e8d
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Nov 30 11:31:06 2004 +0100

    checkpointing
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--0.5--patch-118)

diff --git a/ChangeLog b/ChangeLog
index 7259f97..772f160 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,18 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--0.5
 #
 
+2004-11-30 04:31:06 GMT	John Goerzen <jgoerzen at complete.org>	patch-118
+
+    Summary:
+      checkpointing
+    Revision:
+      missingh--head--0.5--patch-118
+
+
+    modified files:
+     ChangeLog libsrc/MissingH/ConfigParser.hs
+
+
 2004-11-29 20:17:08 GMT	John Goerzen <jgoerzen at complete.org>	patch-117
 
     Summary:
diff --git a/libsrc/MissingH/ConfigParser.hs b/libsrc/MissingH/ConfigParser.hs
index 06379a9..94dea21 100644
--- a/libsrc/MissingH/ConfigParser.hs
+++ b/libsrc/MissingH/ConfigParser.hs
@@ -110,6 +110,11 @@ does not convey those options.
 
 May return an error if there is a syntax error.  May raise an exception if the file could not be accessed.
 -}
+
+retdata :: ConfigParser -> CPResult ParseOutput -> CPResult ConfigParser
+retdata cp x = do d <- x
+                  return $ readutil cp d
+
 readfile :: ConfigParser -> FilePath ->IO (CPResult ConfigParser)
 {-
 readfile cp fp = do n <- parse_file fp
@@ -117,7 +122,8 @@ readfile cp fp = do n <- parse_file fp
                                 return $ readutil cp y
 -}
 readfile cp fp = do n <- parse_file fp
-                    return $ n >>= (return . (readutil cp))
+                    return $ retdata cp n
+
 
 {- | Like 'readfile', but uses an already-open handle.  You should
 use 'readfile' instead of this if possible, since it will be able to

-- 
haskell-testpack