diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-03-01 05:22:19 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-03-01 05:22:19 +0000 |
| commit | c42526006076b88ff2755f33eb1defd2e455e67e (patch) | |
| tree | 975c82ab94b65bc41169dd0c339700d4a2efc825 /src/algebra/strap/LNAGG-.lsp | |
| parent | 4311f047fffe6dbc6f58ba4f37f074cc9d155630 (diff) | |
| download | open-axiom-c42526006076b88ff2755f33eb1defd2e455e67e.tar.gz | |
Optimization should not change slot numbers.
Diffstat (limited to 'src/algebra/strap/LNAGG-.lsp')
| -rw-r--r-- | src/algebra/strap/LNAGG-.lsp | 45 |
1 files changed, 24 insertions, 21 deletions
diff --git a/src/algebra/strap/LNAGG-.lsp b/src/algebra/strap/LNAGG-.lsp index 6f6d374f..d140a5dc 100644 --- a/src/algebra/strap/LNAGG-.lsp +++ b/src/algebra/strap/LNAGG-.lsp @@ -41,19 +41,19 @@ ('T (NOT (< (SPADCALL |a| (|getShellEntry| $ 10)) |i|))))) (DEFUN |LNAGG-;concat;ASA;3| (|a| |x| $) - (SPADCALL |a| (SPADCALL 1 |x| (|getShellEntry| $ 16)) - (|getShellEntry| $ 17))) + (SPADCALL |a| (SPADCALL 1 |x| (|getShellEntry| $ 20)) + (|getShellEntry| $ 21))) (DEFUN |LNAGG-;concat;S2A;4| (|x| |y| $) - (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 16)) |y| - (|getShellEntry| $ 17))) + (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 20)) |y| + (|getShellEntry| $ 21))) (DEFUN |LNAGG-;insert;SAIA;5| (|x| |a| |i| $) - (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 16)) |a| |i| - (|getShellEntry| $ 20))) + (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 20)) |a| |i| + (|getShellEntry| $ 24))) (DEFUN |LNAGG-;maxIndex;AI;6| (|l| $) - (+ (- (SPADCALL |l| (|getShellEntry| $ 22)) 1) + (+ (- (SPADCALL |l| (|getShellEntry| $ 26)) 1) (SPADCALL |l| (|getShellEntry| $ 9)))) (DEFUN |LinearAggregate&| (|#1| |#2|) @@ -63,7 +63,7 @@ (LETT |dv$1| (|devaluate| |#1|) . #0=(|LinearAggregate&|)) (LETT |dv$2| (|devaluate| |#2|) . #0#) (LETT |dv$| (LIST '|LinearAggregate&| |dv$1| |dv$2|) . #0#) - (LETT $ (|newShell| 25) . #0#) + (LETT $ (|newShell| 31) . #0#) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 (LETT |pv$| @@ -74,28 +74,31 @@ (|setShellEntry| $ 7 |#2|) (COND ((|HasAttribute| |#1| '|finiteAggregate|) - (|setShellEntry| $ 23 + (|setShellEntry| $ 29 (CONS (|dispatchFunction| |LNAGG-;maxIndex;AI;6|) $)))) $)))) (MAKEPROP '|LinearAggregate&| '|infovec| (LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|) (|Integer|) (0 . |minIndex|) (5 . |maxIndex|) (|List| 8) - |LNAGG-;indices;AL;1| (|Boolean|) |LNAGG-;index?;IAB;2| - (|NonNegativeInteger|) (10 . |new|) (16 . |concat|) + |LNAGG-;indices;AL;1| (|Boolean|) (10 . <) (16 . |false|) + |LNAGG-;index?;IAB;2| (|NonNegativeInteger|) (20 . |One|) + (24 . |One|) (28 . |new|) (34 . |concat|) |LNAGG-;concat;ASA;3| |LNAGG-;concat;S2A;4| - (22 . |insert|) |LNAGG-;insert;SAIA;5| (29 . |#|) - (34 . |maxIndex|) (|List| $)) - '#(|maxIndex| 39 |insert| 44 |indices| 51 |index?| 56 - |concat| 62) + (40 . |insert|) |LNAGG-;insert;SAIA;5| (47 . |#|) (52 . -) + (58 . +) (64 . |maxIndex|) (|List| $)) + '#(|maxIndex| 69 |insert| 74 |indices| 81 |index?| 86 + |concat| 92) 'NIL (CONS (|makeByteWordVec2| 1 'NIL) (CONS '#() (CONS '#() - (|makeByteWordVec2| 23 - '(1 6 8 0 9 1 6 8 0 10 2 6 0 15 7 16 2 - 6 0 0 0 17 3 6 0 0 0 8 20 1 6 15 0 22 - 1 0 8 0 23 1 0 8 0 23 3 0 0 7 0 8 21 - 1 0 11 0 12 2 0 13 8 0 14 2 0 0 0 7 - 18 2 0 0 7 0 19))))) + (|makeByteWordVec2| 29 + '(1 6 8 0 9 1 6 8 0 10 2 8 13 0 0 14 0 + 13 0 15 0 17 0 18 0 8 0 19 2 6 0 17 7 + 20 2 6 0 0 0 21 3 6 0 0 0 8 24 1 6 17 + 0 26 2 8 0 0 0 27 2 8 0 0 0 28 1 0 8 + 0 29 1 0 8 0 29 3 0 0 7 0 8 25 1 0 11 + 0 12 2 0 13 8 0 16 2 0 0 0 7 22 2 0 0 + 7 0 23))))) '|lookupComplete|)) |