summaryrefslogtreecommitdiff
path: root/module/ice-9
diff options
context:
space:
mode:
Diffstat (limited to 'module/ice-9')
-rw-r--r--module/ice-9/format.scm3
-rw-r--r--module/ice-9/r6rs-libraries.scm17
2 files changed, 14 insertions, 6 deletions
diff --git a/module/ice-9/format.scm b/module/ice-9/format.scm
index 01da71e90..e53649866 100644
--- a/module/ice-9/format.scm
+++ b/module/ice-9/format.scm
@@ -49,7 +49,8 @@
((boolean? destination) (current-output-port)) ; boolean but not false
((output-port? destination) destination)
(else
- (error "format: bad destination `~a'" destination)))))
+ (error
+ (simple-format #f "format: bad destination `~a'" destination))))))
(define %output-col (or (port-column port) 0))
(define %flush-output? #f)
diff --git a/module/ice-9/r6rs-libraries.scm b/module/ice-9/r6rs-libraries.scm
index f27b07841..90bfb5451 100644
--- a/module/ice-9/r6rs-libraries.scm
+++ b/module/ice-9/r6rs-libraries.scm
@@ -115,8 +115,10 @@
(for-each (lambda (sym)
(module-add! iface sym
(or (module-variable mod sym)
- (error "no binding `~A' in module ~A"
- sym mod)))
+ (error (format
+ #f
+ "no binding `~A' in module ~A"
+ sym mod))))
(when (hashq-ref (module-replacements mod) sym)
(hashq-set! (module-replacements iface) sym #t)))
(syntax->datum #'(identifier ...)))
@@ -131,7 +133,7 @@
mod)
(for-each (lambda (sym)
(unless (module-local-variable iface sym)
- (error "no binding `~A' in module ~A" sym mod))
+ (error (format #f "no binding `~A' in module ~A" sym mod)))
(module-remove! iface sym))
(syntax->datum #'(identifier ...)))
iface))
@@ -167,7 +169,11 @@
(replace? (vector-ref v 1))
(var (vector-ref v 2)))
(when (module-local-variable iface to)
- (error "duplicate binding for `~A' in module ~A" to mod))
+ (error (format
+ #f
+ "duplicate binding for `~A' in module ~A"
+ to
+ mod)))
(module-add! iface to var)
(when replace?
(hashq-set! replacements to #t))))
@@ -178,7 +184,8 @@
(to (cdar in))
(var (module-variable mod from))
(replace? (hashq-ref replacements from)))
- (unless var (error "no binding `~A' in module ~A" from mod))
+ (unless var (error
+ (format #f "no binding `~A' in module ~A" from mod)))
(module-remove! iface from)
(hashq-remove! replacements from)
(lp (cdr in) (cons (vector to replace? var) out))))))))