diff --git a/include/cyclone/runtime.h b/include/cyclone/runtime.h index f1dfc1ca..e2f898b6 100644 --- a/include/cyclone/runtime.h +++ b/include/cyclone/runtime.h @@ -358,15 +358,6 @@ extern object Cyc_glo_call_cc; #define __glo_eval Cyc_glo_eval #define __glo_call_95cc Cyc_glo_call_cc -/* Exception handler */ -extern object Cyc_exception_handler_stack; - -// Special case, use this one instead since we need it in the runtime -// This also seems to "shadow" the corresponding C var definition, as -// subsequent instances of it are replaced during preprocessing. Is that -// behavior portable? If not, will have to modify cgen to not emit the var. -#define __glo__85exception_91handler_91stack_85 Cyc_exception_handler_stack - object Cyc_default_exception_handler(void *data, int argc, closure _, object err); object Cyc_current_exception_handler(void *data); void Cyc_rt_raise(void *data, object err); diff --git a/runtime.c b/runtime.c index 9bf754de..fccb16ce 100644 --- a/runtime.c +++ b/runtime.c @@ -347,8 +347,6 @@ object Cyc_glo_call_cc = nil; object Cyc_glo_eval = nil; /* Exception handler */ -object Cyc_exception_handler_stack = nil; - object Cyc_default_exception_handler(void *data, int argc, closure _, object err) { fprintf(stderr, "Error: "); diff --git a/scheme/base.sld b/scheme/base.sld index eedd55ff..aaa00a65 100644 --- a/scheme/base.sld +++ b/scheme/base.sld @@ -72,7 +72,6 @@ raise raise-continuable with-exception-handler - *exception-handler-stack* Cyc-add-exception-handler Cyc-remove-exception-handler newline @@ -618,12 +617,6 @@ (set! result (thunk)) (Cyc-remove-exception-handler) ; Only reached if no ex raised result)) - (define *exception-handler-stack* '()) -; (define (Cyc-add-exception-handler h) -; (set! *exception-handler-stack* (cons h *exception-handler-stack*))) -; (define (Cyc-remove-exception-handler) -; (if (not (null? *exception-handler-stack*)) -; (set! *exception-handler-stack* (cdr *exception-handler-stack*)))) (define-c Cyc-add-exception-handler "(void *data, int argc, closure _, object k, object h)" " gc_thread_data *thd = (gc_thread_data *)data;