[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 e27b3a009da66643491e3a1a2cd420e97d722826
Author: John Goerzen <jgoerzen at complete.org>
Date:   Fri Oct 8 21:32:58 2004 +0100

    Removed provisional logging stuff
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--1.0--patch-54)

diff --git a/ChangeLog b/ChangeLog
index 638fd94..ac7f7c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,22 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--1.0
 #
 
+2004-10-08 15:32:58 GMT	John Goerzen <jgoerzen at complete.org>	patch-54
+
+    Summary:
+      Removed provisional logging stuff
+    Revision:
+      missingh--head--1.0--patch-54
+
+
+    removed files:
+     libsrc/MissingH/Logging/Default.hs
+     libsrc/MissingH/Logging/Logger.hs
+
+    modified files:
+     ChangeLog libsrc/MissingH/List.hs libsrc/MissingH/Logging.hs
+
+
 2004-10-08 13:44:22 GMT	John Goerzen <jgoerzen at complete.org>	patch-53
 
     Summary:
diff --git a/libsrc/MissingH/List.hs b/libsrc/MissingH/List.hs
index 2cde196..f9f5db8 100644
--- a/libsrc/MissingH/List.hs
+++ b/libsrc/MissingH/List.hs
@@ -31,10 +31,12 @@ module MissingH.List(-- * Tests
                      addToAL, delFromAL,
                      -- * Conversions
                      split, join, genericJoin, trunc,
+                     -- * Miscellaneous
+                     countElem
                      -- -- * Sub-List Selection
                      -- sub,
                     ) where
-import Data.List(intersperse, concat, isPrefixOf, isSuffixOf)
+import Data.List(intersperse, concat, isPrefixOf, isSuffixOf, elemIndices)
 import IO
 import System.IO.Unsafe
 
@@ -132,3 +134,7 @@ delFromAL l key = filter (\a -> (fst a) /= key) l
 
 {- FIXME TODO: sub -}
 
+{- | Returns a count of the number of times the given element occured in the
+given list. -}
+countElem :: Eq a => a -> [a] -> Int
+countElem i l = length (elemIndices i l)
diff --git a/libsrc/MissingH/Logging.hs b/libsrc/MissingH/Logging.hs
index 7cb2462..2d2307b 100644
--- a/libsrc/MissingH/Logging.hs
+++ b/libsrc/MissingH/Logging.hs
@@ -22,6 +22,8 @@ Written by John Goerzen, jgoerzen\@complete.org
 
 This module defines basic types used for logging.
 
+/This API is new and in a state of flux./
+
 -}
 
 module MissingH.Logging(Priority(..),
diff --git a/libsrc/MissingH/Logging/Default.hs b/libsrc/MissingH/Logging/Default.hs
deleted file mode 100644
index a0f2294..0000000
--- a/libsrc/MissingH/Logging/Default.hs
+++ /dev/null
@@ -1,45 +0,0 @@
-{- arch-tag: Log handlers default code
-Copyright (C) 2004 John Goerzen <jgoerzen at complete.org>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
--}
-
-{- | Definition of log handler support
-
-For some handlers, check out "MissingH.Logging.Handler.Simple" and
-"MissingH.Logging.Handler.Syslog".
-
-Written by John Goerzen, jgoerzen\@complete.org
--}
-
-module MissingH.Logging.Default where
-import MissingH.Logging
-import MissingH.Logging.Handler
-import MissingH.Logging.Handler.Simple
-import Data.IORef
-import IO
-
-{-
-defaultHandlerNamespace :: LogHandler b => IO (a -> IORef b)
-defaultHandlerNamespace = do
-                          h <- (streamHandler stdout WARNING)
-                          r <- newIORef h
-                          return (\x -> r)
-
-
--}
-
-
-foo = streamHandler stdout WARNING
diff --git a/libsrc/MissingH/Logging/Logger.hs b/libsrc/MissingH/Logging/Logger.hs
deleted file mode 100644
index 216a48b..0000000
--- a/libsrc/MissingH/Logging/Logger.hs
+++ /dev/null
@@ -1,33 +0,0 @@
-{- arch-tag: Logger support
-Copyright (C) 2004 John Goerzen <jgoerzen at complete.org>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
--}
-
-{- | Definition of log handler support
-
-For some handlers, check out "MissingH.Logging.Handler.Simple" and
-"MissingH.Logging.Handler.Syslog".
-
-Written by John Goerzen, jgoerzen\@complete.org
--}
-
-module MissingH.Logging.Logger(
-                              ) where
-import MissingH.Logging
-import IO
-
-
-

-- 
haskell-testpack