aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure18
-rw-r--r--configure.ac2
-rw-r--r--configure.ac.pamphlet2
-rw-r--r--src/ChangeLog5
-rw-r--r--src/interp/g-error.boot14
-rw-r--r--src/interp/sys-driver.boot5
6 files changed, 35 insertions, 11 deletions
diff --git a/configure b/configure
index 3d2fd9eb..33ef121f 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-2008-08-19.
+# Generated by GNU Autoconf 2.60 for OpenAxiom 1.3.0-2008-08-21.
#
# 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-2008-08-19'
-PACKAGE_STRING='OpenAxiom 1.3.0-2008-08-19'
+PACKAGE_VERSION='1.3.0-2008-08-21'
+PACKAGE_STRING='OpenAxiom 1.3.0-2008-08-21'
PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
ac_unique_file="src/Makefile.pamphlet"
@@ -1405,7 +1405,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-2008-08-19 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.3.0-2008-08-21 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1475,7 +1475,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2008-08-19:";;
+ short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2008-08-21:";;
esac
cat <<\_ACEOF
@@ -1579,7 +1579,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-OpenAxiom configure 1.3.0-2008-08-19
+OpenAxiom configure 1.3.0-2008-08-21
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1593,7 +1593,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-2008-08-19, which was
+It was created by OpenAxiom $as_me 1.3.0-2008-08-21, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -26103,7 +26103,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-2008-08-19, which was
+This file was extended by OpenAxiom $as_me 1.3.0-2008-08-21, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -26152,7 +26152,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-OpenAxiom config.status 1.3.0-2008-08-19
+OpenAxiom config.status 1.3.0-2008-08-21
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 821c994a..f4276e06 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-2008-08-19],
+AC_INIT([OpenAxiom], [1.3.0-2008-08-21],
[open-axiom-bugs@lists.sf.net])
AC_CONFIG_AUX_DIR(config)
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index 4a680c4e..e32aabf4 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-2008-08-19],
+AC_INIT([OpenAxiom], [1.3.0-2008-08-21],
[open-axiom-bugs@lists.sf.net])
@
diff --git a/src/ChangeLog b/src/ChangeLog
index 95a22bc6..2d4ce270 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-21 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * interp/g-error.boot (systemErrorHandler): New.
+ * interp/sys-driver.boot (restart): Use it.
+
2008-08-20 Gabriel Dos Reis <gdr@cs.tamu.edu>
* boot/Makefile.in (oa_boot_linkset): Tidy.
diff --git a/src/interp/g-error.boot b/src/interp/g-error.boot
index 32ed1d72..2d7747d5 100644
--- a/src/interp/g-error.boot
+++ b/src/interp/g-error.boot
@@ -194,3 +194,17 @@ throwMessage(:msg) ==
if $printMsgsToFile then sayMSG2File msg'
spadThrow()
+
+++ Error handler for Lisp systems that support Common Lisp conditions.
+++ We don't want users to get dropped into the Lisp debugger.
+systemErrorHandler c ==
+ $NeedToSignalSessionManager := true
+ $BreakMode = "validate" =>
+ systemError ERROR_-FORMAT('"~a",[c])
+ not $inLispVM and $BreakMode in '(nobreak query resume) =>
+ $inLispVM := true
+ systemError ERROR_-FORMAT('"~a",[c])
+ $BreakMode = "letPrint2" =>
+ $BreakMode := nil
+ THROW("letPrint2",nil)
+
diff --git a/src/interp/sys-driver.boot b/src/interp/sys-driver.boot
index 1274564f..12f0a022 100644
--- a/src/interp/sys-driver.boot
+++ b/src/interp/sys-driver.boot
@@ -165,7 +165,12 @@ restart() ==
$currentLine := nil
openDatabases()
readSpadProfileIfThere()
+)if %hasFeature KEYWORD::GCL
spad()
+)else
+ SETQ(_*DEBUGGER_-HOOK_*,LAMBDA(c h, systemErrorHandler c))
+ !(handler-bind ((error #'|systemErrorHandler|)) (|spad|))
+)endif
--%