[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 20a5066293f059aea521e70fd5420a2403cb037f
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Dec 21 05:34:42 2004 +0100

    Added Show requirements
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--0.7--patch-115)

diff --git a/ChangeLog b/ChangeLog
index 7728bc3..1b82cd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,19 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--0.7
 #
 
+2004-12-20 22:34:42 GMT	John Goerzen <jgoerzen at complete.org>	patch-115
+
+    Summary:
+      Added Show requirements
+    Revision:
+      missingh--head--0.7--patch-115
+
+
+    modified files:
+     ChangeLog libsrc/MissingH/IO/HVFS.hs
+     libsrc/MissingH/IO/HVFS/InstanceHelpers.hs
+
+
 2004-12-20 22:31:41 GMT	John Goerzen <jgoerzen at complete.org>	patch-114
 
     Summary:
diff --git a/libsrc/MissingH/IO/HVFS.hs b/libsrc/MissingH/IO/HVFS.hs
index 9806764..011e7a8 100644
--- a/libsrc/MissingH/IO/HVFS.hs
+++ b/libsrc/MissingH/IO/HVFS.hs
@@ -73,7 +73,7 @@ Inplementators must, at minimum, implement 'vIsDirectory' and
 Default implementations of everything else are provided, returning
 reasonable values.
 -}
-class HVFSStat a where
+class (Show a) => HVFSStat a where
     vDeviceID :: a -> DeviceID
     vFileID :: a -> FileID
     {- | Refers to file permissions, NOT the st_mode field from stat(2) -}
@@ -135,7 +135,7 @@ certainly several of the others.
 Most of these functions correspond to functions in System.Directory or
 System.Posix.Files.  Please see detailed documentation on them there.
  -}
-class HVFS a where
+class (Show a) => HVFS a where
     vGetCurrentDirectory :: a -> IO FilePath
     vSetCurrentDirectory :: a -> FilePath -> IO ()
     vGetDirectoryContents :: a -> FilePath -> IO [FilePath]
@@ -194,6 +194,9 @@ eh fs desc = vRaiseError fs illegalOperationErrorType
 class HVFS a => HVFSOpenable a where
     vOpen :: a -> FilePath -> IOMode -> IO HVFSOpenEncap
 
+instance Show FileStatus where
+    show _ = "<FileStatus>"
+
 ----------------------------------------------------------------------
 -- Standard implementations
 ----------------------------------------------------------------------
diff --git a/libsrc/MissingH/IO/HVFS/InstanceHelpers.hs b/libsrc/MissingH/IO/HVFS/InstanceHelpers.hs
index 4df066d..4ea50cb 100644
--- a/libsrc/MissingH/IO/HVFS/InstanceHelpers.hs
+++ b/libsrc/MissingH/IO/HVFS/InstanceHelpers.hs
@@ -66,11 +66,15 @@ instance HVFSStat SimpleStat where
 type MemoryNode = (String, MemoryEntry)
 data MemoryEntry = MemoryDirectory [MemoryNode]
                  | MemoryFile String
+                   deriving (Eq, Show)
 data MemoryVFS = MemoryVFS 
                { content :: IORef [MemoryNode],
                  cwd :: IORef FilePath
                }
 
+instance Show MemoryVFS where
+    show _ = "<MemoryVFS>"
+
 -- | Create a new 'MemoryVFS' object from an existing tree.
 -- An empty filesystem may be created by using @[]@ for the parameter.
 newMemoryVFS :: [MemoryNode] -> IO MemoryVFS

-- 
haskell-testpack