src/Pure/PIDE/document.scala
author wenzelm
Fri, 06 Jan 2023 14:59:59 +0100
changeset 76931 cca0b48ca891
parent 76924 fc24cf493202
child 76932 f88c239d1a83
permissions -rw-r--r--
unused;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
36676
ac7961d42ac3 some rearrangement of Scala sources;
wenzelm
parents: 36012
diff changeset
     1
/*  Title:      Pure/PIDE/document.scala
ac7961d42ac3 some rearrangement of Scala sources;
wenzelm
parents: 36012
diff changeset
     2
    Author:     Makarius
ac7961d42ac3 some rearrangement of Scala sources;
wenzelm
parents: 36012
diff changeset
     3
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents: 37849
diff changeset
     4
Document as collection of named nodes, each consisting of an editable
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38417
diff changeset
     5
list of commands, associated with asynchronous execution process.
36676
ac7961d42ac3 some rearrangement of Scala sources;
wenzelm
parents: 36012
diff changeset
     6
*/
34407
aad6834ba380 added some headers and comments;
wenzelm
parents: 34390
diff changeset
     7
34871
e596a0b71f3c incorporate "proofdocument" part into main Isabelle/Pure.jar -- except for html_panel.scala, which depends on external library (Lobo/Cobra browser);
wenzelm
parents: 34868
diff changeset
     8
package isabelle
34318
c13e168a8ae6 original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff changeset
     9
34760
dc7f5e0d9d27 misc modernization of names;
wenzelm
parents: 34759
diff changeset
    10
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents: 37849
diff changeset
    11
import scala.collection.mutable
37073
5e42e36a6693 @tailrec annotation;
wenzelm
parents: 37072
diff changeset
    12
5e42e36a6693 @tailrec annotation;
wenzelm
parents: 37072
diff changeset
    13
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
    14
object Document {
38424
940a404e45e2 moved History/Snapshot to document.scala;
wenzelm
parents: 38418
diff changeset
    15
  /** document structure **/
940a404e45e2 moved History/Snapshot to document.scala;
wenzelm
parents: 38418
diff changeset
    16
52977
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    17
  /* overlays -- print functions with arguments */
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    18
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
    19
  object Overlays {
52977
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    20
    val empty = new Overlays(Map.empty)
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    21
  }
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    22
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
    23
  final class Overlays private(rep: Map[Node.Name, Node.Overlays]) {
64799
c0c648911f1a misc tuning and clarification;
wenzelm
parents: 64798
diff changeset
    24
    def apply(name: Node.Name): Node.Overlays =
52977
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    25
      rep.getOrElse(name, Node.Overlays.empty)
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    26
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
    27
    private def update(name: Node.Name, f: Node.Overlays => Node.Overlays): Overlays = {
52977
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    28
      val node_overlays = f(apply(name))
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    29
      new Overlays(if (node_overlays.is_empty) rep - name else rep + (name -> node_overlays))
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    30
    }
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    31
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    32
    def insert(command: Command, fn: String, args: List[String]): Overlays =
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    33
      update(command.node_name, _.insert(command, fn, args))
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    34
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    35
    def remove(command: Command, fn: String, args: List[String]): Overlays =
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    36
      update(command.node_name, _.remove(command, fn, args))
55800
wenzelm
parents: 55783
diff changeset
    37
wenzelm
parents: 55783
diff changeset
    38
    override def toString: String = rep.mkString("Overlays(", ",", ")")
52977
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    39
  }
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    40
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    41
55783
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    42
  /* document blobs: auxiliary files */
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    43
76904
e27d097d7d15 tuned signature: avoid confusion with Document.Node.Blob and Command.Blob;
wenzelm
parents: 76903
diff changeset
    44
  object Blobs {
76916
54947a35ce86 more operations;
wenzelm
parents: 76915
diff changeset
    45
    sealed case class Item(
54947a35ce86 more operations;
wenzelm
parents: 76915
diff changeset
    46
      bytes: Bytes,
54947a35ce86 more operations;
wenzelm
parents: 76915
diff changeset
    47
      source: String,
54947a35ce86 more operations;
wenzelm
parents: 76915
diff changeset
    48
      chunk: Symbol.Text_Chunk,
54947a35ce86 more operations;
wenzelm
parents: 76915
diff changeset
    49
      changed: Boolean
54947a35ce86 more operations;
wenzelm
parents: 76915
diff changeset
    50
    ) {
76924
fc24cf493202 tuned signature;
wenzelm
parents: 76917
diff changeset
    51
      def source_wellformed: Boolean = bytes.wellformed_text.nonEmpty
76904
e27d097d7d15 tuned signature: avoid confusion with Document.Node.Blob and Command.Blob;
wenzelm
parents: 76903
diff changeset
    52
      def unchanged: Item = copy(changed = false)
e27d097d7d15 tuned signature: avoid confusion with Document.Node.Blob and Command.Blob;
wenzelm
parents: 76903
diff changeset
    53
    }
55783
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    54
76904
e27d097d7d15 tuned signature: avoid confusion with Document.Node.Blob and Command.Blob;
wenzelm
parents: 76903
diff changeset
    55
    def apply(blobs: Map[Node.Name, Item]): Blobs = new Blobs(blobs)
55783
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    56
    val empty: Blobs = apply(Map.empty)
76913
a8eb5046b05f tuned signature;
wenzelm
parents: 76912
diff changeset
    57
a8eb5046b05f tuned signature;
wenzelm
parents: 76912
diff changeset
    58
    def make(blobs: List[(Command.Blob, Item)]): Blobs =
a8eb5046b05f tuned signature;
wenzelm
parents: 76912
diff changeset
    59
      if (blobs.isEmpty) empty
a8eb5046b05f tuned signature;
wenzelm
parents: 76912
diff changeset
    60
      else apply((for ((a, b) <- blobs.iterator) yield a.name -> b).toMap)
55783
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    61
  }
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    62
76904
e27d097d7d15 tuned signature: avoid confusion with Document.Node.Blob and Command.Blob;
wenzelm
parents: 76903
diff changeset
    63
  final class Blobs private(blobs: Map[Node.Name, Blobs.Item]) {
e27d097d7d15 tuned signature: avoid confusion with Document.Node.Blob and Command.Blob;
wenzelm
parents: 76903
diff changeset
    64
    def get(name: Node.Name): Option[Blobs.Item] = blobs.get(name)
55783
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    65
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    66
    def changed(name: Node.Name): Boolean =
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    67
      get(name) match {
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    68
        case Some(blob) => blob.changed
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    69
        case None => false
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    70
      }
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    71
55800
wenzelm
parents: 55783
diff changeset
    72
    override def toString: String = blobs.mkString("Blobs(", ",", ")")
55783
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    73
  }
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    74
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    75
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    76
  /* document nodes: theories and auxiliary files */
38424
940a404e45e2 moved History/Snapshot to document.scala;
wenzelm
parents: 38418
diff changeset
    77
44615
a4ff8a787202 more abstract Document.Node.Name;
wenzelm
parents: 44613
diff changeset
    78
  type Edit[A, B] = (Node.Name, Node.Edit[A, B])
44384
8f6054a63f96 some support for editor perspective;
wenzelm
parents: 44383
diff changeset
    79
  type Edit_Text = Edit[Text.Edit, Text.Perspective]
52849
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52808
diff changeset
    80
  type Edit_Command = Edit[Command.Edit, Command.Perspective]
38151
2837c952ca31 explicit Change.Snapshot and Document.Node;
wenzelm
parents: 38150
diff changeset
    81
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
    82
  object Node {
52887
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
    83
    /* header and name */
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
    84
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 48706
diff changeset
    85
    sealed case class Header(
70638
f164cec7ac22 clarified signature: prefer operations without position;
wenzelm
parents: 70636
diff changeset
    86
      imports_pos: List[(Name, Position.T)] = Nil,
63020
02921dcc42c3 tuned signature;
wenzelm
parents: 62492
diff changeset
    87
      keywords: Thy_Header.Keywords = Nil,
63579
73939a9b70a3 support 'abbrevs' within theory header;
wenzelm
parents: 63032
diff changeset
    88
      abbrevs: Thy_Header.Abbrevs = Nil,
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
    89
      errors: List[String] = Nil
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
    90
    ) {
70638
f164cec7ac22 clarified signature: prefer operations without position;
wenzelm
parents: 70636
diff changeset
    91
      def imports: List[Name] = imports_pos.map(_._1)
f164cec7ac22 clarified signature: prefer operations without position;
wenzelm
parents: 70636
diff changeset
    92
66773
0cd29455a5e8 tuned signature;
wenzelm
parents: 66716
diff changeset
    93
      def append_errors(msgs: List[String]): Header =
0cd29455a5e8 tuned signature;
wenzelm
parents: 66716
diff changeset
    94
        copy(errors = errors ::: msgs)
54549
2a3053472ec3 actually expose errors of cumulative theory dependencies;
wenzelm
parents: 54530
diff changeset
    95
2a3053472ec3 actually expose errors of cumulative theory dependencies;
wenzelm
parents: 54530
diff changeset
    96
      def cat_errors(msg2: String): Header =
62492
0e53fade87fe clarified modules;
wenzelm
parents: 61197
diff changeset
    97
        copy(errors = errors.map(msg1 => Exn.cat_message(msg1, msg2)))
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 48706
diff changeset
    98
    }
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 48706
diff changeset
    99
71601
97ccf48c2f0c misc tuning based on hints by IntelliJ IDEA;
wenzelm
parents: 70986
diff changeset
   100
    val no_header: Header = Header()
63020
02921dcc42c3 tuned signature;
wenzelm
parents: 62492
diff changeset
   101
    def bad_header(msg: String): Header = Header(errors = List(msg))
46737
09ab89658a5d clarified module Thy_Load;
wenzelm
parents: 46723
diff changeset
   102
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   103
    object Name {
76860
f95ed5a0600c clarified signature: uniform master_dir instead of separate field;
wenzelm
parents: 76848
diff changeset
   104
      def apply(node: String, theory: String = ""): Name = new Name(node, theory)
76671
254964ca1b98 clarified signature: avoid case class with redefined equality;
wenzelm
parents: 76481
diff changeset
   105
76905
0e01fa1699d2 tuned signature;
wenzelm
parents: 76904
diff changeset
   106
      def loaded_theory(theory: String): Name = Name(theory, theory = theory)
46723
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   107
76848
wenzelm
parents: 76847
diff changeset
   108
      val empty: Name = Name("")
76845
81848d12aba3 clarified modules;
wenzelm
parents: 76840
diff changeset
   109
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   110
      object Ordering extends scala.math.Ordering[Name] {
46723
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   111
        def compare(name1: Name, name2: Name): Int = name1.node compare name2.node
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   112
      }
70636
a56eab490f4e clarified signature: full dependency graph;
wenzelm
parents: 70539
diff changeset
   113
70674
29bb1ebb188f clarified signature: proper Document.Node.Ordering conforming to equality (e.g. required in situations where theory names are ambiguous due to overlapping session directories);
wenzelm
parents: 70650
diff changeset
   114
      type Graph[A] = isabelle.Graph[Node.Name, A]
29bb1ebb188f clarified signature: proper Document.Node.Ordering conforming to equality (e.g. required in situations where theory names are ambiguous due to overlapping session directories);
wenzelm
parents: 70650
diff changeset
   115
70692
41b5e515c238 clarified signature: eliminated unused option;
wenzelm
parents: 70676
diff changeset
   116
      def make_graph[A](entries: List[((Name, A), List[Name])]): Graph[A] =
76840
893eeef9ef08 clarified signature;
wenzelm
parents: 76829
diff changeset
   117
        Graph.make(entries, converse = true)(Ordering)
44957
098dd95349e7 more elaborate Node_Renderer, which paints node_name.theory only;
wenzelm
parents: 44676
diff changeset
   118
    }
52887
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   119
76860
f95ed5a0600c clarified signature: uniform master_dir instead of separate field;
wenzelm
parents: 76848
diff changeset
   120
    final class Name private(val node: String, val theory: String) {
44615
a4ff8a787202 more abstract Document.Node.Name;
wenzelm
parents: 44613
diff changeset
   121
      override def hashCode: Int = node.hashCode
a4ff8a787202 more abstract Document.Node.Name;
wenzelm
parents: 44613
diff changeset
   122
      override def equals(that: Any): Boolean =
a4ff8a787202 more abstract Document.Node.Name;
wenzelm
parents: 44613
diff changeset
   123
        that match {
a4ff8a787202 more abstract Document.Node.Name;
wenzelm
parents: 44613
diff changeset
   124
          case other: Name => node == other.node
a4ff8a787202 more abstract Document.Node.Name;
wenzelm
parents: 44613
diff changeset
   125
          case _ => false
a4ff8a787202 more abstract Document.Node.Name;
wenzelm
parents: 44613
diff changeset
   126
        }
54509
1f77110c94ef maintain document model for all files, with document view for theory only, and special blob for non-theory files;
wenzelm
parents: 54462
diff changeset
   127
76829
f2a8ba0b8c96 more robust: avoid detour via somewhat fragile Node.Name.path;
wenzelm
parents: 76792
diff changeset
   128
      def file_name: String = Url.get_base_name(node).getOrElse("")
f2a8ba0b8c96 more robust: avoid detour via somewhat fragile Node.Name.path;
wenzelm
parents: 76792
diff changeset
   129
66849
42311fd08899 more robust: allow Windows file names;
wenzelm
parents: 66773
diff changeset
   130
      def path: Path = Path.explode(File.standard_path(node))
76860
f95ed5a0600c clarified signature: uniform master_dir instead of separate field;
wenzelm
parents: 76848
diff changeset
   131
f95ed5a0600c clarified signature: uniform master_dir instead of separate field;
wenzelm
parents: 76848
diff changeset
   132
      def master_dir: String = Url.strip_base_name(node).getOrElse("")
66716
8737b866bd1c tuned signature;
wenzelm
parents: 66714
diff changeset
   133
59319
wenzelm
parents: 59077
diff changeset
   134
      def is_theory: Boolean = theory.nonEmpty
65409
ad9e2c1665b6 tuned signature;
wenzelm
parents: 65361
diff changeset
   135
65439
862bfd2b4fd4 tuned signature;
wenzelm
parents: 65409
diff changeset
   136
      def theory_base_name: String = Long_Name.base_name(theory)
862bfd2b4fd4 tuned signature;
wenzelm
parents: 65409
diff changeset
   137
54510
wenzelm
parents: 54509
diff changeset
   138
      override def toString: String = if (is_theory) theory else node
56801
8dd9df88f647 some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents: 56746
diff changeset
   139
67943
b45f0c0ea14f clarified theory node name;
wenzelm
parents: 67895
diff changeset
   140
      def json: JSON.Object.T =
b45f0c0ea14f clarified theory node name;
wenzelm
parents: 67895
diff changeset
   141
        JSON.Object("node_name" -> node, "theory_name" -> theory)
44615
a4ff8a787202 more abstract Document.Node.Name;
wenzelm
parents: 44613
diff changeset
   142
    }
a4ff8a787202 more abstract Document.Node.Name;
wenzelm
parents: 44613
diff changeset
   143
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   144
    sealed case class Entry(name: Node.Name, header: Node.Header) {
66714
9fc4e144693c tuned signature;
wenzelm
parents: 66379
diff changeset
   145
      override def toString: String = name.toString
9fc4e144693c tuned signature;
wenzelm
parents: 66379
diff changeset
   146
    }
9fc4e144693c tuned signature;
wenzelm
parents: 66379
diff changeset
   147
52887
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   148
52977
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
   149
    /* node overlays */
52887
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   150
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   151
    object Overlays {
52976
c3d82d58beaf tuned -- use Multi_Map;
wenzelm
parents: 52972
diff changeset
   152
      val empty = new Overlays(Multi_Map.empty)
52887
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   153
    }
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   154
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   155
    final class Overlays private(rep: Multi_Map[Command, (String, List[String])]) {
52887
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   156
      def commands: Set[Command] = rep.keySet
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   157
      def is_empty: Boolean = rep.isEmpty
52977
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
   158
      def dest: List[(Command, (String, List[String]))] = rep.iterator.toList
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
   159
      def insert(cmd: Command, fn: String, args: List[String]): Overlays =
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
   160
        new Overlays(rep.insert(cmd, (fn, args)))
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
   161
      def remove(cmd: Command, fn: String, args: List[String]): Overlays =
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
   162
        new Overlays(rep.remove(cmd, (fn, args)))
55800
wenzelm
parents: 55783
diff changeset
   163
wenzelm
parents: 55783
diff changeset
   164
      override def toString: String = rep.mkString("Node.Overlays(", ",", ")")
52887
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   165
    }
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   166
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   167
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   168
    /* edits */
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   169
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   170
    sealed abstract class Edit[A, B] {
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   171
      def foreach(f: A => Unit): Unit = {
44156
6aa25b80e1a5 explicit datatypes for document node edits;
wenzelm
parents: 43780
diff changeset
   172
        this match {
44383
f99906c2a1d3 discontinued redundant Edit_Command_ID;
wenzelm
parents: 44222
diff changeset
   173
          case Edits(es) => es.foreach(f)
f99906c2a1d3 discontinued redundant Edit_Command_ID;
wenzelm
parents: 44222
diff changeset
   174
          case _ =>
44156
6aa25b80e1a5 explicit datatypes for document node edits;
wenzelm
parents: 43780
diff changeset
   175
        }
44383
f99906c2a1d3 discontinued redundant Edit_Command_ID;
wenzelm
parents: 44222
diff changeset
   176
      }
57621
caa37976801f more frugal edits;
wenzelm
parents: 57620
diff changeset
   177
caa37976801f more frugal edits;
wenzelm
parents: 57620
diff changeset
   178
      def is_void: Boolean =
caa37976801f more frugal edits;
wenzelm
parents: 57620
diff changeset
   179
        this match {
caa37976801f more frugal edits;
wenzelm
parents: 57620
diff changeset
   180
          case Edits(Nil) => true
caa37976801f more frugal edits;
wenzelm
parents: 57620
diff changeset
   181
          case _ => false
caa37976801f more frugal edits;
wenzelm
parents: 57620
diff changeset
   182
        }
44156
6aa25b80e1a5 explicit datatypes for document node edits;
wenzelm
parents: 43780
diff changeset
   183
    }
76904
e27d097d7d15 tuned signature: avoid confusion with Document.Node.Blob and Command.Blob;
wenzelm
parents: 76903
diff changeset
   184
    case class Blob[A, B](blob: Blobs.Item) extends Edit[A, B]
54562
301a721af68b clarified node edits sent to prover -- Clear/Blob only required for text edits within editor;
wenzelm
parents: 54549
diff changeset
   185
44384
8f6054a63f96 some support for editor perspective;
wenzelm
parents: 44383
diff changeset
   186
    case class Edits[A, B](edits: List[A]) extends Edit[A, B]
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 48706
diff changeset
   187
    case class Deps[A, B](header: Header) extends Edit[A, B]
52849
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52808
diff changeset
   188
    case class Perspective[A, B](required: Boolean, visible: B, overlays: Overlays) extends Edit[A, B]
57610
518e28a7c74b tuned signature;
wenzelm
parents: 56801
diff changeset
   189
518e28a7c74b tuned signature;
wenzelm
parents: 56801
diff changeset
   190
518e28a7c74b tuned signature;
wenzelm
parents: 56801
diff changeset
   191
    /* perspective */
518e28a7c74b tuned signature;
wenzelm
parents: 56801
diff changeset
   192
76702
94cdf6513f01 clarified signature;
wenzelm
parents: 76672
diff changeset
   193
    object Perspective_Text {
94cdf6513f01 clarified signature;
wenzelm
parents: 76672
diff changeset
   194
      type T = Perspective[Text.Edit, Text.Perspective]
94cdf6513f01 clarified signature;
wenzelm
parents: 76672
diff changeset
   195
      val empty: T = Perspective(false, Text.Perspective.empty, Overlays.empty)
94cdf6513f01 clarified signature;
wenzelm
parents: 76672
diff changeset
   196
      def is_empty(perspective: T): Boolean =
94cdf6513f01 clarified signature;
wenzelm
parents: 76672
diff changeset
   197
        !perspective.required &&
94cdf6513f01 clarified signature;
wenzelm
parents: 76672
diff changeset
   198
        perspective.visible.is_empty &&
94cdf6513f01 clarified signature;
wenzelm
parents: 76672
diff changeset
   199
        perspective.overlays.is_empty
94cdf6513f01 clarified signature;
wenzelm
parents: 76672
diff changeset
   200
    }
57614
wenzelm
parents: 57610
diff changeset
   201
76702
94cdf6513f01 clarified signature;
wenzelm
parents: 76672
diff changeset
   202
    object Perspective_Command {
94cdf6513f01 clarified signature;
wenzelm
parents: 76672
diff changeset
   203
      type T = Perspective[Command.Edit, Command.Perspective]
94cdf6513f01 clarified signature;
wenzelm
parents: 76672
diff changeset
   204
      val empty: T = Perspective(false, Command.Perspective.empty, Overlays.empty)
94cdf6513f01 clarified signature;
wenzelm
parents: 76672
diff changeset
   205
      def is_empty(perspective: T): Boolean =
94cdf6513f01 clarified signature;
wenzelm
parents: 76672
diff changeset
   206
        !perspective.required &&
94cdf6513f01 clarified signature;
wenzelm
parents: 76672
diff changeset
   207
        perspective.visible.is_empty &&
94cdf6513f01 clarified signature;
wenzelm
parents: 76672
diff changeset
   208
        perspective.overlays.is_empty
94cdf6513f01 clarified signature;
wenzelm
parents: 76672
diff changeset
   209
    }
57615
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   210
52887
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   211
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   212
    /* commands */
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   213
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   214
    object Commands {
52901
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   215
      def apply(commands: Linear_Set[Command]): Commands = new Commands(commands)
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   216
      val empty: Commands = apply(Linear_Set.empty)
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   217
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   218
      def starts(
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   219
        commands: Iterator[Command],
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   220
        offset: Text.Offset = 0
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   221
      ) : Iterator[(Command, Text.Offset)] = {
52901
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   222
        var i = offset
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   223
        for (command <- commands) yield {
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   224
          val start = i
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   225
          i += command.length
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   226
          (command, start)
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   227
        }
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   228
      }
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   229
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   230
      def starts_pos(
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   231
        commands: Iterator[Command],
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   232
        pos: Token.Pos = Token.Pos.start
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   233
      ) : Iterator[(Command, Token.Pos)] = {
67895
cd00999d2d30 more position information;
wenzelm
parents: 67825
diff changeset
   234
        var p = pos
cd00999d2d30 more position information;
wenzelm
parents: 67825
diff changeset
   235
        for (command <- commands) yield {
cd00999d2d30 more position information;
wenzelm
parents: 67825
diff changeset
   236
          val start = p
73359
d8a0e996614b tuned --- fewer warnings;
wenzelm
parents: 73344
diff changeset
   237
          p = command.span.content.foldLeft(p)(_.advance(_))
67895
cd00999d2d30 more position information;
wenzelm
parents: 67825
diff changeset
   238
          (command, start)
cd00999d2d30 more position information;
wenzelm
parents: 67825
diff changeset
   239
        }
cd00999d2d30 more position information;
wenzelm
parents: 67825
diff changeset
   240
      }
cd00999d2d30 more position information;
wenzelm
parents: 67825
diff changeset
   241
56398
15d0821c8667 afford larger full_index, to save a few milliseconds during rendering (notably text_overview);
wenzelm
parents: 56394
diff changeset
   242
      private val block_size = 256
52901
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   243
    }
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   244
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   245
    final class Commands private(val commands: Linear_Set[Command]) {
56314
9a513737a0b2 tuned signature;
wenzelm
parents: 56309
diff changeset
   246
      lazy val load_commands: List[Command] =
59319
wenzelm
parents: 59077
diff changeset
   247
        commands.iterator.filter(cmd => cmd.blobs.nonEmpty).toList
54462
c9bb76303348 explicit indication of thy_load commands;
wenzelm
parents: 54328
diff changeset
   248
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   249
      private lazy val full_index: (Array[(Command, Text.Offset)], Text.Range) = {
52901
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   250
        val blocks = new mutable.ListBuffer[(Command, Text.Offset)]
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   251
        var next_block = 0
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   252
        var last_stop = 0
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   253
        for ((command, start) <- Commands.starts(commands.iterator)) {
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   254
          last_stop = start + command.length
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   255
          while (last_stop + 1 > next_block) {
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   256
            blocks += (command -> start)
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   257
            next_block += Commands.block_size
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   258
          }
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   259
        }
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   260
        (blocks.toArray, Text.Range(0, last_stop))
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   261
      }
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   262
66043
f704c063e95d tuned signature;
wenzelm
parents: 66041
diff changeset
   263
      private def full_range: Text.Range = full_index._2
52901
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   264
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   265
      def iterator(i: Text.Offset = 0): Iterator[(Command, Text.Offset)] = {
59319
wenzelm
parents: 59077
diff changeset
   266
        if (commands.nonEmpty && full_range.contains(i)) {
52901
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   267
          val (cmd0, start0) = full_index._1(i / Commands.block_size)
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   268
          Node.Commands.starts(commands.iterator(cmd0), start0) dropWhile {
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   269
            case (cmd, start) => start + cmd.length <= i }
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   270
        }
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   271
        else Iterator.empty
38227
6bbb42843b6e concentrate structural document notions in document.scala;
wenzelm
parents: 38220
diff changeset
   272
      }
6bbb42843b6e concentrate structural document notions in document.scala;
wenzelm
parents: 38220
diff changeset
   273
    }
57614
wenzelm
parents: 57610
diff changeset
   274
wenzelm
parents: 57610
diff changeset
   275
    val empty: Node = new Node()
76903
f9de9c4b2156 clarified signature: old node is ignored;
wenzelm
parents: 76891
diff changeset
   276
76904
e27d097d7d15 tuned signature: avoid confusion with Document.Node.Blob and Command.Blob;
wenzelm
parents: 76903
diff changeset
   277
    def init_blob(blob: Blobs.Item): Node =
e27d097d7d15 tuned signature: avoid confusion with Document.Node.Blob and Command.Blob;
wenzelm
parents: 76903
diff changeset
   278
      new Node(get_blob = Some(blob.unchanged))
38151
2837c952ca31 explicit Change.Snapshot and Document.Node;
wenzelm
parents: 38150
diff changeset
   279
  }
2837c952ca31 explicit Change.Snapshot and Document.Node;
wenzelm
parents: 38150
diff changeset
   280
46712
8650d9a95736 prefer final ADTs -- prevent ooddities;
wenzelm
parents: 46684
diff changeset
   281
  final class Node private(
76904
e27d097d7d15 tuned signature: avoid confusion with Document.Node.Blob and Command.Blob;
wenzelm
parents: 76903
diff changeset
   282
    val get_blob: Option[Blobs.Item] = None,
57615
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   283
    val header: Node.Header = Node.no_header,
63584
68751fe1c036 tuned signature -- prover-independence is presently theoretical;
wenzelm
parents: 63579
diff changeset
   284
    val syntax: Option[Outer_Syntax] = None,
59372
503739360344 proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
wenzelm
parents: 59319
diff changeset
   285
    val text_perspective: Text.Perspective = Text.Perspective.empty,
76702
94cdf6513f01 clarified signature;
wenzelm
parents: 76672
diff changeset
   286
    val perspective: Node.Perspective_Command.T = Node.Perspective_Command.empty,
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   287
    _commands: Node.Commands = Node.Commands.empty
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   288
  ) {
57615
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   289
    def is_empty: Boolean =
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   290
      get_blob.isEmpty &&
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   291
      header == Node.no_header &&
59372
503739360344 proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
wenzelm
parents: 59319
diff changeset
   292
      text_perspective.is_empty &&
76702
94cdf6513f01 clarified signature;
wenzelm
parents: 76672
diff changeset
   293
      Node.Perspective_Command.is_empty(perspective) &&
57615
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   294
      commands.isEmpty
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   295
59702
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59695
diff changeset
   296
    def has_header: Boolean = header != Node.no_header
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59695
diff changeset
   297
69556
0a38f23ca4c5 clarified signature;
wenzelm
parents: 69255
diff changeset
   298
    override def toString: String =
0a38f23ca4c5 clarified signature;
wenzelm
parents: 69255
diff changeset
   299
      if (is_empty) "empty"
0a38f23ca4c5 clarified signature;
wenzelm
parents: 69255
diff changeset
   300
      else if (get_blob.isDefined) "blob"
0a38f23ca4c5 clarified signature;
wenzelm
parents: 69255
diff changeset
   301
      else "node"
0a38f23ca4c5 clarified signature;
wenzelm
parents: 69255
diff changeset
   302
57615
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   303
    def commands: Linear_Set[Command] = _commands.commands
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   304
    def load_commands: List[Command] = _commands.load_commands
64799
c0c648911f1a misc tuning and clarification;
wenzelm
parents: 64798
diff changeset
   305
    def load_commands_changed(doc_blobs: Blobs): Boolean =
c0c648911f1a misc tuning and clarification;
wenzelm
parents: 64798
diff changeset
   306
      load_commands.exists(_.blobs_changed(doc_blobs))
57615
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   307
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 48706
diff changeset
   308
    def update_header(new_header: Node.Header): Node =
59372
503739360344 proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
wenzelm
parents: 59319
diff changeset
   309
      new Node(get_blob, new_header, syntax, text_perspective, perspective, _commands)
59077
7e0d3da6e6d8 node-specific syntax, with base_syntax as default;
wenzelm
parents: 57976
diff changeset
   310
63584
68751fe1c036 tuned signature -- prover-independence is presently theoretical;
wenzelm
parents: 63579
diff changeset
   311
    def update_syntax(new_syntax: Option[Outer_Syntax]): Node =
59372
503739360344 proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
wenzelm
parents: 59319
diff changeset
   312
      new Node(get_blob, header, new_syntax, text_perspective, perspective, _commands)
503739360344 proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
wenzelm
parents: 59319
diff changeset
   313
503739360344 proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
wenzelm
parents: 59319
diff changeset
   314
    def update_perspective(
503739360344 proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
wenzelm
parents: 59319
diff changeset
   315
        new_text_perspective: Text.Perspective,
76702
94cdf6513f01 clarified signature;
wenzelm
parents: 76672
diff changeset
   316
        new_perspective: Node.Perspective_Command.T): Node =
59372
503739360344 proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
wenzelm
parents: 59319
diff changeset
   317
      new Node(get_blob, header, syntax, new_text_perspective, new_perspective, _commands)
46680
234f1730582d more abstract class Document.Node;
wenzelm
parents: 46679
diff changeset
   318
59372
503739360344 proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
wenzelm
parents: 59319
diff changeset
   319
    def edit_perspective: Node.Edit[Text.Edit, Text.Perspective] =
503739360344 proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
wenzelm
parents: 59319
diff changeset
   320
      Node.Perspective(perspective.required, text_perspective, perspective.overlays)
46680
234f1730582d more abstract class Document.Node;
wenzelm
parents: 46679
diff changeset
   321
59372
503739360344 proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
wenzelm
parents: 59319
diff changeset
   322
    def same_perspective(
503739360344 proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
wenzelm
parents: 59319
diff changeset
   323
        other_text_perspective: Text.Perspective,
76702
94cdf6513f01 clarified signature;
wenzelm
parents: 76672
diff changeset
   324
        other_perspective: Node.Perspective_Command.T): Boolean =
59372
503739360344 proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
wenzelm
parents: 59319
diff changeset
   325
      text_perspective == other_text_perspective &&
52849
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52808
diff changeset
   326
      perspective.required == other_perspective.required &&
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52808
diff changeset
   327
      perspective.visible.same(other_perspective.visible) &&
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52808
diff changeset
   328
      perspective.overlays == other_perspective.overlays
52808
143f225e50f5 allow explicit indication of required node: full eval, no prints;
wenzelm
parents: 52568
diff changeset
   329
52901
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   330
    def update_commands(new_commands: Linear_Set[Command]): Node =
52918
038458a4d11b proper low-level comparison -- heed warning by Scala compiler;
wenzelm
parents: 52901
diff changeset
   331
      if (new_commands eq _commands.commands) this
76759
wenzelm
parents: 76715
diff changeset
   332
      else {
59372
503739360344 proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
wenzelm
parents: 59319
diff changeset
   333
        new Node(get_blob, header, syntax, text_perspective, perspective,
503739360344 proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
wenzelm
parents: 59319
diff changeset
   334
          Node.Commands(new_commands))
76759
wenzelm
parents: 76715
diff changeset
   335
      }
38151
2837c952ca31 explicit Change.Snapshot and Document.Node;
wenzelm
parents: 38150
diff changeset
   336
56373
0605d90be6fc tuned signature -- more explicit iterator terminology;
wenzelm
parents: 56372
diff changeset
   337
    def command_iterator(i: Text.Offset = 0): Iterator[(Command, Text.Offset)] =
0605d90be6fc tuned signature -- more explicit iterator terminology;
wenzelm
parents: 56372
diff changeset
   338
      _commands.iterator(i)
38151
2837c952ca31 explicit Change.Snapshot and Document.Node;
wenzelm
parents: 38150
diff changeset
   339
56373
0605d90be6fc tuned signature -- more explicit iterator terminology;
wenzelm
parents: 56372
diff changeset
   340
    def command_iterator(range: Text.Range): Iterator[(Command, Text.Offset)] =
0605d90be6fc tuned signature -- more explicit iterator terminology;
wenzelm
parents: 56372
diff changeset
   341
      command_iterator(range.start) takeWhile { case (_, start) => start < range.stop }
38151
2837c952ca31 explicit Change.Snapshot and Document.Node;
wenzelm
parents: 38150
diff changeset
   342
38879
dde403450419 Document.Node: significant speedup of command_range etc. via lazy full_index;
wenzelm
parents: 38872
diff changeset
   343
    def command_start(cmd: Command): Option[Text.Offset] =
52901
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   344
      Node.Commands.starts(commands.iterator).find(_._1 == cmd).map(_._2)
67247
3a9651318015 clarified signature;
wenzelm
parents: 67114
diff changeset
   345
76924
fc24cf493202 tuned signature;
wenzelm
parents: 76917
diff changeset
   346
    lazy val source_wellformed: Boolean =
76916
54947a35ce86 more operations;
wenzelm
parents: 76915
diff changeset
   347
      get_blob match {
76924
fc24cf493202 tuned signature;
wenzelm
parents: 76917
diff changeset
   348
        case Some(blob) => blob.source_wellformed
76916
54947a35ce86 more operations;
wenzelm
parents: 76915
diff changeset
   349
        case None => true
54947a35ce86 more operations;
wenzelm
parents: 76915
diff changeset
   350
      }
54947a35ce86 more operations;
wenzelm
parents: 76915
diff changeset
   351
76204
b80b2fbc46c3 clarified signature: persistent Node.source / Snapshot.source;
wenzelm
parents: 75914
diff changeset
   352
    lazy val source: String =
67247
3a9651318015 clarified signature;
wenzelm
parents: 67114
diff changeset
   353
      get_blob match {
67265
f32287c95432 store full blob source for the sake of markup_to_XML;
wenzelm
parents: 67264
diff changeset
   354
        case Some(blob) => blob.source
75819
9f7abd148545 tuned, following hints by IntelliJ IDEA;
wenzelm
parents: 75818
diff changeset
   355
        case None => command_iterator().map({ case (cmd, _) => cmd.source }).mkString
67247
3a9651318015 clarified signature;
wenzelm
parents: 67114
diff changeset
   356
      }
38151
2837c952ca31 explicit Change.Snapshot and Document.Node;
wenzelm
parents: 38150
diff changeset
   357
  }
2837c952ca31 explicit Change.Snapshot and Document.Node;
wenzelm
parents: 38150
diff changeset
   358
2837c952ca31 explicit Change.Snapshot and Document.Node;
wenzelm
parents: 38150
diff changeset
   359
46723
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   360
  /* development graph */
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   361
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   362
  object Nodes {
46723
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   363
    val empty: Nodes = new Nodes(Graph.empty(Node.Name.Ordering))
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   364
  }
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   365
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   366
  final class Nodes private(graph: Graph[Node.Name, Node]) {
46723
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   367
    def apply(name: Node.Name): Node =
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   368
      graph.default_node(name, Node.empty).get_node(name)
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   369
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   370
    def is_suppressed(name: Node.Name): Boolean = {
57619
dcd69422b953 clarified display;
wenzelm
parents: 57617
diff changeset
   371
      val graph1 = graph.default_node(name, Node.empty)
dcd69422b953 clarified display;
wenzelm
parents: 57617
diff changeset
   372
      graph1.is_maximal(name) && graph1.get_node(name).is_empty
dcd69422b953 clarified display;
wenzelm
parents: 57617
diff changeset
   373
    }
57617
335750d989a3 clarified display;
wenzelm
parents: 57616
diff changeset
   374
68300
cd8ab1a7a286 retain isolated blob nodes (amending deb2fcbda16e): avoid failure of Session.handle_change with "Missing blob", when opening theory with load command later;
wenzelm
parents: 68299
diff changeset
   375
    def purge_suppressed: Option[Nodes] =
71601
97ccf48c2f0c misc tuning based on hints by IntelliJ IDEA;
wenzelm
parents: 70986
diff changeset
   376
      graph.keys_iterator.filter(is_suppressed).toList match {
67112
deb2fcbda16e removed inaccessible blobs from Document.Nodes;
wenzelm
parents: 67110
diff changeset
   377
        case Nil => None
73359
d8a0e996614b tuned --- fewer warnings;
wenzelm
parents: 73344
diff changeset
   378
        case del => Some(new Nodes(del.foldLeft(graph)(_.del_node(_))))
67112
deb2fcbda16e removed inaccessible blobs from Document.Nodes;
wenzelm
parents: 67110
diff changeset
   379
      }
67110
3156faac30a7 purge hidden nodes more thoroughly: is_hidden may become true only later;
wenzelm
parents: 67014
diff changeset
   380
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   381
    def + (entry: (Node.Name, Node)): Nodes = {
46723
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   382
      val (name, node) = entry
70638
f164cec7ac22 clarified signature: prefer operations without position;
wenzelm
parents: 70636
diff changeset
   383
      val imports = node.header.imports
46723
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   384
      val graph1 =
73359
d8a0e996614b tuned --- fewer warnings;
wenzelm
parents: 73344
diff changeset
   385
        imports.foldLeft(graph.default_node(name, Node.empty)) {
d8a0e996614b tuned --- fewer warnings;
wenzelm
parents: 73344
diff changeset
   386
          case (g, p) => g.default_node(p, Node.empty)
d8a0e996614b tuned --- fewer warnings;
wenzelm
parents: 73344
diff changeset
   387
        }
d8a0e996614b tuned --- fewer warnings;
wenzelm
parents: 73344
diff changeset
   388
      val graph2 =
d8a0e996614b tuned --- fewer warnings;
wenzelm
parents: 73344
diff changeset
   389
        graph1.imm_preds(name).foldLeft(graph1) { case (g, dep) => g.del_edge(dep, name) }
d8a0e996614b tuned --- fewer warnings;
wenzelm
parents: 73344
diff changeset
   390
      val graph3 = imports.foldLeft(graph2) { case (g, dep) => g.add_edge(dep, name) }
67110
3156faac30a7 purge hidden nodes more thoroughly: is_hidden may become true only later;
wenzelm
parents: 67014
diff changeset
   391
      new Nodes(graph3.map_node(name, _ => node))
46723
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   392
    }
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   393
68321
daca5f2a0c90 tuned signature;
wenzelm
parents: 68306
diff changeset
   394
    def domain: Set[Node.Name] = graph.domain
daca5f2a0c90 tuned signature;
wenzelm
parents: 68306
diff changeset
   395
56372
fadb0fef09d7 more explicit iterator terminology, in accordance to Scala 2.8 library;
wenzelm
parents: 56354
diff changeset
   396
    def iterator: Iterator[(Node.Name, Node)] =
fadb0fef09d7 more explicit iterator terminology, in accordance to Scala 2.8 library;
wenzelm
parents: 56354
diff changeset
   397
      graph.iterator.map({ case (name, (node, _)) => (name, node) })
46723
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   398
70539
30b3c58a1933 support Export_Theory.read_proof, based on theory_name and serial;
wenzelm
parents: 70284
diff changeset
   399
    def theory_name(theory: String): Option[Node.Name] =
30b3c58a1933 support Export_Theory.read_proof, based on theory_name and serial;
wenzelm
parents: 70284
diff changeset
   400
      graph.keys_iterator.find(name => name.theory == theory)
30b3c58a1933 support Export_Theory.read_proof, based on theory_name and serial;
wenzelm
parents: 70284
diff changeset
   401
64799
c0c648911f1a misc tuning and clarification;
wenzelm
parents: 64798
diff changeset
   402
    def commands_loading(file_name: Node.Name): List[Command] =
54528
842adea880a4 refer to thy_load command of auxiliary file;
wenzelm
parents: 54521
diff changeset
   403
      (for {
56372
fadb0fef09d7 more explicit iterator terminology, in accordance to Scala 2.8 library;
wenzelm
parents: 56354
diff changeset
   404
        (_, node) <- iterator
56314
9a513737a0b2 tuned signature;
wenzelm
parents: 56309
diff changeset
   405
        cmd <- node.load_commands.iterator
54530
2c1440f70028 ranges of thy_load commands count as visible within perspective;
wenzelm
parents: 54528
diff changeset
   406
        name <- cmd.blobs_names.iterator
54528
842adea880a4 refer to thy_load command of auxiliary file;
wenzelm
parents: 54521
diff changeset
   407
        if name == file_name
842adea880a4 refer to thy_load command of auxiliary file;
wenzelm
parents: 54521
diff changeset
   408
      } yield cmd).toList
842adea880a4 refer to thy_load command of auxiliary file;
wenzelm
parents: 54521
diff changeset
   409
46942
f5c2d66faa04 basic support for outer syntax keywords in theory header;
wenzelm
parents: 46941
diff changeset
   410
    def descendants(names: List[Node.Name]): List[Node.Name] = graph.all_succs(names)
72065
11dc8929832d clarified order --- proper sorting of requirements;
wenzelm
parents: 71601
diff changeset
   411
    def requirements(names: List[Node.Name]): List[Node.Name] = graph.all_preds_rev(names)
46723
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   412
    def topological_order: List[Node.Name] = graph.topological_order
56337
520148f9921d tuned output;
wenzelm
parents: 56336
diff changeset
   413
520148f9921d tuned output;
wenzelm
parents: 56336
diff changeset
   414
    override def toString: String = topological_order.mkString("Nodes(", ",", ")")
46723
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   415
  }
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   416
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   417
38424
940a404e45e2 moved History/Snapshot to document.scala;
wenzelm
parents: 38418
diff changeset
   418
940a404e45e2 moved History/Snapshot to document.scala;
wenzelm
parents: 38418
diff changeset
   419
  /** versioning **/
940a404e45e2 moved History/Snapshot to document.scala;
wenzelm
parents: 38418
diff changeset
   420
940a404e45e2 moved History/Snapshot to document.scala;
wenzelm
parents: 38418
diff changeset
   421
  /* particular document versions */
34485
6475bfb4ff99 joined Document with ProofDocument;
wenzelm
parents: 34483
diff changeset
   422
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   423
  object Version {
46681
c083a3f621c0 more abstract class Document.Version;
wenzelm
parents: 46680
diff changeset
   424
    val init: Version = new Version()
59077
7e0d3da6e6d8 node-specific syntax, with base_syntax as default;
wenzelm
parents: 57976
diff changeset
   425
    def make(nodes: Nodes): Version = new Version(Document_ID.make(), nodes)
67112
deb2fcbda16e removed inaccessible blobs from Document.Nodes;
wenzelm
parents: 67110
diff changeset
   426
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   427
    def purge_future(
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   428
      versions: Map[Document_ID.Version, Version],
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   429
      future: Future[Version]
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   430
    ) : Future[Version] = {
68066
63f03ee4057e purge history more thoroughly (see also 3156faac30a7);
wenzelm
parents: 67943
diff changeset
   431
      if (future.is_finished) {
63f03ee4057e purge history more thoroughly (see also 3156faac30a7);
wenzelm
parents: 67943
diff changeset
   432
        val version = future.join
63f03ee4057e purge history more thoroughly (see also 3156faac30a7);
wenzelm
parents: 67943
diff changeset
   433
        versions.get(version.id) match {
63f03ee4057e purge history more thoroughly (see also 3156faac30a7);
wenzelm
parents: 67943
diff changeset
   434
          case Some(version1) if !(version eq version1) => Future.value(version1)
63f03ee4057e purge history more thoroughly (see also 3156faac30a7);
wenzelm
parents: 67943
diff changeset
   435
          case _ => future
63f03ee4057e purge history more thoroughly (see also 3156faac30a7);
wenzelm
parents: 67943
diff changeset
   436
        }
63f03ee4057e purge history more thoroughly (see also 3156faac30a7);
wenzelm
parents: 67943
diff changeset
   437
      }
63f03ee4057e purge history more thoroughly (see also 3156faac30a7);
wenzelm
parents: 67943
diff changeset
   438
      else future
63f03ee4057e purge history more thoroughly (see also 3156faac30a7);
wenzelm
parents: 67943
diff changeset
   439
    }
68300
cd8ab1a7a286 retain isolated blob nodes (amending deb2fcbda16e): avoid failure of Session.handle_change with "Missing blob", when opening theory with load command later;
wenzelm
parents: 68299
diff changeset
   440
cd8ab1a7a286 retain isolated blob nodes (amending deb2fcbda16e): avoid failure of Session.handle_change with "Missing blob", when opening theory with load command later;
wenzelm
parents: 68299
diff changeset
   441
    def purge_suppressed(
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   442
      versions: Map[Document_ID.Version, Version]
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   443
    ): Map[Document_ID.Version, Version] = {
73359
d8a0e996614b tuned --- fewer warnings;
wenzelm
parents: 73344
diff changeset
   444
      (for ((id, v) <- versions.iterator; v1 <- v.purge_suppressed) yield (id, v1)).
d8a0e996614b tuned --- fewer warnings;
wenzelm
parents: 73344
diff changeset
   445
        foldLeft(versions)(_ + _)
68300
cd8ab1a7a286 retain isolated blob nodes (amending deb2fcbda16e): avoid failure of Session.handle_change with "Missing blob", when opening theory with load command later;
wenzelm
parents: 68299
diff changeset
   446
    }
38417
b8922ae21111 renamed class Document to Document.Version etc.;
wenzelm
parents: 38414
diff changeset
   447
  }
b8922ae21111 renamed class Document to Document.Version etc.;
wenzelm
parents: 38414
diff changeset
   448
46712
8650d9a95736 prefer final ADTs -- prevent ooddities;
wenzelm
parents: 46684
diff changeset
   449
  final class Version private(
52530
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
   450
    val id: Document_ID.Version = Document_ID.none,
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   451
    val nodes: Nodes = Nodes.empty
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   452
  ) {
55777
90484dff4dc4 tuned output;
wenzelm
parents: 55710
diff changeset
   453
    override def toString: String = "Version(" + id + ")"
67110
3156faac30a7 purge hidden nodes more thoroughly: is_hidden may become true only later;
wenzelm
parents: 67014
diff changeset
   454
68299
0b5a23477911 clarified signature -- avoid confusion with Resources.is_hidden;
wenzelm
parents: 68114
diff changeset
   455
    def purge_suppressed: Option[Version] =
68300
cd8ab1a7a286 retain isolated blob nodes (amending deb2fcbda16e): avoid failure of Session.handle_change with "Missing blob", when opening theory with load command later;
wenzelm
parents: 68299
diff changeset
   456
      nodes.purge_suppressed.map(new Version(id, _))
46941
c0f776b661fa maintain Version.syntax within document state;
wenzelm
parents: 46940
diff changeset
   457
  }
34660
e0561943bfc9 Change consisting of a list of Edits
immler@in.tum.de
parents: 34657
diff changeset
   458
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   459
38424
940a404e45e2 moved History/Snapshot to document.scala;
wenzelm
parents: 38418
diff changeset
   460
  /* changes of plain text, eventually resulting in document edits */
38227
6bbb42843b6e concentrate structural document notions in document.scala;
wenzelm
parents: 38220
diff changeset
   461
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   462
  object Change {
46678
c2dba08548f9 more abstract class Document.Change;
wenzelm
parents: 46677
diff changeset
   463
    val init: Change = new Change()
c2dba08548f9 more abstract class Document.Change;
wenzelm
parents: 46677
diff changeset
   464
c2dba08548f9 more abstract class Document.Change;
wenzelm
parents: 46677
diff changeset
   465
    def make(previous: Future[Version], edits: List[Edit_Text], version: Future[Version]): Change =
57620
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
   466
      new Change(Some(previous), edits.reverse, version)
38227
6bbb42843b6e concentrate structural document notions in document.scala;
wenzelm
parents: 38220
diff changeset
   467
  }
6bbb42843b6e concentrate structural document notions in document.scala;
wenzelm
parents: 38220
diff changeset
   468
46712
8650d9a95736 prefer final ADTs -- prevent ooddities;
wenzelm
parents: 46684
diff changeset
   469
  final class Change private(
46677
wenzelm
parents: 46208
diff changeset
   470
    val previous: Option[Future[Version]] = Some(Future.value(Version.init)),
57620
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
   471
    val rev_edits: List[Edit_Text] = Nil,
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   472
    val version: Future[Version] = Future.value(Version.init)
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   473
  ) {
44672
07dad1433cd7 some support to prune_history;
wenzelm
parents: 44642
diff changeset
   474
    def is_finished: Boolean =
07dad1433cd7 some support to prune_history;
wenzelm
parents: 44642
diff changeset
   475
      (previous match { case None => true case Some(future) => future.is_finished }) &&
07dad1433cd7 some support to prune_history;
wenzelm
parents: 44642
diff changeset
   476
      version.is_finished
07dad1433cd7 some support to prune_history;
wenzelm
parents: 44642
diff changeset
   477
46678
c2dba08548f9 more abstract class Document.Change;
wenzelm
parents: 46677
diff changeset
   478
    def truncate: Change = new Change(None, Nil, version)
68066
63f03ee4057e purge history more thoroughly (see also 3156faac30a7);
wenzelm
parents: 67943
diff changeset
   479
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   480
    def purge(versions: Map[Document_ID.Version, Version]): Option[Change] = {
68066
63f03ee4057e purge history more thoroughly (see also 3156faac30a7);
wenzelm
parents: 67943
diff changeset
   481
      val previous1 = previous.map(Version.purge_future(versions, _))
63f03ee4057e purge history more thoroughly (see also 3156faac30a7);
wenzelm
parents: 67943
diff changeset
   482
      val version1 = Version.purge_future(versions, version)
63f03ee4057e purge history more thoroughly (see also 3156faac30a7);
wenzelm
parents: 67943
diff changeset
   483
      if ((previous eq previous1) && (version eq version1)) None
63f03ee4057e purge history more thoroughly (see also 3156faac30a7);
wenzelm
parents: 67943
diff changeset
   484
      else Some(new Change(previous1, rev_edits, version1))
63f03ee4057e purge history more thoroughly (see also 3156faac30a7);
wenzelm
parents: 67943
diff changeset
   485
    }
38227
6bbb42843b6e concentrate structural document notions in document.scala;
wenzelm
parents: 38220
diff changeset
   486
  }
6bbb42843b6e concentrate structural document notions in document.scala;
wenzelm
parents: 38220
diff changeset
   487
6bbb42843b6e concentrate structural document notions in document.scala;
wenzelm
parents: 38220
diff changeset
   488
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   489
  /* history navigation */
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   490
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   491
  object History {
46679
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   492
    val init: History = new History()
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   493
  }
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   494
46712
8650d9a95736 prefer final ADTs -- prevent ooddities;
wenzelm
parents: 46684
diff changeset
   495
  final class History private(
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   496
    val undo_list: List[Change] = List(Change.init)  // non-empty list
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   497
  ) {
67114
3d8626cbaff8 tuned output;
wenzelm
parents: 67112
diff changeset
   498
    override def toString: String = "History(" + undo_list.length + ")"
3d8626cbaff8 tuned output;
wenzelm
parents: 67112
diff changeset
   499
46679
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   500
    def tip: Change = undo_list.head
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   501
    def + (change: Change): History = new History(change :: undo_list)
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   502
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   503
    def prune(check: Change => Boolean, retain: Int): Option[(List[Change], History)] = {
46679
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   504
      val n = undo_list.iterator.zipWithIndex.find(p => check(p._1)).get._2 + 1
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   505
      val (retained, dropped) = undo_list.splitAt(n max retain)
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   506
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   507
      retained.splitAt(retained.length - 1) match {
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   508
        case (prefix, List(last)) => Some(dropped, new History(prefix ::: List(last.truncate)))
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   509
        case _ => None
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   510
      }
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   511
    }
68066
63f03ee4057e purge history more thoroughly (see also 3156faac30a7);
wenzelm
parents: 67943
diff changeset
   512
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   513
    def purge(versions: Map[Document_ID.Version, Version]): History = {
68066
63f03ee4057e purge history more thoroughly (see also 3156faac30a7);
wenzelm
parents: 67943
diff changeset
   514
      val undo_list1 = undo_list.map(_.purge(versions))
63f03ee4057e purge history more thoroughly (see also 3156faac30a7);
wenzelm
parents: 67943
diff changeset
   515
      if (undo_list1.forall(_.isEmpty)) this
63f03ee4057e purge history more thoroughly (see also 3156faac30a7);
wenzelm
parents: 67943
diff changeset
   516
      else new History(for ((a, b) <- undo_list1 zip undo_list) yield a.getOrElse(b))
63f03ee4057e purge history more thoroughly (see also 3156faac30a7);
wenzelm
parents: 67943
diff changeset
   517
    }
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   518
  }
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   519
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   520
72818
55792cb3892f clarified signature;
wenzelm
parents: 72817
diff changeset
   521
  /* snapshot: persistent user-view of document state */
38424
940a404e45e2 moved History/Snapshot to document.scala;
wenzelm
parents: 38418
diff changeset
   522
76765
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   523
  object Pending_Edits {
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   524
    val empty: Pending_Edits = make(Nil)
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   525
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   526
    def make(models: Iterable[Model]): Pending_Edits =
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   527
      new Pending_Edits(
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   528
        (for {
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   529
          model <- models.iterator
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   530
          edits = model.pending_edits if edits.nonEmpty
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   531
        } yield model.node_name -> edits).toMap)
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   532
  }
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   533
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   534
  final class Pending_Edits(pending_edits: Map[Node.Name, List[Text.Edit]]) {
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   535
    def is_stable: Boolean = pending_edits.isEmpty
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   536
76905
0e01fa1699d2 tuned signature;
wenzelm
parents: 76904
diff changeset
   537
    def + (entry: (Node.Name, List[Text.Edit])): Pending_Edits = {
76765
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   538
      val (name, es) = entry
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   539
      if (es.isEmpty) this
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   540
      else new Pending_Edits(pending_edits + (name -> (es ::: edits(name))))
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   541
    }
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   542
76905
0e01fa1699d2 tuned signature;
wenzelm
parents: 76904
diff changeset
   543
    def edits(name: Node.Name): List[Text.Edit] =
76765
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   544
      pending_edits.getOrElse(name, Nil)
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   545
76905
0e01fa1699d2 tuned signature;
wenzelm
parents: 76904
diff changeset
   546
    def reverse_edits(name: Node.Name): List[Text.Edit] =
76765
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   547
      reverse_pending_edits.getOrElse(name, Nil)
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   548
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   549
    private lazy val reverse_pending_edits =
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   550
      (for ((name, es) <- pending_edits.iterator) yield (name, es.reverse)).toMap
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   551
  }
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   552
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   553
  object Snapshot {
71601
97ccf48c2f0c misc tuning based on hints by IntelliJ IDEA;
wenzelm
parents: 70986
diff changeset
   554
    val init: Snapshot = State.init.snapshot()
52972
8fd8e1c14988 tuned signature;
wenzelm
parents: 52918
diff changeset
   555
  }
8fd8e1c14988 tuned signature;
wenzelm
parents: 52918
diff changeset
   556
72821
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   557
  class Snapshot private[Document](
72818
55792cb3892f clarified signature;
wenzelm
parents: 72817
diff changeset
   558
    val state: State,
55792cb3892f clarified signature;
wenzelm
parents: 72817
diff changeset
   559
    val version: Version,
55792cb3892f clarified signature;
wenzelm
parents: 72817
diff changeset
   560
    val node_name: Node.Name,
76765
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   561
    pending_edits: Pending_Edits,
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   562
    val snippet_command: Option[Command]
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   563
  ) {
72821
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   564
    override def toString: String =
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   565
      "Snapshot(node = " + node_name.node + ", version = " + version.id +
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   566
        (if (is_outdated) ", outdated" else "") + ")"
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   567
76765
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   568
    def switch(name: Node.Name): Snapshot =
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   569
      if (name == node_name) this
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   570
      else new Snapshot(state, version, name, pending_edits, None)
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   571
72821
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   572
72822
8d166825265e clarified signature;
wenzelm
parents: 72821
diff changeset
   573
    /* nodes */
8d166825265e clarified signature;
wenzelm
parents: 72821
diff changeset
   574
72823
ab1a49ac456b tuned signature;
wenzelm
parents: 72822
diff changeset
   575
    def get_node(name: Node.Name): Node = version.nodes(name)
ab1a49ac456b tuned signature;
wenzelm
parents: 72822
diff changeset
   576
ab1a49ac456b tuned signature;
wenzelm
parents: 72822
diff changeset
   577
    val node: Node = get_node(node_name)
72822
8d166825265e clarified signature;
wenzelm
parents: 72821
diff changeset
   578
8d166825265e clarified signature;
wenzelm
parents: 72821
diff changeset
   579
    def node_files: List[Node.Name] =
72829
a28a4105883f avoid duplicate entries: snippet_command is defined within node;
wenzelm
parents: 72823
diff changeset
   580
      node_name :: node.load_commands.flatMap(_.blobs_names)
72822
8d166825265e clarified signature;
wenzelm
parents: 72821
diff changeset
   581
8d166825265e clarified signature;
wenzelm
parents: 72821
diff changeset
   582
76204
b80b2fbc46c3 clarified signature: persistent Node.source / Snapshot.source;
wenzelm
parents: 75914
diff changeset
   583
    /* source text */
b80b2fbc46c3 clarified signature: persistent Node.source / Snapshot.source;
wenzelm
parents: 75914
diff changeset
   584
b80b2fbc46c3 clarified signature: persistent Node.source / Snapshot.source;
wenzelm
parents: 75914
diff changeset
   585
    def source: String =
b80b2fbc46c3 clarified signature: persistent Node.source / Snapshot.source;
wenzelm
parents: 75914
diff changeset
   586
      snippet_command match {
b80b2fbc46c3 clarified signature: persistent Node.source / Snapshot.source;
wenzelm
parents: 75914
diff changeset
   587
        case Some(command) => command.source
b80b2fbc46c3 clarified signature: persistent Node.source / Snapshot.source;
wenzelm
parents: 75914
diff changeset
   588
        case None => node.source
b80b2fbc46c3 clarified signature: persistent Node.source / Snapshot.source;
wenzelm
parents: 75914
diff changeset
   589
      }
b80b2fbc46c3 clarified signature: persistent Node.source / Snapshot.source;
wenzelm
parents: 75914
diff changeset
   590
b80b2fbc46c3 clarified signature: persistent Node.source / Snapshot.source;
wenzelm
parents: 75914
diff changeset
   591
76765
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   592
    /* pending edits */
72820
af1bd8f2760f clarified signature;
wenzelm
parents: 72819
diff changeset
   593
76765
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   594
    def is_outdated: Boolean = !pending_edits.is_stable
72820
af1bd8f2760f clarified signature;
wenzelm
parents: 72819
diff changeset
   595
af1bd8f2760f clarified signature;
wenzelm
parents: 72819
diff changeset
   596
    def convert(offset: Text.Offset): Text.Offset =
76765
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   597
      pending_edits.edits(node_name).foldLeft(offset) { case (i, edit) => edit.convert(i) }
72820
af1bd8f2760f clarified signature;
wenzelm
parents: 72819
diff changeset
   598
    def revert(offset: Text.Offset): Text.Offset =
76765
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   599
      pending_edits.reverse_edits(node_name).foldLeft(offset) { case (i, edit) => edit.revert(i) }
72820
af1bd8f2760f clarified signature;
wenzelm
parents: 72819
diff changeset
   600
af1bd8f2760f clarified signature;
wenzelm
parents: 72819
diff changeset
   601
    def convert(range: Text.Range): Text.Range = range.map(convert)
af1bd8f2760f clarified signature;
wenzelm
parents: 72819
diff changeset
   602
    def revert(range: Text.Range): Text.Range = range.map(revert)
af1bd8f2760f clarified signature;
wenzelm
parents: 72819
diff changeset
   603
52972
8fd8e1c14988 tuned signature;
wenzelm
parents: 52918
diff changeset
   604
72821
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   605
    /* theory load commands */
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   606
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   607
    val commands_loading: List[Command] =
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   608
      if (node_name.is_theory) Nil
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   609
      else version.nodes.commands_loading(node_name)
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   610
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   611
    def commands_loading_ranges(pred: Node.Name => Boolean): List[Text.Range] =
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   612
      (for {
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   613
        cmd <- node.load_commands.iterator
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   614
        blob_name <- cmd.blobs_names.iterator
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   615
        if pred(blob_name)
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   616
        start <- node.command_start(cmd)
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   617
      } yield convert(cmd.core_range + start)).toList
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   618
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   619
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   620
    /* command as add-on snippet */
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   621
76912
ca872f20cf5b clarified session sources: theory and blobs are read from database, instead of physical file-system;
wenzelm
parents: 76905
diff changeset
   622
    def snippet(command: Command, doc_blobs: Blobs): Snapshot = {
72718
59a7f82a7180 clarified signature;
wenzelm
parents: 72692
diff changeset
   623
      val node_name = command.node_name
59a7f82a7180 clarified signature;
wenzelm
parents: 72692
diff changeset
   624
76915
e5f67cfedecd proper Node.init_blobs, not just edits (amending ca872f20cf5b);
wenzelm
parents: 76913
diff changeset
   625
      val blobs = for (a <- command.blobs_names; b <- doc_blobs.get(a)) yield a -> b
e5f67cfedecd proper Node.init_blobs, not just edits (amending ca872f20cf5b);
wenzelm
parents: 76913
diff changeset
   626
72718
59a7f82a7180 clarified signature;
wenzelm
parents: 72692
diff changeset
   627
      val nodes0 = version.nodes
59a7f82a7180 clarified signature;
wenzelm
parents: 72692
diff changeset
   628
      val nodes1 = nodes0 + (node_name -> nodes0(node_name).update_commands(Linear_Set(command)))
76915
e5f67cfedecd proper Node.init_blobs, not just edits (amending ca872f20cf5b);
wenzelm
parents: 76913
diff changeset
   629
      val nodes2 = blobs.foldLeft(nodes1) { case (ns, (a, b)) => ns + (a -> Node.init_blob(b)) }
e5f67cfedecd proper Node.init_blobs, not just edits (amending ca872f20cf5b);
wenzelm
parents: 76913
diff changeset
   630
      val version1 = Version.make(nodes2)
72718
59a7f82a7180 clarified signature;
wenzelm
parents: 72692
diff changeset
   631
59a7f82a7180 clarified signature;
wenzelm
parents: 72692
diff changeset
   632
      val edits: List[Edit_Text] =
76912
ca872f20cf5b clarified session sources: theory and blobs are read from database, instead of physical file-system;
wenzelm
parents: 76905
diff changeset
   633
        List(node_name -> Node.Edits(List(Text.Edit.insert(0, command.source)))) :::
76915
e5f67cfedecd proper Node.init_blobs, not just edits (amending ca872f20cf5b);
wenzelm
parents: 76913
diff changeset
   634
        blobs.map({ case (a, b) => a -> Node.Blob(b) })
72718
59a7f82a7180 clarified signature;
wenzelm
parents: 72692
diff changeset
   635
59a7f82a7180 clarified signature;
wenzelm
parents: 72692
diff changeset
   636
      val state0 = state.define_command(command)
59a7f82a7180 clarified signature;
wenzelm
parents: 72692
diff changeset
   637
      val state1 =
59a7f82a7180 clarified signature;
wenzelm
parents: 72692
diff changeset
   638
        state0.continue_history(Future.value(version), edits, Future.value(version1))
59a7f82a7180 clarified signature;
wenzelm
parents: 72692
diff changeset
   639
          .define_version(version1, state0.the_assignment(version))
59a7f82a7180 clarified signature;
wenzelm
parents: 72692
diff changeset
   640
          .assign(version1.id, Nil, List(command.id -> List(Document_ID.make())))._2
59a7f82a7180 clarified signature;
wenzelm
parents: 72692
diff changeset
   641
72818
55792cb3892f clarified signature;
wenzelm
parents: 72817
diff changeset
   642
      state1.snapshot(node_name = node_name, snippet_command = Some(command))
72718
59a7f82a7180 clarified signature;
wenzelm
parents: 72692
diff changeset
   643
    }
59a7f82a7180 clarified signature;
wenzelm
parents: 72692
diff changeset
   644
72821
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   645
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   646
    /* XML markup */
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   647
72723
3b804e0ffae9 clarified signature;
wenzelm
parents: 72722
diff changeset
   648
    def xml_markup(
72821
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   649
        range: Text.Range = Text.Range.full,
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   650
        elements: Markup.Elements = Markup.Elements.full): XML.Body =
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   651
      state.xml_markup(version, node_name, range = range, elements = elements)
72816
ea4f86914cb2 support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents: 72780
diff changeset
   652
72821
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   653
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   654
    /* messages */
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   655
72869
015a61936c13 clarified signature: more specific types;
wenzelm
parents: 72861
diff changeset
   656
    lazy val messages: List[(XML.Elem, Position.T)] =
72821
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   657
      (for {
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   658
        (command, start) <-
76905
0e01fa1699d2 tuned signature;
wenzelm
parents: 76904
diff changeset
   659
          Node.Commands.starts_pos(node.commands.iterator, Token.Pos.file(node_name.node))
72821
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   660
        pos = command.span.keyword_pos(start).position(command.span.name)
72869
015a61936c13 clarified signature: more specific types;
wenzelm
parents: 72861
diff changeset
   661
        (_, elem) <- state.command_results(version, command).iterator
015a61936c13 clarified signature: more specific types;
wenzelm
parents: 72861
diff changeset
   662
       } yield (elem, pos)).toList
72821
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   663
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   664
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   665
    /* exports */
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   666
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   667
    lazy val exports: List[Export.Entry] =
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   668
      state.node_exports(version, node_name).iterator.map(_._2).toList
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   669
75770
62e2c6f65f9a clarified Document.Snapshot.all_exports: refer to material from this (virtual) session;
wenzelm
parents: 75394
diff changeset
   670
    lazy val all_exports: Map[Export.Entry_Name, Export.Entry] =
62e2c6f65f9a clarified Document.Snapshot.all_exports: refer to material from this (virtual) session;
wenzelm
parents: 75394
diff changeset
   671
      (for {
62e2c6f65f9a clarified Document.Snapshot.all_exports: refer to material from this (virtual) session;
wenzelm
parents: 75394
diff changeset
   672
        (name, _) <- version.nodes.iterator
62e2c6f65f9a clarified Document.Snapshot.all_exports: refer to material from this (virtual) session;
wenzelm
parents: 75394
diff changeset
   673
        (_, entry) <- state.node_exports(version, name).iterator
62e2c6f65f9a clarified Document.Snapshot.all_exports: refer to material from this (virtual) session;
wenzelm
parents: 75394
diff changeset
   674
        if entry.entry_name.session == Sessions.DRAFT
62e2c6f65f9a clarified Document.Snapshot.all_exports: refer to material from this (virtual) session;
wenzelm
parents: 75394
diff changeset
   675
      } yield entry.entry_name -> entry).toMap
72821
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   676
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   677
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   678
    /* find command */
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   679
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   680
    def find_command(id: Document_ID.Generic): Option[(Node, Command)] =
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   681
      state.lookup_id(id) match {
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   682
        case None => None
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   683
        case Some(st) =>
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   684
          val command = st.command
72823
ab1a49ac456b tuned signature;
wenzelm
parents: 72822
diff changeset
   685
          val command_node = get_node(command.node_name)
ab1a49ac456b tuned signature;
wenzelm
parents: 72822
diff changeset
   686
          if (command_node.commands.contains(command)) Some((command_node, command)) else None
72821
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   687
      }
66040
f826ba18fe08 HTML preview based on PIDE markup;
wenzelm
parents: 65471
diff changeset
   688
64665
wenzelm
parents: 63584
diff changeset
   689
    def find_command_position(id: Document_ID.Generic, offset: Symbol.Offset)
72821
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   690
        : Option[Line.Node_Position] =
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   691
      for ((node, command) <- find_command(id))
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   692
      yield {
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   693
        val name = command.node_name.node
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   694
        val sources_iterator =
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   695
          node.commands.iterator.takeWhile(_ != command).map(_.source) ++
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   696
            (if (offset == 0) Iterator.empty
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   697
             else Iterator.single(command.source(Text.Range(0, command.chunk.decode(offset)))))
73359
d8a0e996614b tuned --- fewer warnings;
wenzelm
parents: 73344
diff changeset
   698
        val pos = sources_iterator.foldLeft(Line.Position.zero)(_.advance(_))
72821
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   699
        Line.Node_Position(name, pos)
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   700
      }
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   701
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   702
    def current_command(other_node_name: Node.Name, offset: Text.Offset): Option[Command] =
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   703
      if (other_node_name.is_theory) {
72823
ab1a49ac456b tuned signature;
wenzelm
parents: 72822
diff changeset
   704
        val other_node = get_node(other_node_name)
72821
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   705
        val iterator = other_node.command_iterator(revert(offset) max 0)
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   706
        if (iterator.hasNext) {
73344
f5c147654661 tuned --- fewer warnings;
wenzelm
parents: 73340
diff changeset
   707
          val (command0, _) = iterator.next()
72821
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   708
          other_node.commands.reverse.iterator(command0).find(command => !command.is_ignored)
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   709
        }
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   710
        else other_node.commands.reverse.iterator.find(command => !command.is_ignored)
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   711
      }
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   712
      else version.nodes.commands_loading(other_node_name).headOption
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   713
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   714
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   715
    /* command results */
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   716
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   717
    def command_results(range: Text.Range): Command.Results =
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   718
      Command.State.merge_results(
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   719
        select[List[Command.State]](range, Markup.Elements.full,
75394
42267c650205 tuned formatting;
wenzelm
parents: 75393
diff changeset
   720
          command_states => _ => Some(command_states)).flatMap(_.info))
72821
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   721
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   722
    def command_results(command: Command): Command.Results =
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   723
      state.command_results(version, command)
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   724
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   725
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   726
    /* cumulate markup */
64665
wenzelm
parents: 63584
diff changeset
   727
55651
fa42cf3fe79b tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents: 55650
diff changeset
   728
    def cumulate[A](
55649
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55620
diff changeset
   729
      range: Text.Range,
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55620
diff changeset
   730
      info: A,
56743
81370dfadb1d tuned signature;
wenzelm
parents: 56711
diff changeset
   731
      elements: Markup.Elements,
56354
a6f8c3566560 more direct command states -- merge_results is hardly ever needed;
wenzelm
parents: 56337
diff changeset
   732
      result: List[Command.State] => (A, Text.Markup) => Option[A],
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   733
      status: Boolean = false
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   734
    ): List[Text.Info[A]] = {
72821
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   735
      val former_range = revert(range).inflate_singularity
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   736
      val (chunk_name, command_iterator) =
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   737
        commands_loading.headOption match {
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   738
          case None => (Symbol.Text_Chunk.Default, node.command_iterator(former_range))
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   739
          case Some(command) => (Symbol.Text_Chunk.File(node_name.node), Iterator((command, 0)))
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   740
        }
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   741
      val markup_index = Command.Markup_Index(status, chunk_name)
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   742
      (for {
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   743
        (command, command_start) <- command_iterator
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   744
        chunk <- command.chunks.get(chunk_name).iterator
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   745
        states = state.command_states(version, command)
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   746
        res = result(states)
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   747
        markup_range <- (former_range - command_start).try_restrict(chunk.range).iterator
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   748
        markup = Command.State.merge_markup(states, markup_index, markup_range, elements)
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   749
        Text.Info(r0, a) <- markup.cumulate[A](markup_range, info, elements,
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   750
          {
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   751
            case (a, Text.Info(r0, b)) => res(a, Text.Info(convert(r0 + command_start), b))
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   752
          }).iterator
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   753
        r1 <- convert(r0 + command_start).try_restrict(range).iterator
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   754
      } yield Text.Info(r1, a)).toList
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   755
    }
55651
fa42cf3fe79b tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents: 55650
diff changeset
   756
fa42cf3fe79b tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents: 55650
diff changeset
   757
    def select[A](
55649
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55620
diff changeset
   758
      range: Text.Range,
56743
81370dfadb1d tuned signature;
wenzelm
parents: 56711
diff changeset
   759
      elements: Markup.Elements,
56354
a6f8c3566560 more direct command states -- merge_results is hardly ever needed;
wenzelm
parents: 56337
diff changeset
   760
      result: List[Command.State] => Text.Markup => Option[A],
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   761
      status: Boolean = false
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   762
    ): List[Text.Info[A]] = {
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   763
      def result1(states: List[Command.State]): (Option[A], Text.Markup) => Option[Option[A]] = {
72821
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   764
        val res = result(states)
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   765
        (_: Option[A], x: Text.Markup) =>
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   766
          res(x) match {
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   767
            case None => None
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   768
            case some => Some(some)
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   769
          }
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   770
      }
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   771
      for (Text.Info(r, Some(x)) <- cumulate(range, None, elements, result1, status))
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   772
        yield Text.Info(r, x)
13275ae9e209 tuned signature;
wenzelm
parents: 72820
diff changeset
   773
    }
38424
940a404e45e2 moved History/Snapshot to document.scala;
wenzelm
parents: 38418
diff changeset
   774
  }
940a404e45e2 moved History/Snapshot to document.scala;
wenzelm
parents: 38418
diff changeset
   775
55820
61869776ce1f tuned signature -- more explicit Document.Elements;
wenzelm
parents: 55801
diff changeset
   776
64814
wenzelm
parents: 64799
diff changeset
   777
  /* model */
wenzelm
parents: 64799
diff changeset
   778
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   779
  trait Session {
65221
6af51a47545b more abstract module Document;
wenzelm
parents: 65199
diff changeset
   780
    def resources: Resources
6af51a47545b more abstract module Document;
wenzelm
parents: 65199
diff changeset
   781
  }
6af51a47545b more abstract module Document;
wenzelm
parents: 65199
diff changeset
   782
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   783
  trait Model {
64814
wenzelm
parents: 64799
diff changeset
   784
    def session: Session
64827
4ef1eb75f1cd uniform Document.Model.node_edits (without void edits);
wenzelm
parents: 64819
diff changeset
   785
    def is_stable: Boolean
76765
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
   786
    def pending_edits: List[Text.Edit]
64814
wenzelm
parents: 64799
diff changeset
   787
65356
wenzelm
parents: 65355
diff changeset
   788
    def node_name: Node.Name
64814
wenzelm
parents: 64799
diff changeset
   789
    def is_theory: Boolean = node_name.is_theory
wenzelm
parents: 64799
diff changeset
   790
    override def toString: String = node_name.toString
wenzelm
parents: 64799
diff changeset
   791
67014
e6a695d6a6b2 tuned signature;
wenzelm
parents: 66849
diff changeset
   792
    def get_text(range: Text.Range): Option[String]
66114
c137a9f038a6 clarified signature;
wenzelm
parents: 66043
diff changeset
   793
76703
8fac11f7f0f4 clarified state: node_required is guarded by PIDE.editor.document_active (e.g. open panel);
wenzelm
parents: 76702
diff changeset
   794
    def node_required: Boolean
76481
a9d52d02bd83 clarified node_required status: distinguish theory_required vs. document_required;
wenzelm
parents: 76235
diff changeset
   795
76904
e27d097d7d15 tuned signature: avoid confusion with Document.Node.Blob and Command.Blob;
wenzelm
parents: 76903
diff changeset
   796
    def get_blob: Option[Blobs.Item]
76792
23f433294173 support for generic File_Format.parse_data, with persistent result in document model;
wenzelm
parents: 76776
diff changeset
   797
23f433294173 support for generic File_Format.parse_data, with persistent result in document model;
wenzelm
parents: 76776
diff changeset
   798
    def untyped_data: AnyRef
23f433294173 support for generic File_Format.parse_data, with persistent result in document model;
wenzelm
parents: 76776
diff changeset
   799
    def get_data[C](c: Class[C]): Option[C] = Library.as_subclass(c)(untyped_data)
64815
wenzelm
parents: 64814
diff changeset
   800
64827
4ef1eb75f1cd uniform Document.Model.node_edits (without void edits);
wenzelm
parents: 64819
diff changeset
   801
    def node_edits(
64867
e7220f4de11f support "purge" operation on document model;
wenzelm
parents: 64854
diff changeset
   802
      node_header: Node.Header,
e7220f4de11f support "purge" operation on document model;
wenzelm
parents: 64854
diff changeset
   803
      text_edits: List[Text.Edit],
76702
94cdf6513f01 clarified signature;
wenzelm
parents: 76672
diff changeset
   804
      perspective: Node.Perspective_Text.T
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   805
    ): List[Edit_Text] = {
64827
4ef1eb75f1cd uniform Document.Model.node_edits (without void edits);
wenzelm
parents: 64819
diff changeset
   806
      val edits: List[Node.Edit[Text.Edit, Text.Perspective]] =
4ef1eb75f1cd uniform Document.Model.node_edits (without void edits);
wenzelm
parents: 64819
diff changeset
   807
        get_blob match {
4ef1eb75f1cd uniform Document.Model.node_edits (without void edits);
wenzelm
parents: 64819
diff changeset
   808
          case None =>
4ef1eb75f1cd uniform Document.Model.node_edits (without void edits);
wenzelm
parents: 64819
diff changeset
   809
            List(
65356
wenzelm
parents: 65355
diff changeset
   810
              Node.Deps(
66773
0cd29455a5e8 tuned signature;
wenzelm
parents: 66716
diff changeset
   811
                if (session.resources.session_base.loaded_theory(node_name)) {
0cd29455a5e8 tuned signature;
wenzelm
parents: 66716
diff changeset
   812
                  node_header.append_errors(
0cd29455a5e8 tuned signature;
wenzelm
parents: 66716
diff changeset
   813
                    List("Cannot update finished theory " + quote(node_name.theory)))
0cd29455a5e8 tuned signature;
wenzelm
parents: 66716
diff changeset
   814
                }
64827
4ef1eb75f1cd uniform Document.Model.node_edits (without void edits);
wenzelm
parents: 64819
diff changeset
   815
                else node_header),
65356
wenzelm
parents: 65355
diff changeset
   816
              Node.Edits(text_edits), perspective)
wenzelm
parents: 65355
diff changeset
   817
          case Some(blob) => List(Node.Blob(blob), Node.Edits(text_edits))
64827
4ef1eb75f1cd uniform Document.Model.node_edits (without void edits);
wenzelm
parents: 64819
diff changeset
   818
        }
4ef1eb75f1cd uniform Document.Model.node_edits (without void edits);
wenzelm
parents: 64819
diff changeset
   819
      edits.flatMap(edit => if (edit.is_void) None else Some(node_name -> edit))
4ef1eb75f1cd uniform Document.Model.node_edits (without void edits);
wenzelm
parents: 64819
diff changeset
   820
    }
64814
wenzelm
parents: 64799
diff changeset
   821
  }
wenzelm
parents: 64799
diff changeset
   822
wenzelm
parents: 64799
diff changeset
   823
55820
61869776ce1f tuned signature -- more explicit Document.Elements;
wenzelm
parents: 55801
diff changeset
   824
  /** global state -- document structure, execution process, editing history **/
61869776ce1f tuned signature -- more explicit Document.Elements;
wenzelm
parents: 55801
diff changeset
   825
52563
f9a20c2c3b70 tuned protocol terminology;
wenzelm
parents: 52531
diff changeset
   826
  type Assign_Update =
f9a20c2c3b70 tuned protocol terminology;
wenzelm
parents: 52531
diff changeset
   827
    List[(Document_ID.Command, List[Document_ID.Exec])]  // update of exec state assignment
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44475
diff changeset
   828
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   829
  object State {
38373
wenzelm
parents: 38370
diff changeset
   830
    class Fail(state: State) extends Exception
wenzelm
parents: 38370
diff changeset
   831
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   832
    object Assignment {
46683
fb160aa7a9a8 more abstract class Document.State.Assignment;
wenzelm
parents: 46682
diff changeset
   833
      val init: Assignment = new Assignment()
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44477
diff changeset
   834
    }
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   835
46712
8650d9a95736 prefer final ADTs -- prevent ooddities;
wenzelm
parents: 46684
diff changeset
   836
    final class Assignment private(
52530
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
   837
      val command_execs: Map[Document_ID.Command, List[Document_ID.Exec]] = Map.empty,
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   838
      val is_finished: Boolean = false
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   839
    ) {
67114
3d8626cbaff8 tuned output;
wenzelm
parents: 67112
diff changeset
   840
      override def toString: String = "Assignment(" + command_execs.size + "," + is_finished + ")"
3d8626cbaff8 tuned output;
wenzelm
parents: 67112
diff changeset
   841
73120
c3589f2dff31 more informative errors: simplify diagnosis of spurious failures reported by users;
wenzelm
parents: 73031
diff changeset
   842
      def check_finished: Assignment = { require(is_finished, "assignment not finished"); this }
47388
fe4b245af74c discontinued obsolete last_execs (cf. cd3ab7625519);
wenzelm
parents: 46997
diff changeset
   843
      def unfinished: Assignment = new Assignment(command_execs, false)
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44477
diff changeset
   844
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   845
      def assign(update: Assign_Update): Assignment = {
73120
c3589f2dff31 more informative errors: simplify diagnosis of spurious failures reported by users;
wenzelm
parents: 73031
diff changeset
   846
        require(!is_finished, "assignment already finished")
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44477
diff changeset
   847
        val command_execs1 =
73359
d8a0e996614b tuned --- fewer warnings;
wenzelm
parents: 73344
diff changeset
   848
          update.foldLeft(command_execs) {
52563
f9a20c2c3b70 tuned protocol terminology;
wenzelm
parents: 52531
diff changeset
   849
            case (res, (command_id, exec_ids)) =>
f9a20c2c3b70 tuned protocol terminology;
wenzelm
parents: 52531
diff changeset
   850
              if (exec_ids.isEmpty) res - command_id
f9a20c2c3b70 tuned protocol terminology;
wenzelm
parents: 52531
diff changeset
   851
              else res + (command_id -> exec_ids)
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44477
diff changeset
   852
          }
47388
fe4b245af74c discontinued obsolete last_execs (cf. cd3ab7625519);
wenzelm
parents: 46997
diff changeset
   853
        new Assignment(command_execs1, true)
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents: 37849
diff changeset
   854
      }
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   855
    }
46682
4a74fbd6f28b tuned signature;
wenzelm
parents: 46681
diff changeset
   856
4a74fbd6f28b tuned signature;
wenzelm
parents: 46681
diff changeset
   857
    val init: State =
70284
3e17c3a5fd39 more thorough assignment, e.g. when "purge" removes commands that were not assigned;
wenzelm
parents: 69633
diff changeset
   858
      State().define_version(Version.init, Assignment.init).assign(Version.init.id, Nil, Nil)._2
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   859
  }
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   860
46712
8650d9a95736 prefer final ADTs -- prevent ooddities;
wenzelm
parents: 46684
diff changeset
   861
  final case class State private(
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
   862
    /*reachable versions*/
60215
5fb4990dfc73 misc tuning, based on warnings by IntelliJ IDEA;
wenzelm
parents: 59702
diff changeset
   863
    versions: Map[Document_ID.Version, Version] = Map.empty,
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
   864
    /*inlined auxiliary files*/
60215
5fb4990dfc73 misc tuning, based on warnings by IntelliJ IDEA;
wenzelm
parents: 59702
diff changeset
   865
    blobs: Set[SHA1.Digest] = Set.empty,
72692
22aeec526ffd support for PIDE markup in batch build (inactive due to pide_reports=false);
wenzelm
parents: 72669
diff changeset
   866
    /*loaded theories in batch builds*/
22aeec526ffd support for PIDE markup in batch build (inactive due to pide_reports=false);
wenzelm
parents: 72669
diff changeset
   867
    theories: Map[Document_ID.Exec, Command.State] = Map.empty,
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
   868
    /*static markup from define_command*/
60215
5fb4990dfc73 misc tuning, based on warnings by IntelliJ IDEA;
wenzelm
parents: 59702
diff changeset
   869
    commands: Map[Document_ID.Command, Command.State] = Map.empty,
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
   870
    /*dynamic markup from execution*/
60215
5fb4990dfc73 misc tuning, based on warnings by IntelliJ IDEA;
wenzelm
parents: 59702
diff changeset
   871
    execs: Map[Document_ID.Exec, Command.State] = Map.empty,
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
   872
    /*command-exec assignment for each version*/
60215
5fb4990dfc73 misc tuning, based on warnings by IntelliJ IDEA;
wenzelm
parents: 59702
diff changeset
   873
    assignments: Map[Document_ID.Version, State.Assignment] = Map.empty,
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
   874
    /*commands with markup produced by other commands (imm_succs)*/
60215
5fb4990dfc73 misc tuning, based on warnings by IntelliJ IDEA;
wenzelm
parents: 59702
diff changeset
   875
    commands_redirection: Graph[Document_ID.Command, Unit] = Graph.long,
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
   876
    /*explicit (linear) history*/
60215
5fb4990dfc73 misc tuning, based on warnings by IntelliJ IDEA;
wenzelm
parents: 59702
diff changeset
   877
    history: History = History.init,
57976
bf99106b6672 postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
wenzelm
parents: 57842
diff changeset
   878
    /*intermediate state between remove_versions/removed_versions*/
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   879
    removing_versions: Boolean = false
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   880
  ) {
68496
7266fb64de69 more scalable output;
wenzelm
parents: 68417
diff changeset
   881
    override def toString: String =
7266fb64de69 more scalable output;
wenzelm
parents: 68417
diff changeset
   882
      "State(versions = " + versions.size +
7266fb64de69 more scalable output;
wenzelm
parents: 68417
diff changeset
   883
      ", blobs = " + blobs.size +
7266fb64de69 more scalable output;
wenzelm
parents: 68417
diff changeset
   884
      ", commands = " + commands.size +
7266fb64de69 more scalable output;
wenzelm
parents: 68417
diff changeset
   885
      ", execs = " + execs.size +
7266fb64de69 more scalable output;
wenzelm
parents: 68417
diff changeset
   886
      ", assignments = " + assignments.size +
7266fb64de69 more scalable output;
wenzelm
parents: 68417
diff changeset
   887
      ", commands_redirection = " + commands_redirection.size +
7266fb64de69 more scalable output;
wenzelm
parents: 68417
diff changeset
   888
      ", history = " + history.undo_list.size +
7266fb64de69 more scalable output;
wenzelm
parents: 68417
diff changeset
   889
      ", removing_versions = " + removing_versions + ")"
7266fb64de69 more scalable output;
wenzelm
parents: 68417
diff changeset
   890
38373
wenzelm
parents: 38370
diff changeset
   891
    private def fail[A]: A = throw new State.Fail(this)
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   892
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   893
    def define_version(version: Version, assignment: State.Assignment): State = {
38417
b8922ae21111 renamed class Document to Document.Version etc.;
wenzelm
parents: 38414
diff changeset
   894
      val id = version.id
b8922ae21111 renamed class Document to Document.Version etc.;
wenzelm
parents: 38414
diff changeset
   895
      copy(versions = versions + (id -> version),
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44477
diff changeset
   896
        assignments = assignments + (id -> assignment.unfinished))
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   897
    }
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   898
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54515
diff changeset
   899
    def define_blob(digest: SHA1.Digest): State = copy(blobs = blobs + digest)
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54515
diff changeset
   900
    def defined_blob(digest: SHA1.Digest): Boolean = blobs.contains(digest)
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54515
diff changeset
   901
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   902
    def define_command(command: Command): State = {
38373
wenzelm
parents: 38370
diff changeset
   903
      val id = command.id
72719
cb07791d86b8 more strict;
wenzelm
parents: 72718
diff changeset
   904
      if (commands.isDefinedAt(id)) fail
cb07791d86b8 more strict;
wenzelm
parents: 72718
diff changeset
   905
      else copy(commands = commands + (id -> command.init_state))
38373
wenzelm
parents: 38370
diff changeset
   906
    }
wenzelm
parents: 38370
diff changeset
   907
52530
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
   908
    def defined_command(id: Document_ID.Command): Boolean = commands.isDefinedAt(id)
44582
479c07072992 tuned signature;
wenzelm
parents: 44581
diff changeset
   909
52530
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
   910
    def the_version(id: Document_ID.Version): Version = versions.getOrElse(id, fail)
52564
4e855c120f6a tuned signature -- NB: Command.read is actually part of Command.eval;
wenzelm
parents: 52563
diff changeset
   911
    def the_static_state(id: Document_ID.Command): Command.State = commands.getOrElse(id, fail)
4e855c120f6a tuned signature -- NB: Command.read is actually part of Command.eval;
wenzelm
parents: 52563
diff changeset
   912
    def the_dynamic_state(id: Document_ID.Exec): Command.State = execs.getOrElse(id, fail)
52563
f9a20c2c3b70 tuned protocol terminology;
wenzelm
parents: 52531
diff changeset
   913
    def the_assignment(version: Version): State.Assignment = assignments.getOrElse(version.id, fail)
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   914
68857
b888de4fe58c clarified signature;
wenzelm
parents: 68836
diff changeset
   915
    def lookup_id(id: Document_ID.Generic): Option[Command.State] =
72692
22aeec526ffd support for PIDE markup in batch build (inactive due to pide_reports=false);
wenzelm
parents: 72669
diff changeset
   916
      theories.get(id) orElse commands.get(id) orElse execs.get(id)
68857
b888de4fe58c clarified signature;
wenzelm
parents: 68836
diff changeset
   917
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
   918
    private def self_id(st: Command.State)(id: Document_ID.Generic): Boolean =
56295
a40e67ce4f84 clarified valid_id: always standardize towards static command.id;
wenzelm
parents: 56176
diff changeset
   919
      id == st.command.id ||
a40e67ce4f84 clarified valid_id: always standardize towards static command.id;
wenzelm
parents: 56176
diff changeset
   920
      (execs.get(id) match { case Some(st1) => st1.command.id == st.command.id case None => false })
a40e67ce4f84 clarified valid_id: always standardize towards static command.id;
wenzelm
parents: 56176
diff changeset
   921
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   922
    private def other_id(
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   923
      node_name: Node.Name,
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   924
      id: Document_ID.Generic
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   925
    ) : Option[(Symbol.Text_Chunk.Id, Symbol.Text_Chunk)] = {
72780
6205c5d4fadf restrict report redirection to current node;
wenzelm
parents: 72723
diff changeset
   926
      for {
6205c5d4fadf restrict report redirection to current node;
wenzelm
parents: 72723
diff changeset
   927
        st <- lookup_id(id)
6205c5d4fadf restrict report redirection to current node;
wenzelm
parents: 72723
diff changeset
   928
        if st.command.node_name == node_name
6205c5d4fadf restrict report redirection to current node;
wenzelm
parents: 72723
diff changeset
   929
      } yield (Symbol.Text_Chunk.Id(st.command.id), st.command.chunk)
6205c5d4fadf restrict report redirection to current node;
wenzelm
parents: 72723
diff changeset
   930
    }
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
   931
56475
710dee42b3d0 tuned signature;
wenzelm
parents: 56473
diff changeset
   932
    private def redirection(st: Command.State): Graph[Document_ID.Command, Unit] =
73359
d8a0e996614b tuned --- fewer warnings;
wenzelm
parents: 73344
diff changeset
   933
      st.markups.redirection_iterator.foldLeft(commands_redirection) {
d8a0e996614b tuned --- fewer warnings;
wenzelm
parents: 73344
diff changeset
   934
        case (graph, id) =>
d8a0e996614b tuned --- fewer warnings;
wenzelm
parents: 73344
diff changeset
   935
          graph.default_node(id, ()).default_node(st.command.id, ()).add_edge(id, st.command.id)
d8a0e996614b tuned --- fewer warnings;
wenzelm
parents: 73344
diff changeset
   936
      }
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
   937
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   938
    def accumulate(
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   939
      id: Document_ID.Generic,
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   940
      message: XML.Elem,
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   941
      cache: XML.Cache
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   942
    ) : (Command.State, State) = {
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   943
      def update(st: Command.State): (Command.State, State) = {
73031
f93f0597f4fb clarified signature: absorb XZ.Cache into XML.Cache;
wenzelm
parents: 72962
diff changeset
   944
        val st1 = st.accumulate(self_id(st), other_id, message, cache)
72692
22aeec526ffd support for PIDE markup in batch build (inactive due to pide_reports=false);
wenzelm
parents: 72669
diff changeset
   945
        (st1, copy(commands_redirection = redirection(st1)))
22aeec526ffd support for PIDE markup in batch build (inactive due to pide_reports=false);
wenzelm
parents: 72669
diff changeset
   946
      }
22aeec526ffd support for PIDE markup in batch build (inactive due to pide_reports=false);
wenzelm
parents: 72669
diff changeset
   947
      execs.get(id).map(update) match {
22aeec526ffd support for PIDE markup in batch build (inactive due to pide_reports=false);
wenzelm
parents: 72669
diff changeset
   948
        case Some((st1, state1)) => (st1, state1.copy(execs = execs + (id -> st1)))
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   949
        case None =>
72692
22aeec526ffd support for PIDE markup in batch build (inactive due to pide_reports=false);
wenzelm
parents: 72669
diff changeset
   950
          commands.get(id).map(update) match {
22aeec526ffd support for PIDE markup in batch build (inactive due to pide_reports=false);
wenzelm
parents: 72669
diff changeset
   951
            case Some((st1, state1)) => (st1, state1.copy(commands = commands + (id -> st1)))
22aeec526ffd support for PIDE markup in batch build (inactive due to pide_reports=false);
wenzelm
parents: 72669
diff changeset
   952
            case None =>
22aeec526ffd support for PIDE markup in batch build (inactive due to pide_reports=false);
wenzelm
parents: 72669
diff changeset
   953
              theories.get(id).map(update) match {
22aeec526ffd support for PIDE markup in batch build (inactive due to pide_reports=false);
wenzelm
parents: 72669
diff changeset
   954
                case Some((st1, state1)) => (st1, state1.copy(theories = theories + (id -> st1)))
22aeec526ffd support for PIDE markup in batch build (inactive due to pide_reports=false);
wenzelm
parents: 72669
diff changeset
   955
                case None => fail
22aeec526ffd support for PIDE markup in batch build (inactive due to pide_reports=false);
wenzelm
parents: 72669
diff changeset
   956
              }
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   957
          }
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   958
      }
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
   959
    }
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   960
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   961
    def add_export(
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   962
      id: Document_ID.Generic,
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   963
      entry: Command.Exports.Entry
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   964
    ): (Command.State, State) = {
68101
0699a0bacc50 store exports within PIDE command state;
wenzelm
parents: 68066
diff changeset
   965
      execs.get(id) match {
0699a0bacc50 store exports within PIDE command state;
wenzelm
parents: 68066
diff changeset
   966
        case Some(st) =>
68114
ce7f35406f37 more robust: self-export only;
wenzelm
parents: 68101
diff changeset
   967
          st.add_export(entry) match {
ce7f35406f37 more robust: self-export only;
wenzelm
parents: 68101
diff changeset
   968
            case Some(new_st) => (new_st, copy(execs = execs + (id -> new_st)))
ce7f35406f37 more robust: self-export only;
wenzelm
parents: 68101
diff changeset
   969
            case None => fail
ce7f35406f37 more robust: self-export only;
wenzelm
parents: 68101
diff changeset
   970
          }
68101
0699a0bacc50 store exports within PIDE command state;
wenzelm
parents: 68066
diff changeset
   971
        case None =>
0699a0bacc50 store exports within PIDE command state;
wenzelm
parents: 68066
diff changeset
   972
          commands.get(id) match {
0699a0bacc50 store exports within PIDE command state;
wenzelm
parents: 68066
diff changeset
   973
            case Some(st) =>
68114
ce7f35406f37 more robust: self-export only;
wenzelm
parents: 68101
diff changeset
   974
              st.add_export(entry) match {
ce7f35406f37 more robust: self-export only;
wenzelm
parents: 68101
diff changeset
   975
                case Some(new_st) => (new_st, copy(commands = commands + (id -> new_st)))
ce7f35406f37 more robust: self-export only;
wenzelm
parents: 68101
diff changeset
   976
                case None => fail
ce7f35406f37 more robust: self-export only;
wenzelm
parents: 68101
diff changeset
   977
              }
68101
0699a0bacc50 store exports within PIDE command state;
wenzelm
parents: 68066
diff changeset
   978
            case None => fail
0699a0bacc50 store exports within PIDE command state;
wenzelm
parents: 68066
diff changeset
   979
          }
0699a0bacc50 store exports within PIDE command state;
wenzelm
parents: 68066
diff changeset
   980
      }
0699a0bacc50 store exports within PIDE command state;
wenzelm
parents: 68066
diff changeset
   981
    }
0699a0bacc50 store exports within PIDE command state;
wenzelm
parents: 68066
diff changeset
   982
69633
3d91a7a58113 tuned signature;
wenzelm
parents: 69556
diff changeset
   983
    def node_exports(version: Version, node_name: Node.Name): Command.Exports =
3d91a7a58113 tuned signature;
wenzelm
parents: 69556
diff changeset
   984
      Command.Exports.merge(
3d91a7a58113 tuned signature;
wenzelm
parents: 69556
diff changeset
   985
        for {
3d91a7a58113 tuned signature;
wenzelm
parents: 69556
diff changeset
   986
          command <- version.nodes(node_name).commands.iterator
3d91a7a58113 tuned signature;
wenzelm
parents: 69556
diff changeset
   987
          st <- command_states(version, command).iterator
3d91a7a58113 tuned signature;
wenzelm
parents: 69556
diff changeset
   988
        } yield st.exports)
3d91a7a58113 tuned signature;
wenzelm
parents: 69556
diff changeset
   989
72816
ea4f86914cb2 support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents: 72780
diff changeset
   990
    def begin_theory(
ea4f86914cb2 support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents: 72780
diff changeset
   991
      node_name: Node.Name,
ea4f86914cb2 support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents: 72780
diff changeset
   992
      id: Document_ID.Exec,
ea4f86914cb2 support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents: 72780
diff changeset
   993
      source: String,
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   994
      blobs_info: Command.Blobs_Info
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
   995
    ): State = {
72692
22aeec526ffd support for PIDE markup in batch build (inactive due to pide_reports=false);
wenzelm
parents: 72669
diff changeset
   996
      if (theories.isDefinedAt(id)) fail
22aeec526ffd support for PIDE markup in batch build (inactive due to pide_reports=false);
wenzelm
parents: 72669
diff changeset
   997
      else {
72816
ea4f86914cb2 support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents: 72780
diff changeset
   998
        val command =
ea4f86914cb2 support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents: 72780
diff changeset
   999
          Command.unparsed(source, theory = true, id = id, node_name = node_name,
ea4f86914cb2 support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents: 72780
diff changeset
  1000
            blobs_info = blobs_info)
72692
22aeec526ffd support for PIDE markup in batch build (inactive due to pide_reports=false);
wenzelm
parents: 72669
diff changeset
  1001
        copy(theories = theories + (id -> command.empty_state))
22aeec526ffd support for PIDE markup in batch build (inactive due to pide_reports=false);
wenzelm
parents: 72669
diff changeset
  1002
      }
72816
ea4f86914cb2 support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents: 72780
diff changeset
  1003
    }
72692
22aeec526ffd support for PIDE markup in batch build (inactive due to pide_reports=false);
wenzelm
parents: 72669
diff changeset
  1004
76912
ca872f20cf5b clarified session sources: theory and blobs are read from database, instead of physical file-system;
wenzelm
parents: 76905
diff changeset
  1005
    def end_theory(id: Document_ID.Exec, document_blobs: Node.Name => Blobs): (Snapshot, State) =
72861
3f5e6da08687 clarified protocol: support "isabelle log" on failed theories as well;
wenzelm
parents: 72860
diff changeset
  1006
      theories.get(id) match {
72692
22aeec526ffd support for PIDE markup in batch build (inactive due to pide_reports=false);
wenzelm
parents: 72669
diff changeset
  1007
        case None => fail
72721
79f5e843e5ec clarified signature: prefer high-level Snapshot over low-level Command.State;
wenzelm
parents: 72719
diff changeset
  1008
        case Some(st) =>
79f5e843e5ec clarified signature: prefer high-level Snapshot over low-level Command.State;
wenzelm
parents: 72719
diff changeset
  1009
          val command = st.command
79f5e843e5ec clarified signature: prefer high-level Snapshot over low-level Command.State;
wenzelm
parents: 72719
diff changeset
  1010
          val node_name = command.node_name
76912
ca872f20cf5b clarified session sources: theory and blobs are read from database, instead of physical file-system;
wenzelm
parents: 76905
diff changeset
  1011
          val doc_blobs = document_blobs(node_name)
72721
79f5e843e5ec clarified signature: prefer high-level Snapshot over low-level Command.State;
wenzelm
parents: 72719
diff changeset
  1012
          val command1 =
72861
3f5e6da08687 clarified protocol: support "isabelle log" on failed theories as well;
wenzelm
parents: 72860
diff changeset
  1013
            Command.unparsed(command.source, theory = true, id = id, node_name = node_name,
72816
ea4f86914cb2 support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents: 72780
diff changeset
  1014
              blobs_info = command.blobs_info, results = st.results, markups = st.markups)
72861
3f5e6da08687 clarified protocol: support "isabelle log" on failed theories as well;
wenzelm
parents: 72860
diff changeset
  1015
          val state1 = copy(theories = theories - id)
76912
ca872f20cf5b clarified session sources: theory and blobs are read from database, instead of physical file-system;
wenzelm
parents: 76905
diff changeset
  1016
          (state1.snippet(command1, doc_blobs), state1)
72692
22aeec526ffd support for PIDE markup in batch build (inactive due to pide_reports=false);
wenzelm
parents: 72669
diff changeset
  1017
      }
22aeec526ffd support for PIDE markup in batch build (inactive due to pide_reports=false);
wenzelm
parents: 72669
diff changeset
  1018
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
  1019
    def assign(
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
  1020
      id: Document_ID.Version,
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
  1021
      edited: List[String],
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
  1022
      update: Assign_Update
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
  1023
    ) : ((List[Node.Name], List[Command]), State) = {
38417
b8922ae21111 renamed class Document to Document.Version etc.;
wenzelm
parents: 38414
diff changeset
  1024
      val version = the_version(id)
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
  1025
70284
3e17c3a5fd39 more thorough assignment, e.g. when "purge" removes commands that were not assigned;
wenzelm
parents: 69633
diff changeset
  1026
      val edited_set = edited.toSet
3e17c3a5fd39 more thorough assignment, e.g. when "purge" removes commands that were not assigned;
wenzelm
parents: 69633
diff changeset
  1027
      val edited_nodes =
3e17c3a5fd39 more thorough assignment, e.g. when "purge" removes commands that were not assigned;
wenzelm
parents: 69633
diff changeset
  1028
        (for { (name, _) <- version.nodes.iterator if edited_set(name.node) } yield name).toList
3e17c3a5fd39 more thorough assignment, e.g. when "purge" removes commands that were not assigned;
wenzelm
parents: 69633
diff changeset
  1029
76759
wenzelm
parents: 76715
diff changeset
  1030
      def upd(
wenzelm
parents: 76715
diff changeset
  1031
        exec_id: Document_ID.Exec,
wenzelm
parents: 76715
diff changeset
  1032
        st: Command.State
wenzelm
parents: 76715
diff changeset
  1033
      ): Option[(Document_ID.Exec, Command.State)] = {
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52564
diff changeset
  1034
        if (execs.isDefinedAt(exec_id)) None else Some(exec_id -> st)
76759
wenzelm
parents: 76715
diff changeset
  1035
      }
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52564
diff changeset
  1036
44543
ba8f24f7156e de-assigned commands also count as changed;
wenzelm
parents: 44484
diff changeset
  1037
      val (changed_commands, new_execs) =
73361
wenzelm
parents: 73359
diff changeset
  1038
        update.foldLeft((List.empty[Command], execs)) {
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52564
diff changeset
  1039
          case ((commands1, execs1), (command_id, exec)) =>
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52564
diff changeset
  1040
            val st = the_static_state(command_id)
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52564
diff changeset
  1041
            val command = st.command
52527
dbac84eab3bc separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents: 52508
diff changeset
  1042
            val commands2 = command :: commands1
44543
ba8f24f7156e de-assigned commands also count as changed;
wenzelm
parents: 44484
diff changeset
  1043
            val execs2 =
ba8f24f7156e de-assigned commands also count as changed;
wenzelm
parents: 44484
diff changeset
  1044
              exec match {
52527
dbac84eab3bc separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents: 52508
diff changeset
  1045
                case Nil => execs1
dbac84eab3bc separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents: 52508
diff changeset
  1046
                case eval_id :: print_ids =>
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52564
diff changeset
  1047
                  execs1 ++ upd(eval_id, st) ++
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52564
diff changeset
  1048
                    (for (id <- print_ids; up <- upd(id, command.empty_state)) yield up)
44543
ba8f24f7156e de-assigned commands also count as changed;
wenzelm
parents: 44484
diff changeset
  1049
              }
ba8f24f7156e de-assigned commands also count as changed;
wenzelm
parents: 44484
diff changeset
  1050
            (commands2, execs2)
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
  1051
        }
52563
f9a20c2c3b70 tuned protocol terminology;
wenzelm
parents: 52531
diff changeset
  1052
      val new_assignment = the_assignment(version).assign(update)
43722
9b5dadb0c28d propagate header changes to prover process;
wenzelm
parents: 43715
diff changeset
  1053
      val new_state = copy(assignments = assignments + (id -> new_assignment), execs = new_execs)
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44475
diff changeset
  1054
70284
3e17c3a5fd39 more thorough assignment, e.g. when "purge" removes commands that were not assigned;
wenzelm
parents: 69633
diff changeset
  1055
      ((edited_nodes, changed_commands), new_state)
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
  1056
    }
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
  1057
38417
b8922ae21111 renamed class Document to Document.Version etc.;
wenzelm
parents: 38414
diff changeset
  1058
    def is_assigned(version: Version): Boolean =
43722
9b5dadb0c28d propagate header changes to prover process;
wenzelm
parents: 43715
diff changeset
  1059
      assignments.get(version.id) match {
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
  1060
        case Some(assgn) => assgn.is_finished
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
  1061
        case None => false
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
  1062
      }
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
  1063
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44385
diff changeset
  1064
    def is_stable(change: Change): Boolean =
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44385
diff changeset
  1065
      change.is_finished && is_assigned(change.version.get_finished)
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44385
diff changeset
  1066
46944
9fc22eb6408c more recent recent_syntax, e.g. relevant for document rendering during startup;
wenzelm
parents: 46942
diff changeset
  1067
    def recent_finished: Change = history.undo_list.find(_.is_finished) getOrElse fail
44672
07dad1433cd7 some support to prune_history;
wenzelm
parents: 44642
diff changeset
  1068
    def recent_stable: Change = history.undo_list.find(is_stable) getOrElse fail
60933
6d03e05ef041 more robust access to stable tip version: take all pending edits into account, don't assume model for current buffer;
wenzelm
parents: 60916
diff changeset
  1069
    def stable_tip_version: Option[Version] =
6d03e05ef041 more robust access to stable tip version: take all pending edits into account, don't assume model for current buffer;
wenzelm
parents: 60916
diff changeset
  1070
      if (is_stable(history.tip)) Some(history.tip.version.get_finished) else None
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44385
diff changeset
  1071
44446
f9334afb6945 misc tuning and simplification;
wenzelm
parents: 44443
diff changeset
  1072
    def continue_history(
56711
ef3d00153e3b tuned signature;
wenzelm
parents: 56590
diff changeset
  1073
      previous: Future[Version],
ef3d00153e3b tuned signature;
wenzelm
parents: 56590
diff changeset
  1074
      edits: List[Edit_Text],
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
  1075
      version: Future[Version]
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
  1076
    ): State = {
46678
c2dba08548f9 more abstract class Document.Change;
wenzelm
parents: 46677
diff changeset
  1077
      val change = Change.make(previous, edits, version)
56711
ef3d00153e3b tuned signature;
wenzelm
parents: 56590
diff changeset
  1078
      copy(history = history + change)
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
  1079
    }
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
  1080
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
  1081
    def remove_versions(retain: Int = 0): (List[Version], State) = {
46679
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
  1082
      history.prune(is_stable, retain) match {
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
  1083
        case Some((dropped, history1)) =>
57976
bf99106b6672 postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
wenzelm
parents: 57842
diff changeset
  1084
          val old_versions = dropped.map(change => change.version.get_finished)
59319
wenzelm
parents: 59077
diff changeset
  1085
          val removing = old_versions.nonEmpty
57976
bf99106b6672 postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
wenzelm
parents: 57842
diff changeset
  1086
          val state1 = copy(history = history1, removing_versions = removing)
bf99106b6672 postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
wenzelm
parents: 57842
diff changeset
  1087
          (old_versions, state1)
46679
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
  1088
        case None => fail
44672
07dad1433cd7 some support to prune_history;
wenzelm
parents: 44642
diff changeset
  1089
      }
07dad1433cd7 some support to prune_history;
wenzelm
parents: 44642
diff changeset
  1090
    }
07dad1433cd7 some support to prune_history;
wenzelm
parents: 44642
diff changeset
  1091
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
  1092
    def removed_versions(removed: List[Document_ID.Version]): State = {
68300
cd8ab1a7a286 retain isolated blob nodes (amending deb2fcbda16e): avoid failure of Session.handle_change with "Missing blob", when opening theory with load command later;
wenzelm
parents: 68299
diff changeset
  1093
      val versions1 = Version.purge_suppressed(versions -- removed)
67110
3156faac30a7 purge hidden nodes more thoroughly: is_hidden may become true only later;
wenzelm
parents: 67014
diff changeset
  1094
44676
7de87f1ae965 Document.removed_versions on Scala side;
wenzelm
parents: 44672
diff changeset
  1095
      val assignments1 = assignments -- removed
67112
deb2fcbda16e removed inaccessible blobs from Document.Nodes;
wenzelm
parents: 67110
diff changeset
  1096
      var blobs1_names = Set.empty[Node.Name]
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54515
diff changeset
  1097
      var blobs1 = Set.empty[SHA1.Digest]
52530
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
  1098
      var commands1 = Map.empty[Document_ID.Command, Command.State]
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
  1099
      var execs1 = Map.empty[Document_ID.Exec, Command.State]
44676
7de87f1ae965 Document.removed_versions on Scala side;
wenzelm
parents: 44672
diff changeset
  1100
      for {
67112
deb2fcbda16e removed inaccessible blobs from Document.Nodes;
wenzelm
parents: 67110
diff changeset
  1101
        (version_id, version) <- versions1.iterator
46997
395b7277ed76 misc tuning to accomodate scala-2.10.0-M2;
wenzelm
parents: 46944
diff changeset
  1102
        command_execs = assignments1(version_id).command_execs
56372
fadb0fef09d7 more explicit iterator terminology, in accordance to Scala 2.8 library;
wenzelm
parents: 56354
diff changeset
  1103
        (_, node) <- version.nodes.iterator
44676
7de87f1ae965 Document.removed_versions on Scala side;
wenzelm
parents: 44672
diff changeset
  1104
        command <- node.commands.iterator
7de87f1ae965 Document.removed_versions on Scala side;
wenzelm
parents: 44672
diff changeset
  1105
      } {
67112
deb2fcbda16e removed inaccessible blobs from Document.Nodes;
wenzelm
parents: 67110
diff changeset
  1106
        for ((name, digest) <- command.blobs_defined) {
deb2fcbda16e removed inaccessible blobs from Document.Nodes;
wenzelm
parents: 67110
diff changeset
  1107
          blobs1_names += name
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54515
diff changeset
  1108
          blobs1 += digest
67112
deb2fcbda16e removed inaccessible blobs from Document.Nodes;
wenzelm
parents: 67110
diff changeset
  1109
        }
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54515
diff changeset
  1110
76759
wenzelm
parents: 76715
diff changeset
  1111
        if (!commands1.isDefinedAt(command.id)) {
52568
wenzelm
parents: 52566
diff changeset
  1112
          commands.get(command.id).foreach(st => commands1 += (command.id -> st))
76759
wenzelm
parents: 76715
diff changeset
  1113
        }
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54515
diff changeset
  1114
76760
wenzelm
parents: 76759
diff changeset
  1115
        for {
wenzelm
parents: 76759
diff changeset
  1116
          exec_id <- command_execs.getOrElse(command.id, Nil)
wenzelm
parents: 76759
diff changeset
  1117
          if !execs1.isDefinedAt(exec_id)
wenzelm
parents: 76759
diff changeset
  1118
          st <- execs.get(exec_id)
wenzelm
parents: 76759
diff changeset
  1119
        } execs1 += (exec_id -> st)
44676
7de87f1ae965 Document.removed_versions on Scala side;
wenzelm
parents: 44672
diff changeset
  1120
      }
67112
deb2fcbda16e removed inaccessible blobs from Document.Nodes;
wenzelm
parents: 67110
diff changeset
  1121
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
  1122
      copy(
68300
cd8ab1a7a286 retain isolated blob nodes (amending deb2fcbda16e): avoid failure of Session.handle_change with "Missing blob", when opening theory with load command later;
wenzelm
parents: 68299
diff changeset
  1123
        versions = versions1,
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
  1124
        blobs = blobs1,
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
  1125
        commands = commands1,
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
  1126
        execs = execs1,
70699
3eb30d80cee6 tuned signature;
wenzelm
parents: 70692
diff changeset
  1127
        commands_redirection = commands_redirection.restrict(commands1.keySet),
57976
bf99106b6672 postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
wenzelm
parents: 57842
diff changeset
  1128
        assignments = assignments1,
68300
cd8ab1a7a286 retain isolated blob nodes (amending deb2fcbda16e): avoid failure of Session.handle_change with "Missing blob", when opening theory with load command later;
wenzelm
parents: 68299
diff changeset
  1129
        history = history.purge(versions1),
57976
bf99106b6672 postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
wenzelm
parents: 57842
diff changeset
  1130
        removing_versions = false)
44676
7de87f1ae965 Document.removed_versions on Scala side;
wenzelm
parents: 44672
diff changeset
  1131
    }
7de87f1ae965 Document.removed_versions on Scala side;
wenzelm
parents: 44672
diff changeset
  1132
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
  1133
    def command_maybe_consolidated(version: Version, command: Command): Boolean = {
73120
c3589f2dff31 more informative errors: simplify diagnosis of spurious failures reported by users;
wenzelm
parents: 73031
diff changeset
  1134
      require(is_assigned(version), "version not assigned (command_maybe_consolidated)")
68381
2fd3a6d6ba2e less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents: 68365
diff changeset
  1135
      try {
2fd3a6d6ba2e less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents: 68365
diff changeset
  1136
        the_assignment(version).check_finished.command_execs.getOrElse(command.id, Nil) match {
70780
034742453594 more robust: avoid update/interrupt of long-running print_consolidation;
wenzelm
parents: 70716
diff changeset
  1137
          case eval_id :: print_ids =>
034742453594 more robust: avoid update/interrupt of long-running print_consolidation;
wenzelm
parents: 70716
diff changeset
  1138
            the_dynamic_state(eval_id).maybe_consolidated &&
034742453594 more robust: avoid update/interrupt of long-running print_consolidation;
wenzelm
parents: 70716
diff changeset
  1139
            !print_ids.exists(print_id => the_dynamic_state(print_id).consolidating)
034742453594 more robust: avoid update/interrupt of long-running print_consolidation;
wenzelm
parents: 70716
diff changeset
  1140
          case Nil => false
68381
2fd3a6d6ba2e less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents: 68365
diff changeset
  1141
        }
2fd3a6d6ba2e less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents: 68365
diff changeset
  1142
      }
70780
034742453594 more robust: avoid update/interrupt of long-running print_consolidation;
wenzelm
parents: 70716
diff changeset
  1143
      catch { case _: State.Fail => false }
68381
2fd3a6d6ba2e less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents: 68365
diff changeset
  1144
    }
2fd3a6d6ba2e less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents: 68365
diff changeset
  1145
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
  1146
    private def command_states_self(
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
  1147
      version: Version,
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
  1148
      command: Command
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
  1149
    ) : List[(Document_ID.Generic, Command.State)] = {
73120
c3589f2dff31 more informative errors: simplify diagnosis of spurious failures reported by users;
wenzelm
parents: 73031
diff changeset
  1150
      require(is_assigned(version), "version not assigned (command_states_self)")
44613
a3255c85327b crude display of node status;
wenzelm
parents: 44607
diff changeset
  1151
      try {
52527
dbac84eab3bc separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents: 52508
diff changeset
  1152
        the_assignment(version).check_finished.command_execs.getOrElse(command.id, Nil)
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
  1153
          .map(id => id -> the_dynamic_state(id)) match {
52527
dbac84eab3bc separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents: 52508
diff changeset
  1154
            case Nil => fail
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
  1155
            case res => res
52527
dbac84eab3bc separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents: 52508
diff changeset
  1156
          }
44613
a3255c85327b crude display of node status;
wenzelm
parents: 44607
diff changeset
  1157
      }
47395
e6261a493f04 added static command status markup, to emphasize accepted but unassigned/unparsed commands (notably in overview panel);
wenzelm
parents: 47388
diff changeset
  1158
      catch {
e6261a493f04 added static command status markup, to emphasize accepted but unassigned/unparsed commands (notably in overview panel);
wenzelm
parents: 47388
diff changeset
  1159
        case _: State.Fail =>
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
  1160
          try { List(command.id -> the_static_state(command.id)) }
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
  1161
          catch { case _: State.Fail => List(command.id -> command.init_state) }
47395
e6261a493f04 added static command status markup, to emphasize accepted but unassigned/unparsed commands (notably in overview panel);
wenzelm
parents: 47388
diff changeset
  1162
      }
44613
a3255c85327b crude display of node status;
wenzelm
parents: 44607
diff changeset
  1163
    }
a3255c85327b crude display of node status;
wenzelm
parents: 44607
diff changeset
  1164
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
  1165
    def command_states(version: Version, command: Command): List[Command.State] = {
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
  1166
      val self = command_states_self(version, command)
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
  1167
      val others =
56475
710dee42b3d0 tuned signature;
wenzelm
parents: 56473
diff changeset
  1168
        if (commands_redirection.defined(command.id)) {
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
  1169
          (for {
56475
710dee42b3d0 tuned signature;
wenzelm
parents: 56473
diff changeset
  1170
            command_id <- commands_redirection.imm_succs(command.id).iterator
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
  1171
            (id, st) <- command_states_self(version, the_static_state(command_id).command)
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
  1172
            if !self.exists(_._1 == id)
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
  1173
          } yield (id, st)).toMap.valuesIterator.toList
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
  1174
        }
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
  1175
        else Nil
56489
wenzelm
parents: 56475
diff changeset
  1176
      self.map(_._2) ::: others.flatMap(_.redirect(command))
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
  1177
    }
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
  1178
56299
8201790fdeb9 more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents: 56298
diff changeset
  1179
    def command_results(version: Version, command: Command): Command.Results =
8201790fdeb9 more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents: 56298
diff changeset
  1180
      Command.State.merge_results(command_states(version, command))
8201790fdeb9 more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents: 56298
diff changeset
  1181
56301
1da7b4c33db9 more frugal merge of markup trees: filter wrt. subsequent query;
wenzelm
parents: 56300
diff changeset
  1182
    def command_markup(version: Version, command: Command, index: Command.Markup_Index,
56743
81370dfadb1d tuned signature;
wenzelm
parents: 56711
diff changeset
  1183
        range: Text.Range, elements: Markup.Elements): Markup_Tree =
56301
1da7b4c33db9 more frugal merge of markup trees: filter wrt. subsequent query;
wenzelm
parents: 56300
diff changeset
  1184
      Command.State.merge_markup(command_states(version, command), index, range, elements)
56299
8201790fdeb9 more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents: 56298
diff changeset
  1185
72723
3b804e0ffae9 clarified signature;
wenzelm
parents: 72722
diff changeset
  1186
    def xml_markup(
66041
c49bd8bb4839 clarified signature;
wenzelm
parents: 66040
diff changeset
  1187
      version: Version,
67264
16f74b7c248a PIDE markup for non-theory nodes;
wenzelm
parents: 67251
diff changeset
  1188
      node_name: Node.Name,
72723
3b804e0ffae9 clarified signature;
wenzelm
parents: 72722
diff changeset
  1189
      range: Text.Range = Text.Range.full,
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
  1190
      elements: Markup.Elements = Markup.Elements.full
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
  1191
    ): XML.Body = {
67264
16f74b7c248a PIDE markup for non-theory nodes;
wenzelm
parents: 67251
diff changeset
  1192
      val node = version.nodes(node_name)
16f74b7c248a PIDE markup for non-theory nodes;
wenzelm
parents: 67251
diff changeset
  1193
      if (node_name.is_theory) {
16f74b7c248a PIDE markup for non-theory nodes;
wenzelm
parents: 67251
diff changeset
  1194
        val markup_index = Command.Markup_Index.markup
16f74b7c248a PIDE markup for non-theory nodes;
wenzelm
parents: 67251
diff changeset
  1195
        (for {
16f74b7c248a PIDE markup for non-theory nodes;
wenzelm
parents: 67251
diff changeset
  1196
          command <- node.commands.iterator
16f74b7c248a PIDE markup for non-theory nodes;
wenzelm
parents: 67251
diff changeset
  1197
          command_range <- command.range.try_restrict(range).iterator
16f74b7c248a PIDE markup for non-theory nodes;
wenzelm
parents: 67251
diff changeset
  1198
          markup = command_markup(version, command, markup_index, command_range, elements)
16f74b7c248a PIDE markup for non-theory nodes;
wenzelm
parents: 67251
diff changeset
  1199
          tree <- markup.to_XML(command_range, command.source, elements).iterator
16f74b7c248a PIDE markup for non-theory nodes;
wenzelm
parents: 67251
diff changeset
  1200
        } yield tree).toList
16f74b7c248a PIDE markup for non-theory nodes;
wenzelm
parents: 67251
diff changeset
  1201
      }
76924
fc24cf493202 tuned signature;
wenzelm
parents: 76917
diff changeset
  1202
      else if (node.source_wellformed) {
76235
16c12979c132 tuned signature;
wenzelm
parents: 76204
diff changeset
  1203
        Text.Range.length(node.source).try_restrict(range) match {
67264
16f74b7c248a PIDE markup for non-theory nodes;
wenzelm
parents: 67251
diff changeset
  1204
          case Some(node_range) =>
16f74b7c248a PIDE markup for non-theory nodes;
wenzelm
parents: 67251
diff changeset
  1205
            val markup =
16f74b7c248a PIDE markup for non-theory nodes;
wenzelm
parents: 67251
diff changeset
  1206
              version.nodes.commands_loading(node_name).headOption match {
16f74b7c248a PIDE markup for non-theory nodes;
wenzelm
parents: 67251
diff changeset
  1207
                case None => Markup_Tree.empty
16f74b7c248a PIDE markup for non-theory nodes;
wenzelm
parents: 67251
diff changeset
  1208
                case Some(command) =>
16f74b7c248a PIDE markup for non-theory nodes;
wenzelm
parents: 67251
diff changeset
  1209
                  val chunk_name = Symbol.Text_Chunk.File(node_name.node)
16f74b7c248a PIDE markup for non-theory nodes;
wenzelm
parents: 67251
diff changeset
  1210
                  val markup_index = Command.Markup_Index(false, chunk_name)
16f74b7c248a PIDE markup for non-theory nodes;
wenzelm
parents: 67251
diff changeset
  1211
                  command_markup(version, command, markup_index, node_range, elements)
16f74b7c248a PIDE markup for non-theory nodes;
wenzelm
parents: 67251
diff changeset
  1212
              }
76204
b80b2fbc46c3 clarified signature: persistent Node.source / Snapshot.source;
wenzelm
parents: 75914
diff changeset
  1213
            markup.to_XML(node_range, node.source, elements)
76917
302bdbb3bc05 more robust;
wenzelm
parents: 76916
diff changeset
  1214
          case None => Nil
67264
16f74b7c248a PIDE markup for non-theory nodes;
wenzelm
parents: 67251
diff changeset
  1215
        }
16f74b7c248a PIDE markup for non-theory nodes;
wenzelm
parents: 67251
diff changeset
  1216
      }
76917
302bdbb3bc05 more robust;
wenzelm
parents: 76916
diff changeset
  1217
      else Nil
66041
c49bd8bb4839 clarified signature;
wenzelm
parents: 66040
diff changeset
  1218
    }
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
  1219
68323
bf7336731981 more node status information;
wenzelm
parents: 68322
diff changeset
  1220
    def node_initialized(version: Version, name: Node.Name): Boolean =
bf7336731981 more node status information;
wenzelm
parents: 68322
diff changeset
  1221
      name.is_theory &&
bf7336731981 more node status information;
wenzelm
parents: 68322
diff changeset
  1222
      (version.nodes(name).commands.iterator.find(_.potentially_initialized) match {
bf7336731981 more node status information;
wenzelm
parents: 68322
diff changeset
  1223
        case None => false
bf7336731981 more node status information;
wenzelm
parents: 68322
diff changeset
  1224
        case Some(command) => command_states(version, command).headOption.exists(_.initialized)
bf7336731981 more node status information;
wenzelm
parents: 68322
diff changeset
  1225
      })
bf7336731981 more node status information;
wenzelm
parents: 68322
diff changeset
  1226
68381
2fd3a6d6ba2e less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents: 68365
diff changeset
  1227
    def node_maybe_consolidated(version: Version, name: Node.Name): Boolean =
2fd3a6d6ba2e less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents: 68365
diff changeset
  1228
      name.is_theory &&
70780
034742453594 more robust: avoid update/interrupt of long-running print_consolidation;
wenzelm
parents: 70716
diff changeset
  1229
      version.nodes(name).commands.reverse.iterator.forall(command_maybe_consolidated(version, _))
68381
2fd3a6d6ba2e less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents: 68365
diff changeset
  1230
66379
6392766f3c25 maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
wenzelm
parents: 66195
diff changeset
  1231
    def node_consolidated(version: Version, name: Node.Name): Boolean =
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
  1232
      !name.is_theory || {
68335
2f080a51a10d clarified: consolidated result is last command;
wenzelm
parents: 68323
diff changeset
  1233
        val it = version.nodes(name).commands.reverse.iterator
73344
f5c147654661 tuned --- fewer warnings;
wenzelm
parents: 73340
diff changeset
  1234
        it.hasNext && command_states(version, it.next()).exists(_.consolidated)
68335
2f080a51a10d clarified: consolidated result is last command;
wenzelm
parents: 68323
diff changeset
  1235
      }
66379
6392766f3c25 maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
wenzelm
parents: 66195
diff changeset
  1236
72816
ea4f86914cb2 support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents: 72780
diff changeset
  1237
    def snapshot(
72818
55792cb3892f clarified signature;
wenzelm
parents: 72817
diff changeset
  1238
      node_name: Node.Name = Node.Name.empty,
76765
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
  1239
      pending_edits: Pending_Edits = Pending_Edits.empty,
75393
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
  1240
      snippet_command: Option[Command] = None
87ebf5a50283 clarified formatting, for the sake of scala3;
wenzelm
parents: 73361
diff changeset
  1241
    ): Snapshot = {
72819
wenzelm
parents: 72818
diff changeset
  1242
      val stable = recent_stable
72820
af1bd8f2760f clarified signature;
wenzelm
parents: 72819
diff changeset
  1243
      val version = stable.version.get_finished
57620
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
  1244
76765
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
  1245
      val pending_edits1 =
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
  1246
        (for {
57620
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
  1247
          change <- history.undo_list.takeWhile(_ != stable)
76765
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
  1248
          (name, Node.Edits(es)) <- change.rev_edits
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
  1249
        } yield (name -> es)).foldLeft(pending_edits)(_ + _)
57620
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
  1250
76765
c654103e9c9d more robust Document.Pending_Edits: cover all nodes simulataneously, and thus support proper Snapshot.switch;
wenzelm
parents: 76760
diff changeset
  1251
      new Snapshot(this, version, node_name, pending_edits1, snippet_command)
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents: 37849
diff changeset
  1252
    }
72859
2b8a328138a6 clarified signature;
wenzelm
parents: 72844
diff changeset
  1253
76912
ca872f20cf5b clarified session sources: theory and blobs are read from database, instead of physical file-system;
wenzelm
parents: 76905
diff changeset
  1254
    def snippet(command: Command, doc_blobs: Blobs): Snapshot =
ca872f20cf5b clarified session sources: theory and blobs are read from database, instead of physical file-system;
wenzelm
parents: 76905
diff changeset
  1255
      snapshot().snippet(command, doc_blobs)
34485
6475bfb4ff99 joined Document with ProofDocument;
wenzelm
parents: 34483
diff changeset
  1256
  }
34840
6c5560d48561 more precise treatment of document/state assigment;
wenzelm
parents: 34838
diff changeset
  1257
}