assocs: Add of and ?of. Change all the things at once! Fixes #701.

[factor.git] / extra / reddit / reddit.factor

diff --git a/extra/reddit/reddit.factor b/extra/reddit/reddit.factor
index 0955a23de1e2923ddd6dbdcacd732e0a8dce0c1f..ec712719a5e3890f19ddced3b86c33397623f953 100644 (file)
--- a/extra/reddit/reddit.factor
+++ b/extra/reddit/reddit.factor
@@ -30,7 +30,7 @@ display_name id header_img header_size header_title name over18
 public_description subscribers title url ;
 
 : parse-data ( assoc -- obj )
-    [ "data" swap at ] [ "kind" swap at ] bi {
+    [ "data" of ] [ "kind" of ] bi {
         { "t1" [ comment ] }
         { "t2" [ user ] }
         { "t3" [ story ] }
@@ -41,10 +41,10 @@ public_description subscribers title url ;
 TUPLE: page url data before after ;
 
 : json-page ( url -- page )
-    >url dup http-get nip json> "data" swap at {
-        [ "children" swap at [ parse-data ] map ]
-        [ "before" swap at [ f ] when-json-null ]
-        [ "after" swap at [ f ] when-json-null ]
+    >url dup http-get nip json> "data" of {
+        [ "children" of [ parse-data ] map ]
+        [ "before" of [ f ] when-json-null ]
+        [ "after" of [ f ] when-json-null ]
     } cleave \ page boa ;
 
 : get-user ( username -- page )