tuned signature;
authorwenzelm
Tue, 04 Apr 2017 21:37:26 +0200
changeset 65377 6e47a27e3d43
parent 65376 4ad983094226
child 65378 4bb51e6334ed
tuned signature;
src/Pure/Thy/present.scala
src/Pure/Thy/sessions.scala
--- a/src/Pure/Thy/present.scala	Tue Apr 04 21:33:51 2017 +0200
+++ b/src/Pure/Thy/present.scala	Tue Apr 04 21:37:26 2017 +0200
@@ -18,19 +18,19 @@
 
   def session_graph(
     parent_session: String,
-    parent_loaded: String => Boolean,
+    parent_loaded: Document.Node.Name => Boolean,
     deps: List[Thy_Info.Dep]): Graph_Display.Graph =
   {
     val parent_session_node =
       Graph_Display.Node("[" + parent_session + "]", "session." + parent_session)
 
     def node(name: Document.Node.Name): Graph_Display.Node =
-      if (parent_loaded(name.theory)) parent_session_node
+      if (parent_loaded(name)) parent_session_node
       else Graph_Display.Node(Long_Name.base_name(name.theory), "theory." + name.theory)
 
     (Graph_Display.empty_graph /: deps) {
       case (g, dep) =>
-        if (parent_loaded(dep.name.theory)) g
+        if (parent_loaded(dep.name)) g
         else {
           val a = node(dep.name)
           val bs = dep.header.imports.map({ case (name, _) => node(name) })
--- a/src/Pure/Thy/sessions.scala	Tue Apr 04 21:33:51 2017 +0200
+++ b/src/Pure/Thy/sessions.scala	Tue Apr 04 21:37:26 2017 +0200
@@ -143,7 +143,7 @@
                 sources = all_files.map(p => (p, SHA1.digest(p.file))),
                 session_graph =
                   Present.session_graph(info.parent getOrElse "",
-                    parent_base.loaded_theories, thy_deps.deps))
+                    parent_base.loaded_theory _, thy_deps.deps))
 
             deps + (name -> base)
           }