diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | eval.c | 10 | ||||
| -rw-r--r-- | unwind.c | 8 |
3 files changed, 17 insertions, 9 deletions
@@ -1,5 +1,13 @@ 2015-08-04 Kaz Kylheku <kaz@kylheku.com> + * eval.c (bind_args): Use new ~! for proper indentation + of multi-line context form. + (apply): Use ~! for proper indentation of function code. + + * unwind.c (uw_throw): Use ~! for proper indentation of code. + +2015-08-04 Kaz Kylheku <kaz@kylheku.com> + * stream.c (put_string): In indent mode, put_string has to process all the characters as if by put_char, (which we now do literally that way). @@ -512,7 +512,7 @@ static val bind_args(val env, val params, val args, val ctx_form) params = cdr(params); } if (!optargs) - eval_error(ctx_form, lit("~s: too few arguments for ~s\n"), + eval_error(ctx_form, lit("~s: too few arguments for ~!~s\n"), car(ctx_form), ctx_form, nao); while (consp(params)) { val param = car(params); @@ -546,7 +546,7 @@ static val bind_args(val env, val params, val args, val ctx_form) eval_error(ctx_form, lit("~s: ~s is not a bindable symbol"), car(ctx_form), params, nao); } else if (args) { - eval_error(ctx_form, lit("~s: too many arguments for ~s"), + eval_error(ctx_form, lit("~s: too many arguments for ~!~s"), car(ctx_form), ctx_form, nao); } @@ -705,11 +705,11 @@ val apply(val fun, val arglist, val ctx_form) nargs = p - arg; if (nargs < reqargs) - eval_error(ctx_form, lit("~s: missing required arguments for ~s"), + eval_error(ctx_form, lit("~s: missing required arguments for ~!~s"), ctx, func_get_name(fun, nil), nao); if (nargs > fixparam) - eval_error(ctx_form, lit("~s: too many arguments for ~s"), + eval_error(ctx_form, lit("~s: too many arguments for ~!~s"), ctx, func_get_name(fun, nil), nao); for (; nargs < fixparam; nargs++) @@ -752,7 +752,7 @@ val apply(val fun, val arglist, val ctx_form) nargs = p - arg; if (nargs < reqargs) - eval_error(ctx_form, lit("~s: missing required arguments for ~s"), + eval_error(ctx_form, lit("~s: missing required arguments for ~!~s"), ctx, func_get_name(fun, nil), nao); for (; nargs < fixparam; nargs++) @@ -319,17 +319,17 @@ val uw_throw(val sym, val args) prog_string, sym, nao); if (info && sym != eval_error_s) - format(std_error, lit("~a: possibly triggered at ~a by form ~s\n"), + format(std_error, lit("~a: possibly triggered at ~a by form ~!~s\n"), prog_string, info, last_form_evaled, nao); if (ex_info) - format(std_error, lit("~a: during expansion at ~a of form ~s\n"), + format(std_error, lit("~a: during expansion at ~a of form ~!~s\n"), prog_string, ex_info, last_form_expanded, nao); format(std_error, if3(is_msg, - lit("~a: message: ~a\n"), - lit("~a: exception args: ~s\n")), + lit("~a: message: ~!~a\n"), + lit("~a: exception args: ~!~s\n")), prog_string, msg_or_args, nao); } if (uw_exception_subtype_p(sym, query_error_s) || |