[Guile-commits] GNU Guile branch, master, updated. release_1-9-15-3-gc415fe0

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=c415fe081e5f31f829ba94b31eb7c6b07e56b64f

The branch, master has been updated
       via  c415fe081e5f31f829ba94b31eb7c6b07e56b64f (commit)
      from  9d427b2cc3a7062403d75074760a2b0feb01cb21 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c415fe081e5f31f829ba94b31eb7c6b07e56b64f
Author: Andy Wingo <address@hidden>
Date:   Mon Feb 7 21:43:11 2011 +0100

    hack around bug in port-filename
    
    * module/ice-9/boot-9.scm (define-module): Until the port-filename bug
      is fixed, hack around it.

-----------------------------------------------------------------------

Summary of changes:
 module/ice-9/boot-9.scm |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/module/ice-9/boot-9.scm b/module/ice-9/boot-9.scm
index 29e2cd7..da882a4 100644
--- a/module/ice-9/boot-9.scm
+++ b/module/ice-9/boot-9.scm
@@ -2872,8 +2872,13 @@ module '(ice-9 q) '(make-q q-length))}."
        (and-map symbol? (syntax->datum #'(name name* ...)))
        (with-syntax (((quoted-arg ...)
                       (parse #'(arg ...) '() '() '() '() '()))
-                     (filename (assq-ref (or (syntax-source x) '())
-                                         'filename)))
+                     ;; Ideally the filename is either a string or #f;
+                     ;; this hack is to work around a case in which
+                     ;; port-filename returns a symbol (`socket') for
+                     ;; sockets.
+                     (filename (let ((f (assq-ref (or (syntax-source x) '())
+                                                  'filename)))
+                                 (and (string? f) f))))
          #'(eval-when (eval load compile expand)
              (let ((m (define-module* '(name name* ...)
                         #:filename filename quoted-arg ...)))


hooks/post-receive
-- 
GNU Guile