mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-30 23:10:21 +02:00
Code Activity

finish deprecating pre-unwind-handler-dispatch

Browse source 
* module/ice-9/boot-9.scm:
* module/ice-9/deprecated.scm (pre-unwind-handler-dispatch): Properly
  deprecate.

* module/ice-9/debugger.scm (debug-on-error):
* module/ice-9/debugging/traps.scm (on-pre-unwind-handler-dispatch):
  Update remaining pre-unwind-handler-dispatch uses.
This commit is contained in:
Andy Wingo 2010-06-18 12:43:04 +02:00
parent a29e5b632e
commit 38008a7517
4 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
module/ice-9/boot-9.scm
View file

@ -2679,10 +2679,6 @@ module '(ice-9 q) '(make-q q-length))}."
(save-stack 2) (save-stack 2)
(apply throw key args)) (apply throw key args))
(begin-deprecated
(define (pre-unwind-handler-dispatch key . args)
(apply default-pre-unwind-handler key args)))
(define abort-hook (make-hook)) (define abort-hook (make-hook))
;; Programs can call `batch-mode?' to see if they are running as part of a ;; Programs can call `batch-mode?' to see if they are running as part of a

6
module/ice-9/debugger.scm
View file

@ -1,6 +1,6 @@
;;;; Guile Debugger ;;;; Guile Debugger
;;; Copyright (C) 1999, 2001, 2002, 2006 Free Software Foundation, Inc. ;;; Copyright (C) 1999, 2001, 2002, 2006, 2010 Free Software Foundation, Inc.
;;; ;;;
;;;; This library is free software; you can redistribute it and/or ;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public ;;;; modify it under the terms of the GNU Lesser General Public
@ -132,12 +132,12 @@ Indicates that the debugger should display an introductory message.
(define (debug-on-error syms) (define (debug-on-error syms)
"Enable or disable debug on error." "Enable or disable debug on error."
(set! pre-unwind-handler-dispatch (set! default-pre-unwind-handler
(if syms (if syms
(lambda (key . args) (lambda (key . args)
(if (memq key syms) (if (memq key syms)
(begin (begin
(debug-stack (make-stack #t pre-unwind-handler-dispatch) (debug-stack (make-stack #t default-pre-unwind-handler)
#:with-introduction #:with-introduction
#:continuable) #:continuable)
(throw 'abort key))) (throw 'abort key)))

2
module/ice-9/debugging/traps.scm
View file

@ -494,7 +494,7 @@ it twice."
(or (memq key ignored-keys) (or (memq key ignored-keys)
(behaviour (throw->trap-context key (behaviour (throw->trap-context key
args args
pre-unwind-handler-dispatch))) default-pre-unwind-handler)))
(apply default-default-pre-unwind-handler key args)) (apply default-default-pre-unwind-handler key args))
default-default-pre-unwind-handler))) default-default-pre-unwind-handler)))

9
module/ice-9/deprecated.scm
View file

@ -56,7 +56,8 @@
assert-repl-verbosity assert-repl-verbosity
set-repl-prompt! set-repl-prompt!
set-batch-mode?! set-batch-mode?!
repl) repl
pre-unwind-handler-dispatch)
#:replace (module-ref-submodule module-define-submodule!)) #:replace (module-ref-submodule module-define-submodule!))
@ -616,3 +617,9 @@ the `(system repl common)' module.")
(let loop ((source (read (current-input-port)))) (let loop ((source (read (current-input-port))))
(print (evaler source)) (print (evaler source))
(loop (read (current-input-port))))) (loop (read (current-input-port)))))
(define (pre-unwind-handler-dispatch key . args)
(issue-deprecation-warning
"`pre-unwind-handler-dispatch' is deprecated. Use
`default-pre-unwind-handler' directly.")
(apply default-pre-unwind-handler key args))