* algebra/strap/ULSCAT.lsp: Remove.

7 files changed, 19 insertions, 130 deletions

diff --git a/configure b/configure
index 005eeb1b..e79f8788 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.60 for OpenAxiom 1.3.0-2009-04-23.
+# Generated by GNU Autoconf 2.60 for OpenAxiom 1.3.0-2009-04-24.
 #
 # 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-2009-04-23'
-PACKAGE_STRING='OpenAxiom 1.3.0-2009-04-23'
+PACKAGE_VERSION='1.3.0-2009-04-24'
+PACKAGE_STRING='OpenAxiom 1.3.0-2009-04-24'
 PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
 
 ac_unique_file="src/Makefile.pamphlet"
@@ -1406,7 +1406,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-04-23 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.3.0-2009-04-24 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1476,7 +1476,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2009-04-23:";;
+     short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2009-04-24:";;
    esac
   cat <<\_ACEOF
 
@@ -1580,7 +1580,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenAxiom configure 1.3.0-2009-04-23
+OpenAxiom configure 1.3.0-2009-04-24
 generated by GNU Autoconf 2.60
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1594,7 +1594,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-04-23, which was
+It was created by OpenAxiom $as_me 1.3.0-2009-04-24, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   $ $0 $@
@@ -26808,7 +26808,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-04-23, which was
+This file was extended by OpenAxiom $as_me 1.3.0-2009-04-24, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -26857,7 +26857,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-OpenAxiom config.status 1.3.0-2009-04-23
+OpenAxiom config.status 1.3.0-2009-04-24
 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 94ea1ed4..7b1972c3 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-04-23], 
+AC_INIT([OpenAxiom], [1.3.0-2009-04-24], 
         [open-axiom-bugs@lists.sf.net])
 
 AC_CONFIG_AUX_DIR(config)
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index 234706ab..ba27a1cb 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-04-23], 
+AC_INIT([OpenAxiom], [1.3.0-2009-04-24], 
         [open-axiom-bugs@lists.sf.net])
 
 @
diff --git a/src/ChangeLog b/src/ChangeLog
index 7e14fdf7..983ebcb7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2009-04-24  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
+	* algebra/strap/ULSCAT.lsp: Remove.
+
+2009-04-24  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
 	* algebra/strap/UPOLYC.lsp: Remove.
 	* algebra/strap/UPOLYC-.lsp: Likewise.
 
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index 0443731e..59b98af8 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -202,7 +202,7 @@ axiom_algebra_bootstrap = \
   RNG      RNS      RNS-     SETAGG   \
   SETAGG-                    SINT     \
   STAGG    STAGG-   SYMBOL            \
-           UFD      UFD-     ULSCAT   \
+           UFD      UFD-              \
                     URAGG    URAGG-   \
   VECTOR
 
@@ -220,7 +220,6 @@ axiom_algebra_bootstrap_last_layer = \
            RNS      RNS-              \
                              SINT     \
                     SYMBOL            \
-                             ULSCAT   \
   VECTOR
 
 
@@ -583,7 +582,7 @@ axiom_algebra_layer_11_objects = \
 	$(addprefix $(OUT)/, \
 	   $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_11)))
 axiom_algebra_layer_12 = \
-                                   BITS     DIRPROD2 IMATRIX \
+  ULSCAT                           BITS     DIRPROD2 IMATRIX \
   IVECTOR  LPOLY   LSMP    LSMP1   MATCAT2  PTCAT    TRIMAT  \
                    SYSTEM  HOSTNAME PORTNUM
 
diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet
index 289e88bf..ee0867c5 100644
--- a/src/algebra/Makefile.pamphlet
+++ b/src/algebra/Makefile.pamphlet
@@ -151,7 +151,7 @@ axiom_algebra_bootstrap = \
   RNG      RNS      RNS-     SETAGG   \
   SETAGG-                    SINT     \
   STAGG    STAGG-   SYMBOL            \
-           UFD      UFD-     ULSCAT   \
+           UFD      UFD-              \
                     URAGG    URAGG-   \
   VECTOR
 
@@ -169,7 +169,6 @@ axiom_algebra_bootstrap_last_layer = \
            RNS      RNS-              \
                              SINT     \
                     SYMBOL            \
-                             ULSCAT   \
   VECTOR
 
 
@@ -600,7 +599,7 @@ axiom_algebra_layer_11_objects = \
 
 <<layer12>>=
 axiom_algebra_layer_12 = \
-                                   BITS     DIRPROD2 IMATRIX \
+  ULSCAT                           BITS     DIRPROD2 IMATRIX \
   IVECTOR  LPOLY   LSMP    LSMP1   MATCAT2  PTCAT    TRIMAT  \
                    SYSTEM  HOSTNAME PORTNUM
 
diff --git a/src/algebra/strap/ULSCAT.lsp b/src/algebra/strap/ULSCAT.lsp
deleted file mode 100644
index d82c1a35..00000000
--- a/src/algebra/strap/ULSCAT.lsp
+++ /dev/null
@@ -1,113 +0,0 @@
-
-(/VERSIONCHECK 2) 
-
-(DEFPARAMETER |UnivariateLaurentSeriesCategory;CAT| 'NIL) 
-
-(DEFPARAMETER |UnivariateLaurentSeriesCategory;AL| 'NIL) 
-
-(DEFUN |UnivariateLaurentSeriesCategory;| (|t#1|)
-  (PROG (#0=#:G1400)
-    (RETURN
-      (PROG1 (LETT #0#
-                   (|sublisV|
-                       (PAIR '(|t#1|) (LIST (|devaluate| |t#1|)))
-                       (|sublisV|
-                           (PAIR '(#1=#:G1399) (LIST '(|Integer|)))
-                           (COND
-                             (|UnivariateLaurentSeriesCategory;CAT|)
-                             ('T
-                              (LETT |UnivariateLaurentSeriesCategory;CAT|
-                                    (|Join|
-                                     (|UnivariatePowerSeriesCategory|
-                                      '|t#1| '#1#)
-                                     (|mkCategory| '|domain|
-                                      '(((|series|
-                                          ($
-                                           (|Stream|
-                                            (|Record|
-                                             (|:| |k| (|Integer|))
-                                             (|:| |c| |t#1|)))))
-                                         T)
-                                        ((|multiplyCoefficients|
-                                          ($
-                                           (|Mapping| |t#1|
-                                            (|Integer|))
-                                           $))
-                                         T)
-                                        ((|rationalFunction|
-                                          ((|Fraction|
-                                            (|Polynomial| |t#1|))
-                                           $ (|Integer|)))
-                                         (|has| |t#1|
-                                          (|IntegralDomain|)))
-                                        ((|rationalFunction|
-                                          ((|Fraction|
-                                            (|Polynomial| |t#1|))
-                                           $ (|Integer|) (|Integer|)))
-                                         (|has| |t#1|
-                                          (|IntegralDomain|)))
-                                        ((|integrate| ($ $))
-                                         (|has| |t#1|
-                                          (|Algebra|
-                                           (|Fraction| (|Integer|)))))
-                                        ((|integrate| ($ $ (|Symbol|)))
-                                         (AND
-                                          (|has| |t#1|
-                                           (SIGNATURE |variables|
-                                            ((|List| (|Symbol|)) |t#1|)))
-                                          (|has| |t#1|
-                                           (SIGNATURE |integrate|
-                                            (|t#1| |t#1| (|Symbol|))))
-                                          (|has| |t#1|
-                                           (|Algebra|
-                                            (|Fraction| (|Integer|))))))
-                                        ((|integrate| ($ $ (|Symbol|)))
-                                         (AND
-                                          (|has| |t#1|
-                                           (|AlgebraicallyClosedFunctionSpace|
-                                            (|Integer|)))
-                                          (|has| |t#1|
-                                           (|PrimitiveFunctionCategory|))
-                                          (|has| |t#1|
-                                           (|TranscendentalFunctionCategory|))
-                                          (|has| |t#1|
-                                           (|Algebra|
-                                            (|Fraction| (|Integer|)))))))
-                                      '(((|RadicalCategory|)
-                                         (|has| |t#1|
-                                          (|Algebra|
-                                           (|Fraction| (|Integer|)))))
-                                        ((|TranscendentalFunctionCategory|)
-                                         (|has| |t#1|
-                                          (|Algebra|
-                                           (|Fraction| (|Integer|)))))
-                                        ((|Field|)
-                                         (|has| |t#1| (|Field|))))
-                                      '((|Symbol|)
-                                        (|Fraction|
-                                         (|Polynomial| |t#1|))
-                                        (|Integer|)
-                                        (|Stream|
-                                         (|Record|
-                                          (|:| |k| (|Integer|))
-                                          (|:| |c| |t#1|))))
-                                      NIL))
-                                    . #2=(|UnivariateLaurentSeriesCategory|)))))) . #2#)
-        (|setShellEntry| #0# 0
-            (LIST '|UnivariateLaurentSeriesCategory|
-                  (|devaluate| |t#1|))))))) 
-
-(DEFUN |UnivariateLaurentSeriesCategory| (#0=#:G1401)
-  (LET (#1=#:G1402)
-    (COND
-      ((SETQ #1#
-             (|assoc| (|devaluate| #0#)
-                      |UnivariateLaurentSeriesCategory;AL|))
-       (CDR #1#))
-      (T (SETQ |UnivariateLaurentSeriesCategory;AL|
-               (|cons5| (CONS (|devaluate| #0#)
-                              (SETQ #1#
-                                    (|UnivariateLaurentSeriesCategory;|
-                                     #0#)))
-                        |UnivariateLaurentSeriesCategory;AL|))
-         #1#))))