X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnNames.lhs;h=388b8c218d054bfddfe82d657472fd1fc9b13b0b;hp=d4c997a5d9b4d443af14dbd99fafeb0344779b8d;hb=f16166e4bcab8ee3598df0cad35d33f1cf6b6cf1;hpb=a77abe6a30ea2763cfa1c0ca83cdce9b7200ced2 diff --git a/ghc/compiler/rename/RnNames.lhs b/ghc/compiler/rename/RnNames.lhs index d4c997a..388b8c2 100644 --- a/ghc/compiler/rename/RnNames.lhs +++ b/ghc/compiler/rename/RnNames.lhs @@ -340,8 +340,9 @@ doImportDecls iface_cache g_info us src_imps imp_warns `unionBags` warns) where (ok_imps, src_qprels) = partition not_qual_prel src_imps - all_imps = qprel_imp ++ prel_imp ++ ok_imps - + the_imps = prel_imp ++ ok_imps + all_imps = qprel_imp ++ the_imps + not_qual_prel (ImportDecl mod qual _ _ _) = not (fromPrelude mod && qual) explicit_prelude_import @@ -358,7 +359,7 @@ doImportDecls iface_cache g_info us src_imps else [ImportDecl pRELUDE False Nothing Nothing mkIfaceSrcLoc] - (uniq_imps, imp_dups) = removeDups cmp_mod all_imps + (uniq_imps, imp_dups) = removeDups cmp_mod the_imps cmp_mod (ImportDecl m1 _ _ _ _) (ImportDecl m2 _ _ _ _) = cmpPString m1 m2 imp_mods = [ mod | ImportDecl mod _ _ _ _ <- uniq_imps ]