Changeset 12091


Ignore:
Timestamp:
May 19, 2009, 12:55:55 PM (10 years ago)
Author:
gz
Message:

Merge r12090 from trunk

Location:
branches/working-0711/ccl
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/working-0711/ccl/level-1/l1-events.lisp

    r11730 r12091  
    9999(defparameter *invoke-debugger-hook-on-interrupt* nil)
    100100
     101(define-condition interrupt-signal-condition (condition) ()
     102  (:report "interrupt signal"))
     103
    101104(defun force-break-in-listener (p)
    102105  (process-interrupt p
    103106                     #'(lambda ()
    104                          (let* ((condition (condition-arg "interrupt signal" nil 'simple-condition)))
     107                         (let* ((condition (make-condition 'interrupt-signal-condition)))
    105108                           (ignoring-without-interrupts
    106109                            (when *invoke-debugger-hook-on-interrupt*
  • branches/working-0711/ccl/level-1/l1-readloop-lds.lisp

    r12081 r12091  
    551551                                        ; returns NIL
    552552
     553(defvar *break-hook* nil)
     554
    553555(defun cbreak-loop (msg cont-string condition error-pointer)
    554   (let* ((*print-readably* nil))
    555     (%break-message msg condition error-pointer)
    556     (restart-case (break-loop condition error-pointer)
     556  (let* ((*print-readably* nil)
     557         (hook *break-hook*))
     558    (restart-case (progn
     559                    (when hook
     560                      (let ((*break-hook* nil))
     561                        (funcall hook condition hook))
     562                      (setq hook nil))
     563                    (%break-message msg condition error-pointer)
     564                    (break-loop condition error-pointer))
    557565      (continue () :report (lambda (stream) (write-string cont-string stream))))
    558     (fresh-line *error-output*)
     566    (unless hook
     567      (fresh-line *error-output*))
    559568    nil))
    560569
  • branches/working-0711/ccl/lib/ccl-export-syms.lisp

    r11591 r12091  
    6666     *quit-on-eof*
    6767     *quit-interrupt-hook*
     68     *break-hook*
     69     interrupt-signal-condition
    6870     macroexpand-all
    6971     compiler-macroexpand
Note: See TracChangeset for help on using the changeset viewer.