From: Ian Lynagh <igloo@earth.li>
Date: Mon, 13 Sep 2010 16:59:49 +0000 (+0000)
Subject: Remove defaultExtensionFlags
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=7c086ecd88b4fb5d82b4597d56695cea0a1a0553

Remove defaultExtensionFlags
The default should do into languageExtensions instead
---

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 557dfb4..c9ac5f9 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -732,7 +732,7 @@ defaultDynFlags =
         haddockOptions = Nothing,
         flags = defaultFlags,
         language = Nothing,
-        extensionFlags = Left defaultExtensionFlags,
+        extensionFlags = Left [],
 
         log_action = \severity srcSpan style msg ->
                         case severity of
@@ -795,6 +795,8 @@ languageExtensions Nothing
     = Opt_MonoPatBinds   -- Experimentally, I'm making this non-standard
                          -- behaviour the default, to see if anyone notices
                          -- SLPJ July 06
+      -- In due course I'd like Opt_MonoLocalBinds to be on by default
+      -- SLPJ September 2010
     : languageExtensions (Just Haskell2010)
 languageExtensions (Just Haskell98)
     = [Opt_ImplicitPrelude,
@@ -1659,10 +1661,6 @@ defaultFlags
 
     ++ standardWarnings
 
-defaultExtensionFlags :: [OnOff ExtensionFlag]
-defaultExtensionFlags 
-  = []		-- In due course I'd like Opt_MonoLocalBinds to be on by default
-
 impliedFlags :: [(ExtensionFlag, ExtensionFlag)]
 impliedFlags
   = [ (Opt_RankNTypes,                Opt_ExplicitForAll)