From: Manuel M T Chakravarty <chak@cse.unsw.edu.au>
Date: Fri, 4 Aug 2006 21:58:46 +0000 (+0000)
Subject: Massive patch for the first months work adding System FC to GHC #23
X-Git-Tag: After_FC_branch_merge~159
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=e69ddd9cc12f59c7ef7103e54fee2d1c55b9fc14;ds=sidebyside

Massive patch for the first months work adding System FC to GHC #23

Broken up massive patch -=chak
Original log message:
This is (sadly) all done in one patch to avoid Darcs bugs.
It's not complete work... more FC stuff to come.  A compiler
using just this patch will fail dismally.
---

diff --git a/compiler/main/HscMain.lhs b/compiler/main/HscMain.lhs
index 422c270..9d77c4d 100644
--- a/compiler/main/HscMain.lhs
+++ b/compiler/main/HscMain.lhs
@@ -38,7 +38,7 @@ import SimplCore        ( simplifyExpr )
 import TcRnDriver	( tcRnStmt, tcRnExpr, tcRnType ) 
 import Type		( Type )
 import PrelNames	( iNTERACTIVE )
-import Kind		( Kind )
+import {- Kind parts of -} Type		( Kind )
 import CoreLint		( lintUnfolding )
 import DsMeta		( templateHaskellNames )
 import SrcLoc		( SrcSpan, noSrcLoc, interactiveSrcLoc, srcLocSpan )
diff --git a/compiler/main/Main.hs b/compiler/main/Main.hs
index 971eb35..52097d9 100644
--- a/compiler/main/Main.hs
+++ b/compiler/main/Main.hs
@@ -18,7 +18,7 @@ import GHC		( Session, DynFlags(..), GhcMode(..), HscTarget(..),
 import CmdLineParser
 
 -- Implementations of the various modes (--show-iface, mkdependHS. etc.)
-import MkIface		( showIface )
+import LoadIface	( showIface )
 import DriverPipeline	( oneShot, compileFile )
 import DriverMkDepend	( doMkDependHS )
 #ifdef GHCI