src/Pure/PIDE/document.scala
author wenzelm
Sat, 15 Aug 2015 18:59:31 +0200
changeset 60933 6d03e05ef041
parent 60916 a6e2a667b0a8
child 61023 46df28442a80
permissions -rw-r--r--
more robust access to stable tip version: take all pending edits into account, don't assume model for current buffer;
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
34823
2f3ea37c5958 renamed Proof_Document to Document;
wenzelm
parents: 34819
diff changeset
    14
object Document
34483
0923926022d7 superficial tuning;
wenzelm
parents: 34482
diff changeset
    15
{
38424
940a404e45e2 moved History/Snapshot to document.scala;
wenzelm
parents: 38418
diff changeset
    16
  /** document structure **/
940a404e45e2 moved History/Snapshot to document.scala;
wenzelm
parents: 38418
diff changeset
    17
52977
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    18
  /* overlays -- print functions with arguments */
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    19
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    20
  object Overlays
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
    val empty = new Overlays(Map.empty)
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    23
  }
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    24
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    25
  final class Overlays private(rep: Map[Node.Name, Node.Overlays])
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    26
  {
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    27
    def apply(name: Document.Node.Name): Node.Overlays =
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    28
      rep.getOrElse(name, Node.Overlays.empty)
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    29
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    30
    private def update(name: Node.Name, f: Node.Overlays => Node.Overlays): Overlays =
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
      val node_overlays = f(apply(name))
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    33
      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
    34
    }
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    35
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    36
    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
    37
      update(command.node_name, _.insert(command, fn, args))
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    38
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    39
    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
    40
      update(command.node_name, _.remove(command, fn, args))
55800
wenzelm
parents: 55783
diff changeset
    41
wenzelm
parents: 55783
diff changeset
    42
    override def toString: String = rep.mkString("Overlays(", ",", ")")
52977
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    43
  }
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    44
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
    45
55783
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    46
  /* document blobs: auxiliary files */
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    47
56746
d37a5d09a277 tuned signature;
wenzelm
parents: 56743
diff changeset
    48
  sealed case class Blob(bytes: Bytes, chunk: Symbol.Text_Chunk, changed: Boolean)
56335
8953d4cc060a store blob content within document node: aux. files that were once open are made persistent;
wenzelm
parents: 56314
diff changeset
    49
  {
8953d4cc060a store blob content within document node: aux. files that were once open are made persistent;
wenzelm
parents: 56314
diff changeset
    50
    def unchanged: Blob = copy(changed = false)
8953d4cc060a store blob content within document node: aux. files that were once open are made persistent;
wenzelm
parents: 56314
diff changeset
    51
  }
55783
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    52
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    53
  object Blobs
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    54
  {
56336
60434514ec0a tuned signature -- more static typing;
wenzelm
parents: 56335
diff changeset
    55
    def apply(blobs: Map[Node.Name, Blob]): Blobs = new Blobs(blobs)
55783
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    56
    val empty: Blobs = apply(Map.empty)
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    57
  }
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    58
56336
60434514ec0a tuned signature -- more static typing;
wenzelm
parents: 56335
diff changeset
    59
  final class Blobs private(blobs: Map[Node.Name, Blob])
55783
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    60
  {
56336
60434514ec0a tuned signature -- more static typing;
wenzelm
parents: 56335
diff changeset
    61
    def get(name: Node.Name): Option[Blob] = blobs.get(name)
55783
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    62
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    63
    def changed(name: Node.Name): Boolean =
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    64
      get(name) match {
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    65
        case Some(blob) => blob.changed
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    66
        case None => false
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    67
      }
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    68
55800
wenzelm
parents: 55783
diff changeset
    69
    override def toString: String = blobs.mkString("Blobs(", ",", ")")
55783
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    70
  }
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    71
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    72
da0513d95155 more formal Document.Blobs;
wenzelm
parents: 55782
diff changeset
    73
  /* document nodes: theories and auxiliary files */
38424
940a404e45e2 moved History/Snapshot to document.scala;
wenzelm
parents: 38418
diff changeset
    74
44615
a4ff8a787202 more abstract Document.Node.Name;
wenzelm
parents: 44613
diff changeset
    75
  type Edit[A, B] = (Node.Name, Node.Edit[A, B])
44384
8f6054a63f96 some support for editor perspective;
wenzelm
parents: 44383
diff changeset
    76
  type Edit_Text = Edit[Text.Edit, Text.Perspective]
52849
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52808
diff changeset
    77
  type Edit_Command = Edit[Command.Edit, Command.Perspective]
38151
2837c952ca31 explicit Change.Snapshot and Document.Node;
wenzelm
parents: 38150
diff changeset
    78
2837c952ca31 explicit Change.Snapshot and Document.Node;
wenzelm
parents: 38150
diff changeset
    79
  object Node
2837c952ca31 explicit Change.Snapshot and Document.Node;
wenzelm
parents: 38150
diff changeset
    80
  {
52887
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
    81
    /* header and name */
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
    82
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 48706
diff changeset
    83
    sealed case class Header(
59695
a03e0561bdbf clarified positions of theory imports;
wenzelm
parents: 59372
diff changeset
    84
      imports: List[(Name, Position.T)],
48706
e2b512024eab tuned signature;
wenzelm
parents: 47395
diff changeset
    85
      keywords: Thy_Header.Keywords,
57615
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
    86
      errors: List[String])
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 48706
diff changeset
    87
    {
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 48706
diff changeset
    88
      def error(msg: String): Header = copy(errors = errors ::: List(msg))
54549
2a3053472ec3 actually expose errors of cumulative theory dependencies;
wenzelm
parents: 54530
diff changeset
    89
2a3053472ec3 actually expose errors of cumulative theory dependencies;
wenzelm
parents: 54530
diff changeset
    90
      def cat_errors(msg2: String): Header =
2a3053472ec3 actually expose errors of cumulative theory dependencies;
wenzelm
parents: 54530
diff changeset
    91
        copy(errors = errors.map(msg1 => Library.cat_message(msg1, msg2)))
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 48706
diff changeset
    92
    }
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 48706
diff changeset
    93
57615
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
    94
    val no_header = Header(Nil, Nil, Nil)
51294
0850d43cb355 discontinued obsolete header "files" -- these are loaded explicitly after exploring dependencies;
wenzelm
parents: 51293
diff changeset
    95
    def bad_header(msg: String): Header = Header(Nil, Nil, List(msg))
46737
09ab89658a5d clarified module Thy_Load;
wenzelm
parents: 46723
diff changeset
    96
44957
098dd95349e7 more elaborate Node_Renderer, which paints node_name.theory only;
wenzelm
parents: 44676
diff changeset
    97
    object Name
098dd95349e7 more elaborate Node_Renderer, which paints node_name.theory only;
wenzelm
parents: 44676
diff changeset
    98
    {
54515
570ba266f5b5 clarified boundary cases of Document.Node.Name;
wenzelm
parents: 54513
diff changeset
    99
      val empty = Name("")
46723
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   100
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   101
      object Ordering extends scala.math.Ordering[Name]
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   102
      {
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   103
        def compare(name1: Name, name2: Name): Int = name1.node compare name2.node
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   104
      }
44957
098dd95349e7 more elaborate Node_Renderer, which paints node_name.theory only;
wenzelm
parents: 44676
diff changeset
   105
    }
52887
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   106
54515
570ba266f5b5 clarified boundary cases of Document.Node.Name;
wenzelm
parents: 54513
diff changeset
   107
    sealed case class Name(node: String, master_dir: String = "", theory: String = "")
44615
a4ff8a787202 more abstract Document.Node.Name;
wenzelm
parents: 44613
diff changeset
   108
    {
a4ff8a787202 more abstract Document.Node.Name;
wenzelm
parents: 44613
diff changeset
   109
      override def hashCode: Int = node.hashCode
a4ff8a787202 more abstract Document.Node.Name;
wenzelm
parents: 44613
diff changeset
   110
      override def equals(that: Any): Boolean =
a4ff8a787202 more abstract Document.Node.Name;
wenzelm
parents: 44613
diff changeset
   111
        that match {
a4ff8a787202 more abstract Document.Node.Name;
wenzelm
parents: 44613
diff changeset
   112
          case other: Name => node == other.node
a4ff8a787202 more abstract Document.Node.Name;
wenzelm
parents: 44613
diff changeset
   113
          case _ => false
a4ff8a787202 more abstract Document.Node.Name;
wenzelm
parents: 44613
diff changeset
   114
        }
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
   115
59319
wenzelm
parents: 59077
diff changeset
   116
      def is_theory: Boolean = theory.nonEmpty
54510
wenzelm
parents: 54509
diff changeset
   117
      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
   118
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
   119
      def map(f: String => String): Name = copy(f(node), f(master_dir), theory)
44615
a4ff8a787202 more abstract Document.Node.Name;
wenzelm
parents: 44613
diff changeset
   120
    }
a4ff8a787202 more abstract Document.Node.Name;
wenzelm
parents: 44613
diff changeset
   121
52887
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   122
52977
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
   123
    /* node overlays */
52887
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   124
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   125
    object Overlays
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   126
    {
52976
c3d82d58beaf tuned -- use Multi_Map;
wenzelm
parents: 52972
diff changeset
   127
      val empty = new Overlays(Multi_Map.empty)
52887
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   128
    }
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   129
52977
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
   130
    final class Overlays private(rep: Multi_Map[Command, (String, List[String])])
52887
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   131
    {
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   132
      def commands: Set[Command] = rep.keySet
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   133
      def is_empty: Boolean = rep.isEmpty
52977
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
   134
      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
   135
      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
   136
        new Overlays(rep.insert(cmd, (fn, args)))
15254e32d299 central management of Document.Overlays, independent of Document_Model;
wenzelm
parents: 52976
diff changeset
   137
      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
   138
        new Overlays(rep.remove(cmd, (fn, args)))
55800
wenzelm
parents: 55783
diff changeset
   139
wenzelm
parents: 55783
diff changeset
   140
      override def toString: String = rep.mkString("Node.Overlays(", ",", ")")
52887
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   141
    }
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   142
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   143
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   144
    /* edits */
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   145
44384
8f6054a63f96 some support for editor perspective;
wenzelm
parents: 44383
diff changeset
   146
    sealed abstract class Edit[A, B]
44156
6aa25b80e1a5 explicit datatypes for document node edits;
wenzelm
parents: 43780
diff changeset
   147
    {
44383
f99906c2a1d3 discontinued redundant Edit_Command_ID;
wenzelm
parents: 44222
diff changeset
   148
      def foreach(f: A => Unit)
f99906c2a1d3 discontinued redundant Edit_Command_ID;
wenzelm
parents: 44222
diff changeset
   149
      {
44156
6aa25b80e1a5 explicit datatypes for document node edits;
wenzelm
parents: 43780
diff changeset
   150
        this match {
44383
f99906c2a1d3 discontinued redundant Edit_Command_ID;
wenzelm
parents: 44222
diff changeset
   151
          case Edits(es) => es.foreach(f)
f99906c2a1d3 discontinued redundant Edit_Command_ID;
wenzelm
parents: 44222
diff changeset
   152
          case _ =>
44156
6aa25b80e1a5 explicit datatypes for document node edits;
wenzelm
parents: 43780
diff changeset
   153
        }
44383
f99906c2a1d3 discontinued redundant Edit_Command_ID;
wenzelm
parents: 44222
diff changeset
   154
      }
57621
caa37976801f more frugal edits;
wenzelm
parents: 57620
diff changeset
   155
caa37976801f more frugal edits;
wenzelm
parents: 57620
diff changeset
   156
      def is_void: Boolean =
caa37976801f more frugal edits;
wenzelm
parents: 57620
diff changeset
   157
        this match {
caa37976801f more frugal edits;
wenzelm
parents: 57620
diff changeset
   158
          case Edits(Nil) => true
caa37976801f more frugal edits;
wenzelm
parents: 57620
diff changeset
   159
          case _ => false
caa37976801f more frugal edits;
wenzelm
parents: 57620
diff changeset
   160
        }
44156
6aa25b80e1a5 explicit datatypes for document node edits;
wenzelm
parents: 43780
diff changeset
   161
    }
44384
8f6054a63f96 some support for editor perspective;
wenzelm
parents: 44383
diff changeset
   162
    case class Clear[A, B]() extends Edit[A, B]
56335
8953d4cc060a store blob content within document node: aux. files that were once open are made persistent;
wenzelm
parents: 56314
diff changeset
   163
    case class Blob[A, B](blob: Document.Blob) 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
   164
44384
8f6054a63f96 some support for editor perspective;
wenzelm
parents: 44383
diff changeset
   165
    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
   166
    case class Deps[A, B](header: Header) extends Edit[A, B]
52849
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52808
diff changeset
   167
    case class Perspective[A, B](required: Boolean, visible: B, overlays: Overlays) extends Edit[A, B]
57610
518e28a7c74b tuned signature;
wenzelm
parents: 56801
diff changeset
   168
518e28a7c74b tuned signature;
wenzelm
parents: 56801
diff changeset
   169
518e28a7c74b tuned signature;
wenzelm
parents: 56801
diff changeset
   170
    /* perspective */
518e28a7c74b tuned signature;
wenzelm
parents: 56801
diff changeset
   171
52808
143f225e50f5 allow explicit indication of required node: full eval, no prints;
wenzelm
parents: 52568
diff changeset
   172
    type Perspective_Text = Perspective[Text.Edit, Text.Perspective]
52849
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52808
diff changeset
   173
    type Perspective_Command = Perspective[Command.Edit, Command.Perspective]
44156
6aa25b80e1a5 explicit datatypes for document node edits;
wenzelm
parents: 43780
diff changeset
   174
57615
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   175
    val no_perspective_text: Perspective_Text =
57610
518e28a7c74b tuned signature;
wenzelm
parents: 56801
diff changeset
   176
      Perspective(false, Text.Perspective.empty, Overlays.empty)
518e28a7c74b tuned signature;
wenzelm
parents: 56801
diff changeset
   177
57615
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   178
    val no_perspective_command: Perspective_Command =
57614
wenzelm
parents: 57610
diff changeset
   179
      Perspective(false, Command.Perspective.empty, Overlays.empty)
wenzelm
parents: 57610
diff changeset
   180
57615
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   181
    def is_no_perspective_command(perspective: Perspective_Command): Boolean =
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   182
      !perspective.required &&
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   183
      perspective.visible.is_empty &&
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   184
      perspective.overlays.is_empty
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   185
52887
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   186
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   187
    /* commands */
98eac7b7eec3 tuned signature;
wenzelm
parents: 52862
diff changeset
   188
52901
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   189
    object Commands
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   190
    {
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   191
      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
   192
      val empty: Commands = apply(Linear_Set.empty)
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   193
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   194
      def starts(commands: Iterator[Command], offset: Text.Offset = 0)
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   195
        : Iterator[(Command, Text.Offset)] =
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   196
      {
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   197
        var i = offset
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   198
        for (command <- commands) yield {
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   199
          val start = i
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   200
          i += command.length
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   201
          (command, start)
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   202
        }
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   203
      }
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   204
56398
15d0821c8667 afford larger full_index, to save a few milliseconds during rendering (notably text_overview);
wenzelm
parents: 56394
diff changeset
   205
      private val block_size = 256
52901
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   206
    }
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   207
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   208
    final class Commands private(val commands: Linear_Set[Command])
38227
6bbb42843b6e concentrate structural document notions in document.scala;
wenzelm
parents: 38220
diff changeset
   209
    {
56314
9a513737a0b2 tuned signature;
wenzelm
parents: 56309
diff changeset
   210
      lazy val load_commands: List[Command] =
59319
wenzelm
parents: 59077
diff changeset
   211
        commands.iterator.filter(cmd => cmd.blobs.nonEmpty).toList
54462
c9bb76303348 explicit indication of thy_load commands;
wenzelm
parents: 54328
diff changeset
   212
52901
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   213
      private lazy val full_index: (Array[(Command, Text.Offset)], Text.Range) =
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   214
      {
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   215
        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
   216
        var next_block = 0
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   217
        var last_stop = 0
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   218
        for ((command, start) <- Commands.starts(commands.iterator)) {
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   219
          last_stop = start + command.length
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   220
          while (last_stop + 1 > next_block) {
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   221
            blocks += (command -> start)
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   222
            next_block += Commands.block_size
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   223
          }
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   224
        }
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   225
        (blocks.toArray, Text.Range(0, last_stop))
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   226
      }
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
      private def full_range: Text.Range = full_index._2
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   229
56373
0605d90be6fc tuned signature -- more explicit iterator terminology;
wenzelm
parents: 56372
diff changeset
   230
      def iterator(i: Text.Offset = 0): Iterator[(Command, Text.Offset)] =
52901
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   231
      {
59319
wenzelm
parents: 59077
diff changeset
   232
        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
   233
          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
   234
          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
   235
            case (cmd, start) => start + cmd.length <= i }
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   236
        }
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   237
        else Iterator.empty
38227
6bbb42843b6e concentrate structural document notions in document.scala;
wenzelm
parents: 38220
diff changeset
   238
      }
6bbb42843b6e concentrate structural document notions in document.scala;
wenzelm
parents: 38220
diff changeset
   239
    }
57614
wenzelm
parents: 57610
diff changeset
   240
wenzelm
parents: 57610
diff changeset
   241
    val empty: Node = new Node()
38151
2837c952ca31 explicit Change.Snapshot and Document.Node;
wenzelm
parents: 38150
diff changeset
   242
  }
2837c952ca31 explicit Change.Snapshot and Document.Node;
wenzelm
parents: 38150
diff changeset
   243
46712
8650d9a95736 prefer final ADTs -- prevent ooddities;
wenzelm
parents: 46684
diff changeset
   244
  final class Node private(
56335
8953d4cc060a store blob content within document node: aux. files that were once open are made persistent;
wenzelm
parents: 56314
diff changeset
   245
    val get_blob: Option[Document.Blob] = None,
57615
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   246
    val header: Node.Header = Node.no_header,
59077
7e0d3da6e6d8 node-specific syntax, with base_syntax as default;
wenzelm
parents: 57976
diff changeset
   247
    val syntax: Option[Prover.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
   248
    val text_perspective: Text.Perspective = Text.Perspective.empty,
57615
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   249
    val perspective: Node.Perspective_Command = Node.no_perspective_command,
52901
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   250
    _commands: Node.Commands = Node.Commands.empty)
38151
2837c952ca31 explicit Change.Snapshot and Document.Node;
wenzelm
parents: 38150
diff changeset
   251
  {
57615
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   252
    def is_empty: Boolean =
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   253
      get_blob.isEmpty &&
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   254
      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
   255
      text_perspective.is_empty &&
57615
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   256
      Node.is_no_perspective_command(perspective) &&
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   257
      commands.isEmpty
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   258
59702
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59695
diff changeset
   259
    def has_header: Boolean = header != Node.no_header
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59695
diff changeset
   260
57615
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   261
    def commands: Linear_Set[Command] = _commands.commands
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   262
    def load_commands: List[Command] = _commands.load_commands
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 57614
diff changeset
   263
59077
7e0d3da6e6d8 node-specific syntax, with base_syntax as default;
wenzelm
parents: 57976
diff changeset
   264
    def clear: Node = new Node(header = header, syntax = syntax)
46680
234f1730582d more abstract class Document.Node;
wenzelm
parents: 46679
diff changeset
   265
59077
7e0d3da6e6d8 node-specific syntax, with base_syntax as default;
wenzelm
parents: 57976
diff changeset
   266
    def init_blob(blob: Document.Blob): Node = new Node(get_blob = Some(blob.unchanged))
55435
662e0fd39823 maintain blob edits within history, which is important for Snapshot.convert/revert;
wenzelm
parents: 55434
diff changeset
   267
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 48706
diff changeset
   268
    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
   269
      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
   270
7e0d3da6e6d8 node-specific syntax, with base_syntax as default;
wenzelm
parents: 57976
diff changeset
   271
    def update_syntax(new_syntax: Option[Prover.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
   272
      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
   273
503739360344 proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
wenzelm
parents: 59319
diff changeset
   274
    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
   275
        new_text_perspective: Text.Perspective,
503739360344 proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
wenzelm
parents: 59319
diff changeset
   276
        new_perspective: Node.Perspective_Command): Node =
503739360344 proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
wenzelm
parents: 59319
diff changeset
   277
      new Node(get_blob, header, syntax, new_text_perspective, new_perspective, _commands)
46680
234f1730582d more abstract class Document.Node;
wenzelm
parents: 46679
diff changeset
   278
59372
503739360344 proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
wenzelm
parents: 59319
diff changeset
   279
    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
   280
      Node.Perspective(perspective.required, text_perspective, perspective.overlays)
46680
234f1730582d more abstract class Document.Node;
wenzelm
parents: 46679
diff changeset
   281
59372
503739360344 proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
wenzelm
parents: 59319
diff changeset
   282
    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
   283
        other_text_perspective: Text.Perspective,
503739360344 proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
wenzelm
parents: 59319
diff changeset
   284
        other_perspective: Node.Perspective_Command): Boolean =
503739360344 proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
wenzelm
parents: 59319
diff changeset
   285
      text_perspective == other_text_perspective &&
52849
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52808
diff changeset
   286
      perspective.required == other_perspective.required &&
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52808
diff changeset
   287
      perspective.visible.same(other_perspective.visible) &&
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52808
diff changeset
   288
      perspective.overlays == other_perspective.overlays
52808
143f225e50f5 allow explicit indication of required node: full eval, no prints;
wenzelm
parents: 52568
diff changeset
   289
52901
8be75f53db82 maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents: 52900
diff changeset
   290
    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
   291
      if (new_commands eq _commands.commands) this
59372
503739360344 proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
wenzelm
parents: 59319
diff changeset
   292
      else
503739360344 proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
wenzelm
parents: 59319
diff changeset
   293
        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
   294
          Node.Commands(new_commands))
38151
2837c952ca31 explicit Change.Snapshot and Document.Node;
wenzelm
parents: 38150
diff changeset
   295
56373
0605d90be6fc tuned signature -- more explicit iterator terminology;
wenzelm
parents: 56372
diff changeset
   296
    def command_iterator(i: Text.Offset = 0): Iterator[(Command, Text.Offset)] =
0605d90be6fc tuned signature -- more explicit iterator terminology;
wenzelm
parents: 56372
diff changeset
   297
      _commands.iterator(i)
38151
2837c952ca31 explicit Change.Snapshot and Document.Node;
wenzelm
parents: 38150
diff changeset
   298
56373
0605d90be6fc tuned signature -- more explicit iterator terminology;
wenzelm
parents: 56372
diff changeset
   299
    def command_iterator(range: Text.Range): Iterator[(Command, Text.Offset)] =
0605d90be6fc tuned signature -- more explicit iterator terminology;
wenzelm
parents: 56372
diff changeset
   300
      command_iterator(range.start) takeWhile { case (_, start) => start < range.stop }
38151
2837c952ca31 explicit Change.Snapshot and Document.Node;
wenzelm
parents: 38150
diff changeset
   301
38879
dde403450419 Document.Node: significant speedup of command_range etc. via lazy full_index;
wenzelm
parents: 38872
diff changeset
   302
    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
   303
      Node.Commands.starts(commands.iterator).find(_._1 == cmd).map(_._2)
38151
2837c952ca31 explicit Change.Snapshot and Document.Node;
wenzelm
parents: 38150
diff changeset
   304
  }
2837c952ca31 explicit Change.Snapshot and Document.Node;
wenzelm
parents: 38150
diff changeset
   305
2837c952ca31 explicit Change.Snapshot and Document.Node;
wenzelm
parents: 38150
diff changeset
   306
46723
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   307
  /* development graph */
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   308
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   309
  object Nodes
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   310
  {
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   311
    val empty: Nodes = new Nodes(Graph.empty(Node.Name.Ordering))
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   312
  }
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   313
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   314
  final class Nodes private(graph: Graph[Node.Name, Node])
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   315
  {
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   316
    def apply(name: Node.Name): Node =
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   317
      graph.default_node(name, Node.empty).get_node(name)
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   318
57619
dcd69422b953 clarified display;
wenzelm
parents: 57617
diff changeset
   319
    def is_hidden(name: Node.Name): Boolean =
dcd69422b953 clarified display;
wenzelm
parents: 57617
diff changeset
   320
    {
dcd69422b953 clarified display;
wenzelm
parents: 57617
diff changeset
   321
      val graph1 = graph.default_node(name, Node.empty)
dcd69422b953 clarified display;
wenzelm
parents: 57617
diff changeset
   322
      graph1.is_maximal(name) && graph1.get_node(name).is_empty
dcd69422b953 clarified display;
wenzelm
parents: 57617
diff changeset
   323
    }
57617
335750d989a3 clarified display;
wenzelm
parents: 57616
diff changeset
   324
46723
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   325
    def + (entry: (Node.Name, Node)): Nodes =
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   326
    {
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   327
      val (name, node) = entry
59695
a03e0561bdbf clarified positions of theory imports;
wenzelm
parents: 59372
diff changeset
   328
      val imports = node.header.imports.map(_._1)
46723
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   329
      val graph1 =
46739
6024353549ca clarified document nodes (full import graph) vs. node_status (non-preloaded theories);
wenzelm
parents: 46737
diff changeset
   330
        (graph.default_node(name, Node.empty) /: imports)((g, p) => g.default_node(p, Node.empty))
46723
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   331
      val graph2 = (graph1 /: graph1.imm_preds(name))((g, dep) => g.del_edge(dep, name))
46739
6024353549ca clarified document nodes (full import graph) vs. node_status (non-preloaded theories);
wenzelm
parents: 46737
diff changeset
   332
      val graph3 = (graph2 /: imports)((g, dep) => g.add_edge(dep, name))
57616
50ab1db5c0fd avoid redundant data structure;
wenzelm
parents: 57615
diff changeset
   333
      new Nodes(
50ab1db5c0fd avoid redundant data structure;
wenzelm
parents: 57615
diff changeset
   334
        if (graph3.is_maximal(name) && node.is_empty) graph3.del_node(name)
50ab1db5c0fd avoid redundant data structure;
wenzelm
parents: 57615
diff changeset
   335
        else graph3.map_node(name, _ => node)
50ab1db5c0fd avoid redundant data structure;
wenzelm
parents: 57615
diff changeset
   336
      )
46723
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   337
    }
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   338
56372
fadb0fef09d7 more explicit iterator terminology, in accordance to Scala 2.8 library;
wenzelm
parents: 56354
diff changeset
   339
    def iterator: Iterator[(Node.Name, Node)] =
fadb0fef09d7 more explicit iterator terminology, in accordance to Scala 2.8 library;
wenzelm
parents: 56354
diff changeset
   340
      graph.iterator.map({ case (name, (node, _)) => (name, node) })
46723
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   341
56314
9a513737a0b2 tuned signature;
wenzelm
parents: 56309
diff changeset
   342
    def load_commands(file_name: Node.Name): List[Command] =
54528
842adea880a4 refer to thy_load command of auxiliary file;
wenzelm
parents: 54521
diff changeset
   343
      (for {
56372
fadb0fef09d7 more explicit iterator terminology, in accordance to Scala 2.8 library;
wenzelm
parents: 56354
diff changeset
   344
        (_, node) <- iterator
56314
9a513737a0b2 tuned signature;
wenzelm
parents: 56309
diff changeset
   345
        cmd <- node.load_commands.iterator
54530
2c1440f70028 ranges of thy_load commands count as visible within perspective;
wenzelm
parents: 54528
diff changeset
   346
        name <- cmd.blobs_names.iterator
54528
842adea880a4 refer to thy_load command of auxiliary file;
wenzelm
parents: 54521
diff changeset
   347
        if name == file_name
842adea880a4 refer to thy_load command of auxiliary file;
wenzelm
parents: 54521
diff changeset
   348
      } yield cmd).toList
842adea880a4 refer to thy_load command of auxiliary file;
wenzelm
parents: 54521
diff changeset
   349
60916
a6e2a667b0a8 resolve undefined blobs by default, e.g. relevant for ML debugger to avoid reset of breakpoints after reload;
wenzelm
parents: 60215
diff changeset
   350
    def undefined_blobs: List[Node.Name] =
a6e2a667b0a8 resolve undefined blobs by default, e.g. relevant for ML debugger to avoid reset of breakpoints after reload;
wenzelm
parents: 60215
diff changeset
   351
      (for {
a6e2a667b0a8 resolve undefined blobs by default, e.g. relevant for ML debugger to avoid reset of breakpoints after reload;
wenzelm
parents: 60215
diff changeset
   352
        (_, node) <- iterator
a6e2a667b0a8 resolve undefined blobs by default, e.g. relevant for ML debugger to avoid reset of breakpoints after reload;
wenzelm
parents: 60215
diff changeset
   353
        cmd <- node.load_commands.iterator
a6e2a667b0a8 resolve undefined blobs by default, e.g. relevant for ML debugger to avoid reset of breakpoints after reload;
wenzelm
parents: 60215
diff changeset
   354
        name <- cmd.blobs_undefined.iterator
a6e2a667b0a8 resolve undefined blobs by default, e.g. relevant for ML debugger to avoid reset of breakpoints after reload;
wenzelm
parents: 60215
diff changeset
   355
      } yield name).toList
a6e2a667b0a8 resolve undefined blobs by default, e.g. relevant for ML debugger to avoid reset of breakpoints after reload;
wenzelm
parents: 60215
diff changeset
   356
46942
f5c2d66faa04 basic support for outer syntax keywords in theory header;
wenzelm
parents: 46941
diff changeset
   357
    def descendants(names: List[Node.Name]): List[Node.Name] = graph.all_succs(names)
46723
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   358
    def topological_order: List[Node.Name] = graph.topological_order
56337
520148f9921d tuned output;
wenzelm
parents: 56336
diff changeset
   359
520148f9921d tuned output;
wenzelm
parents: 56336
diff changeset
   360
    override def toString: String = topological_order.mkString("Nodes(", ",", ")")
46723
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   361
  }
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   362
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   363
38424
940a404e45e2 moved History/Snapshot to document.scala;
wenzelm
parents: 38418
diff changeset
   364
940a404e45e2 moved History/Snapshot to document.scala;
wenzelm
parents: 38418
diff changeset
   365
  /** versioning **/
940a404e45e2 moved History/Snapshot to document.scala;
wenzelm
parents: 38418
diff changeset
   366
940a404e45e2 moved History/Snapshot to document.scala;
wenzelm
parents: 38418
diff changeset
   367
  /* particular document versions */
34485
6475bfb4ff99 joined Document with ProofDocument;
wenzelm
parents: 34483
diff changeset
   368
38417
b8922ae21111 renamed class Document to Document.Version etc.;
wenzelm
parents: 38414
diff changeset
   369
  object Version
b8922ae21111 renamed class Document to Document.Version etc.;
wenzelm
parents: 38414
diff changeset
   370
  {
46681
c083a3f621c0 more abstract class Document.Version;
wenzelm
parents: 46680
diff changeset
   371
    val init: Version = new Version()
59077
7e0d3da6e6d8 node-specific syntax, with base_syntax as default;
wenzelm
parents: 57976
diff changeset
   372
    def make(nodes: Nodes): Version = new Version(Document_ID.make(), nodes)
38417
b8922ae21111 renamed class Document to Document.Version etc.;
wenzelm
parents: 38414
diff changeset
   373
  }
b8922ae21111 renamed class Document to Document.Version etc.;
wenzelm
parents: 38414
diff changeset
   374
46712
8650d9a95736 prefer final ADTs -- prevent ooddities;
wenzelm
parents: 46684
diff changeset
   375
  final class Version private(
52530
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
   376
    val id: Document_ID.Version = Document_ID.none,
46723
54ea872b60ea more explicit development graph;
wenzelm
parents: 46712
diff changeset
   377
    val nodes: Nodes = Nodes.empty)
46941
c0f776b661fa maintain Version.syntax within document state;
wenzelm
parents: 46940
diff changeset
   378
  {
55777
90484dff4dc4 tuned output;
wenzelm
parents: 55710
diff changeset
   379
    override def toString: String = "Version(" + id + ")"
46941
c0f776b661fa maintain Version.syntax within document state;
wenzelm
parents: 46940
diff changeset
   380
  }
34660
e0561943bfc9 Change consisting of a list of Edits
immler@in.tum.de
parents: 34657
diff changeset
   381
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   382
38424
940a404e45e2 moved History/Snapshot to document.scala;
wenzelm
parents: 38418
diff changeset
   383
  /* changes of plain text, eventually resulting in document edits */
38227
6bbb42843b6e concentrate structural document notions in document.scala;
wenzelm
parents: 38220
diff changeset
   384
6bbb42843b6e concentrate structural document notions in document.scala;
wenzelm
parents: 38220
diff changeset
   385
  object Change
6bbb42843b6e concentrate structural document notions in document.scala;
wenzelm
parents: 38220
diff changeset
   386
  {
46678
c2dba08548f9 more abstract class Document.Change;
wenzelm
parents: 46677
diff changeset
   387
    val init: Change = new Change()
c2dba08548f9 more abstract class Document.Change;
wenzelm
parents: 46677
diff changeset
   388
c2dba08548f9 more abstract class Document.Change;
wenzelm
parents: 46677
diff changeset
   389
    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
   390
      new Change(Some(previous), edits.reverse, version)
38227
6bbb42843b6e concentrate structural document notions in document.scala;
wenzelm
parents: 38220
diff changeset
   391
  }
6bbb42843b6e concentrate structural document notions in document.scala;
wenzelm
parents: 38220
diff changeset
   392
46712
8650d9a95736 prefer final ADTs -- prevent ooddities;
wenzelm
parents: 46684
diff changeset
   393
  final class Change private(
46677
wenzelm
parents: 46208
diff changeset
   394
    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
   395
    val rev_edits: List[Edit_Text] = Nil,
46677
wenzelm
parents: 46208
diff changeset
   396
    val version: Future[Version] = Future.value(Version.init))
38227
6bbb42843b6e concentrate structural document notions in document.scala;
wenzelm
parents: 38220
diff changeset
   397
  {
44672
07dad1433cd7 some support to prune_history;
wenzelm
parents: 44642
diff changeset
   398
    def is_finished: Boolean =
07dad1433cd7 some support to prune_history;
wenzelm
parents: 44642
diff changeset
   399
      (previous match { case None => true case Some(future) => future.is_finished }) &&
07dad1433cd7 some support to prune_history;
wenzelm
parents: 44642
diff changeset
   400
      version.is_finished
07dad1433cd7 some support to prune_history;
wenzelm
parents: 44642
diff changeset
   401
46678
c2dba08548f9 more abstract class Document.Change;
wenzelm
parents: 46677
diff changeset
   402
    def truncate: Change = new Change(None, Nil, version)
38227
6bbb42843b6e concentrate structural document notions in document.scala;
wenzelm
parents: 38220
diff changeset
   403
  }
6bbb42843b6e concentrate structural document notions in document.scala;
wenzelm
parents: 38220
diff changeset
   404
6bbb42843b6e concentrate structural document notions in document.scala;
wenzelm
parents: 38220
diff changeset
   405
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   406
  /* history navigation */
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   407
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   408
  object History
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   409
  {
46679
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   410
    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
   411
  }
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   412
46712
8650d9a95736 prefer final ADTs -- prevent ooddities;
wenzelm
parents: 46684
diff changeset
   413
  final class History private(
46679
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   414
    val undo_list: List[Change] = List(Change.init))  // non-empty list
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   415
  {
46679
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   416
    def tip: Change = undo_list.head
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   417
    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
   418
46679
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   419
    def prune(check: Change => Boolean, retain: Int): Option[(List[Change], History)] =
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   420
    {
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   421
      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
   422
      val (retained, dropped) = undo_list.splitAt(n max retain)
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   423
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   424
      retained.splitAt(retained.length - 1) match {
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   425
        case (prefix, List(last)) => Some(dropped, new History(prefix ::: List(last.truncate)))
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   426
        case _ => None
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   427
      }
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   428
    }
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   429
  }
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   430
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   431
55820
61869776ce1f tuned signature -- more explicit Document.Elements;
wenzelm
parents: 55801
diff changeset
   432
  /* snapshot */
38424
940a404e45e2 moved History/Snapshot to document.scala;
wenzelm
parents: 38418
diff changeset
   433
52972
8fd8e1c14988 tuned signature;
wenzelm
parents: 52918
diff changeset
   434
  object Snapshot
8fd8e1c14988 tuned signature;
wenzelm
parents: 52918
diff changeset
   435
  {
8fd8e1c14988 tuned signature;
wenzelm
parents: 52918
diff changeset
   436
    val init = State.init.snapshot()
8fd8e1c14988 tuned signature;
wenzelm
parents: 52918
diff changeset
   437
  }
8fd8e1c14988 tuned signature;
wenzelm
parents: 52918
diff changeset
   438
38424
940a404e45e2 moved History/Snapshot to document.scala;
wenzelm
parents: 38418
diff changeset
   439
  abstract class Snapshot
940a404e45e2 moved History/Snapshot to document.scala;
wenzelm
parents: 38418
diff changeset
   440
  {
44582
479c07072992 tuned signature;
wenzelm
parents: 44581
diff changeset
   441
    val state: State
38424
940a404e45e2 moved History/Snapshot to document.scala;
wenzelm
parents: 38418
diff changeset
   442
    val version: Version
940a404e45e2 moved History/Snapshot to document.scala;
wenzelm
parents: 38418
diff changeset
   443
    val is_outdated: Boolean
55649
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55620
diff changeset
   444
38427
7066fbd315ae some derived operations on Text.Range;
wenzelm
parents: 38426
diff changeset
   445
    def convert(i: Text.Offset): Text.Offset
52889
ea3338812e67 more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
wenzelm
parents: 52887
diff changeset
   446
    def revert(i: Text.Offset): Text.Offset
39177
0468964aec11 simplified Markup_Tree.select: Stream instead of Iterator (again), explicit Option instead of default;
wenzelm
parents: 38976
diff changeset
   447
    def convert(range: Text.Range): Text.Range
0468964aec11 simplified Markup_Tree.select: Stream instead of Iterator (again), explicit Option instead of default;
wenzelm
parents: 38976
diff changeset
   448
    def revert(range: Text.Range): Text.Range
52972
8fd8e1c14988 tuned signature;
wenzelm
parents: 52918
diff changeset
   449
8fd8e1c14988 tuned signature;
wenzelm
parents: 52918
diff changeset
   450
    val node_name: Node.Name
8fd8e1c14988 tuned signature;
wenzelm
parents: 52918
diff changeset
   451
    val node: Node
56314
9a513737a0b2 tuned signature;
wenzelm
parents: 56309
diff changeset
   452
    val load_commands: List[Command]
56176
0bc9b0ad6287 tuned rendering -- avoid flashing background of aux. files that are disconnected from the document model;
wenzelm
parents: 55820
diff changeset
   453
    def is_loaded: Boolean
51494
8f3d1a7bee26 structural equality for Command.Results;
wenzelm
parents: 51294
diff changeset
   454
    def eq_content(other: Snapshot): Boolean
55649
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55620
diff changeset
   455
55651
fa42cf3fe79b tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents: 55650
diff changeset
   456
    def cumulate[A](
55649
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55620
diff changeset
   457
      range: Text.Range,
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55620
diff changeset
   458
      info: A,
56743
81370dfadb1d tuned signature;
wenzelm
parents: 56711
diff changeset
   459
      elements: Markup.Elements,
56354
a6f8c3566560 more direct command states -- merge_results is hardly ever needed;
wenzelm
parents: 56337
diff changeset
   460
      result: List[Command.State] => (A, Text.Markup) => Option[A],
55651
fa42cf3fe79b tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents: 55650
diff changeset
   461
      status: Boolean = false): List[Text.Info[A]]
fa42cf3fe79b tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents: 55650
diff changeset
   462
fa42cf3fe79b tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents: 55650
diff changeset
   463
    def select[A](
55649
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55620
diff changeset
   464
      range: Text.Range,
56743
81370dfadb1d tuned signature;
wenzelm
parents: 56711
diff changeset
   465
      elements: Markup.Elements,
56354
a6f8c3566560 more direct command states -- merge_results is hardly ever needed;
wenzelm
parents: 56337
diff changeset
   466
      result: List[Command.State] => Text.Markup => Option[A],
55651
fa42cf3fe79b tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents: 55650
diff changeset
   467
      status: Boolean = false): List[Text.Info[A]]
38424
940a404e45e2 moved History/Snapshot to document.scala;
wenzelm
parents: 38418
diff changeset
   468
  }
940a404e45e2 moved History/Snapshot to document.scala;
wenzelm
parents: 38418
diff changeset
   469
55820
61869776ce1f tuned signature -- more explicit Document.Elements;
wenzelm
parents: 55801
diff changeset
   470
61869776ce1f tuned signature -- more explicit Document.Elements;
wenzelm
parents: 55801
diff changeset
   471
61869776ce1f tuned signature -- more explicit Document.Elements;
wenzelm
parents: 55801
diff changeset
   472
  /** global state -- document structure, execution process, editing history **/
61869776ce1f tuned signature -- more explicit Document.Elements;
wenzelm
parents: 55801
diff changeset
   473
52563
f9a20c2c3b70 tuned protocol terminology;
wenzelm
parents: 52531
diff changeset
   474
  type Assign_Update =
f9a20c2c3b70 tuned protocol terminology;
wenzelm
parents: 52531
diff changeset
   475
    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
   476
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   477
  object State
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   478
  {
38373
wenzelm
parents: 38370
diff changeset
   479
    class Fail(state: State) extends Exception
wenzelm
parents: 38370
diff changeset
   480
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44477
diff changeset
   481
    object Assignment
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44477
diff changeset
   482
    {
46683
fb160aa7a9a8 more abstract class Document.State.Assignment;
wenzelm
parents: 46682
diff changeset
   483
      val init: Assignment = new Assignment()
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44477
diff changeset
   484
    }
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   485
46712
8650d9a95736 prefer final ADTs -- prevent ooddities;
wenzelm
parents: 46684
diff changeset
   486
    final class Assignment private(
52530
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
   487
      val command_execs: Map[Document_ID.Command, List[Document_ID.Exec]] = Map.empty,
46677
wenzelm
parents: 46208
diff changeset
   488
      val is_finished: Boolean = false)
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   489
    {
44477
086bb1083552 maintain last_execs assignment on Scala side;
wenzelm
parents: 44476
diff changeset
   490
      def check_finished: Assignment = { require(is_finished); this }
47388
fe4b245af74c discontinued obsolete last_execs (cf. cd3ab7625519);
wenzelm
parents: 46997
diff changeset
   491
      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
   492
52563
f9a20c2c3b70 tuned protocol terminology;
wenzelm
parents: 52531
diff changeset
   493
      def assign(update: Assign_Update): Assignment =
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   494
      {
38976
a4a465dc89d9 Document.State.Assignment: eliminated promise in favour of plain values -- signalling is done via event bus in Session;
wenzelm
parents: 38885
diff changeset
   495
        require(!is_finished)
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44477
diff changeset
   496
        val command_execs1 =
52563
f9a20c2c3b70 tuned protocol terminology;
wenzelm
parents: 52531
diff changeset
   497
          (command_execs /: update) {
f9a20c2c3b70 tuned protocol terminology;
wenzelm
parents: 52531
diff changeset
   498
            case (res, (command_id, exec_ids)) =>
f9a20c2c3b70 tuned protocol terminology;
wenzelm
parents: 52531
diff changeset
   499
              if (exec_ids.isEmpty) res - command_id
f9a20c2c3b70 tuned protocol terminology;
wenzelm
parents: 52531
diff changeset
   500
              else res + (command_id -> exec_ids)
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44477
diff changeset
   501
          }
47388
fe4b245af74c discontinued obsolete last_execs (cf. cd3ab7625519);
wenzelm
parents: 46997
diff changeset
   502
        new Assignment(command_execs1, true)
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents: 37849
diff changeset
   503
      }
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   504
    }
46682
4a74fbd6f28b tuned signature;
wenzelm
parents: 46681
diff changeset
   505
4a74fbd6f28b tuned signature;
wenzelm
parents: 46681
diff changeset
   506
    val init: State =
52563
f9a20c2c3b70 tuned protocol terminology;
wenzelm
parents: 52531
diff changeset
   507
      State().define_version(Version.init, Assignment.init).assign(Version.init.id, Nil)._2
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   508
  }
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   509
46712
8650d9a95736 prefer final ADTs -- prevent ooddities;
wenzelm
parents: 46684
diff changeset
   510
  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
   511
    /*reachable versions*/
60215
5fb4990dfc73 misc tuning, based on warnings by IntelliJ IDEA;
wenzelm
parents: 59702
diff changeset
   512
    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
   513
    /*inlined auxiliary files*/
60215
5fb4990dfc73 misc tuning, based on warnings by IntelliJ IDEA;
wenzelm
parents: 59702
diff changeset
   514
    blobs: Set[SHA1.Digest] = Set.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
   515
    /*static markup from define_command*/
60215
5fb4990dfc73 misc tuning, based on warnings by IntelliJ IDEA;
wenzelm
parents: 59702
diff changeset
   516
    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
   517
    /*dynamic markup from execution*/
60215
5fb4990dfc73 misc tuning, based on warnings by IntelliJ IDEA;
wenzelm
parents: 59702
diff changeset
   518
    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
   519
    /*command-exec assignment for each version*/
60215
5fb4990dfc73 misc tuning, based on warnings by IntelliJ IDEA;
wenzelm
parents: 59702
diff changeset
   520
    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
   521
    /*commands with markup produced by other commands (imm_succs)*/
60215
5fb4990dfc73 misc tuning, based on warnings by IntelliJ IDEA;
wenzelm
parents: 59702
diff changeset
   522
    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
   523
    /*explicit (linear) history*/
60215
5fb4990dfc73 misc tuning, based on warnings by IntelliJ IDEA;
wenzelm
parents: 59702
diff changeset
   524
    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
   525
    /*intermediate state between remove_versions/removed_versions*/
60215
5fb4990dfc73 misc tuning, based on warnings by IntelliJ IDEA;
wenzelm
parents: 59702
diff changeset
   526
    removing_versions: Boolean = false)
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   527
  {
38373
wenzelm
parents: 38370
diff changeset
   528
    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
   529
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44477
diff changeset
   530
    def define_version(version: Version, assignment: State.Assignment): State =
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   531
    {
38417
b8922ae21111 renamed class Document to Document.Version etc.;
wenzelm
parents: 38414
diff changeset
   532
      val id = version.id
b8922ae21111 renamed class Document to Document.Version etc.;
wenzelm
parents: 38414
diff changeset
   533
      copy(versions = versions + (id -> version),
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44477
diff changeset
   534
        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
   535
    }
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   536
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54515
diff changeset
   537
    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
   538
    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
   539
38373
wenzelm
parents: 38370
diff changeset
   540
    def define_command(command: Command): State =
wenzelm
parents: 38370
diff changeset
   541
    {
wenzelm
parents: 38370
diff changeset
   542
      val id = command.id
49414
d7b5fb2e9ca2 some support for inital command markup;
wenzelm
parents: 49346
diff changeset
   543
      copy(commands = commands + (id -> command.init_state))
38373
wenzelm
parents: 38370
diff changeset
   544
    }
wenzelm
parents: 38370
diff changeset
   545
52530
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
   546
    def defined_command(id: Document_ID.Command): Boolean = commands.isDefinedAt(id)
44582
479c07072992 tuned signature;
wenzelm
parents: 44581
diff changeset
   547
52531
21f8e0e151f5 tuned signature;
wenzelm
parents: 52530
diff changeset
   548
    def find_command(version: Version, id: Document_ID.Generic): Option[(Node, Command)] =
44582
479c07072992 tuned signature;
wenzelm
parents: 44581
diff changeset
   549
      commands.get(id) orElse execs.get(id) match {
479c07072992 tuned signature;
wenzelm
parents: 44581
diff changeset
   550
        case None => None
479c07072992 tuned signature;
wenzelm
parents: 44581
diff changeset
   551
        case Some(st) =>
479c07072992 tuned signature;
wenzelm
parents: 44581
diff changeset
   552
          val command = st.command
46681
c083a3f621c0 more abstract class Document.Version;
wenzelm
parents: 46680
diff changeset
   553
          val node = version.nodes(command.node_name)
54328
ffa4e0b1701e more strict find_command -- avoid invalid hyperlink_command;
wenzelm
parents: 52978
diff changeset
   554
          if (node.commands.contains(command)) Some((node, command)) else None
44582
479c07072992 tuned signature;
wenzelm
parents: 44581
diff changeset
   555
      }
38373
wenzelm
parents: 38370
diff changeset
   556
52530
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
   557
    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
   558
    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
   559
    def the_dynamic_state(id: Document_ID.Exec): Command.State = execs.getOrElse(id, fail)
52563
f9a20c2c3b70 tuned protocol terminology;
wenzelm
parents: 52531
diff changeset
   560
    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
   561
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
   562
    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
   563
      id == st.command.id ||
a40e67ce4f84 clarified valid_id: always standardize towards static command.id;
wenzelm
parents: 56176
diff changeset
   564
      (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
   565
56746
d37a5d09a277 tuned signature;
wenzelm
parents: 56743
diff changeset
   566
    private def other_id(id: Document_ID.Generic)
d37a5d09a277 tuned signature;
wenzelm
parents: 56743
diff changeset
   567
      : Option[(Symbol.Text_Chunk.Id, Symbol.Text_Chunk)] = None
56514
db929027e701 ignore other_id reports for now (see 8eda56033203): massive amounts of redirections to 'class' etc. makes it difficult to edit main HOL;
wenzelm
parents: 56489
diff changeset
   568
    /* FIXME
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
   569
      (execs.get(id) orElse commands.get(id)).map(st =>
56746
d37a5d09a277 tuned signature;
wenzelm
parents: 56743
diff changeset
   570
        ((Symbol.Text_Chunk.Id(st.command.id), st.command.chunk)))
56514
db929027e701 ignore other_id reports for now (see 8eda56033203): massive amounts of redirections to 'class' etc. makes it difficult to edit main HOL;
wenzelm
parents: 56489
diff changeset
   571
    */
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
   572
56475
710dee42b3d0 tuned signature;
wenzelm
parents: 56473
diff changeset
   573
    private def redirection(st: Command.State): Graph[Document_ID.Command, Unit] =
710dee42b3d0 tuned signature;
wenzelm
parents: 56473
diff changeset
   574
      (commands_redirection /: st.markups.redirection_iterator)({ case (graph, 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
   575
        graph.default_node(id, ()).default_node(st.command.id, ()).add_edge(id, st.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
   576
52531
21f8e0e151f5 tuned signature;
wenzelm
parents: 52530
diff changeset
   577
    def accumulate(id: Document_ID.Generic, message: XML.Elem): (Command.State, 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
   578
    {
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   579
      execs.get(id) match {
44446
f9334afb6945 misc tuning and simplification;
wenzelm
parents: 44443
diff changeset
   580
        case Some(st) =>
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
   581
          val new_st = st.accumulate(self_id(st), other_id _, message)
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
   582
          val execs1 = execs + (id -> new_st)
56475
710dee42b3d0 tuned signature;
wenzelm
parents: 56473
diff changeset
   583
          (new_st, copy(execs = execs1, commands_redirection = redirection(new_st)))
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   584
        case None =>
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   585
          commands.get(id) match {
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   586
            case Some(st) =>
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
   587
              val new_st = st.accumulate(self_id(st), other_id _, message)
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
   588
              val commands1 = commands + (id -> new_st)
56475
710dee42b3d0 tuned signature;
wenzelm
parents: 56473
diff changeset
   589
              (new_st, copy(commands = commands1, commands_redirection = redirection(new_st)))
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   590
            case None => fail
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   591
          }
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   592
      }
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
   593
    }
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   594
52563
f9a20c2c3b70 tuned protocol terminology;
wenzelm
parents: 52531
diff changeset
   595
    def assign(id: Document_ID.Version, update: Assign_Update): (List[Command], State) =
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   596
    {
38417
b8922ae21111 renamed class Document to Document.Version etc.;
wenzelm
parents: 38414
diff changeset
   597
      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
   598
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52564
diff changeset
   599
      def upd(exec_id: Document_ID.Exec, st: Command.State)
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52564
diff changeset
   600
          : Option[(Document_ID.Exec, Command.State)] =
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52564
diff changeset
   601
        if (execs.isDefinedAt(exec_id)) None else Some(exec_id -> st)
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52564
diff changeset
   602
44543
ba8f24f7156e de-assigned commands also count as changed;
wenzelm
parents: 44484
diff changeset
   603
      val (changed_commands, new_execs) =
52563
f9a20c2c3b70 tuned protocol terminology;
wenzelm
parents: 52531
diff changeset
   604
        ((Nil: List[Command], execs) /: update) {
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52564
diff changeset
   605
          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
   606
            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
   607
            val command = st.command
52527
dbac84eab3bc separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents: 52508
diff changeset
   608
            val commands2 = command :: commands1
44543
ba8f24f7156e de-assigned commands also count as changed;
wenzelm
parents: 44484
diff changeset
   609
            val execs2 =
ba8f24f7156e de-assigned commands also count as changed;
wenzelm
parents: 44484
diff changeset
   610
              exec match {
52527
dbac84eab3bc separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents: 52508
diff changeset
   611
                case Nil => execs1
dbac84eab3bc separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents: 52508
diff changeset
   612
                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
   613
                  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
   614
                    (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
   615
              }
ba8f24f7156e de-assigned commands also count as changed;
wenzelm
parents: 44484
diff changeset
   616
            (commands2, execs2)
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   617
        }
52563
f9a20c2c3b70 tuned protocol terminology;
wenzelm
parents: 52531
diff changeset
   618
      val new_assignment = the_assignment(version).assign(update)
43722
9b5dadb0c28d propagate header changes to prover process;
wenzelm
parents: 43715
diff changeset
   619
      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
   620
44543
ba8f24f7156e de-assigned commands also count as changed;
wenzelm
parents: 44484
diff changeset
   621
      (changed_commands, new_state)
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   622
    }
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   623
38417
b8922ae21111 renamed class Document to Document.Version etc.;
wenzelm
parents: 38414
diff changeset
   624
    def is_assigned(version: Version): Boolean =
43722
9b5dadb0c28d propagate header changes to prover process;
wenzelm
parents: 43715
diff changeset
   625
      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
   626
        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
   627
        case None => false
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   628
      }
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   629
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44385
diff changeset
   630
    def is_stable(change: Change): Boolean =
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44385
diff changeset
   631
      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
   632
46944
9fc22eb6408c more recent recent_syntax, e.g. relevant for document rendering during startup;
wenzelm
parents: 46942
diff changeset
   633
    def recent_finished: Change = history.undo_list.find(_.is_finished) getOrElse fail
44672
07dad1433cd7 some support to prune_history;
wenzelm
parents: 44642
diff changeset
   634
    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
   635
    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
   636
      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
   637
44446
f9334afb6945 misc tuning and simplification;
wenzelm
parents: 44443
diff changeset
   638
    def continue_history(
56711
ef3d00153e3b tuned signature;
wenzelm
parents: 56590
diff changeset
   639
      previous: Future[Version],
ef3d00153e3b tuned signature;
wenzelm
parents: 56590
diff changeset
   640
      edits: List[Edit_Text],
ef3d00153e3b tuned signature;
wenzelm
parents: 56590
diff changeset
   641
      version: Future[Version]): State =
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   642
    {
46678
c2dba08548f9 more abstract class Document.Change;
wenzelm
parents: 46677
diff changeset
   643
      val change = Change.make(previous, edits, version)
56711
ef3d00153e3b tuned signature;
wenzelm
parents: 56590
diff changeset
   644
      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
   645
    }
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   646
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
   647
    def remove_versions(retain: Int = 0): (List[Version], State) =
44672
07dad1433cd7 some support to prune_history;
wenzelm
parents: 44642
diff changeset
   648
    {
46679
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   649
      history.prune(is_stable, retain) match {
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   650
        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
   651
          val old_versions = dropped.map(change => change.version.get_finished)
59319
wenzelm
parents: 59077
diff changeset
   652
          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
   653
          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
   654
          (old_versions, state1)
46679
bce11e807488 more abstract class Document.History;
wenzelm
parents: 46678
diff changeset
   655
        case None => fail
44672
07dad1433cd7 some support to prune_history;
wenzelm
parents: 44642
diff changeset
   656
      }
07dad1433cd7 some support to prune_history;
wenzelm
parents: 44642
diff changeset
   657
    }
07dad1433cd7 some support to prune_history;
wenzelm
parents: 44642
diff changeset
   658
52530
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
   659
    def removed_versions(removed: List[Document_ID.Version]): State =
44676
7de87f1ae965 Document.removed_versions on Scala side;
wenzelm
parents: 44672
diff changeset
   660
    {
7de87f1ae965 Document.removed_versions on Scala side;
wenzelm
parents: 44672
diff changeset
   661
      val versions1 = versions -- removed
7de87f1ae965 Document.removed_versions on Scala side;
wenzelm
parents: 44672
diff changeset
   662
      val assignments1 = assignments -- removed
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54515
diff changeset
   663
      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
   664
      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
   665
      var execs1 = Map.empty[Document_ID.Exec, Command.State]
44676
7de87f1ae965 Document.removed_versions on Scala side;
wenzelm
parents: 44672
diff changeset
   666
      for {
7de87f1ae965 Document.removed_versions on Scala side;
wenzelm
parents: 44672
diff changeset
   667
        (version_id, version) <- versions1.iterator
46997
395b7277ed76 misc tuning to accomodate scala-2.10.0-M2;
wenzelm
parents: 46944
diff changeset
   668
        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
   669
        (_, node) <- version.nodes.iterator
44676
7de87f1ae965 Document.removed_versions on Scala side;
wenzelm
parents: 44672
diff changeset
   670
        command <- node.commands.iterator
7de87f1ae965 Document.removed_versions on Scala side;
wenzelm
parents: 44672
diff changeset
   671
      } {
57842
8e4ae2db1849 more direct access to persistent blobs (see also 8953d4cc060a), avoiding fragile digest lookup from later version (which might have removed unused blobs already);
wenzelm
parents: 57621
diff changeset
   672
        for ((_, digest) <- command.blobs_defined; if !blobs1.contains(digest))
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54515
diff changeset
   673
          blobs1 += digest
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54515
diff changeset
   674
52568
wenzelm
parents: 52566
diff changeset
   675
        if (!commands1.isDefinedAt(command.id))
wenzelm
parents: 52566
diff changeset
   676
          commands.get(command.id).foreach(st => commands1 += (command.id -> st))
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54515
diff changeset
   677
52568
wenzelm
parents: 52566
diff changeset
   678
        for (exec_id <- command_execs.getOrElse(command.id, Nil)) {
52527
dbac84eab3bc separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents: 52508
diff changeset
   679
          if (!execs1.isDefinedAt(exec_id))
dbac84eab3bc separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents: 52508
diff changeset
   680
            execs.get(exec_id).foreach(st => execs1 += (exec_id -> st))
44676
7de87f1ae965 Document.removed_versions on Scala side;
wenzelm
parents: 44672
diff changeset
   681
        }
7de87f1ae965 Document.removed_versions on Scala side;
wenzelm
parents: 44672
diff changeset
   682
      }
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
   683
      copy(
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
   684
        versions = versions1,
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
   685
        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
   686
        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
   687
        execs = execs1,
56475
710dee42b3d0 tuned signature;
wenzelm
parents: 56473
diff changeset
   688
        commands_redirection = commands_redirection.restrict(commands1.isDefinedAt(_)),
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
   689
        assignments = assignments1,
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
   690
        removing_versions = false)
44676
7de87f1ae965 Document.removed_versions on Scala side;
wenzelm
parents: 44672
diff changeset
   691
    }
7de87f1ae965 Document.removed_versions on Scala side;
wenzelm
parents: 44672
diff changeset
   692
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
   693
    private def command_states_self(version: Version, command: 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
   694
      : List[(Document_ID.Generic, Command.State)] =
44613
a3255c85327b crude display of node status;
wenzelm
parents: 44607
diff changeset
   695
    {
a3255c85327b crude display of node status;
wenzelm
parents: 44607
diff changeset
   696
      require(is_assigned(version))
a3255c85327b crude display of node status;
wenzelm
parents: 44607
diff changeset
   697
      try {
52527
dbac84eab3bc separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents: 52508
diff changeset
   698
        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
   699
          .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
   700
            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
   701
            case res => res
52527
dbac84eab3bc separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents: 52508
diff changeset
   702
          }
44613
a3255c85327b crude display of node status;
wenzelm
parents: 44607
diff changeset
   703
      }
47395
e6261a493f04 added static command status markup, to emphasize accepted but unassigned/unparsed commands (notably in overview panel);
wenzelm
parents: 47388
diff changeset
   704
      catch {
e6261a493f04 added static command status markup, to emphasize accepted but unassigned/unparsed commands (notably in overview panel);
wenzelm
parents: 47388
diff changeset
   705
        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
   706
          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
   707
          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
   708
      }
44613
a3255c85327b crude display of node status;
wenzelm
parents: 44607
diff changeset
   709
    }
a3255c85327b crude display of node status;
wenzelm
parents: 44607
diff changeset
   710
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
   711
    def command_states(version: Version, command: Command): List[Command.State] =
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
   712
    {
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
   713
      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
   714
      val others =
56475
710dee42b3d0 tuned signature;
wenzelm
parents: 56473
diff changeset
   715
        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
   716
          (for {
56475
710dee42b3d0 tuned signature;
wenzelm
parents: 56473
diff changeset
   717
            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
   718
            (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
   719
            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
   720
          } 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
   721
        }
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
   722
        else Nil
56489
wenzelm
parents: 56475
diff changeset
   723
      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
   724
    }
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56468
diff changeset
   725
56299
8201790fdeb9 more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents: 56298
diff changeset
   726
    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
   727
      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
   728
56301
1da7b4c33db9 more frugal merge of markup trees: filter wrt. subsequent query;
wenzelm
parents: 56300
diff changeset
   729
    def command_markup(version: Version, command: Command, index: Command.Markup_Index,
56743
81370dfadb1d tuned signature;
wenzelm
parents: 56711
diff changeset
   730
        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
   731
      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
   732
56743
81370dfadb1d tuned signature;
wenzelm
parents: 56711
diff changeset
   733
    def markup_to_XML(version: Version, node: Node, elements: Markup.Elements): XML.Body =
56299
8201790fdeb9 more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents: 56298
diff changeset
   734
      (for {
8201790fdeb9 more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents: 56298
diff changeset
   735
        command <- node.commands.iterator
56301
1da7b4c33db9 more frugal merge of markup trees: filter wrt. subsequent query;
wenzelm
parents: 56300
diff changeset
   736
        markup =
1da7b4c33db9 more frugal merge of markup trees: filter wrt. subsequent query;
wenzelm
parents: 56300
diff changeset
   737
          command_markup(version, command, Command.Markup_Index.markup, command.range, elements)
56300
8346b664fa7a tuned signature;
wenzelm
parents: 56299
diff changeset
   738
        tree <- markup.to_XML(command.range, command.source, elements)
56299
8201790fdeb9 more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents: 56298
diff changeset
   739
      } yield tree).toList
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   740
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   741
    // persistent user-view
49346
977cf0788b30 more efficient painting based on cached result;
wenzelm
parents: 48923
diff changeset
   742
    def snapshot(name: Node.Name = Node.Name.empty, pending_edits: List[Text.Edit] = Nil)
977cf0788b30 more efficient painting based on cached result;
wenzelm
parents: 48923
diff changeset
   743
      : Snapshot =
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   744
    {
44672
07dad1433cd7 some support to prune_history;
wenzelm
parents: 44642
diff changeset
   745
      val stable = recent_stable
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44385
diff changeset
   746
      val latest = history.tip
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   747
57620
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
   748
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
   749
      /* pending edits and unstable changes */
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
   750
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
   751
      val rev_pending_changes =
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
   752
        for {
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
   753
          change <- history.undo_list.takeWhile(_ != stable)
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
   754
          (a, edits) <- change.rev_edits
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
   755
          if a == name
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
   756
        } yield edits
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
   757
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
   758
      val is_cleared = rev_pending_changes.exists({ case Node.Clear() => true case _ => false })
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   759
      val edits =
57620
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
   760
        if (is_cleared) Nil
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
   761
        else
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
   762
          (pending_edits /: rev_pending_changes)({
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
   763
            case (edits, Node.Edits(es)) => es ::: edits
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
   764
            case (edits, _) => edits
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
   765
          })
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   766
      lazy val reverse_edits = edits.reverse
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   767
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   768
      new Snapshot
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   769
      {
52972
8fd8e1c14988 tuned signature;
wenzelm
parents: 52918
diff changeset
   770
        /* global information */
8fd8e1c14988 tuned signature;
wenzelm
parents: 52918
diff changeset
   771
44582
479c07072992 tuned signature;
wenzelm
parents: 44581
diff changeset
   772
        val state = State.this
39698
625a3bc4417b tuned signature;
wenzelm
parents: 39621
diff changeset
   773
        val version = stable.version.get_finished
59319
wenzelm
parents: 59077
diff changeset
   774
        val is_outdated = pending_edits.nonEmpty || latest != stable
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   775
55649
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55620
diff changeset
   776
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55620
diff changeset
   777
        /* local node content */
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55620
diff changeset
   778
57620
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
   779
        def convert(offset: Text.Offset) =
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
   780
          if (is_cleared) 0 else (offset /: edits)((i, edit) => edit.convert(i))
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
   781
        def revert(offset: Text.Offset) =
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
   782
          if (is_cleared) 0 else (offset /: reverse_edits)((i, edit) => edit.revert(i))
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
   783
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
   784
        def convert(range: Text.Range) = range.map(convert(_))
c30ab960875e more explicit treatment of cleared nodes (removal is implicit);
wenzelm
parents: 57619
diff changeset
   785
        def revert(range: Text.Range) = range.map(revert(_))
39177
0468964aec11 simplified Markup_Tree.select: Stream instead of Iterator (again), explicit Option instead of default;
wenzelm
parents: 38976
diff changeset
   786
52972
8fd8e1c14988 tuned signature;
wenzelm
parents: 52918
diff changeset
   787
        val node_name = name
8fd8e1c14988 tuned signature;
wenzelm
parents: 52918
diff changeset
   788
        val node = version.nodes(name)
8fd8e1c14988 tuned signature;
wenzelm
parents: 52918
diff changeset
   789
56314
9a513737a0b2 tuned signature;
wenzelm
parents: 56309
diff changeset
   790
        val load_commands: List[Command] =
55432
9c53198dbb1c maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents: 55431
diff changeset
   791
          if (node_name.is_theory) Nil
56314
9a513737a0b2 tuned signature;
wenzelm
parents: 56309
diff changeset
   792
          else version.nodes.load_commands(node_name)
55432
9c53198dbb1c maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents: 55431
diff changeset
   793
59319
wenzelm
parents: 59077
diff changeset
   794
        val is_loaded: Boolean = node_name.is_theory || load_commands.nonEmpty
56176
0bc9b0ad6287 tuned rendering -- avoid flashing background of aux. files that are disconnected from the document model;
wenzelm
parents: 55820
diff changeset
   795
51494
8f3d1a7bee26 structural equality for Command.Results;
wenzelm
parents: 51294
diff changeset
   796
        def eq_content(other: Snapshot): Boolean =
55434
aa2918d967f0 more accurate eq_content;
wenzelm
parents: 55432
diff changeset
   797
        {
aa2918d967f0 more accurate eq_content;
wenzelm
parents: 55432
diff changeset
   798
          def eq_commands(commands: (Command, Command)): Boolean =
56299
8201790fdeb9 more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents: 56298
diff changeset
   799
          {
8201790fdeb9 more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents: 56298
diff changeset
   800
            val states1 = state.command_states(version, commands._1)
8201790fdeb9 more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents: 56298
diff changeset
   801
            val states2 = other.state.command_states(other.version, commands._2)
8201790fdeb9 more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents: 56298
diff changeset
   802
            states1.length == states2.length &&
8201790fdeb9 more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents: 56298
diff changeset
   803
            (states1 zip states2).forall({ case (st1, st2) => st1 eq_content st2 })
8201790fdeb9 more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents: 56298
diff changeset
   804
          }
55434
aa2918d967f0 more accurate eq_content;
wenzelm
parents: 55432
diff changeset
   805
49346
977cf0788b30 more efficient painting based on cached result;
wenzelm
parents: 48923
diff changeset
   806
          !is_outdated && !other.is_outdated &&
55434
aa2918d967f0 more accurate eq_content;
wenzelm
parents: 55432
diff changeset
   807
          node.commands.size == other.node.commands.size &&
aa2918d967f0 more accurate eq_content;
wenzelm
parents: 55432
diff changeset
   808
          (node.commands.iterator zip other.node.commands.iterator).forall(eq_commands) &&
56314
9a513737a0b2 tuned signature;
wenzelm
parents: 56309
diff changeset
   809
          load_commands.length == other.load_commands.length &&
9a513737a0b2 tuned signature;
wenzelm
parents: 56309
diff changeset
   810
          (load_commands zip other.load_commands).forall(eq_commands)
55434
aa2918d967f0 more accurate eq_content;
wenzelm
parents: 55432
diff changeset
   811
        }
49346
977cf0788b30 more efficient painting based on cached result;
wenzelm
parents: 48923
diff changeset
   812
55649
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55620
diff changeset
   813
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55620
diff changeset
   814
        /* cumulate markup */
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55620
diff changeset
   815
55651
fa42cf3fe79b tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents: 55650
diff changeset
   816
        def cumulate[A](
55649
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55620
diff changeset
   817
          range: Text.Range,
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55620
diff changeset
   818
          info: A,
56743
81370dfadb1d tuned signature;
wenzelm
parents: 56711
diff changeset
   819
          elements: Markup.Elements,
56354
a6f8c3566560 more direct command states -- merge_results is hardly ever needed;
wenzelm
parents: 56337
diff changeset
   820
          result: List[Command.State] => (A, Text.Markup) => Option[A],
55651
fa42cf3fe79b tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents: 55650
diff changeset
   821
          status: Boolean = false): List[Text.Info[A]] =
45459
a5c1599f664d added markup_cumulate operator;
wenzelm
parents: 45243
diff changeset
   822
        {
56590
d01d183e84ea clarified treatment of markup ranges wrt. revert/convert: inflate_singularity allows to retrieve information like language_context more reliably during editing;
wenzelm
parents: 56514
diff changeset
   823
          val former_range = revert(range).inflate_singularity
56462
b64b0cb845fe more explicit Command.Chunk types, less ooddities;
wenzelm
parents: 56398
diff changeset
   824
          val (chunk_name, command_iterator) =
56314
9a513737a0b2 tuned signature;
wenzelm
parents: 56309
diff changeset
   825
            load_commands match {
56746
d37a5d09a277 tuned signature;
wenzelm
parents: 56743
diff changeset
   826
              case command :: _ => (Symbol.Text_Chunk.File(node_name.node), Iterator((command, 0)))
d37a5d09a277 tuned signature;
wenzelm
parents: 56743
diff changeset
   827
              case _ => (Symbol.Text_Chunk.Default, node.command_iterator(former_range))
56309
5003ea266aef tuned -- avoid code duplication;
wenzelm
parents: 56301
diff changeset
   828
            }
56462
b64b0cb845fe more explicit Command.Chunk types, less ooddities;
wenzelm
parents: 56398
diff changeset
   829
          val markup_index = Command.Markup_Index(status, chunk_name)
56309
5003ea266aef tuned -- avoid code duplication;
wenzelm
parents: 56301
diff changeset
   830
          (for {
56373
0605d90be6fc tuned signature -- more explicit iterator terminology;
wenzelm
parents: 56372
diff changeset
   831
            (command, command_start) <- command_iterator
56462
b64b0cb845fe more explicit Command.Chunk types, less ooddities;
wenzelm
parents: 56398
diff changeset
   832
            chunk <- command.chunks.get(chunk_name).iterator
56309
5003ea266aef tuned -- avoid code duplication;
wenzelm
parents: 56301
diff changeset
   833
            states = state.command_states(version, command)
56354
a6f8c3566560 more direct command states -- merge_results is hardly ever needed;
wenzelm
parents: 56337
diff changeset
   834
            res = result(states)
56590
d01d183e84ea clarified treatment of markup ranges wrt. revert/convert: inflate_singularity allows to retrieve information like language_context more reliably during editing;
wenzelm
parents: 56514
diff changeset
   835
            markup_range <- (former_range - command_start).try_restrict(chunk.range).iterator
d01d183e84ea clarified treatment of markup ranges wrt. revert/convert: inflate_singularity allows to retrieve information like language_context more reliably during editing;
wenzelm
parents: 56514
diff changeset
   836
            markup = Command.State.merge_markup(states, markup_index, markup_range, elements)
d01d183e84ea clarified treatment of markup ranges wrt. revert/convert: inflate_singularity allows to retrieve information like language_context more reliably during editing;
wenzelm
parents: 56514
diff changeset
   837
            Text.Info(r0, a) <- markup.cumulate[A](markup_range, info, elements,
56309
5003ea266aef tuned -- avoid code duplication;
wenzelm
parents: 56301
diff changeset
   838
              {
5003ea266aef tuned -- avoid code duplication;
wenzelm
parents: 56301
diff changeset
   839
                case (a, Text.Info(r0, b)) => res(a, Text.Info(convert(r0 + command_start), b))
5003ea266aef tuned -- avoid code duplication;
wenzelm
parents: 56301
diff changeset
   840
              }).iterator
56590
d01d183e84ea clarified treatment of markup ranges wrt. revert/convert: inflate_singularity allows to retrieve information like language_context more reliably during editing;
wenzelm
parents: 56514
diff changeset
   841
            r1 <- convert(r0 + command_start).try_restrict(range).iterator
d01d183e84ea clarified treatment of markup ranges wrt. revert/convert: inflate_singularity allows to retrieve information like language_context more reliably during editing;
wenzelm
parents: 56514
diff changeset
   842
          } yield Text.Info(r1, a)).toList
45459
a5c1599f664d added markup_cumulate operator;
wenzelm
parents: 45243
diff changeset
   843
        }
a5c1599f664d added markup_cumulate operator;
wenzelm
parents: 45243
diff changeset
   844
55651
fa42cf3fe79b tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents: 55650
diff changeset
   845
        def select[A](
fa42cf3fe79b tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents: 55650
diff changeset
   846
          range: Text.Range,
56743
81370dfadb1d tuned signature;
wenzelm
parents: 56711
diff changeset
   847
          elements: Markup.Elements,
56354
a6f8c3566560 more direct command states -- merge_results is hardly ever needed;
wenzelm
parents: 56337
diff changeset
   848
          result: List[Command.State] => Text.Markup => Option[A],
55651
fa42cf3fe79b tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents: 55650
diff changeset
   849
          status: Boolean = false): List[Text.Info[A]] =
38845
a9e37daf5bd0 added Document.Snapshot.select_markup, which includes command iteration, range conversion etc.;
wenzelm
parents: 38841
diff changeset
   850
        {
56354
a6f8c3566560 more direct command states -- merge_results is hardly ever needed;
wenzelm
parents: 56337
diff changeset
   851
          def result1(states: List[Command.State]): (Option[A], Text.Markup) => Option[Option[A]] =
50500
c94bba7906d2 identify dialogs via official serial and maintain as result message;
wenzelm
parents: 50204
diff changeset
   852
          {
56354
a6f8c3566560 more direct command states -- merge_results is hardly ever needed;
wenzelm
parents: 56337
diff changeset
   853
            val res = result(states)
52889
ea3338812e67 more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
wenzelm
parents: 52887
diff changeset
   854
            (_: Option[A], x: Text.Markup) =>
ea3338812e67 more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
wenzelm
parents: 52887
diff changeset
   855
              res(x) match {
ea3338812e67 more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
wenzelm
parents: 52887
diff changeset
   856
                case None => None
ea3338812e67 more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
wenzelm
parents: 52887
diff changeset
   857
                case some => Some(some)
ea3338812e67 more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
wenzelm
parents: 52887
diff changeset
   858
              }
50500
c94bba7906d2 identify dialogs via official serial and maintain as result message;
wenzelm
parents: 50204
diff changeset
   859
          }
55651
fa42cf3fe79b tuned signature -- avoid redundancy and confusion of flags;
wenzelm
parents: 55650
diff changeset
   860
          for (Text.Info(r, Some(x)) <- cumulate(range, None, elements, result1 _, status))
46198
cd040c5772de improved select_markup: include filtering of defined results;
wenzelm
parents: 46178
diff changeset
   861
            yield Text.Info(r, x)
38845
a9e37daf5bd0 added Document.Snapshot.select_markup, which includes command iteration, range conversion etc.;
wenzelm
parents: 38841
diff changeset
   862
        }
55800
wenzelm
parents: 55783
diff changeset
   863
wenzelm
parents: 55783
diff changeset
   864
wenzelm
parents: 55783
diff changeset
   865
        /* output */
wenzelm
parents: 55783
diff changeset
   866
wenzelm
parents: 55783
diff changeset
   867
        override def toString: String =
wenzelm
parents: 55783
diff changeset
   868
          "Snapshot(node = " + node_name.node + ", version = " + version.id +
wenzelm
parents: 55783
diff changeset
   869
            (if (is_outdated) ", outdated" else "") + ")"
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38569
diff changeset
   870
      }
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents: 37849
diff changeset
   871
    }
34485
6475bfb4ff99 joined Document with ProofDocument;
wenzelm
parents: 34483
diff changeset
   872
  }
34840
6c5560d48561 more precise treatment of document/state assigment;
wenzelm
parents: 34838
diff changeset
   873
}
6c5560d48561 more precise treatment of document/state assigment;
wenzelm
parents: 34838
diff changeset
   874