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

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

1 files changed, 99 insertions, 98 deletions

diff --git a/src/algebra/strap/LSAGG-.lsp b/src/algebra/strap/LSAGG-.lsp
index c5006e53..09fe53fb 100644
--- a/src/algebra/strap/LSAGG-.lsp
+++ b/src/algebra/strap/LSAGG-.lsp
@@ -159,7 +159,7 @@
                                          |LSAGG-;select!;M2A;5|)
                                         (EXIT
                                          (SPADCALL |y| |z|
-                                          (|getShellEntry| $ 26))))))))
+                                          (|getShellEntry| $ 27))))))))
                               NIL (GO G190) G191 (EXIT NIL))
                          (EXIT |x|))))))))) 
 
@@ -169,7 +169,7 @@
       (SEQ (COND
              ((SPADCALL |p| (|getShellEntry| $ 16)) |q|)
              ((SPADCALL |q| (|getShellEntry| $ 16)) |p|)
-             ((SPADCALL |p| |q| (|getShellEntry| $ 29))
+             ((SPADCALL |p| |q| (|getShellEntry| $ 30))
               (|error| "cannot merge a list into itself"))
              ('T
               (SEQ (COND
@@ -210,7 +210,7 @@
                                        |f|)
                                       (SEQ
                                        (SPADCALL |t| |p|
-                                        (|getShellEntry| $ 26))
+                                        (|getShellEntry| $ 27))
                                        (LETT |t| |p|
                                         |LSAGG-;merge!;M3A;6|)
                                        (EXIT
@@ -221,7 +221,7 @@
                                      ('T
                                       (SEQ
                                        (SPADCALL |t| |q|
-                                        (|getShellEntry| $ 26))
+                                        (|getShellEntry| $ 27))
                                        (LETT |t| |q|
                                         |LSAGG-;merge!;M3A;6|)
                                        (EXIT
@@ -234,13 +234,13 @@
                        (COND
                          ((SPADCALL |p| (|getShellEntry| $ 16)) |q|)
                          ('T |p|))
-                       (|getShellEntry| $ 26))
+                       (|getShellEntry| $ 27))
                    (EXIT |r|)))))))) 
 
 (DEFUN |LSAGG-;insert!;SAIA;7| (|s| |x| |i| $)
   (PROG (|m| #0=#:G1465 |y| |z|)
     (RETURN
-      (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 32))
+      (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 33))
                  |LSAGG-;insert!;SAIA;7|)
            (EXIT (COND
                    ((< |i| |m|) (|error| "index out of range"))
@@ -255,25 +255,25 @@
                                      (|check-subtype|
                                       (COND ((< #0# 0) 'NIL) ('T 'T))
                                       '(|NonNegativeInteger|) #0#))
-                                   (|getShellEntry| $ 38))
+                                   (|getShellEntry| $ 39))
                                |LSAGG-;insert!;SAIA;7|)
                          (LETT |z|
                                (SPADCALL |y| (|getShellEntry| $ 17))
                                |LSAGG-;insert!;SAIA;7|)
                          (SPADCALL |y|
                              (SPADCALL |s| |z| (|getShellEntry| $ 14))
-                             (|getShellEntry| $ 26))
+                             (|getShellEntry| $ 27))
                          (EXIT |x|))))))))) 
 
 (DEFUN |LSAGG-;insert!;2AIA;8| (|w| |x| |i| $)
   (PROG (|m| #0=#:G1469 |y| |z|)
     (RETURN
-      (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 32))
+      (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 33))
                  |LSAGG-;insert!;2AIA;8|)
            (EXIT (COND
                    ((< |i| |m|) (|error| "index out of range"))
                    ((EQL |i| |m|)
-                    (SPADCALL |w| |x| (|getShellEntry| $ 40)))
+                    (SPADCALL |w| |x| (|getShellEntry| $ 41)))
                    ('T
                     (SEQ (LETT |y|
                                (SPADCALL |x|
@@ -283,13 +283,13 @@
                                      (|check-subtype|
                                       (COND ((< #0# 0) 'NIL) ('T 'T))
                                       '(|NonNegativeInteger|) #0#))
-                                   (|getShellEntry| $ 38))
+                                   (|getShellEntry| $ 39))
                                |LSAGG-;insert!;2AIA;8|)
                          (LETT |z|
                                (SPADCALL |y| (|getShellEntry| $ 17))
                                |LSAGG-;insert!;2AIA;8|)
-                         (SPADCALL |y| |w| (|getShellEntry| $ 26))
-                         (SPADCALL |y| |z| (|getShellEntry| $ 40))
+                         (SPADCALL |y| |w| (|getShellEntry| $ 27))
+                         (SPADCALL |y| |z| (|getShellEntry| $ 41))
                          (EXIT |x|))))))))) 
 
 (DEFUN |LSAGG-;remove!;M2A;9| (|f| |x| $)
@@ -331,7 +331,7 @@
                                         (SPADCALL |p|
                                          (SPADCALL |q|
                                           (|getShellEntry| $ 17))
-                                         (|getShellEntry| $ 26))
+                                         (|getShellEntry| $ 27))
                                         |LSAGG-;remove!;M2A;9|))
                                       ('T
                                        (SEQ
@@ -348,7 +348,7 @@
 (DEFUN |LSAGG-;delete!;AIA;10| (|x| |i| $)
   (PROG (|m| #0=#:G1481 |y|)
     (RETURN
-      (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 32))
+      (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 33))
                  |LSAGG-;delete!;AIA;10|)
            (EXIT (COND
                    ((< |i| |m|) (|error| "index out of range"))
@@ -363,29 +363,29 @@
                                      (|check-subtype|
                                       (COND ((< #0# 0) 'NIL) ('T 'T))
                                       '(|NonNegativeInteger|) #0#))
-                                   (|getShellEntry| $ 38))
+                                   (|getShellEntry| $ 39))
                                |LSAGG-;delete!;AIA;10|)
                          (SPADCALL |y|
-                             (SPADCALL |y| 2 (|getShellEntry| $ 38))
-                             (|getShellEntry| $ 26))
+                             (SPADCALL |y| 2 (|getShellEntry| $ 39))
+                             (|getShellEntry| $ 27))
                          (EXIT |x|))))))))) 
 
 (DEFUN |LSAGG-;delete!;AUsA;11| (|x| |i| $)
   (PROG (|l| |m| |h| #0=#:G1486 #1=#:G1487 |t| #2=#:G1488)
     (RETURN
-      (SEQ (LETT |l| (SPADCALL |i| (|getShellEntry| $ 45))
+      (SEQ (LETT |l| (SPADCALL |i| (|getShellEntry| $ 46))
                  |LSAGG-;delete!;AUsA;11|)
-           (LETT |m| (SPADCALL |x| (|getShellEntry| $ 32))
+           (LETT |m| (SPADCALL |x| (|getShellEntry| $ 33))
                  |LSAGG-;delete!;AUsA;11|)
            (EXIT (COND
                    ((< |l| |m|) (|error| "index out of range"))
                    ('T
                     (SEQ (LETT |h|
                                (COND
-                                 ((SPADCALL |i| (|getShellEntry| $ 46))
-                                  (SPADCALL |i| (|getShellEntry| $ 47)))
+                                 ((SPADCALL |i| (|getShellEntry| $ 47))
+                                  (SPADCALL |i| (|getShellEntry| $ 48)))
                                  ('T
-                                  (SPADCALL |x| (|getShellEntry| $ 48))))
+                                  (SPADCALL |x| (|getShellEntry| $ 49))))
                                |LSAGG-;delete!;AUsA;11|)
                          (EXIT (COND
                                  ((< |h| |l|) |x|)
@@ -399,7 +399,7 @@
                                            ((< #0# 0) 'NIL)
                                            ('T 'T))
                                          '(|NonNegativeInteger|) #0#))
-                                      (|getShellEntry| $ 38)))
+                                      (|getShellEntry| $ 39)))
                                  ('T
                                   (SEQ (LETT |t|
                                         (SPADCALL |x|
@@ -412,7 +412,7 @@
                                               ('T 'T))
                                             '(|NonNegativeInteger|)
                                             #1#))
-                                         (|getShellEntry| $ 38))
+                                         (|getShellEntry| $ 39))
                                         |LSAGG-;delete!;AUsA;11|)
                                        (SPADCALL |t|
                                         (SPADCALL |t|
@@ -425,8 +425,8 @@
                                               ('T 'T))
                                             '(|NonNegativeInteger|)
                                             #2#))
-                                         (|getShellEntry| $ 38))
-                                        (|getShellEntry| $ 26))
+                                         (|getShellEntry| $ 39))
+                                        (|getShellEntry| $ 27))
                                        (EXIT |x|))))))))))))) 
 
 (DEFUN |LSAGG-;find;MAU;12| (|f| |x| $)
@@ -450,7 +450,7 @@
 (DEFUN |LSAGG-;position;MAI;13| (|f| |x| $)
   (PROG (|k|)
     (RETURN
-      (SEQ (SEQ (LETT |k| (SPADCALL |x| (|getShellEntry| $ 32))
+      (SEQ (SEQ (LETT |k| (SPADCALL |x| (|getShellEntry| $ 33))
                       |LSAGG-;position;MAI;13|)
                 G190
                 (COND
@@ -469,7 +469,7 @@
                 G191 (EXIT NIL))
            (EXIT (COND
                    ((SPADCALL |x| (|getShellEntry| $ 16))
-                    (- (SPADCALL |x| (|getShellEntry| $ 32)) 1))
+                    (- (SPADCALL |x| (|getShellEntry| $ 33)) 1))
                    ('T |k|))))))) 
 
 (DEFUN |LSAGG-;mergeSort| (|f| |p| |n| $)
@@ -482,7 +482,7 @@
                      (SPADCALL (SPADCALL |p| (|getShellEntry| $ 17))
                          (|getShellEntry| $ 18))
                      (SPADCALL |p| (|getShellEntry| $ 18)) |f|)
-                 (LETT |p| (SPADCALL |p| (|getShellEntry| $ 56))
+                 (LETT |p| (SPADCALL |p| (|getShellEntry| $ 57))
                        |LSAGG-;mergeSort|)))))
            (EXIT (COND
                    ((< |n| 3) |p|)
@@ -496,7 +496,7 @@
                                |LSAGG-;mergeSort|)
                          (LETT |q|
                                (SPADCALL |p| |l|
-                                   (|getShellEntry| $ 58))
+                                   (|getShellEntry| $ 59))
                                |LSAGG-;mergeSort|)
                          (LETT |p| (|LSAGG-;mergeSort| |f| |p| |l| $)
                                |LSAGG-;mergeSort|)
@@ -574,7 +574,7 @@
                   ((NULL (COND
                            ((SPADCALL |x| (|getShellEntry| $ 16)) 'NIL)
                            ('T
-                            (SPADCALL |r| |a| (|getShellEntry| $ 62)))))
+                            (SPADCALL |r| |a| (|getShellEntry| $ 63)))))
                    (GO G191)))
                 (SEQ (LETT |r|
                            (SPADCALL |r|
@@ -630,7 +630,7 @@
                                  (SPADCALL |y| (|getShellEntry| $ 17))
                                  |LSAGG-;map;M3A;19|)))
                 NIL (GO G190) G191 (EXIT NIL))
-           (EXIT (SPADCALL |z| (|getShellEntry| $ 56))))))) 
+           (EXIT (SPADCALL |z| (|getShellEntry| $ 57))))))) 
 
 (DEFUN |LSAGG-;reverse!;2A;20| (|x| $)
   (PROG (|z| |y|)
@@ -644,7 +644,7 @@
               |x|)
              ('T
               (SEQ (SPADCALL |x| (SPADCALL (|getShellEntry| $ 13))
-                       (|getShellEntry| $ 26))
+                       (|getShellEntry| $ 27))
                    (SEQ G190
                         (COND
                           ((NULL (NOT (SPADCALL |y|
@@ -654,7 +654,7 @@
                                    (SPADCALL |y|
                                     (|getShellEntry| $ 17))
                                    |LSAGG-;reverse!;2A;20|)
-                             (SPADCALL |y| |x| (|getShellEntry| $ 26))
+                             (SPADCALL |y| |x| (|getShellEntry| $ 27))
                              (LETT |x| |y| |LSAGG-;reverse!;2A;20|)
                              (EXIT (LETT |y| |z|
                                     |LSAGG-;reverse!;2A;20|)))
@@ -673,7 +673,7 @@
                 (SEQ (COND
                        ((EQL |k| 1000)
                         (COND
-                          ((SPADCALL |x| (|getShellEntry| $ 70))
+                          ((SPADCALL |x| (|getShellEntry| $ 71))
                            (EXIT (|error| "cyclic list"))))))
                      (LETT |y|
                            (SPADCALL
@@ -685,12 +685,12 @@
                                  |LSAGG-;copy;2A;21|)))
                 (LETT |k| (QSADD1 |k|) |LSAGG-;copy;2A;21|) (GO G190)
                 G191 (EXIT NIL))
-           (EXIT (SPADCALL |y| (|getShellEntry| $ 56))))))) 
+           (EXIT (SPADCALL |y| (|getShellEntry| $ 57))))))) 
 
 (DEFUN |LSAGG-;copyInto!;2AIA;22| (|y| |x| |s| $)
   (PROG (|m| #0=#:G1546 |z|)
     (RETURN
-      (SEQ (LETT |m| (SPADCALL |y| (|getShellEntry| $ 32))
+      (SEQ (LETT |m| (SPADCALL |y| (|getShellEntry| $ 33))
                  |LSAGG-;copyInto!;2AIA;22|)
            (EXIT (COND
                    ((< |s| |m|) (|error| "index out of range"))
@@ -703,7 +703,7 @@
                                      (|check-subtype|
                                       (COND ((< #0# 0) 'NIL) ('T 'T))
                                       '(|NonNegativeInteger|) #0#))
-                                   (|getShellEntry| $ 38))
+                                   (|getShellEntry| $ 39))
                                |LSAGG-;copyInto!;2AIA;22|)
                          (SEQ G190
                               (COND
@@ -719,7 +719,7 @@
                               (SEQ (SPADCALL |z|
                                     (SPADCALL |x|
                                      (|getShellEntry| $ 18))
-                                    (|getShellEntry| $ 72))
+                                    (|getShellEntry| $ 73))
                                    (LETT |x|
                                     (SPADCALL |x|
                                      (|getShellEntry| $ 17))
@@ -735,7 +735,7 @@
 (DEFUN |LSAGG-;position;SA2I;23| (|w| |x| |s| $)
   (PROG (|m| #0=#:G1553 |k|)
     (RETURN
-      (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 32))
+      (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 33))
                  |LSAGG-;position;SA2I;23|)
            (EXIT (COND
                    ((< |s| |m|) (|error| "index out of range"))
@@ -748,7 +748,7 @@
                                      (|check-subtype|
                                       (COND ((< #0# 0) 'NIL) ('T 'T))
                                       '(|NonNegativeInteger|) #0#))
-                                   (|getShellEntry| $ 38))
+                                   (|getShellEntry| $ 39))
                                |LSAGG-;position;SA2I;23|)
                          (SEQ (LETT |k| |s| |LSAGG-;position;SA2I;23|)
                               G190
@@ -761,7 +761,7 @@
                                           (SPADCALL |w|
                                            (SPADCALL |x|
                                             (|getShellEntry| $ 18))
-                                           (|getShellEntry| $ 62)))))
+                                           (|getShellEntry| $ 63)))))
                                  (GO G191)))
                               (SEQ (EXIT
                                     (LETT |x|
@@ -774,7 +774,7 @@
                          (EXIT (COND
                                  ((SPADCALL |x| (|getShellEntry| $ 16))
                                   (- (SPADCALL |x|
-                                      (|getShellEntry| $ 32))
+                                      (|getShellEntry| $ 33))
                                      1))
                                  ('T |k|))))))))))) 
 
@@ -794,8 +794,8 @@
                                        (VECTOR $ |p|))
                                       (SPADCALL |p|
                                        (|getShellEntry| $ 17))
-                                      (|getShellEntry| $ 76))
-                                     (|getShellEntry| $ 26))
+                                      (|getShellEntry| $ 77))
+                                     (|getShellEntry| $ 27))
                                  |LSAGG-;removeDuplicates!;2A;24|)))
                 NIL (GO G190) G191 (EXIT NIL))
            (EXIT |l|))))) 
@@ -807,7 +807,7 @@
       (PROGN
         (SPADCALL |#1|
             (SPADCALL (|getShellEntry| $$ 1) (|getShellEntry| $ 18))
-            (|getShellEntry| $ 75)))))) 
+            (|getShellEntry| $ 76)))))) 
 
 (DEFUN |LSAGG-;<;2AB;25| (|x| |y| $)
   (PROG (#0=#:G1567)
@@ -829,7 +829,7 @@
                                            (|getShellEntry| $ 18))
                                           (SPADCALL |y|
                                            (|getShellEntry| $ 18))
-                                          (|getShellEntry| $ 62))
+                                          (|getShellEntry| $ 63))
                                          (PROGN
                                            (LETT #0#
                                             (SPADCALL
@@ -837,7 +837,7 @@
                                               (|getShellEntry| $ 18))
                                              (SPADCALL |y|
                                               (|getShellEntry| $ 18))
-                                             (|getShellEntry| $ 78))
+                                             (|getShellEntry| $ 79))
                                             |LSAGG-;<;2AB;25|)
                                            (GO #0#)))
                                         ('T
@@ -866,7 +866,7 @@
         (LETT |dv$1| (|devaluate| |#1|) . #0=(|ListAggregate&|))
         (LETT |dv$2| (|devaluate| |#2|) . #0#)
         (LETT |dv$| (LIST '|ListAggregate&| |dv$1| |dv$2|) . #0#)
-        (LETT $ (|newShell| 81) . #0#)
+        (LETT $ (|newShell| 82) . #0#)
         (|setShellEntry| $ 0 |dv$|)
         (|setShellEntry| $ 3
             (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -875,21 +875,21 @@
         (|setShellEntry| $ 7 |#2|)
         (COND
           ((|HasCategory| |#2| '(|SetCategory|))
-           (|setShellEntry| $ 63
+           (|setShellEntry| $ 64
                (CONS (|dispatchFunction| |LSAGG-;reduce;MA3S;17|) $))))
         (COND
           ((|HasCategory| |#2| '(|SetCategory|))
            (PROGN
-             (|setShellEntry| $ 74
+             (|setShellEntry| $ 75
                  (CONS (|dispatchFunction| |LSAGG-;position;SA2I;23|)
                        $))
-             (|setShellEntry| $ 77
+             (|setShellEntry| $ 78
                  (CONS (|dispatchFunction|
                            |LSAGG-;removeDuplicates!;2A;24|)
                        $)))))
         (COND
           ((|HasCategory| |#2| '(|OrderedSet|))
-           (|setShellEntry| $ 79
+           (|setShellEntry| $ 80
                (CONS (|dispatchFunction| |LSAGG-;<;2AB;25|) $))))
         $)))) 
 
@@ -901,59 +901,60 @@
              (20 . |rest|) (25 . |first|) (|Mapping| 7 7 7)
              (30 . |reduce|) |LSAGG-;reduce;MAS;3| (37 . |copy|)
              (42 . |merge!|) |LSAGG-;merge;M3A;4| (49 . |false|)
-             (53 . |setrest!|) (|Mapping| 10 7) |LSAGG-;select!;M2A;5|
-             (59 . |eq?|) |LSAGG-;merge!;M3A;6| (|Integer|)
-             (65 . |minIndex|) (70 . <) (76 . =) (82 . |One|)
-             (86 . |One|) (90 . -) (96 . |rest|)
-             |LSAGG-;insert!;SAIA;7| (102 . |concat!|)
+             (53 . |not|) (58 . |setrest!|) (|Mapping| 10 7)
+             |LSAGG-;select!;M2A;5| (64 . |eq?|) |LSAGG-;merge!;M3A;6|
+             (|Integer|) (70 . |minIndex|) (75 . <) (81 . =)
+             (87 . |One|) (91 . |One|) (95 . -) (101 . |rest|)
+             |LSAGG-;insert!;SAIA;7| (107 . |concat!|)
              |LSAGG-;insert!;2AIA;8| |LSAGG-;remove!;M2A;9|
-             |LSAGG-;delete!;AIA;10| (|UniversalSegment| 31)
-             (108 . |lo|) (113 . |hasHi|) (118 . |hi|)
-             (123 . |maxIndex|) (128 . +) |LSAGG-;delete!;AUsA;11|
+             |LSAGG-;delete!;AIA;10| (|UniversalSegment| 32)
+             (113 . |lo|) (118 . |hasHi|) (123 . |hi|)
+             (128 . |maxIndex|) (133 . +) |LSAGG-;delete!;AUsA;11|
              (|Union| 7 '"failed") |LSAGG-;find;MAU;12|
-             (|SingleInteger|) (134 . |One|) |LSAGG-;position;MAI;13|
-             (138 . |reverse!|) (143 . |quo|) (149 . |split!|)
-             (155 . |true|) |LSAGG-;sorted?;MAB;15|
-             |LSAGG-;reduce;MA2S;16| (159 . ~=) (165 . |reduce|)
+             (|SingleInteger|) (139 . |One|) |LSAGG-;position;MAI;13|
+             (143 . |reverse!|) (148 . |quo|) (154 . |split!|)
+             (160 . |true|) |LSAGG-;sorted?;MAB;15|
+             |LSAGG-;reduce;MA2S;16| (164 . ~=) (170 . |reduce|)
              |LSAGG-;new;NniSA;18| |LSAGG-;map;M3A;19|
-             |LSAGG-;reverse!;2A;20| (173 . |Zero|) (177 . |Zero|)
-             (181 . =) (187 . |cyclic?|) |LSAGG-;copy;2A;21|
-             (192 . |setfirst!|) |LSAGG-;copyInto!;2AIA;22|
-             (198 . |position|) (205 . =) (211 . |remove!|)
-             (217 . |removeDuplicates!|) (222 . <) (228 . <)
+             |LSAGG-;reverse!;2A;20| (178 . |Zero|) (182 . |Zero|)
+             (186 . =) (192 . |cyclic?|) |LSAGG-;copy;2A;21|
+             (197 . |setfirst!|) |LSAGG-;copyInto!;2AIA;22|
+             (203 . |position|) (210 . =) (216 . |remove!|)
+             (222 . |removeDuplicates!|) (227 . <) (233 . <)
              (|Mapping| 7 7))
-          '#(|sorted?| 234 |sort!| 240 |select!| 246 |reverse!| 252
-             |removeDuplicates!| 257 |remove!| 262 |reduce| 268
-             |position| 289 |new| 302 |merge!| 308 |merge| 315 |map|
-             322 |list| 329 |insert!| 334 |find| 348 |delete!| 354
-             |copyInto!| 366 |copy| 373 < 378)
+          '#(|sorted?| 239 |sort!| 245 |select!| 251 |reverse!| 257
+             |removeDuplicates!| 262 |remove!| 267 |reduce| 273
+             |position| 294 |new| 307 |merge!| 313 |merge| 320 |map|
+             327 |list| 334 |insert!| 339 |find| 353 |delete!| 359
+             |copyInto!| 371 |copy| 378 < 383)
           'NIL
           (CONS (|makeByteWordVec2| 1 'NIL)
                 (CONS '#()
                       (CONS '#()
-                            (|makeByteWordVec2| 79
+                            (|makeByteWordVec2| 80
                                 '(1 6 8 0 9 0 6 0 13 2 6 0 7 0 14 1 6
                                   10 0 16 1 6 0 0 17 1 6 7 0 18 3 6 7
                                   19 0 7 20 1 6 0 0 22 3 6 0 11 0 0 23
-                                  0 10 0 25 2 6 0 0 0 26 2 6 10 0 0 29
-                                  1 6 31 0 32 2 31 10 0 0 33 2 31 10 0
-                                  0 34 0 8 0 35 0 31 0 36 2 31 0 0 0 37
-                                  2 6 0 0 8 38 2 6 0 0 0 40 1 44 31 0
-                                  45 1 44 10 0 46 1 44 31 0 47 1 6 31 0
-                                  48 2 31 0 0 0 49 0 53 0 54 1 6 0 0 56
-                                  2 31 0 0 0 57 2 6 0 0 31 58 0 10 0 59
-                                  2 7 10 0 0 62 4 0 7 19 0 7 7 63 0 53
-                                  0 67 0 8 0 68 2 8 10 0 0 69 1 6 10 0
-                                  70 2 6 7 0 7 72 3 0 31 7 0 31 74 2 7
-                                  10 0 0 75 2 6 0 27 0 76 1 0 0 0 77 2
-                                  7 10 0 0 78 2 0 10 0 0 79 2 0 10 11 0
-                                  60 2 0 0 11 0 12 2 0 0 27 0 28 1 0 0
-                                  0 66 1 0 0 0 77 2 0 0 27 0 42 3 0 7
-                                  19 0 7 61 4 0 7 19 0 7 7 63 2 0 7 19
-                                  0 21 2 0 31 27 0 55 3 0 31 7 0 31 74
-                                  2 0 0 8 7 64 3 0 0 11 0 0 30 3 0 0 11
-                                  0 0 24 3 0 0 19 0 0 65 1 0 0 7 15 3 0
-                                  0 7 0 31 39 3 0 0 0 0 31 41 2 0 51 27
-                                  0 52 2 0 0 0 44 50 2 0 0 0 31 43 3 0
-                                  0 0 0 31 73 1 0 0 0 71 2 0 10 0 0 79)))))
+                                  0 10 0 25 1 10 0 0 26 2 6 0 0 0 27 2
+                                  6 10 0 0 30 1 6 32 0 33 2 32 10 0 0
+                                  34 2 32 10 0 0 35 0 8 0 36 0 32 0 37
+                                  2 32 0 0 0 38 2 6 0 0 8 39 2 6 0 0 0
+                                  41 1 45 32 0 46 1 45 10 0 47 1 45 32
+                                  0 48 1 6 32 0 49 2 32 0 0 0 50 0 54 0
+                                  55 1 6 0 0 57 2 32 0 0 0 58 2 6 0 0
+                                  32 59 0 10 0 60 2 7 10 0 0 63 4 0 7
+                                  19 0 7 7 64 0 54 0 68 0 8 0 69 2 8 10
+                                  0 0 70 1 6 10 0 71 2 6 7 0 7 73 3 0
+                                  32 7 0 32 75 2 7 10 0 0 76 2 6 0 28 0
+                                  77 1 0 0 0 78 2 7 10 0 0 79 2 0 10 0
+                                  0 80 2 0 10 11 0 61 2 0 0 11 0 12 2 0
+                                  0 28 0 29 1 0 0 0 67 1 0 0 0 78 2 0 0
+                                  28 0 43 3 0 7 19 0 7 62 4 0 7 19 0 7
+                                  7 64 2 0 7 19 0 21 2 0 32 28 0 56 3 0
+                                  32 7 0 32 75 2 0 0 8 7 65 3 0 0 11 0
+                                  0 31 3 0 0 11 0 0 24 3 0 0 19 0 0 66
+                                  1 0 0 7 15 3 0 0 7 0 32 40 3 0 0 0 0
+                                  32 42 2 0 52 28 0 53 2 0 0 0 45 51 2
+                                  0 0 0 32 44 3 0 0 0 0 32 74 1 0 0 0
+                                  72 2 0 10 0 0 80)))))
           '|lookupComplete|))