From 5768bef1b2b7cd3fd38733a26a33ec2f0d8e6c01 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Wed, 5 May 2010 01:23:36 +0000 Subject: * interp/c-util.boot (backendCompileSPADSLAM): Generate more readable Lisp code. --- src/algebra/strap/CLAGG.lsp | 167 +++++++++++++++++++------------------------- 1 file changed, 73 insertions(+), 94 deletions(-) (limited to 'src/algebra/strap/CLAGG.lsp') diff --git a/src/algebra/strap/CLAGG.lsp b/src/algebra/strap/CLAGG.lsp index ce380a1a..eab9160d 100644 --- a/src/algebra/strap/CLAGG.lsp +++ b/src/algebra/strap/CLAGG.lsp @@ -6,100 +6,79 @@ (DEFPARAMETER |Collection;AL| 'NIL) (DEFUN |Collection;| (|t#1|) - (PROG (#0=#:G1396) - (RETURN - (PROG1 (LETT #0# - (|sublisV| - (PAIR '(|t#1|) (LIST (|devaluate| |t#1|))) - (COND - (|Collection;CAT|) - ('T - (LETT |Collection;CAT| - (|Join| (|HomogeneousAggregate| '|t#1|) - (|mkCategory| '|domain| - '(((|construct| - ($ (|List| |t#1|))) - T) - ((|find| - ((|Union| |t#1| "failed") - (|Mapping| (|Boolean|) - |t#1|) - $)) - T) - ((|reduce| - (|t#1| - (|Mapping| |t#1| |t#1| - |t#1|) - $)) - (|has| $ - (ATTRIBUTE - |finiteAggregate|))) - ((|reduce| - (|t#1| - (|Mapping| |t#1| |t#1| - |t#1|) - $ |t#1|)) - (|has| $ - (ATTRIBUTE - |finiteAggregate|))) - ((|remove| - ($ - (|Mapping| (|Boolean|) - |t#1|) - $)) - (|has| $ - (ATTRIBUTE - |finiteAggregate|))) - ((|select| - ($ - (|Mapping| (|Boolean|) - |t#1|) - $)) - (|has| $ - (ATTRIBUTE - |finiteAggregate|))) - ((|reduce| - (|t#1| - (|Mapping| |t#1| |t#1| - |t#1|) - $ |t#1| |t#1|)) - (AND - (|has| |t#1| - (|SetCategory|)) - (|has| $ - (ATTRIBUTE - |finiteAggregate|)))) - ((|remove| ($ |t#1| $)) - (AND - (|has| |t#1| - (|SetCategory|)) - (|has| $ - (ATTRIBUTE - |finiteAggregate|)))) - ((|removeDuplicates| ($ $)) - (AND - (|has| |t#1| - (|SetCategory|)) - (|has| $ - (ATTRIBUTE - |finiteAggregate|))))) - '(((|ConvertibleTo| - (|InputForm|)) - (|has| |t#1| - (|ConvertibleTo| - (|InputForm|))))) - '((|List| |t#1|)) NIL)) - . #1=(|Collection|))))) . #1#) - (|setShellEntry| #0# 0 - (LIST '|Collection| (|devaluate| |t#1|))))))) + (LET ((#0=#:G1396 + (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|))) + (COND + (|Collection;CAT|) + ('T + (LETT |Collection;CAT| + (|Join| (|HomogeneousAggregate| '|t#1|) + (|mkCategory| '|domain| + '(((|construct| + ($ (|List| |t#1|))) + T) + ((|find| + ((|Union| |t#1| "failed") + (|Mapping| (|Boolean|) |t#1|) + $)) + T) + ((|reduce| + (|t#1| + (|Mapping| |t#1| |t#1| |t#1|) + $)) + (|has| $ + (ATTRIBUTE |finiteAggregate|))) + ((|reduce| + (|t#1| + (|Mapping| |t#1| |t#1| |t#1|) + $ |t#1|)) + (|has| $ + (ATTRIBUTE |finiteAggregate|))) + ((|remove| + ($ + (|Mapping| (|Boolean|) |t#1|) + $)) + (|has| $ + (ATTRIBUTE |finiteAggregate|))) + ((|select| + ($ + (|Mapping| (|Boolean|) |t#1|) + $)) + (|has| $ + (ATTRIBUTE |finiteAggregate|))) + ((|reduce| + (|t#1| + (|Mapping| |t#1| |t#1| |t#1|) + $ |t#1| |t#1|)) + (AND + (|has| |t#1| (|SetCategory|)) + (|has| $ + (ATTRIBUTE |finiteAggregate|)))) + ((|remove| ($ |t#1| $)) + (AND + (|has| |t#1| (|SetCategory|)) + (|has| $ + (ATTRIBUTE |finiteAggregate|)))) + ((|removeDuplicates| ($ $)) + (AND + (|has| |t#1| (|SetCategory|)) + (|has| $ + (ATTRIBUTE |finiteAggregate|))))) + '(((|ConvertibleTo| (|InputForm|)) + (|has| |t#1| + (|ConvertibleTo| + (|InputForm|))))) + '((|List| |t#1|)) NIL)) + |Collection|)))))) + (|setShellEntry| #0# 0 (LIST '|Collection| (|devaluate| |t#1|))) + #0#)) (DEFUN |Collection| (#0=#:G1397) - (LET (#1=#:G1398) + (LET ((#1=#:G1398 (|assoc| (|devaluate| #0#) |Collection;AL|))) (COND - ((SETQ #1# (|assoc| (|devaluate| #0#) |Collection;AL|)) - (CDR #1#)) - (T (SETQ |Collection;AL| - (|cons5| (CONS (|devaluate| #0#) - (SETQ #1# (|Collection;| #0#))) - |Collection;AL|)) - #1#)))) + (#1# (CDR #1#)) + (T (PROGN + (SETQ #1# (|Collection;| #0#)) + (SETQ |Collection;AL| + (|cons5| (CONS (|devaluate| #0#) #1#) |Collection;AL|)) + #1#))))) -- cgit v1.2.3