From 517b9dd50dcdf3f7881d5f682e8217174d03a211 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Tue, 19 Apr 2011 22:20:38 +0000
Subject: more cleanup

---
 src/boot/utility.boot | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'src/boot')

diff --git a/src/boot/utility.boot b/src/boot/utility.boot
index 026bcc04..6ee1e180 100644
--- a/src/boot/utility.boot
+++ b/src/boot/utility.boot
@@ -39,22 +39,27 @@ objectMember?(x,l) ==
   cons? l => sameObject?(x,first l) or objectMember?(x,rest l)
   sameObject?(x,l)
 
-genericMember?(x,l,p) ==
+symbolMember?(s,l) ==
   l = nil => false
-  cons? l => apply(p,x,first l,nil) or genericMember?(x,rest l,p)
-  apply(p,x,l,nil)
-
-symbolMember?(x,l) ==
-  genericMember?(x,l,function symbolEq?)
+  cons? l => symbolEq?(s,first l) or symbolMember?(s,rest l)
+  symbolEq?(s,l)
 
 stringMember?(s,l) ==
-  genericMember?(s,l,function stringEq?)
+  l = nil => false
+  cons? l => stringEq?(s,first l) or stringMember?(s,rest l)
+  stringEq?(s,l)
 
 charMember?(c,l) ==
-  genericMember?(c,l,function charEq?)
+  l = nil => false
+  cons? l => charEq?(c,first l) or charMember?(c,rest l)
+  charEq?(c,l)
 
 scalarMember?(x,l) ==
-  genericMember?(x,l,function scalarEq?)
+  l = nil => false
+  cons? l => scalarEq?(x,first l) or scalarMember?(x,rest l)
+  charEq?(x,l)
 
 listMember?(x,l) ==
-  genericMember?(x,l,function listEq?)
+  l = nil => false
+  cons? l => listEq?(x,first l) or listMember?(x,rest l)
+  listEq?(x,l)
-- 
cgit v1.2.3