aboutsummaryrefslogtreecommitdiff
path: root/src/algebra/strap
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2011-01-31 14:14:08 +0000
committerdos-reis <gdr@axiomatics.org>2011-01-31 14:14:08 +0000
commit308c8ede509d3d186d6d43402b5335867ebdb49e (patch)
treeb2e5516092366985a775f609bb3033b7eede626f /src/algebra/strap
parent03c09deff90cb2eb7a85730f7e74bce2df268b47 (diff)
downloadopen-axiom-308c8ede509d3d186d6d43402b5335867ebdb49e.tar.gz
* interp/g-opt.boot ($VMsideEffectFreeOperators): Remove QCDR,
QCAR. SYMBOLP, GREATERP. Add %ibit, %ilength, %ident, %equal. * interp/g-util.boot: Expand them * algebra/any.spad.pamphlet: Tidy. * algebra/catdef.spad.pamphlet: Likewise. * algebra/data.spad.pamphlet: Likewise. * algebra/domain.spad.pamphlet: Likewise. * algebra/float.spad.pamphlet: Likewise. * algebra/fname.spad.pamphlet: Likewise. * algebra/integer.spad.pamphlet: Likewise. * algebra/list.spad.pamphlet: Likewise. * algebra/outform.spad.pamphlet: Likewise. * algebra/random.spad.pamphlet: Likewise. * algebra/sex.spad.pamphlet: Likewise. * algebra/si.spad.pamphlet: Likewise. * algebra/symbol.spad.pamphlet: Likewise. * algebra/syntax.spad.pamphlet: Likewise.
Diffstat (limited to 'src/algebra/strap')
-rw-r--r--src/algebra/strap/INT.lsp2
-rw-r--r--src/algebra/strap/OUTFORM.lsp2
-rw-r--r--src/algebra/strap/SINT.lsp10
-rw-r--r--src/algebra/strap/SYMBOL.lsp2
4 files changed, 8 insertions, 8 deletions
diff --git a/src/algebra/strap/INT.lsp b/src/algebra/strap/INT.lsp
index 8ed6dc18..8e681337 100644
--- a/src/algebra/strap/INT.lsp
+++ b/src/algebra/strap/INT.lsp
@@ -70,7 +70,7 @@
(DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%Integer|)
|INT;length;2$;19|))
-(PUT '|INT;length;2$;19| '|SPADreplace| 'INTEGER-LENGTH)
+(PUT '|INT;length;2$;19| '|SPADreplace| '|%ilength|)
(DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Integer| |%Shell|)
|%Integer|)
diff --git a/src/algebra/strap/OUTFORM.lsp b/src/algebra/strap/OUTFORM.lsp
index 8916bd73..af6c2e66 100644
--- a/src/algebra/strap/OUTFORM.lsp
+++ b/src/algebra/strap/OUTFORM.lsp
@@ -37,7 +37,7 @@
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Boolean|)
|OUTFORM;=;2$B;9|))
-(PUT '|OUTFORM;=;2$B;9| '|SPADreplace| 'EQUAL)
+(PUT '|OUTFORM;=;2$B;9| '|SPADreplace| '|%equal|)
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
|OUTFORM;=;3$;10|))
diff --git a/src/algebra/strap/SINT.lsp b/src/algebra/strap/SINT.lsp
index a3c55e19..634d0e12 100644
--- a/src/algebra/strap/SINT.lsp
+++ b/src/algebra/strap/SINT.lsp
@@ -194,11 +194,13 @@
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Boolean|)
|SINT;zero?;$B;43|))
-(PUT '|SINT;zero?;$B;43| '|SPADreplace| 'QSZEROP)
+(PUT '|SINT;zero?;$B;43| '|SPADreplace| '(XLAM (|x|) (|%ieq| |x| 0)))
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Boolean|)
|SINT;one?;$B;44|))
+(PUT '|SINT;one?;$B;44| '|SPADreplace| '(XLAM (|x|) (|%ieq| |x| 1)))
+
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
|SINT;max;3$;45|))
@@ -217,7 +219,7 @@
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|)
|SINT;length;2$;48|))
-(PUT '|SINT;length;2$;48| '|SPADreplace| 'INTEGER-LENGTH)
+(PUT '|SINT;length;2$;48| '|SPADreplace| '|%ilength|)
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
|SINT;shift;3$;49|))
@@ -287,8 +289,6 @@
(PUT '|SINT;or;3$;24| '|SPADreplace| 'LOGIOR)
-(PUT '|SINT;one?;$B;44| '|SPADreplace| '(XLAM (|x|) (|%ieq| |x| 1)))
-
(DEFUN |SINT;writeOMSingleInt| (|dev| |x| $)
(SEQ (COND
((QSMINUSP |x|)
@@ -433,7 +433,7 @@
(DEFUN |SINT;odd?;$B;42| (|x| $) (DECLARE (IGNORE $)) (ODDP |x|))
-(DEFUN |SINT;zero?;$B;43| (|x| $) (DECLARE (IGNORE $)) (QSZEROP |x|))
+(DEFUN |SINT;zero?;$B;43| (|x| $) (DECLARE (IGNORE $)) (ZEROP |x|))
(DEFUN |SINT;one?;$B;44| (|x| $) (DECLARE (IGNORE $)) (EQL |x| 1))
diff --git a/src/algebra/strap/SYMBOL.lsp b/src/algebra/strap/SYMBOL.lsp
index 72bde704..71fd3a5c 100644
--- a/src/algebra/strap/SYMBOL.lsp
+++ b/src/algebra/strap/SYMBOL.lsp
@@ -31,7 +31,7 @@
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Boolean|)
|SYMBOL;=;2$B;9|))
-(PUT '|SYMBOL;=;2$B;9| '|SPADreplace| 'EQUAL)
+(PUT '|SYMBOL;=;2$B;9| '|SPADreplace| '|%equal|)
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Boolean|)
|SYMBOL;<;2$B;10|))