vocabs.metadata.resources,help.pdf: gather used

diff --git a/basis/vocabs/metadata/resources/resources-tests.factor b/basis/vocabs/metadata/resources/resources-tests.factor
index 81955100650e22cfba5ed2e220c1bc87ec5cd954..d6fea4ca363d0cd8499d654f52230d08a97ec25a 100644 (file)
--- a/basis/vocabs/metadata/resources/resources-tests.factor
+++ b/basis/vocabs/metadata/resources/resources-tests.factor
@@ -11,6 +11,13 @@ IN: vocabs.metadata.resources.tests
     "*.txt" { "foo.bar" "foo.factor" } match-pattern
 ] [ resource-missing? ] must-fail-with
 
+! match-patterns
+{
+    { "a.txt" "b.pdf" }
+} [
+    { "*.txt" "*.pdf" } { "a.txt" "b.pdf" "a" } match-patterns
+] unit-test
+
 ! vocab-resource-files
 { { "bar" "bas" "foo" } }
 [ "vocabs.metadata.resources.test.1" vocab-resource-files natural-sort ] unit-test

diff --git a/basis/vocabs/metadata/resources/resources.factor b/basis/vocabs/metadata/resources/resources.factor
index beabc51cf01193fc9f76bde86c9d1e50eb7262ae..9c66456ab6327ae6b6647333ad6bd853e1779cc0 100644 (file)
--- a/basis/vocabs/metadata/resources/resources.factor
+++ b/basis/vocabs/metadata/resources/resources.factor
@@ -29,7 +29,7 @@ ERROR: resource-missing pattern ;
     [ resource-missing ] [ nip ] if-empty ;
 
 : match-patterns ( patterns filenames -- filenames' )
-    '[ _ match-pattern ] map concat members ;
+    '[ _ match-pattern ] gather ;
 
 : vocab-resource-files ( vocab -- filenames )
     [ vocab-resources ] [ vocab-dir-in-root ] bi

diff --git a/extra/help/pdf/pdf.factor b/extra/help/pdf/pdf.factor
index fbeca6f0142acb6ce987800a7c48459eb3b4695b..04ced9a67b23ab929eab626a10c0765b3213b440 100644 (file)
--- a/extra/help/pdf/pdf.factor
+++ b/extra/help/pdf/pdf.factor
@@ -12,7 +12,7 @@ IN: help.pdf
 : next-articles ( str -- seq )
     lookup-article content>> [ array? ] filter
     [ first \ $subsections eq? ] filter
-    [ rest [ string? ] filter ] map concat members ;
+    [ rest [ string? ] filter ] gather ;
 
 : topic>pdf ( str -- pdf )
     [