X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FDriverUtil.hs;h=b8796c1244d11479e1c90c924dcece7cacfec684;hb=423d477bfecd490de1449c59325c8776f91d7aac;hp=4932b9e48e132012e942c9525c04e57e04694591;hpb=70b6c54b3c140d96b69287f8f400f88a0b7e9c18;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/DriverUtil.hs b/ghc/compiler/main/DriverUtil.hs
index 4932b9e..b8796c1 100644
--- a/ghc/compiler/main/DriverUtil.hs
+++ b/ghc/compiler/main/DriverUtil.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: DriverUtil.hs,v 1.38 2003/06/04 15:47:59 simonmar Exp $
+-- $Id: DriverUtil.hs,v 1.43 2004/08/13 13:07:02 simonmar Exp $
 --
 -- Utils for the driver
 --
@@ -7,9 +7,19 @@
 --
 -----------------------------------------------------------------------------
 
-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, replaceFilenameDirectory,
+	remove_spaces, escapeSpaces,
+  ) where
+
+#include "../includes/ghcconfig.h"
 #include "HsVersions.h"
 
 import Util
@@ -38,6 +48,7 @@ getOptionsFromSource file
        catchJust ioErrors (look h `finally` hClose h)
 	  (\e -> if isEOFError e then return [] else ioError e)
   where
+
 	look h = do
 	    l' <- hGetLine h
 	    let l = remove_spaces l'
@@ -51,9 +62,9 @@ getOptionsFromSource file
 		   | 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
@@ -101,20 +112,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
 
@@ -177,7 +176,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)