From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Rob Browning Newsgroups: gmane.lisp.guile.devel Subject: [PATCH 1/1] (scheme base) member: return #f, not (), for no match Date: Sun, 4 Oct 2020 10:50:09 -0500 Message-ID: <20201004155009.184217-1-rlb@defaultvalue.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="15885"; mail-complaints-to="usenet@ciao.gmane.io" To: guile-devel@gnu.org Original-X-From: guile-devel-bounces+guile-devel=m.gmane-mx.org@gnu.org Sun Oct 04 17:50:46 2020 Return-path: Envelope-to: guile-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kP6Hd-00044U-9w for guile-devel@m.gmane-mx.org; Sun, 04 Oct 2020 17:50:45 +0200 Original-Received: from localhost ([::1]:39182 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kP6Hc-0004YP-Cn for guile-devel@m.gmane-mx.org; Sun, 04 Oct 2020 11:50:44 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:53628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kP6HA-0004Vq-51 for guile-devel@gnu.org; Sun, 04 Oct 2020 11:50:17 -0400 Original-Received: from defaultvalue.org ([45.33.119.55]:38442) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kP6H6-00007p-Qr for guile-devel@gnu.org; Sun, 04 Oct 2020 11:50:15 -0400 Original-Received: from trouble.defaultvalue.org (localhost [127.0.0.1]) (Authenticated sender: rlb@defaultvalue.org) by defaultvalue.org (Postfix) with ESMTPSA id C37B12011D for ; Sun, 4 Oct 2020 10:50:10 -0500 (CDT) Original-Received: by trouble.defaultvalue.org (Postfix, from userid 1000) id 9BC0514E072; Sun, 4 Oct 2020 10:50:09 -0500 (CDT) X-Mailer: git-send-email 2.26.1 Received-SPF: pass client-ip=45.33.119.55; envelope-from=rlb@defaultvalue.org; helo=defaultvalue.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/04 11:50:11 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-devel-bounces+guile-devel=m.gmane-mx.org@gnu.org Original-Sender: "guile-devel" Xref: news.gmane.io gmane.lisp.guile.devel:20588 Archived-At: * module/scheme/base.scm (member): Match the r7rs requirement, as assoc already does. Thanks to Erik Dominikus for reporting the problem. Closes: 43304 --- Proposed for 3.0 module/scheme/base.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/module/scheme/base.scm b/module/scheme/base.scm index 5a366f846..94591477d 100644 --- a/module/scheme/base.scm +++ b/module/scheme/base.scm @@ -129,9 +129,10 @@ (unless (procedure? =) (error "not a procedure" =)) (let lp ((ls ls)) - (if (or (null? ls) (= (car ls) x)) - ls - (lp (cdr ls))))))) + (cond + ((null? ls) #f) + ((= (car ls) x) ls) + (else (lp (cdr ls)))))))) (define* (assoc x ls #:optional (= equal?)) (cond -- 2.26.1