X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FDriverUtil.hs;h=f759f8b196f37854f350ecb4a0c19e9da9fc9aa0;hb=0f0e83390daf09bceb7ed0be5b280f3c662c02a8;hp=17eb663e614b67e145d8be399cbc1b09c9a015ce;hpb=06575d67c6e85ee746d96c77dab9e40edfb4f7ee;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/DriverUtil.hs b/ghc/compiler/main/DriverUtil.hs
index 17eb663..f759f8b 100644
--- a/ghc/compiler/main/DriverUtil.hs
+++ b/ghc/compiler/main/DriverUtil.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: DriverUtil.hs,v 1.35 2002/10/17 14:26:18 simonmar Exp $
+-- $Id: DriverUtil.hs,v 1.46 2004/11/09 16:59:31 simonmar Exp $
 --
 -- Utils for the driver
 --
@@ -7,20 +7,31 @@
 --
 -----------------------------------------------------------------------------
 
-module DriverUtil where
-
-#include "../includes/config.h"
+module DriverUtil (
+	getOptionsFromSource, softGetDirectoryContents,
+	createDirectoryHierarchy, doesDirNameExist, prefixUnderscore,
+	unknownFlagErr, unknownFlagsErr, missingArgErr, 
+	later, handleDyn, handle,
+	split, add, addNoDups, 
+	Suffix, splitFilename, getFileSuffix,
+	splitFilename3, remove_suffix, split_longest_prefix,
+	replaceFilenameSuffix, directoryOf, filenameOf,
+	replaceFilenameDirectory, remove_spaces, escapeSpaces,
+  ) where
+
+#include "../includes/ghcconfig.h"
 #include "HsVersions.h"
 
 import Util
 import Panic
 import Config		( cLeadingUnderscore )
 
-import EXCEPTION as Exception
+import EXCEPTION	( Exception(..), finally, throwDyn, catchDyn, throw )
+import qualified EXCEPTION as Exception
 import DYNAMIC
 import DATA_IOREF	( IORef, readIORef, writeIORef )
 
-import Directory	( getDirectoryContents, doesDirectoryExist )
+import Directory
 import IO
 import List
 import Char
@@ -34,25 +45,28 @@ getOptionsFromSource
 	-> IO [String]		-- options, if any
 getOptionsFromSource file
   = do h <- openFile file ReadMode
-       catchJust ioErrors (look h `finally` hClose h)
-	  (\e -> if isEOFError e then return [] else ioError e)
+       look h `finally` hClose h
   where
 	look h = do
-	    l' <- hGetLine h
-	    let l = remove_spaces l'
-	    case () of
-		() | null l -> look h
-		   | prefixMatch "#" l -> look h
-		   | prefixMatch "{-# LINE" l -> look h   -- -}
-		   | Just opts <- matchOptions l
-			-> do rest <- look h
+	    r <- tryJust ioErrors (hGetLine h)
+	    case r of
+	      Left e | isEOFError e -> return []
+	             | otherwise    -> ioError e
+	      Right l' -> do
+	    	let l = remove_spaces l'
+	    	case () of
+		    () | null l -> look h
+		       | prefixMatch "#" l -> look h
+		       | prefixMatch "{-# LINE" l -> look h   -- -}
+		       | Just opts <- matchOptions l
+		       	-> do rest <- look h
                               return (words opts ++ rest)
-		   | otherwise -> return []
+		       | otherwise -> return []
 
 matchOptions s
-  | Just s1 <- my_prefix_match "{-#" s, -- -}
-    Just s2 <- my_prefix_match "OPTIONS" (remove_spaces s1),
-    Just s3 <- my_prefix_match "}-#" (reverse s2)
+  | Just s1 <- maybePrefixMatch "{-#" s, -- -}
+    Just s2 <- maybePrefixMatch "OPTIONS" (remove_spaces s1),
+    Just s3 <- maybePrefixMatch "}-#" (reverse s2)
   = Just (reverse s3)
   | otherwise
   = Nothing
@@ -69,6 +83,16 @@ softGetDirectoryContents d
 	  )
 
 -----------------------------------------------------------------------------
+-- Create a hierarchy of directories
+
+createDirectoryHierarchy :: FilePath -> IO ()
+createDirectoryHierarchy dir = do
+  b <- doesDirectoryExist dir
+  when (not b) $ do
+	createDirectoryHierarchy (directoryOf dir)
+	createDirectory dir
+
+-----------------------------------------------------------------------------
 -- Verify that the 'dirname' portion of a FilePath exists.
 -- 
 doesDirNameExist :: FilePath -> IO Bool
@@ -90,20 +114,8 @@ unknownFlagErr f = throwDyn (UsageError ("unrecognised flag: " ++ f))
 unknownFlagsErr :: [String] -> a
 unknownFlagsErr fs = throwDyn (UsageError ("unrecognised flags: " ++ unwords fs))
 
-my_partition :: (a -> Maybe b) -> [a] -> ([(a,b)],[a])
-my_partition _ [] = ([],[])
-my_partition p (a:as)
-  = let (bs,cs) = my_partition p as in
-    case p a of
-	Nothing -> (bs,a:cs)
-	Just b  -> ((a,b):bs,cs)
-
-my_prefix_match :: String -> String -> Maybe String
-my_prefix_match []    rest = Just rest
-my_prefix_match (_:_) []   = Nothing
-my_prefix_match (p:pat) (r:rest)
-  | p == r    = my_prefix_match pat rest
-  | otherwise = Nothing
+missingArgErr :: String -> a
+missingArgErr f = throwDyn (UsageError ("missing argument for flag: " ++ f))
 
 later = flip finally
 
@@ -166,7 +178,7 @@ splitFilename3 str
 
 remove_suffix :: Char -> String -> Suffix
 remove_suffix c s
-  | null pre  = reverse suf
+  | null pre  = s
   | otherwise = reverse pre
   where (suf,pre) = break (==c) (reverse s)
 
@@ -202,6 +214,11 @@ replaceFilenameSuffix s suf = remove_suffix '.' s ++ suf
 directoryOf :: FilePath -> String
 directoryOf = fst . splitFilenameDir
 
+-- filenameOf strips the directory off the input string, returning
+-- the filename.
+filenameOf :: FilePath -> String
+filenameOf = snd . splitFilenameDir
+
 replaceFilenameDirectory :: FilePath -> String -> FilePath
 replaceFilenameDirectory s dir
  = dir ++ '/':drop_longest_prefix s isPathSeparator