[nongnu] elpa/d-mode 3ed3b7b 257/346: Simplify imenu testing code

[ELPA Syncer]

branch: elpa/d-mode
commit 3ed3b7b1c43e07b2071746b6a723cc1e9811a0b1
Author: Vladimir Panteleev <git@thecybershadow.net>
Commit: Vladimir Panteleev <git@thecybershadow.net>

    Simplify imenu testing code
---
 d-mode-test.el | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/d-mode-test.el b/d-mode-test.el
index e53c4b6..4f37730 100644
--- a/d-mode-test.el
+++ b/d-mode-test.el
@@ -234,21 +234,18 @@ Called from the #run snippet of individual test files."
 
 (require 'imenu)
 
-(defun d-test-imenu-to-lines (l)
-  (apply #'append
-        (mapcar
-         (lambda (e)
-           (if (imenu--subalist-p e)
-               (d-test-imenu-to-lines (cdr e))
-             (list (line-number-at-pos (cdr e)))))
-         l)))
+(defun d-test--imenu-to-lines (x)
+  "Extracts line numbers from one possibly-nested imenu--index-alist element 
X."
+  (if (imenu--subalist-p x)
+      (apply #'append (mapcar #'d-test--imenu-to-lines (cdr x)))
+    (list (line-number-at-pos (cdr x)))))
 
 (defun d-test-get-imenu-lines ()
   "Get list of line numbers of lines recognized as imenu entries.
 
 Called from the #run snippet of individual test files."
   (imenu--make-index-alist t)
-  (sort (d-test-imenu-to-lines imenu--index-alist) '<))
+  (sort (d-test--imenu-to-lines (cons nil imenu--index-alist)) '<))
 
 (defun d-test-save-result (filename)
   "In case of an unexpected result, save it to a file.