diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-05-03 20:51:40 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-05-03 20:51:40 +0000 |
| commit | 6c0cc18deacadb592fe3d68c5585979f6902cd1a (patch) | |
| tree | e6a692a4192af9746f755e855c3dfb33e99cfcfd /src/algebra/strap/HOAGG-.lsp | |
| parent | 41cb0a1a53d9022c9461c6c9137329a252b455dd (diff) | |
| download | open-axiom-6c0cc18deacadb592fe3d68c5585979f6902cd1a.tar.gz | |
Generate more readable code for functor definitions.
* interp/nruncomp.boot (washFunctorBody): New.
(buildFunctor): Use it.
* interp/g-opt.boot (optBind): New.
(optLIST): Likewise.
Diffstat (limited to 'src/algebra/strap/HOAGG-.lsp')
| -rw-r--r-- | src/algebra/strap/HOAGG-.lsp | 103 |
1 files changed, 47 insertions, 56 deletions
diff --git a/src/algebra/strap/HOAGG-.lsp b/src/algebra/strap/HOAGG-.lsp index f5a748ef..96d009a0 100644 --- a/src/algebra/strap/HOAGG-.lsp +++ b/src/algebra/strap/HOAGG-.lsp @@ -224,62 +224,53 @@ (|getShellEntry| $ 42)))))) (DEFUN |HomogeneousAggregate&| (|#1| |#2|) - (PROG (|dv$1| |dv$2| |dv$| $ |pv$|) - (RETURN - (PROGN - (LETT |dv$1| (|devaluate| |#1|) . #0=(|HomogeneousAggregate&|)) - (LETT |dv$2| (|devaluate| |#2|) . #0#) - (LETT |dv$| - (LIST '|HomogeneousAggregate&| |dv$1| |dv$2|) . #0#) - (LETT $ (|newShell| 44) . #0#) - (|setShellEntry| $ 0 |dv$|) - (|setShellEntry| $ 3 - (LETT |pv$| - (|buildPredVector| 0 0 - (LIST (|HasAttribute| |#1| '|finiteAggregate|) - (|HasAttribute| |#1| '|shallowlyMutable|) - (|HasCategory| |#2| - (LIST '|Evalable| (|devaluate| |#2|))) - (|HasCategory| |#2| '(|SetCategory|)) - (|HasCategory| |#2| - '(|CoercibleTo| (|OutputForm|))))) . #0#)) - (|stuffDomainSlots| $) - (|setShellEntry| $ 6 |#1|) - (|setShellEntry| $ 7 |#2|) - (COND - ((|testBitVector| |pv$| 3) - (|setShellEntry| $ 13 - (CONS (|dispatchFunction| |HOAGG-;eval;ALA;1|) $)))) - (COND - ((|testBitVector| |pv$| 1) - (PROGN - (|setShellEntry| $ 18 - (CONS (|dispatchFunction| |HOAGG-;#;ANni;2|) $)) - (|setShellEntry| $ 23 - (CONS (|dispatchFunction| |HOAGG-;any?;MAB;3|) $)) - (|setShellEntry| $ 24 - (CONS (|dispatchFunction| |HOAGG-;every?;MAB;4|) $)) - (|setShellEntry| $ 28 - (CONS (|dispatchFunction| |HOAGG-;count;MANni;5|) $)) - (|setShellEntry| $ 29 - (CONS (|dispatchFunction| |HOAGG-;members;AL;6|) $)) - (COND - ((|testBitVector| |pv$| 4) - (PROGN - (|setShellEntry| $ 32 - (CONS (|dispatchFunction| |HOAGG-;count;SANni;7|) - $)) - (|setShellEntry| $ 34 - (CONS (|dispatchFunction| |HOAGG-;member?;SAB;8|) - $)) - (|setShellEntry| $ 37 - (CONS (|dispatchFunction| |HOAGG-;=;2AB;9|) $))))) - (COND - ((|testBitVector| |pv$| 5) - (|setShellEntry| $ 43 - (CONS (|dispatchFunction| |HOAGG-;coerce;AOf;10|) - $))))))) - $)))) + (LET* ((|dv$1| (|devaluate| |#1|)) (|dv$2| (|devaluate| |#2|)) + (|dv$| (LIST '|HomogeneousAggregate&| |dv$1| |dv$2|)) + ($ (|newShell| 44)) + (|pv$| (|buildPredVector| 0 0 + (LIST (|HasAttribute| |#1| '|finiteAggregate|) + (|HasAttribute| |#1| '|shallowlyMutable|) + (|HasCategory| |#2| + (LIST '|Evalable| (|devaluate| |#2|))) + (|HasCategory| |#2| '(|SetCategory|)) + (|HasCategory| |#2| + (LIST '|CoercibleTo| '(|OutputForm|))))))) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 |pv$|) + (|stuffDomainSlots| $) + (|setShellEntry| $ 6 |#1|) + (|setShellEntry| $ 7 |#2|) + (COND + ((|testBitVector| |pv$| 3) + (|setShellEntry| $ 13 + (CONS (|dispatchFunction| |HOAGG-;eval;ALA;1|) $)))) + (COND + ((|testBitVector| |pv$| 1) + (PROGN + (|setShellEntry| $ 18 + (CONS (|dispatchFunction| |HOAGG-;#;ANni;2|) $)) + (|setShellEntry| $ 23 + (CONS (|dispatchFunction| |HOAGG-;any?;MAB;3|) $)) + (|setShellEntry| $ 24 + (CONS (|dispatchFunction| |HOAGG-;every?;MAB;4|) $)) + (|setShellEntry| $ 28 + (CONS (|dispatchFunction| |HOAGG-;count;MANni;5|) $)) + (|setShellEntry| $ 29 + (CONS (|dispatchFunction| |HOAGG-;members;AL;6|) $)) + (COND + ((|testBitVector| |pv$| 4) + (PROGN + (|setShellEntry| $ 32 + (CONS (|dispatchFunction| |HOAGG-;count;SANni;7|) $)) + (|setShellEntry| $ 34 + (CONS (|dispatchFunction| |HOAGG-;member?;SAB;8|) $)) + (|setShellEntry| $ 37 + (CONS (|dispatchFunction| |HOAGG-;=;2AB;9|) $))))) + (COND + ((|testBitVector| |pv$| 5) + (|setShellEntry| $ 43 + (CONS (|dispatchFunction| |HOAGG-;coerce;AOf;10|) $))))))) + $)) (MAKEPROP '|HomogeneousAggregate&| '|infovec| (LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|) |