From e4e0db3b369e74bd9a619b190f710706a40a64d4 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Thu, 22 Dec 2011 18:29:09 -0800 Subject: * stream.c (vformat): If width is specified for ~s or ~a, and the object is not a string or number, then print it to a string and treat it as a string, adjusting it within the field. Also, do not simply abort on an unknown format directive but throw a proper exception. --- stream.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'stream.c') diff --git a/stream.c b/stream.c index f959898e..38af8afe 100644 --- a/stream.c +++ b/stream.c @@ -1020,6 +1020,11 @@ val vformat(val stream, val fmtstr, va_list vl) pnum = (char *) chk_malloc(nchars + 1); mp_toradix(mp(obj), (unsigned char *) pnum, 10); goto output_num; + } else if (width != 0) { + val str = format(nil, ch == 'a' ? lit("~a") : lit("~s"), obj, nao); + if (!vformat_str(stream, str, width, left, precision)) + return nil; + continue; } if (ch == 'a') obj_pprint(obj, stream); @@ -1032,7 +1037,8 @@ val vformat(val stream, val fmtstr, va_list vl) sprintf(num_buf, num_fmt->hex, value); goto output_num; default: - abort(); + uw_throwf(error_s, lit("unknown format directive character ~s\n"), + chr(ch), nao); output_num: { val res = vformat_num(stream, pnum, width, left, -- cgit v1.2.3