* 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 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