From ce415c5184773e4a114ab36629c9988472418dc5 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Thu, 23 Jun 2016 15:17:40 -0700
Subject: [PATCH] factor: rename all three of the {foo} words.

---
 collections/quadtrees/quadtrees.factor    | 6 +++---
 language/slots/macros/macros-tests.factor | 4 ++--
 language/slots/macros/macros.factor       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/collections/quadtrees/quadtrees.factor b/collections/quadtrees/quadtrees.factor
index 3cbc2344e0..2745fe25a5 100644
--- a/collections/quadtrees/quadtrees.factor
+++ b/collections/quadtrees/quadtrees.factor
@@ -59,7 +59,7 @@ DEFER: in-rect*
 : ur-bounds ( rect -- rect' )
     [ [ loc>> ] [ dim>> { 0.5 0.5 } v* ] bi v+ ] [ child-dim ] bi <rect> ;
 
-: {quadrants} ( node -- quadrants )
+: node>quadrants ( node -- quadrants )
     { [ ll>> ] [ lr>> ] [ ul>> ] [ ur>> ] } cleave 4array ;
 
 : add-subnodes ( node -- node )
@@ -130,7 +130,7 @@ DEFER: in-rect*
     } case ;
 
 : collapseable? ( node -- {point,value}/f )
-    {quadrants} { [ [ leaf?>> ] all? ] [ ?leaf ] } 1&& ;
+    node>quadrants { [ [ leaf?>> ] all? ] [ ?leaf ] } 1&& ;
 
 : remove-subnodes ( node -- leaf ) f >>ll f >>lr f >>ul f >>ur t >>leaf? ;
 
@@ -162,7 +162,7 @@ DEFER: in-rect*
 
 : leaf= ( a b -- ? ) [ [ point>> ] [ value>> ] bi 2array ] same? ;
 
-: node= ( a b -- ? ) [ {quadrants} ] same? ;
+: node= ( a b -- ? ) [ node>quadrants ] same? ;
 
 : (tree=) ( a b -- ? ) dup leaf?>> [ leaf= ] [ node= ] if ;
 
diff --git a/language/slots/macros/macros-tests.factor b/language/slots/macros/macros-tests.factor
index 46ca59d8a5..f71145518c 100644
--- a/language/slots/macros/macros-tests.factor
+++ b/language/slots/macros/macros-tests.factor
@@ -58,7 +58,7 @@ TUPLE: foo a b c ;
 
 { { 2 1 3 } } [
     T{ foo { a 1 } { b 2 } { c 3 } }
-    { "b" "a" "c" } {slots}
+    { "b" "a" "c" } slots>array
 ] unit-test
 
 { T{ foo { a "one" } { b "two" } { c "three" } } } [
@@ -70,5 +70,5 @@ TUPLE: foo a b c ;
 { T{ foo { a "one" } { b "two" } { c "three" } } } [
     { "two" "one" "three" }
     T{ foo { a 1 } { b 2 } { c 3 } } clone
-    [ { "b" "a" "c" } {set-slots} ] keep
+    [ { "b" "a" "c" } set-tuple-slots ] keep
 ] unit-test
diff --git a/language/slots/macros/macros.factor b/language/slots/macros/macros.factor
index 1f25cd6fc9..c8eb200f98 100644
--- a/language/slots/macros/macros.factor
+++ b/language/slots/macros/macros.factor
@@ -44,12 +44,12 @@ MACRO: set-slot ( name -- quot: ( value tuple -- ) )
 MACRO: slots ( names -- quot: ( tuple -- values... ) )
     [ '[ _ slot ] ] { } map-as '[ _ cleave ] ;
 
-MACRO: {slots} ( names -- quot: ( tuple -- {values} ) )
+MACRO: slots>array ( names -- quot: ( tuple -- values ) )
     dup length '[ _ slots _ narray ] ;
 
 MACRO: set-slots ( names -- quot: ( values... tuple -- ) )
     [ [ '[ _ set-slot ] ] [ ] map-as ] [ length dup ] bi
     '[ @ _ cleave-curry _ spread* ] ;
 
-MACRO: {set-slots} ( names -- quot: ( {values} tuple -- ) )
+MACRO: set-tuple-slots ( names -- quot: ( values tuple -- ) )
     [ length ] keep '[ [ _ firstn ] dip _ set-slots ] ;