[Guile-commits] branch master updated: Fix R7RS include-library-declarations and cond-expand in define-library

[Andy Wingo]

This is an automated email from the git hooks/post-receive script.

wingo pushed a commit to branch master
in repository guile.

The following commit(s) were added to refs/heads/master by this push:
     new d4b7cbc  Fix R7RS include-library-declarations and cond-expand in 
define-library
d4b7cbc is described below

commit d4b7cbc68c088fb593e8d015dbc013539ef54b22
Author: Andy Wingo <wingo@pobox.com>
AuthorDate: Sat May 1 22:23:06 2021 +0200

    Fix R7RS include-library-declarations and cond-expand in define-library
    
    * module/ice-9/r7rs-libraries.scm (define-library): Fix bug handling
    include-library-declarations and cond-expand subforms.  Thanks to Adam
    Nelson for the fix!  Fixes #40252.
---
 module/ice-9/r7rs-libraries.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/ice-9/r7rs-libraries.scm b/module/ice-9/r7rs-libraries.scm
index 6db9de8..c4c4da2 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 Free Software Foundation, Inc.
+;;      Copyright (C) 2020, 2021 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
@@ -88,11 +88,11 @@
         (((include-library-declarations filename ...) . decls)
          (syntax-case (handle-includes #'(filename ...)) ()
            ((decl ...)
-            (partition-decls #'(decl ... decls) exports imports code))))
+            (partition-decls #'(decl ... . decls) exports imports code))))
         (((cond-expand clause ...) . decls)
          (syntax-case (handle-cond-expand #'(clause ...)) ()
            ((decl ...)
-            (partition-decls #'(decl ... decls) exports imports code))))))
+            (partition-decls #'(decl ... . decls) exports imports code))))))
 
     (syntax-case stx ()
       ((_ name decl ...)