diff options
| -rwxr-xr-x | configure | 18 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | configure.ac.pamphlet | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/interp/compiler.boot | 16 | ||||
| -rw-r--r-- | src/interp/sys-macros.lisp | 6 |
6 files changed, 27 insertions, 24 deletions
@@ -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-10-01. +# Generated by GNU Autoconf 2.60 for OpenAxiom 1.3.0-2008-10-06. # # 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-10-01' -PACKAGE_STRING='OpenAxiom 1.3.0-2008-10-01' +PACKAGE_VERSION='1.3.0-2008-10-06' +PACKAGE_STRING='OpenAxiom 1.3.0-2008-10-06' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' ac_unique_file="src/Makefile.pamphlet" @@ -1404,7 +1404,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-10-01 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.3.0-2008-10-06 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1474,7 +1474,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2008-10-01:";; + short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2008-10-06:";; esac cat <<\_ACEOF @@ -1578,7 +1578,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.3.0-2008-10-01 +OpenAxiom configure 1.3.0-2008-10-06 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1592,7 +1592,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-10-01, which was +It was created by OpenAxiom $as_me 1.3.0-2008-10-06, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -26097,7 +26097,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-10-01, which was +This file was extended by OpenAxiom $as_me 1.3.0-2008-10-06, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26146,7 +26146,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenAxiom config.status 1.3.0-2008-10-01 +OpenAxiom config.status 1.3.0-2008-10-06 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 b9957a6a..f6d88853 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-10-01], +AC_INIT([OpenAxiom], [1.3.0-2008-10-06], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index 0ac54eba..c8b45911 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -1126,7 +1126,7 @@ information: <<Autoconf init>>= sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.3.0-2008-10-01], +AC_INIT([OpenAxiom], [1.3.0-2008-10-06], [open-axiom-bugs@lists.sf.net]) @ diff --git a/src/ChangeLog b/src/ChangeLog index 52592a9b..8eefe4d1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2008-10-06 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * interp/sys-macros.lisp (|quietlyIfInteractive|): New. + * interp/compiler.boot (quietlyIfInteractive): Use it. + (compQuietly): Likewise. + (compileQuietly): Likewise. + 2008-10-05 Gabriel Dos Reis <gdr@cs.tamu.edu> * interp/c-util.boot ($optExportedFunctionReference): New. diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot index 004acbb0..cb237c12 100644 --- a/src/interp/compiler.boot +++ b/src/interp/compiler.boot @@ -1895,10 +1895,7 @@ compMapCondFun(fnexpr,op,dc,bindings) == --% Interface to the backend compileFileQuietly path == - $OutputStream := - $InteractiveMode => MAKE_-BROADCAST_-STREAM() - MAKE_-SYNONYM_-STREAM "*STANDARD-OUTPUT*" - COMPILE_-FILE path + quietlyIfInteractive COMPILE_-FILE path compAndDefine l == _*COMP370_-APPLY_* := "PRINT-AND-EVAL-DEFUN" @@ -1910,11 +1907,7 @@ compQuietly fn == $compileDontDefineFunctions => "COMPILE-DEFUN" "EVAL-DEFUN" "PRINT-DEFUN" - -- create a null outputstream if $InteractiveMode - $OutputStream := - $InteractiveMode => MAKE_-BROADCAST_-STREAM() - MAKE_-SYNONYM_-STREAM "*STANDARD-OUTPUT*" - COMP fn + quietlyIfInteractive COMP fn compileQuietly fn == _*COMP370_-APPLY_* := @@ -1922,10 +1915,7 @@ compileQuietly fn == $compileDontDefineFunctions => "COMPILE-DEFUN" "EVAL-DEFUN" "PRINT-DEFUN" - $OutputStream := - $InteractiveMode => MAKE_-BROADCAST_-STREAM() - MAKE_-SYNONYM_-STREAM "*STANDARD-OUTPUT*" - COMP370 fn + quietlyIfInteractive COMP370 fn COMP l == diff --git a/src/interp/sys-macros.lisp b/src/interp/sys-macros.lisp index c53dac73..53a6c3b5 100644 --- a/src/interp/sys-macros.lisp +++ b/src/interp/sys-macros.lisp @@ -1308,6 +1308,12 @@ (SUBST (SECOND L) 'x '(COND ($reportFlag (sayBrightly x)) ((QUOTE T) NIL)))) +;; Quietly execute `cmd' if in interactive session +(defmacro |quietlyIfInteractive| (cmd) + `(let ((|$OutputStream| (if |$InteractiveMode| + (make-broadcast-stream) + (make-synonym-stream '*standard-output*)))) + ,cmd)) (defmacro |spadConstant| (dollar n) `(spadcall (svref ,dollar (the fixnum ,n)))) |