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

cs: fix prop:chaperone-unsafe-undefined-triggered error

Browse Source
This commit is contained in:
Matthew Flatt 2019-01-13 18:10:22 -07:00
parent 9b2431e670
commit 0602c7e21b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/racket-test-core/tests/racket/object.rktl
View File

@ -1939,7 +1939,7 @@
(define q 1) (define q 1)
(field [s 1]) (field [s 1])
(super-new))) (super-new)))
(err/rt-test (new d%) (make-undefined-exn? 'z)) (err/rt-test (new d%) (make-undefined-exn? 'z))
(err/rt-test (new d!%) (make-undefined-exn? 'z)) (err/rt-test (new d!%) (make-undefined-exn? 'z))
(err/rt-test (new e%) (make-undefined-exn? 'z)) (err/rt-test (new e%) (make-undefined-exn? 'z))

5
racket/src/cs/rumble/impersonator.ss
View File

@ -56,7 +56,8 @@
rtd) rtd)
(let ([r (loop (impersonator-next v))]) (let ([r (loop (impersonator-next v))])
(when (eq? r unsafe-undefined) (when (eq? r unsafe-undefined)
(raise-unsafe-undefined 'struct-ref "undefined" "use" acc (impersonator-val v) (cdr key))) (let ([abs-pos (fx+ (cdr key) (struct-type-parent-total*-count (car key)))])
(raise-unsafe-undefined 'struct-ref "undefined" "use" acc (impersonator-val v) abs-pos)))
r)] r)]
[(impersonator? v) [(impersonator? v)
(loop (impersonator-next v))] (loop (impersonator-next v))]
@ -95,7 +96,7 @@
(when (eq? (unsafe-struct*-ref (impersonator-val v) abs-pos) unsafe-undefined) (when (eq? (unsafe-struct*-ref (impersonator-val v) abs-pos) unsafe-undefined)
(unless (eq? (continuation-mark-set-first #f prop:chaperone-unsafe-undefined) (unless (eq? (continuation-mark-set-first #f prop:chaperone-unsafe-undefined)
unsafe-undefined) unsafe-undefined)
(raise-unsafe-undefined 'struct-set! "assignment disallowed" "assign" set (impersonator-val v) pos))) (raise-unsafe-undefined 'struct-set! "assignment disallowed" "assign" set (impersonator-val v) abs-pos)))
(loop (impersonator-next v) a)] (loop (impersonator-next v) a)]
[(impersonator? v) [(impersonator? v)
(loop (impersonator-next v) a)] (loop (impersonator-next v) a)]