* algebra/mkfunc.spad.pamphlet (InputForm): Remove assignment to Rep.

	(convert): Use per and rep operators.
	* algebra/stap: Updated cached Lisp translation.

20 files changed, 123 insertions, 118 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 172ef0e5..57e610a1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2009-04-18  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
+	* algebra/mkfunc.spad.pamphlet (InputForm): Remove assignment to Rep.
+	(convert): Use per and rep operators.
+	* algebra/stap: Updated cached Lisp translation.
+
+2009-04-18  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
 	Fix SF/2757715
 	* Makefile.pamphlet (all-input): Make all-doc a requirement.
 	(all-doc): Tidy.
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index d50d9098..cbdd5c0d 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -1132,7 +1132,7 @@ user-stamp: $(axiom_algebra_layer_user_objects)
 all-algstrap: $(addsuffix .NRLIB/code.lsp,$(axiom_algebra_bootstrap))
 	for a in $(axiom_algebra_bootstrap); do \
 	  old=$(srcdir)/strap/$$a.lsp; new=$$a.NRLIB/code.lsp; \
-	  if cmp -s $$new $$old; then cp -p $$new $$old || exit 1; fi; \
+	  cmp -s $$new $$old || cp -p $$new $$old || exit 1; \
 	done
 
 mostlyclean-local:
diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet
index 42aa4dd1..d09db854 100644
--- a/src/algebra/Makefile.pamphlet
+++ b/src/algebra/Makefile.pamphlet
@@ -2221,7 +2221,7 @@ check:
 all-algstrap: $(addsuffix .NRLIB/code.lsp,$(axiom_algebra_bootstrap))
 	for a in $(axiom_algebra_bootstrap); do \
 	  old=$(srcdir)/strap/$$a.lsp; new=$$a.NRLIB/code.lsp; \
-	  if cmp -s $$new $$old; then cp -p $$new $$old || exit 1; fi; \
+	  cmp -s $$new $$old || cp -p $$new $$old || exit 1; \
 	done
 
 mostlyclean-local:
diff --git a/src/algebra/mkfunc.spad.pamphlet b/src/algebra/mkfunc.spad.pamphlet
index 8f7131c9..3bb17da5 100644
--- a/src/algebra/mkfunc.spad.pamphlet
+++ b/src/algebra/mkfunc.spad.pamphlet
@@ -84,7 +84,6 @@ InputForm():
       ++ Error: if f was not defined beforehand in the interpreter,
       ++ or if the ti's are not valid types, or if the compiler fails.
  == SExpression add
-    Rep := SExpression
 
     strsym    : % -> String
     tuplify   : List Symbol -> %
@@ -93,11 +92,11 @@ InputForm():
 
     0                        == convert(0::Integer)
     1                        == convert(1::Integer)
-    convert(x:%):SExpression == x pretend SExpression
-    convert(x:SExpression):% == x
+    convert(x:%):SExpression == rep x
+    convert(x:SExpression):% == per x
 
     conv(ll : List %): % ==
-      convert(ll pretend List SExpression)$SExpression pretend %
+      per convert(ll pretend List SExpression)$SExpression
 
     lambda(f,l) == conv([convert("+->"::Symbol),tuplify l,f]$List(%))
 
@@ -108,7 +107,7 @@ InputForm():
     convert(x:DoubleFloat):% ==
       zero? x => 0
       one? x => 1
-      convert(x)$Rep
+      convert(x)
 
     flatten s ==
       -- will not compile if I use 'or'
diff --git a/src/algebra/strap/ES-.lsp b/src/algebra/strap/ES-.lsp
index e7eed238..586de74f 100644
--- a/src/algebra/strap/ES-.lsp
+++ b/src/algebra/strap/ES-.lsp
@@ -572,7 +572,7 @@
 
 (DEFUN |ES-;kernel;BoLS;31| (|op| |args| $)
   (COND
-    ((NULL (SPADCALL |op| (|getShellEntry| $ 108)))
+    ((NOT (SPADCALL |op| (|getShellEntry| $ 108)))
      (|error| "Unknown operator"))
     ('T (|ES-;okkernel| |op| |args| $)))) 
 
@@ -611,7 +611,7 @@
   (PROG (|u| #0=#:G1522 |v|)
     (RETURN
       (SEQ (EXIT (COND
-                   ((NULL (SPADCALL |op| (|getShellEntry| $ 108)))
+                   ((NOT (SPADCALL |op| (|getShellEntry| $ 108)))
                     (|error| "Unknown operator"))
                    ('T
                     (SEQ (SEQ (LETT |u|
@@ -780,8 +780,8 @@
                      (EXIT (COND
                              ((QEQCAR |k| 1)
                               (|error| "left hand side must be a single kernel"))
-                             ((NULL (SPADCALL (QCDR |k|) |lk|
-                                     (|getShellEntry| $ 59)))
+                             ((NOT (SPADCALL (QCDR |k|) |lk|
+                                    (|getShellEntry| $ 59)))
                               (SEQ (LETT |lk| (CONS (QCDR |k|) |lk|)
                                     |ES-;mkKerLists|)
                                    (EXIT
diff --git a/src/algebra/strap/EUCDOM-.lsp b/src/algebra/strap/EUCDOM-.lsp
index 1f2691f3..7972f055 100644
--- a/src/algebra/strap/EUCDOM-.lsp
+++ b/src/algebra/strap/EUCDOM-.lsp
@@ -165,11 +165,11 @@
                                      |EUCDOM-;extendedEuclidean;2SR;7|)))
                               NIL (GO G190) G191 (EXIT NIL))
                          (COND
-                           ((NULL (SPADCALL (QVELT |s1| 0)
-                                      (|getShellEntry| $ 8)))
+                           ((NOT (SPADCALL (QVELT |s1| 0)
+                                     (|getShellEntry| $ 8)))
                             (COND
-                              ((NULL (SPADCALL (QVELT |s1| 0) |y|
-                                      (|getShellEntry| $ 31)))
+                              ((NOT (SPADCALL (QVELT |s1| 0) |y|
+                                     (|getShellEntry| $ 31)))
                                (SEQ (LETT |qr|
                                      (SPADCALL (QVELT |s1| 0) |y|
                                       (|getShellEntry| $ 16))
diff --git a/src/algebra/strap/FFIELDC-.lsp b/src/algebra/strap/FFIELDC-.lsp
index 6742951f..826615e8 100644
--- a/src/algebra/strap/FFIELDC-.lsp
+++ b/src/algebra/strap/FFIELDC-.lsp
@@ -390,13 +390,13 @@
                     (CONS 0 1))
                    ('T
                     (COND
-                      ((NULL (ZEROP (REMAINDER2
-                                     (LETT |groupord|
-                                      (SPADCALL |logbase|
-                                       (|getShellEntry| $ 19))
-                                      |FFIELDC-;discreteLog;2SU;12|)
-                                     (SPADCALL |b|
-                                      (|getShellEntry| $ 19)))))
+                      ((NOT (ZEROP (REMAINDER2
+                                    (LETT |groupord|
+                                     (SPADCALL |logbase|
+                                      (|getShellEntry| $ 19))
+                                     |FFIELDC-;discreteLog;2SU;12|)
+                                    (SPADCALL |b|
+                                     (|getShellEntry| $ 19)))))
                        (SEQ (SPADCALL
                                 "discreteLog: second argument not in cyclic group generated by first argument"
                                 (|getShellEntry| $ 85))
diff --git a/src/algebra/strap/ILIST.lsp b/src/algebra/strap/ILIST.lsp
index 2a1dfcbc..dd576d32 100644
--- a/src/algebra/strap/ILIST.lsp
+++ b/src/algebra/strap/ILIST.lsp
@@ -302,7 +302,7 @@
                            |ILIST;latex;$S;23|)
                      (LETT |x| (QCDR |x|) |ILIST;latex;$S;23|)
                      (EXIT (COND
-                             ((NULL (NULL |x|))
+                             ((NOT (NULL |x|))
                               (LETT |s| (STRCONC |s| ", ")
                                     |ILIST;latex;$S;23|)))))
                 NIL (GO G190) G191 (EXIT NIL))
diff --git a/src/algebra/strap/INS-.lsp b/src/algebra/strap/INS-.lsp
index da1d5f67..2ac58e9a 100644
--- a/src/algebra/strap/INS-.lsp
+++ b/src/algebra/strap/INS-.lsp
@@ -226,12 +226,12 @@
                                      (SPADCALL |r| |n|
                                       (|getShellEntry| $ 65)))
                                     ('T |r|)))
-                                 ((NULL (SPADCALL (|spadConstant| $ 10)
-                                         (SPADCALL
-                                          (SPADCALL 2 |r|
-                                           (|getShellEntry| $ 80))
-                                          |n| (|getShellEntry| $ 81))
-                                         (|getShellEntry| $ 15)))
+                                 ((NOT (SPADCALL (|spadConstant| $ 10)
+                                        (SPADCALL
+                                         (SPADCALL 2 |r|
+                                          (|getShellEntry| $ 80))
+                                         |n| (|getShellEntry| $ 81))
+                                        (|getShellEntry| $ 15)))
                                   (SPADCALL |r| |n|
                                       (|getShellEntry| $ 81)))
                                  ('T |r|))))))))))) 
@@ -272,7 +272,7 @@
                      (EXIT (LETT |d1| |r1| |INS-;invmod;3S;28|)))
                 NIL (GO G190) G191 (EXIT NIL))
            (COND
-             ((NULL (SPADCALL |c| (|getShellEntry| $ 87)))
+             ((NOT (SPADCALL |c| (|getShellEntry| $ 87)))
               (EXIT (|error| "inverse does not exist"))))
            (EXIT (COND
                    ((SPADCALL |c1| (|getShellEntry| $ 83))
diff --git a/src/algebra/strap/INT.lsp b/src/algebra/strap/INT.lsp
index c7ad0701..4bb78bc9 100644
--- a/src/algebra/strap/INT.lsp
+++ b/src/algebra/strap/INT.lsp
@@ -337,7 +337,7 @@
     (RETURN
       (SEQ (EXIT (SEQ (SEQ (LETT |c| (+ |a| |b|) |INT;addmod;4$;20|)
                            (EXIT (COND
-                                   ((NULL (< |c| |p|))
+                                   ((NOT (< |c| |p|))
                                     (PROGN
                                       (LETT #0# (- |c| |p|)
                                        |INT;addmod;4$;20|)
diff --git a/src/algebra/strap/ISTRING.lsp b/src/algebra/strap/ISTRING.lsp
index 33d4cd6d..dc7ed95f 100644
--- a/src/algebra/strap/ISTRING.lsp
+++ b/src/algebra/strap/ISTRING.lsp
@@ -200,7 +200,7 @@
                        (|getShellEntry| $ 6))))
                  |ISTRING;replace;$Us2$;15|)
            (COND
-             ((OR (OR (< |l| 0) (NULL (< |h| |m|))) (< |h| (- |l| 1)))
+             ((OR (OR (< |l| 0) (NOT (< |h| |m|))) (< |h| (- |l| 1)))
               (EXIT (|error| "index out of range"))))
            (LETT |r|
                  (MAKE-FULL-CVEC
@@ -284,7 +284,7 @@
                                        (SEQ
                                         (EXIT
                                          (COND
-                                           ((NULL
+                                           ((NOT
                                              (CHAR= (CHAR |part| |ip|)
                                               (CHAR |whole| |iw|)))
                                             (PROGN
@@ -312,7 +312,7 @@
                  |ISTRING;position;2$2I;18|)
            (EXIT (COND
                    ((< |startpos| 0) (|error| "index out of bounds"))
-                   ((NULL (< |startpos| (QCSIZE |t|)))
+                   ((NOT (< |startpos| (QCSIZE |t|)))
                     (- (|getShellEntry| $ 6) 1))
                    ('T
                     (SEQ (LETT |r| (STRPOS |s| |t| |startpos| NIL)
@@ -331,7 +331,7 @@
                       (EXIT (COND
                               ((< |startpos| 0)
                                (|error| "index out of bounds"))
-                              ((NULL (< |startpos| (QCSIZE |t|)))
+                              ((NOT (< |startpos| (QCSIZE |t|)))
                                (- (|getShellEntry| $ 6) 1))
                               ('T
                                (SEQ (SEQ
@@ -367,7 +367,7 @@
                       (EXIT (COND
                               ((< |startpos| 0)
                                (|error| "index out of bounds"))
-                              ((NULL (< |startpos| (QCSIZE |t|)))
+                              ((NOT (< |startpos| (QCSIZE |t|)))
                                (- (|getShellEntry| $ 6) 1))
                               ('T
                                (SEQ (SEQ
@@ -459,7 +459,7 @@
                                 (GO G190) G191 (EXIT NIL))))
                 NIL (GO G190) G191 (EXIT NIL))
            (COND
-             ((NULL (< |n| |i|))
+             ((NOT (< |n| |i|))
               (LETT |l|
                     (SPADCALL
                         (|ISTRING;elt;$Us$;31| |s|
@@ -521,7 +521,7 @@
                                 (GO G190) G191 (EXIT NIL))))
                 NIL (GO G190) G191 (EXIT NIL))
            (COND
-             ((NULL (< |n| |i|))
+             ((NOT (< |n| |i|))
               (LETT |l|
                     (SPADCALL
                         (|ISTRING;elt;$Us$;31| |s|
@@ -698,7 +698,7 @@
                        (|getShellEntry| $ 6))))
                  |ISTRING;elt;$Us$;31|)
            (COND
-             ((OR (< |l| 0) (NULL (< |h| (QCSIZE |s|))))
+             ((OR (< |l| 0) (NOT (< |h| (QCSIZE |s|))))
               (EXIT (|error| "index out of bound"))))
            (EXIT (SUBSTRING |s| |l| (MAX 0 (+ (- |h| |l|) 1)))))))) 
 
@@ -762,7 +762,7 @@
                                       ((SPADCALL |p| |m|
                                         (|getShellEntry| $ 92))
                                        (COND
-                                         ((NULL
+                                         ((NOT
                                            (SPADCALL
                                             (|ISTRING;elt;$Us$;31|
                                              |pattern|
@@ -846,7 +846,7 @@
                                       ((SPADCALL |p| |n|
                                         (|getShellEntry| $ 92))
                                        (COND
-                                         ((NULL
+                                         ((NOT
                                            (|ISTRING;suffix?;2$B;21|
                                             (|ISTRING;elt;$Us$;31|
                                              |pattern|
diff --git a/src/algebra/strap/LIST.lsp b/src/algebra/strap/LIST.lsp
index f49808e5..d446ced6 100644
--- a/src/algebra/strap/LIST.lsp
+++ b/src/algebra/strap/LIST.lsp
@@ -145,8 +145,8 @@
                            (SPADCALL |l1| 1 (|getShellEntry| $ 41))
                            |LIST;setDifference;3$;12|)
                      (COND
-                       ((NULL (SPADCALL |l11| |l2|
-                                  (|getShellEntry| $ 39)))
+                       ((NOT (SPADCALL |l11| |l2|
+                                 (|getShellEntry| $ 39)))
                         (LETT |lu| (CONS |l11| |lu|)
                               |LIST;setDifference;3$;12|)))
                      (EXIT (LETT |l1| (CDR |l1|)
diff --git a/src/algebra/strap/LSAGG-.lsp b/src/algebra/strap/LSAGG-.lsp
index a1ad4e13..c5006e53 100644
--- a/src/algebra/strap/LSAGG-.lsp
+++ b/src/algebra/strap/LSAGG-.lsp
@@ -524,7 +524,7 @@
                                  (GO G191)))
                               (SEQ (EXIT
                                     (COND
-                                      ((NULL
+                                      ((NOT
                                         (SPADCALL
                                          (SPADCALL |l|
                                           (|getShellEntry| $ 18))
diff --git a/src/algebra/strap/OUTFORM.lsp b/src/algebra/strap/OUTFORM.lsp
index 33f67b44..be37f024 100644
--- a/src/algebra/strap/OUTFORM.lsp
+++ b/src/algebra/strap/OUTFORM.lsp
@@ -517,7 +517,7 @@
 (DEFUN |OUTFORM;rspace;2I$;30| (|n| |m| $)
   (SEQ (COND
          ((< 0 |n|)
-          (COND ((NULL (< 0 |m|)) (EXIT (|OUTFORM;empty;$;73| $)))))
+          (COND ((NOT (< 0 |m|)) (EXIT (|OUTFORM;empty;$;73| $)))))
          ('T (EXIT (|OUTFORM;empty;$;73| $))))
        (EXIT (|OUTFORM;vconcat;3$;50| (|OUTFORM;hspace;I$;29| |n| $)
                  (|OUTFORM;rspace;2I$;30| |n| (- |m| 1) $) $)))) 
@@ -728,7 +728,7 @@
 
 (DEFUN |OUTFORM;prefix;$L$;76| (|a| |l| $)
   (COND
-    ((NULL (|OUTFORM;infix?;$B;74| |a| $)) (CONS |a| |l|))
+    ((NOT (|OUTFORM;infix?;$B;74| |a| $)) (CONS |a| |l|))
     ('T
      (|OUTFORM;hconcat;3$;48| |a|
          (|OUTFORM;paren;2$;40| (|OUTFORM;commaSeparate;L$;33| |l| $)
diff --git a/src/algebra/strap/POLYCAT-.lsp b/src/algebra/strap/POLYCAT-.lsp
index c8d88782..d6fea686 100644
--- a/src/algebra/strap/POLYCAT-.lsp
+++ b/src/algebra/strap/POLYCAT-.lsp
@@ -267,7 +267,7 @@
              ((OR (NULL (LETT |lv|
                               (SPADCALL |p| (|getShellEntry| $ 40))
                               |POLYCAT-;isTimes;SU;4|))
-                  (NULL (SPADCALL |p| (|getShellEntry| $ 42))))
+                  (NOT (SPADCALL |p| (|getShellEntry| $ 42))))
               (CONS 1 "failed"))
              ('T
               (SEQ (LETT |l|
@@ -320,15 +320,15 @@
                  |POLYCAT-;isExpt;SU;5|)
            (EXIT (COND
                    ((OR (QEQCAR |u| 1)
-                        (NULL (SPADCALL |p|
-                                  (SPADCALL (|spadConstant| $ 43)
-                                      (QCDR |u|)
-                                      (LETT |d|
-                                       (SPADCALL |p| (QCDR |u|)
-                                        (|getShellEntry| $ 46))
-                                       |POLYCAT-;isExpt;SU;5|)
-                                      (|getShellEntry| $ 47))
-                                  (|getShellEntry| $ 54))))
+                        (NOT (SPADCALL |p|
+                                 (SPADCALL (|spadConstant| $ 43)
+                                     (QCDR |u|)
+                                     (LETT |d|
+                                      (SPADCALL |p| (QCDR |u|)
+                                       (|getShellEntry| $ 46))
+                                      |POLYCAT-;isExpt;SU;5|)
+                                     (|getShellEntry| $ 47))
+                                 (|getShellEntry| $ 54))))
                     (CONS 1 "failed"))
                    ('T (CONS 0 (CONS (QCDR |u|) |d|))))))))) 
 
diff --git a/src/algebra/strap/PSETCAT-.lsp b/src/algebra/strap/PSETCAT-.lsp
index 0168ae69..d4723490 100644
--- a/src/algebra/strap/PSETCAT-.lsp
+++ b/src/algebra/strap/PSETCAT-.lsp
@@ -214,8 +214,8 @@
                      (LETT |lp| (CDR |lp|)
                            |PSETCAT-;collectUpper;SVarSetS;8|)
                      (EXIT (COND
-                             ((NULL (SPADCALL |p|
-                                     (|getShellEntry| $ 24)))
+                             ((NOT (SPADCALL |p|
+                                    (|getShellEntry| $ 24)))
                               (COND
                                 ((SPADCALL |v|
                                      (SPADCALL |p|
@@ -238,8 +238,8 @@
                      (LETT |lp| (CDR |lp|)
                            |PSETCAT-;collect;SVarSetS;9|)
                      (EXIT (COND
-                             ((NULL (SPADCALL |p|
-                                     (|getShellEntry| $ 24)))
+                             ((NOT (SPADCALL |p|
+                                    (|getShellEntry| $ 24)))
                               (COND
                                 ((SPADCALL
                                      (SPADCALL |p|
@@ -704,7 +704,7 @@
                                         |PSETCAT-;rewriteIdealWithHeadRemainder;LSL;25|)
                                        (EXIT
                                         (COND
-                                          ((NULL
+                                          ((NOT
                                             (SPADCALL |p|
                                              (|getShellEntry| $ 47)))
                                            (COND
@@ -767,7 +767,7 @@
                                         |PSETCAT-;rewriteIdealWithRemainder;LSL;26|)
                                        (EXIT
                                         (COND
-                                          ((NULL
+                                          ((NOT
                                             (SPADCALL |p|
                                              (|getShellEntry| $ 47)))
                                            (COND
diff --git a/src/algebra/strap/STAGG-.lsp b/src/algebra/strap/STAGG-.lsp
index 0048a3c3..cb3671d0 100644
--- a/src/algebra/strap/STAGG-.lsp
+++ b/src/algebra/strap/STAGG-.lsp
@@ -104,7 +104,7 @@
                  |STAGG-;elt;AUsA;6|)
            (EXIT (COND
                    ((< |l| 0) (|error| "index out of range"))
-                   ((NULL (SPADCALL |i| (|getShellEntry| $ 31)))
+                   ((NOT (SPADCALL |i| (|getShellEntry| $ 31)))
                     (SPADCALL
                         (SPADCALL |x|
                             (PROG1 |l|
diff --git a/src/algebra/strap/SYMBOL.lsp b/src/algebra/strap/SYMBOL.lsp
index 933198cc..c216ea58 100644
--- a/src/algebra/strap/SYMBOL.lsp
+++ b/src/algebra/strap/SYMBOL.lsp
@@ -270,23 +270,23 @@
       (SEQ (LETT |sc| (VECTOR NIL NIL NIL NIL NIL)
                  |SYMBOL;script;$L$;22|)
            (COND
-             ((NULL (NULL |ls|))
+             ((NOT (NULL |ls|))
               (SEQ (QSETVELT |sc| 0 (|SPADfirst| |ls|))
                    (EXIT (LETT |ls| (CDR |ls|) |SYMBOL;script;$L$;22|)))))
            (COND
-             ((NULL (NULL |ls|))
+             ((NOT (NULL |ls|))
               (SEQ (QSETVELT |sc| 1 (|SPADfirst| |ls|))
                    (EXIT (LETT |ls| (CDR |ls|) |SYMBOL;script;$L$;22|)))))
            (COND
-             ((NULL (NULL |ls|))
+             ((NOT (NULL |ls|))
               (SEQ (QSETVELT |sc| 2 (|SPADfirst| |ls|))
                    (EXIT (LETT |ls| (CDR |ls|) |SYMBOL;script;$L$;22|)))))
            (COND
-             ((NULL (NULL |ls|))
+             ((NOT (NULL |ls|))
               (SEQ (QSETVELT |sc| 3 (|SPADfirst| |ls|))
                    (EXIT (LETT |ls| (CDR |ls|) |SYMBOL;script;$L$;22|)))))
            (COND
-             ((NULL (NULL |ls|))
+             ((NOT (NULL |ls|))
               (SEQ (QSETVELT |sc| 4 (|SPADfirst| |ls|))
                    (EXIT (LETT |ls| (CDR |ls|) |SYMBOL;script;$L$;22|)))))
            (EXIT (|SYMBOL;script;$R$;23| |sy| |sc| $)))))) 
@@ -307,7 +307,7 @@
 
 (DEFUN |SYMBOL;string;$S;24| (|e| $)
   (COND
-    ((NULL (|SYMBOL;scripted?;$B;30| |e| $)) (PNAME |e|))
+    ((NOT (|SYMBOL;scripted?;$B;30| |e| $)) (PNAME |e|))
     ('T (|error| "Cannot form string from non-atomic symbols.")))) 
 
 (DEFUN |SYMBOL;latex;$S;25| (|e| $)
@@ -323,12 +323,12 @@
                      (|getShellEntry| $ 108))
                  (LETT |s| (STRCONC "\\mbox{\\it " (STRCONC |s| "}"))
                        |SYMBOL;latex;$S;25|)))))
-           (COND ((NULL (|SYMBOL;scripted?;$B;30| |e| $)) (EXIT |s|)))
+           (COND ((NOT (|SYMBOL;scripted?;$B;30| |e| $)) (EXIT |s|)))
            (LETT |ss| (|SYMBOL;scripts;$R;32| |e| $)
                  |SYMBOL;latex;$S;25|)
            (LETT |lo| (QVELT |ss| 0) |SYMBOL;latex;$S;25|)
            (COND
-             ((NULL (NULL |lo|))
+             ((NOT (NULL |lo|))
               (SEQ (LETT |sc| "_{" |SYMBOL;latex;$S;25|)
                    (SEQ G190
                         (COND ((NULL (NOT (NULL |lo|))) (GO G191)))
@@ -340,7 +340,7 @@
                              (LETT |lo| (CDR |lo|)
                                    |SYMBOL;latex;$S;25|)
                              (EXIT (COND
-                                     ((NULL (NULL |lo|))
+                                     ((NOT (NULL |lo|))
                                       (LETT |sc| (STRCONC |sc| ", ")
                                        |SYMBOL;latex;$S;25|)))))
                         NIL (GO G190) G191 (EXIT NIL))
@@ -349,7 +349,7 @@
                                |SYMBOL;latex;$S;25|)))))
            (LETT |lo| (QVELT |ss| 1) |SYMBOL;latex;$S;25|)
            (COND
-             ((NULL (NULL |lo|))
+             ((NOT (NULL |lo|))
               (SEQ (LETT |sc| "^{" |SYMBOL;latex;$S;25|)
                    (SEQ G190
                         (COND ((NULL (NOT (NULL |lo|))) (GO G191)))
@@ -361,7 +361,7 @@
                              (LETT |lo| (CDR |lo|)
                                    |SYMBOL;latex;$S;25|)
                              (EXIT (COND
-                                     ((NULL (NULL |lo|))
+                                     ((NOT (NULL |lo|))
                                       (LETT |sc| (STRCONC |sc| ", ")
                                        |SYMBOL;latex;$S;25|)))))
                         NIL (GO G190) G191 (EXIT NIL))
@@ -370,7 +370,7 @@
                                |SYMBOL;latex;$S;25|)))))
            (LETT |lo| (QVELT |ss| 2) |SYMBOL;latex;$S;25|)
            (COND
-             ((NULL (NULL |lo|))
+             ((NOT (NULL |lo|))
               (SEQ (LETT |sc| "{}^{" |SYMBOL;latex;$S;25|)
                    (SEQ G190
                         (COND ((NULL (NOT (NULL |lo|))) (GO G191)))
@@ -382,7 +382,7 @@
                              (LETT |lo| (CDR |lo|)
                                    |SYMBOL;latex;$S;25|)
                              (EXIT (COND
-                                     ((NULL (NULL |lo|))
+                                     ((NOT (NULL |lo|))
                                       (LETT |sc| (STRCONC |sc| ", ")
                                        |SYMBOL;latex;$S;25|)))))
                         NIL (GO G190) G191 (EXIT NIL))
@@ -391,7 +391,7 @@
                                |SYMBOL;latex;$S;25|)))))
            (LETT |lo| (QVELT |ss| 3) |SYMBOL;latex;$S;25|)
            (COND
-             ((NULL (NULL |lo|))
+             ((NOT (NULL |lo|))
               (SEQ (LETT |sc| "{}_{" |SYMBOL;latex;$S;25|)
                    (SEQ G190
                         (COND ((NULL (NOT (NULL |lo|))) (GO G191)))
@@ -403,7 +403,7 @@
                              (LETT |lo| (CDR |lo|)
                                    |SYMBOL;latex;$S;25|)
                              (EXIT (COND
-                                     ((NULL (NULL |lo|))
+                                     ((NOT (NULL |lo|))
                                       (LETT |sc| (STRCONC |sc| ", ")
                                        |SYMBOL;latex;$S;25|)))))
                         NIL (GO G190) G191 (EXIT NIL))
@@ -412,7 +412,7 @@
                                |SYMBOL;latex;$S;25|)))))
            (LETT |lo| (QVELT |ss| 4) |SYMBOL;latex;$S;25|)
            (COND
-             ((NULL (NULL |lo|))
+             ((NOT (NULL |lo|))
               (SEQ (LETT |sc| "\\left( {" |SYMBOL;latex;$S;25|)
                    (SEQ G190
                         (COND ((NULL (NOT (NULL |lo|))) (GO G191)))
@@ -424,7 +424,7 @@
                              (LETT |lo| (CDR |lo|)
                                    |SYMBOL;latex;$S;25|)
                              (EXIT (COND
-                                     ((NULL (NULL |lo|))
+                                     ((NOT (NULL |lo|))
                                       (LETT |sc| (STRCONC |sc| ", ")
                                        |SYMBOL;latex;$S;25|)))))
                         NIL (GO G190) G191 (EXIT NIL))
@@ -495,7 +495,7 @@
                (|getShellEntry| $ 127))
            (LETT |xx|
                  (COND
-                   ((NULL (|SYMBOL;scripted?;$B;30| |x| $))
+                   ((NOT (|SYMBOL;scripted?;$B;30| |x| $))
                     (|SYMBOL;string;$S;24| |x| $))
                    ('T
                     (|SYMBOL;string;$S;24| (|SYMBOL;name;2$;31| |x| $)
@@ -504,15 +504,15 @@
            (LETT |xx| (STRCONC "%" |xx|) |SYMBOL;new;2$;28|)
            (LETT |xx|
                  (COND
-                   ((NULL (< (SPADCALL
-                                 (SPADCALL |xx|
-                                     (SPADCALL |xx|
-                                      (|getShellEntry| $ 128))
-                                     (|getShellEntry| $ 107))
-                                 (|getShellEntry| $ 19)
-                                 (|getShellEntry| $ 129))
-                             (SPADCALL (|getShellEntry| $ 19)
-                                 (|getShellEntry| $ 117))))
+                   ((NOT (< (SPADCALL
+                                (SPADCALL |xx|
+                                    (SPADCALL |xx|
+                                     (|getShellEntry| $ 128))
+                                    (|getShellEntry| $ 107))
+                                (|getShellEntry| $ 19)
+                                (|getShellEntry| $ 129))
+                            (SPADCALL (|getShellEntry| $ 19)
+                                (|getShellEntry| $ 117))))
                     (STRCONC |xx|
                              (|SYMBOL;anyRadix| |n|
                                  (|getShellEntry| $ 21) $)))
@@ -522,7 +522,7 @@
                                  (|getShellEntry| $ 19) $))))
                  |SYMBOL;new;2$;28|)
            (COND
-             ((NULL (|SYMBOL;scripted?;$B;30| |x| $))
+             ((NOT (|SYMBOL;scripted?;$B;30| |x| $))
               (EXIT (|SYMBOL;coerce;S$;8| |xx| $))))
            (EXIT (|SYMBOL;script;$R$;23| (|SYMBOL;coerce;S$;8| |xx| $)
                      (|SYMBOL;scripts;$R;32| |x| $) $)))))) 
@@ -555,7 +555,7 @@
   (PROG (|str| |i| #0=#:G1553 #1=#:G1533 #2=#:G1531)
     (RETURN
       (SEQ (EXIT (COND
-                   ((NULL (|SYMBOL;scripted?;$B;30| |sy| $)) |sy|)
+                   ((NOT (|SYMBOL;scripted?;$B;30| |sy| $)) |sy|)
                    ('T
                     (SEQ (LETT |str|
                                (|SYMBOL;string;$S;24|
@@ -575,7 +575,7 @@
                                      (SEQ
                                       (EXIT
                                        (COND
-                                         ((NULL
+                                         ((NOT
                                            (SPADCALL
                                             (SPADCALL |str| |i|
                                              (|getShellEntry| $ 107))
@@ -609,7 +609,7 @@
             #1=#:G1554 |i| #2=#:G1555 |a| #3=#:G1556 |allscripts|)
     (RETURN
       (SEQ (COND
-             ((NULL (|SYMBOL;scripted?;$B;30| |sy| $))
+             ((NOT (|SYMBOL;scripted?;$B;30| |sy| $))
               (VECTOR NIL NIL NIL NIL NIL))
              ('T
               (SEQ (LETT |nscripts| (LIST 0 0 0 0 0)
@@ -748,7 +748,7 @@
 
 (DEFUN |SYMBOL;list;$L;34| (|sy| $)
   (COND
-    ((NULL (|SYMBOL;scripted?;$B;30| |sy| $))
+    ((NOT (|SYMBOL;scripted?;$B;30| |sy| $))
      (|error| "Cannot convert a symbol to a list if it is not subscripted"))
     ('T |sy|))) 
 
diff --git a/src/algebra/strap/TSETCAT-.lsp b/src/algebra/strap/TSETCAT-.lsp
index c54146fb..3474e270 100644
--- a/src/algebra/strap/TSETCAT-.lsp
+++ b/src/algebra/strap/TSETCAT-.lsp
@@ -129,22 +129,22 @@
         ((SPADCALL |ts| (|getShellEntry| $ 12))
          (SPADCALL |us| (|getShellEntry| $ 12)))
         ((OR (SPADCALL |us| (|getShellEntry| $ 12))
-             (NULL (SPADCALL
-                       (PROG2 (LETT #0#
-                                    (SPADCALL |ts|
-                                     (|getShellEntry| $ 15))
-                                    |TSETCAT-;=;2SB;1|)
-                              (QCDR #0#)
-                         (|check-union| (QEQCAR #0# 0)
-                             (|getShellEntry| $ 10) #0#))
-                       (PROG2 (LETT #0#
-                                    (SPADCALL |us|
-                                     (|getShellEntry| $ 15))
-                                    |TSETCAT-;=;2SB;1|)
-                              (QCDR #0#)
-                         (|check-union| (QEQCAR #0# 0)
-                             (|getShellEntry| $ 10) #0#))
-                       (|getShellEntry| $ 16))))
+             (NOT (SPADCALL
+                      (PROG2 (LETT #0#
+                                   (SPADCALL |ts|
+                                    (|getShellEntry| $ 15))
+                                   |TSETCAT-;=;2SB;1|)
+                             (QCDR #0#)
+                        (|check-union| (QEQCAR #0# 0)
+                            (|getShellEntry| $ 10) #0#))
+                      (PROG2 (LETT #0#
+                                   (SPADCALL |us|
+                                    (|getShellEntry| $ 15))
+                                   |TSETCAT-;=;2SB;1|)
+                             (QCDR #0#)
+                        (|check-union| (QEQCAR #0# 0)
+                            (|getShellEntry| $ 10) #0#))
+                      (|getShellEntry| $ 16))))
          'NIL)
         ('T
          (SPADCALL
@@ -362,7 +362,7 @@
                               (SEQ (LETT |p| (|SPADfirst| |lp|)
                                     |TSETCAT-;initials;SL;6|)
                                    (COND
-                                     ((NULL
+                                     ((NOT
                                        (SPADCALL
                                         (LETT |ip|
                                          (SPADCALL |p|
@@ -453,7 +453,7 @@
                                       |TSETCAT-;initiallyReduced?;PSB;12|)))
                           NIL (GO G190) G191 (EXIT NIL))
                      (EXIT (COND
-                             ((NULL (NULL |lp|))
+                             ((NOT (NULL |lp|))
                               (COND
                                 ((SPADCALL
                                      (SPADCALL (|SPADfirst| |lp|)
@@ -524,7 +524,7 @@
                                       (|getShellEntry| $ 6) #1#))
                                    |TSETCAT-;reduce;PSMMP;13|)
                              (EXIT (COND
-                                     ((NULL
+                                     ((NOT
                                        (SPADCALL |p| |reductor|
                                         |redOp?|))
                                       (SEQ
@@ -575,7 +575,7 @@
                                         |TSETCAT-;rewriteSetWithReduction;LSMML;14|)
                                        (EXIT
                                         (COND
-                                          ((NULL
+                                          ((NOT
                                             (SPADCALL |p|
                                              (|getShellEntry| $ 36)))
                                            (COND
diff --git a/src/algebra/strap/UPOLYC-.lsp b/src/algebra/strap/UPOLYC-.lsp
index 49994497..c6538499 100644
--- a/src/algebra/strap/UPOLYC-.lsp
+++ b/src/algebra/strap/UPOLYC-.lsp
@@ -195,7 +195,7 @@
 (DEFUN |UPOLYC-;eval;SLLS;5| (|p| |lv| |lq| $)
   (COND
     ((NULL |lv|) |p|)
-    ((NULL (NULL (CDR |lv|)))
+    ((NOT (NULL (CDR |lv|)))
      (|error| "can only eval a univariate polynomial once"))
     ('T
      (SPADCALL |p| (|SPADfirst| |lv|) (|SPADfirst| |lq|)
@@ -207,7 +207,7 @@
 (DEFUN |UPOLYC-;eval;SLLS;7| (|p| |lv| |lr| $)
   (COND
     ((NULL |lv|) |p|)
-    ((NULL (NULL (CDR |lv|)))
+    ((NOT (NULL (CDR |lv|)))
      (|error| "can only eval a univariate polynomial once"))
     ('T
      (SPADCALL |p| (|SPADfirst| |lv|) (|SPADfirst| |lr|)
@@ -220,7 +220,7 @@
 (DEFUN |UPOLYC-;eval;SLS;9| (|p| |le| $)
   (COND
     ((NULL |le|) |p|)
-    ((NULL (NULL (CDR |le|)))
+    ((NOT (NULL (CDR |le|)))
      (|error| "can only eval a univariate polynomial once"))
     ('T
      (COND