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 (file)
--- 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 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 )
 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 (file)
--- 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 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
 import DriverPipeline  ( oneShot, compileFile )
 import DriverMkDepend  ( doMkDependHS )
 #ifdef GHCI