* interp/c-util.boot (middleEndExpand): Tidy.

	* interp/g-util.boot (expandToVMForm): Likewise.  
	(expandStore): Refine store to pair components.
	* algebra/any.spad.pamphlet (Scope): Use builtin operators.
	(Environment): Likewise.
	* algebra/domain.spad.pamphlet (FunctionDescriptor): Likewise.
	(ConstructorCall): Likewise.
	(FunctorData): Likewise.
	(OperatorSignature): Likewise.
	(Category): Likewise.
	(Domain): Likewise.
	* algebra/integer.spad.pamphlet (Integer): Likewise.
	(NonNegativeInteger): Likewise.
	* algebra/outform.spad.pamphlet: Likewise.
	* algebra/si.spad.pamphlet (SingleInteger): Likewise.
	* algebra/syntax.spad.pamphlet (Syntax): Likewise.

1 files changed, 28 insertions, 28 deletions

diff --git a/src/algebra/strap/POLYCAT-.lsp b/src/algebra/strap/POLYCAT-.lsp
index e28995ec..cb7b1776 100644
--- a/src/algebra/strap/POLYCAT-.lsp
+++ b/src/algebra/strap/POLYCAT-.lsp
@@ -142,8 +142,8 @@
                 |POLYCAT-;convert;SIf;43|)) 
 
 (DEFUN |POLYCAT-;eval;SLS;1| (|p| |l| $)
-  (PROG (#0=#:G1690 #1=#:G1426 #2=#:G1691 #3=#:G1692 |lvar| #4=#:G1693
-            |e| #5=#:G1694)
+  (PROG (#0=#:G1691 #1=#:G1427 #2=#:G1692 #3=#:G1693 |lvar| #4=#:G1694
+            |e| #5=#:G1695)
     (RETURN
       (SEQ (COND
              ((NULL |l|) |p|)
@@ -256,7 +256,7 @@
         ('T (CONS 0 |l|)))))) 
 
 (DEFUN |POLYCAT-;isTimes;SU;4| (|p| $)
-  (PROG (|lv| #0=#:G1695 |v| #1=#:G1696 |l| |r|)
+  (PROG (|lv| #0=#:G1696 |v| #1=#:G1697 |l| |r|)
     (RETURN
       (SEQ (COND
              ((OR (NULL (LETT |lv|
@@ -358,7 +358,7 @@
          (CDR |lv|) (CDR |ln|) (|getShellEntry| $ 70))))) 
 
 (DEFUN |POLYCAT-;retract;SVarSet;9| (|p| $)
-  (PROG (#0=#:G1477 |q|)
+  (PROG (#0=#:G1478 |q|)
     (RETURN
       (SEQ (LETT |q|
                  (PROG2 (LETT #0# (SPADCALL |p| (|getShellEntry| $ 53))
@@ -374,7 +374,7 @@
                    ('T (|error| "Polynomial is not a single variable")))))))) 
 
 (DEFUN |POLYCAT-;retractIfCan;SU;10| (|p| $)
-  (PROG (|q| #0=#:G1485)
+  (PROG (|q| #0=#:G1486)
     (RETURN
       (SEQ (EXIT (SEQ (SEQ (LETT |q|
                                  (SPADCALL |p| (|getShellEntry| $ 53))
@@ -398,7 +398,7 @@
       (|getShellEntry| $ 76))) 
 
 (DEFUN |POLYCAT-;primitiveMonomials;SL;12| (|p| $)
-  (PROG (#0=#:G1697 |q| #1=#:G1698)
+  (PROG (#0=#:G1698 |q| #1=#:G1699)
     (RETURN
       (SEQ (PROGN
              (LETT #0# NIL |POLYCAT-;primitiveMonomials;SL;12|)
@@ -420,7 +420,7 @@
                   (GO G190) G191 (EXIT (NREVERSE0 #0#)))))))) 
 
 (DEFUN |POLYCAT-;totalDegree;SNni;13| (|p| $)
-  (PROG (#0=#:G1491 |d| |u|)
+  (PROG (#0=#:G1492 |d| |u|)
     (RETURN
       (SEQ (COND
              ((SPADCALL |p| (|getShellEntry| $ 78)) 0)
@@ -460,7 +460,7 @@
                    (EXIT |d|)))))))) 
 
 (DEFUN |POLYCAT-;totalDegree;SLNni;14| (|p| |lv| $)
-  (PROG (#0=#:G1499 |v| |w| |d| |u|)
+  (PROG (#0=#:G1500 |v| |w| |d| |u|)
     (RETURN
       (SEQ (COND
              ((SPADCALL |p| (|getShellEntry| $ 78)) 0)
@@ -517,7 +517,7 @@
       (|getShellEntry| $ 96))) 
 
 (DEFUN |POLYCAT-;allMonoms| (|l| $)
-  (PROG (#0=#:G1699 |p| #1=#:G1700)
+  (PROG (#0=#:G1700 |p| #1=#:G1701)
     (RETURN
       (SEQ (SPADCALL
                (SPADCALL
@@ -543,7 +543,7 @@
                (|getShellEntry| $ 100)))))) 
 
 (DEFUN |POLYCAT-;P2R| (|p| |b| |n| $)
-  (PROG (|w| |bj| #0=#:G1702 |i| #1=#:G1701)
+  (PROG (|w| |bj| #0=#:G1703 |i| #1=#:G1702)
     (RETURN
       (SEQ (LETT |w|
                  (SPADCALL |n| (|spadConstant| $ 28)
@@ -573,7 +573,7 @@
            (EXIT |w|))))) 
 
 (DEFUN |POLYCAT-;eq2R| (|l| |b| $)
-  (PROG (#0=#:G1703 |bj| #1=#:G1704 #2=#:G1705 |p| #3=#:G1706)
+  (PROG (#0=#:G1704 |bj| #1=#:G1705 #2=#:G1706 |p| #3=#:G1707)
     (RETURN
       (SEQ (SPADCALL
                (PROGN
@@ -616,7 +616,7 @@
                (|getShellEntry| $ 111)))))) 
 
 (DEFUN |POLYCAT-;reducedSystem;MM;20| (|m| $)
-  (PROG (#0=#:G1707 |r| #1=#:G1708 |b| #2=#:G1709 |bj| #3=#:G1710 |d|
+  (PROG (#0=#:G1708 |r| #1=#:G1709 |b| #2=#:G1710 |bj| #3=#:G1711 |d|
             |mm| |l|)
     (RETURN
       (SEQ (LETT |l| (SPADCALL |m| (|getShellEntry| $ 114))
@@ -690,7 +690,7 @@
            (EXIT |mm|))))) 
 
 (DEFUN |POLYCAT-;reducedSystem;MVR;21| (|m| |v| $)
-  (PROG (#0=#:G1711 |s| #1=#:G1712 |b| #2=#:G1713 |bj| #3=#:G1714 |d|
+  (PROG (#0=#:G1712 |s| #1=#:G1713 |b| #2=#:G1714 |bj| #3=#:G1715 |d|
             |n| |mm| |w| |l| |r|)
     (RETURN
       (SEQ (LETT |l| (SPADCALL |m| (|getShellEntry| $ 114))
@@ -794,8 +794,8 @@
   (SPADCALL |pp| (|getShellEntry| $ 146))) 
 
 (DEFUN |POLYCAT-;factor;SF;26| (|p| $)
-  (PROG (|v| |ansR| #0=#:G1715 |w| #1=#:G1716 |up| |ansSUP| #2=#:G1717
-             |ww| #3=#:G1718)
+  (PROG (|v| |ansR| #0=#:G1716 |w| #1=#:G1717 |up| |ansSUP| #2=#:G1718
+             |ww| #3=#:G1719)
     (RETURN
       (SEQ (LETT |v| (SPADCALL |p| (|getShellEntry| $ 53))
                  |POLYCAT-;factor;SF;26|)
@@ -894,12 +894,12 @@
                                    (|getShellEntry| $ 159))))))))))) 
 
 (DEFUN |POLYCAT-;conditionP;MU;27| (|mat| $)
-  (PROG (|ll| #0=#:G1719 |z| #1=#:G1720 |ch| |l| #2=#:G1721 #3=#:G1722
-              #4=#:G1582 #5=#:G1580 #6=#:G1581 #7=#:G1723 |vars| |degs|
-              #8=#:G1724 |d| #9=#:G1725 |nd| #10=#:G1608 |deg1|
-              |redmons| #11=#:G1726 |v| #12=#:G1728 |u| #13=#:G1727
-              |llR| |monslist| |ans| #14=#:G1609 |mons| #15=#:G1729 |m|
-              #16=#:G1730 |i| #17=#:G1604 #18=#:G1602 #19=#:G1603)
+  (PROG (|ll| #0=#:G1720 |z| #1=#:G1721 |ch| |l| #2=#:G1722 #3=#:G1723
+              #4=#:G1583 #5=#:G1581 #6=#:G1582 #7=#:G1724 |vars| |degs|
+              #8=#:G1725 |d| #9=#:G1726 |nd| #10=#:G1609 |deg1|
+              |redmons| #11=#:G1727 |v| #12=#:G1729 |u| #13=#:G1728
+              |llR| |monslist| |ans| #14=#:G1610 |mons| #15=#:G1730 |m|
+              #16=#:G1731 |i| #17=#:G1605 #18=#:G1603 #19=#:G1604)
     (RETURN
       (SEQ (EXIT (SEQ (LETT |ll|
                             (SPADCALL
@@ -1051,7 +1051,7 @@
                                                      (GO #10#)))
                                                   ('T
                                                    (LET
-                                                    ((#20=#:G1611
+                                                    ((#20=#:G1612
                                                       (QCDR |nd|)))
                                                      (|check-subtype|
                                                       (>= #20# 0)
@@ -1146,7 +1146,7 @@
                                     (EXIT
                                      (CONS 0
                                       (LET
-                                       ((#21=#:G1610
+                                       ((#21=#:G1611
                                          (|makeSimpleArray|
                                           (|getVMType|
                                            (|getShellEntry| $ 6))
@@ -1262,7 +1262,7 @@
                                    $)))))))))) 
 
 (DEFUN |POLYCAT-;charthRootlv| (|p| |vars| |ch| $)
-  (PROG (|v| |dd| |cp| |d| |ans| |ansx| #0=#:G1638)
+  (PROG (|v| |dd| |cp| |d| |ans| |ansx| #0=#:G1639)
     (RETURN
       (SEQ (EXIT (COND
                    ((NULL |vars|)
@@ -1337,7 +1337,7 @@
                                                 (SPADCALL (QCDR |ansx|)
                                                  |v|
                                                  (LET
-                                                  ((#1=#:G1639
+                                                  ((#1=#:G1640
                                                     (QCDR |dd|)))
                                                    (|check-subtype|
                                                     (>= #1# 0)
@@ -1391,7 +1391,7 @@
   (SPADCALL |p| (|getShellEntry| $ 197))) 
 
 (DEFUN |POLYCAT-;squareFreePart;2S;34| (|p| $)
-  (PROG (|s| |f| #0=#:G1731 #1=#:G1653 #2=#:G1651 #3=#:G1652)
+  (PROG (|s| |f| #0=#:G1732 #1=#:G1654 #2=#:G1652 #3=#:G1653)
     (RETURN
       (SEQ (SPADCALL
                (SPADCALL
@@ -1436,7 +1436,7 @@
       (|getShellEntry| $ 204))) 
 
 (DEFUN |POLYCAT-;primitivePart;2S;36| (|p| $)
-  (PROG (#0=#:G1657)
+  (PROG (#0=#:G1658)
     (RETURN
       (QVELT (SPADCALL
                  (PROG2 (LETT #0#
@@ -1452,7 +1452,7 @@
              1)))) 
 
 (DEFUN |POLYCAT-;primitivePart;SVarSetS;37| (|p| |v| $)
-  (PROG (#0=#:G1663)
+  (PROG (#0=#:G1664)
     (RETURN
       (QVELT (SPADCALL
                  (PROG2 (LETT #0#