From fa1141b57dfd46d81db23d3ee42bd259342e2720 Mon Sep 17 00:00:00 2001 From: Abdulaziz Ghuloum Date: Sat, 2 Dec 2006 06:26:05 -0500 Subject: [PATCH] renamed current-error-handler to error-handler --- lib/ikarus.boot | Bin 1868320 -> 1868264 bytes lib/libcafe.ss | 9 ++++----- lib/libwriter.ss | 6 +++--- lib/makefile.ss | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/lib/ikarus.boot b/lib/ikarus.boot index 4b5774cf7e2ae621b18726ffa1e30157064da6e5..613612b2fdc7989c7d5f19bb51a809685f51938b 100644 GIT binary patch delta 2673 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 C-;vY+ diff --git a/lib/libcafe.ss b/lib/libcafe.ss index 53f07bc..cd7b54a 100644 --- a/lib/libcafe.ss +++ b/lib/libcafe.ss @@ -1,17 +1,17 @@ (let () (define with-error-handler (lambda (p thunk) - (let ([old-error-handler (current-error-handler)]) + (let ([old-error-handler (error-handler)]) (dynamic-wind (lambda () - (current-error-handler + (error-handler (lambda args - (current-error-handler old-error-handler) + (error-handler old-error-handler) (apply p args) (apply error args)))) thunk (lambda () - (current-error-handler old-error-handler)))))) + (error-handler old-error-handler)))))) (define eval-depth 0) @@ -30,7 +30,6 @@ (with-error-handler (lambda args (reset-input-port! (console-input-port)) - ;(display "repl catch\n" (console-output-port)) (apply print-error args) (k (void))) (lambda () diff --git a/lib/libwriter.ss b/lib/libwriter.ss index 4104643..e74dd2a 100644 --- a/lib/libwriter.ss +++ b/lib/libwriter.ss @@ -483,7 +483,7 @@ (error 'display "~s is not an output port" p)) (display x p)])) (primitive-set! 'print-error print-error) - (primitive-set! 'current-error-handler + (primitive-set! 'error-handler (make-parameter (lambda args (apply print-error args) @@ -492,8 +492,8 @@ (lambda (x) (if (procedure? x) x - (error 'current-error-handler "~s is not a procedure" x))))) + (error 'error-handler "~s is not a procedure" x))))) (primitive-set! 'error (lambda args - (apply (current-error-handler) args)))) + (apply (error-handler) args)))) diff --git a/lib/makefile.ss b/lib/makefile.ss index e6b61d0..4f4fc77 100644 --- a/lib/makefile.ss +++ b/lib/makefile.ss @@ -69,7 +69,7 @@ display write print-graph fasl-write printf format print-error read-token read error exit call/cc - current-error-handler + error-handler eval current-eval interpret compile compile-file new-cafe load system expand sc-expand current-expand expand-mode