From 873241a396e37378d56d014aa8cb00fcd614273b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Tue, 12 Apr 2022 13:25:13 +0200
Subject: Use module-introspection more.

---
 scripts/all-modules.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'scripts/all-modules.scm')

diff --git a/scripts/all-modules.scm b/scripts/all-modules.scm
index ad6d3b72..b83644e5 100644
--- a/scripts/all-modules.scm
+++ b/scripts/all-modules.scm
@@ -4,6 +4,7 @@
   :use-module (ice-9 ftw)
   :use-module (ice-9 match)
   :use-module (hnh util path)
+  :use-module (module-introspection)
   :export (all-files-and-modules-under-directory
            all-modules-under-directory
            fs-find-base fs-find))
@@ -29,10 +30,8 @@
 
   (map (lambda (file)
          (list file
-               (match (call-with-input-file file read)
-                 (('define-module (module ...) _ ...)
-                  module)
-                 (_ #f))))
+               (call-with-input-file file
+                 (compose find-module-declaration get-forms))))
        files))
 
 (define (all-modules-under-directory dir)
-- 
cgit v1.2.3