[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 6c74a5f2287274b93bbe43de6582d1c2358e8284
Author: John Goerzen <jgoerzen at complete.org>
Date:   Fri Nov 19 05:13:17 2004 +0100

    More code reduction
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--0.5--patch-89)

diff --git a/ChangeLog b/ChangeLog
index ae3dc0e..019ea85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,18 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--0.5
 #
 
+2004-11-18 22:13:17 GMT	John Goerzen <jgoerzen at complete.org>	patch-89
+
+    Summary:
+      More code reduction
+    Revision:
+      missingh--head--0.5--patch-89
+
+
+    modified files:
+     ChangeLog libsrc/MissingH/ConfigParser/Parser.hs
+
+
 2004-11-18 22:06:07 GMT	John Goerzen <jgoerzen at complete.org>	patch-88
 
     Summary:
diff --git a/libsrc/MissingH/ConfigParser/Parser.hs b/libsrc/MissingH/ConfigParser/Parser.hs
index 1b1b5e8..30f3213 100644
--- a/libsrc/MissingH/ConfigParser/Parser.hs
+++ b/libsrc/MissingH/ConfigParser/Parser.hs
@@ -114,25 +114,15 @@ sectionlist =
 
 section = do {sh <- sectionhead; ol <- optionlist; return (sh, ol)}
 
-
 sectionhead = do {s <- sectheader; return $ strip s}
               <?> "start of section"
 
-optionlist = 
-    try (do {c <- coption; ol <- optionlist; return $ c : ol})
-    <|> do {c <- coption; return $ [c]}
-
-extensionlist =
-    try (do {x <- extension_line; l <- extensionlist; return $ x : l})
-    <|> do {x <- extension_line; return [x]}
-
-coption =
-    try (do o <- optionpair
-            l <- extensionlist
-            return (strip (fst o), valmerge ((snd o) : l))
-        )
-    <|> do {o <- optionpair; return $ (strip (fst o), strip (snd o))}
-    <?> "an option"
+optionlist = many1 (try coption)
+
+coption = do o <- optionpair
+             l <- many (try extension_line)
+             return (strip (fst o), valmerge ((snd o) : l))
+          <?> "an option"
 
 valmerge :: [String] -> String
 valmerge vallist =

-- 
haskell-testpack