[PATCH] Preserve additional R6RS library name components after srfi :n

[Mark H Weaver]

Hello all,

Here's another patch to help with R6RS libraries.  Right now, if you use
R6RS syntax to import (srfi :99 records procedural), the components
after the :99 will be silently dropped and it will treat this as if you
imported (srfi :99).  I suspect this is simply a bug.

Does anyone see a reason not to commit this to stable-2.0?

    Mark


>From 97ba1d9fe19c45531cc5a227a9d6643731c3e7df Mon Sep 17 00:00:00 2001
From: Mark H Weaver <address@hidden>
Date: Sun, 4 Nov 2012 01:01:06 -0400
Subject: [PATCH] Preserve additional R6RS library name components after srfi
 :n

* module/ice-9/r6rs-libraries.scm (resolve-r6rs-interface):
  (srfi :n ...) -> (srfi srfi-n ...) instead of (srfi 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 f71b90b..019a6a7 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 (version ...))))))
+        #`(library (srfi #,srfi-n rest ... (version ...))))))
     
     ((library (name name* ... (version ...)))
      (and-map sym? #'(name name* ...))
-- 
1.7.10.4