summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Jerram <neil@ossau.uklinux.net>2008-03-25 21:42:23 +0000
committerNeil Jerram <neil@ossau.uklinux.net>2008-03-25 21:42:23 +0000
commitc0a7be0672e0cfb45917ff1da7064994e7d3e5ff (patch)
tree1f9045967f852a784f15798739c4a6b544af157f
parent1b6e6217152512426e8cf578f1e9e93695cae9ac (diff)
downloadguile-branch_release-1-6.tar.gz
(process-define-module): In #:use-syntax processing,branch_release-1-6
change two occurrences of interface-args to (car interface-args). Fixes a problem with #:use-syntax reported by Bruce Carleton.
-rw-r--r--NEWS1
-rw-r--r--THANKS1
-rw-r--r--ice-9/ChangeLog6
-rw-r--r--ice-9/boot-9.scm4
4 files changed, 10 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 366250d2a..92fd0d74d 100644
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,7 @@ Changes in 1.6.9 (since 1.6.8):
** Fixed a segmentation fault which occurred when displaying the
backtrace of a stack with a promise object (made by `delay') in it.
** Fixed MinGW versions of dirname and basename.
+** Fixed uses of #:use-syntax within (define-module ...) forms.
* Changes to the C interface
diff --git a/THANKS b/THANKS
index 8bb61dd35..45a65f9e9 100644
--- a/THANKS
+++ b/THANKS
@@ -33,6 +33,7 @@ For fixes or providing information which led to a fix:
Christof Boeckler
Quetzalcoatl Bradley
Adrian Bunk
+ Bruce Carleton
Michael Carmack
George Caswell
Albert Chin
diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog
index 0f4e70358..5d95aebd0 100644
--- a/ice-9/ChangeLog
+++ b/ice-9/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-25 Neil Jerram <neil@ossau.uklinux.net>
+
+ * boot-9.scm (process-define-module): In #:use-syntax processing,
+ change two occurrences of interface-args to (car interface-args).
+ Fixes a problem with #:use-syntax reported by Bruce Carleton.
+
2006-12-09 Kevin Ryde <user42@zip.com.au>
* boot-9.scm (top-repl): Remove module-use! of the core `(guile)'
diff --git a/ice-9/boot-9.scm b/ice-9/boot-9.scm
index f2ef5019b..0e74fc2c9 100644
--- a/ice-9/boot-9.scm
+++ b/ice-9/boot-9.scm
@@ -1768,9 +1768,9 @@
(let* ((interface-args (cadr kws))
(interface (apply resolve-interface interface-args)))
(and (eq? (car kws) #:use-syntax)
- (or (symbol? (car interface-args))
+ (or (symbol? (caar interface-args))
(error "invalid module name for use-syntax"
- interface-args))
+ (car interface-args)))
(set-module-transformer!
module
(module-ref interface (car