[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 46690be1cc8a165aff176ca4785cae24ab708f8e
Author: John Goerzen <jgoerzen at complete.org>
Date:   Wed Dec 1 04:58:43 2004 +0100

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

diff --git a/ChangeLog b/ChangeLog
index d73b8f1..5c79263 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 21:58:43 GMT	John Goerzen <jgoerzen at complete.org>	patch-134
+
+    Summary:
+      checkpointing again
+    Revision:
+      missingh--head--0.5--patch-134
+
+
+    modified files:
+     ChangeLog cpexample1.hs libsrc/MissingH/ConfigParser.hs
+
+
 2004-11-30 21:52:26 GMT	John Goerzen <jgoerzen at complete.org>	patch-133
 
     Summary:
diff --git a/cpexample1.hs b/cpexample1.hs
index 41a9a3e..9972037 100644
--- a/cpexample1.hs
+++ b/cpexample1.hs
@@ -3,15 +3,11 @@ import MissingH.ConfigParser
 import Control.Monad.Error
 
 main = do
-          --let d = readfile empty "/etc/passwd"
           rv <- runErrorT $
               do
               cp <- join $ liftIO $ readfile empty "/etc/passwd"
-              --x <- cp
               let x = cp
               liftIO $ putStrLn "In the test"
-              --cp <- d
-              --liftIO $ print (sections cp)
               nb <- get x "DEFAULT" "nobody"
               liftIO $ putStrLn nb
               foo <- get x "DEFAULT" "foo"
diff --git a/libsrc/MissingH/ConfigParser.hs b/libsrc/MissingH/ConfigParser.hs
index c4e5455..18ae7de 100644
--- a/libsrc/MissingH/ConfigParser.hs
+++ b/libsrc/MissingH/ConfigParser.hs
@@ -64,6 +64,9 @@ module MissingH.ConfigParser
      -- ** Error Monad Usage
      -- $usageerrormonad
 
+     -- ** Combined Error\/IO Monad Usage
+     -- $usageerroriomonad
+
      -- * Types
      SectionSpec, OptionSpec, ConfigParser(..),
      CPErrorData(..), CPError, CPResult,
@@ -620,10 +623,13 @@ out of it:
 >                 cp <- set cp "sect1" "opt2" "bar"
 >                 options cp "sect1"
 
-This returns ["opt1", "opt2"].  A quite normal value.
+This returns @[\"opt1\", \"opt2\"]@.  A quite normal value.
 
 -}
 
+{- $usageerroriomonad
+
+-}
 
 {- $reading
 

-- 
haskell-testpack