[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36
John Goerzen
jgoerzen at complete.org
Fri Apr 23 14:47:16 UTC 2010
The following commit has been merged in the master branch:
commit dca0fefd9af3367f86aa814030d2b9c635782572
Author: John Goerzen <jgoerzen at complete.org>
Date: Thu Nov 18 23:40:26 2004 +0100
Parser compiles
Keywords:
(jgoerzen at complete.org--projects/missingh--head--0.5--patch-71)
diff --git a/ChangeLog b/ChangeLog
index 8a6b094..e983045 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 16:40:26 GMT John Goerzen <jgoerzen at complete.org> patch-71
+
+ Summary:
+ Parser compiles
+ Revision:
+ missingh--head--0.5--patch-71
+
+
+ modified files:
+ ChangeLog libsrc/MissingH/ConfigParser/Parser.hs
+
+
2004-11-18 16:35:38 GMT John Goerzen <jgoerzen at complete.org> patch-70
Summary:
diff --git a/libsrc/MissingH/ConfigParser/Parser.hs b/libsrc/MissingH/ConfigParser/Parser.hs
index bbf2ba2..dee96f8 100644
--- a/libsrc/MissingH/ConfigParser/Parser.hs
+++ b/libsrc/MissingH/ConfigParser/Parser.hs
@@ -72,7 +72,7 @@ sectionlist = do {satisfyG (==EOFTOK); return []}
<|> try (do
s <- sectionhead
satisfyG (==EOFTOK)
- return [s, []]
+ return [(s, [])]
)
<|> do
s <- section
@@ -82,6 +82,7 @@ sectionlist = do {satisfyG (==EOFTOK); return []}
section :: GenParser CPTok () (String, [(String, String)])
section = do {sh <- sectionhead; ol <- optionlist; return (sh, ol)}
+sectionhead :: GenParser CPTok () String
sectionhead =
let wf (NEWSECTION x) = Just x
wf _ = Nothing
@@ -93,6 +94,7 @@ optionlist =
try (do {c <- coption; ol <- optionlist; return $ c : ol})
<|> do {c <- coption; return $ [c]}
+extensionlist :: GenParser CPTok () [String]
extensionlist =
let wf (EXTENSIONLINE x) = Just x
wf _ = Nothing
@@ -112,6 +114,7 @@ coption =
)
<|> do {o <- want wf; return $ (strip (fst o), strip (snd o))}
+valmerge :: [String] -> String
valmerge vallist =
let vl2 = map strip vallist
in join "\n" vl2
--
haskell-testpack
More information about the Pkg-haskell-commits
mailing list