Improved error reporting, particularly for macro expansion.

* eval.c (last_form_expanded): New variable.
(do_expand): New static function; contains previous expand
function.
(expand): Becomes a wrapper for do_expand, with re-entry
counting.
(eval_init): GC-protect last_form_expanded.

* eval.h (last_form_expanded): Declared.

* parser.l (regex_parse, lisp_parse): Just use a simple word for
the name of the regex or string parse location, not the entire
expression itself.

* unwind.c (uw_throw): Check whether expansion was going on
when the unhandled exception was thrown and print additional
information.

1 files changed, 1 insertions, 1 deletions

diff --git a/eval.h b/eval.h
index b30e6615..f027de1a 100644
--- a/eval.h
+++ b/eval.h
@@ -27,7 +27,7 @@
 extern val dwim_s, lambda_s, vector_lit_s, vector_list_s;
 extern val hash_lit_s, hash_construct_s;
 extern val eval_error_s;
-extern val last_form_evaled;
+extern val last_form_evaled, last_form_expanded;
 
 val make_env(val fbindings, val vbindings, val up_env);
 val env_fbind(val env, val sym, val fun);