From: simonpj Date: Wed, 26 Oct 2005 10:24:10 +0000 (+0000) Subject: [project @ 2005-10-26 10:23:47 by simonpj] X-Git-Tag: Initial_conversion_from_CVS_complete~131 X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=474656aa64e690fc48752eabecf2b76532c31ea7 [project @ 2005-10-26 10:23:47 by simonpj] Cosmetics --- diff --git a/ghc/compiler/basicTypes/RdrName.lhs b/ghc/compiler/basicTypes/RdrName.lhs index d04aa6f..172485c 100644 --- a/ghc/compiler/basicTypes/RdrName.lhs +++ b/ghc/compiler/basicTypes/RdrName.lhs @@ -451,7 +451,7 @@ data Provenance = LocalDef -- Defined locally Module - | Imported -- Imported + | Imported -- Imported [ImportSpec] -- INVARIANT: non-empty data ImportSpec = ImpSpec { is_decl :: ImpDeclSpec, diff --git a/ghc/compiler/typecheck/TcSplice.lhs b/ghc/compiler/typecheck/TcSplice.lhs index 0459956..1262674 100644 --- a/ghc/compiler/typecheck/TcSplice.lhs +++ b/ghc/compiler/typecheck/TcSplice.lhs @@ -139,14 +139,15 @@ tc_bracket (TypBr typ) -- Result type is Type (= Q Typ) tc_bracket (DecBr decls) - = tcTopSrcDecls emptyModDetails decls `thenM_` + = do { tcTopSrcDecls emptyModDetails decls -- Typecheck the declarations, dicarding the result -- We'll get all that stuff later, when we splice it in - tcMetaTy decTyConName `thenM` \ decl_ty -> - tcMetaTy qTyConName `thenM` \ q_ty -> - returnM (mkAppTy q_ty (mkListTy decl_ty)) + ; decl_ty <- tcMetaTy decTyConName + ; q_ty <- tcMetaTy qTyConName + ; return (mkAppTy q_ty (mkListTy decl_ty)) -- Result type is Q [Dec] + } \end{code}