diff options
| author | dos-reis <gdr@axiomatics.org> | 2012-05-01 02:27:52 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2012-05-01 02:27:52 +0000 |
| commit | e37c877a8ad003972fc6c0206dc6220e266f0a8b (patch) | |
| tree | 6a4dafe69f35f013172cdbf7b646064328380986 /src/interp/sys-macros.lisp | |
| parent | 52d8ccbf25a71457f923860824696742328bdb35 (diff) | |
| download | open-axiom-e37c877a8ad003972fc6c0206dc6220e266f0a8b.tar.gz | |
* algebra/integer.spad.pamphlet (Integer): Use %iaddmod, %isubmod,
%imulmod.
* algebra/si.spad.pamphlet (SingleInteger): Likewise.
* interp/c-util.boot (devaluate): Use # in lieu of QVSIZE.
* interp/g-opt.boot: %ilfshift and %irshift are now builtin
side-effect free operations.
* interp/lisp-backend.boot: Translate them.
* interp/g-util.boot (mergeSort): Avoid QSDIFFERENCE.
* interp/slam.boot: Likewise.
* interp/sys-macros.lisp: Likewise.
* interp/macros.lisp: Avoid QVMAXINDEX.
* interp/vmlisp.lisp (QSDIFFERENCE): Remove.
(QSGREATERP): Likewise.
(QSLEFTSHIFT): Likewise.
(QSLESSP): Likewise.
(QSMAX): Likewise.
(QSMIN): Likewise.
(QSMINUS): Likewise.
(QSMINUSP): Likewise.
(QSODDP): Likewise.
(QSABSVAL): Likewise.
(QSPLUS): Likewise.
(QSZEROP): Likewise.
(QVMAXINDEX): Likewise.
(QVSIZE): Likewise.
(ZERO?): Likewise.
Diffstat (limited to 'src/interp/sys-macros.lisp')
| -rw-r--r-- | src/interp/sys-macros.lisp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/interp/sys-macros.lisp b/src/interp/sys-macros.lisp index 8e949642..39d0385e 100644 --- a/src/interp/sys-macros.lisp +++ b/src/interp/sys-macros.lisp @@ -512,7 +512,7 @@ (defun MKQSADD1 (X) (COND ((ATOM X) `(1+ ,X)) - ((AND (member (CAR X) '(-DIFFERENCE QSDIFFERENCE -) :test #'eq) + ((AND (member (CAR X) '(-DIFFERENCE |%isub| -) :test #'eq) (EQL 1 (CADDR X))) (CADR X)) (`(1+ ,X)))) @@ -605,19 +605,19 @@ ;; If CADDDR U is not an atom, only compute the value once (PUSH (if (INTEGERP INC) - (LIST (if (QSMINUSP INC) - 'QSLESSP - 'QSGREATERP) + (LIST (if (MINUSP INC) + '< + '>) (CAR U) FINAL) - `(if (QSMINUSP ,INC) - (QSLESSP ,(CAR U) ,FINAL) - (QSGREATERP ,(CAR U) ,FINAL))) + `(if (MINUSP ,INC) + (< ,(CAR U) ,FINAL) + (> ,(CAR U) ,FINAL))) XCL))) (PUSH (LIST (CAR U) (CADR U) (COND ((|member| INC '(1 (|One|))) (MKQSADD1 (CAR U))) - ((LIST 'QSPLUS (CAR U) INC)) )) + ((LIST '+ (CAR U) INC)) )) IL)) (ON (PUSH (LIST 'ATOM (CAR U)) XCL) |