Deal correctly with infix type constructors in GADT decls

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

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 0bd6690..bc6a0af 100644 (file)
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -49,10 +49,14 @@ module DynFlags (
 
 #include "HsVersions.h"
 
-import Module          ( Module, mkModule )
+import Module          ( Module, mkModuleName, mkModule )
+import PackageConfig
 import PrelNames       ( mAIN )
-import StaticFlags     ( opt_Static, opt_PIC, 
-                         WayName(..), v_Ways, v_Build_tag, v_RTS_Build_tag )
+#ifdef i386_TARGET_ARCH
+import StaticFlags     ( opt_Static )
+#endif
+import StaticFlags     ( opt_PIC, WayName(..), v_Ways, v_Build_tag,
+                         v_RTS_Build_tag )
 import {-# SOURCE #-} Packages (PackageState)
 import DriverPhases    ( Phase(..), phaseInputExt )
 import Config
@@ -145,6 +149,7 @@ data DynFlag
    | Opt_AllowUndecidableInstances
    | Opt_AllowIncoherentInstances
    | Opt_MonomorphismRestriction
+   | Opt_MonoPatBinds
    | Opt_GlasgowExts
    | Opt_FFI
    | Opt_PArr                         -- syntactic support for parallel arrays
@@ -168,6 +173,7 @@ data DynFlag
    | Opt_DoEtaReduction
    | Opt_CaseMerge
    | Opt_UnboxStrictFields
+   | Opt_DictsCheap
 
    -- misc opts
    | Opt_Cpp
@@ -208,6 +214,7 @@ data DynFlags = DynFlags {
   importPaths          :: [FilePath],
   mainModIs            :: Module,
   mainFunIs            :: Maybe String,
+  thisPackage          :: PackageId,
 
   -- ways
   wayNames             :: [WayName],   -- way flags from the cmd line
@@ -342,6 +349,7 @@ defaultDynFlags =
        importPaths             = ["."],
        mainModIs               = mAIN,
        mainFunIs               = Nothing,
+       thisPackage             = mainPackageId,
        
        wayNames                = panic "ways",
        buildTag                = panic "buildTag",
@@ -391,6 +399,10 @@ defaultDynFlags =
            Opt_RecompChecking,
            Opt_ReadUserPackageConf,
     
+           Opt_MonoPatBinds,   -- Experimentally, I'm making this non-standard
+                               -- behaviour the default, to see if anyone notices
+                               -- SLPJ July 06
+
            Opt_ImplicitPrelude,
            Opt_MonomorphismRestriction,
            Opt_Strictness,
@@ -858,7 +870,7 @@ dynamic_flags = [
         ------- Packages ----------------------------------------------------
   ,  ( "package-conf"   , HasArg extraPkgConf_ )
   ,  ( "no-user-package-conf", NoArg (unSetDynFlag Opt_ReadUserPackageConf) )
-  ,  ( "package-name"   , HasArg ignorePackage ) -- for compatibility
+  ,  ( "package-name"   , HasArg setPackageName )
   ,  ( "package"        , HasArg exposePackage )
   ,  ( "hide-package"   , HasArg hidePackage )
   ,  ( "hide-all-packages", NoArg (setDynFlag Opt_HideAllPackages) )
@@ -991,6 +1003,7 @@ fFlags = [
   ( "scoped-type-variables",           Opt_ScopedTypeVariables ),
   ( "bang-patterns",                   Opt_BangPatterns ),
   ( "monomorphism-restriction",                Opt_MonomorphismRestriction ),
+  ( "mono-pat-binds",                  Opt_MonoPatBinds ),
   ( "implicit-params",                 Opt_ImplicitParams ),
   ( "allow-overlapping-instances",     Opt_AllowOverlappingInstances ),
   ( "allow-undecidable-instances",     Opt_AllowUndecidableInstances ),
@@ -1007,6 +1020,7 @@ fFlags = [
   ( "do-eta-reduction",                        Opt_DoEtaReduction ),
   ( "case-merge",                      Opt_CaseMerge ),
   ( "unbox-strict-fields",             Opt_UnboxStrictFields ),
+  ( "dicts-cheap",                     Opt_DictsCheap ),
   ( "excess-precision",                        Opt_ExcessPrecision ),
   ( "asm-mangling",                    Opt_DoAsmMangling )
   ]
@@ -1065,6 +1079,13 @@ hidePackage p =
   upd (\s -> s{ packageFlags = HidePackage p : packageFlags s })
 ignorePackage p = 
   upd (\s -> s{ packageFlags = IgnorePackage p : packageFlags s })
+setPackageName p
+  | Nothing <- unpackPackageId pid
+  = throwDyn (CmdLineError ("cannot parse \'" ++ p ++ "\' as a package identifier"))
+  | otherwise
+  = upd (\s -> s{ thisPackage = pid })
+  where
+        pid = stringToPackageId p
 
 -- we can only switch between HscC, HscAsmm, and HscILX with dynamic flags 
 -- (-fvia-C, -fasm, -filx respectively).
@@ -1088,10 +1109,10 @@ setMainIs :: String -> DynP ()
 setMainIs arg
   | not (null main_fn)         -- The arg looked like "Foo.baz"
   = upd $ \d -> d{ mainFunIs = Just main_fn,
-                  mainModIs = mkModule main_mod }
+                  mainModIs = mkModule mainPackageId (mkModuleName main_mod) }
 
   | isUpper (head main_mod)    -- The arg looked like "Foo"
-  = upd $ \d -> d{ mainModIs = mkModule main_mod }
+  = upd $ \d -> d{ mainModIs = mkModule mainPackageId (mkModuleName main_mod) }
   
   | otherwise                  -- The arg looked like "baz"
   = upd $ \d -> d{ mainFunIs = Just main_mod }
@@ -1256,6 +1277,13 @@ machdepCCOpts dflags
                        -- -fomit-frame-pointer, so we disable it first here.
                        "-mno-omit-leaf-frame-pointer",
 #endif
+#ifdef HAVE_GCC_HAS_NO_UNIT_AT_A_TIME
+                       "-fno-unit-at-a-time",
+                       -- unit-at-a-time doesn't do us any good, and screws
+                       -- up -split-objs by moving the split markers around.
+                       -- It's only turned on with -O2, but put it here just
+                       -- in case someone uses -optc-O2.
+#endif
                        "-fomit-frame-pointer",
                        -- we want -fno-builtin, because when gcc inlines
                        -- built-in functions like memcpy() it tends to