steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into modern-harvey3

modern-harvey3
Doug Coleman 2019-10-01 00:21:39 -05:00
parent 8d3dec2034 0dc71ab053
commit 4a86d45c17
4 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/tools/deploy/deploy-tests.factor
View File

@ -59,7 +59,7 @@ delete-staging-images
! { } [ "bunny" shake-and-bake 2559640 small-enough? ] long-unit-test ! { } [ "bunny" shake-and-bake 2559640 small-enough? ] long-unit-test
{ } [ "bunny" shake-and-bake 2700000 small-enough? ] long-unit-test { } [ "bunny" shake-and-bake 2700000 small-enough? ] long-unit-test
{ } [ "gpu.demos.bunny" shake-and-bake 3660000 small-enough? ] long-unit-test { } [ "gpu.demos.bunny" shake-and-bake 3750000 small-enough? ] long-unit-test
os macosx? [ os macosx? [
[ ] [ "webkit-demo" shake-and-bake 600000 small-enough? ] long-unit-test [ ] [ "webkit-demo" shake-and-bake 600000 small-enough? ] long-unit-test

3
core/memoize/memoize.factor
View File

@ -85,7 +85,8 @@ M: memoized reset-word
bi ; bi ;
: memoize-quot ( quot effect -- memo-quot ) : memoize-quot ( quot effect -- memo-quot )
[ H{ } clone ] 2dip make-memoizer ; dup in>> length zero? [ f 1array ] [ H{ } clone ] if
-rot make-memoizer ;
: reset-memoized ( word -- ) : reset-memoized ( word -- )
"memoize" word-prop dup sequence? "memoize" word-prop dup sequence?

19
extra/monads/monads-tests.factor
View File

@ -1,4 +1,5 @@
USING: tools.test math kernel sequences lists promises monads ; USING: tools.test math math.functions kernel sequences lists
promises monads ;
FROM: monads => do ; FROM: monads => do ;
IN: monads.tests IN: monads.tests
@ -113,6 +114,22 @@ LAZY: nats-from ( n -- list )
run-writer run-writer
] unit-test ] unit-test
{
T{ writer
{ value 1.618033988749895 }
{ log
"Started with five, took square root, added one, divided by two."
}
}
} [
{
[ 5 "Started with five, " <writer> ]
[ sqrt "took square root, " <writer> ]
[ 1 + "added one, " <writer> ]
[ 2 / "divided by two." <writer> ]
} do
] unit-test
{ T{ identity f 7 } } { T{ identity f 7 } }
[ [
4 identity-monad return 4 identity-monad return

2
extra/monads/monads.factor
View File

@ -188,7 +188,7 @@ M: writer-monad fail "Fail" throw ;
: run-writer ( writer -- value log ) [ value>> ] [ log>> ] bi ; : run-writer ( writer -- value log ) [ value>> ] [ log>> ] bi ;
M: writer >>= '[ [ _ run-writer ] dip '[ @ run-writer ] dip append <writer> ] ; M: writer >>= '[ [ _ run-writer ] dip '[ @ run-writer ] dip prepend <writer> ] ;
: pass ( writer -- writer' ) run-writer [ first2 ] dip swap call( x -- y ) <writer> ; : pass ( writer -- writer' ) run-writer [ first2 ] dip swap call( x -- y ) <writer> ;
: listen ( writer -- writer' ) run-writer [ 2array ] keep <writer> ; : listen ( writer -- writer' ) run-writer [ 2array ] keep <writer> ;