From c42526006076b88ff2755f33eb1defd2e455e67e Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sun, 1 Mar 2009 05:22:19 +0000 Subject: Optimization should not change slot numbers. --- src/algebra/strap/ILIST.lsp | 211 +++++++++++++++++++++++--------------------- 1 file changed, 110 insertions(+), 101 deletions(-) (limited to 'src/algebra/strap/ILIST.lsp') diff --git a/src/algebra/strap/ILIST.lsp b/src/algebra/strap/ILIST.lsp index ee2b5370..2a1dfcbc 100644 --- a/src/algebra/strap/ILIST.lsp +++ b/src/algebra/strap/ILIST.lsp @@ -202,7 +202,7 @@ (SEQ (COND ((EQ |i| 1000) (COND - ((SPADCALL |x| (|getShellEntry| $ 33)) + ((SPADCALL |x| (|getShellEntry| $ 39)) (|error| "cyclic list"))))) (LETT |y| (CONS (QCAR |x|) |y|) |ILIST;copy;2$;20|) @@ -215,25 +215,25 @@ (PROG (|s| |y| |z|) (RETURN (SEQ (LETT |y| NIL |ILIST;coerce;$Of;21|) - (LETT |s| (SPADCALL |x| (|getShellEntry| $ 35)) + (LETT |s| (SPADCALL |x| (|getShellEntry| $ 44)) |ILIST;coerce;$Of;21|) (SEQ G190 (COND ((NULL (NEQ |x| |s|)) (GO G191))) (SEQ (LETT |y| (CONS (SPADCALL (|SPADfirst| |x|) - (|getShellEntry| $ 37)) + (|getShellEntry| $ 45)) |y|) |ILIST;coerce;$Of;21|) (EXIT (LETT |x| (CDR |x|) |ILIST;coerce;$Of;21|))) NIL (GO G190) G191 (EXIT NIL)) (LETT |y| (NREVERSE |y|) |ILIST;coerce;$Of;21|) (EXIT (COND - ((NULL |s|) (SPADCALL |y| (|getShellEntry| $ 39))) + ((NULL |s|) (SPADCALL |y| (|getShellEntry| $ 49))) ('T (SEQ (LETT |z| (SPADCALL (SPADCALL (|SPADfirst| |x|) - (|getShellEntry| $ 37)) - (|getShellEntry| $ 41)) + (|getShellEntry| $ 45)) + (|getShellEntry| $ 50)) |ILIST;coerce;$Of;21|) (SEQ G190 (COND @@ -244,7 +244,7 @@ (LETT |z| (CONS (SPADCALL (|SPADfirst| |x|) - (|getShellEntry| $ 37)) + (|getShellEntry| $ 45)) |z|) |ILIST;coerce;$Of;21|))) NIL (GO G190) G191 (EXIT NIL)) @@ -252,10 +252,10 @@ (SPADCALL |y| (SPADCALL (SPADCALL (NREVERSE |z|) - (|getShellEntry| $ 42)) - (|getShellEntry| $ 43)) - (|getShellEntry| $ 44)) - (|getShellEntry| $ 39))))))))))) + (|getShellEntry| $ 51)) + (|getShellEntry| $ 52)) + (|getShellEntry| $ 53)) + (|getShellEntry| $ 49))))))))))) (DEFUN |ILIST;=;2$B;22| (|x| |y| $) (PROG (#0=#:G1470) @@ -272,7 +272,7 @@ (SEQ (EXIT (COND ((SPADCALL (QCAR |x|) (QCAR |y|) - (|getShellEntry| $ 46)) + (|getShellEntry| $ 57)) (PROGN (LETT #0# 'NIL |ILIST;=;2$B;22|) @@ -298,7 +298,7 @@ (SEQ (LETT |s| (STRCONC |s| (SPADCALL (QCAR |x|) - (|getShellEntry| $ 49))) + (|getShellEntry| $ 60))) |ILIST;latex;$S;23|) (LETT |x| (QCDR |x|) |ILIST;latex;$S;23|) (EXIT (COND @@ -315,7 +315,7 @@ (COND ((NULL (NOT (NULL |x|))) (GO G191))) (SEQ (EXIT (COND ((SPADCALL |s| (QCAR |x|) - (|getShellEntry| $ 51)) + (|getShellEntry| $ 63)) (PROGN (LETT #0# 'T |ILIST;member?;S$B;24|) @@ -368,7 +368,7 @@ (SEQ (EXIT (COND ((SPADCALL (QCAR |pr|) |f| - (|getShellEntry| $ 51)) + (|getShellEntry| $ 63)) (QRPLACD |pp| (QCDR |pr|))) ('T (LETT |pp| |pr| @@ -501,7 +501,7 @@ (LETT |dv$1| (|devaluate| |#1|) . #0=(|IndexedList|)) (LETT |dv$2| (|devaluate| |#2|) . #0#) (LETT |dv$| (LIST '|IndexedList| |dv$1| |dv$2|) . #0#) - (LETT $ (|newShell| 72) . #0#) + (LETT $ (|newShell| 88) . #0#) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 (LETT |pv$| @@ -543,20 +543,20 @@ (|setShellEntry| $ 7 |#2|) (COND ((|testBitVector| |pv$| 8) - (|setShellEntry| $ 45 + (|setShellEntry| $ 54 (CONS (|dispatchFunction| |ILIST;coerce;$Of;21|) $)))) (COND ((|testBitVector| |pv$| 7) (PROGN - (|setShellEntry| $ 47 + (|setShellEntry| $ 58 (CONS (|dispatchFunction| |ILIST;=;2$B;22|) $)) - (|setShellEntry| $ 50 + (|setShellEntry| $ 62 (CONS (|dispatchFunction| |ILIST;latex;$S;23|) $)) - (|setShellEntry| $ 52 + (|setShellEntry| $ 64 (CONS (|dispatchFunction| |ILIST;member?;S$B;24|) $))))) (COND ((|testBitVector| |pv$| 7) - (|setShellEntry| $ 54 + (|setShellEntry| $ 66 (CONS (|dispatchFunction| |ILIST;removeDuplicates!;2$;26|) $)))) @@ -573,43 +573,47 @@ |ILIST;setelt;$rest2$;13| (|List| 6) |ILIST;construct;L$;14| |ILIST;parts;$L;15| |ILIST;reverse!;2$;16| |ILIST;reverse;2$;17| (|Integer|) - |ILIST;minIndex;$I;18| |ILIST;rest;$Nni$;19| - (0 . |cyclic?|) |ILIST;copy;2$;20| (5 . |cycleEntry|) - (|OutputForm|) (10 . |coerce|) (|List| $) (15 . |bracket|) - (|List| 36) (20 . |list|) (25 . |commaSeparate|) - (30 . |overbar|) (35 . |concat!|) (41 . |coerce|) - (46 . ~=) (52 . =) (|String|) (58 . |latex|) - (63 . |latex|) (68 . =) (74 . |member?|) - |ILIST;concat!;3$;25| (80 . |removeDuplicates!|) - (|Mapping| 11 6 6) |ILIST;sort!;M2$;27| - |ILIST;merge!;M3$;28| |ILIST;split!;$I$;29| - (|Mapping| 6 6 6) (|Equation| 6) (|List| 60) + |ILIST;minIndex;$I;18| (|SingleInteger|) (0 . |One|) + (4 . |One|) |ILIST;rest;$Nni$;19| (8 . |Zero|) + (12 . |Zero|) (16 . |not|) (21 . |cyclic?|) + |ILIST;copy;2$;20| (|OutputForm|) (|List| 41) + (26 . |empty|) (30 . |cycleEntry|) (35 . |coerce|) + (40 . |concat|) (46 . |reverse!|) (|List| $) + (51 . |bracket|) (56 . |list|) (61 . |commaSeparate|) + (66 . |overbar|) (71 . |concat!|) (77 . |coerce|) + (82 . |true|) (86 . |false|) (90 . ~=) (96 . =) (|String|) + (102 . |latex|) (107 . |concat|) (113 . |latex|) (118 . =) + (124 . |member?|) |ILIST;concat!;3$;25| + (130 . |removeDuplicates!|) (|Mapping| 11 6 6) + |ILIST;sort!;M2$;27| |ILIST;merge!;M3$;28| (135 . |One|) + (139 . <) (145 . -) |ILIST;split!;$I$;29| (151 . =) + (157 . |quo|) (|Mapping| 6 6 6) (|Equation| 6) (|List| 77) (|Mapping| 11 6) (|Void|) (|UniversalSegment| 30) '"last" - '"value" (|Mapping| 6 6) (|InputForm|) (|SingleInteger|) - (|List| 30) (|Union| 6 '"failed")) - '#(~= 85 |value| 91 |third| 96 |tail| 101 |swap!| 106 - |split!| 113 |sorted?| 119 |sort!| 130 |sort| 141 |size?| - 152 |setvalue!| 158 |setrest!| 164 |setlast!| 170 - |setfirst!| 176 |setelt| 182 |setchildren!| 224 |select!| - 230 |select| 236 |second| 242 |sample| 247 |reverse!| 251 - |reverse| 256 |rest| 261 |removeDuplicates!| 272 - |removeDuplicates| 277 |remove!| 282 |remove| 294 |reduce| - 306 |qsetelt!| 327 |qelt| 334 |possiblyInfinite?| 340 - |position| 345 |parts| 364 |nodes| 369 |node?| 374 |new| - 380 |more?| 386 |minIndex| 392 |min| 397 |merge!| 403 - |merge| 416 |members| 429 |member?| 434 |maxIndex| 440 - |max| 445 |map!| 451 |map| 457 |list| 470 |less?| 475 - |leaves| 481 |leaf?| 486 |latex| 491 |last| 496 |insert!| - 507 |insert| 521 |indices| 535 |index?| 540 |hash| 546 - |first| 551 |find| 562 |fill!| 568 |explicitlyFinite?| 574 - |every?| 579 |eval| 585 |eq?| 611 |entry?| 617 |entries| - 623 |empty?| 628 |empty| 633 |elt| 637 |distance| 680 - |delete!| 686 |delete| 698 |cyclic?| 710 |cycleTail| 715 - |cycleSplit!| 720 |cycleLength| 725 |cycleEntry| 730 - |count| 735 |copyInto!| 747 |copy| 754 |convert| 759 - |construct| 764 |concat!| 769 |concat| 781 |coerce| 804 - |children| 809 |child?| 814 |any?| 820 >= 826 > 832 = 838 - <= 844 < 850 |#| 856) + '"value" (|Mapping| 6 6) (|InputForm|) (|List| 30) + (|Union| 6 '"failed")) + '#(~= 163 |value| 169 |third| 174 |tail| 179 |swap!| 184 + |split!| 191 |sorted?| 197 |sort!| 208 |sort| 219 |size?| + 230 |setvalue!| 236 |setrest!| 242 |setlast!| 248 + |setfirst!| 254 |setelt| 260 |setchildren!| 302 |select!| + 308 |select| 314 |second| 320 |sample| 325 |reverse!| 329 + |reverse| 334 |rest| 339 |removeDuplicates!| 350 + |removeDuplicates| 355 |remove!| 360 |remove| 372 |reduce| + 384 |qsetelt!| 405 |qelt| 412 |possiblyInfinite?| 418 + |position| 423 |parts| 442 |nodes| 447 |node?| 452 |new| + 458 |more?| 464 |minIndex| 470 |min| 475 |merge!| 481 + |merge| 494 |members| 507 |member?| 512 |maxIndex| 518 + |max| 523 |map!| 529 |map| 535 |list| 548 |less?| 553 + |leaves| 559 |leaf?| 564 |latex| 569 |last| 574 |insert!| + 585 |insert| 599 |indices| 613 |index?| 618 |hash| 624 + |first| 629 |find| 640 |fill!| 646 |explicitlyFinite?| 652 + |every?| 657 |eval| 663 |eq?| 689 |entry?| 695 |entries| + 701 |empty?| 706 |empty| 711 |elt| 715 |distance| 758 + |delete!| 764 |delete| 776 |cyclic?| 788 |cycleTail| 793 + |cycleSplit!| 798 |cycleLength| 803 |cycleEntry| 808 + |count| 813 |copyInto!| 825 |copy| 832 |convert| 837 + |construct| 842 |concat!| 847 |concat| 859 |coerce| 882 + |children| 887 |child?| 892 |any?| 898 >= 904 > 910 = 916 + <= 922 < 928 |#| 934) '((|shallowlyMutable| . 0) (|finiteAggregate| . 0)) (CONS (|makeByteWordVec2| 5 '(0 0 0 0 0 0 0 0 0 0 5 0 0 1 4 0 0 1 2 3 4)) @@ -636,58 +640,63 @@ (|EltableAggregate| 30 6) (|Evalable| 6) (|SetCategory|) (|Type|) (|Eltable| 30 6) (|InnerEvalable| 6 6) - (|CoercibleTo| 36) (|ConvertibleTo| 68) + (|CoercibleTo| 41) (|ConvertibleTo| 85) (|BasicType|)) - (|makeByteWordVec2| 71 - '(1 0 11 0 33 1 0 0 0 35 1 6 36 0 37 1 - 36 0 38 39 1 40 0 36 41 1 36 0 38 42 - 1 36 0 0 43 2 40 0 0 36 44 1 0 36 0 - 45 2 6 11 0 0 46 2 0 11 0 0 47 1 6 48 - 0 49 1 0 48 0 50 2 6 11 0 0 51 2 0 11 - 6 0 52 1 0 0 0 54 2 7 11 0 0 1 1 0 6 - 0 1 1 0 6 0 1 1 0 0 0 1 3 0 63 0 30 - 30 1 2 0 0 0 30 58 1 5 11 0 1 2 0 11 - 55 0 1 1 5 0 0 1 2 0 0 55 0 56 1 5 0 - 0 1 2 0 0 55 0 1 2 0 11 0 8 1 2 0 6 0 + (|makeByteWordVec2| 87 + '(0 32 0 33 0 8 0 34 0 32 0 36 0 8 0 37 + 1 11 0 0 38 1 0 11 0 39 0 42 0 43 1 0 + 0 0 44 1 6 41 0 45 2 42 0 41 0 46 1 + 42 0 0 47 1 41 0 48 49 1 42 0 41 50 1 + 41 0 48 51 1 41 0 0 52 2 42 0 0 41 53 + 1 0 41 0 54 0 11 0 55 0 11 0 56 2 6 + 11 0 0 57 2 0 11 0 0 58 1 6 59 0 60 2 + 59 0 0 0 61 1 0 59 0 62 2 6 11 0 0 63 + 2 0 11 6 0 64 1 0 0 0 66 0 30 0 70 2 + 30 11 0 0 71 2 30 0 0 0 72 2 30 11 0 + 0 74 2 30 0 0 0 75 2 7 11 0 0 1 1 0 6 + 0 1 1 0 6 0 1 1 0 0 0 1 3 0 80 0 30 + 30 1 2 0 0 0 30 73 1 5 11 0 1 2 0 11 + 67 0 1 1 5 0 0 1 2 0 0 67 0 68 1 5 0 + 0 1 2 0 0 67 0 1 2 0 11 0 8 1 2 0 6 0 6 1 2 0 0 0 0 23 2 0 6 0 6 1 2 0 6 0 - 6 21 3 0 6 0 30 6 1 3 0 6 0 64 6 1 3 - 0 6 0 65 6 1 3 0 0 0 19 0 24 3 0 6 0 - 14 6 22 3 0 6 0 66 6 1 2 0 0 0 38 1 2 - 0 0 62 0 1 2 0 0 62 0 1 1 0 6 0 1 0 0 + 6 21 3 0 6 0 30 6 1 3 0 6 0 81 6 1 3 + 0 6 0 82 6 1 3 0 0 0 19 0 24 3 0 6 0 + 14 6 22 3 0 6 0 83 6 1 2 0 0 0 48 1 2 + 0 0 79 0 1 2 0 0 79 0 1 1 0 6 0 1 0 0 0 1 1 0 0 0 28 1 0 0 0 29 2 0 0 0 8 - 32 1 0 0 0 18 1 7 0 0 54 1 7 0 0 1 2 - 7 0 6 0 1 2 0 0 62 0 1 2 7 0 6 0 1 2 - 0 0 62 0 1 4 7 6 59 0 6 6 1 2 0 6 59 - 0 1 3 0 6 59 0 6 1 3 0 6 0 30 6 1 2 0 + 35 1 0 0 0 18 1 7 0 0 66 1 7 0 0 1 2 + 7 0 6 0 1 2 0 0 79 0 1 2 7 0 6 0 1 2 + 0 0 79 0 1 4 7 6 76 0 6 6 1 2 0 6 76 + 0 1 3 0 6 76 0 6 1 3 0 6 0 30 6 1 2 0 6 0 30 1 1 0 11 0 1 2 7 30 6 0 1 3 7 - 30 6 0 30 1 2 0 30 62 0 1 1 0 25 0 27 - 1 0 38 0 1 2 7 11 0 0 1 2 0 0 8 6 1 2 + 30 6 0 30 1 2 0 30 79 0 1 1 0 25 0 27 + 1 0 48 0 1 2 7 11 0 0 1 2 0 0 8 6 1 2 0 11 0 8 1 1 6 30 0 31 2 5 0 0 0 1 2 - 5 0 0 0 1 3 0 0 55 0 0 57 2 5 0 0 0 1 - 3 0 0 55 0 0 1 1 0 25 0 1 2 7 11 6 0 - 52 1 6 30 0 1 2 5 0 0 0 1 2 0 0 67 0 - 1 3 0 0 59 0 0 1 2 0 0 67 0 1 1 0 0 6 + 5 0 0 0 1 3 0 0 67 0 0 69 2 5 0 0 0 1 + 3 0 0 67 0 0 1 1 0 25 0 1 2 7 11 6 0 + 64 1 6 30 0 1 2 5 0 0 0 1 2 0 0 84 0 + 1 3 0 0 76 0 0 1 2 0 0 84 0 1 1 0 0 6 1 2 0 11 0 8 1 1 0 25 0 1 1 0 11 0 1 - 1 7 48 0 50 2 0 0 0 8 1 1 0 6 0 1 3 0 + 1 7 59 0 62 2 0 0 0 8 1 1 0 6 0 1 3 0 0 6 0 30 1 3 0 0 0 0 30 1 3 0 0 0 0 - 30 1 3 0 0 6 0 30 1 1 0 70 0 1 2 0 11 - 30 0 1 1 7 69 0 1 2 0 0 0 8 1 1 0 6 0 - 13 2 0 71 62 0 1 2 0 0 0 6 1 1 0 11 0 - 1 2 0 11 62 0 1 3 9 0 0 6 6 1 3 9 0 0 - 25 25 1 2 9 0 0 60 1 2 9 0 0 61 1 2 0 + 30 1 3 0 0 6 0 30 1 1 0 86 0 1 2 0 11 + 30 0 1 1 7 32 0 1 2 0 0 0 8 1 1 0 6 0 + 13 2 0 87 79 0 1 2 0 0 0 6 1 1 0 11 0 + 1 2 0 11 79 0 1 3 9 0 0 6 6 1 3 9 0 0 + 25 25 1 2 9 0 0 77 1 2 9 0 0 78 1 2 0 11 0 0 12 2 7 11 6 0 1 1 0 25 0 1 1 0 11 0 17 0 0 0 16 2 0 6 0 30 1 3 0 6 0 - 30 6 1 2 0 0 0 64 1 2 0 6 0 65 1 2 0 - 0 0 19 20 2 0 6 0 14 15 2 0 6 0 66 1 - 2 0 30 0 0 1 2 0 0 0 64 1 2 0 0 0 30 - 1 2 0 0 0 64 1 2 0 0 0 30 1 1 0 11 0 - 33 1 0 0 0 1 1 0 0 0 1 1 0 8 0 1 1 0 - 0 0 35 2 7 8 6 0 1 2 0 8 62 0 1 3 0 0 - 0 0 30 1 1 0 0 0 34 1 3 68 0 1 1 0 0 - 25 26 2 0 0 0 0 53 2 0 0 0 6 1 1 0 0 - 38 1 2 0 0 0 6 1 2 0 0 6 0 10 2 0 0 0 - 0 1 1 8 36 0 45 1 0 38 0 1 2 7 11 0 0 - 1 2 0 11 62 0 1 2 5 11 0 0 1 2 5 11 0 - 0 1 2 7 11 0 0 47 2 5 11 0 0 1 2 5 11 + 30 6 1 2 0 0 0 81 1 2 0 6 0 82 1 2 0 + 0 0 19 20 2 0 6 0 14 15 2 0 6 0 83 1 + 2 0 30 0 0 1 2 0 0 0 81 1 2 0 0 0 30 + 1 2 0 0 0 81 1 2 0 0 0 30 1 1 0 11 0 + 39 1 0 0 0 1 1 0 0 0 1 1 0 8 0 1 1 0 + 0 0 44 2 7 8 6 0 1 2 0 8 79 0 1 3 0 0 + 0 0 30 1 1 0 0 0 40 1 3 85 0 1 1 0 0 + 25 26 2 0 0 0 0 65 2 0 0 0 6 1 1 0 0 + 48 1 2 0 0 0 6 1 2 0 0 6 0 10 2 0 0 0 + 0 1 1 8 41 0 54 1 0 48 0 1 2 7 11 0 0 + 1 2 0 11 79 0 1 2 5 11 0 0 1 2 5 11 0 + 0 1 2 7 11 0 0 58 2 5 11 0 0 1 2 5 11 0 0 1 1 0 8 0 9))))) '|lookupComplete|)) -- cgit v1.2.3