clarified signature;
authorwenzelm
Tue, 12 Jul 2022 16:11:14 +0200
changeset 75681 83b976c3edb1
parent 75680 605f4b6b5785
child 75682 b6f3db86f9c7
clarified signature;
src/Pure/System/isabelle_system.scala
src/Pure/System/scala.scala
--- a/src/Pure/System/isabelle_system.scala	Tue Jul 12 16:04:15 2022 +0200
+++ b/src/Pure/System/isabelle_system.scala	Tue Jul 12 16:11:14 2022 +0200
@@ -55,7 +55,7 @@
 
   /* init settings + services */
 
-  def make_services(): List[Class[Service]] = {
+  def get_services(): List[Class[Service]] = {
     def make(where: String, names: List[String]): List[Class[Service]] = {
       for (name <- names) yield {
         def err(msg: String): Nothing =
@@ -75,12 +75,12 @@
       make(quote(platform_jar),
         isabelle.setup.Build.get_services(JPath.of(platform_jar)).asScala.toList)
 
-    from_env("ISABELLE_SCALA_SERVICES") ::: Scala.class_path().flatMap(from_jar)
+    from_env("ISABELLE_SCALA_SERVICES") ::: Scala.get_classpath().flatMap(from_jar)
   }
 
   def init(isabelle_root: String = "", cygwin_root: String = ""): Unit = {
     isabelle.setup.Environment.init(isabelle_root, cygwin_root)
-    synchronized { if (_services.isEmpty) { _services = Some(make_services()) } }
+    synchronized { if (_services.isEmpty) { _services = Some(get_services()) } }
   }
 
 
--- a/src/Pure/System/scala.scala	Tue Jul 12 16:04:15 2022 +0200
+++ b/src/Pure/System/scala.scala	Tue Jul 12 16:11:14 2022 +0200
@@ -100,7 +100,7 @@
 
   /** compiler **/
 
-  def class_path(): List[String] =
+  def get_classpath(): List[String] =
     space_explode(JFile.pathSeparatorChar, System.getProperty("java.class.path", ""))
       .filter(_.nonEmpty)
 
@@ -172,7 +172,7 @@
         File.find_files(dir, file => file.getName.endsWith(".jar")).
           map(File.absolute_name)
 
-      val classpath = (class_path() ::: jar_dirs.flatMap(find_jars)).mkString(JFile.pathSeparator)
+      val classpath = (get_classpath() ::: jar_dirs.flatMap(find_jars)).mkString(JFile.pathSeparator)
       val settings1 = isabelle_settings ::: settings ::: List("-classpath", classpath)
       new Context(settings1, class_loader)
     }