assocs.extras: deep-at -> deep-of

diff --git a/extra/assocs/extras/extras-tests.factor b/extra/assocs/extras/extras-tests.factor
index f382df494f3f1b3a25d64f78e1f8aa529b49e8e5..c8233c6d251588d0f133cd7bbf8b7646b99b6e29 100644 (file)
--- 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 1314f8b616f4b7dbd5858dd0842c050655450e22..8aee7d6d9db110e65d14d15979093f9d2586ae93 100644 (file)
--- 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 ba1d396119d2af2c071743e0c2779ca41190fef4..7f4b0b4463c0e2d1a9a7989c3ad47e30ab27f40f 100644 (file)
--- 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 ;
 
 <PRIVATE