[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 b1d6d8f9eca459fa708c8b1cd8d3bceeaf015e60
Author: John Goerzen <jgoerzen at complete.org>
Date:   Sun Nov 14 05:40:11 2004 +0100

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

diff --git a/ChangeLog b/ChangeLog
index 06475fe..00ad012 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,18 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--0.5
 #
 
+2004-11-13 22:40:11 GMT	John Goerzen <jgoerzen at complete.org>	patch-33
+
+    Summary:
+      Checkpointing
+    Revision:
+      missingh--head--0.5--patch-33
+
+
+    modified files:
+     ChangeLog libsrc/MissingH/Printf.hs
+
+
 2004-11-13 21:42:46 GMT	John Goerzen <jgoerzen at complete.org>	patch-32
 
     Summary:
diff --git a/libsrc/MissingH/Printf.hs b/libsrc/MissingH/Printf.hs
index 24f95cc..3ab3cad 100644
--- a/libsrc/MissingH/Printf.hs
+++ b/libsrc/MissingH/Printf.hs
@@ -36,7 +36,8 @@ module MissingH.Printf(
                        PFRun(..),
                        PFType(..),
                        sprintf,
-                       printf,
+--                       ssprintf,
+--                       printf,
                        wrapper
                        ) where
 
@@ -62,10 +63,10 @@ instance PFType String where
     fromValue _ = error "fromValue string"
 
 class PFRun a where
-    pfrun :: ([Value] -> Value) -> a
+    pfrun :: ([Value] -> String) -> a
 
 instance PFRun String where
-    pfrun f = fromValue $ f []
+    pfrun f = f []
 
 instance (PFType a, PFRun b) => PFRun (a -> b) where
     pfrun f x = pfrun (\xs -> f (toValue x : xs))
@@ -78,14 +79,16 @@ sprintf_real ('!' : xs) (y : ys) =
     show (((fromValue y)::Int) + 1) ++ sprintf_real xs ys
 sprintf_real (x:xs) y = x : sprintf_real xs y
 
-wrapper :: String -> [Value] -> Value
-wrapper f v = toValue $ sprintf_real f v
+wrapper :: String -> [Value] -> String
+wrapper f v = sprintf_real f v
 
-sprintf :: PFRun a => String -> a
+sprintf :: (PFRun a) => String -> a
 sprintf f = pfrun $ wrapper f
 
-printf :: (PFRun a, PFType a) => String -> a -> IO ()
-printf f v = putStr (sprintf f v)
+--printf :: (PFRun a) => String -> IO a
+--printf = return . sprintf
+
+--printf :: (PFRun a) => String -> a
 
 --printf :: PFRun a => String -> a -> IO ()
 

-- 
haskell-testpack