[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 53403f8d5df3f07124c297f1919ecceac56e8935
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Dec 21 04:05:56 2004 +0100

    Checkpointing (compiles)
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--0.7--patch-107)

diff --git a/ChangeLog b/ChangeLog
index f2c4fe5..673684f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,18 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--0.7
 #
 
+2004-12-20 21:05:56 GMT	John Goerzen <jgoerzen at complete.org>	patch-107
+
+    Summary:
+      Checkpointing (compiles)
+    Revision:
+      missingh--head--0.7--patch-107
+
+
+    modified files:
+     ChangeLog libsrc/MissingH/IO/HVFS/InstanceHelpers.hs
+
+
 2004-12-20 20:54:54 GMT	John Goerzen <jgoerzen at complete.org>	patch-106
 
     Summary:
diff --git a/libsrc/MissingH/IO/HVFS/InstanceHelpers.hs b/libsrc/MissingH/IO/HVFS/InstanceHelpers.hs
index eba70bf..b891b78 100644
--- a/libsrc/MissingH/IO/HVFS/InstanceHelpers.hs
+++ b/libsrc/MissingH/IO/HVFS/InstanceHelpers.hs
@@ -43,6 +43,7 @@ import Data.IORef
 import MissingH.Path
 import MissingH.Path.NameManip
 import Control.Monad.Error
+import System.IO.Error
 
 {- | A simple class that assumes that everything is either a file
 or a directory. -}
@@ -136,3 +137,10 @@ instance HVFS MemoryVFS where
                                              SimpleStat {isFile = True}
                      (MemoryDirectory _) -> return $ HVFSStatEncap $
                                              SimpleStat {isFile = False}
+    vGetDirectoryContents x fp =
+        do elem <- getMelem x fp
+           case elem of
+                MemoryFile _ -> vRaiseError x doesNotExistErrorType
+                                  "Can't list contents of a file"
+                                  (Just fp)
+                MemoryDirectory c -> return $ map fst c

-- 
haskell-testpack