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/algebra/boolean.spad.pamphlet | 2 | ||||
| -rw-r--r-- | src/algebra/strap/BOOLEAN.lsp | 40 |
6 files changed, 38 insertions, 31 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.4.0-2010-02-09. +# Generated by GNU Autoconf 2.63 for OpenAxiom 1.4.0-2010-02-11. # # 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.4.0-2010-02-09' -PACKAGE_STRING='OpenAxiom 1.4.0-2010-02-09' +PACKAGE_VERSION='1.4.0-2010-02-11' +PACKAGE_STRING='OpenAxiom 1.4.0-2010-02-11' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' ac_unique_file="src/Makefile.pamphlet" @@ -1511,7 +1511,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.4.0-2010-02-09 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.4.0-2010-02-11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1581,7 +1581,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2010-02-09:";; + short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2010-02-11:";; esac cat <<\_ACEOF @@ -1688,7 +1688,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.4.0-2010-02-09 +OpenAxiom configure 1.4.0-2010-02-11 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1702,7 +1702,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.4.0-2010-02-09, which was +It was created by OpenAxiom $as_me 1.4.0-2010-02-11, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -21165,7 +21165,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.4.0-2010-02-09, which was +This file was extended by OpenAxiom $as_me 1.4.0-2010-02-11, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21228,7 +21228,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -OpenAxiom config.status 1.4.0-2010-02-09 +OpenAxiom config.status 1.4.0-2010-02-11 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 21c8f89e..7a55b7eb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.4.0-2010-02-09], +AC_INIT([OpenAxiom], [1.4.0-2010-02-11], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index 19a45867..124a9107 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -1200,7 +1200,7 @@ information: <<Autoconf init>>= sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.4.0-2010-02-09], +AC_INIT([OpenAxiom], [1.4.0-2010-02-11], [open-axiom-bugs@lists.sf.net]) @ diff --git a/src/ChangeLog b/src/ChangeLog index 61f2c020..e45dcef9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-02-11 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * algebra/boolean.spad.pamphlet (~$Boolean): Work around silly bug + in CLisp-2.48. + 2010-02-09 Gabriel Dos Reis <gdr@cs.tamu.edu> * interp/vmlisp.lisp (NEQ): Remove. diff --git a/src/algebra/boolean.spad.pamphlet b/src/algebra/boolean.spad.pamphlet index 2ac487e1..08c39765 100644 --- a/src/algebra/boolean.spad.pamphlet +++ b/src/algebra/boolean.spad.pamphlet @@ -326,7 +326,7 @@ Boolean(): Join(OrderedFinite, Logic, PropositionalLogic, ConvertibleTo InputFor false == NIL$Foreign(Builtin) sample() == true not b == NOT b - ~ b == (b => false; true) + ~ b == NOT b a and b == AND(a,b) a /\ b == AND(a,b) a or b == OR(a,b) diff --git a/src/algebra/strap/BOOLEAN.lsp b/src/algebra/strap/BOOLEAN.lsp index 5075ccfd..c808e229 100644 --- a/src/algebra/strap/BOOLEAN.lsp +++ b/src/algebra/strap/BOOLEAN.lsp @@ -22,6 +22,8 @@ (DECLAIM (FTYPE (FUNCTION (|%Boolean| |%Shell|) |%Boolean|) |BOOLEAN;~;2$;5|)) +(PUT '|BOOLEAN;~;2$;5| '|SPADreplace| 'NOT) + (DECLAIM (FTYPE (FUNCTION (|%Boolean| |%Boolean| |%Shell|) |%Boolean|) |BOOLEAN;and;3$;6|)) @@ -94,7 +96,7 @@ (DEFUN |BOOLEAN;not;2$;4| (|b| $) (DECLARE (IGNORE $)) (NOT |b|)) -(DEFUN |BOOLEAN;~;2$;5| (|b| $) (COND (|b| NIL) ('T T))) +(DEFUN |BOOLEAN;~;2$;5| (|b| $) (DECLARE (IGNORE $)) (NOT |b|)) (DEFUN |BOOLEAN;and;3$;6| (|a| |b| $) (DECLARE (IGNORE $)) @@ -184,15 +186,15 @@ (FUNCALL (|dispatchFunction| |BOOLEAN;true;$;2|) $)) (CONS IDENTITY (FUNCALL (|dispatchFunction| |BOOLEAN;false;$;3|) $)) - |BOOLEAN;not;2$;4| (|Boolean|) (0 . |false|) (4 . |true|) - |BOOLEAN;~;2$;5| |BOOLEAN;and;3$;6| |BOOLEAN;/\\;3$;7| - |BOOLEAN;or;3$;8| |BOOLEAN;\\/;3$;9| |BOOLEAN;xor;3$;10| - |BOOLEAN;nor;3$;11| |BOOLEAN;nand;3$;12| |BOOLEAN;=;3$;13| - |BOOLEAN;implies;3$;14| |BOOLEAN;equiv;3$;15| - |BOOLEAN;<;3$;16| (|NonNegativeInteger|) - |BOOLEAN;size;Nni;17| (|Integer|) (8 . |even?|) - (|PositiveInteger|) |BOOLEAN;index;Pi$;18| (13 . |One|) - |BOOLEAN;lookup;$Pi;19| (17 . |random|) + |BOOLEAN;not;2$;4| |BOOLEAN;~;2$;5| |BOOLEAN;and;3$;6| + |BOOLEAN;/\\;3$;7| |BOOLEAN;or;3$;8| |BOOLEAN;\\/;3$;9| + |BOOLEAN;xor;3$;10| (|Boolean|) (0 . |false|) + |BOOLEAN;nor;3$;11| (4 . |true|) |BOOLEAN;nand;3$;12| + |BOOLEAN;=;3$;13| |BOOLEAN;implies;3$;14| + |BOOLEAN;equiv;3$;15| |BOOLEAN;<;3$;16| + (|NonNegativeInteger|) |BOOLEAN;size;Nni;17| (|Integer|) + (8 . |even?|) (|PositiveInteger|) |BOOLEAN;index;Pi$;18| + (13 . |One|) |BOOLEAN;lookup;$Pi;19| (17 . |random|) |BOOLEAN;random;$;20| (|InputForm|) |BOOLEAN;convert;$If;21| (|OutputForm|) |BOOLEAN;coerce;$Of;22| (|SingleInteger|) (|String|)) @@ -212,18 +214,18 @@ (|ConvertibleTo| 35) (|BasicType|) (|CoercibleTo| 37)) (|makeByteWordVec2| 40 - '(0 10 0 11 0 10 0 12 1 27 10 0 28 0 29 - 0 31 0 27 0 33 2 0 10 0 0 1 1 0 0 0 - 13 2 0 0 0 0 18 0 0 0 7 1 0 0 0 6 0 0 - 25 26 0 0 0 34 2 0 0 0 0 16 1 0 0 0 9 - 2 0 0 0 0 19 2 0 0 0 0 20 0 0 0 1 2 0 + '(0 16 0 17 0 16 0 19 1 27 16 0 28 0 29 + 0 31 0 27 0 33 2 0 16 0 0 1 1 0 0 0 + 10 2 0 0 0 0 15 0 0 0 7 1 0 0 0 6 0 0 + 25 26 0 0 0 34 2 0 0 0 0 13 1 0 0 0 9 + 2 0 0 0 0 18 2 0 0 0 0 20 0 0 0 1 2 0 0 0 0 1 0 0 0 1 2 0 0 0 0 1 1 0 29 0 32 1 0 40 0 1 1 0 0 29 30 2 0 0 0 0 22 1 0 39 0 1 0 0 0 8 2 0 0 0 0 23 1 - 0 35 0 36 1 0 37 0 38 2 0 10 0 0 1 2 - 0 0 0 0 14 2 0 0 0 0 17 2 0 10 0 0 1 - 2 0 10 0 0 1 2 0 10 0 0 21 2 0 10 0 0 - 1 2 0 10 0 0 24 2 0 0 0 0 15))))) + 0 35 0 36 1 0 37 0 38 2 0 16 0 0 1 2 + 0 0 0 0 11 2 0 0 0 0 14 2 0 16 0 0 1 + 2 0 16 0 0 1 2 0 16 0 0 21 2 0 16 0 0 + 1 2 0 16 0 0 24 2 0 0 0 0 12))))) '|lookupComplete|)) (MAKEPROP '|Boolean| 'NILADIC T) |