From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Mark H Weaver Newsgroups: gmane.lisp.guile.devel Subject: [PATCH] Preserve additional R6RS library name components after srfi :n Date: Sun, 04 Nov 2012 01:43:14 -0400 Message-ID: <87bofdhqj1.fsf@tines.lan> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1352007812 15158 80.91.229.3 (4 Nov 2012 05:43:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 4 Nov 2012 05:43:32 +0000 (UTC) To: guile-devel@gnu.org Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Sun Nov 04 06:43:42 2012 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TUszl-0008Sv-R3 for guile-devel@m.gmane.org; Sun, 04 Nov 2012 06:43:41 +0100 Original-Received: from localhost ([::1]:60667 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUszd-00013t-4X for guile-devel@m.gmane.org; Sun, 04 Nov 2012 01:43:33 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:37082) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUsza-00013o-5V for guile-devel@gnu.org; Sun, 04 Nov 2012 01:43:31 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TUszY-0002dm-Pb for guile-devel@gnu.org; Sun, 04 Nov 2012 01:43:30 -0400 Original-Received: from world.peace.net ([96.39.62.75]:52593) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUszY-0002di-Kg for guile-devel@gnu.org; Sun, 04 Nov 2012 01:43:28 -0400 Original-Received: from 209-6-91-212.c3-0.smr-ubr1.sbo-smr.ma.cable.rcn.com ([209.6.91.212] helo=tines.lan) by world.peace.net with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1TUszR-000698-Hz; Sun, 04 Nov 2012 01:43:21 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 96.39.62.75 X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Original-Sender: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.devel:15080 Archived-At: --=-=-= Content-Type: text/plain 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 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Preserve-additional-R6RS-library-name-components-aft.patch Content-Description: [PATCH] Preserve additional R6RS library name components after srfi :n >From 97ba1d9fe19c45531cc5a227a9d6643731c3e7df Mon Sep 17 00:00:00 2001 From: Mark H Weaver 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 --=-=-=--