check session directories;
authorwenzelm
Sun, 08 Sep 2019 16:49:32 +0200
changeset 70866 73812c598a26
parent 70865 efd995488228
child 70867 56d70f7ce4a4
check session directories;
src/Pure/PIDE/document.scala
src/Pure/Thy/sessions.scala
--- a/src/Pure/PIDE/document.scala	Sun Sep 08 16:49:05 2019 +0200
+++ b/src/Pure/PIDE/document.scala	Sun Sep 08 16:49:32 2019 +0200
@@ -126,6 +126,7 @@
         }
 
       def path: Path = Path.explode(File.standard_path(node))
+      def master_dir_path: Path = Path.explode(File.standard_path(master_dir))
 
       def is_theory: Boolean = theory.nonEmpty
 
--- a/src/Pure/Thy/sessions.scala	Sun Sep 08 16:49:05 2019 +0200
+++ b/src/Pure/Thy/sessions.scala	Sun Sep 08 16:49:32 2019 +0200
@@ -379,6 +379,21 @@
               for ((options, name) <- dependencies.adjunct_theories)
               yield ((name, options), known.theories(name.theory).header.imports)
 
+            val dir_errors =
+            {
+              val ok = (for { (dir, _) <- info.dirs } yield dir.canonical_file).toSet
+              (for {
+                  ((name, _), _) <- used_theories.iterator
+                  if imports_base.theory_qualifier(name) == session_name
+                  val path = name.master_dir_path
+                  if !ok(path.canonical_file)
+                } yield {
+                  val path1 = File.relative_path(info.dir.canonical, path).getOrElse(path)
+                  "Implicit use of directory " + path1 + " for theory " + quote(name.toString)
+                }
+              ).toList
+            }
+
             val sources_errors =
               for (p <- session_files if !p.is_file) yield "No such file: " + p
 
@@ -404,7 +419,8 @@
                 imported_sources = check_sources(imported_files),
                 sources = check_sources(session_files),
                 session_graph_display = session_graph_display,
-                errors = dependencies.errors ::: sources_errors ::: path_errors ::: bibtex_errors,
+                errors = dependencies.errors ::: dir_errors ::: sources_errors :::
+                  path_errors ::: bibtex_errors,
                 imports = Some(imports_base))
 
             session_bases + (info.name -> base)