[Guile-commits] GNU Guile branch, master, updated. release_1-9-11-23-g78f79f1

[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=78f79f18e2dd7de64a43b3dc195db2c5485cde17

The branch, master has been updated
       via  78f79f18e2dd7de64a43b3dc195db2c5485cde17 (commit)
      from  41147ee732158df937f871a37814ec3208e105ae (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 78f79f18e2dd7de64a43b3dc195db2c5485cde17
Author: Andy Wingo <address@hidden>
Date:   Mon Jun 7 00:33:57 2010 +0200

    modules have field for their filenames, for debugging
    
    * module/ice-9/boot-9.scm (module-filename, set-module-filename!): Add a
      new field to modules, the filename that is associated with the module.
      For debugging purposes.
      (process-define-module): Parse out a #:filename argument.
      (make-module, make-autoload-interface): Adapt to module-constructor
      change.
      (define-module): Init module-filename from (current-source-location).

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

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

diff --git a/module/ice-9/boot-9.scm b/module/ice-9/boot-9.scm
index 6381111..f5870cd 100644
--- a/module/ice-9/boot-9.scm
+++ b/module/ice-9/boot-9.scm
@@ -1581,7 +1581,8 @@ If there is no handler at all, Guile prints an error and 
then exits."
      version
      submodules
      submodule-binder
-     public-interface)))
+     public-interface
+     filename)))
 
 
 ;; make-module &opt size uses binder
@@ -1623,7 +1624,7 @@ If there is no handler at all, Guile prints an error and 
then exits."
                                           (make-hash-table 
%default-import-size)
                                           '()
                                           (make-weak-key-hash-table 31) #f
-                                          (make-hash-table 7) #f #f)))
+                                          (make-hash-table 7) #f #f #f)))
 
           ;; We can't pass this as an argument to module-constructor,
           ;; because we need it to close over a pointer to the module
@@ -2650,6 +2651,16 @@ If there is no handler at all, Guile prints an error and 
then exits."
                    re-exports
                    (append (cadr kws) replacements)
                    autoloads))
+            ((#:filename)
+             (or (pair? (cdr kws))
+                 (unrecognized kws))
+             (set-module-filename! module (cadr kws))
+             (loop (cddr kws)
+                   reversed-interfaces
+                   exports
+                   re-exports
+                   replacements
+                   autoloads))
             (else
              (unrecognized kws)))))
     (run-hook module-defined-hook module)
@@ -2679,7 +2690,7 @@ If there is no handler at all, Guile prints an error and 
then exits."
                     (module-local-variable i sym))))))
     (module-constructor (make-hash-table 0) '() b #f #f name 'autoload #f
                         (make-hash-table 0) '() (make-weak-value-hash-table 
31) #f
-                        (make-hash-table 0) #f #f)))
+                        (make-hash-table 0) #f #f #f)))
 
 (define (module-autoload! module . args)
   "Have @var{module} automatically load the module named @var{name} when one
@@ -3320,7 +3331,11 @@ module '(ice-9 q) '(make-q q-length))}."
        (with-syntax (((quoted-arg ...) (quotify #'(arg ...))))
          #'(eval-when (eval load compile expand)
              (let ((m (process-define-module
-                       (list '(name name* ...) quoted-arg ...))))
+                       (list '(name name* ...)
+                             #:filename (assq-ref
+                                         (or (current-source-location) '())
+                                         'filename)
+                             quoted-arg ...))))
                (set-current-module m)
                m)))))))
 


hooks/post-receive
-- 
GNU Guile