assocs: assoc-stack-from

diff --git a/basis/bootstrap/compiler/compiler.factor b/basis/bootstrap/compiler/compiler.factor
index 69615c7e7f73a241fdb4e40cde9c4de26c9560a8..4d10ced59c6b86b4f1a5854b2f93a4ddf663eb35 100644 (file)
--- a/basis/bootstrap/compiler/compiler.factor
+++ b/basis/bootstrap/compiler/compiler.factor
@@ -83,7 +83,7 @@ gc
     "." write flush
 
     {
-        hashcode* = equal? assoc-stack search-assoc-stack get set
+        hashcode* = equal? assoc-stack assoc-stack-from get set
     } compile-unoptimized
 
     "." write flush

diff --git a/core/assocs/assocs.factor b/core/assocs/assocs.factor
index 8007cd95c6c9eab3b6ef735ac0a7f2f349f53de7..2f661e74815cbf4b827d0552a59860694ae120ba 100644 (file)
--- a/core/assocs/assocs.factor
+++ b/core/assocs/assocs.factor
@@ -33,12 +33,12 @@ M: assoc assoc-like drop ; inline
 : assoc-operator ( assoc quot -- alist quot' )
     [ >alist ] dip [ first2 ] prepose ; inline
 
-: search-assoc-stack ( key i seq -- value/f )
+: assoc-stack-from ( key i seq -- value/f )
     over 0 < [
         3drop f
     ] [
         3dup nth-unsafe at*
-        [ 3nip ] [ drop [ 1 - ] dip search-assoc-stack ] if
+        [ 3nip ] [ drop [ 1 - ] dip assoc-stack-from ] if
     ] if ; inline recursive
 
 : search-alist ( key alist -- pair/f i/f )
@@ -142,7 +142,7 @@ M: assoc values [ nip ] { } assoc>map ;
     assoc-size 0 = ; inline
 
 : assoc-stack ( key seq -- value )
-    [ length 1 - ] keep search-assoc-stack ; flushable
+    [ length 1 - ] keep assoc-stack-from ; flushable
 
 : assoc-subset? ( assoc1 assoc2 -- ? )
     [ at* [ = ] [ 2drop f ] if ] with-assoc assoc-all? ;