diff options
author | Greg J. Badros <gjb@cs.washington.edu> | 2000-01-11 18:48:57 +0000 |
---|---|---|
committer | Greg J. Badros <gjb@cs.washington.edu> | 2000-01-11 18:48:57 +0000 |
commit | 70d63753769a55ae51d72dfc2fa82dc5e6487220 (patch) | |
tree | e9e5902f8667d65176da9e66b9284c58dde1c200 /libguile/eval.c | |
parent | 3370bcf262919b2043e636f18033000f354f71c3 (diff) | |
download | guile-70d63753769a55ae51d72dfc2fa82dc5e6487220.tar.gz |
* dynl.c, error.c, eval.c, feature.c, filesys.c, fports.c, list.c, load.c,
net_db.c, read.c, socket.c: Update error messages to use ~A for
%s, ~S for %S to work with new `simple-format' format and be
standardized better.
* print.h, print.c (scm_simple_format): Added `simple-format'
primitive. It's the old scm_display_error, with ARGS now a rest
parameter, and the destination first instead of last (and a couple
new capabilities inspired by `format' -- #t as destination means
current-output-port, #f means return the formatted text as a
string.
* gh.h, gh_data.c, ports.h, ports.c: Added some missing const specifications.
* backtrace.c (scm_display_error_message): Rewrote to use
scm_simple_format() procedure.
* __scm.h: Added commented-out #define of GUILE_DEBUG_FREELIST
Diffstat (limited to 'libguile/eval.c')
-rw-r--r-- | libguile/eval.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libguile/eval.c b/libguile/eval.c index bf9cda4e1..dc9d80853 100644 --- a/libguile/eval.c +++ b/libguile/eval.c @@ -346,10 +346,10 @@ scm_lookupcar (SCM vloc, SCM genv, int check) if (check) { if (SCM_NULLP (env)) - scm_error (scm_unbound_variable_key, NULL, "Unbound variable: %S", + scm_error (scm_unbound_variable_key, NULL, "Unbound variable: ~S", scm_cons (var, SCM_EOL), SCM_BOOL_F); else - scm_misc_error (NULL, "Damaged environment: %S", + scm_misc_error (NULL, "Damaged environment: ~S", scm_cons (var, SCM_EOL)); } else @@ -569,7 +569,7 @@ scm_m_vref (SCM xorig, SCM env) { /* scm_everr (SCM_UNDEFINED, env,..., "global variable reference") */ scm_misc_error (NULL, - "Bad variable: %S", + "Bad variable: ~S", scm_listify (SCM_CAR (SCM_CDR (x)), SCM_UNDEFINED)); } SCM_ASSYNT (SCM_NIMP(x) && DEFSCM_VARIABLEP (SCM_CAR (x)), @@ -2455,7 +2455,7 @@ dispatch: badfun: /* scm_everr (x, env,...) */ scm_misc_error (NULL, - "Wrong type to apply: %S", + "Wrong type to apply: ~S", scm_listify (proc, SCM_UNDEFINED)); case scm_tc7_vector: case scm_tc7_wvect: |