From: David Kastrup <dak@gnu.org>
Date: Thu, 4 Oct 2012 19:06:29 +0000 (+0200)
Subject: Simplify first-member and first-assoc
X-Git-Tag: release/2.17.10-1~32
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e1ee52bfd4ee15dbe0b0214f6ead3a60ec3bd777;p=lilypond.git

Simplify first-member and first-assoc
---

diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index da04e6c896..fdd8cbfd3d 100644
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -411,17 +411,11 @@ bookoutput function"
 (define-public (first-member members lst)
   "Return first successful member (of member) from @var{members} in
 @var{lst}."
-  (if (null? members)
-      #f
-      (let ((m (member (car members) lst)))
-	(if m m (first-member (cdr members) lst)))))
+  (any (lambda (m) (member m lst)) members))
 
 (define-public (first-assoc keys lst)
   "Return first successful assoc of key from @var{keys} in @var{lst}."
-  (if (null? keys)
-      #f
-      (let ((k (assoc (car keys) lst)))
-	(if k k (first-assoc (cdr keys) lst)))))
+  (any (lambda (k) (assoc k lst)) keys))
 
 (define-public (flatten-alist alist)
   (if (null? alist)