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 | 5 | ||||
| -rw-r--r-- | src/interp/bootlex.lisp | 3 | ||||
| -rw-r--r-- | src/interp/i-spec1.boot | 2 |
6 files changed, 18 insertions, 14 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for OpenAxiom 1.3.0-2009-06-20. +# Generated by GNU Autoconf 2.63 for OpenAxiom 1.3.0-2009-06-22. # # Report bugs to <open-axiom-bugs@lists.sf.net>. # @@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='OpenAxiom' PACKAGE_TARNAME='openaxiom' -PACKAGE_VERSION='1.3.0-2009-06-20' -PACKAGE_STRING='OpenAxiom 1.3.0-2009-06-20' +PACKAGE_VERSION='1.3.0-2009-06-22' +PACKAGE_STRING='OpenAxiom 1.3.0-2009-06-22' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' ac_unique_file="src/Makefile.pamphlet" @@ -1500,7 +1500,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-06-20 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.3.0-2009-06-22 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1570,7 +1570,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2009-06-20:";; + short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2009-06-22:";; esac cat <<\_ACEOF @@ -1672,7 +1672,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.3.0-2009-06-20 +OpenAxiom configure 1.3.0-2009-06-22 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1686,7 +1686,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-06-20, which was +It was created by OpenAxiom $as_me 1.3.0-2009-06-22, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -17686,7 +17686,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-06-20, which was +This file was extended by OpenAxiom $as_me 1.3.0-2009-06-22, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17749,7 +17749,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -OpenAxiom config.status 1.3.0-2009-06-20 +OpenAxiom config.status 1.3.0-2009-06-22 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 02746da5..3772ea73 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-06-20], +AC_INIT([OpenAxiom], [1.3.0-2009-06-22], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index 2714efe3..d148e9eb 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-06-20], +AC_INIT([OpenAxiom], [1.3.0-2009-06-22], [open-axiom-bugs@lists.sf.net]) @ diff --git a/src/ChangeLog b/src/ChangeLog index 305a1291..0156f61d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-06-23 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * interp/bootlex.lisp (spad): Don't bind $noSubsumption. + * interp/i-spec1.boot (evalCOLLECT): Fix thinko. + 2009-06-20 Gabriel Dos Reis <gdr@cs.tamu.edu> * interp/category.boot (SigOpsubsume): Remove as unused. diff --git a/src/interp/bootlex.lisp b/src/interp/bootlex.lisp index 4cd605d5..f430ffe1 100644 --- a/src/interp/bootlex.lisp +++ b/src/interp/bootlex.lisp @@ -94,10 +94,9 @@ (*EOF* NIL) (File-Closed NIL) (/editfile *spad-input-file*) - (|$noSubsumption| |$noSubsumption|) in-stream out-stream) (declare (special echo-meta /editfile *comp370-apply* *EOF* - File-Closed Xcape |$noSubsumption|)) + File-Closed Xcape)) (setq |$InteractiveMode| nil) ;; only rebind |$InteractiveFrame| if compiling (progv (if (not |$InteractiveMode|) '(|$InteractiveFrame|)) diff --git a/src/interp/i-spec1.boot b/src/interp/i-spec1.boot index f9b1fb60..a23aaffb 100644 --- a/src/interp/i-spec1.boot +++ b/src/interp/i-spec1.boot @@ -541,7 +541,7 @@ upLoopIterSTEP(index,lower,step,upperList) == evalCOLLECT(op,[:itrl,body],m) == iters := [evalLoopIter itr for itr in itrl] bod := getArgValue(body,computedMode body) - if bod isnt ['SPADCALL,:.] then bode := ['unwrap,bod] + if bod isnt ['SPADCALL,:.] then bod := ['unwrap,bod] code := timedOptimization asTupleNewCode0(second m, ['COLLECT,:iters,bod]) if $genValue then code := wrap timedEVALFUN code putValue(op,objNew(code,m)) |