aboutsummaryrefslogtreecommitdiff
path: root/src/algebra/strap/LNAGG.lsp
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2010-05-05 01:23:36 +0000
committerdos-reis <gdr@axiomatics.org>2010-05-05 01:23:36 +0000
commit5768bef1b2b7cd3fd38733a26a33ec2f0d8e6c01 (patch)
treebbe038276bb180f6d391dee2ca22388cd1aba2d2 /src/algebra/strap/LNAGG.lsp
parent9d2955097e1bd70c06df5c5a55da67fb151466c2 (diff)
downloadopen-axiom-5768bef1b2b7cd3fd38733a26a33ec2f0d8e6c01.tar.gz
* interp/c-util.boot (backendCompileSPADSLAM): Generate more
readable Lisp code.
Diffstat (limited to 'src/algebra/strap/LNAGG.lsp')
-rw-r--r--src/algebra/strap/LNAGG.lsp50
1 files changed, 23 insertions, 27 deletions
diff --git a/src/algebra/strap/LNAGG.lsp b/src/algebra/strap/LNAGG.lsp
index ce7cf516..fe5b1777 100644
--- a/src/algebra/strap/LNAGG.lsp
+++ b/src/algebra/strap/LNAGG.lsp
@@ -6,22 +6,17 @@
(DEFPARAMETER |LinearAggregate;AL| 'NIL)
(DEFUN |LinearAggregate;| (|t#1|)
- (PROG (#0=#:G1399)
- (RETURN
- (PROG1 (LETT #0#
- (|sublisV|
- (PAIR '(|t#1|) (LIST (|devaluate| |t#1|)))
- (|sublisV|
- (PAIR '(#1=#:G1397 #2=#:G1398)
- (LIST '(|Integer|)
- '(|UniversalSegment|
- (|Integer|))))
- (COND
- (|LinearAggregate;CAT|)
- ('T
- (LETT |LinearAggregate;CAT|
- (|Join|
- (|IndexedAggregate| '#1# '|t#1|)
+ (LET ((#0=#:G1399
+ (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|)))
+ (|sublisV|
+ (PAIR '(#1=#:G1397 #2=#:G1398)
+ (LIST '(|Integer|)
+ '(|UniversalSegment| (|Integer|))))
+ (COND
+ (|LinearAggregate;CAT|)
+ ('T
+ (LETT |LinearAggregate;CAT|
+ (|Join| (|IndexedAggregate| '#1# '|t#1|)
(|Collection| '|t#1|)
(|Eltable| '#2# '$)
(|mkCategory| '|domain|
@@ -65,17 +60,18 @@
(|Integer|) (|List| $)
(|NonNegativeInteger|))
NIL))
- . #3=(|LinearAggregate|)))))) . #3#)
- (|setShellEntry| #0# 0
- (LIST '|LinearAggregate| (|devaluate| |t#1|)))))))
+ |LinearAggregate|)))))))
+ (|setShellEntry| #0# 0
+ (LIST '|LinearAggregate| (|devaluate| |t#1|)))
+ #0#))
(DEFUN |LinearAggregate| (#0=#:G1400)
- (LET (#1=#:G1401)
+ (LET ((#1=#:G1401 (|assoc| (|devaluate| #0#) |LinearAggregate;AL|)))
(COND
- ((SETQ #1# (|assoc| (|devaluate| #0#) |LinearAggregate;AL|))
- (CDR #1#))
- (T (SETQ |LinearAggregate;AL|
- (|cons5| (CONS (|devaluate| #0#)
- (SETQ #1# (|LinearAggregate;| #0#)))
- |LinearAggregate;AL|))
- #1#))))
+ (#1# (CDR #1#))
+ (T (PROGN
+ (SETQ #1# (|LinearAggregate;| #0#))
+ (SETQ |LinearAggregate;AL|
+ (|cons5| (CONS (|devaluate| #0#) #1#)
+ |LinearAggregate;AL|))
+ #1#)))))