From: Doug Coleman Date: Wed, 17 Aug 2022 05:14:44 +0000 (-0500) Subject: assocs.extras: deep-at -> deep-of X-Git-Tag: 0.99~1126 X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=e766b83ac0fcc5857602dcfae2791be3b93602b6 assocs.extras: deep-at -> deep-of --- diff --git a/extra/assocs/extras/extras-tests.factor b/extra/assocs/extras/extras-tests.factor index f382df494f..c8233c6d25 100644 --- a/extra/assocs/extras/extras-tests.factor +++ b/extra/assocs/extras/extras-tests.factor @@ -6,12 +6,12 @@ USING: arrays assocs.extras kernel math math.order sequences tools.test ; H{ } clone 10 { 1 2 3 4 5 } pick push-at-each ] unit-test -{ f } [ f { } deep-at ] unit-test -{ f } [ f { "foo" } deep-at ] unit-test -{ f } [ H{ } { 1 2 3 } deep-at ] unit-test -{ f } [ H{ { "a" H{ { "b" 1 } } } } { "a" "c" } deep-at ] unit-test -{ 1 } [ H{ { "a" H{ { "b" 1 } } } } { "a" "b" } deep-at ] unit-test -{ 4 } [ H{ { 1 H{ { 2 H{ { 3 4 } } } } } } { 1 2 3 } deep-at ] unit-test +{ f } [ f { } deep-of ] unit-test +{ f } [ f { "foo" } deep-of ] unit-test +{ f } [ H{ } { 1 2 3 } deep-of ] unit-test +{ f } [ H{ { "a" H{ { "b" 1 } } } } { "a" "c" } deep-of ] unit-test +{ 1 } [ H{ { "a" H{ { "b" 1 } } } } { "a" "b" } deep-of ] unit-test +{ 4 } [ H{ { 1 H{ { 2 H{ { 3 4 } } } } } } { 1 2 3 } deep-of ] unit-test { H{ { 2 1 } { 4 3 } } } [ H{ { 1 2 } { 3 4 } } assoc-invert ] unit-test diff --git a/extra/assocs/extras/extras.factor b/extra/assocs/extras/extras.factor index 1314f8b616..8aee7d6d9d 100644 --- a/extra/assocs/extras/extras.factor +++ b/extra/assocs/extras/extras.factor @@ -7,7 +7,7 @@ IN: assocs.extras : push-at-each ( value keys assoc -- ) '[ _ push-at ] with each ; inline -: deep-at ( assoc seq -- value/f ) +: deep-of ( assoc seq -- value/f ) [ of ] each ; inline : substitute! ( seq assoc -- seq ) diff --git a/extra/google/search/search.factor b/extra/google/search/search.factor index ba1d396119..7f4b0b4463 100644 --- a/extra/google/search/search.factor +++ b/extra/google/search/search.factor @@ -23,7 +23,7 @@ PRIVATE> : google-search ( query -- results ) search-url http-get nip json> - { "responseData" "results" } deep-at + { "responseData" "results" } deep-of [ \ search-result from-slots ] map ;