From 925deb5f0ec8d201f701493d3e571ba46b169a15 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Mon, 7 Sep 2015 20:23:56 -0700 Subject: Print exceptions with proper indenting. * parser.c (repl): Use format to print exception, and use ~! to ensure indentation. --- parser.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'parser.c') diff --git a/parser.c b/parser.c index aea9cec6..532936f0 100644 --- a/parser.c +++ b/parser.c @@ -574,16 +574,14 @@ val repl(val bindings, val in_stream, val out_stream) if (uw_exception_subtype_p(exsym, syntax_error_s)) { put_line(lit("** syntax error"), out_stream); } else if (uw_exception_subtype_p(exsym, error_s)) { - put_string(lit("** "), out_stream); - obj_pprint(car(exvals), out_stream); - if (cdr(exvals)) { - put_string(lit(" "), out_stream); - pprinl(cdr(exvals), out_stream); - } else { - put_line(nil, nil); - } + if (cdr(exvals)) + format(out_stream, lit("** ~!~a ~!~s\n"), + car(exvals), cdr(exvals), nao); + else + format(out_stream, lit("** ~!~a\n"), car(exvals), nao); + } else { - format(out_stream, lit("** ~s exception, args: ~s\n"), + format(out_stream, lit("** ~!~s exception, args: ~!~s\n"), exsym, exvals, nao); } } -- cgit v1.2.3