From: John Benediktsson <mrjbq7@gmail.com>
Date: Sun, 4 Feb 2024 19:54:27 +0000 (-0800)
Subject: basis/extra: use some vocab: paths
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=b54f1e116cdb01855a67d67412c705e339f8e4f3

basis/extra: use some vocab: paths
---

diff --git a/basis/colors/colors.factor b/basis/colors/colors.factor
index 8a93194456..71cb727349 100644
--- a/basis/colors/colors.factor
+++ b/basis/colors/colors.factor
@@ -52,10 +52,10 @@ CONSTANT: transparent T{ rgba f 0.0 0.0 0.0 0.0 }
 
 MEMO: colors ( -- assoc )
     {
-        "resource:basis/colors/rgb.txt"
-        "resource:basis/colors/css-colors.txt"
-        "resource:basis/colors/factor-colors.txt"
-        "resource:basis/colors/solarized-colors.txt"
+        "vocab:colors/rgb.txt"
+        "vocab:colors/css-colors.txt"
+        "vocab:colors/factor-colors.txt"
+        "vocab:colors/solarized-colors.txt"
     } [
         utf8 file-lines parse-colors
     ] [ assoc-union ] map-reduce ;
diff --git a/extra/elf/elf-tests.factor b/extra/elf/elf-tests.factor
index 025830c8b7..4e897e63c2 100644
--- a/extra/elf/elf-tests.factor
+++ b/extra/elf/elf-tests.factor
@@ -45,7 +45,7 @@ cpu ppc? [
     }
 }
 [
-    "resource:extra/elf/a.elf" [
+    "vocab:elf/a.elf" [
         sections [ name>> ] map
     ] with-mapped-elf
 ]
@@ -74,7 +74,7 @@ unit-test
     }
 }
 [
-    "resource:extra/elf/a.elf" [
+    "vocab:elf/a.elf" [
         segments [ program-header>> p_type>> PT_LOAD = ] find nip
         sections [ name>> ] map
     ] with-mapped-elf
@@ -158,7 +158,7 @@ unit-test
     }
 }
 [
-    "resource:extra/elf/a.elf" [
+    "vocab:elf/a.elf" [
         sections ".symtab" find-section symbols
         [ name>> ] map
     ] with-mapped-elf
@@ -172,7 +172,7 @@ unit-test
     }
 }
 [
-    "resource:extra/elf/a.elf" [
+    "vocab:elf/a.elf" [
         sections ".symtab" "main" find-section-symbol
         symbol-data >byte-array
     ] with-mapped-elf
diff --git a/extra/elf/nm/nm-tests.factor b/extra/elf/nm/nm-tests.factor
index ec772d3b14..843b713e5a 100644
--- a/extra/elf/nm/nm-tests.factor
+++ b/extra/elf/nm/nm-tests.factor
@@ -48,6 +48,6 @@ STRING: validation-output
 
 cpu ppc? [
     { $ validation-output }
-    [ [ "resource:extra/elf/a.elf" elf-nm ] with-string-writer ]
+    [ [ "vocab:elf/a.elf" elf-nm ] with-string-writer ]
     unit-test
 ] unless
diff --git a/extra/usa-cities/usa-cities.factor b/extra/usa-cities/usa-cities.factor
index 63315169f0..ff3d880107 100644
--- a/extra/usa-cities/usa-cities.factor
+++ b/extra/usa-cities/usa-cities.factor
@@ -28,7 +28,7 @@ TUPLE: city
 first-zip name state latitude longitude gmt-offset dst-offset ;
 
 MEMO: cities ( -- seq )
-    "resource:extra/usa-cities/zipcode.csv" ascii file>csv
+    "vocab:usa-cities/zipcode.csv" ascii file>csv
     rest-slice [
         [
             {