From 489cfd14dccfcaf7b0ebd41e9d0f8e081a9d1d9f Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Fri, 25 Sep 2009 20:48:45 +0000
Subject: 	* 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.

---
 src/interp/interop.boot | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/interp/interop.boot')

diff --git a/src/interp/interop.boot b/src/interp/interop.boot
index e56e396a..8005b868 100644
--- a/src/interp/interop.boot
+++ b/src/interp/interop.boot
@@ -131,7 +131,7 @@ makeLazyOldAxiomDispatchDomain domform ==
   dd
 
 makeOldAxiomDispatchDomain dom ==
-  PAIRP dom => dom
+  CONSP dom => dom
   [$oldAxiomDomainDispatch,hashTypeForm(dom.0,0),:dom]
 
 closeOldAxiomFunctor(name) ==
@@ -453,7 +453,7 @@ hashNewLookupInTable(op,sig,dollar,[domain,opvec],flag) ==
   (success ~= 'failed) and success =>
     if $monitorNewWorld then
       sayLooking1('"<----",uu) where uu() ==
-        PAIRP success => [first success,:devaluate rest success]
+        CONSP success => [first success,:devaluate rest success]
         success
     success
   subsumptionSig and (u:= basicLookup(op,subsumptionSig,domain,dollar)) => u
@@ -603,7 +603,7 @@ HasCategory(domain,catform') ==
   slot4 := domain.4
   catlist := slot4.1
   member(catform,catlist) or
-   MEMQ(opOf(catform),'(Object Type)) or  --temporary hack
+   opOf(catform) in '(Object Type) or  --temporary hack
     or/[compareSigEqual(catform,cat,domain0,domain) for cat in catlist]
 
 --systemDependentMkAutoload(fn,cnam) ==
-- 
cgit v1.2.3