From bcf4deb1f4de85c07a6c91d2fb59a77545e317b0 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Fri, 29 May 2009 04:10:14 +0000 Subject: * interp/compiler.boot (getSuccessEnvironment): Tidy. (getInverseEnvironment): Likewise. (compLogicalNot): Don't normalize to if-statement. --- src/algebra/strap/LNAGG-.lsp | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'src/algebra/strap/LNAGG-.lsp') diff --git a/src/algebra/strap/LNAGG-.lsp b/src/algebra/strap/LNAGG-.lsp index d140a5dc..912a1dcb 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| $ 20)) - (|getShellEntry| $ 21))) + (SPADCALL |a| (SPADCALL 1 |x| (|getShellEntry| $ 21)) + (|getShellEntry| $ 22))) (DEFUN |LNAGG-;concat;S2A;4| (|x| |y| $) - (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 20)) |y| - (|getShellEntry| $ 21))) + (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 21)) |y| + (|getShellEntry| $ 22))) (DEFUN |LNAGG-;insert;SAIA;5| (|x| |a| |i| $) - (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 20)) |a| |i| - (|getShellEntry| $ 24))) + (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 21)) |a| |i| + (|getShellEntry| $ 25))) (DEFUN |LNAGG-;maxIndex;AI;6| (|l| $) - (+ (- (SPADCALL |l| (|getShellEntry| $ 26)) 1) + (+ (- (SPADCALL |l| (|getShellEntry| $ 27)) 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| 31) . #0#) + (LETT $ (|newShell| 32) . #0#) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 (LETT |pv$| @@ -74,7 +74,7 @@ (|setShellEntry| $ 7 |#2|) (COND ((|HasAttribute| |#1| '|finiteAggregate|) - (|setShellEntry| $ 29 + (|setShellEntry| $ 30 (CONS (|dispatchFunction| |LNAGG-;maxIndex;AI;6|) $)))) $)))) @@ -82,23 +82,23 @@ (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|) - |LNAGG-;index?;IAB;2| (|NonNegativeInteger|) (20 . |One|) - (24 . |One|) (28 . |new|) (34 . |concat|) + (20 . |not|) |LNAGG-;index?;IAB;2| (|NonNegativeInteger|) + (25 . |One|) (29 . |One|) (33 . |new|) (39 . |concat|) |LNAGG-;concat;ASA;3| |LNAGG-;concat;S2A;4| - (40 . |insert|) |LNAGG-;insert;SAIA;5| (47 . |#|) (52 . -) - (58 . +) (64 . |maxIndex|) (|List| $)) - '#(|maxIndex| 69 |insert| 74 |indices| 81 |index?| 86 - |concat| 92) + (45 . |insert|) |LNAGG-;insert;SAIA;5| (52 . |#|) (57 . -) + (63 . +) (69 . |maxIndex|) (|List| $)) + '#(|maxIndex| 74 |insert| 79 |indices| 86 |index?| 91 + |concat| 97) 'NIL (CONS (|makeByteWordVec2| 1 'NIL) (CONS '#() (CONS '#() - (|makeByteWordVec2| 29 + (|makeByteWordVec2| 30 '(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))))) + 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))))) '|lookupComplete|)) -- cgit v1.2.3