Update for 6.10.4, proper ghc-path usage, GHC file separation

Ignore-this: fa58b320277567a54e19793e73c8799c

darcs-hash:20090826085000-ed0c4-43997151bc6362ef145989dce2216f9cd124ca7d

Author: clefru

Finder4Lsk.hs

@@ -8,7 +8,7 @@
 -- (c) The University of Glasgow 2005
 --
 -----------------------------------------------------------------------------
-module DriverPipeline4Lsk (
+module GHCSalat.DriverPipeline4Lsk (
 	-- Run a series of compilation steps in a pipeline, for a
 	-- collection of source files.
    oneShot, compileFile,
@@ -30,7 +30,7 @@ import HeaderInfo
 import DriverPhases
 import SysTools
 import HscMain
-import qualified HscMain4Lsk as HML
+import qualified GHCSalat.HscMain4Lsk as HML
 import Finder
 import HscTypes
 import Outputable

DriverPipeline4Lsk.hs renamed to GHCSalat/DriverPipeline4Lsk.hs

@@ -5,7 +5,7 @@
 -- The GHC API
 --
 -- -----------------------------------------------------------------------------
-module GHC4Lsk (
+module GHCSalat.GHC4Lsk (
 	-- * Initialisation
 	defaultErrorHandler,
 	defaultCleanupHandler,
@@ -98,7 +98,7 @@ module GHC4Lsk (
         Resume(resumeStmt, resumeThreadId, resumeBreakInfo, resumeSpan,
                resumeHistory, resumeHistoryIx),
         History(historyBreakInfo, historyEnclosingDecl), 
-        GHC4Lsk.getHistorySpan, getHistoryModule,
+        GHCSalat.GHC4Lsk.getHistorySpan, getHistoryModule,
         getResumeContext,
         abandon, abandonAll,
         InteractiveEval.back,
@@ -107,7 +107,7 @@ module GHC4Lsk (
         isModuleInterpreted,
 	InteractiveEval.compileExpr, HValue, dynCompileExpr,
 	lookupName,
-        GHC4Lsk.obtainTermFromId, GHC4Lsk.obtainTermFromVal, reconstructType,
+        GHCSalat.GHC4Lsk.obtainTermFromId, GHCSalat.GHC4Lsk.obtainTermFromVal, reconstructType,
         modInfoModBreaks,
         ModBreaks(..), BreakIndex,
         BreakInfo(breakInfo_number, breakInfo_module),
@@ -247,7 +247,7 @@ import BreakArray
 import NameSet
 import InteractiveEval
 import TcRnDriver
-import TcRnDriver4Lsk
+import GHCSalat.TcRnDriver4Lsk
 import Desugar          ( deSugarExpr )
 import PrelNames
 #endif
@@ -277,11 +277,11 @@ import FamInstEnv       ( emptyFamInstEnv )
 import SrcLoc
 --import CoreSyn
 import TidyPgm
-import DriverPipeline4Lsk
+import GHCSalat.DriverPipeline4Lsk
 import DriverPhases	( HscSource(..), Phase(..), isHaskellSrcFilename, startPhase )
 import HeaderInfo
 import Finder
-import qualified Finder4Lsk as FL
+import qualified GHCSalat.Finder4Lsk as FL
 import HscMain
 import HscTypes
 import DynFlags

GHC4Lsk.hs renamed to GHCSalat/GHC4Lsk.hs

@@ -1,5 +1,5 @@
-module GHC4Lsk (ParsedMod,loadModule,typecheckModule,runGhc,setSessionDynFlags,getSessionDynFlags,findModule,ParsedModule(..),compileHsExpr,setTargets,LoadHowMuch(..),load,unload) where
-import GhciMonad
+module GHCSalat.GHC4Lsk (ParsedMod,loadModule,typecheckModule,runGhc,setSessionDynFlags,getSessionDynFlags,findModule,ParsedModule(..),compileHsExpr,setTargets,LoadHowMuch(..),load,unload) where
+import GHCSalat.GhciMonad
 import HscTypes
 import Module
 import FastString