1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-23 13:00:34 +02:00

* 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.
This commit is contained in:
Greg J. Badros 2000-01-11 18:52:25 +00:00
parent 70d6375376
commit 8641dd9e73
3 changed files with 7 additions and 4 deletions

View file

@ -43,6 +43,9 @@
;;; presumably deprecated. ;;; presumably deprecated.
(define feature? provided?) (define feature? provided?)
;;; let format alias simple-format until the more complete version is loaded
(define format simple-format)
;;; {R4RS compliance} ;;; {R4RS compliance}
@ -591,10 +594,10 @@
(save-stack) (save-stack)
(if (null? args) (if (null? args)
(scm-error 'misc-error #f "?" #f #f) (scm-error 'misc-error #f "?" #f #f)
(let loop ((msg "%s") (let loop ((msg "~A")
(rest (cdr args))) (rest (cdr args)))
(if (not (null? rest)) (if (not (null? rest))
(loop (string-append msg " %S") (loop (string-append msg " ~S")
(cdr rest)) (cdr rest))
(scm-error 'misc-error #f msg args #f))))) (scm-error 'misc-error #f msg args #f)))))

View file

@ -82,7 +82,7 @@
2)) 2))
(scm-error 'misc-error (scm-error 'misc-error
"expect" "expect"
"bad recipient: %S" "bad recipient: ~S"
(list (car exprs)) (list (car exprs))
#f) #f)
`((apply ,(cadar exprs) `((apply ,(cadar exprs)

View file

@ -87,7 +87,7 @@
(start-stack 'syncase-stack (start-stack 'syncase-stack
(scm-error 'misc-error (scm-error 'misc-error
who who
"%s %S" "~A ~S"
(list why what) (list why what)
'()))) '())))