diff options
Diffstat (limited to 'module')
-rw-r--r-- | module/hnh/module-introspection.scm | 8 | ||||
-rw-r--r-- | module/hnh/module-introspection/all-modules.scm | 1 | ||||
-rw-r--r-- | module/hnh/module-introspection/static-util.scm | 9 | ||||
-rw-r--r-- | module/scripts/module-dependants.scm | 1 | ||||
-rw-r--r-- | module/scripts/module-imports.scm | 6 | ||||
-rw-r--r-- | module/scripts/peg-to-graph.scm | 4 |
6 files changed, 14 insertions, 15 deletions
diff --git a/module/hnh/module-introspection.scm b/module/hnh/module-introspection.scm index 83e561f1..254c33c7 100644 --- a/module/hnh/module-introspection.scm +++ b/module/hnh/module-introspection.scm @@ -4,6 +4,7 @@ :export (unique-symbols find-module-declaration module-declaration? + get-forms )) @@ -20,3 +21,10 @@ (define (find-module-declaration forms) (and=> (find module-declaration? forms) cadr)) + +(define (get-forms port) + (let loop ((done '())) + (let ((form (read port))) + (if (eof-object? form) + done + (loop (cons form done)))))) diff --git a/module/hnh/module-introspection/all-modules.scm b/module/hnh/module-introspection/all-modules.scm index 5b4b37d2..3d202839 100644 --- a/module/hnh/module-introspection/all-modules.scm +++ b/module/hnh/module-introspection/all-modules.scm @@ -4,7 +4,6 @@ :use-module (ice-9 match) :use-module (hnh util path) :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 diff --git a/module/hnh/module-introspection/static-util.scm b/module/hnh/module-introspection/static-util.scm deleted file mode 100644 index 7593ce3c..00000000 --- a/module/hnh/module-introspection/static-util.scm +++ /dev/null @@ -1,9 +0,0 @@ -(define-module (hnh module-introspection static-util) - :export (get-forms)) - -(define (get-forms port) - (let loop ((done '())) - (let ((form (read port))) - (if (eof-object? form) - done - (loop (cons form done)))))) diff --git a/module/scripts/module-dependants.scm b/module/scripts/module-dependants.scm index 6bda1917..f39c548d 100644 --- a/module/scripts/module-dependants.scm +++ b/module/scripts/module-dependants.scm @@ -15,7 +15,6 @@ :use-module (ice-9 format) :use-module (texinfo string-utils) :use-module (hnh module-introspection) - :use-module ((hnh module-introspection static-util) :select (get-forms)) :export (main)) (define %summary "Print all modules which depend on module specified in target file.") diff --git a/module/scripts/module-imports.scm b/module/scripts/module-imports.scm index 7758c53a..39dc78da 100644 --- a/module/scripts/module-imports.scm +++ b/module/scripts/module-imports.scm @@ -13,8 +13,10 @@ (define-module (scripts module-imports) :use-module ((srfi srfi-1) :select (lset-difference)) :use-module ((rnrs lists) :select (remp filter partition)) - :use-module ((hnh module-introspection) :select (module-declaration? unique-symbols)) - :use-module ((hnh module-introspection static-util) :select (get-forms)) + :use-module ((hnh module-introspection) + :select (module-declaration? + unique-symbols + get-forms)) :use-module ((hnh module-introspection module-uses) :select (module-uses*)) :export (main) ) diff --git a/module/scripts/peg-to-graph.scm b/module/scripts/peg-to-graph.scm index afd7a4c3..82974042 100644 --- a/module/scripts/peg-to-graph.scm +++ b/module/scripts/peg-to-graph.scm @@ -1,7 +1,7 @@ (define-module (scripts peg-to-graph) :use-module ((graphviz) :prefix #{gv:}#) - :use-module ((hnh module-introspection) :select (unique-symbols)) - :use-module ((hnh module-introspection static-util) :select (get-forms)) + :use-module ((hnh module-introspection) + :select (unique-symbols get-forms)) :use-module (srfi srfi-1) :use-module (ice-9 match) :use-module (hnh util options) |