diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-07-22 16:15:30 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-07-22 16:15:30 +0000 |
| commit | 510c2f70ce377d60eed221e46294767f7f548f5d (patch) | |
| tree | db7b49602660346425298790df1ffcb9ad5f7c26 /src/algebra/strap/SYMBOL.lsp | |
| parent | c1da0d2561b27741a6feb73336b0712f5ddc7e97 (diff) | |
| download | open-axiom-510c2f70ce377d60eed221e46294767f7f548f5d.tar.gz | |
* interp/g-opt.boot (simplifyVMForm): New.
(optRetract): Simplify the predicate when possible.
(optNot): New transformer.
(optAnd): Likewise.
(optOr): Likewise.
(optIlt): Likewise.
(optIle): Likewise.
(optIgt): Likewise.
(optIge): Likewise.
Diffstat (limited to 'src/algebra/strap/SYMBOL.lsp')
| -rw-r--r-- | src/algebra/strap/SYMBOL.lsp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/algebra/strap/SYMBOL.lsp b/src/algebra/strap/SYMBOL.lsp index 0c928c37..190f733b 100644 --- a/src/algebra/strap/SYMBOL.lsp +++ b/src/algebra/strap/SYMBOL.lsp @@ -200,7 +200,8 @@ (SEQ (LOOP (COND ((NOT (COND - ((>= (LENGTH |ns|) 2) (ZEROP (|SPADfirst| |ns|))) + ((NOT (< (LENGTH |ns|) 2)) + (ZEROP (|SPADfirst| |ns|))) ('T NIL))) (RETURN NIL)) (T (SETQ |ns| (CDR |ns|))))) @@ -440,14 +441,15 @@ (SETQ |xx| (STRCONC "%" |xx|)) (SETQ |xx| (COND - ((>= (SPADCALL - (SPADCALL |xx| - (SPADCALL |xx| (|getShellEntry| $ 128)) - (|getShellEntry| $ 106)) - (|getShellEntry| $ 19) - (|getShellEntry| $ 129)) - (SPADCALL (|getShellEntry| $ 19) - (|getShellEntry| $ 117))) + ((NOT (< (SPADCALL + (SPADCALL |xx| + (SPADCALL |xx| + (|getShellEntry| $ 128)) + (|getShellEntry| $ 106)) + (|getShellEntry| $ 19) + (|getShellEntry| $ 129)) + (SPADCALL (|getShellEntry| $ 19) + (|getShellEntry| $ 117)))) (STRCONC |xx| (|SYMBOL;anyRadix| |n| (|getShellEntry| $ 21) $))) @@ -546,7 +548,7 @@ (|getShellEntry| $ 106)) (|getShellEntry| $ 44)) (|getShellEntry| $ 45)))) - (|check-subtype| (>= #0# 0) + (|check-subtype| (NOT (MINUSP #0#)) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 148)))) (SETQ |i| (+ |i| 1)) |