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.

8 files changed, 33 insertions, 20 deletions

diff --git a/configure b/configure
index 4955c197..1c85b3b6 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for OpenAxiom 1.3.0-2009-04-14.
+# Generated by GNU Autoconf 2.60 for OpenAxiom 1.3.0-2009-04-15.
 #
 # Report bugs to <open-axiom-bugs@lists.sf.net>.
 #
@@ -713,8 +713,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='OpenAxiom'
 PACKAGE_TARNAME='openaxiom'
-PACKAGE_VERSION='1.3.0-2009-04-14'
-PACKAGE_STRING='OpenAxiom 1.3.0-2009-04-14'
+PACKAGE_VERSION='1.3.0-2009-04-15'
+PACKAGE_STRING='OpenAxiom 1.3.0-2009-04-15'
 PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
 
 ac_unique_file="src/Makefile.pamphlet"
@@ -1406,7 +1406,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures OpenAxiom 1.3.0-2009-04-14 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.3.0-2009-04-15 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1476,7 +1476,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2009-04-14:";;
+     short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2009-04-15:";;
    esac
   cat <<\_ACEOF
 
@@ -1580,7 +1580,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenAxiom configure 1.3.0-2009-04-14
+OpenAxiom configure 1.3.0-2009-04-15
 generated by GNU Autoconf 2.60
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1594,7 +1594,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OpenAxiom $as_me 1.3.0-2009-04-14, which was
+It was created by OpenAxiom $as_me 1.3.0-2009-04-15, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   $ $0 $@
@@ -26808,7 +26808,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by OpenAxiom $as_me 1.3.0-2009-04-14, which was
+This file was extended by OpenAxiom $as_me 1.3.0-2009-04-15, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -26857,7 +26857,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-OpenAxiom config.status 1.3.0-2009-04-14
+OpenAxiom config.status 1.3.0-2009-04-15
 configured by $0, generated by GNU Autoconf 2.60,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 80420f6f..82f1b5ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 sinclude(config/open-axiom.m4)
 sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.3.0-2009-04-14], 
+AC_INIT([OpenAxiom], [1.3.0-2009-04-15], 
         [open-axiom-bugs@lists.sf.net])
 
 AC_CONFIG_AUX_DIR(config)
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index 9fa7267d..ef055f30 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -1131,7 +1131,7 @@ information:
 <<Autoconf init>>=
 sinclude(config/open-axiom.m4)
 sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.3.0-2009-04-14], 
+AC_INIT([OpenAxiom], [1.3.0-2009-04-15], 
         [open-axiom-bugs@lists.sf.net])
 
 @
diff --git a/src/ChangeLog b/src/ChangeLog
index 9159ff43..217b1308 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2009-04-15  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	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.
+
 2009-04-14  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	Fix SF/2760553
diff --git a/src/interp/i-toplev.boot b/src/interp/i-toplev.boot
index 83c20e8d..f0d2204c 100644
--- a/src/interp/i-toplev.boot
+++ b/src/interp/i-toplev.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2008, Gabriel Dos Reis.
+-- Copyright (C) 2007-2009, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -108,7 +108,6 @@ start(:l) ==
     $OLDLINE := NIL
   $superHash := MAKE_-HASHTABLE('UEQUAL)
   if null l then runspad()
-  %hasFeature KEYWORD::SBCL => 0
   'EndOfSpad
 
 readSpadProfileIfThere() ==
diff --git a/src/interp/int-top.boot b/src/interp/int-top.boot
index 9b1d7f10..949b3241 100644
--- a/src/interp/int-top.boot
+++ b/src/interp/int-top.boot
@@ -78,7 +78,6 @@ spad() ==
   $inLispVM : local := nil
   setOutputAlgebra "%initialize%"
   runspad()
-  %hasFeature KEYWORD::SBCL => 0
   'EndOfSpad
 
 runspad() ==
@@ -110,12 +109,10 @@ intloop () ==
     mode := $intRestart
     while mode = $intRestart repeat
       resetStackLimits()
-      mode := CATCH($intTopLevel,
-                    SpadInterpretStream(1, ["TIM", "DALY", "?"], true))
+      mode := CATCH($intTopLevel, SpadInterpretStream(1, nil, true))
 
 
 SpadInterpretStream(str, source, interactive?) ==
-    $fn              : local := source
     pile?                    := not interactive?
     $libQuiet        : local := not interactive?
  
diff --git a/src/interp/msg.boot b/src/interp/msg.boot
index af1532f9..60d2e2f6 100644
--- a/src/interp/msg.boot
+++ b/src/interp/msg.boot
@@ -337,7 +337,6 @@ msgOutputter msg  ==
         
 toScreen? msg ==  getMsgToWhere msg ^= 'fileOnly
 toFile? msg   ==
-     PAIRP $fn and _
      getMsgToWhere msg ^= 'screenOnly
  
  
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"