[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 e85883c5588455302676d6e2312d7c52b910a4fe
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Oct 5 23:48:45 2004 +0100

    Added Cabalized info
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--1.0--patch-22)

diff --git a/Makefile b/Makefile
index f6abdeb..cdd00c3 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ libmissingH.a: $(OBJS)
 doc:
 	-rm -rf html
 	mkdir html
-	haddock -h -o html $(SOURCES)
+	haddock -t 'MissingH API Manual' -h -o html $(SOURCES)
 
 clean:
 	-rm -rf html `find . -name "*.o"` `find . -name "*.hi"` \
diff --git a/MissingH/Listutil.hs b/MissingH/Listutil.hs
index b696115..2d432fc 100644
--- a/MissingH/Listutil.hs
+++ b/MissingH/Listutil.hs
@@ -30,7 +30,7 @@ module MissingH.Listutil(-- * Tests
                          for association lists. -}
                          addToAL, delFromAL,
                          -- * Conversions
-                         split, join, trunc,
+                         split, join, genericJoin, trunc,
                          -- -- * Sub-List Selection
                          -- sub,
                         ) where
@@ -93,6 +93,18 @@ Example:
 join :: [a] -> [[a]] -> [a]
 join delim l = concat (intersperse delim l)
 
+{- | Like 'join', but works with a list of anything showable, converting
+it to a String.
+
+Examples:
+
+> genericJoin ", " [1, 2, 3, 4] -> "1, 2, 3, 4"
+> genericJoin "|" ["foo", "bar", "baz"] -> "\"foo\"|\"bar\"|\"baz\""
+
+-}
+genericJoin :: Show a => String -> [a] -> String
+genericJoin delim l = join delim (map show l)
+
 {- | Given a length and a list, remove any elements at the end of the list
 that make it longer than the length.  If the list is shorter than the
 length, do nothing.
diff --git a/Setup.description b/Setup.description
new file mode 100644
index 0000000..2003939
--- /dev/null
+++ b/Setup.description
@@ -0,0 +1,9 @@
+-- arch-tag: MissingH main description file
+Name: MissingH
+Version: 0.1.0
+License: GPL
+Maintainer: John Goerzen <jgoerzen at complete.org>
+Stability: Alpha
+Copyright: Copyright (c) 2004 John Goerzen
+Exposed-Modules: MissingH.Listutil, MissingH.Strutil, MissingH.IOutil
+HS-Source-Dir: libsrc
diff --git a/Setup.lhs b/Setup.lhs
new file mode 100644
index 0000000..f2d98a8
--- /dev/null
+++ b/Setup.lhs
@@ -0,0 +1,3 @@
+#!/usr/bin/env runhugs
+-- arch-tag: Main setup script
+> import Distribution.simple
\ No newline at end of file

-- 
haskell-testpack