return and return-from must throw, not abort.

* eval.c (op_return, op_return_from): If uw_block_return
doesn't find a block, and just returns, then throw an
exception rather than aborting.

1 files changed, 3 insertions, 0 deletions

diff --git a/eval.c b/eval.c
index 8a2e99ed..bd0b40ea 100644
--- a/eval.c
+++ b/eval.c
@@ -1833,6 +1833,7 @@ static val op_return(val form, val env)
 {
   val retval = eval(second(form), env, form);
   uw_block_return(nil, retval);
+  eval_error(form, lit("return: no anonymous block is visible"), nao);
   abort();
 }
 
@@ -1841,6 +1842,8 @@ static val op_return_from(val form, val env)
   val name = second(form);
   val retval = eval(third(form), env, form);
   uw_block_return(name, retval);
+  eval_error(form, lit("return-from: no block named ~s is visible"),
+             name, nao);
   abort();
 }