From e7e3cddc7d075a5c2ed67b24fcb885329ad1eb3b Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Wed, 15 Apr 2009 08:45:54 +0000
Subject: 	Fix SF/2760823 	* interp/sys-driver.boot (systemMain):
 Explicitly call toplevel 	REPL for SBCL- and ECL-based builds. 	*
 interp/i-toplev.boot (start): Don't special case SBCL here. 	*
 interp/int-top.boot (spad): Likewise. 	(intloop): Tidy call to
 SpadInterpretStream. 	(SpadInterpretStream): Don't store to $fn. 	*
 interp/msg.boot (toFile?): Don't check for $fn.

---
 src/interp/sys-driver.boot | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/interp/sys-driver.boot')

diff --git a/src/interp/sys-driver.boot b/src/interp/sys-driver.boot
index ffe4af23..b4d23d29 100644
--- a/src/interp/sys-driver.boot
+++ b/src/interp/sys-driver.boot
@@ -288,7 +288,7 @@ installDriver(Option '"build-databases",function buildDatabasesHandler)
 
 --%
 
-++ Main entry point to the system.
+++ Main entry point to the interactive system.
 systemMain() ==
   IN_-PACKAGE '"BOOT"      -- ??? is this still necessary?
   -- ??? Ideally, we should not be calling AxiomCore::topLevel.
@@ -301,5 +301,12 @@ systemMain() ==
   if $StandardLinking then 
     initializeGlobalState()
   $leanMode := getOptionValue "mode" = '"lean"
-  %basicSystemIsComplete() => restart()
+  %basicSystemIsComplete() => 
+    restart()
+)if %hasFeature KEYWORD::ECL
+    SI::_*LISP_-INITIALIZED_* : local := true
+    apply($originalLispTopLevel,nil)
+)elseif %hasFeature KEYWORD::SBCL 
+    apply($originalLispTopLevel,nil)
+)endif
   fatalError '"fell off systemMain"
-- 
cgit v1.2.3