diff options
author | Kaz Kylheku <kaz@kylheku.com> | 2015-02-06 22:24:33 -0800 |
---|---|---|
committer | Kaz Kylheku <kaz@kylheku.com> | 2015-02-06 22:24:33 -0800 |
commit | 55cc849371a0dc0782f3f749cb58c46e0a558e40 (patch) | |
tree | f82e0ff125c582ef2753fef122e4761a9a4533e2 /eval.c | |
parent | 3b7f7ef0422537391879d356e61baa50f74483a1 (diff) | |
download | txr-55cc849371a0dc0782f3f749cb58c46e0a558e40.tar.gz txr-55cc849371a0dc0782f3f749cb58c46e0a558e40.tar.bz2 txr-55cc849371a0dc0782f3f749cb58c46e0a558e40.zip |
Slight internal representation change of string-only exceptions.
One upshot of all this is that (throw 'foo "msg") now
does exactly the same thing as (throwf 'foo "msg").
A message-only exception really is a one-string exception argument
list ("message ..."), like the documentation says.
* unwind.h (struct uw_catch): exception member renamed to args.
(uw_catch): Macro follows structure member rename.
* eval.c (op_catch): Removed now unnecessary kludge of turning non-list
exception argument list into a one-element argument list.
* match.c (v_try): Similar hack to the one in op_catch
removed here.
* unwind.c (uw_unwind_to_exit_point, uw_push_catch): Follows rename of
exception member.
(uw_throw): The exception parameter is renamed to args. The kludge
removed from op_catch re-appears here, because numerous calls
to uw_throw just pass a string as args. It's less of a kludge here
because this is the master entry point to exception processing,
and it straightens out the representation right away.
The exception arguments or message are printed in a clearer way.
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -2002,9 +2002,7 @@ static val op_catch(val form, val env) if (uw_exception_subtype_p(exsym, type)) { val params = second(clause); val saved_de = set_dyn_env(make_env(nil, nil, dyn_env)); - val clause_env = bind_args(env, params, if3(listp(exvals), - exvals, cons(exvals, nil)), - clause); + val clause_env = bind_args(env, params, exvals, clause); result = eval_progn(rest(rest(clause)), clause_env, clause); set_dyn_env(saved_de); break; |