From acc3ed6373ce1eef51323efcb7ba3ccf0dc3e882 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Sat, 16 Apr 2011 14:08:10 +0000
Subject: cleanup

---
 src/interp/sys-utility.boot | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/interp/sys-utility.boot')

diff --git a/src/interp/sys-utility.boot b/src/interp/sys-utility.boot
index d6b0d6ed..9bff9b41 100644
--- a/src/interp/sys-utility.boot
+++ b/src/interp/sys-utility.boot
@@ -114,14 +114,14 @@ macrop f ==
 functionp: %Thing -> %Boolean
 functionp f ==
   IDENTP f => FBOUNDP f and null MACRO_-FUNCTION f
-  FUNCTIONP f
+  function? f
 
 ++ remove `item' from `sequence'.
 delete: (%Thing,%Sequence) -> %Sequence
 delete(item,sequence) ==
   symbol? item => 
-    REMOVE(item,sequence,KEYWORD::TEST,function EQ)
-  atom item and not ARRAYP item =>
+    REMOVE(item,sequence,KEYWORD::TEST,function sameObject?)
+  atom item and not array? item =>
     REMOVE(item,sequence)
   REMOVE(item,sequence,KEYWORD::TEST,function EQUALP)
 
@@ -274,8 +274,8 @@ PRINT_-AND_-EVAL_-DEFUN(name,body) ==
 
 hashTable cmp ==
   testFun :=
-    cmp in '(ID EQ) => function EQ
-    cmp = 'EQL => function EQL
+    cmp in '(ID EQ) => function sameObject?
+    cmp = 'EQL => function scalarEqual?
     cmp = 'EQUAL => function EQUAL
     error '"bad arg to hashTable"
   MAKE_-HASH_-TABLE(KEYWORD::TEST,testFun)
-- 
cgit v1.2.3