projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cabalize ext-core tools
[ghc-hetmet.git]
/
utils
/
ext-core
/
Driver.hs
diff --git
a/utils/ext-core/Driver.hs
b/utils/ext-core/Driver.hs
index
927a95d
..
c2eee43
100644
(file)
--- a/
utils/ext-core/Driver.hs
+++ b/
utils/ext-core/Driver.hs
@@
-1,5
+1,4
@@
{-# OPTIONS -Wall #-}
{-# OPTIONS -Wall #-}
-
{- A simple driver that loads, typechecks, prepares, re-typechecks, and interprets the
GHC standard Prelude modules and an application module called Main.
{- A simple driver that loads, typechecks, prepares, re-typechecks, and interprets the
GHC standard Prelude modules and an application module called Main.
@@
-17,15
+16,14
@@
import System.Environment
import System.Exit
import System.FilePath
import System.Exit
import System.FilePath
-import Core
-import Dependencies
-import Overrides
-import Prims
-import Check
-import Prep
-import Interp
-
-import ParsecParser
+import Language.Core.Core
+import Language.Core.Dependencies
+import Language.Core.Overrides
+import Language.Core.Prims
+import Language.Core.Check
+import Language.Core.Prep
+import Language.Core.Interp
+import Language.Core.ParsecParser
-- You may need to change this.
baseDir :: FilePath
-- You may need to change this.
baseDir :: FilePath
@@
-57,8
+55,8
@@
options =
Option ['n'] ["no-deps"] (NoArg NoDeps) "don't compute dependencies automatically"
]
Option ['n'] ["no-deps"] (NoArg NoDeps) "don't compute dependencies automatically"
]
-process :: Bool -> (Check.Menv,[Module]) -> (FilePath, Module)
- -> IO (Check.Menv,[Module])
+process :: Bool -> (Menv,[Module]) -> (FilePath, Module)
+ -> IO (Menv,[Module])
process _ (senv,modules) p@(f,m) | isLib p && not typecheckLibs = do
-- if it's a library and we set typecheckLibs to False:
-- prep, but don't typecheck
process _ (senv,modules) p@(f,m) | isLib p && not typecheckLibs = do
-- if it's a library and we set typecheckLibs to False:
-- prep, but don't typecheck
@@
-84,7
+82,7
@@
process doTest (senv,modules) (f, m@(Module mn _ _)) = catch (do
++ " while processing " ++ f)
return (senv, modules)
++ " while processing " ++ f)
return (senv, modules)
-prepM :: Check.Menv -> Module -> FilePath -> IO Module
+prepM :: Menv -> Module -> FilePath -> IO Module
prepM senv' m _f = do
let m' = prepModule senv' m
--writeFile (f </> ".prepped") (show m')
prepM senv' m _f = do
let m' = prepModule senv' m
--writeFile (f </> ".prepped") (show m')