summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
a8eecb8)
getOptionsFromSource: fix a bug which caused a file containing just an
OPTIONS pragma to have the pragma ignored.
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
--- $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
--
--
-- Utils for the driver
--
-> IO [String] -- options, if any
getOptionsFromSource file
= do h <- openFile file ReadMode
-> 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
- 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)
return (words opts ++ rest)
- | otherwise -> return []
+ | otherwise -> return []
matchOptions s
| Just s1 <- maybePrefixMatch "{-#" s, -- -}
matchOptions s
| Just s1 <- maybePrefixMatch "{-#" s, -- -}