From: simonmar <unknown>
Date: Tue, 11 Jan 2005 16:21:53 +0000 (+0000)
Subject: [project @ 2005-01-11 16:21:53 by simonmar]
X-Git-Tag: Initial_conversion_from_CVS_complete~1263
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=2128bf29e735fb34d343868f45ef6e321ce74d72;p=ghc-hetmet.git

[project @ 2005-01-11 16:21:53 by simonmar]
ignore OPTIONS_anything_else when looking for OPTIONS_GHC/OPTIONS pragmas.
---

diff --git a/ghc/compiler/main/DriverUtil.hs b/ghc/compiler/main/DriverUtil.hs
index 8893c56..8a85670 100644
--- a/ghc/compiler/main/DriverUtil.hs
+++ b/ghc/compiler/main/DriverUtil.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: DriverUtil.hs,v 1.48 2005/01/11 15:59:39 simonmar Exp $
+-- $Id: DriverUtil.hs,v 1.49 2005/01/11 16:21:53 simonmar Exp $
 --
 -- Utils for the driver
 --
@@ -73,13 +73,18 @@ matchOptions s
   = Nothing
  where
   matchOptions1 s
-    | Just s2 <- maybePrefixMatch "OPTIONS_GHC" s   = matchOptions2 s2
-    | Just s2 <- maybePrefixMatch "OPTIONS" s	    = matchOptions2 s2
-    | otherwise					    = Nothing
+    | Just s2 <- maybePrefixMatch "OPTIONS" s
+    = case () of
+	_ | Just s3 <- maybePrefixMatch "_GHC" s2, not (is_ident (head s3))
+	  -> matchOptions2 s3
+	  | not (is_ident (head s2))
+	  -> matchOptions2 s2
+	  | otherwise
+	  -> Just []  -- OPTIONS_anything is ignored, not treated as start of source
+    | otherwise = Nothing
   matchOptions2 s
-    | not (is_ident (head s)),
-      Just s3 <- maybePrefixMatch "}-#" (reverse s) = Just (reverse s3)
-    | otherwise					    = Nothing
+    | Just s3 <- maybePrefixMatch "}-#" (reverse s) = Just (reverse s3)
+    | otherwise = Nothing
 
 -----------------------------------------------------------------------------
 -- A version of getDirectoryContents that is non-fatal if the