# HG changeset patch
# User wenzelm
# Date 1711303693 -3600
# Node ID 2cc5182cbb08bec6e90b94d7cc088fad0c9e1bae
# Parent  612f0bb14124d927d2b4486f9bc32ef6dbd9600f
clarified modules;

diff -r 612f0bb14124 -r 2cc5182cbb08 src/Pure/System/components.scala
--- a/src/Pure/System/components.scala	Sun Mar 24 18:45:40 2024 +0100
+++ b/src/Pure/System/components.scala	Sun Mar 24 19:08:13 2024 +0100
@@ -35,26 +35,30 @@
 
   /* platforms */
 
-  private val family_platforms: Map[Platform.Family, List[String]] =
-    Map(
-      Platform.Family.linux_arm -> List("arm64-linux", "arm64_32-linux"),
-      Platform.Family.linux -> List("x86_64-linux", "x86_64_32-linux"),
-      Platform.Family.macos ->
-        List("arm64-darwin", "arm64_32-darwin", "x86_64-darwin", "x86_64_32-darwin"),
-      Platform.Family.windows ->
-        List("x86_64-cygwin", "x86_64-windows", "x86_64_32-windows", "x86-windows"))
+  sealed case class Platforms(family_platforms: Map[String, List[String]]) {
+    def purge(preserve: List[Platform.Family]): String => Boolean = {
+      val preserve_platform =
+        Set.from(
+          for {
+            family <- preserve.iterator
+            platform <- family_platforms(family.toString).iterator
+          } yield platform)
+      (name: String) => family_platforms.isDefinedAt(name) && !preserve_platform(name)
+    }
+  }
 
-  private val platform_names: Set[String] =
-    Set("x86-linux", "x86-cygwin") ++ family_platforms.iterator.flatMap(_._2)
-
-  def platform_purge(platforms: List[Platform.Family]): String => Boolean = {
-    val preserve =
-      (for {
-        family <- platforms.iterator
-        platform <- family_platforms(family)
-      } yield platform).toSet
-    (name: String) => platform_names(name) && !preserve(name)
-  }
+  val default_platforms: Platforms =
+    Platforms(
+      Map(
+        Platform.Family.linux_arm.toString ->
+          List("arm64-linux", "arm64_32-linux"),
+        Platform.Family.linux.toString ->
+          List("x86_64-linux", "x86_64_32-linux"),
+        Platform.Family.macos.toString ->
+          List("arm64-darwin", "arm64_32-darwin", "x86_64-darwin", "x86_64_32-darwin"),
+        Platform.Family.windows.toString ->
+          List("x86_64-cygwin", "x86_64-windows", "x86_64_32-windows", "x86-windows"),
+        "obsolete" -> List("x86-linux", "x86-cygwin")))
 
 
   /* component collections */
@@ -99,7 +103,7 @@
       name <- ssh.read_dir(base_dir)
       dir = base_dir + Path.basic(name)
       if is_component_dir(dir)
-    } Directory(dir, ssh = ssh).clean(platforms = platforms, progress = progress)
+    } Directory(dir, ssh = ssh).clean(preserve = platforms, progress = progress)
   }
 
   def resolve(
@@ -132,7 +136,7 @@
 
     if (clean_platforms.isDefined) {
       Directory(unpack_dir + Path.basic(name), ssh = ssh).
-        clean(platforms = clean_platforms.get, progress = progress)
+        clean(preserve = clean_platforms.get, progress = progress)
     }
 
     if (clean_archives) {
@@ -205,10 +209,11 @@
     }
 
     def clean(
-      platforms: List[Platform.Family] = Platform.Family.list,
+      platforms: Platforms = default_platforms,
+      preserve: List[Platform.Family] = Platform.Family.list,
       progress: Progress = new Progress
     ): Unit = {
-      val purge = platform_purge(platforms)
+      val purge = platforms.purge(preserve)
       for {
         name <- ssh.read_dir(path)
         dir = Path.basic(name)