src/Pure/Thy/sessions.scala
author wenzelm
Fri, 28 Apr 2017 20:03:34 +0200
changeset 65619 e33b3d57b7cb
parent 65604 637aa8e93cd7
child 65698 38139b2067cf
permissions -rw-r--r--
tuned signature;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
     1
/*  Title:      Pure/Thy/sessions.scala
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
     2
    Author:     Makarius
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
     3
65430
4433d189a77d tuned comment;
wenzelm
parents: 65429
diff changeset
     4
Cumulative session information.
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
     5
*/
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
     6
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
     7
package isabelle
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
     8
65461
b6c2e30dc018 support for known theories files (according to multiple uses);
wenzelm
parents: 65457
diff changeset
     9
import java.io.{File => JFile}
62704
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
    10
import java.nio.ByteBuffer
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
    11
import java.nio.channels.FileChannel
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
    12
import java.nio.file.StandardOpenOption
65320
52861eebf58d access table via session_name: db may in principle contain multiple entries;
wenzelm
parents: 65318
diff changeset
    13
import java.sql.PreparedStatement
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
    14
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
    15
import scala.collection.SortedSet
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
    16
import scala.collection.mutable
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
    17
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
    18
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
    19
object Sessions
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
    20
{
65360
wenzelm
parents: 65359
diff changeset
    21
  /* base info and source dependencies */
62883
b04e9fe29223 clarified ML bootstrap;
wenzelm
parents: 62864
diff changeset
    22
65445
e9e7f5f5794c more qualifier treatment, but in the end it is still ignored;
wenzelm
parents: 65441
diff changeset
    23
  val DRAFT = "Draft"
e9e7f5f5794c more qualifier treatment, but in the end it is still ignored;
wenzelm
parents: 65441
diff changeset
    24
65360
wenzelm
parents: 65359
diff changeset
    25
  def is_pure(name: String): Boolean = name == Thy_Header.PURE
64856
5e9bf964510a clarified modules;
wenzelm
parents: 63996
diff changeset
    26
65495
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
    27
  object Known
64856
5e9bf964510a clarified modules;
wenzelm
parents: 63996
diff changeset
    28
  {
65495
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
    29
    val empty: Known = Known()
65360
wenzelm
parents: 65359
diff changeset
    30
65495
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
    31
    def make(local_dir: Path, bases: List[Base], theories: List[Document.Node.Name]): Known =
65427
wenzelm
parents: 65426
diff changeset
    32
    {
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
    33
      def bases_iterator(local: Boolean) =
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
    34
        for {
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
    35
          base <- bases.iterator
65499
fc7f03cbccbc tuned signature;
wenzelm
parents: 65498
diff changeset
    36
          (_, name) <- (if (local) base.known.theories_local else base.known.theories).iterator
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
    37
        } yield name
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
    38
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
    39
      def local_theories_iterator =
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
    40
      {
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
    41
        val local_path = local_dir.file.getCanonicalFile.toPath
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
    42
        theories.iterator.filter(name =>
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
    43
          Path.explode(name.node).file.getCanonicalFile.toPath.startsWith(local_path))
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
    44
      }
65427
wenzelm
parents: 65426
diff changeset
    45
65461
b6c2e30dc018 support for known theories files (according to multiple uses);
wenzelm
parents: 65457
diff changeset
    46
      val known_theories =
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
    47
        (Map.empty[String, Document.Node.Name] /: (bases_iterator(false) ++ theories.iterator))({
65461
b6c2e30dc018 support for known theories files (according to multiple uses);
wenzelm
parents: 65457
diff changeset
    48
          case (known, name) =>
b6c2e30dc018 support for known theories files (according to multiple uses);
wenzelm
parents: 65457
diff changeset
    49
            known.get(name.theory) match {
b6c2e30dc018 support for known theories files (according to multiple uses);
wenzelm
parents: 65457
diff changeset
    50
              case Some(name1) if name != name1 =>
b6c2e30dc018 support for known theories files (according to multiple uses);
wenzelm
parents: 65457
diff changeset
    51
                error("Duplicate theory " + quote(name.node) + " vs. " + quote(name1.node))
b6c2e30dc018 support for known theories files (according to multiple uses);
wenzelm
parents: 65457
diff changeset
    52
              case _ => known + (name.theory -> name)
b6c2e30dc018 support for known theories files (according to multiple uses);
wenzelm
parents: 65457
diff changeset
    53
            }
b6c2e30dc018 support for known theories files (according to multiple uses);
wenzelm
parents: 65457
diff changeset
    54
          })
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
    55
      val known_theories_local =
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
    56
        (Map.empty[String, Document.Node.Name] /:
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
    57
            (bases_iterator(true) ++ local_theories_iterator))({
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
    58
          case (known, name) => known + (name.theory -> name)
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
    59
        })
65461
b6c2e30dc018 support for known theories files (according to multiple uses);
wenzelm
parents: 65457
diff changeset
    60
      val known_files =
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
    61
        (Map.empty[JFile, List[Document.Node.Name]] /:
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
    62
            (bases_iterator(true) ++ bases_iterator(false) ++ theories.iterator))({
65461
b6c2e30dc018 support for known theories files (according to multiple uses);
wenzelm
parents: 65457
diff changeset
    63
          case (known, name) =>
b6c2e30dc018 support for known theories files (according to multiple uses);
wenzelm
parents: 65457
diff changeset
    64
            val file = Path.explode(name.node).file.getCanonicalFile
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
    65
            val theories1 = known.getOrElse(file, Nil)
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
    66
            if (theories1.exists(name1 => name.node == name1.node && name.theory == name1.theory))
65461
b6c2e30dc018 support for known theories files (according to multiple uses);
wenzelm
parents: 65457
diff changeset
    67
              known
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
    68
            else known + (file -> (name :: theories1))
65427
wenzelm
parents: 65426
diff changeset
    69
        })
65495
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
    70
      Known(known_theories, known_theories_local,
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
    71
        known_files.iterator.map(p => (p._1, p._2.reverse)).toMap)
65427
wenzelm
parents: 65426
diff changeset
    72
    }
64856
5e9bf964510a clarified modules;
wenzelm
parents: 63996
diff changeset
    73
  }
5e9bf964510a clarified modules;
wenzelm
parents: 63996
diff changeset
    74
65495
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
    75
  sealed case class Known(
65499
fc7f03cbccbc tuned signature;
wenzelm
parents: 65498
diff changeset
    76
    theories: Map[String, Document.Node.Name] = Map.empty,
fc7f03cbccbc tuned signature;
wenzelm
parents: 65498
diff changeset
    77
    theories_local: Map[String, Document.Node.Name] = Map.empty,
fc7f03cbccbc tuned signature;
wenzelm
parents: 65498
diff changeset
    78
    files: Map[JFile, List[Document.Node.Name]] = Map.empty)
65355
403eabd73c9a tuned signature;
wenzelm
parents: 65326
diff changeset
    79
  {
65495
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
    80
    def platform_path: Known =
65499
fc7f03cbccbc tuned signature;
wenzelm
parents: 65498
diff changeset
    81
      copy(theories = for ((a, b) <- theories) yield (a, b.map(File.platform_path(_))),
fc7f03cbccbc tuned signature;
wenzelm
parents: 65498
diff changeset
    82
        theories_local = for ((a, b) <- theories_local) yield (a, b.map(File.platform_path(_))),
fc7f03cbccbc tuned signature;
wenzelm
parents: 65498
diff changeset
    83
        files = for ((a, b) <- files) yield (a, b.map(c => c.map(File.platform_path(_)))))
65524
0910f1733909 tuned signature;
wenzelm
parents: 65520
diff changeset
    84
0910f1733909 tuned signature;
wenzelm
parents: 65520
diff changeset
    85
    def get_file(file: JFile): Option[Document.Node.Name] =
0910f1733909 tuned signature;
wenzelm
parents: 65520
diff changeset
    86
      files.getOrElse(file.getCanonicalFile, Nil).headOption
65495
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
    87
  }
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
    88
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
    89
  object Base
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
    90
  {
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
    91
    def pure(options: Options): Base = session_base(options, Thy_Header.PURE)
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
    92
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
    93
    def bootstrap(global_theories: Map[String, String]): Base =
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
    94
      Base(
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
    95
        global_theories = global_theories,
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
    96
        keywords = Thy_Header.bootstrap_header,
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
    97
        syntax = Thy_Header.bootstrap_syntax)
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
    98
  }
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
    99
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
   100
  sealed case class Base(
65540
2b73ed8bf4d9 proper imports_resources for import_name: avoid self-referential name resolution;
wenzelm
parents: 65532
diff changeset
   101
    imports: Option[Base] = None,
65495
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
   102
    global_theories: Map[String, String] = Map.empty,
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
   103
    loaded_theories: Map[String, String] = Map.empty,
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
   104
    known: Known = Known.empty,
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
   105
    keywords: Thy_Header.Keywords = Nil,
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
   106
    syntax: Outer_Syntax = Outer_Syntax.empty,
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
   107
    sources: List[(Path, SHA1.Digest)] = Nil,
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
   108
    session_graph: Graph_Display.Graph = Graph_Display.empty_graph)
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
   109
  {
65540
2b73ed8bf4d9 proper imports_resources for import_name: avoid self-referential name resolution;
wenzelm
parents: 65532
diff changeset
   110
    def get_imports: Base = imports getOrElse Base.bootstrap(global_theories)
2b73ed8bf4d9 proper imports_resources for import_name: avoid self-referential name resolution;
wenzelm
parents: 65532
diff changeset
   111
65495
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
   112
    def platform_path: Base = copy(known = known.platform_path)
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   113
65355
403eabd73c9a tuned signature;
wenzelm
parents: 65326
diff changeset
   114
    def loaded_theory(name: Document.Node.Name): Boolean =
65429
fcff401fb609 more explicit lookup of loaded_theories: base names allowed here;
wenzelm
parents: 65428
diff changeset
   115
      loaded_theories.isDefinedAt(name.theory)
65432
wenzelm
parents: 65430
diff changeset
   116
65498
2af863e28204 tuned signature;
wenzelm
parents: 65496
diff changeset
   117
    def known_theory(name: String): Option[Document.Node.Name] =
65499
fc7f03cbccbc tuned signature;
wenzelm
parents: 65498
diff changeset
   118
      known.theories.get(name)
65498
2af863e28204 tuned signature;
wenzelm
parents: 65496
diff changeset
   119
65432
wenzelm
parents: 65430
diff changeset
   120
    def dest_known_theories: List[(String, String)] =
65499
fc7f03cbccbc tuned signature;
wenzelm
parents: 65498
diff changeset
   121
      for ((theory, node_name) <- known.theories.toList)
65432
wenzelm
parents: 65430
diff changeset
   122
        yield (theory, node_name.node)
65355
403eabd73c9a tuned signature;
wenzelm
parents: 65326
diff changeset
   123
  }
64856
5e9bf964510a clarified modules;
wenzelm
parents: 63996
diff changeset
   124
65495
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
   125
  sealed case class Deps(session_bases: Map[String, Base], all_known: Known)
65251
4b0a43afc3fb clarified modules;
wenzelm
parents: 64856
diff changeset
   126
  {
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   127
    def is_empty: Boolean = session_bases.isEmpty
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   128
    def apply(name: String): Base = session_bases(name)
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   129
    def sources(name: String): List[SHA1.Digest] = session_bases(name).sources.map(_._2)
65251
4b0a43afc3fb clarified modules;
wenzelm
parents: 64856
diff changeset
   130
  }
64856
5e9bf964510a clarified modules;
wenzelm
parents: 63996
diff changeset
   131
65415
8cd54b18b68b clarified signature: tree structure is not essential;
wenzelm
parents: 65410
diff changeset
   132
  def deps(sessions: T,
65251
4b0a43afc3fb clarified modules;
wenzelm
parents: 64856
diff changeset
   133
      progress: Progress = No_Progress,
4b0a43afc3fb clarified modules;
wenzelm
parents: 64856
diff changeset
   134
      inlined_files: Boolean = false,
4b0a43afc3fb clarified modules;
wenzelm
parents: 64856
diff changeset
   135
      verbose: Boolean = false,
4b0a43afc3fb clarified modules;
wenzelm
parents: 64856
diff changeset
   136
      list_files: Boolean = false,
4b0a43afc3fb clarified modules;
wenzelm
parents: 64856
diff changeset
   137
      check_keywords: Set[String] = Set.empty,
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   138
      global_theories: Map[String, String] = Map.empty,
65495
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
   139
      all_known: Boolean = false): Deps =
65372
b722ee40c26c refer to global_theories from all sessions, before selection;
wenzelm
parents: 65371
diff changeset
   140
  {
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   141
    val session_bases =
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   142
      (Map.empty[String, Base] /: sessions.imports_topological_order)({
65519
d244d8f8e13f store Sessions.Info.name;
wenzelm
parents: 65517
diff changeset
   143
        case (session_bases, info) =>
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   144
          if (progress.stopped) throw Exn.Interrupt()
65251
4b0a43afc3fb clarified modules;
wenzelm
parents: 64856
diff changeset
   145
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   146
          try {
65496
ca8dcb2a500c proper imports_base, notably for thy_deps;
wenzelm
parents: 65495
diff changeset
   147
            val parent_base: Sessions.Base =
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   148
              info.parent match {
65475
4519c8cc4bec proper bootstrap base for building Pure;
wenzelm
parents: 65471
diff changeset
   149
                case None => Base.bootstrap(global_theories)
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   150
                case Some(parent) => session_bases(parent)
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   151
              }
65496
ca8dcb2a500c proper imports_base, notably for thy_deps;
wenzelm
parents: 65495
diff changeset
   152
            val imports_base: Sessions.Base =
ca8dcb2a500c proper imports_base, notably for thy_deps;
wenzelm
parents: 65495
diff changeset
   153
              parent_base.copy(known =
ca8dcb2a500c proper imports_base, notably for thy_deps;
wenzelm
parents: 65495
diff changeset
   154
                Known.make(info.dir, parent_base :: info.imports.map(session_bases(_)), Nil))
ca8dcb2a500c proper imports_base, notably for thy_deps;
wenzelm
parents: 65495
diff changeset
   155
65532
febfd9f78bd4 eliminated default_qualifier: just a constant;
wenzelm
parents: 65528
diff changeset
   156
            val resources = new Resources(imports_base)
65251
4b0a43afc3fb clarified modules;
wenzelm
parents: 64856
diff changeset
   157
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   158
            if (verbose || list_files) {
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   159
              val groups =
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   160
                if (info.groups.isEmpty) ""
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   161
                else info.groups.mkString(" (", " ", ")")
65519
d244d8f8e13f store Sessions.Info.name;
wenzelm
parents: 65517
diff changeset
   162
              progress.echo("Session " + info.chapter + "/" + info.name + groups)
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   163
            }
65251
4b0a43afc3fb clarified modules;
wenzelm
parents: 64856
diff changeset
   164
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   165
            val thy_deps =
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   166
            {
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   167
              val root_theories =
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   168
                info.theories.flatMap({ case (_, thys) =>
65517
1544e61e5314 more position information;
wenzelm
parents: 65507
diff changeset
   169
                  thys.map({ case (thy, pos) =>
65528
d15d302da7f0 proper theory_qualifier;
wenzelm
parents: 65525
diff changeset
   170
                    (resources.import_name(info.theory_qualifier, info.dir.implode, thy), pos) })
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   171
                })
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   172
              val thy_deps = resources.thy_info.dependencies(root_theories)
65251
4b0a43afc3fb clarified modules;
wenzelm
parents: 64856
diff changeset
   173
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   174
              thy_deps.errors match {
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   175
                case Nil => thy_deps
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   176
                case errs => error(cat_lines(errs))
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   177
              }
65251
4b0a43afc3fb clarified modules;
wenzelm
parents: 64856
diff changeset
   178
            }
4b0a43afc3fb clarified modules;
wenzelm
parents: 64856
diff changeset
   179
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   180
            val syntax = thy_deps.syntax
65251
4b0a43afc3fb clarified modules;
wenzelm
parents: 64856
diff changeset
   181
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   182
            val theory_files = thy_deps.deps.map(dep => Path.explode(dep.name.node))
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   183
            val loaded_files =
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   184
              if (inlined_files) {
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   185
                val pure_files =
65519
d244d8f8e13f store Sessions.Info.name;
wenzelm
parents: 65517
diff changeset
   186
                  if (is_pure(info.name)) {
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   187
                    val roots = Thy_Header.ml_roots.map(p => info.dir + Path.explode(p._1))
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   188
                    val files =
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   189
                      roots.flatMap(root => resources.loaded_files(syntax, File.read(root))).
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   190
                        map(file => info.dir + Path.explode(file))
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   191
                    roots ::: files
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   192
                  }
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   193
                  else Nil
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   194
                pure_files ::: thy_deps.loaded_files
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   195
              }
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   196
              else Nil
65251
4b0a43afc3fb clarified modules;
wenzelm
parents: 64856
diff changeset
   197
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   198
            val all_files =
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   199
              (theory_files ::: loaded_files :::
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   200
                info.files.map(file => info.dir + file) :::
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   201
                info.document_files.map(file => info.dir + file._1 + file._2)).map(_.expand)
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   202
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   203
            if (list_files)
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   204
              progress.echo(cat_lines(all_files.map(_.implode).sorted.map("  " + _)))
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   205
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   206
            if (check_keywords.nonEmpty)
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   207
              Check_Keywords.check_keywords(progress, syntax.keywords, check_keywords, theory_files)
65251
4b0a43afc3fb clarified modules;
wenzelm
parents: 64856
diff changeset
   208
65507
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   209
            val session_graph: Graph_Display.Graph =
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   210
            {
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   211
              def session_node(name: String): Graph_Display.Node =
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   212
                Graph_Display.Node("[" + name + "]", "session." + name)
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   213
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   214
              def node(name: Document.Node.Name): Graph_Display.Node =
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   215
              {
65528
d15d302da7f0 proper theory_qualifier;
wenzelm
parents: 65525
diff changeset
   216
                val qualifier = resources.theory_qualifier(name)
d15d302da7f0 proper theory_qualifier;
wenzelm
parents: 65525
diff changeset
   217
                if (qualifier == info.theory_qualifier)
65507
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   218
                  Graph_Display.Node(name.theory_base_name, "theory." + name.theory)
65528
d15d302da7f0 proper theory_qualifier;
wenzelm
parents: 65525
diff changeset
   219
                else session_node(qualifier)
65507
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   220
              }
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   221
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   222
              val imports_subgraph =
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   223
                sessions.imports_graph.restrict(
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   224
                  sessions.imports_graph.all_preds(info.parent.toList ::: info.imports).toSet)
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   225
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   226
              val graph0 =
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   227
                (Graph_Display.empty_graph /: imports_subgraph.topological_order)(
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   228
                  { case (g, session) =>
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   229
                      val a = session_node(session)
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   230
                      val bs = imports_subgraph.imm_preds(session).toList.map(session_node(_))
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   231
                      ((g /: (a :: bs))(_.default_node(_, Nil)) /: bs)(_.add_edge(_, a)) })
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   232
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   233
              (graph0 /: thy_deps.deps)(
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   234
                { case (g, dep) =>
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   235
                    val a = node(dep.name)
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   236
                    val bs =
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   237
                      dep.header.imports.map({ case (name, _) => node(name) }).
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   238
                        filterNot(_ == a)
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   239
                    ((g /: (a :: bs))(_.default_node(_, Nil)) /: bs)(_.add_edge(_, a)) })
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   240
            }
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   241
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   242
            val base =
65540
2b73ed8bf4d9 proper imports_resources for import_name: avoid self-referential name resolution;
wenzelm
parents: 65532
diff changeset
   243
              Base(imports = Some(imports_base),
2b73ed8bf4d9 proper imports_resources for import_name: avoid self-referential name resolution;
wenzelm
parents: 65532
diff changeset
   244
                global_theories = global_theories,
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   245
                loaded_theories = thy_deps.loaded_theories,
65496
ca8dcb2a500c proper imports_base, notably for thy_deps;
wenzelm
parents: 65495
diff changeset
   246
                known = Known.make(info.dir, List(imports_base), thy_deps.deps.map(_.name)),
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   247
                keywords = thy_deps.keywords,
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   248
                syntax = syntax,
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   249
                sources = all_files.map(p => (p, SHA1.digest(p.file))),
65507
decdb95bd007 clarified session graph: collapse theories from other sessions;
wenzelm
parents: 65500
diff changeset
   250
                session_graph = session_graph)
65251
4b0a43afc3fb clarified modules;
wenzelm
parents: 64856
diff changeset
   251
65519
d244d8f8e13f store Sessions.Info.name;
wenzelm
parents: 65517
diff changeset
   252
            session_bases + (info.name -> base)
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   253
          }
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   254
          catch {
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   255
            case ERROR(msg) =>
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   256
              cat_error(msg, "The error(s) above occurred in session " +
65519
d244d8f8e13f store Sessions.Info.name;
wenzelm
parents: 65517
diff changeset
   257
                quote(info.name) + Position.here(info.pos))
65463
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   258
          }
104502de757c more informative known_files: known_theories within the local session directory come first;
wenzelm
parents: 65461
diff changeset
   259
      })
65251
4b0a43afc3fb clarified modules;
wenzelm
parents: 64856
diff changeset
   260
65496
ca8dcb2a500c proper imports_base, notably for thy_deps;
wenzelm
parents: 65495
diff changeset
   261
    Deps(session_bases,
65495
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
   262
      if (all_known) Known.make(Path.current, session_bases.toList.map(_._2), Nil)
65496
ca8dcb2a500c proper imports_base, notably for thy_deps;
wenzelm
parents: 65495
diff changeset
   263
      else Known.empty)
65372
b722ee40c26c refer to global_theories from all sessions, before selection;
wenzelm
parents: 65371
diff changeset
   264
  }
65251
4b0a43afc3fb clarified modules;
wenzelm
parents: 64856
diff changeset
   265
65428
f8dd71a0791a support for all_known_theories of all sessions;
wenzelm
parents: 65427
diff changeset
   266
  def session_base(
f8dd71a0791a support for all_known_theories of all sessions;
wenzelm
parents: 65427
diff changeset
   267
    options: Options,
f8dd71a0791a support for all_known_theories of all sessions;
wenzelm
parents: 65427
diff changeset
   268
    session: String,
f8dd71a0791a support for all_known_theories of all sessions;
wenzelm
parents: 65427
diff changeset
   269
    dirs: List[Path] = Nil,
65495
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
   270
    all_known: Boolean = false): Base =
65251
4b0a43afc3fb clarified modules;
wenzelm
parents: 64856
diff changeset
   271
  {
65415
8cd54b18b68b clarified signature: tree structure is not essential;
wenzelm
parents: 65410
diff changeset
   272
    val full_sessions = load(options, dirs = dirs)
65428
f8dd71a0791a support for all_known_theories of all sessions;
wenzelm
parents: 65427
diff changeset
   273
    val global_theories = full_sessions.global_theories
f8dd71a0791a support for all_known_theories of all sessions;
wenzelm
parents: 65427
diff changeset
   274
    val selected_sessions = full_sessions.selection(Selection(sessions = List(session)))._2
65372
b722ee40c26c refer to global_theories from all sessions, before selection;
wenzelm
parents: 65371
diff changeset
   275
65495
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
   276
    if (all_known) {
65560
wenzelm
parents: 65540
diff changeset
   277
      val deps = Sessions.deps(full_sessions, global_theories = global_theories, all_known = true)
65495
60d4fbed2b1f tuned signature;
wenzelm
parents: 65490
diff changeset
   278
      deps(session).copy(known = deps.all_known)
65428
f8dd71a0791a support for all_known_theories of all sessions;
wenzelm
parents: 65427
diff changeset
   279
    }
f8dd71a0791a support for all_known_theories of all sessions;
wenzelm
parents: 65427
diff changeset
   280
    else
f8dd71a0791a support for all_known_theories of all sessions;
wenzelm
parents: 65427
diff changeset
   281
      deps(selected_sessions, global_theories = global_theories)(session)
65251
4b0a43afc3fb clarified modules;
wenzelm
parents: 64856
diff changeset
   282
  }
4b0a43afc3fb clarified modules;
wenzelm
parents: 64856
diff changeset
   283
4b0a43afc3fb clarified modules;
wenzelm
parents: 64856
diff changeset
   284
65415
8cd54b18b68b clarified signature: tree structure is not essential;
wenzelm
parents: 65410
diff changeset
   285
  /* cumulative session info */
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   286
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   287
  sealed case class Info(
65519
d244d8f8e13f store Sessions.Info.name;
wenzelm
parents: 65517
diff changeset
   288
    name: String,
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   289
    chapter: String,
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   290
    select: Boolean,
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   291
    pos: Position.T,
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   292
    groups: List[String],
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   293
    dir: Path,
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   294
    parent: Option[String],
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   295
    description: String,
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   296
    options: Options,
65420
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   297
    imports: List[String],
65517
1544e61e5314 more position information;
wenzelm
parents: 65507
diff changeset
   298
    theories: List[(Options, List[(String, Position.T)])],
65374
a5b38d8d3c1e tuned syntax;
wenzelm
parents: 65373
diff changeset
   299
    global_theories: List[String],
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   300
    files: List[Path],
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   301
    document_files: List[(Path, Path)],
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   302
    meta_digest: SHA1.Digest)
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   303
  {
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   304
    def timeout: Time = Time.seconds(options.real("timeout") * options.real("timeout_scale"))
65456
31e8a86971a8 explicit theory qualifier for session "HOL-Proofs": its theory name space overlaps with session "HOL", even for further imports;
wenzelm
parents: 65445
diff changeset
   305
65520
f47bc12b6e8a clarified;
wenzelm
parents: 65519
diff changeset
   306
    def theory_qualifier: String =
65456
31e8a86971a8 explicit theory qualifier for session "HOL-Proofs": its theory name space overlaps with session "HOL", even for further imports;
wenzelm
parents: 65445
diff changeset
   307
      options.string("theory_qualifier") match {
65520
f47bc12b6e8a clarified;
wenzelm
parents: 65519
diff changeset
   308
        case "" => name
65457
2bf0d2fcd506 proper import qualifier for global theories;
wenzelm
parents: 65456
diff changeset
   309
        case qualifier => qualifier
65456
31e8a86971a8 explicit theory qualifier for session "HOL-Proofs": its theory name space overlaps with session "HOL", even for further imports;
wenzelm
parents: 65445
diff changeset
   310
      }
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   311
  }
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   312
65419
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   313
  object Selection
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   314
  {
65422
b606c98e6d10 tuned signature;
wenzelm
parents: 65420
diff changeset
   315
    val empty: Selection = Selection()
65525
360063716c71 more operations;
wenzelm
parents: 65524
diff changeset
   316
    val all: Selection = Selection(all_sessions = true)
65419
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   317
  }
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   318
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   319
  sealed case class Selection(
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   320
    requirements: Boolean = false,
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   321
    all_sessions: Boolean = false,
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   322
    exclude_session_groups: List[String] = Nil,
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   323
    exclude_sessions: List[String] = Nil,
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   324
    session_groups: List[String] = Nil,
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   325
    sessions: List[String] = Nil)
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   326
  {
65422
b606c98e6d10 tuned signature;
wenzelm
parents: 65420
diff changeset
   327
    def + (other: Selection): Selection =
b606c98e6d10 tuned signature;
wenzelm
parents: 65420
diff changeset
   328
      Selection(
b606c98e6d10 tuned signature;
wenzelm
parents: 65420
diff changeset
   329
        requirements = requirements || other.requirements,
b606c98e6d10 tuned signature;
wenzelm
parents: 65420
diff changeset
   330
        all_sessions = all_sessions || other.all_sessions,
b606c98e6d10 tuned signature;
wenzelm
parents: 65420
diff changeset
   331
        exclude_session_groups = exclude_session_groups ::: other.exclude_session_groups,
b606c98e6d10 tuned signature;
wenzelm
parents: 65420
diff changeset
   332
        exclude_sessions = exclude_sessions ::: other.exclude_sessions,
b606c98e6d10 tuned signature;
wenzelm
parents: 65420
diff changeset
   333
        session_groups = session_groups ::: other.session_groups,
b606c98e6d10 tuned signature;
wenzelm
parents: 65420
diff changeset
   334
        sessions = sessions ::: other.sessions)
b606c98e6d10 tuned signature;
wenzelm
parents: 65420
diff changeset
   335
65419
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   336
    def apply(graph: Graph[String, Info]): (List[String], Graph[String, Info]) =
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   337
    {
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   338
      val bad_sessions =
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   339
        SortedSet((exclude_sessions ::: sessions).filterNot(graph.defined(_)): _*).toList
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   340
      if (bad_sessions.nonEmpty) error("Undefined session(s): " + commas_quote(bad_sessions))
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   341
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   342
      val excluded =
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   343
      {
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   344
        val exclude_group = exclude_session_groups.toSet
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   345
        val exclude_group_sessions =
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   346
          (for {
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   347
            (name, (info, _)) <- graph.iterator
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   348
            if graph.get_node(name).groups.exists(exclude_group)
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   349
          } yield name).toList
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   350
        graph.all_succs(exclude_group_sessions ::: exclude_sessions).toSet
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   351
      }
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   352
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   353
      val pre_selected =
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   354
      {
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   355
        if (all_sessions) graph.keys
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   356
        else {
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   357
          val select_group = session_groups.toSet
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   358
          val select = sessions.toSet
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   359
          (for {
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   360
            (name, (info, _)) <- graph.iterator
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   361
            if info.select || select(name) || graph.get_node(name).groups.exists(select_group)
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   362
          } yield name).toList
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   363
        }
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   364
      }.filterNot(excluded)
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   365
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   366
      val selected =
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   367
        if (requirements) (graph.all_preds(pre_selected).toSet -- pre_selected).toList
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   368
        else pre_selected
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   369
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   370
      (selected, graph.restrict(graph.all_preds(selected).toSet))
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   371
    }
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   372
  }
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   373
65415
8cd54b18b68b clarified signature: tree structure is not essential;
wenzelm
parents: 65410
diff changeset
   374
  def make(infos: Traversable[(String, Info)]): T =
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   375
  {
65420
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   376
    def add_edges(graph: Graph[String, Info], kind: String, edges: Info => Traversable[String])
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   377
      : Graph[String, Info] =
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   378
    {
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   379
      def add_edge(pos: Position.T, name: String, g: Graph[String, Info], parent: String) =
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   380
      {
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   381
        if (!g.defined(parent))
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   382
          error("Bad " + kind + " session " + quote(parent) + " for " +
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   383
            quote(name) + Position.here(pos))
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   384
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   385
        try { g.add_edge_acyclic(parent, name) }
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   386
        catch {
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   387
          case exn: Graph.Cycles[_] =>
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   388
            error(cat_lines(exn.cycles.map(cycle =>
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   389
              "Cyclic session dependency of " +
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   390
                cycle.map(c => quote(c.toString)).mkString(" via "))) + Position.here(pos))
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   391
        }
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   392
      }
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   393
      (graph /: graph.iterator) {
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   394
        case (g, (name, (info, _))) => (g /: edges(info))(add_edge(info.pos, name, _, _))
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   395
      }
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   396
    }
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   397
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   398
    val graph0 =
65415
8cd54b18b68b clarified signature: tree structure is not essential;
wenzelm
parents: 65410
diff changeset
   399
      (Graph.string[Info] /: infos) {
8cd54b18b68b clarified signature: tree structure is not essential;
wenzelm
parents: 65410
diff changeset
   400
        case (graph, (name, info)) =>
8cd54b18b68b clarified signature: tree structure is not essential;
wenzelm
parents: 65410
diff changeset
   401
          if (graph.defined(name))
8cd54b18b68b clarified signature: tree structure is not essential;
wenzelm
parents: 65410
diff changeset
   402
            error("Duplicate session " + quote(name) + Position.here(info.pos) +
8cd54b18b68b clarified signature: tree structure is not essential;
wenzelm
parents: 65410
diff changeset
   403
              Position.here(graph.get_node(name).pos))
8cd54b18b68b clarified signature: tree structure is not essential;
wenzelm
parents: 65410
diff changeset
   404
          else graph.new_node(name, info)
8cd54b18b68b clarified signature: tree structure is not essential;
wenzelm
parents: 65410
diff changeset
   405
      }
65420
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   406
    val graph1 = add_edges(graph0, "parent", _.parent)
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   407
    val graph2 = add_edges(graph1, "imports", _.imports)
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   408
65420
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   409
    new T(graph1, graph2)
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   410
  }
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   411
65420
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   412
  final class T private[Sessions](
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   413
      val build_graph: Graph[String, Info],
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   414
      val imports_graph: Graph[String, Info])
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   415
  {
65420
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   416
    def apply(name: String): Info = imports_graph.get_node(name)
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   417
    def get(name: String): Option[Info] =
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   418
      if (imports_graph.defined(name)) Some(imports_graph.get_node(name)) else None
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   419
65457
2bf0d2fcd506 proper import qualifier for global theories;
wenzelm
parents: 65456
diff changeset
   420
    def global_theories: Map[String, String] =
65490
571a3ce3cc17 special theories are always global;
wenzelm
parents: 65475
diff changeset
   421
      (Thy_Header.bootstrap_global_theories.toMap /:
65424
741d40f42dd3 more checks;
wenzelm
parents: 65422
diff changeset
   422
        (for {
65519
d244d8f8e13f store Sessions.Info.name;
wenzelm
parents: 65517
diff changeset
   423
          (_, (info, _)) <- imports_graph.iterator
d244d8f8e13f store Sessions.Info.name;
wenzelm
parents: 65517
diff changeset
   424
          thy <- info.global_theories.iterator }
d244d8f8e13f store Sessions.Info.name;
wenzelm
parents: 65517
diff changeset
   425
         yield (thy, info)))({
d244d8f8e13f store Sessions.Info.name;
wenzelm
parents: 65517
diff changeset
   426
            case (global, (thy, info)) =>
65520
f47bc12b6e8a clarified;
wenzelm
parents: 65519
diff changeset
   427
              val qualifier = info.theory_qualifier
65457
2bf0d2fcd506 proper import qualifier for global theories;
wenzelm
parents: 65456
diff changeset
   428
              global.get(thy) match {
2bf0d2fcd506 proper import qualifier for global theories;
wenzelm
parents: 65456
diff changeset
   429
                case Some(qualifier1) if qualifier != qualifier1 =>
2bf0d2fcd506 proper import qualifier for global theories;
wenzelm
parents: 65456
diff changeset
   430
                  error("Duplicate global theory " + quote(thy) + Position.here(info.pos))
2bf0d2fcd506 proper import qualifier for global theories;
wenzelm
parents: 65456
diff changeset
   431
                case _ => global + (thy -> qualifier)
2bf0d2fcd506 proper import qualifier for global theories;
wenzelm
parents: 65456
diff changeset
   432
              }
2bf0d2fcd506 proper import qualifier for global theories;
wenzelm
parents: 65456
diff changeset
   433
          })
65372
b722ee40c26c refer to global_theories from all sessions, before selection;
wenzelm
parents: 65371
diff changeset
   434
65419
457e4fbed731 explicit Sessions.Selection;
wenzelm
parents: 65415
diff changeset
   435
    def selection(select: Selection): (List[String], T) =
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   436
    {
65420
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   437
      val (_, build_graph1) = select(build_graph)
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   438
      val (selected, imports_graph1) = select(imports_graph)
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   439
      (selected, new T(build_graph1, imports_graph1))
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   440
    }
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   441
65420
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   442
    def build_ancestors(name: String): List[String] =
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   443
      build_graph.all_preds(List(name)).tail.reverse
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   444
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   445
    def build_descendants(names: List[String]): List[String] =
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   446
      build_graph.all_succs(names)
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   447
65519
d244d8f8e13f store Sessions.Info.name;
wenzelm
parents: 65517
diff changeset
   448
    def build_topological_order: List[Info] =
d244d8f8e13f store Sessions.Info.name;
wenzelm
parents: 65517
diff changeset
   449
      build_graph.topological_order.map(apply(_))
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   450
65566
94c514ea2846 support for potential session imports;
wenzelm
parents: 65561
diff changeset
   451
    def imports_ancestors(name: String): List[String] =
94c514ea2846 support for potential session imports;
wenzelm
parents: 65561
diff changeset
   452
      imports_graph.all_preds(List(name)).tail.reverse
94c514ea2846 support for potential session imports;
wenzelm
parents: 65561
diff changeset
   453
65519
d244d8f8e13f store Sessions.Info.name;
wenzelm
parents: 65517
diff changeset
   454
    def imports_topological_order: List[Info] =
d244d8f8e13f store Sessions.Info.name;
wenzelm
parents: 65517
diff changeset
   455
      imports_graph.topological_order.map(apply(_))
65420
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   456
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   457
    override def toString: String =
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   458
      imports_graph.keys_iterator.mkString("Sessions.T(", ", ", ")")
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   459
  }
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   460
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   461
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   462
  /* parser */
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   463
62864
wenzelm
parents: 62769
diff changeset
   464
  val ROOT = Path.explode("ROOT")
wenzelm
parents: 62769
diff changeset
   465
  val ROOTS = Path.explode("ROOTS")
wenzelm
parents: 62769
diff changeset
   466
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   467
  private val CHAPTER = "chapter"
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   468
  private val SESSION = "session"
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   469
  private val IN = "in"
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   470
  private val DESCRIPTION = "description"
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   471
  private val OPTIONS = "options"
65420
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   472
  private val SESSIONS = "sessions"
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   473
  private val THEORIES = "theories"
65374
a5b38d8d3c1e tuned syntax;
wenzelm
parents: 65373
diff changeset
   474
  private val GLOBAL = "global"
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   475
  private val FILES = "files"
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   476
  private val DOCUMENT_FILES = "document_files"
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   477
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   478
  lazy val root_syntax =
65374
a5b38d8d3c1e tuned syntax;
wenzelm
parents: 65373
diff changeset
   479
    Outer_Syntax.init() + "(" + ")" + "+" + "," + "=" + "[" + "]" + GLOBAL + IN +
63443
c037248d54e8 clarified keywords;
wenzelm
parents: 63022
diff changeset
   480
      (CHAPTER, Keyword.THY_DECL) +
c037248d54e8 clarified keywords;
wenzelm
parents: 63022
diff changeset
   481
      (SESSION, Keyword.THY_DECL) +
c037248d54e8 clarified keywords;
wenzelm
parents: 63022
diff changeset
   482
      (DESCRIPTION, Keyword.QUASI_COMMAND) +
c037248d54e8 clarified keywords;
wenzelm
parents: 63022
diff changeset
   483
      (OPTIONS, Keyword.QUASI_COMMAND) +
65420
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   484
      (SESSIONS, Keyword.QUASI_COMMAND) +
63443
c037248d54e8 clarified keywords;
wenzelm
parents: 63022
diff changeset
   485
      (THEORIES, Keyword.QUASI_COMMAND) +
c037248d54e8 clarified keywords;
wenzelm
parents: 63022
diff changeset
   486
      (FILES, Keyword.QUASI_COMMAND) +
c037248d54e8 clarified keywords;
wenzelm
parents: 63022
diff changeset
   487
      (DOCUMENT_FILES, Keyword.QUASI_COMMAND)
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   488
62968
4e4738698db4 clarified syntax;
wenzelm
parents: 62946
diff changeset
   489
  private object Parser extends Parse.Parser with Options.Parser
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   490
  {
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   491
    private abstract class Entry
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   492
    private sealed case class Chapter(name: String) extends Entry
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   493
    private sealed case class Session_Entry(
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   494
      pos: Position.T,
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   495
      name: String,
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   496
      groups: List[String],
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   497
      path: String,
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   498
      parent: Option[String],
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   499
      description: String,
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   500
      options: List[Options.Spec],
65420
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   501
      imports: List[String],
65517
1544e61e5314 more position information;
wenzelm
parents: 65507
diff changeset
   502
      theories: List[(List[Options.Spec], List[((String, Position.T), Boolean)])],
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   503
      files: List[String],
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   504
      document_files: List[(String, String)]) extends Entry
65580
66351f79c295 meta_digest without accidental source positions (amending 1544e61e5314): avoid spurious rebuild of unrelated sessions after editing ROOT;
wenzelm
parents: 65566
diff changeset
   505
    {
66351f79c295 meta_digest without accidental source positions (amending 1544e61e5314): avoid spurious rebuild of unrelated sessions after editing ROOT;
wenzelm
parents: 65566
diff changeset
   506
      def theories_no_position: List[(List[Options.Spec], List[(String, Boolean)])] =
66351f79c295 meta_digest without accidental source positions (amending 1544e61e5314): avoid spurious rebuild of unrelated sessions after editing ROOT;
wenzelm
parents: 65566
diff changeset
   507
        theories.map({ case (a, b) => (a, b.map({ case ((c, _), d) => (c, d) })) })
66351f79c295 meta_digest without accidental source positions (amending 1544e61e5314): avoid spurious rebuild of unrelated sessions after editing ROOT;
wenzelm
parents: 65566
diff changeset
   508
    }
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   509
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   510
    private val chapter: Parser[Chapter] =
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   511
    {
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   512
      val chapter_name = atom("chapter name", _.is_name)
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   513
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   514
      command(CHAPTER) ~! chapter_name ^^ { case _ ~ a => Chapter(a) }
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   515
    }
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   516
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   517
    private val session_entry: Parser[Session_Entry] =
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   518
    {
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   519
      val session_name = atom("session name", _.is_name)
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   520
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   521
      val option =
62968
4e4738698db4 clarified syntax;
wenzelm
parents: 62946
diff changeset
   522
        option_name ~ opt($$$("=") ~! option_value ^^
4e4738698db4 clarified syntax;
wenzelm
parents: 62946
diff changeset
   523
          { case _ ~ x => x }) ^^ { case x ~ y => (x, y) }
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   524
      val options = $$$("[") ~> rep1sep(option, $$$(",")) <~ $$$("]")
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   525
65374
a5b38d8d3c1e tuned syntax;
wenzelm
parents: 65373
diff changeset
   526
      val global =
a5b38d8d3c1e tuned syntax;
wenzelm
parents: 65373
diff changeset
   527
        ($$$("(") ~! $$$(GLOBAL) ~ $$$(")")) ^^ { case _ => true } | success(false)
a5b38d8d3c1e tuned syntax;
wenzelm
parents: 65373
diff changeset
   528
a5b38d8d3c1e tuned syntax;
wenzelm
parents: 65373
diff changeset
   529
      val theory_entry =
65517
1544e61e5314 more position information;
wenzelm
parents: 65507
diff changeset
   530
        position(theory_name) ~ global ^^ { case x ~ y => (x, y) }
65374
a5b38d8d3c1e tuned syntax;
wenzelm
parents: 65373
diff changeset
   531
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   532
      val theories =
65374
a5b38d8d3c1e tuned syntax;
wenzelm
parents: 65373
diff changeset
   533
        $$$(THEORIES) ~!
a5b38d8d3c1e tuned syntax;
wenzelm
parents: 65373
diff changeset
   534
          ((options | success(Nil)) ~ rep(theory_entry)) ^^
a5b38d8d3c1e tuned syntax;
wenzelm
parents: 65373
diff changeset
   535
          { case _ ~ (x ~ y) => (x, y) }
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   536
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   537
      val document_files =
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   538
        $$$(DOCUMENT_FILES) ~!
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   539
          (($$$("(") ~! ($$$(IN) ~! (path ~ $$$(")"))) ^^
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   540
              { case _ ~ (_ ~ (x ~ _)) => x } | success("document")) ~
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   541
            rep1(path)) ^^ { case _ ~ (x ~ y) => y.map((x, _)) }
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   542
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   543
      command(SESSION) ~!
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   544
        (position(session_name) ~
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   545
          (($$$("(") ~! (rep1(name) <~ $$$(")")) ^^ { case _ ~ x => x }) | success(Nil)) ~
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   546
          (($$$(IN) ~! path ^^ { case _ ~ x => x }) | success(".")) ~
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   547
          ($$$("=") ~!
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   548
            (opt(session_name ~! $$$("+") ^^ { case x ~ _ => x }) ~
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   549
              (($$$(DESCRIPTION) ~! text ^^ { case _ ~ x => x }) | success("")) ~
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   550
              (($$$(OPTIONS) ~! options ^^ { case _ ~ x => x }) | success(Nil)) ~
65420
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   551
              (($$$(SESSIONS) ~! rep(session_name)  ^^ { case _ ~ x => x }) | success(Nil)) ~
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   552
              rep1(theories) ~
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   553
              (($$$(FILES) ~! rep1(path) ^^ { case _ ~ x => x }) | success(Nil)) ~
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   554
              (rep(document_files) ^^ (x => x.flatten))))) ^^
65420
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   555
        { case _ ~ ((a, pos) ~ b ~ c ~ (_ ~ (d ~ e ~ f ~ g ~ h ~ i ~ j))) =>
695d4e22345a support for static session imports, without affect build hierarchy;
wenzelm
parents: 65419
diff changeset
   556
            Session_Entry(pos, a, b, c, d, e, f, g, h, i, j) }
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   557
    }
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   558
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   559
    def parse(options: Options, select: Boolean, dir: Path): List[(String, Info)] =
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   560
    {
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   561
      def make_info(entry_chapter: String, entry: Session_Entry): (String, Info) =
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   562
      {
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   563
        try {
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   564
          val name = entry.name
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   565
65445
e9e7f5f5794c more qualifier treatment, but in the end it is still ignored;
wenzelm
parents: 65441
diff changeset
   566
          if (name == "" || name == DRAFT) error("Bad session name")
65360
wenzelm
parents: 65359
diff changeset
   567
          if (is_pure(name) && entry.parent.isDefined) error("Illegal parent session")
wenzelm
parents: 65359
diff changeset
   568
          if (!is_pure(name) && !entry.parent.isDefined) error("Missing parent session")
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   569
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   570
          val session_options = options ++ entry.options
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   571
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   572
          val theories =
65392
f365f61f2081 uniform import_name, with treatment of global and qualified theories;
wenzelm
parents: 65391
diff changeset
   573
            entry.theories.map({ case (opts, thys) => (session_options ++ opts, thys.map(_._1)) })
65374
a5b38d8d3c1e tuned syntax;
wenzelm
parents: 65373
diff changeset
   574
a5b38d8d3c1e tuned syntax;
wenzelm
parents: 65373
diff changeset
   575
          val global_theories =
65517
1544e61e5314 more position information;
wenzelm
parents: 65507
diff changeset
   576
            for { (_, thys) <- entry.theories; ((thy, pos), global) <- thys if global }
65374
a5b38d8d3c1e tuned syntax;
wenzelm
parents: 65373
diff changeset
   577
            yield {
a5b38d8d3c1e tuned syntax;
wenzelm
parents: 65373
diff changeset
   578
              val thy_name = Path.explode(thy).expand.base.implode
a5b38d8d3c1e tuned syntax;
wenzelm
parents: 65373
diff changeset
   579
              if (Long_Name.is_qualified(thy_name))
65517
1544e61e5314 more position information;
wenzelm
parents: 65507
diff changeset
   580
                error("Bad qualified name for global theory " +
1544e61e5314 more position information;
wenzelm
parents: 65507
diff changeset
   581
                  quote(thy_name) + Position.here(pos))
65374
a5b38d8d3c1e tuned syntax;
wenzelm
parents: 65373
diff changeset
   582
              else thy_name
a5b38d8d3c1e tuned syntax;
wenzelm
parents: 65373
diff changeset
   583
            }
a5b38d8d3c1e tuned syntax;
wenzelm
parents: 65373
diff changeset
   584
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   585
          val files = entry.files.map(Path.explode(_))
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   586
          val document_files =
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   587
            entry.document_files.map({ case (s1, s2) => (Path.explode(s1), Path.explode(s2)) })
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   588
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   589
          val meta_digest =
65580
66351f79c295 meta_digest without accidental source positions (amending 1544e61e5314): avoid spurious rebuild of unrelated sessions after editing ROOT;
wenzelm
parents: 65566
diff changeset
   590
            SHA1.digest((entry_chapter, name, entry.parent, entry.options, entry.imports,
66351f79c295 meta_digest without accidental source positions (amending 1544e61e5314): avoid spurious rebuild of unrelated sessions after editing ROOT;
wenzelm
parents: 65566
diff changeset
   591
              entry.theories_no_position, entry.files, entry.document_files).toString)
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   592
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   593
          val info =
65519
d244d8f8e13f store Sessions.Info.name;
wenzelm
parents: 65517
diff changeset
   594
            Info(name, entry_chapter, select, entry.pos, entry.groups,
d244d8f8e13f store Sessions.Info.name;
wenzelm
parents: 65517
diff changeset
   595
              dir + Path.explode(entry.path), entry.parent, entry.description, session_options,
d244d8f8e13f store Sessions.Info.name;
wenzelm
parents: 65517
diff changeset
   596
              entry.imports, theories, global_theories, files, document_files, meta_digest)
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   597
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   598
          (name, info)
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   599
        }
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   600
        catch {
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   601
          case ERROR(msg) =>
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   602
            error(msg + "\nThe error(s) above occurred in session entry " +
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   603
              quote(entry.name) + Position.here(entry.pos))
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   604
        }
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   605
      }
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   606
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   607
      val root = dir + ROOT
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   608
      if (root.is_file) {
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   609
        val toks = Token.explode(root_syntax.keywords, File.read(root))
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   610
        val start = Token.Pos.file(root.implode)
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   611
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   612
        parse_all(rep(chapter | session_entry), Token.reader(toks, start)) match {
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   613
          case Success(result, _) =>
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   614
            var entry_chapter = "Unsorted"
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   615
            val infos = new mutable.ListBuffer[(String, Info)]
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   616
            result.foreach {
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   617
              case Chapter(name) => entry_chapter = name
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   618
              case entry: Session_Entry => infos += make_info(entry_chapter, entry)
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   619
            }
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   620
            infos.toList
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   621
          case bad => error(bad.toString)
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   622
        }
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   623
      }
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   624
      else Nil
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   625
    }
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   626
  }
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   627
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   628
62635
4854a38061de tuned signature;
wenzelm
parents: 62633
diff changeset
   629
  /* load sessions from certain directories */
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   630
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   631
  private def is_session_dir(dir: Path): Boolean =
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   632
    (dir + ROOT).is_file || (dir + ROOTS).is_file
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   633
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   634
  private def check_session_dir(dir: Path): Path =
65468
c41791ad75c3 early check and normalization of session directory, e.g. relevant for path information passed to ML process, which may have a different CWD;
wenzelm
parents: 65463
diff changeset
   635
    if (is_session_dir(dir)) File.pwd() + dir.expand
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   636
    else error("Bad session root directory: " + dir.toString)
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   637
65561
741b1d3930c0 support for Mercurial manifest check;
wenzelm
parents: 65560
diff changeset
   638
  def directories(dirs: List[Path], select_dirs: List[Path]): List[(Boolean, Path)] =
741b1d3930c0 support for Mercurial manifest check;
wenzelm
parents: 65560
diff changeset
   639
  {
741b1d3930c0 support for Mercurial manifest check;
wenzelm
parents: 65560
diff changeset
   640
    val default_dirs = Isabelle_System.components().filter(is_session_dir(_))
741b1d3930c0 support for Mercurial manifest check;
wenzelm
parents: 65560
diff changeset
   641
    (default_dirs ::: dirs).map((false, _)) ::: select_dirs.map((true, _))
741b1d3930c0 support for Mercurial manifest check;
wenzelm
parents: 65560
diff changeset
   642
  }
741b1d3930c0 support for Mercurial manifest check;
wenzelm
parents: 65560
diff changeset
   643
65415
8cd54b18b68b clarified signature: tree structure is not essential;
wenzelm
parents: 65410
diff changeset
   644
  def load(options: Options, dirs: List[Path] = Nil, select_dirs: List[Path] = Nil): T =
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   645
  {
62635
4854a38061de tuned signature;
wenzelm
parents: 62633
diff changeset
   646
    def load_dir(select: Boolean, dir: Path): List[(String, Info)] =
4854a38061de tuned signature;
wenzelm
parents: 62633
diff changeset
   647
      load_root(select, dir) ::: load_roots(select, dir)
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   648
62635
4854a38061de tuned signature;
wenzelm
parents: 62633
diff changeset
   649
    def load_root(select: Boolean, dir: Path): List[(String, Info)] =
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   650
      Parser.parse(options, select, dir)
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   651
62635
4854a38061de tuned signature;
wenzelm
parents: 62633
diff changeset
   652
    def load_roots(select: Boolean, dir: Path): List[(String, Info)] =
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   653
    {
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   654
      val roots = dir + ROOTS
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   655
      if (roots.is_file) {
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   656
        for {
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   657
          line <- split_lines(File.read(roots))
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   658
          if !(line == "" || line.startsWith("#"))
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   659
          dir1 =
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   660
            try { check_session_dir(dir + Path.explode(line)) }
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   661
            catch {
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   662
              case ERROR(msg) =>
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   663
                error(msg + "\nThe error(s) above occurred in session catalog " + roots.toString)
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   664
            }
62635
4854a38061de tuned signature;
wenzelm
parents: 62633
diff changeset
   665
          info <- load_dir(select, dir1)
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   666
        } yield info
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   667
      }
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   668
      else Nil
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   669
    }
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   670
65415
8cd54b18b68b clarified signature: tree structure is not essential;
wenzelm
parents: 65410
diff changeset
   671
    make(
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   672
      for {
65561
741b1d3930c0 support for Mercurial manifest check;
wenzelm
parents: 65560
diff changeset
   673
        (select, dir) <- directories(dirs, select_dirs)
65468
c41791ad75c3 early check and normalization of session directory, e.g. relevant for path information passed to ML process, which may have a different CWD;
wenzelm
parents: 65463
diff changeset
   674
        info <- load_dir(select, check_session_dir(dir))
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   675
      } yield info)
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   676
  }
62632
cd991ba01ffd clarified modules;
wenzelm
parents: 62631
diff changeset
   677
cd991ba01ffd clarified modules;
wenzelm
parents: 62631
diff changeset
   678
62637
0189fe0f6452 support for Poly/ML heap hierarchy, which saves a lot of disk space;
wenzelm
parents: 62636
diff changeset
   679
62704
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   680
  /** heap file with SHA1 digest **/
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   681
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   682
  private val sha1_prefix = "SHA1:"
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   683
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   684
  def read_heap_digest(heap: Path): Option[String] =
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   685
  {
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   686
    if (heap.is_file) {
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   687
      val file = FileChannel.open(heap.file.toPath, StandardOpenOption.READ)
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   688
      try {
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   689
        val len = file.size
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   690
        val n = sha1_prefix.length + SHA1.digest_length
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   691
        if (len >= n) {
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   692
          file.position(len - n)
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   693
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   694
          val buf = ByteBuffer.allocate(n)
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   695
          var i = 0
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   696
          var m = 0
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   697
          do {
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   698
            m = file.read(buf)
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   699
            if (m != -1) i += m
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   700
          }
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   701
          while (m != -1 && n > i)
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   702
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   703
          if (i == n) {
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   704
            val prefix = new String(buf.array(), 0, sha1_prefix.length, UTF8.charset)
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   705
            val s = new String(buf.array(), sha1_prefix.length, SHA1.digest_length, UTF8.charset)
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   706
            if (prefix == sha1_prefix) Some(s) else None
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   707
          }
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   708
          else None
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   709
        }
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   710
        else None
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   711
      }
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   712
      finally { file.close }
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   713
    }
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   714
    else None
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   715
  }
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   716
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   717
  def write_heap_digest(heap: Path): String =
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   718
    read_heap_digest(heap) match {
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   719
      case None =>
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   720
        val s = SHA1.digest(heap).rep
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   721
        File.append(heap, sha1_prefix + s)
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   722
        s
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   723
      case Some(s) => s
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   724
    }
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   725
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   726
478b49f0d726 proper SHA1 digest as annex to heap file: Poly/ML reads precise segment length;
wenzelm
parents: 62637
diff changeset
   727
62637
0189fe0f6452 support for Poly/ML heap hierarchy, which saves a lot of disk space;
wenzelm
parents: 62636
diff changeset
   728
  /** persistent store **/
62632
cd991ba01ffd clarified modules;
wenzelm
parents: 62631
diff changeset
   729
65296
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   730
  object Session_Info
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   731
  {
65326
cb7cb57c7ce1 proper primary key;
wenzelm
parents: 65324
diff changeset
   732
    val session_name = SQL.Column.string("session_name", primary_key = true)
cb7cb57c7ce1 proper primary key;
wenzelm
parents: 65324
diff changeset
   733
65296
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   734
    // Build_Log.Session_Info
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   735
    val session_timing = SQL.Column.bytes("session_timing")
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   736
    val command_timings = SQL.Column.bytes("command_timings")
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   737
    val ml_statistics = SQL.Column.bytes("ml_statistics")
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   738
    val task_statistics = SQL.Column.bytes("task_statistics")
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   739
    val build_log_columns =
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   740
      List(session_name, session_timing, command_timings, ml_statistics, task_statistics)
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   741
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   742
    // Build.Session_Info
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   743
    val sources = SQL.Column.string("sources")
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   744
    val input_heaps = SQL.Column.string("input_heaps")
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   745
    val output_heap = SQL.Column.string("output_heap")
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   746
    val return_code = SQL.Column.int("return_code")
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   747
    val build_columns = List(sources, input_heaps, output_heap, return_code)
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   748
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   749
    val table = SQL.Table("isabelle_session_info", build_log_columns ::: build_columns)
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   750
  }
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   751
62632
cd991ba01ffd clarified modules;
wenzelm
parents: 62631
diff changeset
   752
  def store(system_mode: Boolean = false): Store = new Store(system_mode)
cd991ba01ffd clarified modules;
wenzelm
parents: 62631
diff changeset
   753
65592
f45609debe0d clarified modules;
wenzelm
parents: 65580
diff changeset
   754
  class Store private[Sessions](system_mode: Boolean) extends Properties.Store
62632
cd991ba01ffd clarified modules;
wenzelm
parents: 62631
diff changeset
   755
  {
65278
b553d0edc440 tuned signature;
wenzelm
parents: 65269
diff changeset
   756
    /* file names */
b553d0edc440 tuned signature;
wenzelm
parents: 65269
diff changeset
   757
65281
c70e7d24a16d SQL database operations for combined session info;
wenzelm
parents: 65278
diff changeset
   758
    def database(name: String): Path = Path.basic("log") + Path.basic(name).ext("db")
65278
b553d0edc440 tuned signature;
wenzelm
parents: 65269
diff changeset
   759
    def log(name: String): Path = Path.basic("log") + Path.basic(name)
b553d0edc440 tuned signature;
wenzelm
parents: 65269
diff changeset
   760
    def log_gz(name: String): Path = log(name).ext("gz")
b553d0edc440 tuned signature;
wenzelm
parents: 65269
diff changeset
   761
b553d0edc440 tuned signature;
wenzelm
parents: 65269
diff changeset
   762
65286
b661543a0de6 clarified signature;
wenzelm
parents: 65285
diff changeset
   763
    /* SQL database content */
65283
042160aee6c2 data representation with XML.Cache;
wenzelm
parents: 65282
diff changeset
   764
65320
52861eebf58d access table via session_name: db may in principle contain multiple entries;
wenzelm
parents: 65318
diff changeset
   765
    def read_bytes(db: SQL.Database, name: String, column: SQL.Column): Bytes =
65619
e33b3d57b7cb tuned signature;
wenzelm
parents: 65604
diff changeset
   766
      using(db.select(Session_Info.table, List(column),
65604
wenzelm
parents: 65602
diff changeset
   767
        Session_Info.session_name.sql_where_equal(name)))(stmt =>
65291
57c85c83c11b maintain persistent session info in SQLite database instead of log file;
wenzelm
parents: 65288
diff changeset
   768
      {
57c85c83c11b maintain persistent session info in SQLite database instead of log file;
wenzelm
parents: 65288
diff changeset
   769
        val rs = stmt.executeQuery
65324
wenzelm
parents: 65322
diff changeset
   770
        if (!rs.next) Bytes.empty else db.bytes(rs, column)
65291
57c85c83c11b maintain persistent session info in SQLite database instead of log file;
wenzelm
parents: 65288
diff changeset
   771
      })
65285
92bc225c7633 more selective queries;
wenzelm
parents: 65284
diff changeset
   772
65320
52861eebf58d access table via session_name: db may in principle contain multiple entries;
wenzelm
parents: 65318
diff changeset
   773
    def read_properties(db: SQL.Database, name: String, column: SQL.Column): List[Properties.T] =
52861eebf58d access table via session_name: db may in principle contain multiple entries;
wenzelm
parents: 65318
diff changeset
   774
      uncompress_properties(read_bytes(db, name, column))
65286
b661543a0de6 clarified signature;
wenzelm
parents: 65285
diff changeset
   775
65283
042160aee6c2 data representation with XML.Cache;
wenzelm
parents: 65282
diff changeset
   776
62637
0189fe0f6452 support for Poly/ML heap hierarchy, which saves a lot of disk space;
wenzelm
parents: 62636
diff changeset
   777
    /* output */
62632
cd991ba01ffd clarified modules;
wenzelm
parents: 62631
diff changeset
   778
cd991ba01ffd clarified modules;
wenzelm
parents: 62631
diff changeset
   779
    val browser_info: Path =
cd991ba01ffd clarified modules;
wenzelm
parents: 62631
diff changeset
   780
      if (system_mode) Path.explode("~~/browser_info")
cd991ba01ffd clarified modules;
wenzelm
parents: 62631
diff changeset
   781
      else Path.explode("$ISABELLE_BROWSER_INFO")
cd991ba01ffd clarified modules;
wenzelm
parents: 62631
diff changeset
   782
62637
0189fe0f6452 support for Poly/ML heap hierarchy, which saves a lot of disk space;
wenzelm
parents: 62636
diff changeset
   783
    val output_dir: Path =
0189fe0f6452 support for Poly/ML heap hierarchy, which saves a lot of disk space;
wenzelm
parents: 62636
diff changeset
   784
      if (system_mode) Path.explode("~~/heaps/$ML_IDENTIFIER")
0189fe0f6452 support for Poly/ML heap hierarchy, which saves a lot of disk space;
wenzelm
parents: 62636
diff changeset
   785
      else Path.explode("$ISABELLE_OUTPUT")
0189fe0f6452 support for Poly/ML heap hierarchy, which saves a lot of disk space;
wenzelm
parents: 62636
diff changeset
   786
65298
wenzelm
parents: 65297
diff changeset
   787
    override def toString: String = "Store(output_dir = " + output_dir.expand + ")"
wenzelm
parents: 65297
diff changeset
   788
62637
0189fe0f6452 support for Poly/ML heap hierarchy, which saves a lot of disk space;
wenzelm
parents: 62636
diff changeset
   789
    def prepare_output() { Isabelle_System.mkdirs(output_dir + Path.basic("log")) }
0189fe0f6452 support for Poly/ML heap hierarchy, which saves a lot of disk space;
wenzelm
parents: 62636
diff changeset
   790
0189fe0f6452 support for Poly/ML heap hierarchy, which saves a lot of disk space;
wenzelm
parents: 62636
diff changeset
   791
0189fe0f6452 support for Poly/ML heap hierarchy, which saves a lot of disk space;
wenzelm
parents: 62636
diff changeset
   792
    /* input */
0189fe0f6452 support for Poly/ML heap hierarchy, which saves a lot of disk space;
wenzelm
parents: 62636
diff changeset
   793
0189fe0f6452 support for Poly/ML heap hierarchy, which saves a lot of disk space;
wenzelm
parents: 62636
diff changeset
   794
    private val input_dirs =
62632
cd991ba01ffd clarified modules;
wenzelm
parents: 62631
diff changeset
   795
      if (system_mode) List(output_dir)
62633
e57416b649d5 find heaps uniformly via Sessions.Store;
wenzelm
parents: 62632
diff changeset
   796
      else {
e57416b649d5 find heaps uniformly via Sessions.Store;
wenzelm
parents: 62632
diff changeset
   797
        val ml_ident = Path.explode("$ML_IDENTIFIER").expand
e57416b649d5 find heaps uniformly via Sessions.Store;
wenzelm
parents: 62632
diff changeset
   798
        output_dir :: Path.split(Isabelle_System.getenv_strict("ISABELLE_PATH")).map(_ + ml_ident)
e57416b649d5 find heaps uniformly via Sessions.Store;
wenzelm
parents: 62632
diff changeset
   799
      }
62632
cd991ba01ffd clarified modules;
wenzelm
parents: 62631
diff changeset
   800
65291
57c85c83c11b maintain persistent session info in SQLite database instead of log file;
wenzelm
parents: 65288
diff changeset
   801
    def find_database_heap(name: String): Option[(Path, Option[String])] =
57c85c83c11b maintain persistent session info in SQLite database instead of log file;
wenzelm
parents: 65288
diff changeset
   802
      input_dirs.find(dir => (dir + database(name)).is_file).map(dir =>
57c85c83c11b maintain persistent session info in SQLite database instead of log file;
wenzelm
parents: 65288
diff changeset
   803
        (dir + database(name), read_heap_digest(dir + Path.basic(name))))
62632
cd991ba01ffd clarified modules;
wenzelm
parents: 62631
diff changeset
   804
65281
c70e7d24a16d SQL database operations for combined session info;
wenzelm
parents: 65278
diff changeset
   805
    def find_database(name: String): Option[Path] =
c70e7d24a16d SQL database operations for combined session info;
wenzelm
parents: 65278
diff changeset
   806
      input_dirs.map(_ + database(name)).find(_.is_file)
c70e7d24a16d SQL database operations for combined session info;
wenzelm
parents: 65278
diff changeset
   807
62637
0189fe0f6452 support for Poly/ML heap hierarchy, which saves a lot of disk space;
wenzelm
parents: 62636
diff changeset
   808
    def heap(name: String): Path =
65288
wenzelm
parents: 65287
diff changeset
   809
      input_dirs.map(_ + Path.basic(name)).find(_.is_file) getOrElse
62637
0189fe0f6452 support for Poly/ML heap hierarchy, which saves a lot of disk space;
wenzelm
parents: 62636
diff changeset
   810
        error("Unknown logic " + quote(name) + " -- no heap file found in:\n" +
62769
146945b9e83c tuned message;
wenzelm
parents: 62704
diff changeset
   811
          cat_lines(input_dirs.map(dir => "  " + dir.expand.implode)))
65287
75999f2a0c38 tuned message;
wenzelm
parents: 65286
diff changeset
   812
75999f2a0c38 tuned message;
wenzelm
parents: 65286
diff changeset
   813
65296
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   814
    /* session info */
65281
c70e7d24a16d SQL database operations for combined session info;
wenzelm
parents: 65278
diff changeset
   815
65296
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   816
    def write_session_info(
65318
342efc382558 eliminated somewhat redundant inlined name (despite a7aa17a1f721);
wenzelm
parents: 65298
diff changeset
   817
      db: SQL.Database,
65320
52861eebf58d access table via session_name: db may in principle contain multiple entries;
wenzelm
parents: 65318
diff changeset
   818
      name: String,
65318
342efc382558 eliminated somewhat redundant inlined name (despite a7aa17a1f721);
wenzelm
parents: 65298
diff changeset
   819
      build_log: Build_Log.Session_Info,
342efc382558 eliminated somewhat redundant inlined name (despite a7aa17a1f721);
wenzelm
parents: 65298
diff changeset
   820
      build: Build.Session_Info)
65281
c70e7d24a16d SQL database operations for combined session info;
wenzelm
parents: 65278
diff changeset
   821
    {
c70e7d24a16d SQL database operations for combined session info;
wenzelm
parents: 65278
diff changeset
   822
      db.transaction {
65296
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   823
        db.create_table(Session_Info.table)
65619
e33b3d57b7cb tuned signature;
wenzelm
parents: 65604
diff changeset
   824
        using(db.delete(Session_Info.table, Session_Info.session_name.sql_where_equal(name)))(
e33b3d57b7cb tuned signature;
wenzelm
parents: 65604
diff changeset
   825
          _.execute)
e33b3d57b7cb tuned signature;
wenzelm
parents: 65604
diff changeset
   826
        using(db.insert(Session_Info.table))(stmt =>
65281
c70e7d24a16d SQL database operations for combined session info;
wenzelm
parents: 65278
diff changeset
   827
        {
65320
52861eebf58d access table via session_name: db may in principle contain multiple entries;
wenzelm
parents: 65318
diff changeset
   828
          db.set_string(stmt, 1, name)
65296
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   829
          db.set_bytes(stmt, 2, encode_properties(build_log.session_timing))
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   830
          db.set_bytes(stmt, 3, compress_properties(build_log.command_timings))
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   831
          db.set_bytes(stmt, 4, compress_properties(build_log.ml_statistics))
a71db30f3b2d tuned signature;
wenzelm
parents: 65295
diff changeset
   832
          db.set_bytes(stmt, 5, compress_properties(build_log.task_statistics))
65284
d189ff34b5b9 clarified data representation;
wenzelm
parents: 65283
diff changeset
   833
          db.set_string(stmt, 6, cat_lines(build.sources))
d189ff34b5b9 clarified data representation;
wenzelm
parents: 65283
diff changeset
   834
          db.set_string(stmt, 7, cat_lines(build.input_heaps))
65291
57c85c83c11b maintain persistent session info in SQLite database instead of log file;
wenzelm
parents: 65288
diff changeset
   835
          db.set_string(stmt, 8, build.output_heap getOrElse "")
65283
042160aee6c2 data representation with XML.Cache;
wenzelm
parents: 65282
diff changeset
   836
          db.set_int(stmt, 9, build.return_code)
65281
c70e7d24a16d SQL database operations for combined session info;
wenzelm
parents: 65278
diff changeset
   837
          stmt.execute()
c70e7d24a16d SQL database operations for combined session info;
wenzelm
parents: 65278
diff changeset
   838
        })
c70e7d24a16d SQL database operations for combined session info;
wenzelm
parents: 65278
diff changeset
   839
      }
c70e7d24a16d SQL database operations for combined session info;
wenzelm
parents: 65278
diff changeset
   840
    }
c70e7d24a16d SQL database operations for combined session info;
wenzelm
parents: 65278
diff changeset
   841
65320
52861eebf58d access table via session_name: db may in principle contain multiple entries;
wenzelm
parents: 65318
diff changeset
   842
    def read_session_timing(db: SQL.Database, name: String): Properties.T =
52861eebf58d access table via session_name: db may in principle contain multiple entries;
wenzelm
parents: 65318
diff changeset
   843
      decode_properties(read_bytes(db, name, Session_Info.session_timing))
65286
b661543a0de6 clarified signature;
wenzelm
parents: 65285
diff changeset
   844
65320
52861eebf58d access table via session_name: db may in principle contain multiple entries;
wenzelm
parents: 65318
diff changeset
   845
    def read_command_timings(db: SQL.Database, name: String): List[Properties.T] =
52861eebf58d access table via session_name: db may in principle contain multiple entries;
wenzelm
parents: 65318
diff changeset
   846
      read_properties(db, name, Session_Info.command_timings)
65286
b661543a0de6 clarified signature;
wenzelm
parents: 65285
diff changeset
   847
65320
52861eebf58d access table via session_name: db may in principle contain multiple entries;
wenzelm
parents: 65318
diff changeset
   848
    def read_ml_statistics(db: SQL.Database, name: String): List[Properties.T] =
52861eebf58d access table via session_name: db may in principle contain multiple entries;
wenzelm
parents: 65318
diff changeset
   849
      read_properties(db, name, Session_Info.ml_statistics)
65286
b661543a0de6 clarified signature;
wenzelm
parents: 65285
diff changeset
   850
65320
52861eebf58d access table via session_name: db may in principle contain multiple entries;
wenzelm
parents: 65318
diff changeset
   851
    def read_task_statistics(db: SQL.Database, name: String): List[Properties.T] =
52861eebf58d access table via session_name: db may in principle contain multiple entries;
wenzelm
parents: 65318
diff changeset
   852
      read_properties(db, name, Session_Info.task_statistics)
65286
b661543a0de6 clarified signature;
wenzelm
parents: 65285
diff changeset
   853
65320
52861eebf58d access table via session_name: db may in principle contain multiple entries;
wenzelm
parents: 65318
diff changeset
   854
    def read_build_log(db: SQL.Database, name: String,
65291
57c85c83c11b maintain persistent session info in SQLite database instead of log file;
wenzelm
parents: 65288
diff changeset
   855
      command_timings: Boolean = false,
57c85c83c11b maintain persistent session info in SQLite database instead of log file;
wenzelm
parents: 65288
diff changeset
   856
      ml_statistics: Boolean = false,
57c85c83c11b maintain persistent session info in SQLite database instead of log file;
wenzelm
parents: 65288
diff changeset
   857
      task_statistics: Boolean = false): Build_Log.Session_Info =
57c85c83c11b maintain persistent session info in SQLite database instead of log file;
wenzelm
parents: 65288
diff changeset
   858
    {
57c85c83c11b maintain persistent session info in SQLite database instead of log file;
wenzelm
parents: 65288
diff changeset
   859
      Build_Log.Session_Info(
65320
52861eebf58d access table via session_name: db may in principle contain multiple entries;
wenzelm
parents: 65318
diff changeset
   860
        session_timing = read_session_timing(db, name),
52861eebf58d access table via session_name: db may in principle contain multiple entries;
wenzelm
parents: 65318
diff changeset
   861
        command_timings = if (command_timings) read_command_timings(db, name) else Nil,
52861eebf58d access table via session_name: db may in principle contain multiple entries;
wenzelm
parents: 65318
diff changeset
   862
        ml_statistics = if (ml_statistics) read_ml_statistics(db, name) else Nil,
52861eebf58d access table via session_name: db may in principle contain multiple entries;
wenzelm
parents: 65318
diff changeset
   863
        task_statistics = if (task_statistics) read_task_statistics(db, name) else Nil)
65291
57c85c83c11b maintain persistent session info in SQLite database instead of log file;
wenzelm
parents: 65288
diff changeset
   864
    }
65285
92bc225c7633 more selective queries;
wenzelm
parents: 65284
diff changeset
   865
65320
52861eebf58d access table via session_name: db may in principle contain multiple entries;
wenzelm
parents: 65318
diff changeset
   866
    def read_build(db: SQL.Database, name: String): Option[Build.Session_Info] =
65619
e33b3d57b7cb tuned signature;
wenzelm
parents: 65604
diff changeset
   867
      using(db.select(Session_Info.table, Session_Info.build_columns,
65604
wenzelm
parents: 65602
diff changeset
   868
        Session_Info.session_name.sql_where_equal(name)))(stmt =>
65285
92bc225c7633 more selective queries;
wenzelm
parents: 65284
diff changeset
   869
      {
92bc225c7633 more selective queries;
wenzelm
parents: 65284
diff changeset
   870
        val rs = stmt.executeQuery
92bc225c7633 more selective queries;
wenzelm
parents: 65284
diff changeset
   871
        if (!rs.next) None
92bc225c7633 more selective queries;
wenzelm
parents: 65284
diff changeset
   872
        else {
92bc225c7633 more selective queries;
wenzelm
parents: 65284
diff changeset
   873
          Some(
65281
c70e7d24a16d SQL database operations for combined session info;
wenzelm
parents: 65278
diff changeset
   874
            Build.Session_Info(
65324
wenzelm
parents: 65322
diff changeset
   875
              split_lines(db.string(rs, Session_Info.sources)),
wenzelm
parents: 65322
diff changeset
   876
              split_lines(db.string(rs, Session_Info.input_heaps)),
wenzelm
parents: 65322
diff changeset
   877
              db.string(rs, Session_Info.output_heap) match { case "" => None case s => Some(s) },
wenzelm
parents: 65322
diff changeset
   878
              db.int(rs, Session_Info.return_code)))
65281
c70e7d24a16d SQL database operations for combined session info;
wenzelm
parents: 65278
diff changeset
   879
        }
c70e7d24a16d SQL database operations for combined session info;
wenzelm
parents: 65278
diff changeset
   880
      })
c70e7d24a16d SQL database operations for combined session info;
wenzelm
parents: 65278
diff changeset
   881
  }
62631
c39614ddb80b clarified modules;
wenzelm
parents:
diff changeset
   882
}