Changeset 10466

Timestamp:

06/03/06 08:12:31 (2 years ago)

Author:

audreyt

Message:

* Change file tests to use native POSIX stats in preparation

of true chained tests.

Location:

src/Pugs

Files:

• AST/Internals.hs (modified) (1 diff)
• Compat.hs (modified) (6 diffs)
• Internals.hs (modified) (3 diffs)
• Prim/Eval.hs (modified) (1 diff)
• Prim/FileTest.hs (modified) (1 diff)

src/Pugs/AST/Internals.hs

@@ -1253 +1253 @@
 mkCompUnit _ pad ast = MkCompUnit compUnitVersion pad ast
 
+compUnitVersion :: Int
 compUnitVersion = 1
 

src/Pugs/Compat.hs

@@ -1 @@
-{-# OPTIONS_GHC -fglasgow-exts -fvia-C -optc-w -fno-warn-orphans -cpp #-}
+{-# OPTIONS_GHC -fglasgow-exts -fvia-C -optc-w -fno-warn-orphans -cpp -fno-warn-deprecations #-}
 
 {-|
@@ -43 +43 @@
     closeDirStream,
     executeFile',        -- the prime signifies we changed signature.
+    getCurrentDirectory,
+    setCurrentDirectory,
+    doesFileExist,
+    doesDirectoryExist,
+    doesExist,
 ) where
 
@@ -49 +54 @@
 
 #ifdef PUGS_HAVE_POSIX
+import System.Posix.Files
 import System.Posix.Process
 import System.Posix.Env hiding (getEnvironment)
-import System.Posix.Files
 import System.Posix.Directory
 import System.Posix.User
@@ -61 +66 @@
 import qualified System.Posix.Signals
 
+doesExist :: FilePath -> IO Bool
+doesExist = fileExist
+
+doesFileExist :: FilePath -> IO Bool
+doesFileExist f = do
+    rv <- (fmap isRegularFile . getFileStatus) f
+    return rv
+
+doesDirectoryExist :: FilePath -> IO Bool
+doesDirectoryExist = fmap isDirectory . getFileStatus
+
+getCurrentDirectory :: IO FilePath
+getCurrentDirectory = getWorkingDirectory
+
+setCurrentDirectory :: FilePath -> IO ()
+setCurrentDirectory = changeWorkingDirectory
+
 executeFile' :: FilePath -> Bool -> [String] -> Maybe [(String, String)] -> IO ExitCode
 executeFile' prog search args env = do
@@ -87 +109 @@
 import Debug.Trace
 import qualified System.Environment
+import System.Directory (getCurrentDirectory, setCurrentDirectory, doesFileExist, doesDirectoryExist)
 import IO
 import System.IO
@@ -245 +268 @@
 executeFile' _ _ _ _ = failWithIncomplete "executeFile"
 
+doesExist :: FilePath -> IO Bool
+doesExist f = do
+    rv <- doesFileExist f
+    if rv then return rv else doesDirectoryExist f
+
 #endif
 

src/Pugs/Internals.hs

@@ -1 @@
-{-# OPTIONS_GHC -fglasgow-exts -fno-warn-orphans -fno-full-laziness -fno-cse #-}
+{-# OPTIONS_GHC -fglasgow-exts -fno-warn-orphans -fno-full-laziness -fno-cse -fno-warn-deprecations #-}
 
 {-|
@@ -15 +15 @@
 
 module Pugs.Internals (
-    module UTF8,
+    module Control.Concurrent,
+    module Control.Concurrent.STM,
+    module Control.Exception,
+    module Control.Monad.Error,
+    module Control.Monad.RWS,
+    module Data.Array,
+    module Data.Bits,
+    module Data.Char,
+    module Data.Complex,
+    module Data.Dynamic,
+    module Data.Either,
+    module Data.FunctorM,
+    module Data.IntMap,
+    module Data.List,
+    module Data.Map,
+    module Data.Maybe,
+    module Data.Ratio,
+    module Data.Set,
+    module Data.Tree,
+    module Data.Unique,
+    module Data.Word,
+    module Debug.Trace,
+    module Network,
     module Pugs.Compat,
     module RRegex,
     module RRegex.Syntax,
-    module Data.Char,
-    module Data.Dynamic,
-    module Data.Unique,
-    module Data.FunctorM,
-    module Control.Exception,
+    module System.Cmd,
+    module System.Directory,
     module System.Environment,
-    module System.Random,
+    module System.Exit,
     module System.IO,
+    module System.IO.Error,
     module System.IO.Unsafe,
-    module System.IO.Error,
-    module System.Exit,
-    module System.Time,
-    module System.Directory,
-    module System.Cmd,
-    module System.Process,
     module System.Mem,
     module System.Mem.Weak,
-    module Control.Monad.RWS,
-    module Control.Monad.Error,
-    module Control.Concurrent,
-    module Control.Concurrent.STM,
-    module Data.Array,
-    module Data.Bits,
-    module Data.List,
-    module Data.Either,
-    module Data.Word,
-    module Data.Ratio,
-    module Data.Tree,
-    module Data.Maybe,
-    module Data.Complex,
-    module Data.Set,
-    module Data.Map,
-    module Data.IntMap,
-    module Debug.Trace,
-    module Network,
+    module System.Process,
+    module System.Random,
+    module System.Time,
+    module UTF8,
     internalError,
     split,
@@ -98 +98 @@
 import System.IO.Unsafe
 import System.IO.Error (ioeGetErrorString, isUserError)
-import System.Directory
 import System.Mem
 import System.Mem.Weak
+import System.Directory (Permissions(..), getPermissions, getTemporaryDirectory, createDirectory, removeDirectory, removeFile, getDirectoryContents)
 import Control.Exception (catchJust, errorCalls)
 import Control.Monad.RWS

src/Pugs/Prim/Eval.hs

@@ -17 +17 @@
 import Pugs.Config
 import Pugs.Prim.Keyed
-import qualified Data.ByteString as Str
 import DrIFT.YAML
 import Data.Yaml.Syck
-
--- type Str = Str.ByteString
-
 
 data EvalError = EvalErrorFatal

src/Pugs/Prim/FileTest.hs

@@ -59 +59 @@
 
 fileTestExists :: FilePath -> IO Val
-fileTestExists f = do
-    b1 <- doesFileExist f
-    b2 <- doesDirectoryExist f
-    return $ valFromBool f (b1 || b2)
+fileTestExists f = doesExist f >>= return . (valFromBool f)
 
 fileTestIsFile :: FilePath -> IO Val