From: Kim F. Storm <storm@cua.dk>
Date: Wed, 20 Sep 2006 23:12:25 +0000 (+0000)
Subject: (member*): Use memql instead of complex code.
X-Git-Tag: emacs-pretest-22.0.90~422
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=eae510750d41e542edc35b5c74e9093f8afb2e01;p=emacs.git

(member*): Use memql instead of complex code.
Suggested by Miles Bader.
---

diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index e8590933863..b7d63acc861 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -2578,21 +2578,7 @@ surrounded by (block NAME ...).
 		   (cl-const-expr-val (nth 1 keys)))))
     (cond ((eq test 'eq) (list 'memq a list))
 	  ((eq test 'equal) (list 'member a list))
-	  ((or (null keys) (eq test 'eql))
-	   (if (eq (cl-const-expr-p a) t)
-	       (list (if (floatp-safe (cl-const-expr-val a)) 'member 'memq)
-		     a list)
-	     (if (eq (cl-const-expr-p list) t)
-		 (let ((p (cl-const-expr-val list)) (mb nil) (mq nil))
-		   (if (not (cdr p))
-		       (and p (list 'eql a (list 'quote (car p))))
-		     (while p
-		       (if (floatp-safe (car p)) (setq mb t)
-			 (or (integerp (car p)) (symbolp (car p)) (setq mq t)))
-		       (setq p (cdr p)))
-		     (if (not mb) (list 'memq a list)
-		       (if (not mq) (list 'member a list) form))))
-	       form)))
+	  ((or (null keys) (eq test 'eql)) (list 'memql a list))
 	  (t form))))
 
 (define-compiler-macro assoc* (&whole form a list &rest keys)