bug#40252: [R7RS] cond-expand in define-library forms

bug#40252: [R7RS] cond-expand in define-library forms

[Marc Nieper-Wißkirchen]

[-- Attachment #1: Type: text/plain, Size: 862 bytes --]

The following valid R7RS library definition is not handled correctly by
Guile:

(define-library (guile-test)
  (export fold)
  (cond-expand
    ((library (scheme list))
     (import (scheme list)))
    ((library (srfi srfi-1))
     (import (srfi srfi-1)))))

This is what I get:

$ guile --r7rs -L .
GNU Guile 3.0.1
...
> (import (guile-test))
While compiling expression:
no code for module (scheme list)
>

Thus, the cond-expand library declaration does not seem to be handled
correctly. Other experiments with cond-expand also show strange behaviors:

(define-library (guile-test)
  (export foo)
  (cond-expand
    (guile
     (import (scheme base))))
  (begin
    (define foo 42)))

> (import (guile-test))
While compiling expression:
Syntax error:
unknown location: source expression failed to match any pattern in form
(((begin (define foo 42))))

--

Marc

[-- Attachment #2: Type: text/html, Size: 2482 bytes --]

bug#40252: [PATCH] [R7RS] cond-expand in define-library forms

[Adam Nelson]

It looks like this bug was caused by a missing dot in a list in the 
cond-expand macro. This small patch fixes it:

diff --git a/module/ice-9/r7rs-libraries.scm 
b/module/ice-9/r7rs-libraries.scm
index 6db9de873..221806ad1 100644
--- a/module/ice-9/r7rs-libraries.scm
+++ b/module/ice-9/r7rs-libraries.scm
@@ -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 ...)

bug#40252: [R7RS] cond-expand in define-library forms

[Marc Nieper-Wißkirchen]

*bump*

Am Fr., 27. März 2020 um 15:17 Uhr schrieb Marc Nieper-Wißkirchen
<marc.nieper+gnu@gmail.com>:
>
> The following valid R7RS library definition is not handled correctly by Guile:
>
> (define-library (guile-test)
>   (export fold)
>   (cond-expand
>     ((library (scheme list))
>      (import (scheme list)))
>     ((library (srfi srfi-1))
>      (import (srfi srfi-1)))))
>
> This is what I get:
>
> $ guile --r7rs -L .
> GNU Guile 3.0.1
> ...
> > (import (guile-test))
> While compiling expression:
> no code for module (scheme list)
> >
>
> Thus, the cond-expand library declaration does not seem to be handled correctly. Other experiments with cond-expand also show strange behaviors:
>
> (define-library (guile-test)
>   (export foo)
>   (cond-expand
>     (guile
>      (import (scheme base))))
>   (begin
>     (define foo 42)))
>
> > (import (guile-test))
> While compiling expression:
> Syntax error:
> unknown location: source expression failed to match any pattern in form (((begin (define foo 42))))
>
> --
>
> Marc

bug#40252: Applied

[Andy Wingo]

Thanks for the report and fix, and apologies for the delay!

Andy