From 663729d0ff4961ea2ea904aa4de9f15c07ba632d Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Tue, 29 Dec 2015 06:54:56 -0800 Subject: Suppress "which is located at nil". * eval.c (error_trace): If info is nil, print alternative message about the location being unavailable. --- eval.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/eval.c b/eval.c index 4110ddb6..07791880 100644 --- a/eval.c +++ b/eval.c @@ -256,11 +256,17 @@ void error_trace(val exsym, val exvals, val out_stream, val prefix) prefix, info, last, nao); } - if (origin) + if (origin) { format(out_stream, lit("~a ... an expansion at ~a of ~!~s\n"), prefix, info, origin, nao); - else if (!first) - format(out_stream, lit("~a which is located at ~a\n"), prefix, info, nao); + } else if (!first) { + if (info) + format(out_stream, lit("~a which is located at ~a\n"), prefix, + info, nao); + else + format(out_stream, lit("~a whose location is unavailable\n"), prefix, + nao); + } } } -- cgit v1.2.3