From 8641dd9e73267c585acbc856ba4889fec4f75b0c Mon Sep 17 00:00:00 2001 From: "Greg J. Badros" Date: Tue, 11 Jan 2000 18:52:25 +0000 Subject: [PATCH] * boot-9.scm expect.scm, syncase.scm: Switch to new style `simple-format' message strings: substitute ~A for %s, and ~S for %S. * boot-9.scm: Added (define format simple-format) to expose that primitive via the simpler name until format.scm is loaded. --- ice-9/boot-9.scm | 7 +++++-- ice-9/expect.scm | 2 +- ice-9/syncase.scm | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ice-9/boot-9.scm b/ice-9/boot-9.scm index 80758722f..430a8f955 100644 --- a/ice-9/boot-9.scm +++ b/ice-9/boot-9.scm @@ -43,6 +43,9 @@ ;;; presumably deprecated. (define feature? provided?) +;;; let format alias simple-format until the more complete version is loaded +(define format simple-format) + ;;; {R4RS compliance} @@ -591,10 +594,10 @@ (save-stack) (if (null? args) (scm-error 'misc-error #f "?" #f #f) - (let loop ((msg "%s") + (let loop ((msg "~A") (rest (cdr args))) (if (not (null? rest)) - (loop (string-append msg " %S") + (loop (string-append msg " ~S") (cdr rest)) (scm-error 'misc-error #f msg args #f))))) diff --git a/ice-9/expect.scm b/ice-9/expect.scm index 20beac4be..8377c9d05 100644 --- a/ice-9/expect.scm +++ b/ice-9/expect.scm @@ -82,7 +82,7 @@ 2)) (scm-error 'misc-error "expect" - "bad recipient: %S" + "bad recipient: ~S" (list (car exprs)) #f) `((apply ,(cadar exprs) diff --git a/ice-9/syncase.scm b/ice-9/syncase.scm index a1f5ac775..bc124bafd 100644 --- a/ice-9/syncase.scm +++ b/ice-9/syncase.scm @@ -87,7 +87,7 @@ (start-stack 'syncase-stack (scm-error 'misc-error who - "%s %S" + "~A ~S" (list why what) '())))