Rename spread>quot to deep-spread>quot, and spread>quot-shallow to shallow-spread...

diff --git a/basis/fry/fry.factor b/basis/fry/fry.factor
index a262548214ceb8b55aebf1a3ea086f9f997b6bdd..cca4aef3b5fe266c81d6461e67221589606b3082 100644 (file)
--- a/basis/fry/fry.factor
+++ b/basis/fry/fry.factor
@@ -95,7 +95,7 @@ INSTANCE: fried-callable fried
     check-fry mark-composes
     { _ } split convert-curries
     [ [ [ ] ] [ [ ] (make-curry) but-last ] if-zero ]
-    [ spread>quot-shallow swap [ [ ] (make-curry) compose ] unless-zero ] if-empty ;
+    [ shallow-spread>quot swap [ [ ] (make-curry) compose ] unless-zero ] if-empty ;
 
 DEFER: dredge-fry
 

diff --git a/basis/locals/rewrite/point-free/point-free.factor b/basis/locals/rewrite/point-free/point-free.factor
index 0b010a559163d837396deff89b8ca3f3c5b145dc..f633cb50ce1c664111ae67f8cf65434645b6d3fe 100644 (file)
--- a/basis/locals/rewrite/point-free/point-free.factor
+++ b/basis/locals/rewrite/point-free/point-free.factor
@@ -40,7 +40,7 @@ M: object localize 1quotation ;
     [ [ ] ] [
         dup [ local-reader? ] any? [
             dup [ local-reader? [ 1array ] [ ] ? ] map
-            spread>quot
+            deep-spread>quot
         ] [ [ ] ] if swap length [ load-locals ] curry append
     ] if-empty ;
 

diff --git a/basis/stack-checker/alien/alien.factor b/basis/stack-checker/alien/alien.factor
index d393aa93321a2b361b6499791839e9903f84b61c..d40d2965f3ecb6c35bd649e0f2b88b0e6594db41 100644 (file)
--- a/basis/stack-checker/alien/alien.factor
+++ b/basis/stack-checker/alien/alien.factor
@@ -24,7 +24,7 @@ TUPLE: alien-assembly-params < alien-node-params { quot callable } ;
 TUPLE: alien-callback-params < alien-node-params xt ;
 
 : param-prep-quot ( params -- quot )
-    parameters>> [ c-type c-type-unboxer-quot ] map spread>quot ;
+    parameters>> [ c-type c-type-unboxer-quot ] map deep-spread>quot ;
 
 : alien-stack ( params extra -- )
     over parameters>> length + consume-d >>in-d
@@ -117,7 +117,7 @@ TUPLE: alien-callback-params < alien-node-params xt ;
 : callback-parameter-quot ( params -- quot )
     parameters>> [ c-type ] map
     [ [ c-type-class ] map '[ _ declare ] ]
-    [ [ c-type-boxer-quot ] map spread>quot ]
+    [ [ c-type-boxer-quot ] map deep-spread>quot ]
     bi append ;
 
 GENERIC: wrap-callback-quot ( params quot -- quot' )

diff --git a/basis/stack-checker/transforms/transforms.factor b/basis/stack-checker/transforms/transforms.factor
index 435cb550c137362f7418efe468c26c1f7154d25f..cbdea569f20beee868b3ac4e48177743f316470e 100644 (file)
--- a/basis/stack-checker/transforms/transforms.factor
+++ b/basis/stack-checker/transforms/transforms.factor
@@ -87,7 +87,7 @@ IN: stack-checker.transforms
 
 \ 3cleave t "no-compile" set-word-prop
 
-\ spread [ spread>quot ] 1 define-transform
+\ spread [ deep-spread>quot ] 1 define-transform
 
 \ spread t "no-compile" set-word-prop
 

diff --git a/core/classes/tuple/tuple.factor b/core/classes/tuple/tuple.factor
index 51faf3a550c8821a69eb21b1564fc86d189e08fc..6360a9662c0fed271bcd1eeb488a07f399de88ad 100644 (file)
--- a/core/classes/tuple/tuple.factor
+++ b/core/classes/tuple/tuple.factor
@@ -134,7 +134,7 @@ M: class final-class? drop t ;
     superclasses [ "slots" word-prop length ] map-sum ;
 
 : boa-check-quot ( class -- quot )
-    all-slots [ class>> instance-check-quot ] map spread>quot-shallow
+    all-slots [ class>> instance-check-quot ] map shallow-spread>quot
     f like ;
 
 : define-boa-check ( class -- )

diff --git a/core/combinators/combinators.factor b/core/combinators/combinators.factor
index 0453b257661aa6981f01bfc0c2805a8b2bc66515..58c205d6717669f552e56f2f3455c4b7a4f4dbd1 100644 (file)
--- a/core/combinators/combinators.factor
+++ b/core/combinators/combinators.factor
@@ -65,14 +65,14 @@ SLOT: terminated?
     [ [ 3keep ] curry ] map concat [ 3drop ] append [ ] like ;
 
 ! spread
-: spread>quot-shallow ( seq -- quot )
+: shallow-spread>quot ( seq -- quot )
     [ ] [ [ dup empty? [ [ dip ] curry ] unless ] dip append ] reduce ;
 
-: spread>quot ( seq -- quot )
+: deep-spread>quot ( seq -- quot )
     [ ] [ [ [ dip ] curry ] dip append ] reduce ;
 
 : spread ( objs... seq -- )
-    spread>quot call ;
+    deep-spread>quot call ;
 
 ! cond
 ERROR: no-cond ;