# HG changeset patch
# User wenzelm
# Date 1590432410 -7200
# Node ID 8dbefe849666e2cd73854fb96e9095ad310539df
# Parent  feb37a43ace6f303a05ea6628b4950966d08a921
omit pointless memoing: Scala compiler is rather bulky anyway;

diff -r feb37a43ace6 -r 8dbefe849666 src/Pure/System/isabelle_system.scala
--- a/src/Pure/System/isabelle_system.scala	Mon May 25 20:43:19 2020 +0200
+++ b/src/Pure/System/isabelle_system.scala	Mon May 25 20:46:50 2020 +0200
@@ -63,98 +63,95 @@
     _services.get
   }
 
-  def init(isabelle_root: String = "", cygwin_root: String = "")
+  def init(isabelle_root: String = "", cygwin_root: String = ""): Unit = synchronized
   {
-    synchronized {
-      if (_settings.isEmpty || _services.isEmpty) {
-        val isabelle_root1 =
-          bootstrap_directory(isabelle_root, "ISABELLE_ROOT", "isabelle.root", "Isabelle root")
+    if (_settings.isEmpty || _services.isEmpty) {
+      val isabelle_root1 =
+        bootstrap_directory(isabelle_root, "ISABELLE_ROOT", "isabelle.root", "Isabelle root")
 
-        val cygwin_root1 =
-          if (Platform.is_windows)
-            bootstrap_directory(cygwin_root, "CYGWIN_ROOT", "cygwin.root", "Cygwin root")
-          else ""
-
-        if (Platform.is_windows) Cygwin.init(isabelle_root1, cygwin_root1)
+      val cygwin_root1 =
+        if (Platform.is_windows)
+          bootstrap_directory(cygwin_root, "CYGWIN_ROOT", "cygwin.root", "Cygwin root")
+        else ""
 
-        def set_cygwin_root()
-        {
-          if (Platform.is_windows)
-            _settings = Some(_settings.getOrElse(Map.empty) + ("CYGWIN_ROOT" -> cygwin_root1))
-        }
-
-        set_cygwin_root()
+      if (Platform.is_windows) Cygwin.init(isabelle_root1, cygwin_root1)
 
-        def default(env: Map[String, String], entry: (String, String)): Map[String, String] =
-          if (env.isDefinedAt(entry._1) || entry._2 == "") env
-          else env + entry
+      def set_cygwin_root()
+      {
+        if (Platform.is_windows)
+          _settings = Some(_settings.getOrElse(Map.empty) + ("CYGWIN_ROOT" -> cygwin_root1))
+      }
+
+      set_cygwin_root()
 
-        val env =
-        {
-          val temp_windows =
-          {
-            val temp = if (Platform.is_windows) System.getenv("TEMP") else null
-            if (temp != null && temp.contains('\\')) temp else ""
-          }
-          val user_home = System.getProperty("user.home", "")
-          val isabelle_app = System.getProperty("isabelle.app", "")
+      def default(env: Map[String, String], entry: (String, String)): Map[String, String] =
+        if (env.isDefinedAt(entry._1) || entry._2 == "") env
+        else env + entry
 
-          default(
-            default(
-              default(sys.env + ("ISABELLE_JDK_HOME" -> File.standard_path(jdk_home())),
-                "TEMP_WINDOWS" -> temp_windows),
-              "HOME" -> user_home),
-            "ISABELLE_APP" -> "true")
-        }
-
-        val settings =
+      val env =
+      {
+        val temp_windows =
         {
-          val dump = JFile.createTempFile("settings", null)
-          dump.deleteOnExit
-          try {
-            val cmd1 =
-              if (Platform.is_windows)
-                List(cygwin_root1 + "\\bin\\bash", "-l",
-                  File.standard_path(isabelle_root1 + "\\bin\\isabelle"))
-              else
-                List(isabelle_root1 + "/bin/isabelle")
-            val cmd = cmd1 ::: List("getenv", "-d", dump.toString)
+          val temp = if (Platform.is_windows) System.getenv("TEMP") else null
+          if (temp != null && temp.contains('\\')) temp else ""
+        }
+        val user_home = System.getProperty("user.home", "")
+        val isabelle_app = System.getProperty("isabelle.app", "")
+
+        default(
+          default(
+            default(sys.env + ("ISABELLE_JDK_HOME" -> File.standard_path(jdk_home())),
+              "TEMP_WINDOWS" -> temp_windows),
+            "HOME" -> user_home),
+          "ISABELLE_APP" -> "true")
+      }
 
-            val (output, rc) = process_output(process(cmd, env = env, redirect = true))
-            if (rc != 0) error(output)
+      val settings =
+      {
+        val dump = JFile.createTempFile("settings", null)
+        dump.deleteOnExit
+        try {
+          val cmd1 =
+            if (Platform.is_windows)
+              List(cygwin_root1 + "\\bin\\bash", "-l",
+                File.standard_path(isabelle_root1 + "\\bin\\isabelle"))
+            else
+              List(isabelle_root1 + "/bin/isabelle")
+          val cmd = cmd1 ::: List("getenv", "-d", dump.toString)
+
+          val (output, rc) = process_output(process(cmd, env = env, redirect = true))
+          if (rc != 0) error(output)
 
-            val entries =
-              (for (entry <- File.read(dump).split("\u0000") if entry != "") yield {
-                val i = entry.indexOf('=')
-                if (i <= 0) entry -> ""
-                else entry.substring(0, i) -> entry.substring(i + 1)
-              }).toMap
-            entries + ("PATH" -> entries("PATH_JVM")) - "PATH_JVM"
+          val entries =
+            (for (entry <- File.read(dump).split("\u0000") if entry != "") yield {
+              val i = entry.indexOf('=')
+              if (i <= 0) entry -> ""
+              else entry.substring(0, i) -> entry.substring(i + 1)
+            }).toMap
+          entries + ("PATH" -> entries("PATH_JVM")) - "PATH_JVM"
+        }
+        finally { dump.delete }
+      }
+      _settings = Some(settings)
+      set_cygwin_root()
+
+      val variable = "ISABELLE_SCALA_SERVICES"
+      val services =
+        for (name <- space_explode(':', settings.getOrElse(variable, getenv_error(variable))))
+        yield {
+          def err(msg: String): Nothing =
+            error("Bad entry " + quote(name) + " in " + variable + "\n" + msg)
+          try {
+            Class.forName(name).asInstanceOf[Class[Service]]
+              .getDeclaredConstructor().newInstance()
           }
-          finally { dump.delete }
+          catch {
+            case _: ClassNotFoundException => err("Class not found")
+            case exn: Throwable => err(Exn.message(exn))
+          }
         }
-        _settings = Some(settings)
-        set_cygwin_root()
-
-        val variable = "ISABELLE_SCALA_SERVICES"
-        val services =
-          for (name <- space_explode(':', settings.getOrElse(variable, getenv_error(variable))))
-          yield {
-            def err(msg: String): Nothing =
-              error("Bad entry " + quote(name) + " in " + variable + "\n" + msg)
-            try {
-              Class.forName(name).asInstanceOf[Class[Service]]
-                .getDeclaredConstructor().newInstance()
-            }
-            catch {
-              case _: ClassNotFoundException => err("Class not found")
-              case exn: Throwable => err(Exn.message(exn))
-            }
-          }
-        _services = Some(services)
-      }
+      _services = Some(services)
     }
-    Scala.Compiler.default_context
   }
 
 
diff -r feb37a43ace6 -r 8dbefe849666 src/Pure/System/scala.scala
--- a/src/Pure/System/scala.scala	Mon May 25 20:43:19 2020 +0200
+++ b/src/Pure/System/scala.scala	Mon May 25 20:46:50 2020 +0200
@@ -19,8 +19,6 @@
 
   object Compiler
   {
-    lazy val default_context: Context = context()
-
     def context(
       error: String => Unit = Exn.error,
       jar_dirs: List[JFile] = Nil): Context =
@@ -83,7 +81,7 @@
   def toplevel_yxml(source: String): String =
   {
     val errors =
-      try { Compiler.default_context.toplevel(source) }
+      try { Compiler.context().toplevel(source) }
       catch { case ERROR(msg) => List(msg) }
     locally { import XML.Encode._; YXML.string_of_body(list(string)(errors)) }
   }