X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Frename%2FRnSource.lhs;h=59ca11b58a490ff8397600a34c1eb4fab004b16b;hb=c1681a73fa4ca4cf8758264ae387ac09a9e900d8;hp=71415faefc27f49fc0f4d267618361d89b34c1eb;hpb=2eb04ca0f8d0ec72b417cddc60672c696b4a3daa;p=ghc-hetmet.git

diff --git a/compiler/rename/RnSource.lhs b/compiler/rename/RnSource.lhs
index 71415fa..59ca11b 100644
--- a/compiler/rename/RnSource.lhs
+++ b/compiler/rename/RnSource.lhs
@@ -378,11 +378,11 @@ type variable environment iff -fglasgow-exts
 
 \begin{code}
 extendTyVarEnvForMethodBinds tyvars thing_inside
-  = doptM Opt_GlasgowExts			`thenM` \ opt_GlasgowExts ->
-    if opt_GlasgowExts then
-	extendTyVarEnvFVRn (map hsLTyVarName tyvars) thing_inside
-    else
-	thing_inside
+  = do	{ scoped_tvs <- doptM Opt_ScopedTypeVariables
+	; if scoped_tvs then
+		extendTyVarEnvFVRn (map hsLTyVarName tyvars) thing_inside
+	  else
+		thing_inside }
 \end{code}
 
 %*********************************************************
@@ -770,7 +770,6 @@ rnConDeclDetails doc (RecCon fields)
 	; new_fields <- mappM (rnField doc) fields
 	; return (RecCon new_fields) }
 
--- Document comments are renamed to Nothing here
 rnField doc (ConDeclField name ty haddock_doc)
   = lookupLocatedTopBndrRn name	`thenM` \ new_name ->
     rnLHsType doc ty		`thenM` \ new_ty ->