diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-06-01 08:01:00 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-06-01 08:01:00 +0000 |
| commit | 6fff2c66d36bf2f6cacf1d9086ba6c80eb5f7f64 (patch) | |
| tree | ecd96105b5ee50cf5e81dfe1eb506797730e2955 /src/algebra/strap/LNAGG-.lsp | |
| parent | 78dd44d657fa65a8029d996aaf7ac05d2133f509 (diff) | |
| download | open-axiom-6fff2c66d36bf2f6cacf1d9086ba6c80eb5f7f64.tar.gz | |
* interp/compiler.boot (compGreaterThan): Remove.
* interp/parse.boot (parseGreaterEqual): Likewise.
Diffstat (limited to 'src/algebra/strap/LNAGG-.lsp')
| -rw-r--r-- | src/algebra/strap/LNAGG-.lsp | 56 |
1 files changed, 29 insertions, 27 deletions
diff --git a/src/algebra/strap/LNAGG-.lsp b/src/algebra/strap/LNAGG-.lsp index 912a1dcb..7182758d 100644 --- a/src/algebra/strap/LNAGG-.lsp +++ b/src/algebra/strap/LNAGG-.lsp @@ -37,23 +37,24 @@ (DEFUN |LNAGG-;index?;IAB;2| (|i| |a| $) (COND - ((< |i| (SPADCALL |a| (|getShellEntry| $ 9))) 'NIL) - ('T (NOT (< (SPADCALL |a| (|getShellEntry| $ 10)) |i|))))) + ((>= |i| (SPADCALL |a| (|getShellEntry| $ 9))) + (NOT (> |i| (SPADCALL |a| (|getShellEntry| $ 10))))) + ('T 'NIL))) (DEFUN |LNAGG-;concat;ASA;3| (|a| |x| $) - (SPADCALL |a| (SPADCALL 1 |x| (|getShellEntry| $ 21)) - (|getShellEntry| $ 22))) + (SPADCALL |a| (SPADCALL 1 |x| (|getShellEntry| $ 22)) + (|getShellEntry| $ 23))) (DEFUN |LNAGG-;concat;S2A;4| (|x| |y| $) - (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 21)) |y| - (|getShellEntry| $ 22))) + (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 22)) |y| + (|getShellEntry| $ 23))) (DEFUN |LNAGG-;insert;SAIA;5| (|x| |a| |i| $) - (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 21)) |a| |i| - (|getShellEntry| $ 25))) + (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 22)) |a| |i| + (|getShellEntry| $ 26))) (DEFUN |LNAGG-;maxIndex;AI;6| (|l| $) - (+ (- (SPADCALL |l| (|getShellEntry| $ 27)) 1) + (+ (- (SPADCALL |l| (|getShellEntry| $ 28)) 1) (SPADCALL |l| (|getShellEntry| $ 9)))) (DEFUN |LinearAggregate&| (|#1| |#2|) @@ -63,7 +64,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| 32) . #0#) + (LETT $ (|newShell| 33) . #0#) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 (LETT |pv$| @@ -74,31 +75,32 @@ (|setShellEntry| $ 7 |#2|) (COND ((|HasAttribute| |#1| '|finiteAggregate|) - (|setShellEntry| $ 30 + (|setShellEntry| $ 31 (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|) (10 . <) (16 . |false|) - (20 . |not|) |LNAGG-;index?;IAB;2| (|NonNegativeInteger|) - (25 . |One|) (29 . |One|) (33 . |new|) (39 . |concat|) - |LNAGG-;concat;ASA;3| |LNAGG-;concat;S2A;4| - (45 . |insert|) |LNAGG-;insert;SAIA;5| (52 . |#|) (57 . -) - (63 . +) (69 . |maxIndex|) (|List| $)) - '#(|maxIndex| 74 |insert| 79 |indices| 86 |index?| 91 - |concat| 97) + |LNAGG-;indices;AL;1| (|Boolean|) (10 . >=) (16 . >) + (22 . |not|) (27 . |false|) |LNAGG-;index?;IAB;2| + (|NonNegativeInteger|) (31 . |One|) (35 . |One|) + (39 . |new|) (45 . |concat|) |LNAGG-;concat;ASA;3| + |LNAGG-;concat;S2A;4| (51 . |insert|) + |LNAGG-;insert;SAIA;5| (58 . |#|) (63 . -) (69 . +) + (75 . |maxIndex|) (|List| $)) + '#(|maxIndex| 80 |insert| 85 |indices| 92 |index?| 97 + |concat| 103) 'NIL (CONS (|makeByteWordVec2| 1 'NIL) (CONS '#() (CONS '#() - (|makeByteWordVec2| 30 - '(1 6 8 0 9 1 6 8 0 10 2 8 13 0 0 14 0 - 13 0 15 1 13 0 0 16 0 18 0 19 0 8 0 - 20 2 6 0 18 7 21 2 6 0 0 0 22 3 6 0 0 - 0 8 25 1 6 18 0 27 2 8 0 0 0 28 2 8 0 - 0 0 29 1 0 8 0 30 1 0 8 0 30 3 0 0 7 - 0 8 26 1 0 11 0 12 2 0 13 8 0 17 2 0 - 0 0 7 23 2 0 0 7 0 24))))) + (|makeByteWordVec2| 31 + '(1 6 8 0 9 1 6 8 0 10 2 8 13 0 0 14 2 + 8 13 0 0 15 1 13 0 0 16 0 13 0 17 0 + 19 0 20 0 8 0 21 2 6 0 19 7 22 2 6 0 + 0 0 23 3 6 0 0 0 8 26 1 6 19 0 28 2 8 + 0 0 0 29 2 8 0 0 0 30 1 0 8 0 31 1 0 + 8 0 31 3 0 0 7 0 8 27 1 0 11 0 12 2 0 + 13 8 0 18 2 0 0 0 7 24 2 0 0 7 0 25))))) '|lookupComplete|)) |