diff options
| author | Andy Wingo <wingo@pobox.com> | 2019-11-29 11:51:29 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2019-11-29 11:51:29 +0100 |
| commit | cf08dbdc189f0005cab6f2ec7b23ed9d150ec43d (patch) | |
| tree | 8e0fb3579bbf5bd496f5c7e10b770e6c4287c6db /module/srfi | |
| parent | 8304b15807debfb1aba6ef6510e42d6174a92215 (diff) | |
| download | guile-cf08dbdc189f0005cab6f2ec7b23ed9d150ec43d.tar.gz | |
Associate #:replace info with modules, not variables
* doc/ref/api-modules.texi (Creating Guile Modules): Document
#:re-export-and-replace.
* module/ice-9/boot-9.scm (module-replacements): New module field.
(make-module, make-autoload-interface): Initialize replacements to an
empty hash table.
(resolve-interface): Propagate replacement info when making custom
interfaces.
(define-module): Parse a #:re-export-and-replace keyword arg.
(define-module*): Handle #:re-export-and-replace.
(module-export!, module-re-export!): Add a keyword arg to indicate
whether to replace or not.
(module-replace!): Call module-export! with #:replace? #t.
(duplicate-handlers): Update replace duplicate handler to look for
replacement info on the interfaces.
* module/srfi/srfi-18.scm (srfi):
* module/srfi/srfi-34.scm (srfi): Update to #:re-export-and-replace
raise-continuable as raise.
Diffstat (limited to 'module/srfi')
| -rw-r--r-- | module/srfi/srfi-18.scm | 4 | ||||
| -rw-r--r-- | module/srfi/srfi-34.scm | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/module/srfi/srfi-18.scm b/module/srfi/srfi-18.scm index 6decb8ca4..79aedb8d1 100644 --- a/module/srfi/srfi-18.scm +++ b/module/srfi/srfi-18.scm @@ -76,8 +76,8 @@ terminated-thread-exception? uncaught-exception? uncaught-exception-reason) - #:re-export ((raise-continuable . raise) - with-exception-handler) + #:re-export (with-exception-handler) + #:re-export-and-replace ((raise-continuable . raise)) #:replace (current-time current-thread thread? diff --git a/module/srfi/srfi-34.scm b/module/srfi/srfi-34.scm index 0e7ad995d..4eb94b443 100644 --- a/module/srfi/srfi-34.scm +++ b/module/srfi/srfi-34.scm @@ -1,6 +1,6 @@ ;;; srfi-34.scm --- Exception handling for programs -;; Copyright (C) 2003, 2006, 2008, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2006, 2008, 2010, 2019 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 @@ -29,6 +29,7 @@ (define-module (srfi srfi-34) #:re-export (with-exception-handler (raise-exception . raise)) + #:re-export-and-replace ((raise-exception . raise)) #:export-syntax (guard)) (cond-expand-provide (current-module) '(srfi-34)) |