[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 6af835e5bc3cb64df3a82038e6bb474d9aff6d9b
Author: John Goerzen <jgoerzen at complete.org>
Date:   Sat Oct 9 06:54:32 2004 +0100

    Prepping code for 0.4.0
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--1.0--patch-64)

diff --git a/ChangeLog b/ChangeLog
index a57376f..9837621 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,18 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--1.0
 #
 
+2004-10-09 00:54:32 GMT	John Goerzen <jgoerzen at complete.org>	patch-64
+
+    Summary:
+      Prepping code for 0.4.0
+    Revision:
+      missingh--head--1.0--patch-64
+
+
+    modified files:
+     ChangeLog Setup.description libsrc/MissingH/Str.hs
+
+
 2004-10-08 22:02:32 GMT	John Goerzen <jgoerzen at complete.org>	patch-63
 
     Summary:
diff --git a/Setup.description b/Setup.description
index e1b71a0..5ee018b 100644
--- a/Setup.description
+++ b/Setup.description
@@ -1,9 +1,14 @@
 -- arch-tag: MissingH main description file
 Name: MissingH
-Version: 0.2.0
+Version: 0.4.0
 License: GPL
 Maintainer: John Goerzen <jgoerzen at complete.org>
 Stability: Alpha
 Copyright: Copyright (c) 2004 John Goerzen
-Modules: MissingH.List, MissingH.Str, MissingH.IO, MissingH.IO.Binary
+Modules: MissingH.IO, MissingH.IO.Binary, MissingH.List,
+  MissingH.Logging, MissingH.Logging.Handler,
+    MissingH.Logging.Handler.Simple, MissingH.Logging.Handler.Syslog,
+    MissingH.Logging.Logger,
+  MissingH.Str
 HS-Source-Dir: libsrc
+Extensions: ExistentialQuantification
diff --git a/libsrc/MissingH/Str.hs b/libsrc/MissingH/Str.hs
index 4bcd381..5edca2f 100644
--- a/libsrc/MissingH/Str.hs
+++ b/libsrc/MissingH/Str.hs
@@ -28,11 +28,12 @@ module MissingH.Str(-- * Whitespace Removal
                         -- in "MissingH.List".
                         startswith, endswith,
                         -- * Conversions
-                        -- | Note: these functions are aliases for functions
+                        -- | Note: Some of these functions are aliases for functions
                         -- in "MissingH.List".
                         join, split, trunc
                        ) where
 import MissingH.List(startswith, endswith, join, split, trunc)
+import Text.Regex
 
 wschars = " \t\r\n"
 
@@ -67,3 +68,19 @@ lstrip s = case s of
 rstrip :: String -> String
 rstrip = reverse . lstrip . reverse
 
+{-
+-- | Splits a string based on a regular expression.  The regular express
+-- should identify one delimiter.
+
+splitRe :: Regex -> String -> [String]
+splitRe delim [] = []
+splitRe delim str =
+    case matchRegexAll delim str of
+        Just (prefix, match, postfix, subex) ->
+            if (prefix == "") && (postfix == "") && (match == str) then
+               -- We matched just a delimiter
+               [] : [] : []
+            else prefix : splitRe delim postfix
+        Nothing -> [str]
+
+-}
\ No newline at end of file

-- 
haskell-testpack