diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-02-24 04:40:09 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-02-24 04:40:09 +0000 |
| commit | f2d31d8bc90b46e0c3373d2980cfa6f730148d1e (patch) | |
| tree | 986da80f585f5b6d221c61f54413ccf4c63d628f /src/algebra/strap/POLYCAT-.lsp | |
| parent | 7eca3ee736c49024a85ad00ff9b0a912d640380c (diff) | |
| download | open-axiom-f2d31d8bc90b46e0c3373d2980cfa6f730148d1e.tar.gz | |
* interp/c-util.boot (isSimple): Accept constructor instantiations.
* algebra/formula.spad.pamphlet: Avoid Lispisms.
* algebra/mathml.spad.pamphlet: Likewise.
* algebra/op.spad.pamphlet: Likewise.
* algebra/sex.spad.pamphlet: Likewise.
Diffstat (limited to 'src/algebra/strap/POLYCAT-.lsp')
| -rw-r--r-- | src/algebra/strap/POLYCAT-.lsp | 65 |
1 files changed, 26 insertions, 39 deletions
diff --git a/src/algebra/strap/POLYCAT-.lsp b/src/algebra/strap/POLYCAT-.lsp index d689f438..71c72c64 100644 --- a/src/algebra/strap/POLYCAT-.lsp +++ b/src/algebra/strap/POLYCAT-.lsp @@ -315,16 +315,15 @@ (SPADCALL |p| (|getShellEntry| $ 53)) |POLYCAT-;retractIfCan;SU;10|) (EXIT (COND - ((ZEROP (CAR |q|)) - (COND - ((SPADCALL - (SPADCALL (CDR |q|) - (|getShellEntry| $ 72)) - |p| (|getShellEntry| $ 54)) - (PROGN - (LETT #0# |q| - |POLYCAT-;retractIfCan;SU;10|) - (GO #0#)))))))) + ((AND (ZEROP (CAR |q|)) + (SPADCALL + (SPADCALL (CDR |q|) + (|getShellEntry| $ 72)) + |p| (|getShellEntry| $ 54))) + (PROGN + (LETT #0# |q| + |POLYCAT-;retractIfCan;SU;10|) + (GO #0#)))))) (EXIT (CONS 1 "failed")))) #0# (EXIT #0#))))) @@ -1191,39 +1190,27 @@ |POLYCAT-;primitivePart;SVarSetS;37|) $))))) (COND - ((|testBitVector| |pv$| 8) - (COND - ((|testBitVector| |pv$| 7) - (|setShellEntry| $ 222 - (CONS (|dispatchFunction| - |POLYCAT-;patternMatch;SP2Pmr;39|) - $)))))) + ((AND (|testBitVector| |pv$| 8) (|testBitVector| |pv$| 7)) + (|setShellEntry| $ 222 + (CONS (|dispatchFunction| |POLYCAT-;patternMatch;SP2Pmr;39|) + $)))) (COND - ((|testBitVector| |pv$| 6) - (COND - ((|testBitVector| |pv$| 5) - (|setShellEntry| $ 229 - (CONS (|dispatchFunction| - |POLYCAT-;patternMatch;SP2Pmr;40|) - $)))))) + ((AND (|testBitVector| |pv$| 6) (|testBitVector| |pv$| 5)) + (|setShellEntry| $ 229 + (CONS (|dispatchFunction| |POLYCAT-;patternMatch;SP2Pmr;40|) + $)))) (COND - ((|testBitVector| |pv$| 12) - (COND - ((|testBitVector| |pv$| 11) - (|setShellEntry| $ 236 - (CONS (|dispatchFunction| |POLYCAT-;convert;SP;41|) $)))))) + ((AND (|testBitVector| |pv$| 12) (|testBitVector| |pv$| 11)) + (|setShellEntry| $ 236 + (CONS (|dispatchFunction| |POLYCAT-;convert;SP;41|) $)))) (COND - ((|testBitVector| |pv$| 10) - (COND - ((|testBitVector| |pv$| 9) - (|setShellEntry| $ 243 - (CONS (|dispatchFunction| |POLYCAT-;convert;SP;42|) $)))))) + ((AND (|testBitVector| |pv$| 10) (|testBitVector| |pv$| 9)) + (|setShellEntry| $ 243 + (CONS (|dispatchFunction| |POLYCAT-;convert;SP;42|) $)))) (COND - ((|testBitVector| |pv$| 14) - (COND - ((|testBitVector| |pv$| 13) - (|setShellEntry| $ 251 - (CONS (|dispatchFunction| |POLYCAT-;convert;SIf;43|) $)))))) + ((AND (|testBitVector| |pv$| 14) (|testBitVector| |pv$| 13)) + (|setShellEntry| $ 251 + (CONS (|dispatchFunction| |POLYCAT-;convert;SIf;43|) $)))) $)) (MAKEPROP '|PolynomialCategory&| '|infovec| |