From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: guile-devel@gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [PATCH v5 05/15] (scheme base): Support non-negative SRFI integer names in cond-expand.
Date: Wed, 29 Nov 2023 16:59:33 -0500 [thread overview]
Message-ID: <20231129220225.6819-6-maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <20231129220225.6819-1-maxim.cournoyer@gmail.com>
* module/scheme/base.scm (r7:cond-expand): Test for library using
resolve-r6rs-interface instead of resolve-interface. Swallow any
exception with false-if-exception.
* test-suite/tests/r7rs-cond-expand.test: New test.
* NEWS: Update news.
---
Changes in v5:
- Update NEWS
NEWS | 1 +
module/scheme/base.scm | 5 +++-
test-suite/tests/r7rs-cond-expand.test | 35 ++++++++++++++++++++++++++
3 files changed, 40 insertions(+), 1 deletion(-)
create mode 100644 test-suite/tests/r7rs-cond-expand.test
diff --git a/NEWS b/NEWS
index af66c80bd..1de1fa8b4 100644
--- a/NEWS
+++ b/NEWS
@@ -55,6 +55,7 @@ other operations, given the internal use of those functions.
(<https://bugs.gnu.org/66046>)
** R7RS define-library now properly supports 'rename' declarations
(<https://bugs.gnu.org/67255>)
+** (scheme base)'s cond-expand supports non-negative integer in modules names
\f
Changes in 3.0.9 (since 3.0.8)
diff --git a/module/scheme/base.scm b/module/scheme/base.scm
index 477dd9c28..2bd1f0d89 100644
--- a/module/scheme/base.scm
+++ b/module/scheme/base.scm
@@ -283,7 +283,10 @@
((not req)
(not (has-req? #'req)))
((library lib-name)
- (->bool (resolve-interface (syntax->datum #'lib-name))))
+ (->bool
+ (false-if-exception
+ (resolve-r6rs-interface
+ (syntax->datum #'lib-name)))))
(id
(identifier? #'id)
(memq (syntax->datum #'id) (features)))))
diff --git a/test-suite/tests/r7rs-cond-expand.test b/test-suite/tests/r7rs-cond-expand.test
new file mode 100644
index 000000000..ea880d8c2
--- /dev/null
+++ b/test-suite/tests/r7rs-cond-expand.test
@@ -0,0 +1,35 @@
+;;; R7RS cond-expand -*- scheme -*-
+;;; Copyright (C) 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 License as
+;;; published by the Free Software Foundation, either version 3 of the
+;;; License, or (at your option) any later version.
+;;;
+;;; This library is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;;; Lesser General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU Lesser General Public
+;;; License along with this program. If not, see
+;;; <http://www.gnu.org/licenses/>.
+
+(define-module (test-suite r7rs-cond-expand)
+ #:use-module ((scheme base) #:select (cond-expand))
+ #:use-module ((srfi srfi-64) #:select (test-read-eval-string))
+ #:use-module (test-suite lib))
+
+(pass-if "cond-expand expression missing library test"
+ (test-read-eval-string "\
+(cond-expand
+ ((library (srfi 99999 something))
+ #f)
+ (else #t))"))
+
+(pass-if "cond-expand expression found library test"
+ (test-read-eval-string "\
+(cond-expand
+ ((library (srfi 64))
+ #t)
+ (else #f))"))
--
2.41.0
next prev parent reply other threads:[~2023-11-29 21:59 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-29 21:59 [PATCH v5 00/15] Add a few new SRFIs, R7RS libraries Maxim Cournoyer
2023-11-29 21:59 ` [PATCH v5 01/15] ice-9: Fix 'include' when used in compilation contexts Maxim Cournoyer
2023-11-29 21:59 ` [PATCH v5 02/15] Use R7RS 'rename' syntax for exports Maxim Cournoyer
2023-11-29 21:59 ` [PATCH v5 03/15] r7rs-libraries: Add support for 'else' clause in cond-expand Maxim Cournoyer
2023-11-29 21:59 ` [PATCH v5 04/15] r7rs-libraries: Better support R7RS SRFI library names Maxim Cournoyer
2023-11-29 21:59 ` Maxim Cournoyer [this message]
2023-11-29 21:59 ` [PATCH v5 06/15] Share features tested by cond-expand library declarations and expressions Maxim Cournoyer
2023-11-29 21:59 ` [PATCH v5 07/15] build: Register '.sld' as an alternative extension to '.scm' Maxim Cournoyer
2023-11-29 21:59 ` [PATCH v5 08/15] module: Add SRFI 126 Maxim Cournoyer
2023-11-29 21:59 ` [PATCH v5 09/15] module: Add SRFI 128 Maxim Cournoyer
2023-11-29 21:59 ` [PATCH v5 10/15] module: Add (scheme comparator) Maxim Cournoyer
2023-11-29 21:59 ` [PATCH v5 11/15] module: Add (scheme sort) Maxim Cournoyer
2023-11-29 21:59 ` [PATCH v5 12/15] module: Add SRFI 125 Maxim Cournoyer
2023-11-29 21:59 ` [PATCH v5 13/15] module: Add SRFI 151 Maxim Cournoyer
2023-11-29 21:59 ` [PATCH v5 14/15] module: Add SRFI 160 Maxim Cournoyer
2023-11-29 21:59 ` [PATCH v5 15/15] module: Add SRFI 178 Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/guile/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231129220225.6819-6-maxim.cournoyer@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=guile-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).