projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move error-ids to MkCore (from PrelRules)
[ghc-hetmet.git]
/
compiler
/
rename
/
RnSource.lhs
diff --git
a/compiler/rename/RnSource.lhs
b/compiler/rename/RnSource.lhs
index
a152a18
..
9e16379
100644
(file)
--- a/
compiler/rename/RnSource.lhs
+++ b/
compiler/rename/RnSource.lhs
@@
-46,7
+46,7
@@
import Bag
import FastString
import Util ( filterOut )
import SrcLoc
import FastString
import Util ( filterOut )
import SrcLoc
-import DynFlags ( DynFlag(..), DynFlags, thisPackage )
+import DynFlags
import HscTypes ( HscEnv, hsc_dflags )
import BasicTypes ( Boxity(..) )
import ListSetOps ( findDupsEq )
import HscTypes ( HscEnv, hsc_dflags )
import BasicTypes ( Boxity(..) )
import ListSetOps ( findDupsEq )
@@
-209,7
+209,7
@@
rnSrcDecls group@(HsGroup { hs_valds = val_decls,
traceRn (text "finish rnSrc" <+> ppr rn_group) ;
traceRn (text "finish Dus" <+> ppr src_dus ) ;
traceRn (text "finish rnSrc" <+> ppr rn_group) ;
traceRn (text "finish Dus" <+> ppr src_dus ) ;
- return (final_tcg_env , rn_group)
+ return (final_tcg_env, rn_group)
}}}}
-- some utils because we do this a bunch above
}}}}
-- some utils because we do this a bunch above
@@
-466,7
+466,7
@@
rnSrcInstDecl (InstDecl inst_ty mbinds uprags ats)
-- The typechecker (not the renamer) checks that all
-- the declarations are for the right class
let
-- The typechecker (not the renamer) checks that all
-- the declarations are for the right class
let
- at_names = map (head . tyClDeclNames . unLoc) ats
+ at_names = map (head . hsTyClDeclBinders) ats
in
checkDupRdrNames at_names `thenM_`
-- See notes with checkDupRdrNames for methods, above
in
checkDupRdrNames at_names `thenM_`
-- See notes with checkDupRdrNames for methods, above
@@
-1059,8
+1059,7
@@
extendRecordFieldEnv tycl_decls inst_decls
all_data_cons = [con | L _ (TyData { tcdCons = cons }) <- all_tycl_decls
, L _ con <- cons ]
all_tycl_decls = at_tycl_decls ++ tycl_decls
all_data_cons = [con | L _ (TyData { tcdCons = cons }) <- all_tycl_decls
, L _ con <- cons ]
all_tycl_decls = at_tycl_decls ++ tycl_decls
- at_tycl_decls = [at | L _ (InstDecl _ _ _ ats) <- inst_decls, at <- ats]
- -- Do not forget associated types!
+ at_tycl_decls = instDeclATs inst_decls -- Do not forget associated types!
get_con (ConDecl { con_name = con, con_details = RecCon flds })
(RecFields env fld_set)
get_con (ConDecl { con_name = con, con_details = RecCon flds })
(RecFields env fld_set)