Commit ef2c1a66 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Merge *UnboxedTuples flags

Merge
    ExpressionSignaturesUnboxedTuples
    TypeSynonymUnboxedTuples
into
    UnboxedTuples
parent 01249617
......@@ -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
......
......@@ -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_`
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment