[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36
gwern0
gwern0 at gmail.com
Fri Apr 23 15:21:58 UTC 2010
The following commit has been merged in the master branch:
commit 89e2aee90b16b1f34dfba47b286639b15f207216
Author: gwern0 <gwern0 at gmail.com>
Date: Fri Nov 30 10:39:16 2007 +0100
-Wall police for System.Debian.ControlParser
diff --git a/src/System/Debian/ControlParser.hs b/src/System/Debian/ControlParser.hs
index 1386c48..371fee4 100644
--- a/src/System/Debian/ControlParser.hs
+++ b/src/System/Debian/ControlParser.hs
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Copyright : Copyright (C) 2004 John Goerzen
License : GNU GPL, version 2 or above
- Maintainer : John Goerzen <jgoerzen at complete.org>
+ Maintainer : John Goerzen <jgoerzen at complete.org>
Stability : provisional
Portability: portable
@@ -33,18 +33,20 @@ Written by John Goerzen, jgoerzen\@complete.org
module System.Debian.ControlParser(control, depPart)
where
+
import Text.ParserCombinators.Parsec
-import Data.String
+import Data.MissingHString (split)
+eol, extline :: GenParser Char st String
eol = (try (string "\r\n"))
<|> string "\n" <?> "EOL"
extline = try (do char ' '
content <- many (noneOf "\r\n")
eol
- return content
- )
+ return content )
+entry :: GenParser Char st (String, String)
entry = do key <- many1 (noneOf ":\r\n")
char ':'
val <- many (noneOf "\r\n")
@@ -58,6 +60,7 @@ control = do many header
retval <- many entry
return retval
+headerPGP, blankLine, header, headerHash :: GenParser Char st ()
headerPGP = do string "-----BEGIN PGP"
manyTill (noneOf "\r\n") eol
return ()
@@ -69,9 +72,9 @@ headerHash = do string "Hash: "
return ()
header = (try headerPGP) <|> (try blankLine) <|> (try headerHash)
-{- | Dependency parser.
+{- | Dependency parser.
-Returns (package name, Maybe version, arch list
+Returns (package name, Maybe version, arch list)
version is (operator, operand) -}
depPart :: CharParser a (String, (Maybe (String, String)), [String])
--
haskell-testpack
More information about the Pkg-haskell-commits
mailing list