* interp/compiler.boot (getSuccessEnvironment): Tidy.

	(getInverseEnvironment): Likewise.
	(compLogicalNot): Don't normalize to if-statement.

1 files changed, 93 insertions, 91 deletions

diff --git a/src/algebra/strap/FFIELDC-.lsp b/src/algebra/strap/FFIELDC-.lsp
index 826615e8..f29249fc 100644
--- a/src/algebra/strap/FFIELDC-.lsp
+++ b/src/algebra/strap/FFIELDC-.lsp
@@ -129,7 +129,7 @@
       (SEQ (COND
              ((SPADCALL |a| (|getShellEntry| $ 16)) 'NIL)
              ('T
-              (SEQ (LETT |explist| (SPADCALL (|getShellEntry| $ 56))
+              (SEQ (LETT |explist| (SPADCALL (|getShellEntry| $ 57))
                          |FFIELDC-;primitive?;SB;9|)
                    (LETT |q| (- 2 1) |FFIELDC-;primitive?;SB;9|)
                    (LETT |equalone| 'NIL |FFIELDC-;primitive?;SB;9|)
@@ -148,8 +148,8 @@
                                     (SPADCALL
                                      (SPADCALL |a|
                                       (QUOTIENT2 |q| (QCAR |exp|))
-                                      (|getShellEntry| $ 58))
-                                     (|getShellEntry| $ 59))
+                                      (|getShellEntry| $ 59))
+                                     (|getShellEntry| $ 60))
                                     |FFIELDC-;primitive?;SB;9|)))
                         (LETT #0# (CDR #0#) |FFIELDC-;primitive?;SB;9|)
                         (GO G190) G191 (EXIT NIL))
@@ -161,12 +161,12 @@
     (RETURN
       (SEQ (COND
              ((SPADCALL |e| (|spadConstant| $ 7)
-                  (|getShellEntry| $ 63))
+                  (|getShellEntry| $ 64))
               (|error| "order(0) is not defined "))
              ('T
               (SEQ (LETT |ord| (- 2 1) |FFIELDC-;order;SPi;10|)
                    (LETT |a| 0 |FFIELDC-;order;SPi;10|)
-                   (LETT |lof| (SPADCALL (|getShellEntry| $ 56))
+                   (LETT |lof| (SPADCALL (|getShellEntry| $ 57))
                          |FFIELDC-;order;SPi;10|)
                    (SEQ (LETT |rec| NIL |FFIELDC-;order;SPi;10|)
                         (LETT #0# |lof| |FFIELDC-;order;SPi;10|) G190
@@ -185,8 +185,8 @@
                              (LETT |goon|
                                    (SPADCALL
                                     (SPADCALL |e| |a|
-                                     (|getShellEntry| $ 58))
-                                    (|getShellEntry| $ 59))
+                                     (|getShellEntry| $ 59))
+                                    (|getShellEntry| $ 60))
                                    |FFIELDC-;order;SPi;10|)
                              (SEQ (LETT |j| 0 |FFIELDC-;order;SPi;10|)
                                   (LETT #1# (- (QCDR |rec|) 2)
@@ -206,8 +206,8 @@
                                         (LETT |goon|
                                          (SPADCALL
                                           (SPADCALL |e| |a|
-                                           (|getShellEntry| $ 58))
-                                          (|getShellEntry| $ 59))
+                                           (|getShellEntry| $ 59))
+                                          (|getShellEntry| $ 60))
                                          |FFIELDC-;order;SPi;10|)))
                                   (LETT |j| (QSADD1 |j|)
                                         |FFIELDC-;order;SPi;10|)
@@ -229,13 +229,13 @@
              ((SPADCALL |b| (|getShellEntry| $ 16))
               (|error| "discreteLog: logarithm of zero"))
              ('T
-              (SEQ (LETT |faclist| (SPADCALL (|getShellEntry| $ 56))
+              (SEQ (LETT |faclist| (SPADCALL (|getShellEntry| $ 57))
                          |FFIELDC-;discreteLog;SNni;11|)
                    (LETT |a| |b| |FFIELDC-;discreteLog;SNni;11|)
-                   (LETT |gen| (SPADCALL (|getShellEntry| $ 67))
+                   (LETT |gen| (SPADCALL (|getShellEntry| $ 68))
                          |FFIELDC-;discreteLog;SNni;11|)
                    (EXIT (COND
-                           ((SPADCALL |b| |gen| (|getShellEntry| $ 63))
+                           ((SPADCALL |b| |gen| (|getShellEntry| $ 64))
                             1)
                            ('T
                             (SEQ (LETT |disclog| 0
@@ -277,15 +277,15 @@
                                            |FFIELDC-;discreteLog;SNni;11|)
                                           (LETT |exptable|
                                            (SPADCALL |fac|
-                                            (|getShellEntry| $ 69))
+                                            (|getShellEntry| $ 70))
                                            |FFIELDC-;discreteLog;SNni;11|)
                                           (LETT |n|
                                            (SPADCALL |exptable|
-                                            (|getShellEntry| $ 70))
+                                            (|getShellEntry| $ 71))
                                            |FFIELDC-;discreteLog;SNni;11|)
                                           (LETT |c|
                                            (SPADCALL |a| |exp|
-                                            (|getShellEntry| $ 58))
+                                            (|getShellEntry| $ 59))
                                            |FFIELDC-;discreteLog;SNni;11|)
                                           (LETT |end|
                                            (QUOTIENT2 (- |fac| 1) |n|)
@@ -309,7 +309,7 @@
                                               (SPADCALL |c|
                                                (|getShellEntry| $ 11))
                                               |exptable|
-                                              (|getShellEntry| $ 73))
+                                              (|getShellEntry| $ 74))
                                              |FFIELDC-;discreteLog;SNni;11|)
                                             (EXIT
                                              (COND
@@ -333,9 +333,9 @@
                                                      |groupord| |fac|)
                                                     (- |n|))
                                                    (|getShellEntry| $
-                                                    58))
+                                                    59))
                                                   (|getShellEntry| $
-                                                   79))
+                                                   80))
                                                  |FFIELDC-;discreteLog;SNni;11|)))))
                                            (LETT |i| (QSADD1 |i|)
                                             |FFIELDC-;discreteLog;SNni;11|)
@@ -356,9 +356,9 @@
                                                   (SPADCALL |gen|
                                                    (- |disc1|)
                                                    (|getShellEntry| $
-                                                    58))
+                                                    59))
                                                   (|getShellEntry| $
-                                                   79))
+                                                   80))
                                                  |FFIELDC-;discreteLog;SNni;11|))))
                                              ('T
                                               (|error|
@@ -379,14 +379,14 @@
       (SEQ (EXIT (COND
                    ((SPADCALL |b| (|getShellEntry| $ 16))
                     (SEQ (SPADCALL "discreteLog: logarithm of zero"
-                             (|getShellEntry| $ 85))
+                             (|getShellEntry| $ 86))
                          (EXIT (CONS 1 "failed"))))
                    ((SPADCALL |logbase| (|getShellEntry| $ 16))
                     (SEQ (SPADCALL
                              "discreteLog: logarithm to base zero"
-                             (|getShellEntry| $ 85))
+                             (|getShellEntry| $ 86))
                          (EXIT (CONS 1 "failed"))))
-                   ((SPADCALL |b| |logbase| (|getShellEntry| $ 63))
+                   ((SPADCALL |b| |logbase| (|getShellEntry| $ 64))
                     (CONS 0 1))
                    ('T
                     (COND
@@ -399,14 +399,14 @@
                                      (|getShellEntry| $ 19)))))
                        (SEQ (SPADCALL
                                 "discreteLog: second argument not in cyclic group generated by first argument"
-                                (|getShellEntry| $ 85))
+                                (|getShellEntry| $ 86))
                             (EXIT (CONS 1 "failed"))))
                       ('T
                        (SEQ (LETT |faclist|
                                   (SPADCALL
                                       (SPADCALL |groupord|
-                                       (|getShellEntry| $ 89))
-                                      (|getShellEntry| $ 91))
+                                       (|getShellEntry| $ 90))
+                                      (|getShellEntry| $ 92))
                                   |FFIELDC-;discreteLog;2SU;12|)
                             (LETT |a| |b|
                                   |FFIELDC-;discreteLog;2SU;12|)
@@ -433,7 +433,7 @@
                                       (LETT |primroot|
                                        (SPADCALL |logbase|
                                         (QUOTIENT2 |groupord| |fac|)
-                                        (|getShellEntry| $ 58))
+                                        (|getShellEntry| $ 59))
                                        |FFIELDC-;discreteLog;2SU;12|)
                                       (EXIT
                                        (SEQ
@@ -452,9 +452,9 @@
                                          (LETT |rhoHelp|
                                           (SPADCALL |primroot|
                                            (SPADCALL |a| |exp|
-                                            (|getShellEntry| $ 58))
+                                            (|getShellEntry| $ 59))
                                            |fac|
-                                           (|getShellEntry| $ 93))
+                                           (|getShellEntry| $ 94))
                                           |FFIELDC-;discreteLog;2SU;12|)
                                          (EXIT
                                           (COND
@@ -482,8 +482,8 @@
                                                  (SPADCALL |logbase|
                                                   (- |rho|)
                                                   (|getShellEntry| $
-                                                   58))
-                                                 (|getShellEntry| $ 79))
+                                                   59))
+                                                 (|getShellEntry| $ 80))
                                                 |FFIELDC-;discreteLog;2SU;12|)))))))
                                         (LETT |t| (QSADD1 |t|)
                                          |FFIELDC-;discreteLog;2SU;12|)
@@ -495,25 +495,25 @@
            #2# (EXIT #2#))))) 
 
 (DEFUN |FFIELDC-;squareFreePolynomial| (|f| $)
-  (SPADCALL |f| (|getShellEntry| $ 98))) 
+  (SPADCALL |f| (|getShellEntry| $ 99))) 
 
 (DEFUN |FFIELDC-;factorPolynomial| (|f| $)
-  (SPADCALL |f| (|getShellEntry| $ 100))) 
+  (SPADCALL |f| (|getShellEntry| $ 101))) 
 
 (DEFUN |FFIELDC-;factorSquareFreePolynomial| (|f| $)
   (PROG (|flist| |u| #0=#:G1521 #1=#:G1510 #2=#:G1508 #3=#:G1509)
     (RETURN
       (SEQ (COND
-             ((SPADCALL |f| (|spadConstant| $ 101)
-                  (|getShellEntry| $ 102))
-              (|spadConstant| $ 103))
+             ((SPADCALL |f| (|spadConstant| $ 102)
+                  (|getShellEntry| $ 103))
+              (|spadConstant| $ 104))
              ('T
               (SEQ (LETT |flist|
-                         (SPADCALL |f| 'T (|getShellEntry| $ 107))
+                         (SPADCALL |f| 'T (|getShellEntry| $ 108))
                          |FFIELDC-;factorSquareFreePolynomial|)
                    (EXIT (SPADCALL
                              (SPADCALL (QCAR |flist|)
-                                 (|getShellEntry| $ 108))
+                                 (|getShellEntry| $ 109))
                              (PROGN
                                (LETT #3# NIL
                                      |FFIELDC-;factorSquareFreePolynomial|)
@@ -535,13 +535,13 @@
                                         (LETT #1#
                                          (SPADCALL (QCAR |u|)
                                           (QCDR |u|)
-                                          (|getShellEntry| $ 109))
+                                          (|getShellEntry| $ 110))
                                          |FFIELDC-;factorSquareFreePolynomial|)
                                         (COND
                                           (#3#
                                            (LETT #2#
                                             (SPADCALL #2# #1#
-                                             (|getShellEntry| $ 110))
+                                             (|getShellEntry| $ 111))
                                             |FFIELDC-;factorSquareFreePolynomial|))
                                           ('T
                                            (PROGN
@@ -554,11 +554,11 @@
                                     (GO G190) G191 (EXIT NIL))
                                (COND
                                  (#3# #2#)
-                                 ('T (|spadConstant| $ 111))))
-                             (|getShellEntry| $ 112)))))))))) 
+                                 ('T (|spadConstant| $ 112))))
+                             (|getShellEntry| $ 113)))))))))) 
 
 (DEFUN |FFIELDC-;gcdPolynomial;3Sup;16| (|f| |g| $)
-  (SPADCALL |f| |g| (|getShellEntry| $ 114))) 
+  (SPADCALL |f| |g| (|getShellEntry| $ 115))) 
 
 (DEFUN |FiniteFieldCategory&| (|#1|)
   (PROG (|dv$1| |dv$| $ |pv$|)
@@ -566,7 +566,7 @@
       (PROGN
         (LETT |dv$1| (|devaluate| |#1|) . #0=(|FiniteFieldCategory&|))
         (LETT |dv$| (LIST '|FiniteFieldCategory&| |dv$1|) . #0#)
-        (LETT $ (|newShell| 117) . #0#)
+        (LETT $ (|newShell| 118) . #0#)
         (|setShellEntry| $ 0 |dv$|)
         (|setShellEntry| $ 3
             (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -593,43 +593,44 @@
              (91 . |size|) (95 . -)
              (|Union| '"prime" '"polynomial" '"normal" '"cyclic")
              (101 . |representationType|) (105 . =) (111 . |false|)
-             (115 . =) |FFIELDC-;createPrimitiveElement;S;8|
+             (115 . |not|) (120 . =)
+             |FFIELDC-;createPrimitiveElement;S;8|
              (|Record| (|:| |factor| 20) (|:| |exponent| 20))
-             (|List| 54) (121 . |factorsOfCyclicGroupSize|)
-             (125 . |quo|) (131 . **) (137 . |one?|)
-             |FFIELDC-;primitive?;SB;9| (142 . |Zero|) (146 . |Zero|)
-             (150 . =) (|SingleInteger|) (156 . |Zero|)
-             |FFIELDC-;order;SPi;10| (160 . |primitiveElement|)
-             (|Table| 10 39) (164 . |tableForDiscreteLogarithm|)
-             (169 . |#|) (174 . |One|) (|Union| 39 '"failed")
-             (178 . |search|) (184 . |true|) (188 . *) (194 . +)
-             (200 . *) (206 . -) (211 . *) (217 . +)
+             (|List| 55) (126 . |factorsOfCyclicGroupSize|)
+             (130 . |quo|) (136 . **) (142 . |one?|)
+             |FFIELDC-;primitive?;SB;9| (147 . |Zero|) (151 . |Zero|)
+             (155 . =) (|SingleInteger|) (161 . |Zero|)
+             |FFIELDC-;order;SPi;10| (165 . |primitiveElement|)
+             (|Table| 10 39) (169 . |tableForDiscreteLogarithm|)
+             (174 . |#|) (179 . |One|) (|Union| 39 '"failed")
+             (183 . |search|) (189 . |true|) (193 . *) (199 . +)
+             (205 . *) (211 . -) (216 . *) (222 . +)
              |FFIELDC-;discreteLog;SNni;11| (|Void|) (|String|)
-             (|OutputForm|) (223 . |messagePrint|) (228 . |rem|)
-             (234 . |zero?|) (|Factored| $) (239 . |factor|)
-             (|Factored| 20) (244 . |factors|)
+             (|OutputForm|) (228 . |messagePrint|) (233 . |rem|)
+             (239 . |zero?|) (|Factored| $) (244 . |factor|)
+             (|Factored| 20) (249 . |factors|)
              (|DiscreteLogarithmPackage| 6)
-             (249 . |shanksDiscLogAlgorithm|)
+             (254 . |shanksDiscLogAlgorithm|)
              |FFIELDC-;discreteLog;2SU;12|
-             (|SparseUnivariatePolynomial| 6) (|Factored| 95)
-             (|UnivariatePolynomialSquareFree| 6 95)
-             (256 . |squareFree|) (|DistinctDegreeFactorize| 6 95)
-             (261 . |factor|) (266 . |Zero|) (270 . =) (276 . |Zero|)
-             (|Record| (|:| |irr| 95) (|:| |pow| 20)) (|List| 104)
-             (|Record| (|:| |cont| 6) (|:| |factors| 105))
-             (280 . |distdfact|) (286 . |coerce|) (291 . |primeFactor|)
-             (297 . *) (303 . |One|) (307 . *) (|EuclideanDomain&| 95)
-             (313 . |gcd|) (|SparseUnivariatePolynomial| $)
+             (|SparseUnivariatePolynomial| 6) (|Factored| 96)
+             (|UnivariatePolynomialSquareFree| 6 96)
+             (261 . |squareFree|) (|DistinctDegreeFactorize| 6 96)
+             (266 . |factor|) (271 . |Zero|) (275 . =) (281 . |Zero|)
+             (|Record| (|:| |irr| 96) (|:| |pow| 20)) (|List| 105)
+             (|Record| (|:| |cont| 6) (|:| |factors| 106))
+             (285 . |distdfact|) (291 . |coerce|) (296 . |primeFactor|)
+             (302 . *) (308 . |One|) (312 . *) (|EuclideanDomain&| 96)
+             (318 . |gcd|) (|SparseUnivariatePolynomial| $)
              |FFIELDC-;gcdPolynomial;3Sup;16|)
-          '#(|primitive?| 319 |order| 324 |nextItem| 334 |init| 339
-             |gcdPolynomial| 343 |discreteLog| 349 |differentiate| 360
-             |createPrimitiveElement| 365 |conditionP| 369 |charthRoot|
-             374)
+          '#(|primitive?| 324 |order| 329 |nextItem| 339 |init| 344
+             |gcdPolynomial| 348 |discreteLog| 354 |differentiate| 365
+             |createPrimitiveElement| 370 |conditionP| 374 |charthRoot|
+             379)
           'NIL
           (CONS (|makeByteWordVec2| 1 'NIL)
                 (CONS '#()
                       (CONS '#()
-                            (|makeByteWordVec2| 116
+                            (|makeByteWordVec2| 117
                                 '(0 6 0 7 1 6 10 0 11 0 10 0 12 2 10 0
                                   0 0 13 1 6 0 10 14 1 6 15 0 16 1 6 10
                                   0 19 1 21 0 20 22 1 26 25 0 27 1 25
@@ -637,23 +638,24 @@
                                   1 6 0 0 32 2 24 0 33 0 34 0 15 39 40
                                   0 20 39 41 2 39 0 0 0 42 2 6 0 0 39
                                   43 0 6 39 46 2 20 0 0 0 47 0 6 48 49
-                                  2 48 15 0 0 50 0 15 0 51 2 10 15 0 0
-                                  52 0 6 55 56 2 20 0 0 0 57 2 6 0 0 20
-                                  58 1 6 15 0 59 0 39 0 61 0 20 0 62 2
-                                  6 15 0 0 63 0 64 0 65 0 6 0 67 1 6 68
-                                  20 69 1 68 39 0 70 0 39 0 71 2 68 72
-                                  10 0 73 0 15 0 74 2 39 0 39 0 75 2 39
-                                  0 0 0 76 2 20 0 20 0 77 1 20 0 0 78 2
-                                  6 0 0 0 79 2 20 0 0 0 80 1 84 82 83
-                                  85 2 39 0 0 0 86 1 39 15 0 87 1 20 88
-                                  0 89 1 90 55 0 91 3 92 72 6 6 39 93 1
-                                  97 96 95 98 1 99 96 95 100 0 95 0 101
-                                  2 95 15 0 0 102 0 96 0 103 2 99 106
-                                  95 15 107 1 95 0 6 108 2 96 0 95 20
-                                  109 2 96 0 0 0 110 0 96 0 111 2 96 0
-                                  95 0 112 2 113 0 0 0 114 1 0 15 0 60
-                                  1 0 10 0 66 1 0 21 0 23 1 0 17 0 18 0
-                                  0 0 9 2 0 115 115 115 116 1 0 39 0 81
-                                  2 0 72 0 0 94 1 0 0 0 8 0 0 0 53 1 0
-                                  36 37 38 1 0 0 0 44 1 0 17 0 45)))))
+                                  2 48 15 0 0 50 0 15 0 51 1 15 0 0 52
+                                  2 10 15 0 0 53 0 6 56 57 2 20 0 0 0
+                                  58 2 6 0 0 20 59 1 6 15 0 60 0 39 0
+                                  62 0 20 0 63 2 6 15 0 0 64 0 65 0 66
+                                  0 6 0 68 1 6 69 20 70 1 69 39 0 71 0
+                                  39 0 72 2 69 73 10 0 74 0 15 0 75 2
+                                  39 0 39 0 76 2 39 0 0 0 77 2 20 0 20
+                                  0 78 1 20 0 0 79 2 6 0 0 0 80 2 20 0
+                                  0 0 81 1 85 83 84 86 2 39 0 0 0 87 1
+                                  39 15 0 88 1 20 89 0 90 1 91 56 0 92
+                                  3 93 73 6 6 39 94 1 98 97 96 99 1 100
+                                  97 96 101 0 96 0 102 2 96 15 0 0 103
+                                  0 97 0 104 2 100 107 96 15 108 1 96 0
+                                  6 109 2 97 0 96 20 110 2 97 0 0 0 111
+                                  0 97 0 112 2 97 0 96 0 113 2 114 0 0
+                                  0 115 1 0 15 0 61 1 0 10 0 67 1 0 21
+                                  0 23 1 0 17 0 18 0 0 0 9 2 0 116 116
+                                  116 117 1 0 39 0 82 2 0 73 0 0 95 1 0
+                                  0 0 8 0 0 0 54 1 0 36 37 38 1 0 0 0
+                                  44 1 0 17 0 45)))))
           '|lookupComplete|))