aboutsummaryrefslogtreecommitdiff
path: root/src/algebra/strap
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2010-07-22 23:30:09 +0000
committerdos-reis <gdr@axiomatics.org>2010-07-22 23:30:09 +0000
commit95d7a3a8c107a8b722f97afdc0266449aad3a5bc (patch)
treeb14f1bb96a61322950da273f750b14ef41467b68 /src/algebra/strap
parent024f4b2055594e528ec98e733bd50684b2366db0 (diff)
downloadopen-axiom-95d7a3a8c107a8b722f97afdc0266449aad3a5bc.tar.gz
more cleanup
Diffstat (limited to 'src/algebra/strap')
-rw-r--r--src/algebra/strap/INT.lsp13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/algebra/strap/INT.lsp b/src/algebra/strap/INT.lsp
index c294d8df..5c5fe790 100644
--- a/src/algebra/strap/INT.lsp
+++ b/src/algebra/strap/INT.lsp
@@ -56,8 +56,6 @@
(DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%Boolean|)
|INT;negative?;$B;15|))
-(PUT '|INT;negative?;$B;15| '|SPADreplace| 'MINUSP)
-
(DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%Thing|)
|INT;coerce;$Of;16|))
@@ -263,6 +261,9 @@
(PUT '|INT;dec;2$;13| '|SPADreplace| '(XLAM (|x|) (|%isub| |x| 1)))
+(PUT '|INT;negative?;$B;15| '|SPADreplace|
+ '(XLAM (|x|) (|%ilt| |x| 0)))
+
(PUT '|INT;unitCanonical;2$;55| '|SPADreplace| '|%iabs|)
(DEFUN |INT;writeOMInt| (|dev| |x| $)
@@ -372,8 +373,10 @@
(PROG (|r|)
(RETURN
(COND
- ((MINUSP (LETT |r| (REMAINDER2 |a| |b|)
- |INT;positiveRemainder;3$;28|))
+ ((|INT;negative?;$B;15|
+ (LETT |r| (REMAINDER2 |a| |b|)
+ |INT;positiveRemainder;3$;28|)
+ $)
(COND ((MINUSP |b|) (- |r| |b|)) ('T (+ |r| |b|))))
('T |r|)))))
@@ -498,7 +501,7 @@
(DEFUN |Integer| ()
(DECLARE (SPECIAL |$ConstructorCache|))
- (PROG (#0=#:G1527)
+ (PROG (#0=#:G1528)
(RETURN
(COND
((SETQ #0# (HGET |$ConstructorCache| '|Integer|))