[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 e56897d1a72e6b580f41349b6918b9dca0ebee80
Author: John Goerzen <jgoerzen at complete.org>
Date:   Fri Nov 19 05:04:31 2004 +0100

    Checkpointing
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--0.5--patch-87)

diff --git a/ChangeLog b/ChangeLog
index ff704f0..6e05a82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,19 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--0.5
 #
 
+2004-11-18 22:04:31 GMT	John Goerzen <jgoerzen at complete.org>	patch-87
+
+    Summary:
+      Checkpointing
+    Revision:
+      missingh--head--0.5--patch-87
+
+
+    modified files:
+     ChangeLog libsrc/MissingH/ConfigParser/Parser.hs
+     testsrc/ConfigParser/Parsertest.hs
+
+
 2004-11-18 21:54:38 GMT	John Goerzen <jgoerzen at complete.org>	patch-86
 
     Summary:
diff --git a/libsrc/MissingH/ConfigParser/Parser.hs b/libsrc/MissingH/ConfigParser/Parser.hs
index de78fa5..9ab5c27 100644
--- a/libsrc/MissingH/ConfigParser/Parser.hs
+++ b/libsrc/MissingH/ConfigParser/Parser.hs
@@ -82,8 +82,7 @@ sectheader = do ignorestuff
              <?> "section header"
 oname_chars = noneOf ":=\r\n"
 value_chars = noneOf "\r\n"
-extension_line = do ignorestuff <?> "POINT3"
-                    many1 whitespace_chars
+extension_line = do many1 whitespace_chars
                     c1 <- noneOf "\r\n#;"
                     remainder <- many value_chars
                     eoleof
diff --git a/testsrc/ConfigParser/Parsertest.hs b/testsrc/ConfigParser/Parsertest.hs
index 1afa5d5..72f9ce4 100644
--- a/testsrc/ConfigParser/Parsertest.hs
+++ b/testsrc/ConfigParser/Parsertest.hs
@@ -40,13 +40,13 @@ test_basic =
           [("Cemptysect", [])]
         ,f "comments4" "[emptysect]\n# [nonexistant]\n" [("emptysect", [])]
         ,f "simple section" "[sect1]\nfoo: bar\n" [("sect1", [("foo", "bar")])]
-{-
-        f "comments5" "\n#foo\n[sect1]\n\n#iiii \no1: v1\no2:  v2\n o3: v3"
+        ,f "comments5" "\n#foo\n[sect1]\n\n#iiii \no1: v1\no2:  v2\no3: v3"
+          [("sect1", [("o1", "v1"), ("o2", "v2"), ("o3", "v3")])]
+        ,f "comments5eol" "\n#foo\n[sect1]\n\n#iiii \no1: v1\no2:  v2\no3: v3\n"
           [("sect1", [("o1", "v1"), ("o2", "v2"), ("o3", "v3")])]
 
-        f "default1" "v1: o1\n[sect1]\nv2: o2" [("DEFAULT", [("v1", "o1")]),
+        ,f "default1" "v1: o1\n[sect1]\nv2: o2" [("DEFAULT", [("v1", "o1")]),
                                      ("sect1", [("v2", "o2")])]
--}
         ,f "simple default" "foo: bar" [("DEFAULT", [("foo", "bar")])]
 {-
         assertRaises "e test1" (ErrorCall "Lexer: \"(string)\" (line 1, column 5):\nunexpected \"\\n\"\nexpecting Option separator")

-- 
haskell-testpack