[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 e457205b516810218d3c1c1bcc119269fd7a38f1
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Apr 19 07:50:32 2005 +0100

    More fixes to ControlParser

diff --git a/MissingH/Debian/ControlParser.hs b/MissingH/Debian/ControlParser.hs
index 86eebda..6278156 100644
--- a/MissingH/Debian/ControlParser.hs
+++ b/MissingH/Debian/ControlParser.hs
@@ -54,7 +54,7 @@ entry = do key <- many1 (noneOf ":\r\n")
            return (key, unlines ([val] ++ exts))
 
 {- | Main parser for the control file -}
-control :: CharParser [(String, String)]
+control :: CharParser a [(String, String)]
 control = do many header
              retval <- many entry
              return retval
@@ -70,8 +70,12 @@ headerHash = do string "Hash: "
                 return ()
 header = (try headerPGP) <|> (try blankLine) <|> (try headerHash)
 
-{- | Dependency parser. -}
-depPart :: CharParser (String, Maybe (String, String, [String]))
+{- | Dependency parser. 
+
+Returns (package name, Maybe version, arch list
+
+version is (operator, operand) -}
+depPart :: CharParser a (String, (Maybe (String, String)), [String])
 depPart = do packagename <- many1 (noneOf " (")
              many (char ' ')
              version <- (do char '('

-- 
haskell-testpack