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/ISTRING.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/ISTRING.lsp')
| -rw-r--r-- | src/algebra/strap/ISTRING.lsp | 84 |
1 files changed, 39 insertions, 45 deletions
diff --git a/src/algebra/strap/ISTRING.lsp b/src/algebra/strap/ISTRING.lsp index 71091f35..f224b0e8 100644 --- a/src/algebra/strap/ISTRING.lsp +++ b/src/algebra/strap/ISTRING.lsp @@ -833,52 +833,46 @@ (HREM |$ConstructorCache| '|IndexedString|))))))))))) (DEFUN |IndexedString;| (|#1|) - (PROG (|dv$1| |dv$| $ |pv$|) - (RETURN - (PROGN - (LETT |dv$1| (|devaluate| |#1|) . #0=(|IndexedString|)) - (LETT |dv$| (LIST '|IndexedString| |dv$1|) . #0#) - (LETT $ (|newShell| 101) . #0#) - (|setShellEntry| $ 0 |dv$|) - (|setShellEntry| $ 3 - (LETT |pv$| - (|buildPredVector| 0 0 - (LIST (OR (AND (|HasCategory| (|Character|) - '(|OrderedSet|)) - (|HasCategory| (|Character|) - '(|Evalable| (|Character|)))) - (AND (|HasCategory| (|Character|) - '(|SetCategory|)) - (|HasCategory| (|Character|) - '(|Evalable| (|Character|))))) - (OR (|HasCategory| (|Character|) - '(|CoercibleTo| (|OutputForm|))) - (AND (|HasCategory| (|Character|) - '(|SetCategory|)) - (|HasCategory| (|Character|) - '(|Evalable| (|Character|))))) - (|HasCategory| (|Character|) - '(|ConvertibleTo| (|InputForm|))) - (OR (|HasCategory| (|Character|) + (LET* ((|dv$1| (|devaluate| |#1|)) + (|dv$| (LIST '|IndexedString| |dv$1|)) ($ (|newShell| 101)) + (|pv$| (|buildPredVector| 0 0 + (LIST (OR (AND (|HasCategory| (|Character|) '(|OrderedSet|)) - (|HasCategory| (|Character|) - '(|SetCategory|))) - (|HasCategory| (|Character|) - '(|OrderedSet|)) - (|HasCategory| (|Integer|) '(|OrderedSet|)) - (|HasCategory| (|Character|) - '(|SetCategory|)) - (|HasCategory| (|Character|) - '(|CoercibleTo| (|OutputForm|))) - (AND (|HasCategory| (|Character|) - '(|SetCategory|)) - (|HasCategory| (|Character|) - '(|Evalable| (|Character|)))))) . #0#)) - (|haddProp| |$ConstructorCache| '|IndexedString| (LIST |dv$1|) - (CONS 1 $)) - (|stuffDomainSlots| $) - (|setShellEntry| $ 6 |#1|) - $)))) + (|HasCategory| (|Character|) + (LIST '|Evalable| '(|Character|)))) + (AND (|HasCategory| (|Character|) + '(|SetCategory|)) + (|HasCategory| (|Character|) + (LIST '|Evalable| '(|Character|))))) + (OR (|HasCategory| (|Character|) + (LIST '|CoercibleTo| '(|OutputForm|))) + (AND (|HasCategory| (|Character|) + '(|SetCategory|)) + (|HasCategory| (|Character|) + (LIST '|Evalable| '(|Character|))))) + (|HasCategory| (|Character|) + (LIST '|ConvertibleTo| '(|InputForm|))) + (OR (|HasCategory| (|Character|) + '(|OrderedSet|)) + (|HasCategory| (|Character|) + '(|SetCategory|))) + (|HasCategory| (|Character|) '(|OrderedSet|)) + (|HasCategory| (|Integer|) '(|OrderedSet|)) + (|HasCategory| (|Character|) + '(|SetCategory|)) + (|HasCategory| (|Character|) + (LIST '|CoercibleTo| '(|OutputForm|))) + (AND (|HasCategory| (|Character|) + '(|SetCategory|)) + (|HasCategory| (|Character|) + (LIST '|Evalable| '(|Character|)))))))) + (|setShellEntry| $ 0 |dv$|) + (|setShellEntry| $ 3 |pv$|) + (|haddProp| |$ConstructorCache| '|IndexedString| (LIST |dv$1|) + (CONS 1 $)) + (|stuffDomainSlots| $) + (|setShellEntry| $ 6 |#1|) + $)) (MAKEPROP '|IndexedString| '|infovec| (LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) |