conservatory
/
picrin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #341 from stibear/lazy2 

fix promise bugs on corner cases (second one)
This commit is contained in:
Yuichi Nishiwaki 2016-06-02 22:34:24 +09:00
parent dd75267f8e 3d2dd7cefc
commit 15f048d0da
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/20.r7rs/scheme/lazy.scm
View File

@ -24,9 +24,12 @@
(if (promise-done? promise) (if (promise-done? promise)
(promise-value promise) (promise-value promise)
(let ((new-promise ((promise-value promise)))) (let ((new-promise ((promise-value promise))))
(set-promise-done! promise (promise-done? new-promise)) (if (promise-done? promise)
(set-promise-value! promise (promise-value new-promise)) (promise-value promise)
(force promise)))) (begin
(set-promise-done! promise (promise-done? new-promise))
(set-promise-value! promise (promise-value new-promise))
(force promise))))))
(define (make-promise obj) (define (make-promise obj)
(if (promise? obj) (if (promise? obj)

10
contrib/20.r7rs/t/r7rs.scm
View File

@ -363,7 +363,15 @@
(force x) (force x)
(promise? x))) (promise? x)))
(let ()
(define flag #f)
(define p (delay (if flag
'ok
(begin
(set! flag #t)
(force p)
'ng))))
(test 'ok (force p)))
(define radix (define radix