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 | 6 | ||||
| -rw-r--r-- | src/algebra/polset.spad.pamphlet | 149 |
5 files changed, 89 insertions, 88 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.2.0-2008-03-13. +# Generated by GNU Autoconf 2.60 for OpenAxiom 1.2.0-2008-03-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.2.0-2008-03-13' -PACKAGE_STRING='OpenAxiom 1.2.0-2008-03-13' +PACKAGE_VERSION='1.2.0-2008-03-15' +PACKAGE_STRING='OpenAxiom 1.2.0-2008-03-15' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' ac_unique_file="src/Makefile.pamphlet" @@ -1387,7 +1387,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.2.0-2008-03-13 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.2.0-2008-03-15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1457,7 +1457,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-03-13:";; + short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-03-15:";; esac cat <<\_ACEOF @@ -1561,7 +1561,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.2.0-2008-03-13 +OpenAxiom configure 1.2.0-2008-03-15 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1575,7 +1575,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.2.0-2008-03-13, which was +It was created by OpenAxiom $as_me 1.2.0-2008-03-15, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -25230,7 +25230,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.2.0-2008-03-13, which was +This file was extended by OpenAxiom $as_me 1.2.0-2008-03-15, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25279,7 +25279,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenAxiom config.status 1.2.0-2008-03-13 +OpenAxiom config.status 1.2.0-2008-03-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 0116534b..ab152548 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.2.0-2008-03-13], +AC_INIT([OpenAxiom], [1.2.0-2008-03-15], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index 82c7fdcf..4f5667ff 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -1022,7 +1022,7 @@ information: <<Autoconf init>>= sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.2.0-2008-03-13], +AC_INIT([OpenAxiom], [1.2.0-2008-03-15], [open-axiom-bugs@lists.sf.net]) @ diff --git a/src/ChangeLog b/src/ChangeLog index 55aaa73f..2bfe9404 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2008-03-15 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * algebra/polset.spad.pamphlet (exactQuo$PSETCAT-): Don't + conditionally define as local function. Update cached Lisp + translation. + 2008-03-13 Gabriel Dos Reis <gdr@cs.tamu.edu> * algebra/catdef.spad.pamphlet: Update cached Lisp translation. diff --git a/src/algebra/polset.spad.pamphlet b/src/algebra/polset.spad.pamphlet index 14527801..60afd780 100644 --- a/src/algebra/polset.spad.pamphlet +++ b/src/algebra/polset.spad.pamphlet @@ -198,8 +198,6 @@ PolynomialSetCategory(R:Ring, E:OrderedAbelianMonoidSup,_ ps1 = ps2 == {p for p in elements(ps1)} =$(Set P) {p for p in elements(ps2)} - exactQuo : (R,R) -> R - localInf? (p:P,q:P):B == degree(p) <$E degree(q) @@ -260,13 +258,9 @@ PolynomialSetCategory(R:Ring, E:OrderedAbelianMonoidSup,_ LPR ==> List Polynomial R LS ==> List Symbol - if R has EuclideanDomain - then - exactQuo(r:R,s:R):R == - r quo$R s - else - exactQuo(r:R,s:R):R == - (r exquo$R s)::R + exactQuo(r:R,s:R):R == + if R has EuclideanDomain then r quo$R s + else (r exquo$R s)::R headRemainder (a,ps) == lp1 : List(P) := remove(zero?, elements(ps))$(List(P)) @@ -884,23 +878,24 @@ Note that this code is not included in the generated catdef.spad file. ('T 'NIL))) (DEFUN |PSETCAT-;exactQuo| (|r| |s| $) - (SPADCALL |r| |s| (QREFELT $ 59))) - -(DEFUN |PSETCAT-;exactQuo| (|r| |s| $) - (PROG (#0=#:G1504) + (PROG (#0=#:G1503) (RETURN - (PROG2 (LETT #0# (SPADCALL |r| |s| (QREFELT $ 61)) - |PSETCAT-;exactQuo|) - (QCDR #0#) - (|check-union| (QEQCAR #0# 0) (QREFELT $ 7) #0#))))) - -(DEFUN |PSETCAT-;headRemainder;PSR;23| (|a| |ps| $) - (PROG (|lp1| |p| |e| |g| |#G47| |#G48| |lca| |lcp| |r| |lp2|) + (COND + ((|HasCategory| (QREFELT $ 7) '(|EuclideanDomain|)) + (SPADCALL |r| |s| (QREFELT $ 59))) + ('T + (PROG2 (LETT #0# (SPADCALL |r| |s| (QREFELT $ 61)) + |PSETCAT-;exactQuo|) + (QCDR #0#) + (|check-union| (QEQCAR #0# 0) (QREFELT $ 7) #0#))))))) + +(DEFUN |PSETCAT-;headRemainder;PSR;22| (|a| |ps| $) + (PROG (|lp1| |p| |e| |g| |#G45| |#G46| |lca| |lcp| |r| |lp2|) (RETURN (SEQ (LETT |lp1| (SPADCALL (ELT $ 43) (|PSETCAT-;elements| |ps| $) (QREFELT $ 26)) - |PSETCAT-;headRemainder;PSR;23|) + |PSETCAT-;headRemainder;PSR;22|) (EXIT (COND ((NULL |lp1|) (CONS |a| (|spadConstant| $ 62))) ((SPADCALL (ELT $ 24) |lp1| (QREFELT $ 44)) @@ -908,7 +903,7 @@ Note that this code is not included in the generated catdef.spad file. (|spadConstant| $ 62))) ('T (SEQ (LETT |r| (|spadConstant| $ 62) - |PSETCAT-;headRemainder;PSR;23|) + |PSETCAT-;headRemainder;PSR;22|) (LETT |lp1| (SPADCALL (CONS @@ -917,9 +912,9 @@ Note that this code is not included in the generated catdef.spad file. (REVERSE (|PSETCAT-;elements| |ps| $)) (QREFELT $ 46)) - |PSETCAT-;headRemainder;PSR;23|) + |PSETCAT-;headRemainder;PSR;22|) (LETT |lp2| |lp1| - |PSETCAT-;headRemainder;PSR;23|) + |PSETCAT-;headRemainder;PSR;22|) (SEQ G190 (COND ((NULL (COND @@ -930,13 +925,13 @@ Note that this code is not included in the generated catdef.spad file. (QREFELT $ 29))))) (GO G191))) (SEQ (LETT |p| (|SPADfirst| |lp2|) - |PSETCAT-;headRemainder;PSR;23|) + |PSETCAT-;headRemainder;PSR;22|) (LETT |e| (SPADCALL (SPADCALL |a| (QREFELT $ 41)) (SPADCALL |p| (QREFELT $ 41)) (QREFELT $ 64)) - |PSETCAT-;headRemainder;PSR;23|) + |PSETCAT-;headRemainder;PSR;22|) (EXIT (COND ((QEQCAR |e| 0) @@ -946,26 +941,26 @@ Note that this code is not included in the generated catdef.spad file. (LETT |lca| (SPADCALL |a| (QREFELT $ 65)) - |PSETCAT-;headRemainder;PSR;23|) + |PSETCAT-;headRemainder;PSR;22|) (LETT |lcp| (SPADCALL |p| (QREFELT $ 65)) - |PSETCAT-;headRemainder;PSR;23|) + |PSETCAT-;headRemainder;PSR;22|) (QREFELT $ 66)) - |PSETCAT-;headRemainder;PSR;23|) + |PSETCAT-;headRemainder;PSR;22|) (PROGN - (LETT |#G47| + (LETT |#G45| (|PSETCAT-;exactQuo| |lca| |g| $) - |PSETCAT-;headRemainder;PSR;23|) - (LETT |#G48| + |PSETCAT-;headRemainder;PSR;22|) + (LETT |#G46| (|PSETCAT-;exactQuo| |lcp| |g| $) - |PSETCAT-;headRemainder;PSR;23|) - (LETT |lca| |#G47| - |PSETCAT-;headRemainder;PSR;23|) - (LETT |lcp| |#G48| - |PSETCAT-;headRemainder;PSR;23|)) + |PSETCAT-;headRemainder;PSR;22|) + (LETT |lca| |#G45| + |PSETCAT-;headRemainder;PSR;22|) + (LETT |lcp| |#G46| + |PSETCAT-;headRemainder;PSR;22|)) (LETT |a| (SPADCALL (SPADCALL |lcp| @@ -979,17 +974,17 @@ Note that this code is not included in the generated catdef.spad file. (QREFELT $ 63)) (QREFELT $ 69)) (QREFELT $ 70)) - |PSETCAT-;headRemainder;PSR;23|) + |PSETCAT-;headRemainder;PSR;22|) (LETT |r| (SPADCALL |r| |lcp| (QREFELT $ 71)) - |PSETCAT-;headRemainder;PSR;23|) + |PSETCAT-;headRemainder;PSR;22|) (EXIT (LETT |lp2| |lp1| - |PSETCAT-;headRemainder;PSR;23|)))) + |PSETCAT-;headRemainder;PSR;22|)))) ('T (LETT |lp2| (CDR |lp2|) - |PSETCAT-;headRemainder;PSR;23|))))) + |PSETCAT-;headRemainder;PSR;22|))))) NIL (GO G190) G191 (EXIT NIL)) (EXIT (CONS |a| |r|)))))))))) @@ -1015,15 +1010,15 @@ Note that this code is not included in the generated catdef.spad file. (QCDR |frac|)) (EXIT |frac|))))))))) -(DEFUN |PSETCAT-;remainder;PSR;25| (|a| |ps| $) +(DEFUN |PSETCAT-;remainder;PSR;24| (|a| |ps| $) (PROG (|hRa| |r| |lca| |g| |b| |c|) (RETURN (SEQ (LETT |hRa| (|PSETCAT-;makeIrreducible!| (SPADCALL |a| |ps| (QREFELT $ 78)) $) - |PSETCAT-;remainder;PSR;25|) - (LETT |a| (QCAR |hRa|) |PSETCAT-;remainder;PSR;25|) - (LETT |r| (QCDR |hRa|) |PSETCAT-;remainder;PSR;25|) + |PSETCAT-;remainder;PSR;24|) + (LETT |a| (QCAR |hRa|) |PSETCAT-;remainder;PSR;24|) + (LETT |r| (QCDR |hRa|) |PSETCAT-;remainder;PSR;24|) (EXIT (COND ((SPADCALL |a| (QREFELT $ 43)) (VECTOR (|spadConstant| $ 62) |a| |r|)) @@ -1032,16 +1027,16 @@ Note that this code is not included in the generated catdef.spad file. (SPADCALL (|spadConstant| $ 62) (SPADCALL |a| (QREFELT $ 41)) (QREFELT $ 68)) - |PSETCAT-;remainder;PSR;25|) + |PSETCAT-;remainder;PSR;24|) (LETT |c| (SPADCALL |a| (QREFELT $ 65)) - |PSETCAT-;remainder;PSR;25|) + |PSETCAT-;remainder;PSR;24|) (SEQ G190 (COND ((NULL (SPADCALL (SPADCALL (LETT |a| (SPADCALL |a| (QREFELT $ 63)) - |PSETCAT-;remainder;PSR;25|) + |PSETCAT-;remainder;PSR;24|) (QREFELT $ 43)) (QREFELT $ 29))) (GO G191))) @@ -1049,20 +1044,20 @@ Note that this code is not included in the generated catdef.spad file. (|PSETCAT-;makeIrreducible!| (SPADCALL |a| |ps| (QREFELT $ 78)) $) - |PSETCAT-;remainder;PSR;25|) + |PSETCAT-;remainder;PSR;24|) (LETT |a| (QCAR |hRa|) - |PSETCAT-;remainder;PSR;25|) + |PSETCAT-;remainder;PSR;24|) (LETT |r| (SPADCALL |r| (QCDR |hRa|) (QREFELT $ 71)) - |PSETCAT-;remainder;PSR;25|) + |PSETCAT-;remainder;PSR;24|) (LETT |g| (SPADCALL |c| (LETT |lca| (SPADCALL |a| (QREFELT $ 65)) - |PSETCAT-;remainder;PSR;25|) + |PSETCAT-;remainder;PSR;24|) (QREFELT $ 66)) - |PSETCAT-;remainder;PSR;25|) + |PSETCAT-;remainder;PSR;24|) (LETT |b| (SPADCALL (SPADCALL @@ -1075,14 +1070,14 @@ Note that this code is not included in the generated catdef.spad file. (SPADCALL |a| (QREFELT $ 41)) (QREFELT $ 68)) (QREFELT $ 79)) - |PSETCAT-;remainder;PSR;25|) + |PSETCAT-;remainder;PSR;24|) (EXIT (LETT |c| |g| - |PSETCAT-;remainder;PSR;25|))) + |PSETCAT-;remainder;PSR;24|))) NIL (GO G190) G191 (EXIT NIL)) (EXIT (VECTOR |c| |b| |r|)))))))))) -(DEFUN |PSETCAT-;rewriteIdealWithHeadRemainder;LSL;26| (|ps| |cs| $) +(DEFUN |PSETCAT-;rewriteIdealWithHeadRemainder;LSL;25| (|ps| |cs| $) (PROG (|p| |rs|) (RETURN (SEQ (COND @@ -1091,14 +1086,14 @@ Note that this code is not included in the generated catdef.spad file. (LIST (|spadConstant| $ 84))) ('T (SEQ (LETT |ps| (SPADCALL (ELT $ 43) |ps| (QREFELT $ 26)) - |PSETCAT-;rewriteIdealWithHeadRemainder;LSL;26|) + |PSETCAT-;rewriteIdealWithHeadRemainder;LSL;25|) (EXIT (COND ((NULL |ps|) |ps|) ((SPADCALL (ELT $ 24) |ps| (QREFELT $ 44)) (LIST (|spadConstant| $ 75))) ('T (SEQ (LETT |rs| NIL - |PSETCAT-;rewriteIdealWithHeadRemainder;LSL;26|) + |PSETCAT-;rewriteIdealWithHeadRemainder;LSL;25|) (SEQ G190 (COND ((NULL @@ -1107,14 +1102,14 @@ Note that this code is not included in the generated catdef.spad file. (GO G191))) (SEQ (LETT |p| (|SPADfirst| |ps|) - |PSETCAT-;rewriteIdealWithHeadRemainder;LSL;26|) + |PSETCAT-;rewriteIdealWithHeadRemainder;LSL;25|) (LETT |ps| (CDR |ps|) - |PSETCAT-;rewriteIdealWithHeadRemainder;LSL;26|) + |PSETCAT-;rewriteIdealWithHeadRemainder;LSL;25|) (LETT |p| (QCAR (SPADCALL |p| |cs| (QREFELT $ 78))) - |PSETCAT-;rewriteIdealWithHeadRemainder;LSL;26|) + |PSETCAT-;rewriteIdealWithHeadRemainder;LSL;25|) (EXIT (COND ((NULL @@ -1125,12 +1120,12 @@ Note that this code is not included in the generated catdef.spad file. (QREFELT $ 24)) (SEQ (LETT |ps| NIL - |PSETCAT-;rewriteIdealWithHeadRemainder;LSL;26|) + |PSETCAT-;rewriteIdealWithHeadRemainder;LSL;25|) (EXIT (LETT |rs| (LIST (|spadConstant| $ 75)) - |PSETCAT-;rewriteIdealWithHeadRemainder;LSL;26|)))) + |PSETCAT-;rewriteIdealWithHeadRemainder;LSL;25|)))) ('T (SEQ (SPADCALL |p| @@ -1138,11 +1133,11 @@ Note that this code is not included in the generated catdef.spad file. (EXIT (LETT |rs| (CONS |p| |rs|) - |PSETCAT-;rewriteIdealWithHeadRemainder;LSL;26|))))))))) + |PSETCAT-;rewriteIdealWithHeadRemainder;LSL;25|))))))))) NIL (GO G190) G191 (EXIT NIL)) (EXIT (SPADCALL |rs| (QREFELT $ 86)))))))))))))) -(DEFUN |PSETCAT-;rewriteIdealWithRemainder;LSL;27| (|ps| |cs| $) +(DEFUN |PSETCAT-;rewriteIdealWithRemainder;LSL;26| (|ps| |cs| $) (PROG (|p| |rs|) (RETURN (SEQ (COND @@ -1151,14 +1146,14 @@ Note that this code is not included in the generated catdef.spad file. (LIST (|spadConstant| $ 84))) ('T (SEQ (LETT |ps| (SPADCALL (ELT $ 43) |ps| (QREFELT $ 26)) - |PSETCAT-;rewriteIdealWithRemainder;LSL;27|) + |PSETCAT-;rewriteIdealWithRemainder;LSL;26|) (EXIT (COND ((NULL |ps|) |ps|) ((SPADCALL (ELT $ 24) |ps| (QREFELT $ 44)) (LIST (|spadConstant| $ 75))) ('T (SEQ (LETT |rs| NIL - |PSETCAT-;rewriteIdealWithRemainder;LSL;27|) + |PSETCAT-;rewriteIdealWithRemainder;LSL;26|) (SEQ G190 (COND ((NULL @@ -1167,15 +1162,15 @@ Note that this code is not included in the generated catdef.spad file. (GO G191))) (SEQ (LETT |p| (|SPADfirst| |ps|) - |PSETCAT-;rewriteIdealWithRemainder;LSL;27|) + |PSETCAT-;rewriteIdealWithRemainder;LSL;26|) (LETT |ps| (CDR |ps|) - |PSETCAT-;rewriteIdealWithRemainder;LSL;27|) + |PSETCAT-;rewriteIdealWithRemainder;LSL;26|) (LETT |p| (QVELT (SPADCALL |p| |cs| (QREFELT $ 88)) 1) - |PSETCAT-;rewriteIdealWithRemainder;LSL;27|) + |PSETCAT-;rewriteIdealWithRemainder;LSL;26|) (EXIT (COND ((NULL @@ -1186,19 +1181,19 @@ Note that this code is not included in the generated catdef.spad file. (QREFELT $ 24)) (SEQ (LETT |ps| NIL - |PSETCAT-;rewriteIdealWithRemainder;LSL;27|) + |PSETCAT-;rewriteIdealWithRemainder;LSL;26|) (EXIT (LETT |rs| (LIST (|spadConstant| $ 75)) - |PSETCAT-;rewriteIdealWithRemainder;LSL;27|)))) + |PSETCAT-;rewriteIdealWithRemainder;LSL;26|)))) ('T (LETT |rs| (CONS (SPADCALL |p| (QREFELT $ 89)) |rs|) - |PSETCAT-;rewriteIdealWithRemainder;LSL;27|))))))) + |PSETCAT-;rewriteIdealWithRemainder;LSL;26|))))))) NIL (GO G190) G191 (EXIT NIL)) (EXIT (SPADCALL |rs| (QREFELT $ 86)))))))))))))) @@ -1252,19 +1247,19 @@ Note that this code is not included in the generated catdef.spad file. (PROGN (QSETREFV $ 73 (CONS (|dispatchFunction| - |PSETCAT-;headRemainder;PSR;23|) + |PSETCAT-;headRemainder;PSR;22|) $)) (QSETREFV $ 81 (CONS (|dispatchFunction| - |PSETCAT-;remainder;PSR;25|) + |PSETCAT-;remainder;PSR;24|) $)) (QSETREFV $ 87 (CONS (|dispatchFunction| - |PSETCAT-;rewriteIdealWithHeadRemainder;LSL;26|) + |PSETCAT-;rewriteIdealWithHeadRemainder;LSL;25|) $)) (QSETREFV $ 90 (CONS (|dispatchFunction| - |PSETCAT-;rewriteIdealWithRemainder;LSL;27|) + |PSETCAT-;rewriteIdealWithRemainder;LSL;26|) $))))))) $)))) |