aboutsummaryrefslogtreecommitdiff
path: root/src/interp
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2011-02-11 16:26:54 +0000
committerdos-reis <gdr@axiomatics.org>2011-02-11 16:26:54 +0000
commitf14f1018fb9d94d4bff48e1475978b0a9deec0d1 (patch)
tree4a45ff073c8114ba630883236bc1daab52e911d9 /src/interp
parent0129463153f8237d0aed03deda4316dd3d45d7c2 (diff)
downloadopen-axiom-f14f1018fb9d94d4bff48e1475978b0a9deec0d1.tar.gz
* interp/g-opt.boot ($VMsideEffectFreeOperators): Include %funcall
and %nothing. * algebra/mkfunc.spad.pamphlet: Use %funcall instead of FUNCALL.
Diffstat (limited to 'src/interp')
-rw-r--r--src/interp/g-opt.boot2
-rw-r--r--src/interp/lisp-backend.boot1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot
index 6d4b3e41..797b50d8 100644
--- a/src/interp/g-opt.boot
+++ b/src/interp/g-opt.boot
@@ -404,7 +404,7 @@ optSuchthat [.,:u] == ["SUCHTHAT",:u]
++ List of VM side effect free operators.
$VMsideEffectFreeOperators ==
'(SPADfirst ASH IDENTP FLOAT_-RADIX FLOAT FLOAT_-SIGN
- %when %false %true %otherwise %2bit %2bool
+ %funcall %nothing %when %false %true %otherwise %2bit %2bool
%and %or %not %peq %ieq %ilt %ile %igt %ige %head %tail %integer?
%beq %blt %ble %bgt %bge %bitand %bitior %bitxor %bitnot %bcompl
%ilength %ibit %icst0 %icst1
diff --git a/src/interp/lisp-backend.boot b/src/interp/lisp-backend.boot
index 151520d1..915b4efb 100644
--- a/src/interp/lisp-backend.boot
+++ b/src/interp/lisp-backend.boot
@@ -587,6 +587,7 @@ for x in [
['%lam, :'LAMBDA],
['%leave, :'RETURN],
['%otherwise,:'T],
+ ['%funcall, :'FUNCALL],
['%when, :'COND]
] repeat property(first x,'%Rename) := rest x