Add 'unportable' tag in place of hard-coded list of 'dangerous' vocabs in load-everything

[factor.git] / basis / tools / vocabs / vocabs.factor

diff --git a/basis/tools/vocabs/vocabs.factor b/basis/tools/vocabs/vocabs.factor
index 442e15935c5b52650fcc7a2521b680b8f91771cf..6328a3d06dd8ece35b2acd9339dbfb3e9a63623e 100755 (executable)
--- a/basis/tools/vocabs/vocabs.factor
+++ b/basis/tools/vocabs/vocabs.factor
@@ -232,39 +232,15 @@ M: vocab-link summary vocab-summary ;
 MEMO: all-vocabs-seq ( -- seq )\r
     all-vocabs values concat ;\r
 \r
-: dangerous? ( name -- ? )\r
-    #! Hack\r
-    {\r
-        { [ "cpu." ?head ] [ t ] }\r
-        { [ "io.unix" ?head ] [ t ] }\r
-        { [ "io.windows" ?head ] [ t ] }\r
-        { [ "ui.x11" ?head ] [ t ] }\r
-        { [ "ui.windows" ?head ] [ t ] }\r
-        { [ "ui.cocoa" ?head ] [ t ] }\r
-        { [ "cocoa" ?head ] [ t ] }\r
-        { [ "core-foundation" ?head ] [ t ] }\r
-        { [ "vocabs.loader.test" ?head ] [ t ] }\r
-        { [ "editors." ?head ] [ t ] }\r
-        { [ ".windows" ?tail ] [ t ] }\r
-        { [ ".unix" ?tail ] [ t ] }\r
-        { [ "unix" ?head ] [ t ] }\r
-        { [ ".linux" ?tail ] [ t ] }\r
-        { [ ".bsd" ?tail ] [ t ] }\r
-        { [ ".macosx" ?tail ] [ t ] }\r
-        { [ "windows." ?head ] [ t ] }\r
-        { [ "cocoa" ?head ] [ t ] }\r
-        { [ ".test" ?tail ] [ t ] }\r
-        { [ "raptor" ?head ] [ t ] }\r
-        { [ dup "tools.deploy.app" = ] [ t ] }\r
-        [ f ]\r
-    } cond nip ;\r
-\r
-: filter-dangerous ( seq -- seq' )\r
-    [ vocab-name dangerous? not ] filter ;\r
+: unportable? ( name -- ? )\r
+    vocab-tags "unportable" swap member? ;\r
+\r
+: filter-unportable ( seq -- seq' )\r
+    [ vocab-name unportable? not ] filter ;\r
 \r
 : try-everything ( -- failures )\r
     all-vocabs-seq\r
-    filter-dangerous\r
+    filter-unportable\r
     require-all ;\r
 \r
 : load-everything ( -- )\r