From 0f0e83390daf09bceb7ed0be5b280f3c662c02a8 Mon Sep 17 00:00:00 2001
From: simonmar <unknown>
Date: Tue, 9 Nov 2004 16:59:31 +0000
Subject: [PATCH] [project @ 2004-11-09 16:59:31 by simonmar]
 getOptionsFromSource: fix a bug which caused a file
 containing just an OPTIONS pragma to have the pragma
 ignored.

---
 ghc/compiler/main/DriverUtil.hs |   28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/ghc/compiler/main/DriverUtil.hs b/ghc/compiler/main/DriverUtil.hs
index 484c024..f759f8b 100644
--- a/ghc/compiler/main/DriverUtil.hs
+++ b/ghc/compiler/main/DriverUtil.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: DriverUtil.hs,v 1.45 2004/10/03 16:28:06 panne Exp $
+-- $Id: DriverUtil.hs,v 1.46 2004/11/09 16:59:31 simonmar Exp $
 --
 -- Utils for the driver
 --
@@ -45,21 +45,23 @@ 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 <- maybePrefixMatch "{-#" s, -- -}
-- 
1.7.10.4