src/Pure/Tools/build_job.scala
author wenzelm
Sun, 07 Aug 2022 12:22:43 +0200
changeset 75786 ff6c1a82270f
parent 75782 dba571dd0ba9
child 75787 f9fcf06aa2eb
permissions -rw-r--r--
clarified modules;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
     1
/*  Title:      Pure/Tools/build_job.scala
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
     2
    Author:     Makarius
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
     3
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
     4
Build job running prover process, with rudimentary PIDE session.
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
     5
*/
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
     6
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
     7
package isabelle
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
     8
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
     9
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
    10
import scala.collection.mutable
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
    11
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
    12
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
    13
object Build_Job {
75778
d18c96b9b955 prefer Export.Context/Session_Context/Theory_Context over Sessions.Database_Context;
wenzelm
parents: 75762
diff changeset
    14
  /* theory markup/messages from session database */
72854
6c660f05f70c clarified signature;
wenzelm
parents: 72853
diff changeset
    15
75778
d18c96b9b955 prefer Export.Context/Session_Context/Theory_Context over Sessions.Database_Context;
wenzelm
parents: 75762
diff changeset
    16
  def read_theory(
d18c96b9b955 prefer Export.Context/Session_Context/Theory_Context over Sessions.Database_Context;
wenzelm
parents: 75762
diff changeset
    17
    theory_context: Export.Theory_Context,
d18c96b9b955 prefer Export.Context/Session_Context/Theory_Context over Sessions.Database_Context;
wenzelm
parents: 75762
diff changeset
    18
    unicode_symbols: Boolean = false
d18c96b9b955 prefer Export.Context/Session_Context/Theory_Context over Sessions.Database_Context;
wenzelm
parents: 75762
diff changeset
    19
  ): Option[Command] = {
d18c96b9b955 prefer Export.Context/Session_Context/Theory_Context over Sessions.Database_Context;
wenzelm
parents: 75762
diff changeset
    20
    def read(name: String): Export.Entry = theory_context(name, permissive = true)
72848
d5d0e36eda16 read theory with PIDE markup from session database;
wenzelm
parents: 72844
diff changeset
    21
d5d0e36eda16 read theory with PIDE markup from session database;
wenzelm
parents: 72844
diff changeset
    22
    def read_xml(name: String): XML.Body =
73033
d2690444c00a clarified caching;
wenzelm
parents: 73031
diff changeset
    23
      YXML.parse_body(
d2690444c00a clarified caching;
wenzelm
parents: 73031
diff changeset
    24
        Symbol.output(unicode_symbols, UTF8.decode_permissive(read(name).uncompressed)),
75778
d18c96b9b955 prefer Export.Context/Session_Context/Theory_Context over Sessions.Database_Context;
wenzelm
parents: 75762
diff changeset
    25
        cache = theory_context.cache)
72848
d5d0e36eda16 read theory with PIDE markup from session database;
wenzelm
parents: 72844
diff changeset
    26
75733
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    27
    for {
75778
d18c96b9b955 prefer Export.Context/Session_Context/Theory_Context over Sessions.Database_Context;
wenzelm
parents: 75762
diff changeset
    28
      id <- theory_context.document_id()
d18c96b9b955 prefer Export.Context/Session_Context/Theory_Context over Sessions.Database_Context;
wenzelm
parents: 75762
diff changeset
    29
      (thy_file, blobs_files) <- theory_context.files()
75733
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    30
    }
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    31
    yield {
75778
d18c96b9b955 prefer Export.Context/Session_Context/Theory_Context over Sessions.Database_Context;
wenzelm
parents: 75762
diff changeset
    32
      val node_name = Resources.file_node(Path.explode(thy_file), theory = theory_context.theory)
72848
d5d0e36eda16 read theory with PIDE markup from session database;
wenzelm
parents: 72844
diff changeset
    33
75733
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    34
      val results =
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    35
        Command.Results.make(
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    36
          for (elem @ XML.Elem(Markup(_, Markup.Serial(i)), _) <- read_xml(Export.MESSAGES))
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    37
            yield i -> elem)
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    38
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    39
      val blobs =
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    40
        blobs_files.map { file =>
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    41
          val path = Path.explode(file)
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    42
          val name = Resources.file_node(path)
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    43
          val src_path = File.relative_path(node_name.master_dir_path, path).getOrElse(path)
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    44
          Command.Blob(name, src_path, None)
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    45
        }
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    46
      val blobs_xml =
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    47
        for (i <- (1 to blobs.length).toList)
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    48
          yield read_xml(Export.MARKUP + i)
72865
ebf72a3b8daa clarified file sources: take from build database instead of file-system;
wenzelm
parents: 72864
diff changeset
    49
75733
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    50
      val blobs_info =
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    51
        Command.Blobs_Info(
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    52
          for { (Command.Blob(name, src_path, _), xml) <- blobs zip blobs_xml }
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    53
            yield {
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    54
              val text = XML.content(xml)
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    55
              val chunk = Symbol.Text_Chunk(text)
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    56
              val digest = SHA1.digest(Symbol.encode(text))
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    57
              Exn.Res(Command.Blob(name, src_path, Some((digest, chunk))))
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    58
            })
72864
wenzelm
parents: 72863
diff changeset
    59
75733
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    60
      val thy_xml = read_xml(Export.MARKUP)
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    61
      val thy_source = XML.content(thy_xml)
72848
d5d0e36eda16 read theory with PIDE markup from session database;
wenzelm
parents: 72844
diff changeset
    62
75733
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    63
      val markups_index =
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    64
        Command.Markup_Index.markup :: blobs.map(Command.Markup_Index.blob)
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    65
      val markups =
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    66
        Command.Markups.make(
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    67
          for ((index, xml) <- markups_index.zip(thy_xml :: blobs_xml))
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    68
          yield index -> Markup_Tree.from_XML(xml))
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    69
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    70
      Command.unparsed(thy_source, theory = true, id = id, node_name = node_name,
d3430f302c2e clarified signature;
wenzelm
parents: 75454
diff changeset
    71
        blobs_info = blobs_info, results = results, markups = markups)
72848
d5d0e36eda16 read theory with PIDE markup from session database;
wenzelm
parents: 72844
diff changeset
    72
    }
d5d0e36eda16 read theory with PIDE markup from session database;
wenzelm
parents: 72844
diff changeset
    73
  }
72858
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
    74
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
    75
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
    76
  /* print messages */
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
    77
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
    78
  def print_log(
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
    79
    options: Options,
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
    80
    session_name: String,
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
    81
    theories: List[String] = Nil,
72878
80465b791f95 clarified messages;
wenzelm
parents: 72876
diff changeset
    82
    verbose: Boolean = false,
72858
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
    83
    progress: Progress = new Progress,
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
    84
    margin: Double = Pretty.default_margin,
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
    85
    breakgain: Double = Pretty.default_breakgain,
72873
0ad513706a27 clarified Pretty.Metric, as for build errors;
wenzelm
parents: 72871
diff changeset
    86
    metric: Pretty.Metric = Symbol.Metric,
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
    87
    unicode_symbols: Boolean = false
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
    88
  ): Unit = {
72858
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
    89
    val store = Sessions.store(options)
74755
510296c0d8d1 clarified signature: avoid potential misunderstanding of Resources.empty as proper Resources;
wenzelm
parents: 74731
diff changeset
    90
    val session = new Session(options, Resources.empty)
72858
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
    91
75779
5470c67bd772 clarified signature: prefer Export.Session_Context;
wenzelm
parents: 75778
diff changeset
    92
    using(Export.open_session_context0(store, session_name)) { session_context =>
72858
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
    93
      val result =
75780
f49c4f160b84 clarified signature: find session_database within Session_Context.db_hierarchy;
wenzelm
parents: 75779
diff changeset
    94
        for {
f49c4f160b84 clarified signature: find session_database within Session_Context.db_hierarchy;
wenzelm
parents: 75779
diff changeset
    95
          db <- session_context.session_db()
f49c4f160b84 clarified signature: find session_database within Session_Context.db_hierarchy;
wenzelm
parents: 75779
diff changeset
    96
          theories = store.read_theories(db, session_name)
f49c4f160b84 clarified signature: find session_database within Session_Context.db_hierarchy;
wenzelm
parents: 75779
diff changeset
    97
          errors = store.read_errors(db, session_name)
f49c4f160b84 clarified signature: find session_database within Session_Context.db_hierarchy;
wenzelm
parents: 75779
diff changeset
    98
          info <- store.read_build(db, session_name)
f49c4f160b84 clarified signature: find session_database within Session_Context.db_hierarchy;
wenzelm
parents: 75779
diff changeset
    99
        } yield (theories, errors, info.return_code)
72858
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   100
      result match {
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   101
        case None => error("Missing build database for session " + quote(session_name))
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   102
        case Some((used_theories, errors, rc)) =>
73835
5dae03d50db1 more formal ML profiling messages;
wenzelm
parents: 73805
diff changeset
   103
          theories.filterNot(used_theories.toSet) match {
5dae03d50db1 more formal ML profiling messages;
wenzelm
parents: 73805
diff changeset
   104
            case Nil =>
5dae03d50db1 more formal ML profiling messages;
wenzelm
parents: 73805
diff changeset
   105
            case bad => error("Unknown theories " + commas_quote(bad))
5dae03d50db1 more formal ML profiling messages;
wenzelm
parents: 73805
diff changeset
   106
          }
72858
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   107
          val print_theories =
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   108
            if (theories.isEmpty) used_theories else used_theories.filter(theories.toSet)
75778
d18c96b9b955 prefer Export.Context/Session_Context/Theory_Context over Sessions.Database_Context;
wenzelm
parents: 75762
diff changeset
   109
72858
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   110
          for (thy <- print_theories) {
72868
90e28f005be9 tuned messages;
wenzelm
parents: 72867
diff changeset
   111
            val thy_heading = "\nTheory " + quote(thy) + ":"
75778
d18c96b9b955 prefer Export.Context/Session_Context/Theory_Context over Sessions.Database_Context;
wenzelm
parents: 75762
diff changeset
   112
75779
5470c67bd772 clarified signature: prefer Export.Session_Context;
wenzelm
parents: 75778
diff changeset
   113
            read_theory(session_context.theory(thy), unicode_symbols = unicode_symbols) match {
72863
a261946dafa3 tuned messages;
wenzelm
parents: 72859
diff changeset
   114
              case None => progress.echo(thy_heading + " MISSING")
72858
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   115
              case Some(command) =>
72958
0d8bc0252e2e tuned signature;
wenzelm
parents: 72882
diff changeset
   116
                val snapshot = Document.State.init.snippet(command)
72858
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   117
                val rendering = new Rendering(snapshot, options, session)
72878
80465b791f95 clarified messages;
wenzelm
parents: 72876
diff changeset
   118
                val messages =
80465b791f95 clarified messages;
wenzelm
parents: 72876
diff changeset
   119
                  rendering.text_messages(Text.Range.full)
80465b791f95 clarified messages;
wenzelm
parents: 72876
diff changeset
   120
                    .filter(message => verbose || Protocol.is_exported(message.info))
72863
a261946dafa3 tuned messages;
wenzelm
parents: 72859
diff changeset
   121
                if (messages.nonEmpty) {
72875
847c6fb05a21 clarified messages;
wenzelm
parents: 72874
diff changeset
   122
                  val line_document = Line.Document(command.source)
72863
a261946dafa3 tuned messages;
wenzelm
parents: 72859
diff changeset
   123
                  progress.echo(thy_heading)
72875
847c6fb05a21 clarified messages;
wenzelm
parents: 72874
diff changeset
   124
                  for (Text.Info(range, elem) <- messages) {
847c6fb05a21 clarified messages;
wenzelm
parents: 72874
diff changeset
   125
                    val line = line_document.position(range.start).line1
847c6fb05a21 clarified messages;
wenzelm
parents: 72874
diff changeset
   126
                    val pos = Position.Line_File(line, command.node_name.node)
72863
a261946dafa3 tuned messages;
wenzelm
parents: 72859
diff changeset
   127
                    progress.echo(
72875
847c6fb05a21 clarified messages;
wenzelm
parents: 72874
diff changeset
   128
                      Protocol.message_text(elem, heading = true, pos = pos,
847c6fb05a21 clarified messages;
wenzelm
parents: 72874
diff changeset
   129
                        margin = margin, breakgain = breakgain, metric = metric))
72863
a261946dafa3 tuned messages;
wenzelm
parents: 72859
diff changeset
   130
                  }
72858
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   131
                }
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   132
            }
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   133
          }
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   134
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   135
          if (errors.nonEmpty) {
72867
7b10b40b1273 clarified output of Isabelle symbols;
wenzelm
parents: 72865
diff changeset
   136
            val msg = Symbol.output(unicode_symbols, cat_lines(errors))
72868
90e28f005be9 tuned messages;
wenzelm
parents: 72867
diff changeset
   137
            progress.echo("\nBuild errors:\n" + Output.error_message_text(msg))
72858
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   138
          }
74306
a117c076aa22 clarified signature;
wenzelm
parents: 74259
diff changeset
   139
          if (rc != Process_Result.RC.ok) {
a117c076aa22 clarified signature;
wenzelm
parents: 74259
diff changeset
   140
            progress.echo("\n" + Process_Result.RC.print_long(rc))
a117c076aa22 clarified signature;
wenzelm
parents: 74259
diff changeset
   141
          }
72858
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   142
      }
75394
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   143
    }
72858
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   144
  }
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   145
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   146
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   147
  /* Isabelle tool wrapper */
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   148
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   149
  val isabelle_tool = Isabelle_Tool("log", "print messages from build database",
75394
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   150
    Scala_Project.here,
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   151
    { args =>
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   152
      /* arguments */
72858
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   153
75394
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   154
      var unicode_symbols = false
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   155
      var theories: List[String] = Nil
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   156
      var margin = Pretty.default_margin
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   157
      var options = Options.init()
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   158
      var verbose = false
72858
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   159
75394
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   160
      val getopts = Getopts("""
72858
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   161
Usage: isabelle log [OPTIONS] SESSION
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   162
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   163
  Options are:
72876
626fcaebd049 NEWS and documentation for "isabelle log";
wenzelm
parents: 72875
diff changeset
   164
    -T NAME      restrict to given theories (multiple options possible)
72867
7b10b40b1273 clarified output of Isabelle symbols;
wenzelm
parents: 72865
diff changeset
   165
    -U           output Unicode symbols
72858
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   166
    -m MARGIN    margin for pretty printing (default: """ + margin + """)
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   167
    -o OPTION    override Isabelle system OPTION (via NAME=VAL or NAME)
73837
f72335f6a9ed clarified documentation: tracing messages are not shown here;
wenzelm
parents: 73835
diff changeset
   168
    -v           print all messages, including information etc.
72858
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   169
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   170
  Print messages from the build database of the given session, without any
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   171
  checks against current sources: results from a failed build can be
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   172
  printed as well.
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   173
""",
75394
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   174
        "T:" -> (arg => theories = theories ::: List(arg)),
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   175
        "U" -> (_ => unicode_symbols = true),
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   176
        "m:" -> (arg => margin = Value.Double.parse(arg)),
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   177
        "o:" -> (arg => options = options + arg),
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   178
        "v" -> (_ => verbose = true))
72858
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   179
75394
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   180
      val more_args = getopts(args)
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   181
      val session_name =
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   182
        more_args match {
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   183
          case List(session_name) => session_name
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   184
          case _ => getopts.usage()
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   185
        }
72858
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   186
75394
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   187
      val progress = new Console_Progress()
72858
cb0c407fbc6e added "isabelle log": print messages from build database;
wenzelm
parents: 72857
diff changeset
   188
75394
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   189
      print_log(options, session_name, theories = theories, verbose = verbose, margin = margin,
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   190
        progress = progress, unicode_symbols = unicode_symbols)
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   191
    })
72848
d5d0e36eda16 read theory with PIDE markup from session database;
wenzelm
parents: 72844
diff changeset
   192
}
d5d0e36eda16 read theory with PIDE markup from session database;
wenzelm
parents: 72844
diff changeset
   193
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   194
class Build_Job(progress: Progress,
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   195
  session_name: String,
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   196
  val info: Sessions.Info,
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   197
  deps: Sessions.Deps,
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   198
  store: Sessions.Store,
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   199
  do_store: Boolean,
73777
52e43a93d51f clarified system_log: make this work independently of the particular "isabelle build" command-line (e.g. "isabelle mirabelle");
wenzelm
parents: 73774
diff changeset
   200
  log: Logger,
73805
b73777a0c076 allow build session setup, e.g. for protocol handlers;
wenzelm
parents: 73804
diff changeset
   201
  session_setup: (String, Session) => Unit,
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   202
  val numa_node: Option[Int],
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   203
  command_timings0: List[Properties.T]
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   204
) {
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   205
  val options: Options = NUMA.policy_options(info.options, numa_node)
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   206
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   207
  private val sessions_structure = deps.sessions_structure
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   208
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   209
  private val future_result: Future[Process_Result] =
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   210
    Future.thread("build", uninterruptible = true) {
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   211
      val parent = info.parent.getOrElse("")
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   212
      val base = deps(parent)
72816
ea4f86914cb2 support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents: 72783
diff changeset
   213
      val result_base = deps(session_name)
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   214
75454
295e1c9d2994 tuned signature;
wenzelm
parents: 75440
diff changeset
   215
      val env =
295e1c9d2994 tuned signature;
wenzelm
parents: 75440
diff changeset
   216
        Isabelle_System.settings(
295e1c9d2994 tuned signature;
wenzelm
parents: 75440
diff changeset
   217
          List("ISABELLE_ML_DEBUGGER" -> options.bool("ML_debugger").toString))
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   218
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   219
      val is_pure = Sessions.is_pure(session_name)
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   220
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   221
      val use_prelude = if (is_pure) Thy_Header.ml_roots.map(_._1) else Nil
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   222
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   223
      val eval_store =
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   224
        if (do_store) {
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   225
          (if (info.theories.nonEmpty) List("ML_Heap.share_common_data ()") else Nil) :::
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   226
          List("ML_Heap.save_child " +
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   227
            ML_Syntax.print_string_bytes(File.platform_path(store.output_heap(session_name))))
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   228
        }
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   229
        else Nil
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   230
73774
734d5d3fbd9d syslog option for "isabelle build";
wenzelm
parents: 73719
diff changeset
   231
      val resources =
734d5d3fbd9d syslog option for "isabelle build";
wenzelm
parents: 73719
diff changeset
   232
        new Resources(sessions_structure, base, log = log, command_timings = command_timings0)
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   233
      val session =
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   234
        new Session(options, resources) {
74731
161e84e6b40a just one cache, via HTML_Context, via Sessions.Store or Session;
wenzelm
parents: 74712
diff changeset
   235
          override val cache: Term.Cache = store.cache
72816
ea4f86914cb2 support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents: 72783
diff changeset
   236
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   237
          override def build_blobs_info(name: Document.Node.Name): Command.Blobs_Info = {
72816
ea4f86914cb2 support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents: 72783
diff changeset
   238
            result_base.load_commands.get(name.expand) match {
ea4f86914cb2 support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents: 72783
diff changeset
   239
              case Some(spans) =>
ea4f86914cb2 support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents: 72783
diff changeset
   240
                val syntax = result_base.theory_syntax(name)
ea4f86914cb2 support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents: 72783
diff changeset
   241
                Command.build_blobs_info(syntax, name, spans)
ea4f86914cb2 support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents: 72783
diff changeset
   242
              case None => Command.Blobs_Info.none
ea4f86914cb2 support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents: 72783
diff changeset
   243
            }
ea4f86914cb2 support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents: 72783
diff changeset
   244
          }
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   245
        }
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   246
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   247
      object Build_Session_Errors {
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   248
        private val promise: Promise[List[String]] = Future.promise
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   249
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   250
        def result: Exn.Result[List[String]] = promise.join_result
73367
77ef8bef0593 clarified signature --- fewer warnings;
wenzelm
parents: 73340
diff changeset
   251
        def cancel(): Unit = promise.cancel()
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   252
        def apply(errs: List[String]): Unit = {
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   253
          try { promise.fulfill(errs) }
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   254
          catch { case _: IllegalStateException => }
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   255
        }
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   256
      }
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   257
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   258
      val export_consumer =
74255
e117e0c29204 more reactive interrupt;
wenzelm
parents: 74144
diff changeset
   259
        Export.consumer(store.open_database(session_name, output = true), store.cache,
e117e0c29204 more reactive interrupt;
wenzelm
parents: 74144
diff changeset
   260
          progress = progress)
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   261
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   262
      val stdout = new StringBuilder(1000)
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   263
      val stderr = new StringBuilder(1000)
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   264
      val command_timings = new mutable.ListBuffer[Properties.T]
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   265
      val theory_timings = new mutable.ListBuffer[Properties.T]
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   266
      val session_timings = new mutable.ListBuffer[Properties.T]
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   267
      val runtime_statistics = new mutable.ListBuffer[Properties.T]
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   268
      val task_statistics = new mutable.ListBuffer[Properties.T]
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   269
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   270
      def fun(
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   271
        name: String,
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   272
        acc: mutable.ListBuffer[Properties.T],
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   273
        unapply: Properties.T => Option[Properties.T]
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   274
      ): (String, Session.Protocol_Function) = {
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   275
        name -> ((msg: Prover.Protocol_Output) =>
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   276
          unapply(msg.properties) match {
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   277
            case Some(props) => acc += props; true
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   278
            case _ => false
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   279
          })
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   280
      }
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   281
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   282
      session.init_protocol_handler(new Session.Protocol_Handler {
73367
77ef8bef0593 clarified signature --- fewer warnings;
wenzelm
parents: 73340
diff changeset
   283
          override def exit(): Unit = Build_Session_Errors.cancel()
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   284
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   285
          private def build_session_finished(msg: Prover.Protocol_Output): Boolean = {
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   286
            val (rc, errors) =
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   287
              try {
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   288
                val (rc, errs) = {
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   289
                  import XML.Decode._
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   290
                  pair(int, list(x => x))(Symbol.decode_yxml(msg.text))
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   291
                }
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   292
                val errors =
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   293
                  for (err <- errs) yield {
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   294
                    val prt = Protocol_Message.expose_no_reports(err)
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   295
                    Pretty.string_of(prt, metric = Symbol.Metric)
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   296
                  }
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   297
                (rc, errors)
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   298
              }
74306
a117c076aa22 clarified signature;
wenzelm
parents: 74259
diff changeset
   299
              catch { case ERROR(err) => (Process_Result.RC.failure, List(err)) }
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   300
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   301
            session.protocol_command("Prover.stop", rc.toString)
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   302
            Build_Session_Errors(errors)
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   303
            true
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   304
          }
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   305
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   306
          private def loading_theory(msg: Prover.Protocol_Output): Boolean =
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   307
            msg.properties match {
72692
22aeec526ffd support for PIDE markup in batch build (inactive due to pide_reports=false);
wenzelm
parents: 72683
diff changeset
   308
              case Markup.Loading_Theory(Markup.Name(name)) =>
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   309
                progress.theory(Progress.Theory(name, session = session_name))
72692
22aeec526ffd support for PIDE markup in batch build (inactive due to pide_reports=false);
wenzelm
parents: 72683
diff changeset
   310
                false
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   311
              case _ => false
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   312
            }
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   313
74685
0ab5e35ac964 avoid conflict with future keyword;
wenzelm
parents: 74657
diff changeset
   314
          private def export_(msg: Prover.Protocol_Output): Boolean =
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   315
            msg.properties match {
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   316
              case Protocol.Export(args) =>
75762
985c3a64748c clarified signature: more uniform treatment of empty exports;
wenzelm
parents: 75738
diff changeset
   317
                export_consumer.make_entry(session_name, args, msg.chunk)
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   318
                true
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   319
              case _ => false
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   320
            }
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   321
75440
39011d0d2128 tuned signature;
wenzelm
parents: 75438
diff changeset
   322
          override val functions: Session.Protocol_Functions =
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   323
            List(
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   324
              Markup.Build_Session_Finished.name -> build_session_finished,
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   325
              Markup.Loading_Theory.name -> loading_theory,
74685
0ab5e35ac964 avoid conflict with future keyword;
wenzelm
parents: 74657
diff changeset
   326
              Markup.EXPORT -> export_,
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   327
              fun(Markup.Theory_Timing.name, theory_timings, Markup.Theory_Timing.unapply),
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   328
              fun(Markup.Session_Timing.name, session_timings, Markup.Session_Timing.unapply),
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   329
              fun(Markup.Task_Statistics.name, task_statistics, Markup.Task_Statistics.unapply))
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   330
        })
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   331
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   332
      session.command_timings += Session.Consumer("command_timings") {
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   333
        case Session.Command_Timing(props) =>
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   334
          for {
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   335
            elapsed <- Markup.Elapsed.unapply(props)
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   336
            elapsed_time = Time.seconds(elapsed)
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   337
            if elapsed_time.is_relevant && elapsed_time >= options.seconds("command_timing_threshold")
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   338
          } command_timings += props.filter(Markup.command_timing_property)
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   339
      }
72711
9e89c2e15d36 clarified command_timings protocol;
wenzelm
parents: 72701
diff changeset
   340
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   341
      session.runtime_statistics += Session.Consumer("ML_statistics") {
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   342
        case Session.Runtime_Statistics(props) => runtime_statistics += props
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   343
      }
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   344
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   345
      session.finished_theories += Session.Consumer[Document.Snapshot]("finished_theories") {
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   346
        case snapshot =>
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   347
          if (!progress.stopped) {
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   348
            val rendering = new Rendering(snapshot, options, session)
72730
01c9b3033036 more exports from rendering;
wenzelm
parents: 72726
diff changeset
   349
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   350
            def export_(name: String, xml: XML.Body, compress: Boolean = true): Unit = {
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   351
              if (!progress.stopped) {
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   352
                val theory_name = snapshot.node_name.theory
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   353
                val args =
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   354
                  Protocol.Export.Args(theory_name = theory_name, name = name, compress = compress)
75762
985c3a64748c clarified signature: more uniform treatment of empty exports;
wenzelm
parents: 75738
diff changeset
   355
                val body = Bytes(Symbol.encode(YXML.string_of_body(xml)))
985c3a64748c clarified signature: more uniform treatment of empty exports;
wenzelm
parents: 75738
diff changeset
   356
                export_consumer.make_entry(session_name, args, body)
74258
e942eedd9229 more reactive interrupt;
wenzelm
parents: 74255
diff changeset
   357
              }
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   358
            }
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   359
            def export_text(name: String, text: String, compress: Boolean = true): Unit =
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   360
              export_(name, List(XML.Text(text)), compress = compress)
72730
01c9b3033036 more exports from rendering;
wenzelm
parents: 72726
diff changeset
   361
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   362
            for (command <- snapshot.snippet_command) {
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   363
              export_text(Export.DOCUMENT_ID, command.id.toString, compress = false)
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   364
            }
72844
240c8a0f6337 clarified exports;
wenzelm
parents: 72817
diff changeset
   365
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   366
            export_text(Export.FILES,
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   367
              cat_lines(snapshot.node_files.map(_.symbolic.node)), compress = false)
72816
ea4f86914cb2 support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents: 72783
diff changeset
   368
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   369
            for (((_, xml), i) <- snapshot.xml_markup_blobs().zipWithIndex) {
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   370
              export_(Export.MARKUP + (i + 1), xml)
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   371
            }
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   372
            export_(Export.MARKUP, snapshot.xml_markup())
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   373
            export_(Export.MESSAGES, snapshot.messages.map(_._1))
74258
e942eedd9229 more reactive interrupt;
wenzelm
parents: 74255
diff changeset
   374
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   375
            val citations = Library.distinct(rendering.citations(Text.Range.full).map(_.info))
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   376
            export_text(Export.DOCUMENT_CITATIONS, cat_lines(citations))
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   377
          }
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   378
      }
72692
22aeec526ffd support for PIDE markup in batch build (inactive due to pide_reports=false);
wenzelm
parents: 72683
diff changeset
   379
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   380
      session.all_messages += Session.Consumer[Any]("build_session_output") {
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   381
        case msg: Prover.Output =>
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   382
          val message = msg.message
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   383
          if (msg.is_system) resources.log(Protocol.message_text(message))
73774
734d5d3fbd9d syslog option for "isabelle build";
wenzelm
parents: 73719
diff changeset
   384
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   385
          if (msg.is_stdout) {
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   386
            stdout ++= Symbol.encode(XML.content(message))
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   387
          }
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   388
          else if (msg.is_stderr) {
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   389
            stderr ++= Symbol.encode(XML.content(message))
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   390
          }
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   391
          else if (msg.is_exit) {
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   392
            val err =
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   393
              "Prover terminated" +
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   394
                (msg.properties match {
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   395
                  case Markup.Process_Result(result) => ": " + result.print_rc
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   396
                  case _ => ""
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   397
                })
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   398
            Build_Session_Errors(List(err))
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   399
          }
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   400
        case _ =>
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   401
      }
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   402
73805
b73777a0c076 allow build session setup, e.g. for protocol handlers;
wenzelm
parents: 73804
diff changeset
   403
      session_setup(session_name, session)
b73777a0c076 allow build session setup, e.g. for protocol handlers;
wenzelm
parents: 73804
diff changeset
   404
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   405
      val eval_main = Command_Line.ML_tool("Isabelle_Process.init_build ()" :: eval_store)
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   406
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   407
      val process =
73802
8d9ac6cfc270 clarified signature;
wenzelm
parents: 73785
diff changeset
   408
        Isabelle_Process.start(session, options, sessions_structure, store,
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   409
          logic = parent, raw_ml_system = is_pure,
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   410
          use_prelude = use_prelude, eval_main = eval_main,
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   411
          cwd = info.dir.file, env = env)
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   412
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   413
      val build_errors =
73367
77ef8bef0593 clarified signature --- fewer warnings;
wenzelm
parents: 73340
diff changeset
   414
        Isabelle_Thread.interrupt_handler(_ => process.terminate()) {
77ef8bef0593 clarified signature --- fewer warnings;
wenzelm
parents: 73340
diff changeset
   415
          Exn.capture { process.await_startup() } match {
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   416
            case Exn.Res(_) =>
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   417
              val resources_yxml = resources.init_session_yxml
74144
f9f6a31cc99c proper prover_options for batch-build;
wenzelm
parents: 74067
diff changeset
   418
              val encode_options: XML.Encode.T[Options] =
f9f6a31cc99c proper prover_options for batch-build;
wenzelm
parents: 74067
diff changeset
   419
                options => session.prover_options(options).encode
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   420
              val args_yxml =
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   421
                YXML.string_of_body(
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   422
                  {
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   423
                    import XML.Encode._
74144
f9f6a31cc99c proper prover_options for batch-build;
wenzelm
parents: 74067
diff changeset
   424
                    pair(string, list(pair(encode_options, list(pair(string, properties)))))(
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   425
                      (session_name, info.theories))
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   426
                  })
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   427
              session.protocol_command("build_session", resources_yxml, args_yxml)
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   428
              Build_Session_Errors.result
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   429
            case Exn.Exn(exn) => Exn.Res(List(Exn.message(exn)))
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   430
          }
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   431
        }
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   432
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   433
      val process_result =
73367
77ef8bef0593 clarified signature --- fewer warnings;
wenzelm
parents: 73340
diff changeset
   434
        Isabelle_Thread.interrupt_handler(_ => process.terminate()) { process.await_shutdown() }
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   435
72697
e16f85e3c288 more robust;
wenzelm
parents: 72696
diff changeset
   436
      session.stop()
e16f85e3c288 more robust;
wenzelm
parents: 72696
diff changeset
   437
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   438
      val export_errors =
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   439
        export_consumer.shutdown(close = true).map(Output.error_message_text)
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   440
72699
ed59a506998f clarified document_output vs. progress;
wenzelm
parents: 72697
diff changeset
   441
      val (document_output, document_errors) =
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   442
        try {
72881
220a094a42d8 proper else statement;
wenzelm
parents: 72879
diff changeset
   443
          if (build_errors.isInstanceOf[Exn.Res[_]] && process_result.ok && info.documents.nonEmpty) {
75786
ff6c1a82270f clarified modules;
wenzelm
parents: 75782
diff changeset
   444
            using(Export.open_database_context(store)) { database_context =>
75394
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   445
              val documents =
75786
ff6c1a82270f clarified modules;
wenzelm
parents: 75782
diff changeset
   446
                using(database_context.open_session(deps.base_info(session_name))) {
75782
dba571dd0ba9 clarified signature: prefer Export.Session_Context over Sessions.Database_Context;
wenzelm
parents: 75780
diff changeset
   447
                  session_context =>
dba571dd0ba9 clarified signature: prefer Export.Session_Context over Sessions.Database_Context;
wenzelm
parents: 75780
diff changeset
   448
                    Document_Build.build_documents(
dba571dd0ba9 clarified signature: prefer Export.Session_Context over Sessions.Database_Context;
wenzelm
parents: 75780
diff changeset
   449
                      Document_Build.context(session_context, progress = progress),
dba571dd0ba9 clarified signature: prefer Export.Session_Context over Sessions.Database_Context;
wenzelm
parents: 75780
diff changeset
   450
                      output_sources = info.document_output,
dba571dd0ba9 clarified signature: prefer Export.Session_Context over Sessions.Database_Context;
wenzelm
parents: 75780
diff changeset
   451
                      output_pdf = info.document_output)
dba571dd0ba9 clarified signature: prefer Export.Session_Context over Sessions.Database_Context;
wenzelm
parents: 75780
diff changeset
   452
                }
75786
ff6c1a82270f clarified modules;
wenzelm
parents: 75782
diff changeset
   453
              database_context.database_output(session_name)(db =>
75394
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   454
                documents.foreach(_.write(db, session_name)))
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   455
              (documents.flatMap(_.log_lines), Nil)
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   456
            }
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   457
          }
72881
220a094a42d8 proper else statement;
wenzelm
parents: 72879
diff changeset
   458
          else (Nil, Nil)
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   459
        }
72882
1dc2ad97e062 more informative error;
wenzelm
parents: 72881
diff changeset
   460
        catch {
73718
ecb31c3bf980 clarified modules;
wenzelm
parents: 73700
diff changeset
   461
          case exn: Document_Build.Build_Error => (exn.log_lines, List(exn.message))
72882
1dc2ad97e062 more informative error;
wenzelm
parents: 72881
diff changeset
   462
          case Exn.Interrupt.ERROR(msg) => (Nil, List(msg))
1dc2ad97e062 more informative error;
wenzelm
parents: 72881
diff changeset
   463
        }
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   464
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   465
      val result = {
72738
a4d7da18ac5c store timings for used_theories in canonical order, with reconstructed store.read_theories;
wenzelm
parents: 72730
diff changeset
   466
        val theory_timing =
75438
wenzelm
parents: 75425
diff changeset
   467
          theory_timings.iterator.flatMap(
75425
b958e053d993 avoid pattern-match warnings, notably in scala3;
wenzelm
parents: 75394
diff changeset
   468
            {
75438
wenzelm
parents: 75425
diff changeset
   469
              case props @ Markup.Name(name) => Some(name -> props)
wenzelm
parents: 75425
diff changeset
   470
              case _ => None
75425
b958e053d993 avoid pattern-match warnings, notably in scala3;
wenzelm
parents: 75394
diff changeset
   471
            }).toMap
72738
a4d7da18ac5c store timings for used_theories in canonical order, with reconstructed store.read_theories;
wenzelm
parents: 72730
diff changeset
   472
        val used_theory_timings =
a4d7da18ac5c store timings for used_theories in canonical order, with reconstructed store.read_theories;
wenzelm
parents: 72730
diff changeset
   473
          for { (name, _) <- deps(session_name).used_theories }
a4d7da18ac5c store timings for used_theories in canonical order, with reconstructed store.read_theories;
wenzelm
parents: 72730
diff changeset
   474
            yield theory_timing.getOrElse(name.theory, Markup.Name(name.theory))
a4d7da18ac5c store timings for used_theories in canonical order, with reconstructed store.read_theories;
wenzelm
parents: 72730
diff changeset
   475
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   476
        val more_output =
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   477
          Library.trim_line(stdout.toString) ::
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   478
            command_timings.toList.map(Protocol.Command_Timing_Marker.apply) :::
72738
a4d7da18ac5c store timings for used_theories in canonical order, with reconstructed store.read_theories;
wenzelm
parents: 72730
diff changeset
   479
            used_theory_timings.map(Protocol.Theory_Timing_Marker.apply) :::
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   480
            session_timings.toList.map(Protocol.Session_Timing_Marker.apply) :::
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   481
            runtime_statistics.toList.map(Protocol.ML_Statistics_Marker.apply) :::
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   482
            task_statistics.toList.map(Protocol.Task_Statistics_Marker.apply) :::
72699
ed59a506998f clarified document_output vs. progress;
wenzelm
parents: 72697
diff changeset
   483
            document_output
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   484
72726
ec6a27bbdab8 proper return code for more errors (amending d892f6d66402);
wenzelm
parents: 72725
diff changeset
   485
        process_result.output(more_output)
ec6a27bbdab8 proper return code for more errors (amending d892f6d66402);
wenzelm
parents: 72725
diff changeset
   486
          .error(Library.trim_line(stderr.toString))
ec6a27bbdab8 proper return code for more errors (amending d892f6d66402);
wenzelm
parents: 72725
diff changeset
   487
          .errors_rc(export_errors ::: document_errors)
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   488
      }
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   489
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   490
      build_errors match {
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   491
        case Exn.Res(build_errs) =>
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   492
          val errs = build_errs ::: document_errors
74259
6d48d6ba58df more robust: progress.stopped means that build has failed;
wenzelm
parents: 74258
diff changeset
   493
          if (errs.nonEmpty) {
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   494
            result.error_rc.output(
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   495
              errs.flatMap(s => split_lines(Output.error_message_text(s))) :::
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   496
                errs.map(Protocol.Error_Message_Marker.apply))
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   497
          }
74306
a117c076aa22 clarified signature;
wenzelm
parents: 74259
diff changeset
   498
          else if (progress.stopped && result.ok) result.copy(rc = Process_Result.RC.interrupt)
74259
6d48d6ba58df more robust: progress.stopped means that build has failed;
wenzelm
parents: 74258
diff changeset
   499
          else result
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   500
        case Exn.Exn(Exn.Interrupt()) =>
74306
a117c076aa22 clarified signature;
wenzelm
parents: 74259
diff changeset
   501
          if (result.ok) result.copy(rc = Process_Result.RC.interrupt)
74259
6d48d6ba58df more robust: progress.stopped means that build has failed;
wenzelm
parents: 74258
diff changeset
   502
          else result
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   503
        case Exn.Exn(exn) => throw exn
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   504
      }
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   505
    }
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   506
73367
77ef8bef0593 clarified signature --- fewer warnings;
wenzelm
parents: 73340
diff changeset
   507
  def terminate(): Unit = future_result.cancel()
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   508
  def is_finished: Boolean = future_result.is_finished
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   509
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   510
  private val timeout_request: Option[Event_Timer.Request] = {
73700
908351c8c0b1 check timeout_ignored as in ML, before applying timeout_scale;
wenzelm
parents: 73559
diff changeset
   511
    if (info.timeout_ignored) None
908351c8c0b1 check timeout_ignored as in ML, before applying timeout_scale;
wenzelm
parents: 73559
diff changeset
   512
    else Some(Event_Timer.request(Time.now() + info.timeout) { terminate() })
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   513
  }
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   514
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 74755
diff changeset
   515
  def join: (Process_Result, Option[String]) = {
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   516
    val result1 = future_result.join
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   517
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   518
    val was_timeout =
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   519
      timeout_request match {
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   520
        case None => false
73367
77ef8bef0593 clarified signature --- fewer warnings;
wenzelm
parents: 73340
diff changeset
   521
        case Some(request) => !request.cancel()
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   522
      }
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   523
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   524
    val result2 =
73134
8a8ffe78eee7 clarified return code: re-use SIGALRM for soft timeout;
wenzelm
parents: 73033
diff changeset
   525
      if (result1.ok) result1
8a8ffe78eee7 clarified return code: re-use SIGALRM for soft timeout;
wenzelm
parents: 73033
diff changeset
   526
      else if (was_timeout) result1.error(Output.error_message_text("Timeout")).timeout_rc
8a8ffe78eee7 clarified return code: re-use SIGALRM for soft timeout;
wenzelm
parents: 73033
diff changeset
   527
      else if (result1.interrupted) result1.error(Output.error_message_text("Interrupt"))
72662
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   528
      else result1
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   529
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   530
    val heap_digest =
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   531
      if (result2.ok && do_store && store.output_heap(session_name).is_file)
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   532
        Some(Sessions.write_heap_digest(store.output_heap(session_name)))
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   533
      else None
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   534
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   535
    (result2, heap_digest)
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   536
  }
5c08ad7adf77 clarified modules;
wenzelm
parents:
diff changeset
   537
}