diff options
| author | andy <unknown> | 2000-04-04 01:07:50 +0000 |
|---|---|---|
| committer | andy <unknown> | 2000-04-04 01:07:50 +0000 |
| commit | be1966e78e545611f39eb2eed6f11fc60558100c (patch) | |
| tree | 3b2a3b9d516021feb0ceae3368eadc7dcf107418 /ghc/interpreter/static.c | |
| parent | a84e2d973928854935b3bc1f498fd81ed17f6483 (diff) | |
| download | haskell-be1966e78e545611f39eb2eed6f11fc60558100c.tar.gz | |
[project @ 2000-04-04 01:07:49 by andy]
Adding in support for split Hugs Prelude.
There are now two preludes.
(1) PrimPrel - the Prelude defintions, and the extra magic datatypes.
(2) Prelude - the external interface for Prelude.
Diffstat (limited to 'ghc/interpreter/static.c')
| -rw-r--r-- | ghc/interpreter/static.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/ghc/interpreter/static.c b/ghc/interpreter/static.c index 8ee6aae42e..999e1e8d4a 100644 --- a/ghc/interpreter/static.c +++ b/ghc/interpreter/static.c @@ -9,8 +9,8 @@ * included in the distribution. * * $RCSfile: static.c,v $ - * $Revision: 1.33 $ - * $Date: 2000/03/31 04:13:27 $ + * $Revision: 1.34 $ + * $Date: 2000/04/04 01:07:49 $ * ------------------------------------------------------------------------*/ #include "hugsbasictypes.h" @@ -5035,18 +5035,21 @@ Void checkDefns ( Module thisModule ) { /* Top level static analysis */ mapProc(checkQualImport, module(thisModule).qualImports); mapProc(checkUnqualImport,unqualImports); /* Add "import Prelude" if there`s no explicit import */ - if (thisModule!=modulePrelude - && isNull(cellAssoc(modulePrelude,unqualImports)) - && isNull(cellRevAssoc(modulePrelude,module(thisModule).qualImports))) { - unqualImports = cons(pair(modulePrelude,DOTDOT),unqualImports); +#if 0 + if (thisModule==modulePrelude || thisModule == modulePrelude2) { + /* Nothing. */ + } else if (isNull(cellAssoc(modulePrelude,unqualImports)) + && isNull(cellRevAssoc(modulePrelude,module(thisModule).qualImports))) { + unqualImports = cons(pair(modulePrelude,DOTDOT),unqualImports); } else { - /* Every module (including the Prelude) implicitly contains - * "import qualified Prelude" - */ - module(thisModule).qualImports - =cons(pair(mkCon(textPrelude),modulePrelude), - module(thisModule).qualImports); + /* Every module (including the Prelude) implicitly contains + * "import qualified Prelude" + */ + module(thisModule).qualImports + =cons(pair(mkCon(textPrelude),modulePrelude), + module(thisModule).qualImports); } +#endif mapProc(checkImportList, unqualImports); /* Note: there's a lot of side-effecting going on here, so |