aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xconfigure18
-rw-r--r--configure.ac2
-rw-r--r--configure.ac.pamphlet2
-rw-r--r--src/ChangeLog7
-rw-r--r--src/algebra/Makefile.in7
-rw-r--r--src/algebra/Makefile.pamphlet7
-rw-r--r--src/algebra/term.spad.pamphlet2
-rw-r--r--src/algebra/tree.spad.pamphlet2
-rw-r--r--src/interp/c-util.boot3
9 files changed, 31 insertions, 19 deletions
diff --git a/configure b/configure
index b8622452..055ff8e4 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.63 for OpenAxiom 1.4.0-2010-04-30.
+# Generated by GNU Autoconf 2.63 for OpenAxiom 1.4.0-2010-05-01.
#
# 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-04-30'
-PACKAGE_STRING='OpenAxiom 1.4.0-2010-04-30'
+PACKAGE_VERSION='1.4.0-2010-05-01'
+PACKAGE_STRING='OpenAxiom 1.4.0-2010-05-01'
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-04-30 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.4.0-2010-05-01 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-04-30:";;
+ short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2010-05-01:";;
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-04-30
+OpenAxiom configure 1.4.0-2010-05-01
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-04-30, which was
+It was created by OpenAxiom $as_me 1.4.0-2010-05-01, 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-04-30, which was
+This file was extended by OpenAxiom $as_me 1.4.0-2010-05-01, 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-04-30
+OpenAxiom config.status 1.4.0-2010-05-01
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 061cc629..d1faac8f 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-04-30],
+AC_INIT([OpenAxiom], [1.4.0-2010-05-01],
[open-axiom-bugs@lists.sf.net])
AC_CONFIG_AUX_DIR(config)
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index 255d5962..78095170 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-04-30],
+AC_INIT([OpenAxiom], [1.4.0-2010-05-01],
[open-axiom-bugs@lists.sf.net])
@
diff --git a/src/ChangeLog b/src/ChangeLog
index 43643d8e..d12de4d5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-02 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * interp/compiler.boot (isSubset): Expand domain representation form.
+ * algebra/term.spad.pamphlet (retractIfCan$Arity): Tidy.
+ * algebra/tree.spad.pamphlet (cyclicCopy2$Tree): Remove
+ unnecessary "return".
+
2010-04-30 Gabriel Dos Reis <gdr@cs.tamu.edu>
* interp/c-util.boot (getSuccessEnvironment): Move to here from
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index 0991f83a..37f31c73 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -426,7 +426,8 @@ axiom_algebra_layer_1 = \
ORDRING ORDRING- FEVALAB FEVALAB- \
OSGROUP MAYBE DATAARY PROPLOG HOMOTOP BYTEORD \
FIELD FIELD- VECTCAT VECTCAT- IARRAY1 BOOLE \
- PROPERTY ARITY OPERCAT OPERCAT-
+ PROPERTY ARITY OPERCAT OPERCAT- PAIR \
+ RADCAT RADCAT-
axiom_algebra_layer_1_nrlibs = \
$(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_1))
@@ -476,7 +477,7 @@ axiom_algebra_layer_4 = \
PALETTE PARPCURV PARPC2 PARSCURV PARSC2 PARSURF \
PARSU2 PATRES2 PATTERN1 PDECAT \
REPSQ REPDB RFDIST RIDIST SPACEC SPLNODE \
- SUCH TEX1 UDVO YSTREAM PAIR ENV \
+ SUCH TEX1 UDVO YSTREAM ENV \
ATRIG ATRIG- GROUP GROUP- LALG LALG-
@@ -560,7 +561,7 @@ axiom_algebra_layer_9 = \
FAGROUP FAMONOID FLINEXP FLINEXP- FRETRCT FRETRCT- \
FSERIES FT IDPAG IDPOAMS INFINITY LA \
OMLO ORTHPOL PRODUCT PADICCT PMPRED PMASS \
- PTFUNC2 RADCAT RADCAT- RATRET RADUTIL UPXS2 \
+ PTFUNC2 RATRET RADUTIL UPXS2 \
XFALG ZLINDEP BBTREE TABLE INTABL \
ODEIFTBL NIPROB ODEPROB OPTPROB \
PDEPROB COLOR SIG FMONCAT
diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet
index 4377820b..ec2c0682 100644
--- a/src/algebra/Makefile.pamphlet
+++ b/src/algebra/Makefile.pamphlet
@@ -385,7 +385,8 @@ axiom_algebra_layer_1 = \
ORDRING ORDRING- FEVALAB FEVALAB- \
OSGROUP MAYBE DATAARY PROPLOG HOMOTOP BYTEORD \
FIELD FIELD- VECTCAT VECTCAT- IARRAY1 BOOLE \
- PROPERTY ARITY OPERCAT OPERCAT-
+ PROPERTY ARITY OPERCAT OPERCAT- PAIR \
+ RADCAT RADCAT-
axiom_algebra_layer_1_nrlibs = \
$(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_1))
@@ -450,7 +451,7 @@ axiom_algebra_layer_4 = \
PALETTE PARPCURV PARPC2 PARSCURV PARSC2 PARSURF \
PARSU2 PATRES2 PATTERN1 PDECAT \
REPSQ REPDB RFDIST RIDIST SPACEC SPLNODE \
- SUCH TEX1 UDVO YSTREAM PAIR ENV \
+ SUCH TEX1 UDVO YSTREAM ENV \
ATRIG ATRIG- GROUP GROUP- LALG LALG-
@@ -562,7 +563,7 @@ axiom_algebra_layer_9 = \
FAGROUP FAMONOID FLINEXP FLINEXP- FRETRCT FRETRCT- \
FSERIES FT IDPAG IDPOAMS INFINITY LA \
OMLO ORTHPOL PRODUCT PADICCT PMPRED PMASS \
- PTFUNC2 RADCAT RADCAT- RATRET RADUTIL UPXS2 \
+ PTFUNC2 RATRET RADUTIL UPXS2 \
XFALG ZLINDEP BBTREE TABLE INTABL \
ODEIFTBL NIPROB ODEPROB OPTPROB \
PDEPROB COLOR SIG FMONCAT
diff --git a/src/algebra/term.spad.pamphlet b/src/algebra/term.spad.pamphlet
index 259b290e..c3c3b321 100644
--- a/src/algebra/term.spad.pamphlet
+++ b/src/algebra/term.spad.pamphlet
@@ -53,7 +53,7 @@ Arity(): Public == Private where
per(n::SingleInteger)
retractIfCan x ==
(n := rep x) < 0 => "failed"
- n::Integer::NonNegativeInteger
+ n@Integer::NonNegativeInteger
@
diff --git a/src/algebra/tree.spad.pamphlet b/src/algebra/tree.spad.pamphlet
index 09d7089b..dc2b9e48 100644
--- a/src/algebra/tree.spad.pamphlet
+++ b/src/algebra/tree.spad.pamphlet
@@ -230,7 +230,7 @@ Tree(S: SetCategory): T==C where
cyclicCopy(t) == cyclicCopy2(t, cyclicEntries t)
cyclicCopy2(t, cycles) ==
- eqMember?(t, cycles) => return copyCycle2(t, cycles)
+ eqMember?(t, cycles) => copyCycle2(t, cycles)
tree(value t, [cyclicCopy2(c, cycles) for c in children t])
copyCycle2(cycle, cycleList) ==
diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot
index aeb37a22..e82cfc23 100644
--- a/src/interp/c-util.boot
+++ b/src/interp/c-util.boot
@@ -603,6 +603,9 @@ isSubset(x,y,e) ==
-- When using the old style definition, the current domain
-- is considered a subset of its representation domain
x = "$" and y = "Rep" => $useRepresentationHack
+ -- Expand domain representation form
+ x = "Rep" and not $useRepresentationHack =>
+ isSubset(getRepresentation e,y,e)
-- Or, if x has the Subsets property set by SubsetCategory.
pred := LASSOC(opOf x,get(opOf y,"Subsets",e)) => pred
-- Or, they are related by subdomain chain.
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 03:34:10 +0000