From 1906e73ab030ad23f1f6269acfed69703c8c40d6 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Mon, 2 May 2011 01:02:57 +0000
Subject: more cleanup

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

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

diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot
index afc696d6..476d7548 100644
--- a/src/interp/lisplib.boot
+++ b/src/interp/lisplib.boot
@@ -279,7 +279,7 @@ killNestedInstantiations(deps) ==
  
 isNestedInstantiation(form,deps) ==
   form is [op,:argl] =>
-    op in deps => true
+    symbolMember?(op,deps) => true
     or/[isNestedInstantiation(x,deps) for x in argl]
   false
  
@@ -404,7 +404,7 @@ loadFunctor u ==
  
 makeConstructorsAutoLoad() ==
   for cnam in allConstructors() repeat
-    cnam in $CategoryNames => nil
+    symbolMember?(cnam,$CategoryNames) => nil
     property(cnam,'LOADED) := nil
 --    fn:=getConstructorAbbreviationFromDB cnam
     if niladicConstructorFromDB cnam
@@ -427,7 +427,7 @@ systemDependentMkAutoload(fn,cnam) ==
 autoLoad(abb,cname) ==
   -- builtin constructors are always loaded.  By definition, there
   -- is no way to unload them and load them again.
-  cname in $BuiltinConstructorNames => cname
+  builtinConstructor? cname => cname
   if not property(cname,'LOADED) then loadLib cname
   symbolFunction cname
 
-- 
cgit v1.2.3