Merge *UnboxedTuples flags

Merge
    ExpressionSignaturesUnboxedTuples
    TypeSynonymUnboxedTuples
into
    UnboxedTuples

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 59391ef..896f136 100644 (file)
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -176,8 +176,6 @@ data DynFlag
    | Opt_ImplicitPrelude 
    | Opt_ScopedTypeVariables
    | Opt_UnboxedTuples
-   | Opt_ExpressionSignaturesUnboxedTuples
-   | Opt_TypeSynonymUnboxedTuples
    | Opt_BangPatterns
    | Opt_TypeFamilies
    | Opt_OverloadedStrings
@@ -1166,8 +1164,6 @@ xFlags = [
   ( "ImplicitParams",                  Opt_ImplicitParams ),
   ( "ScopedTypeVariables",             Opt_ScopedTypeVariables ),
   ( "UnboxedTuples",                Opt_UnboxedTuples ),
-  ( "ExpressionSignaturesUnboxedTuples", Opt_ExpressionSignaturesUnboxedTuples ),
-  ( "TypeSynonymUnboxedTuples",     Opt_TypeSynonymUnboxedTuples ),
   ( "StandaloneDeriving",           Opt_StandaloneDeriving ),
   ( "DeriveDataTypeable",           Opt_DeriveDataTypeable ),
   ( "TypeSynonymInstances",         Opt_TypeSynonymInstances ),
@@ -1195,8 +1191,6 @@ glasgowExtsFlags = [
                   , Opt_ImplicitParams 
                   , Opt_ScopedTypeVariables
            , Opt_UnboxedTuples
-           , Opt_ExpressionSignaturesUnboxedTuples
-           , Opt_TypeSynonymUnboxedTuples
            , Opt_TypeSynonymInstances
            , Opt_StandaloneDeriving
            , Opt_DeriveDataTypeable

diff --git a/compiler/typecheck/TcMType.lhs b/compiler/typecheck/TcMType.lhs
index 90268e4..955d45c 100644 (file)
--- a/compiler/typecheck/TcMType.lhs
+++ b/compiler/typecheck/TcMType.lhs
@@ -694,8 +694,7 @@ checkValidType :: UserTypeCtxt -> Type -> TcM ()
 -- Checks that the type is valid for the given context
 checkValidType ctxt ty
   = traceTc (text "checkValidType" <+> ppr ty) `thenM_`
-    doptM Opt_ExpressionSignaturesUnboxedTuples `thenM` \ exp_sigs_unboxed ->
-    doptM Opt_TypeSynonymUnboxedTuples `thenM` \ type_synonym_unboxed ->
+    doptM Opt_UnboxedTuples `thenM` \ unboxed ->
     doptM Opt_Rank2Types       `thenM` \ rank2 ->
     doptM Opt_RankNTypes       `thenM` \ rankn ->
     doptM Opt_PolymorphicComponents    `thenM` \ polycomp ->
@@ -731,9 +730,9 @@ checkValidType ctxt ty
                        other        -> isSubArgTypeKind    actual_kind
        
        ubx_tup = case ctxt of
-                     TySynCtxt _ | type_synonym_unboxed -> UT_Ok
-                     ExprSigCtxt | exp_sigs_unboxed     -> UT_Ok
-                     _                                  -> UT_NotOk
+                     TySynCtxt _ | unboxed -> UT_Ok
+                     ExprSigCtxt | unboxed -> UT_Ok
+                     _                     -> UT_NotOk
     in
        -- Check that the thing has kind Type, and is lifted if necessary
     checkTc kind_ok (kindErr actual_kind)      `thenM_`