From e1ee52bfd4ee15dbe0b0214f6ead3a60ec3bd777 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Thu, 4 Oct 2012 21:06:29 +0200 Subject: [PATCH] Simplify first-member and first-assoc --- scm/lily-library.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) 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) -- 2.39.5