summaryrefslogtreecommitdiff
path: root/src/eval.c
diff options
context:
space:
mode:
authorPhilipp Stephani <phst@google.com>2015-11-16 00:31:56 +0100
committerTed Zlatanov <tzz@lifelogs.com>2015-11-18 14:23:41 -0500
commit7cdc5d628a737e2153c38d0d285c9879071beaa7 (patch)
tree58d21223b8d1b7de7230449dfb24d85efcab86f5 /src/eval.c
parent133ad3e2006d136a6153a75140a880f8ff16ea65 (diff)
downloademacs-7cdc5d628a737e2153c38d0d285c9879071beaa7.tar.gz
emacs-7cdc5d628a737e2153c38d0d285c9879071beaa7.tar.bz2
emacs-7cdc5d628a737e2153c38d0d285c9879071beaa7.zip
Add catch-all & no-signal version of PUSH_HANDLER
Ground work for modules. Add a non-signaling version of PUSH_HANDLER and a new "catch-all" handler type. * src/eval.c (init_handler, push_handler, push_handler_nosignal): New functions. * src/fns.c (hash_remove_from_table): Expose function public. * src/lisp.h: New handler type, define macro to push_handler call.
Diffstat (limited to 'src/eval.c')
-rw-r--r--src/eval.c53
1 files changed, 52 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c
index 3ee07a71c69..396ca84a71d 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1145,7 +1145,9 @@ Both TAG and VALUE are evalled. */
if (!NILP (tag))
for (c = handlerlist; c; c = c->next)
{
- if (c->type == CATCHER && EQ (c->tag_or_ch, tag))
+ if (c->type == CATCHER_ALL)
+ unwind_to_catch (c, Fcons (tag, value));
+ if (c->type == CATCHER && EQ (c->tag_or_ch, tag))
unwind_to_catch (c, value);
}
xsignal2 (Qno_catch, tag, value);
@@ -1394,6 +1396,55 @@ internal_condition_case_n (Lisp_Object (*bfun) (ptrdiff_t, Lisp_Object *),
return val;
}
+static void init_handler (struct handler *c, Lisp_Object tag_ch_val,
+ enum handlertype handlertype);
+
+void push_handler (struct handler **const c, const Lisp_Object tag_ch_val,
+ const enum handlertype handlertype)
+{
+ if (handlerlist->nextfree)
+ *c = handlerlist->nextfree;
+ else
+ {
+ *c = xmalloc (sizeof (struct handler));
+ (*c)->nextfree = NULL;
+ handlerlist->nextfree = *c;
+ }
+ init_handler (*c, tag_ch_val, handlertype);
+}
+
+bool push_handler_nosignal (struct handler **const c, const Lisp_Object tag_ch_val,
+ const enum handlertype handlertype)
+{
+ if (handlerlist->nextfree)
+ *c = handlerlist->nextfree;
+ else
+ {
+ struct handler *const h = malloc (sizeof (struct handler));
+ if (! h) return false;
+ *c = h;
+ h->nextfree = NULL;
+ handlerlist->nextfree = h;
+ }
+ init_handler (*c, tag_ch_val, handlertype);
+ return true;
+}
+
+static void init_handler (struct handler *const c, const Lisp_Object tag_ch_val,
+ const enum handlertype handlertype)
+{
+ c->type = handlertype;
+ c->tag_or_ch = tag_ch_val;
+ c->val = Qnil;
+ c->next = handlerlist;
+ c->lisp_eval_depth = lisp_eval_depth;
+ c->pdlcount = SPECPDL_INDEX ();
+ c->poll_suppress_count = poll_suppress_count;
+ c->interrupt_input_blocked = interrupt_input_blocked;
+ c->byte_stack = byte_stack_list;
+ handlerlist = c;
+}
+
static Lisp_Object find_handler_clause (Lisp_Object, Lisp_Object);
static bool maybe_call_debugger (Lisp_Object conditions, Lisp_Object sig,