From 7432a8aa7d39aaddc830bdf8d9650899877f34c3 Mon Sep 17 00:00:00 2001 From: Juanjo Garcia-Ripoll Date: Tue, 3 Jul 2012 12:46:39 +0200 Subject: [PATCH] si_bind_simple_restarts() should do nothing in ecl_min until everything is loaded --- src/c/cinit.d | 5 ++++- src/c/symbols_list.h | 2 +- src/c/symbols_list2.h | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/c/cinit.d b/src/c/cinit.d index 03978716d..0254146b2 100644 --- a/src/c/cinit.d +++ b/src/c/cinit.d @@ -55,7 +55,10 @@ clos_std_compute_applicable_methods(cl_object gf, cl_object arglist) extern cl_object si_bind_simple_restarts(cl_object tag, cl_object names) { - return _ecl_funcall3(@'si::bind-simple-restarts', tag, names); + if (ECL_SYM_FUN(@'si::bind-simple-restarts') != Cnil) + return _ecl_funcall3(@'si::bind-simple-restarts', tag, names); + else + return ECL_SYM_VAL(ecl_process_env(), @'si::*restart-clusters*'); } extern cl_object diff --git a/src/c/symbols_list.h b/src/c/symbols_list.h index a2e3435b3..94c11bdad 100755 --- a/src/c/symbols_list.h +++ b/src/c/symbols_list.h @@ -2305,7 +2305,7 @@ cl_symbols[] = { {FFI_ "WITH-FOREIGN-STRING", FFI_ORDINARY, NULL, -1, OBJNULL}, {FFI_ "WITH-FOREIGN-STRINGS", FFI_ORDINARY, NULL, -1, OBJNULL}, -{SYS_ "BIND-SIMPLE-RESTARTS", SI_ORDINARY, si_bind_simple_restarts, 2, OBJNULL}, +{SYS_ "BIND-SIMPLE-RESTARTS", SI_ORDINARY, ECL_NAME(si_bind_simple_restarts), 2, OBJNULL}, /* Tag for end of list */ {NULL, CL_ORDINARY, NULL, -1, OBJNULL}}; diff --git a/src/c/symbols_list2.h b/src/c/symbols_list2.h index 7eace4162..8cb92352e 100644 --- a/src/c/symbols_list2.h +++ b/src/c/symbols_list2.h @@ -2305,7 +2305,7 @@ cl_symbols[] = { {FFI_ "WITH-FOREIGN-STRING",NULL}, {FFI_ "WITH-FOREIGN-STRINGS",NULL}, -{SYS_ "BIND-SIMPLE-RESTARTS","si_bind_simple_restarts"}, +{SYS_ "BIND-SIMPLE-RESTARTS","ECL_NAME(si_bind_simple_restarts)"}, /* Tag for end of list */ {NULL,NULL}};