From: David Kastrup <dak@gnu.org>
Date: Thu, 14 Feb 2013 15:12:22 +0000 (+0100)
Subject: Fix typo in list-element-index, simplify count-list
X-Git-Tag: release/2.17.13-1~10^2~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7d886e6650ebc275c82a6770827380e883706c50;p=lilypond.git

Fix typo in list-element-index, simplify count-list
---

diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index ecf5a4598f..5b39cc46ff 100644
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -541,19 +541,12 @@ For example:
   (helper lst (make-vector n '()) (1- n)))
 
 (define (list-element-index lst x)
-  (list-index (lambda (m) (equal? m x))))
+  (list-index (lambda (m) (equal? m x)) lst))
 
 (define-public (count-list lst)
   "Given @var{lst} as @code{(E1 E2 .. )}, return
 @code{((E1 . 1) (E2 . 2) ... )}."
-
-  (define (helper l acc count)
-    (if (pair? l)
-	(helper (cdr l) (cons (cons (car l) count) acc) (1+ count))
-	acc))
-
-
-  (reverse (helper lst '() 1)))
+  (map cons lst (iota (length lst) 1)))
 
 (define-public (list-join lst intermediate)
   "Put @var{intermediate} between all elts of @var{lst}."