Implement -fexpose-all-unfoldings, and fix a non-termination bug

[ghc-hetmet.git] / compiler / main / HeaderInfo.hs

diff --git a/compiler/main/HeaderInfo.hs b/compiler/main/HeaderInfo.hs
index 5f4fc7c..c3c78ae 100644 (file)
--- a/compiler/main/HeaderInfo.hs
+++ b/compiler/main/HeaderInfo.hs
@@ -68,7 +68,7 @@ getImports dflags buf filename source_filename = do
         then liftIO $ throwIO $ mkSrcErr errs
         else
          case rdr_module of
-           L _ (HsModule mb_mod _ imps _ _ _ _) ->
+           L _ (HsModule mb_mod _ imps _ _ _) ->
              let
                 main_loc = mkSrcLoc (mkFastString source_filename) 1 0
                mod = mb_mod `orElse` L (srcLocSpan main_loc) mAIN_NAME
@@ -237,13 +237,16 @@ languagePragParseError :: SrcSpan -> a
 languagePragParseError loc =
   throw $ mkSrcErr $ unitBag $
      (mkPlainErrMsg loc $
-       text "cannot parse LANGUAGE pragma: comma-separated list expected")
+       vcat [ text "Cannot parse LANGUAGE pragma"
+            , text "Expecting comma-separated list of language options,"
+            , text "each starting with a capital letter"
+            , nest 2 (text "E.g. {-# LANGUAGE RecordPuns, Generics #-}") ])
 
 unsupportedExtnError :: SrcSpan -> String -> a
 unsupportedExtnError loc unsup =
   throw $ mkSrcErr $ unitBag $
     mkPlainErrMsg loc $
-        text "unsupported extension: " <> text unsup
+        text "Unsupported extension: " <> text unsup
 
 
 optionsErrorMsgs :: [String] -> [Located String] -> FilePath -> Messages