From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Maxim Cournoyer Newsgroups: gmane.lisp.guile.devel Subject: [PATCH v4 02/10] Use R7RS 'rename' syntax for exports. Date: Wed, 22 Nov 2023 22:25:13 -0500 Message-ID: <20231123032659.5637-3-maxim.cournoyer@gmail.com> References: <20231123032659.5637-1-maxim.cournoyer@gmail.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="38117"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Timothy Sample , Maxim Cournoyer To: guile-devel@gnu.org Original-X-From: guile-devel-bounces+guile-devel=m.gmane-mx.org@gnu.org Thu Nov 23 04:28:20 2023 Return-path: Envelope-to: guile-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1r60O3-0009is-Ql for guile-devel@m.gmane-mx.org; Thu, 23 Nov 2023 04:28:19 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r60N1-0004P9-7s; Wed, 22 Nov 2023 22:27:15 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r60N0-0004Ot-4m for guile-devel@gnu.org; Wed, 22 Nov 2023 22:27:14 -0500 Original-Received: from mail-vs1-xe31.google.com ([2607:f8b0:4864:20::e31]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r60My-0004MV-L7 for guile-devel@gnu.org; Wed, 22 Nov 2023 22:27:13 -0500 Original-Received: by mail-vs1-xe31.google.com with SMTP id ada2fe7eead31-4629afba9acso131300137.2 for ; Wed, 22 Nov 2023 19:27:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700710031; x=1701314831; darn=gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=791D8tnTIBF+39QF4YmyqB39kDdeHUmlE0ageZehfkA=; b=MFlQOfBGHZ+o7oTAbMr8pPJOOv34aC5jeHGIUcWA/VlLBnJg3Q8PyOo8iMMRcsIPS6 xVqLOp4VKXt4qtBKg/+QhsilC3UjastaNh6P20U8BZnBqew9Tc/LOvlKTWh1DYNXJh1l cHL+KmuE7nXnIAsnNKg9tAeKfii3FtCR4HUXvUhXe+Gjk5RTnI4b92J1SWh96k9rvVwl u8ko9SJY63OTW0IoxhWjDyWmG7dniAyiMO9rOofeEL0glXyI5jiNbzGPnzJ5VP+Ea675 KWf5bfLyq0fe4K7XKEWSbNzsdQRdJsrlBHaSLiyQDmyQSwDnTEqM8+ub5Geoe6NT4LOd tAbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700710031; x=1701314831; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=791D8tnTIBF+39QF4YmyqB39kDdeHUmlE0ageZehfkA=; b=bkqEMMXL2ekMwirVgd6wzaAzWZk6ygfXNmj345NMw4g7hmGGOhta84HzEXT7D6Eyob fl8cWU/moiYCMdtDe2SuZWi/bzbSHseJyzOnI+2mwAYTDotSHKNgnnMUReOjCCdeikj8 rYV2bJM4pUaHkisb9+ATkCDbsv6FSQfyAIPEA/Cs1YPlzsA45EMPWF5zRHHM5LmhHioR qA82UZKwM7ZpLLIt+Jv9pjtG1VypWFWVVI5ePTLM3tEPDhsREYl3RdZqvhw5KIkqAdOB 6az9OMRmTrhDIxasT7uSoLrVroyNsoaJjp5fo6lAYbvNK5XLYfEQxg7n4+qz4o0VTq4O YamA== X-Gm-Message-State: AOJu0YwkdkXJOfsxbdzoDbPpObs7LBMGdsjHm7SXQxosyLg7VolCFGYx HxmQyMyxP42zZGoO6HR0tOAt+4e0hgE= X-Google-Smtp-Source: AGHT+IGwFe2uFm+M2mnPL4BGisxeIqXloxo3OvUxI/EZJWhWDqO8JKIktwO6PZVRNaOKou8c6uiHSg== X-Received: by 2002:a67:f68b:0:b0:45d:9bac:d899 with SMTP id n11-20020a67f68b000000b0045d9bacd899mr4496321vso.16.1700710031104; Wed, 22 Nov 2023 19:27:11 -0800 (PST) Original-Received: from localhost.localdomain (dsl-205-233-124-102.b2b2c.ca. [205.233.124.102]) by smtp.gmail.com with ESMTPSA id k18-20020ac84752000000b0041a6fb444f6sm137285qtp.86.2023.11.22.19.27.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Nov 2023 19:27:10 -0800 (PST) X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231123032659.5637-1-maxim.cournoyer@gmail.com> Received-SPF: pass client-ip=2607:f8b0:4864:20::e31; envelope-from=maxim.cournoyer@gmail.com; helo=mail-vs1-xe31.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.29 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-mx.org@gnu.org Original-Sender: guile-devel-bounces+guile-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.lisp.guile.devel:22111 Archived-At: From: Timothy Sample * module/ice-9/r7rs-libraries.scm (define-library): Convert R7RS exports to R6RS exports before passing them on to 'library'. Fixes: https://bugs.gnu.org/67255 Reported-by: Maxim Cournoyer . --- (no changes since v1) module/ice-9/r7rs-libraries.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/module/ice-9/r7rs-libraries.scm b/module/ice-9/r7rs-libraries.scm index 63a300a26..f8b6b4c59 100644 --- a/module/ice-9/r7rs-libraries.scm +++ b/module/ice-9/r7rs-libraries.scm @@ -1,5 +1,5 @@ ;; R7RS library support -;; Copyright (C) 2020, 2021 Free Software Foundation, Inc. +;; Copyright (C) 2020, 2021, 2023 Free Software Foundation, Inc. ;; ;; This library is free software; you can redistribute it and/or ;; modify it under the terms of the GNU Lesser General Public @@ -97,12 +97,17 @@ ((decl ...) (partition-decls #'(decl ... . decls) exports imports code)))))) + (define (r7rs-export->r6rs-export export) + (syntax-case export (rename) + ((rename internal external) #'(rename (internal external))) + (_ export))) + (syntax-case stx () ((_ name decl ...) (call-with-values (lambda () (partition-decls #'(decl ...) '() '() '())) (lambda (exports imports code) #`(library name - (export . #,exports) + (export . #,(map r7rs-export->r6rs-export exports)) (import . #,imports) . #,code))))))) -- 2.41.0