aboutsummaryrefslogtreecommitdiff
path: root/src/interp/i-intern.boot
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2009-09-25 20:48:45 +0000
committerdos-reis <gdr@axiomatics.org>2009-09-25 20:48:45 +0000
commit489cfd14dccfcaf7b0ebd41e9d0f8e081a9d1d9f (patch)
tree84a87ab3bdba58fe9fd2975efc829d1ed10b8781 /src/interp/i-intern.boot
parent7704713134cb251be6129f38833930228e09eee2 (diff)
downloadopen-axiom-489cfd14dccfcaf7b0ebd41e9d0f8e081a9d1d9f.tar.gz
* boot/ast.boot (bfMember): Improve a bit.
* boot/tokens.boot: Don't rename 'is' and 'inst'. * boot/parser.boot: Use 'in' instead of 'MEMQ' where approrpriate. * interp/: Likewise.
Diffstat (limited to 'src/interp/i-intern.boot')
-rw-r--r--src/interp/i-intern.boot6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/interp/i-intern.boot b/src/interp/i-intern.boot
index 739bde15..3c8eda00 100644
--- a/src/interp/i-intern.boot
+++ b/src/interp/i-intern.boot
@@ -223,7 +223,7 @@ mkAtree3(x,op,argl) ==
r := mkAtreeValueOf r
v :=
null arg => VECTOR(NIL,NIL,NIL)
- PAIRP arg and rest arg and first arg ~= "|" =>
+ CONSP arg and rest arg and first arg ~= "|" =>
collectDefTypesAndPreds ["tuple",:arg]
null rest arg => collectDefTypesAndPreds first arg
collectDefTypesAndPreds arg
@@ -240,7 +240,7 @@ mkAtree3(x,op,argl) ==
a is [op,:arg] =>
v :=
null arg => VECTOR(NIL,NIL,NIL)
- PAIRP arg and rest arg and first arg ~= "|" =>
+ CONSP arg and rest arg and first arg ~= "|" =>
collectDefTypesAndPreds ["tuple",:arg]
null rest arg => collectDefTypesAndPreds first arg
collectDefTypesAndPreds arg
@@ -395,7 +395,7 @@ getValueFromEnvironment(x,mode) ==
objValUnwrap v
getValueFromSpecificEnvironment(id,mode,e) ==
- PAIRP e =>
+ CONSP e =>
u := get(id,'value,e) =>
objMode(u) = $EmptyMode =>
systemErrorHere ["getValueFromSpecificEnvironment",id]