Changed the name of the macro ECL_RESTARTS_TRY to ECL_RESTART_CASE

This commit is contained in:
Juan Jose Garcia Ripoll 2012-07-02 23:21:34 +02:00
parent 84a3200a02
commit e1fb39a49b
3 changed files with 7 additions and 6 deletions

View file

@ -266,7 +266,7 @@ thread_entry_point(void *arg)
si_trap_fpe(@'last', ECL_T);
ecl_bds_bind(env, @'mp::*current-process*', process);
ECL_RESTARTS_TRY(env, ecl_list1(Cnil), @'abort') {
ECL_RESTART_CASE_BEGIN(env, @'abort') {
env->values[0] = cl_apply(2, process->process.function,
process->process.args);
{
@ -277,7 +277,7 @@ thread_entry_point(void *arg)
}
process->process.exit_values = output;
}
} ECL_RESTARTS_CATCH(1,args) {
} ECL_RESTART_CASE(1,args) {
/* ABORT restart. */
process->process.exit_values = args;
} ECL_RESTARTS_END;

View file

@ -347,6 +347,7 @@
;; ECL extensions
(proclamation ext:catch-signal (fixnum gen-bool &key) null)
(proclamation si:bind-simple-restarts (t t) list)
;;;
;;; 10. SYMBOLS

View file

@ -414,19 +414,19 @@ extern ECL_API ecl_frame_ptr _ecl_frs_push(register cl_env_ptr, register cl_obje
#define ECL_CATCH_END } \
ecl_frs_pop(__the_env); } while (0)
#define ECL_RESTARTS_TRY(the_env, tag, names) do { \
#define ECL_RESTART_CASE_BEGIN(the_env, names) do { \
const cl_env_ptr __the_env = (the_env); \
const cl_object __ecl_tag = (tag); \
const cl_object __ecl_tag = ecl_list1(names); \
ecl_bds_bind(__the_env, ECL_RESTART_CLUSTERS, \
si_bind_simple_restarts(__ecl_tag, names)); \
if (ecl_frs_push(__the_env,__ecl_tag) == 0) {
#define ECL_RESTARTS_CATCH(code, args) \
#define ECL_RESTART_CASE(code, args) \
} else if (__the_env->values[1] == ecl_make_fixnum(code)) { \
const cl_object args = __the_env->values[0];
#define ECL_RESTARTS_END } \
#define ECL_RESTART_CASE_END } \
ecl_frs_pop(__the_env); \
ecl_bds_unwind1(__the_env); \
} while (0)