From b1e5445f778abb61832c70b884b1afe52bab75b6 Mon Sep 17 00:00:00 2001 From: Andreas Rottmann Date: Sat, 19 Jun 2010 14:52:21 +0200 Subject: [PATCH] Ignore the SRFI name component(s) in R6RS imports * module/ice-9/r6rs-libraries.scm (resolve-r6rs-interface): To avoid having to create alias libraries for all the SRFIs, we simply ignore the name components, so (srfi :n foo bar) will resolve to (srfi :n). --- module/ice-9/r6rs-libraries.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/ice-9/r6rs-libraries.scm b/module/ice-9/r6rs-libraries.scm index 482f8264b..6fcde278c 100644 --- a/module/ice-9/r6rs-libraries.scm +++ b/module/ice-9/r6rs-libraries.scm @@ -29,7 +29,7 @@ (define (sym? x) (symbol? (syntax->datum x))) (syntax-case import-spec (library only except prefix rename srfi) - ;; (srfi :n ...) -> (srfi srfi-n ...) + ;; (srfi :n ...) -> (srfi srfi-n) ((library (srfi colon-n rest ... (version ...))) (and (and-map sym? #'(srfi rest ...)) (symbol? (syntax->datum #'colon-n)) @@ -40,7 +40,7 @@ (substring (symbol->string (syntax->datum #'colon-n)) 1))))) (resolve-r6rs-interface - #`(library (srfi #,srfi-n rest ... (version ...)))))) + #`(library (srfi #,srfi-n (version ...)))))) ((library (name name* ... (version ...))) (and-map sym? #'(name name* ...))