From b32b297cd6bf2767f980dbe9523ed02a38e0efb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Mon, 20 Dec 2021 22:06:00 +0100 Subject: Remove re-export-modules A weird special form which was only used once, and didn't add much clarity above what we actually did. --- module/calp/util.scm | 9 --------- module/vcomponent.scm | 6 ++++-- 2 files changed, 4 insertions(+), 11 deletions(-) (limited to 'module') diff --git a/module/calp/util.scm b/module/calp/util.scm index 77dd9316..1f423756 100644 --- a/module/calp/util.scm +++ b/module/calp/util.scm @@ -9,7 +9,6 @@ set/r! catch-multiple quote? - re-export-modules -> ->> set set-> aif awhen let-lazy let-env case* define-many @@ -339,14 +338,6 @@ (cons (proc (car dotted-list)) (map/dotted proc (cdr dotted-list)))))) -(define-syntax re-export-modules - (syntax-rules () - ((_ (mod ...) ...) - (begin - (module-use! (module-public-interface (current-module)) - (resolve-interface '(mod ...))) - ...)))) - ;; Merges two association lists, comparing with eq. ;; The cdrs in all pairs in both lists should be lists, ;; If a key is present in both then the contents of b is diff --git a/module/vcomponent.scm b/module/vcomponent.scm index a53523c0..226b740f 100644 --- a/module/vcomponent.scm +++ b/module/vcomponent.scm @@ -7,8 +7,10 @@ :re-export (make-vcomponent parse-cal-path parse-calendar)) -(re-export-modules (vcomponent base) - (vcomponent instance methods)) +(define cm (module-public-interface (current-module))) +(module-use! cm (resolve-interface '(vcomponent base))) +(module-use! cm (resolve-interface '(vcomponent instance methods))) + (define-config calendar-files '() description: "Which files to parse. Takes a list of paths or a single string which will be globbed." -- cgit v1.2.3