diff options
| author | Manuel M T Chakravarty <chak@cse.unsw.edu.au> | 2013-02-06 10:31:17 +1100 |
|---|---|---|
| committer | Manuel M T Chakravarty <chak@cse.unsw.edu.au> | 2013-02-06 10:31:17 +1100 |
| commit | fac50f929ad6e432d5dd1ffa6f298631c627a54e (patch) | |
| tree | be283780a8b7aa824e47f381aaf122f44c376880 /compiler/iface/LoadIface.lhs | |
| parent | 1116e3c05f9c397aa2fae35c69d8d792f42da2cf (diff) | |
| parent | 874bb7e34b114669a1b3b45f06e70a3a7a1100bb (diff) | |
| download | haskell-fac50f929ad6e432d5dd1ffa6f298631c627a54e.tar.gz | |
Merge branch 'refs/heads/vect-avoid' into vect-avoid-merge
Conflicts:
compiler/rename/RnSource.lhs
compiler/simplCore/OccurAnal.lhs
compiler/vectorise/Vectorise/Exp.hs
NB: Merging instead of rebasing for a change. During rebase Git got confused due to the lack of the submodules in my quite old fork.
Diffstat (limited to 'compiler/iface/LoadIface.lhs')
| -rw-r--r-- | compiler/iface/LoadIface.lhs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/compiler/iface/LoadIface.lhs b/compiler/iface/LoadIface.lhs index 93e8e96715..a81b01589e 100644 --- a/compiler/iface/LoadIface.lhs +++ b/compiler/iface/LoadIface.lhs @@ -790,18 +790,18 @@ pprFixities fixes = ptext (sLit "fixities") <+> pprWithCommas pprFix fixes pprFix (occ,fix) = ppr fix <+> ppr occ pprVectInfo :: IfaceVectInfo -> SDoc -pprVectInfo (IfaceVectInfo { ifaceVectInfoVar = vars - , ifaceVectInfoTyCon = tycons - , ifaceVectInfoTyConReuse = tyconsReuse - , ifaceVectInfoScalarVars = scalarVars - , ifaceVectInfoScalarTyCons = scalarTyCons +pprVectInfo (IfaceVectInfo { ifaceVectInfoVar = vars + , ifaceVectInfoTyCon = tycons + , ifaceVectInfoTyConReuse = tyconsReuse + , ifaceVectInfoParallelVars = parallelVars + , ifaceVectInfoParallelTyCons = parallelTyCons }) = vcat [ ptext (sLit "vectorised variables:") <+> hsep (map ppr vars) , ptext (sLit "vectorised tycons:") <+> hsep (map ppr tycons) , ptext (sLit "vectorised reused tycons:") <+> hsep (map ppr tyconsReuse) - , ptext (sLit "scalar variables:") <+> hsep (map ppr scalarVars) - , ptext (sLit "scalar tycons:") <+> hsep (map ppr scalarTyCons) + , ptext (sLit "parallel variables:") <+> hsep (map ppr parallelVars) + , ptext (sLit "parallel tycons:") <+> hsep (map ppr parallelTyCons) ] pprTrustInfo :: IfaceTrustInfo -> SDoc |