X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Frename%2FRnTypes.lhs;h=0aa0b4e1c568ec0ed9ee1c1377ea940c340e7307;hp=055cd349ad77a701672a6832c56467d78c1f5bc6;hb=9da4639011348fb6c318e3cba4b08622f811d9c4;hpb=39fd94e2727715556805a85a7e803c337df950a9

diff --git a/compiler/rename/RnTypes.lhs b/compiler/rename/RnTypes.lhs
index 055cd34..0aa0b4e 100644
--- a/compiler/rename/RnTypes.lhs
+++ b/compiler/rename/RnTypes.lhs
@@ -21,7 +21,7 @@ module RnTypes (
 	dupFieldErr, patSigErr, checkTupSize
   ) where
 
-import DynFlags		( DynFlag(Opt_WarnUnusedMatches, Opt_GlasgowExts) )
+import DynFlags		( DynFlag(Opt_WarnUnusedMatches, Opt_GlasgowExts, Opt_ScopedTypeVariables ) )
 
 import HsSyn
 import RdrHsSyn		( extractHsRhoRdrTyVars )
@@ -121,17 +121,16 @@ rnHsType doc (HsTyVar tyvar)
   = lookupOccRn tyvar 		`thenM` \ tyvar' ->
     returnM (HsTyVar tyvar')
 
-rnHsType doc (HsOpTy ty1 (L loc op) ty2)
-  = setSrcSpan loc (
-      lookupOccRn op			`thenM` \ op' ->
-      let
-	l_op' = L loc op'
-      in
-      lookupTyFixityRn l_op'		`thenM` \ fix ->
-      rnLHsType doc ty1			`thenM` \ ty1' ->
-      rnLHsType doc ty2			`thenM` \ ty2' -> 
-      mkHsOpTyRn (\t1 t2 -> HsOpTy t1 l_op' t2) (ppr op') fix ty1' ty2'
-   )
+rnHsType doc ty@(HsOpTy ty1 (L loc op) ty2)
+  = setSrcSpan loc $ 
+    do	{ ty_ops_ok <- doptM Opt_ScopedTypeVariables	-- Badly named option
+	; checkErr ty_ops_ok (opTyErr op ty)
+	; op' <- lookupOccRn op
+	; let l_op' = L loc op'
+	; fix <- lookupTyFixityRn l_op'
+	; ty1' <- rnLHsType doc ty1
+	; ty2' <- rnLHsType doc ty2
+	; mkHsOpTyRn (\t1 t2 -> HsOpTy t1 l_op' t2) (ppr op') fix ty1' ty2' }
 
 rnHsType doc (HsParTy ty)
   = rnLHsType doc ty 	        `thenM` \ ty' ->
@@ -535,7 +534,6 @@ rnPatsAndThen ctxt pats thing_inside
     bindLocatedLocalsFV doc_pat bndrs	$ \ new_bndrs ->
     rnLPats pats			`thenM` \ (pats', pat_fvs) ->
     thing_inside pats'			`thenM` \ (res, res_fvs) ->
-
     let
 	unused_binders = filter (not . (`elemNameSet` res_fvs)) new_bndrs
     in
@@ -757,6 +755,10 @@ forAllWarn doc ty (L loc tyvar)
 		   $$
 		   doc)
 
+opTyErr op ty 
+  = hang (ptext SLIT("Illegal operator") <+> quotes (ppr op) <+> ptext SLIT("in type") <+> quotes (ppr ty))
+	 2 (parens (ptext SLIT("Use -fscoped-type-variables to allow operators in types")))
+
 bogusCharError c
   = ptext SLIT("character literal out of range: '\\") <> char c  <> char '\''