diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-07-25 00:12:57 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-07-25 00:12:57 +0000 |
| commit | f5181e8acaf34cb5a26a30bd3901a19485933c6d (patch) | |
| tree | e30eb7600dbe651222f96e3d977e052285475227 /src/algebra/strap/HOAGG.lsp | |
| parent | c19e54f03e3230811e6c86998568ce63ccbc42c9 (diff) | |
| download | open-axiom-f5181e8acaf34cb5a26a30bd3901a19485933c6d.tar.gz | |
* interp/cattable.boot: Use %true for truth value in VM expressions.
* interp/clam.boot: Likewise.
* interp/define.boot: Likewise.
* interp/format.boot: Likewise.
* interp/functor.boot: Likewise.
* interp/g-opt.boot: Likewise.
* interp/mark.boot: Likewise.
* interp/pspad1.boot: Likewise.
* interp/pspad2.boot: Likewise.
* interp/slam.boot: Likewise.
* interp/wi1.boot: Likewise.
* interp/wi2.boot: Likewise.
* interp/sys-constants.boot: Remove $true and $false as unused.
Diffstat (limited to 'src/algebra/strap/HOAGG.lsp')
| -rw-r--r-- | src/algebra/strap/HOAGG.lsp | 121 |
1 files changed, 60 insertions, 61 deletions
diff --git a/src/algebra/strap/HOAGG.lsp b/src/algebra/strap/HOAGG.lsp index d256f98a..44e52b8b 100644 --- a/src/algebra/strap/HOAGG.lsp +++ b/src/algebra/strap/HOAGG.lsp @@ -10,70 +10,69 @@ (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|))) (COND (|HomogeneousAggregate;CAT|) - ('T - (SETQ |HomogeneousAggregate;CAT| - (|Join| (|Aggregate|) - (|mkCategory| '|domain| - '(((|map| - ($ (|Mapping| |t#1| |t#1|) $)) - T) - ((|map!| - ($ (|Mapping| |t#1| |t#1|) $)) + (T (SETQ |HomogeneousAggregate;CAT| + (|Join| (|Aggregate|) + (|mkCategory| '|domain| + '(((|map| + ($ (|Mapping| |t#1| |t#1|) $)) + T) + ((|map!| + ($ (|Mapping| |t#1| |t#1|) $)) + (|has| $ + (ATTRIBUTE |shallowlyMutable|))) + ((|any?| + ((|Boolean|) + (|Mapping| (|Boolean|) |t#1|) + $)) + (|has| $ + (ATTRIBUTE |finiteAggregate|))) + ((|every?| + ((|Boolean|) + (|Mapping| (|Boolean|) |t#1|) + $)) + (|has| $ + (ATTRIBUTE |finiteAggregate|))) + ((|count| + ((|NonNegativeInteger|) + (|Mapping| (|Boolean|) |t#1|) + $)) + (|has| $ + (ATTRIBUTE |finiteAggregate|))) + ((|parts| ((|List| |t#1|) $)) + (|has| $ + (ATTRIBUTE |finiteAggregate|))) + ((|members| ((|List| |t#1|) $)) + (|has| $ + (ATTRIBUTE |finiteAggregate|))) + ((|count| + ((|NonNegativeInteger|) |t#1| + $)) + (AND + (|has| |t#1| (|SetCategory|)) (|has| $ - (ATTRIBUTE |shallowlyMutable|))) - ((|any?| - ((|Boolean|) - (|Mapping| (|Boolean|) |t#1|) - $)) + (ATTRIBUTE |finiteAggregate|)))) + ((|member?| + ((|Boolean|) |t#1| $)) + (AND + (|has| |t#1| (|SetCategory|)) (|has| $ - (ATTRIBUTE |finiteAggregate|))) - ((|every?| - ((|Boolean|) - (|Mapping| (|Boolean|) |t#1|) - $)) - (|has| $ - (ATTRIBUTE |finiteAggregate|))) - ((|count| - ((|NonNegativeInteger|) - (|Mapping| (|Boolean|) |t#1|) - $)) - (|has| $ - (ATTRIBUTE |finiteAggregate|))) - ((|parts| ((|List| |t#1|) $)) - (|has| $ - (ATTRIBUTE |finiteAggregate|))) - ((|members| ((|List| |t#1|) $)) - (|has| $ - (ATTRIBUTE |finiteAggregate|))) - ((|count| - ((|NonNegativeInteger|) |t#1| - $)) - (AND - (|has| |t#1| (|SetCategory|)) - (|has| $ - (ATTRIBUTE |finiteAggregate|)))) - ((|member?| - ((|Boolean|) |t#1| $)) - (AND - (|has| |t#1| (|SetCategory|)) - (|has| $ - (ATTRIBUTE |finiteAggregate|))))) - '(((|CoercibleTo| (|OutputForm|)) + (ATTRIBUTE |finiteAggregate|))))) + '(((|CoercibleTo| (|OutputForm|)) + (|has| |t#1| + (|CoercibleTo| (|OutputForm|)))) + ((|BasicType|) + (|has| |t#1| (|BasicType|))) + ((|SetCategory|) + (|has| |t#1| (|SetCategory|))) + ((|Evalable| |t#1|) + (AND (|has| |t#1| - (|CoercibleTo| (|OutputForm|)))) - ((|BasicType|) - (|has| |t#1| (|BasicType|))) - ((|SetCategory|) - (|has| |t#1| (|SetCategory|))) - ((|Evalable| |t#1|) - (AND - (|has| |t#1| - (|Evalable| |t#1|)) - (|has| |t#1| (|SetCategory|))))) - '((|Boolean|) - (|NonNegativeInteger|) - (|List| |t#1|)) - NIL)))))))) + (|Evalable| |t#1|)) + (|has| |t#1| (|SetCategory|))))) + '((|Boolean|) + (|NonNegativeInteger|) + (|List| |t#1|)) + NIL)))))))) (|setShellEntry| #0# 0 (LIST '|HomogeneousAggregate| (|devaluate| |t#1|))) #0#)) |