Merge branch 'next' into datarewrite-structures

1 files changed, 14 insertions, 11 deletions

diff --git a/module/hnh/module-introspection/all-modules.scm b/module/hnh/module-introspection/all-modules.scm
index 1bf39e1e..4b224d2f 100644
--- a/module/hnh/module-introspection/all-modules.scm
+++ b/module/hnh/module-introspection/all-modules.scm
@@ -7,8 +7,9 @@
   :use-module (hnh module-introspection)
   :use-module ((hnh module-introspection static-util) :select (get-forms))
   :export (all-files-and-modules-under-directory
+           all-files-under-directory
            all-modules-under-directory
-           fs-find-base fs-find
+           fs-find
            module-file-mapping
            ))
 
@@ -20,22 +21,24 @@
 ;; (define (fs-find proc dir)
 ;;   (filter proc (fs-find-base dir)))
 
-(define (all-files-and-modules-under-directory dir)
-  (define re (make-regexp "\\.scm$"))
+(define* (all-files-under-directory dir extension)
+  (define extension-rx ((@ (texinfo string-utils) escape-special-chars)
+                        extension "[](){}+*?.^$" #\\))
+  (define re (make-regexp (string-append extension-rx "$")))
 
-  (define files
-    (map car
-         (filter (match-lambda ((filename _ 'regular)
-                                (and (regexp-exec re filename)
-                                     (not (file-hidden? filename))))
-                               (_ #f))
-                 (fs-find dir))))
+  (map car
+       (filter (match-lambda ((filename _ 'regular)
+                              (and (regexp-exec re filename)
+                                   (not (file-hidden? filename))))
+                             (_ #f))
+               (fs-find dir))))
 
+(define (all-files-and-modules-under-directory dir)
   (map (lambda (file)
          (list file
                (call-with-input-file file
                  (compose find-module-declaration get-forms))))
-       files))
+       (all-files-under-directory dir ".scm")))
 
 (define (all-modules-under-directory dir)
   "Returns two values, all scm files in dir, and all top