From: Doug Coleman <doug.coleman@gmail.com>
Date: Sun, 21 Mar 2021 18:51:04 +0000 (-0500)
Subject: factor: map-zip -> zip-with
X-Git-Tag: 0.99~2401
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=3b8d5e9e48e120626b06778696f671b8b98b783c

factor: map-zip -> zip-with
---

diff --git a/basis/windows/user32/user32.factor b/basis/windows/user32/user32.factor
index fb14d7e106..06b9f284fb 100644
--- a/basis/windows/user32/user32.factor
+++ b/basis/windows/user32/user32.factor
@@ -2366,7 +2366,7 @@ FUNCTION: BOOL IsValidDpiAwarenessContext (
 )
 
 ! DPI_AWARENESS_CONTEXT experimentally:
-! USE: math.ranges -100 1000 [a,b] [ <alien> IsValidDpiAwarenessContext ] map-zip
+! USE: math.ranges -100 1000 [a,b] [ <alien> IsValidDpiAwarenessContext ] zip-with
 ! [ nip 0 > ] assoc-filter keys .
 ! { -5 -4 -3 -2 -1 17 18 34 273 529 785 }
 
diff --git a/extra/assocs/extras/extras.factor b/extra/assocs/extras/extras.factor
index ee5ab67730..9ae550a3d5 100644
--- a/extra/assocs/extras/extras.factor
+++ b/extra/assocs/extras/extras.factor
@@ -189,7 +189,7 @@ PRIVATE>
     dup any-multi-value? [ expand-values-set-at flatten-values ] when ;
 
 : intersect-keys ( assoc seq -- elts )
-    [ of ] with map-zip sift-values ; inline
+    [ of ] with zip-with sift-values ; inline
 
 : values-of ( assoc seq -- elts )
     [ of ] with map sift ; inline
diff --git a/extra/modern/modern.factor b/extra/modern/modern.factor
index e949a387e1..41b28a57b5 100644
--- a/extra/modern/modern.factor
+++ b/extra/modern/modern.factor
@@ -480,10 +480,10 @@ ERROR: compound-syntax-disallowed n seq obj ;
     utf8 file-contents string>literals ;
 
 : lex-paths ( vocabs -- assoc )
-    [ [ path>literals ] [ nip ] recover ] map-zip ;
+    [ [ path>literals ] [ nip ] recover ] zip-with ;
 
 : lex-vocabs ( vocabs -- assoc )
-    [ [ vocab>literals ] [ nip ] recover ] map-zip ;
+    [ [ vocab>literals ] [ nip ] recover ] zip-with ;
 
 : failed-lexing ( assoc -- assoc' ) [ nip array? ] assoc-reject ;
 
diff --git a/extra/modern/out/out.factor b/extra/modern/out/out.factor
index c4e3f085b1..1eb4634350 100644
--- a/extra/modern/out/out.factor
+++ b/extra/modern/out/out.factor
@@ -85,7 +85,7 @@ DEFER: map-literals
 
 : strings-core-to-file ( -- )
     core-vocabs
-    [ ".private" ?tail drop vocab-source-path utf8 file-contents ] map-zip
+    [ ".private" ?tail drop vocab-source-path utf8 file-contents ] zip-with
     [ "[========[" dup matching-delimiter-string surround ] assoc-map
     [
         first2 [ "VOCAB: " prepend ] dip " " glue
@@ -96,7 +96,7 @@ DEFER: map-literals
 
 : parsed-core-to-file ( -- )
     core-vocabs
-    [ vocab>literals ] map-zip
+    [ vocab>literals ] zip-with
     [
         first2 [ "<VOCAB: " prepend ] dip
         >strings
diff --git a/extra/s3/s3.factor b/extra/s3/s3.factor
index 153d638ca1..54fed8ba29 100644
--- a/extra/s3/s3.factor
+++ b/extra/s3/s3.factor
@@ -137,4 +137,4 @@ PRIVATE>
 
 : bucket>alist ( bucket -- alist )
     dup keys
-    [ name>> get-object nip ] with map-zip ;
\ No newline at end of file
+    [ name>> get-object nip ] with zip-with ;
\ No newline at end of file
diff --git a/extra/semantic-versioning/semantic-versioning-tests.factor b/extra/semantic-versioning/semantic-versioning-tests.factor
index 8e5a2560ea..4c44af47e8 100644
--- a/extra/semantic-versioning/semantic-versioning-tests.factor
+++ b/extra/semantic-versioning/semantic-versioning-tests.factor
@@ -88,12 +88,12 @@ CONSTANT: semver-gt-comparisons {
 
 { t } [
     semver-gt-comparisons
-    [ first2 version<=> ] map-zip
+    [ first2 version<=> ] zip-with
     values [ +gt+ = ] all?
 ] unit-test
 
 { t } [
     semver-gt-comparisons
-    [ first2 swap version<=> ] map-zip
+    [ first2 swap version<=> ] zip-with
     values [ +lt+ = ] all?
 ] unit-test
\ No newline at end of file
diff --git a/extra/semver/semver-tests.factor b/extra/semver/semver-tests.factor
index 3515f9451d..3c6d6a8a3a 100644
--- a/extra/semver/semver-tests.factor
+++ b/extra/semver/semver-tests.factor
@@ -131,12 +131,12 @@ CONSTANT: semver-gt-comparisons {
 
 { t } [
     semver-gt-comparisons
-    [ first2 [ parse-semver ] bi@ <=> ] map-zip
+    [ first2 [ parse-semver ] bi@ <=> ] zip-with
     values [ +gt+ = ] all?
 ] unit-test
 
 { t } [
     semver-gt-comparisons
-    [ first2 swap [ parse-semver ] bi@ <=> ] map-zip
+    [ first2 swap [ parse-semver ] bi@ <=> ] zip-with
     values [ +lt+ = ] all?
 ] unit-test
\ No newline at end of file
diff --git a/extra/zoneinfo/zoneinfo.factor b/extra/zoneinfo/zoneinfo.factor
index ac7a02a9a3..4923769975 100644
--- a/extra/zoneinfo/zoneinfo.factor
+++ b/extra/zoneinfo/zoneinfo.factor
@@ -132,7 +132,7 @@ ERROR: zone-not-found name ;
         [
             letters>> swap "%" split1 dup [ 1 tail ] when surround
         ] with V{ } map-as
-    ] map-zip ;
+    ] zip-with ;
 
 : number>value ( n -- n' )
     {