X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcMType.lhs;h=eee4ec2403c178246b6a49bc5efe114ac930129c;hb=b99310f05faee2abec850da4349fcd5c0498f7ca;hp=9746e0cbde2bc7e554b2c47ab69b178f82d56537;hpb=a4980c2c58727d4337b48b7e4a7dcd4747d0fec7;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcMType.lhs b/compiler/typecheck/TcMType.lhs
index 9746e0c..eee4ec2 100644
--- a/compiler/typecheck/TcMType.lhs
+++ b/compiler/typecheck/TcMType.lhs
@@ -694,7 +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_GlasgowExts	`thenM` \ gla_exts ->
+    doptM Opt_UnboxedTuples `thenM` \ unboxed ->
     doptM Opt_Rank2Types	`thenM` \ rank2 ->
     doptM Opt_RankNTypes	`thenM` \ rankn ->
     doptM Opt_PolymorphicComponents	`thenM` \ polycomp ->
@@ -729,14 +729,10 @@ checkValidType ctxt ty
 			ForSigCtxt _ -> isLiftedTypeKind actual_kind
 			other	     -> isSubArgTypeKind    actual_kind
 	
-	ubx_tup | not gla_exts = UT_NotOk
-		| otherwise    = case ctxt of
-				   TySynCtxt _ -> UT_Ok
-				   ExprSigCtxt -> UT_Ok
-				   other       -> UT_NotOk
-		-- Unboxed tuples ok in function results,
-		-- but for type synonyms we allow them even at
-		-- top level
+	ubx_tup = case ctxt of
+	              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_`
@@ -857,8 +853,8 @@ check_tau_type rank ubx_tup ty@(TyConApp tc tys)
 	}
     
   | isUnboxedTupleTyCon tc
-  = doptM Opt_GlasgowExts			`thenM` \ gla_exts ->
-    checkTc (ubx_tup_ok gla_exts) ubx_tup_msg	`thenM_`
+  = doptM Opt_UnboxedTuples `thenM` \ ub_tuples_allowed ->
+    checkTc (ubx_tup_ok ub_tuples_allowed) ubx_tup_msg	`thenM_`
     mappM_ (check_tau_type (Rank 0) UT_Ok) tys	
 		-- Args are allowed to be unlifted, or
 		-- more unboxed tuples, so can't use check_arg_ty
@@ -867,7 +863,7 @@ check_tau_type rank ubx_tup ty@(TyConApp tc tys)
   = mappM_ check_arg_type tys
 
   where
-    ubx_tup_ok gla_exts = case ubx_tup of { UT_Ok -> gla_exts; other -> False }
+    ubx_tup_ok ub_tuples_allowed = case ubx_tup of { UT_Ok -> ub_tuples_allowed; other -> False }
 
     n_args    = length tys
     tc_arity  = tyConArity tc
@@ -984,7 +980,7 @@ check_class_pred_tys dflags ctxt tys
 	other	      -> flexible_contexts || all tyvar_head tys
   where
     flexible_contexts = dopt Opt_FlexibleContexts dflags
-    undecidable_ok = dopt Opt_AllowUndecidableInstances dflags
+    undecidable_ok = dopt Opt_UndecidableInstances dflags
 
 -------------------------
 tyvar_head ty			-- Haskell 98 allows predicates of form 
@@ -1179,7 +1175,7 @@ instTypeErr pp_ty msg
 \begin{code}
 checkValidInstance :: [TyVar] -> ThetaType -> Class -> [TcType] -> TcM ()
 checkValidInstance tyvars theta clas inst_tys
-  = do	{ undecidable_ok <- doptM Opt_AllowUndecidableInstances
+  = do	{ undecidable_ok <- doptM Opt_UndecidableInstances
 
 	; checkValidTheta InstThetaCtxt theta
 	; checkAmbiguity tyvars theta (tyVarsOfTypes inst_tys)