diff options
author | dos-reis <gdr@axiomatics.org> | 2011-02-05 03:52:54 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2011-02-05 03:52:54 +0000 |
commit | 5eebd42bedc639efb11826fcc56520afbb4637ca (patch) | |
tree | c692329216ca44718ddb41e58679d5c334187a4f /src/algebra/strap | |
parent | dd16b47e4904b1839b2918cf5b38c352979a6141 (diff) | |
download | open-axiom-5eebd42bedc639efb11826fcc56520afbb4637ca.tar.gz |
* interp/g-opt.boot ($VMsideEffectFreeOperators): Remove CGREATERP
and GGREATERP. Add VM-level complex number operators.
* interp/lisp-backend.boot: Expand them.
* algebra/gaussian.spad.pamphlet (ComplexCategory): Use VM form
instead of Lisp level forms.
* algebra/pfr.spad.pamphlet (PartialFraction): Likewise.
* algebra/si.spad.pamphlet (SingleInteger): Likewise.
* algebra/symbol.spad.pamphlet (Symbol): Likewise.
Diffstat (limited to 'src/algebra/strap')
-rw-r--r-- | src/algebra/strap/SINT.lsp | 24 | ||||
-rw-r--r-- | src/algebra/strap/SYMBOL.lsp | 3 |
2 files changed, 13 insertions, 14 deletions
diff --git a/src/algebra/strap/SINT.lsp b/src/algebra/strap/SINT.lsp index 4632edb4..18b88fc4 100644 --- a/src/algebra/strap/SINT.lsp +++ b/src/algebra/strap/SINT.lsp @@ -62,48 +62,52 @@ (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|) |SINT;~;2$;16|)) -(PUT '|SINT;~;2$;16| '|SPADreplace| 'LOGNOT) +(PUT '|SINT;~;2$;16| '|SPADreplace| '|%bitnot|) (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|) |SINT;not;2$;17|)) -(PUT '|SINT;not;2$;17| '|SPADreplace| 'LOGNOT) +(PUT '|SINT;not;2$;17| '|SPADreplace| '|%bitnot|) (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|) |SINT;/\\;3$;18|)) -(PUT '|SINT;/\\;3$;18| '|SPADreplace| 'LOGAND) +(PUT '|SINT;/\\;3$;18| '|SPADreplace| '|%bitand|) (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|) |SINT;\\/;3$;19|)) -(PUT '|SINT;\\/;3$;19| '|SPADreplace| 'LOGIOR) +(PUT '|SINT;\\/;3$;19| '|SPADreplace| '|%bitior|) (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|) |SINT;Not;2$;20|)) -(PUT '|SINT;Not;2$;20| '|SPADreplace| 'LOGNOT) +(PUT '|SINT;Not;2$;20| '|SPADreplace| '|%bitnot|) (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|) |SINT;And;3$;21|)) -(PUT '|SINT;And;3$;21| '|SPADreplace| 'LOGAND) +(PUT '|SINT;And;3$;21| '|SPADreplace| '|%bitand|) (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|) |SINT;and;3$;22|)) +(PUT '|SINT;and;3$;22| '|SPADreplace| '|%bitand|) + (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|) |SINT;Or;3$;23|)) -(PUT '|SINT;Or;3$;23| '|SPADreplace| 'LOGIOR) +(PUT '|SINT;Or;3$;23| '|SPADreplace| '|%bitior|) (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|) |SINT;or;3$;24|)) +(PUT '|SINT;or;3$;24| '|SPADreplace| '|%bitior|) + (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|) |SINT;xor;3$;25|)) -(PUT '|SINT;xor;3$;25| '|SPADreplace| 'LOGXOR) +(PUT '|SINT;xor;3$;25| '|SPADreplace| '|%bitxor|) (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Boolean|) |SINT;<;2$B;26|)) @@ -280,10 +284,6 @@ (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Shell|) |SINT;unitNormal;$R;62|)) -(PUT '|SINT;and;3$;22| '|SPADreplace| 'LOGAND) - -(PUT '|SINT;or;3$;24| '|SPADreplace| 'LOGIOR) - (PUT '|SINT;size;Nni;54| '|SPADreplace| '(XLAM NIL (|%iadd| (|%isub| |$ShortMaximum| |$ShortMinimum|) 1))) diff --git a/src/algebra/strap/SYMBOL.lsp b/src/algebra/strap/SYMBOL.lsp index 320352ff..add07b55 100644 --- a/src/algebra/strap/SYMBOL.lsp +++ b/src/algebra/strap/SYMBOL.lsp @@ -36,8 +36,7 @@ (DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Boolean|) |SYMBOL;<;2$B;10|)) -(PUT '|SYMBOL;<;2$B;10| '|SPADreplace| - '(XLAM (|x| |y|) (GGREATERP |y| |x|))) +(PUT '|SYMBOL;<;2$B;10| '|SPADreplace| '|%before?|) (DECLAIM (FTYPE (FUNCTION (|%Thing| |%Shell|) |%Thing|) |SYMBOL;coerce;$Of;11|)) |