diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-09-18 16:38:15 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-09-18 16:38:15 +0000 |
| commit | a6f2d598e1e7760d334d1b5ea0b7745e66835e11 (patch) | |
| tree | 1c7db21d0add0858c021399e6953a69bf6c0017c /compiler/rename/RnSource.lhs | |
| parent | 896135d0231f798f264548f5935223d142e718a7 (diff) | |
| download | haskell-a6f2d598e1e7760d334d1b5ea0b7745e66835e11.tar.gz | |
Add separate functions for querying DynFlag and ExtensionFlag options
and remove the temporary DOpt class workaround.
Diffstat (limited to 'compiler/rename/RnSource.lhs')
| -rw-r--r-- | compiler/rename/RnSource.lhs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rename/RnSource.lhs b/compiler/rename/RnSource.lhs index 9e1637919e..91bc78f947 100644 --- a/compiler/rename/RnSource.lhs +++ b/compiler/rename/RnSource.lhs @@ -524,7 +524,7 @@ extendTyVarEnvForMethodBinds :: [LHsTyVarBndr Name] -> RnM (Bag (LHsBind Name), FreeVars) -> RnM (Bag (LHsBind Name), FreeVars) extendTyVarEnvForMethodBinds tyvars thing_inside - = do { scoped_tvs <- doptM Opt_ScopedTypeVariables + = do { scoped_tvs <- xoptM Opt_ScopedTypeVariables ; if scoped_tvs then extendTyVarEnvFVRn (map hsLTyVarName tyvars) thing_inside else @@ -540,7 +540,7 @@ extendTyVarEnvForMethodBinds tyvars thing_inside \begin{code} rnSrcDerivDecl :: DerivDecl RdrName -> RnM (DerivDecl Name, FreeVars) rnSrcDerivDecl (DerivDecl ty) - = do { standalone_deriv_ok <- doptM Opt_StandaloneDeriving + = do { standalone_deriv_ok <- xoptM Opt_StandaloneDeriving ; unless standalone_deriv_ok (addErr standaloneDerivErr) ; ty' <- rnLHsType (text "a deriving decl") ty ; let fvs = extractHsTyNames ty' @@ -1126,7 +1126,7 @@ add gp loc (SpliceD splice@(SpliceDecl _ flag)) ds -- (i.e. a naked top level expression) case flag of Explicit -> return () - Implicit -> do { th_on <- doptM Opt_TemplateHaskell + Implicit -> do { th_on <- xoptM Opt_TemplateHaskell ; unless th_on $ setSrcSpan loc $ failWith badImplicitSplice } |