suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix exception handling during collection-table read

Browse Source 
Non-`exn:fail?' exceptions, such as breaks, should be propagated.
This commit is contained in:
Matthew Flatt 2012-11-24 06:26:59 -07:00
parent 3f08da67a4
commit 4ca6e3c452
3 changed files with 598 additions and 587 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1156
src/racket/src/cstartup.inc
View File

File diff suppressed because it is too large Load Diff

6
src/racket/src/startup.inc
View File

@ -359,6 +359,7 @@
"(define-values(make-handler)"
"(lambda(ts)"
"(lambda(exn)"
"(if(exn:fail? exn)"
"(let((l(current-logger)))"
"(when(log-level? l 'error)"
"(log-message l 'error "
@ -367,6 +368,7 @@
"(if user? user-links-path links-path)"
"(exn-message exn))"
"(current-continuation-marks))))"
"(void))"
"(when ts"
"(if user?"
"(begin"
@ -375,7 +377,9 @@
"(begin"
"(set! links-cache(make-hasheq))"
"(set! links-timestamp ts))))"
"(esc(make-hasheq)))))"
"(if(exn:fail? exn)"
"(esc(make-hasheq))"
" exn))))"
"(with-continuation-mark"
" exception-handler-key"
"(make-handler #f)"

23
src/racket/src/startup.rktl
View File

@ -429,14 +429,16 @@
(define-values (make-handler)
(lambda (ts)
(lambda (exn)
(let ([l (current-logger)])
(when (log-level? l 'error)
(log-message l 'error
(format
"error reading collection links file ~s: ~a"
(if user? user-links-path links-path)
(exn-message exn))
(current-continuation-marks))))
(if (exn:fail? exn)
(let ([l (current-logger)])
(when (log-level? l 'error)
(log-message l 'error
(format
"error reading collection links file ~s: ~a"
(if user? user-links-path links-path)
(exn-message exn))
(current-continuation-marks))))
(void))
(when ts
(if user?
(begin
@ -445,7 +447,10 @@
(begin
(set! links-cache (make-hasheq))
(set! links-timestamp ts))))
(esc (make-hasheq)))))
(if (exn:fail? exn)
(esc (make-hasheq))
;; re-raise the exception (which is probably a break)
exn))))
(with-continuation-mark
exception-handler-key
(make-handler #f)