src/Pure/Thy/thy_syntax.scala
author wenzelm
Fri, 10 Aug 2012 13:33:07 +0200
changeset 48754 c2c1e5944536
parent 48748 89b4e7d83d6f
child 48755 393a37003851
permissions -rw-r--r--
clarified undefined, unparsed, unfinished command spans; common reparse_spans, diff_commands; some support for consolidate_spans after change of perspective;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
34268
b149b7083236 separate module Thy_Syntax for command span parsing;
wenzelm
parents:
diff changeset
     1
/*  Title:      Pure/Thy/thy_syntax.scala
b149b7083236 separate module Thy_Syntax for command span parsing;
wenzelm
parents:
diff changeset
     2
    Author:     Makarius
b149b7083236 separate module Thy_Syntax for command span parsing;
wenzelm
parents:
diff changeset
     3
38374
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
     4
Superficial theory syntax: tokens and spans.
34268
b149b7083236 separate module Thy_Syntax for command span parsing;
wenzelm
parents:
diff changeset
     5
*/
b149b7083236 separate module Thy_Syntax for command span parsing;
wenzelm
parents:
diff changeset
     6
b149b7083236 separate module Thy_Syntax for command span parsing;
wenzelm
parents:
diff changeset
     7
package isabelle
b149b7083236 separate module Thy_Syntax for command span parsing;
wenzelm
parents:
diff changeset
     8
b149b7083236 separate module Thy_Syntax for command span parsing;
wenzelm
parents:
diff changeset
     9
38239
89a4d1028fb3 parse_spans: somewhat faster low-level implementation;
wenzelm
parents: 36956
diff changeset
    10
import scala.collection.mutable
38374
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
    11
import scala.annotation.tailrec
38239
89a4d1028fb3 parse_spans: somewhat faster low-level implementation;
wenzelm
parents: 36956
diff changeset
    12
89a4d1028fb3 parse_spans: somewhat faster low-level implementation;
wenzelm
parents: 36956
diff changeset
    13
34303
98425e77cfeb plain object;
wenzelm
parents: 34268
diff changeset
    14
object Thy_Syntax
34268
b149b7083236 separate module Thy_Syntax for command span parsing;
wenzelm
parents:
diff changeset
    15
{
40454
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    16
  /** nested structure **/
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    17
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    18
  object Structure
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    19
  {
40478
4bae781b8f7c replaced Document.Node_Text_Edit by Document.Text_Edit, with treatment of deleted nodes;
wenzelm
parents: 40457
diff changeset
    20
    sealed abstract class Entry { def length: Int }
40454
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    21
    case class Block(val name: String, val body: List[Entry]) extends Entry
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    22
    {
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    23
      val length: Int = (0 /: body)(_ + _.length)
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    24
    }
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    25
    case class Atom(val command: Command) extends Entry
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    26
    {
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    27
      def length: Int = command.length
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    28
    }
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    29
46811
03a2dc9e0624 clarified command span: include trailing whitespace/comments and thus reduce number of ignored spans with associated transactions and states (factor 2);
wenzelm
parents: 46749
diff changeset
    30
    def parse(syntax: Outer_Syntax, node_name: Document.Node.Name, text: CharSequence): Entry =
40454
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    31
    {
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    32
      /* stack operations */
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    33
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    34
      def buffer(): mutable.ListBuffer[Entry] = new mutable.ListBuffer[Entry]
44615
a4ff8a787202 more abstract Document.Node.Name;
wenzelm
parents: 44607
diff changeset
    35
      var stack: List[(Int, String, mutable.ListBuffer[Entry])] =
48718
73e6c22e2d94 more structural parsing for minor modes;
wenzelm
parents: 48707
diff changeset
    36
        List((0, node_name.theory, buffer()))
40454
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    37
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    38
      @tailrec def close(level: Int => Boolean)
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    39
      {
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    40
        stack match {
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    41
          case (lev, name, body) :: (_, _, body2) :: rest if level(lev) =>
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    42
            body2 += Block(name, body.toList)
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    43
            stack = stack.tail
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    44
            close(level)
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    45
          case _ =>
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    46
        }
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    47
      }
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    48
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    49
      def result(): Entry =
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    50
      {
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    51
        close(_ => true)
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    52
        val (_, name, body) = stack.head
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    53
        Block(name, body.toList)
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    54
      }
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    55
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    56
      def add(command: Command)
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    57
      {
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    58
        syntax.heading_level(command) match {
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    59
          case Some(i) =>
46969
481b7d9ad6fe more abstract heading level;
wenzelm
parents: 46946
diff changeset
    60
            close(_ > i)
481b7d9ad6fe more abstract heading level;
wenzelm
parents: 46946
diff changeset
    61
            stack = (i + 1, command.source, buffer()) :: stack
40454
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    62
          case None =>
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    63
        }
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    64
        stack.head._3 += Atom(command)
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    65
      }
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    66
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    67
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    68
      /* result structure */
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    69
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    70
      val spans = parse_spans(syntax.scan(text))
47012
0e246130486b clarified command span classification: strict Command.is_command, permissive Command.name;
wenzelm
parents: 46969
diff changeset
    71
      spans.foreach(span => add(Command(Document.no_id, node_name, span)))
40454
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    72
      result()
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    73
    }
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    74
  }
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    75
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    76
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    77
38374
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
    78
  /** parse spans **/
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
    79
48748
89b4e7d83d6f refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
wenzelm
parents: 48747
diff changeset
    80
  def parse_spans(toks: List[Token]): List[Command.Span] =
34268
b149b7083236 separate module Thy_Syntax for command span parsing;
wenzelm
parents:
diff changeset
    81
  {
48748
89b4e7d83d6f refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
wenzelm
parents: 48747
diff changeset
    82
    val result = new mutable.ListBuffer[Command.Span]
38239
89a4d1028fb3 parse_spans: somewhat faster low-level implementation;
wenzelm
parents: 36956
diff changeset
    83
    val span = new mutable.ListBuffer[Token]
34268
b149b7083236 separate module Thy_Syntax for command span parsing;
wenzelm
parents:
diff changeset
    84
46811
03a2dc9e0624 clarified command span: include trailing whitespace/comments and thus reduce number of ignored spans with associated transactions and states (factor 2);
wenzelm
parents: 46749
diff changeset
    85
    def flush() { if (!span.isEmpty) { result += span.toList; span.clear } }
03a2dc9e0624 clarified command span: include trailing whitespace/comments and thus reduce number of ignored spans with associated transactions and states (factor 2);
wenzelm
parents: 46749
diff changeset
    86
    for (tok <- toks) { if (tok.is_command) flush(); span += tok }
03a2dc9e0624 clarified command span: include trailing whitespace/comments and thus reduce number of ignored spans with associated transactions and states (factor 2);
wenzelm
parents: 46749
diff changeset
    87
    flush()
38239
89a4d1028fb3 parse_spans: somewhat faster low-level implementation;
wenzelm
parents: 36956
diff changeset
    88
    result.toList
34268
b149b7083236 separate module Thy_Syntax for command span parsing;
wenzelm
parents:
diff changeset
    89
  }
38374
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
    90
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
    91
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
    92
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44388
diff changeset
    93
  /** perspective **/
44388
5f9ad3583e0a tuned signature;
wenzelm
parents: 44385
diff changeset
    94
5f9ad3583e0a tuned signature;
wenzelm
parents: 44385
diff changeset
    95
  def command_perspective(node: Document.Node, perspective: Text.Perspective): Command.Perspective =
5f9ad3583e0a tuned signature;
wenzelm
parents: 44385
diff changeset
    96
  {
44474
681447a9ffe5 slightly more abstract Command.Perspective;
wenzelm
parents: 44473
diff changeset
    97
    if (perspective.is_empty) Command.Perspective.empty
44388
5f9ad3583e0a tuned signature;
wenzelm
parents: 44385
diff changeset
    98
    else {
5f9ad3583e0a tuned signature;
wenzelm
parents: 44385
diff changeset
    99
      val result = new mutable.ListBuffer[Command]
5f9ad3583e0a tuned signature;
wenzelm
parents: 44385
diff changeset
   100
      @tailrec
5f9ad3583e0a tuned signature;
wenzelm
parents: 44385
diff changeset
   101
      def check_ranges(ranges: List[Text.Range], commands: Stream[(Command, Text.Offset)])
5f9ad3583e0a tuned signature;
wenzelm
parents: 44385
diff changeset
   102
      {
5f9ad3583e0a tuned signature;
wenzelm
parents: 44385
diff changeset
   103
        (ranges, commands) match {
5f9ad3583e0a tuned signature;
wenzelm
parents: 44385
diff changeset
   104
          case (range :: more_ranges, (command, offset) #:: more_commands) =>
5f9ad3583e0a tuned signature;
wenzelm
parents: 44385
diff changeset
   105
            val command_range = command.range + offset
5f9ad3583e0a tuned signature;
wenzelm
parents: 44385
diff changeset
   106
            range compare command_range match {
5f9ad3583e0a tuned signature;
wenzelm
parents: 44385
diff changeset
   107
              case -1 => check_ranges(more_ranges, commands)
5f9ad3583e0a tuned signature;
wenzelm
parents: 44385
diff changeset
   108
              case 0 =>
5f9ad3583e0a tuned signature;
wenzelm
parents: 44385
diff changeset
   109
                result += command
5f9ad3583e0a tuned signature;
wenzelm
parents: 44385
diff changeset
   110
                check_ranges(ranges, more_commands)
5f9ad3583e0a tuned signature;
wenzelm
parents: 44385
diff changeset
   111
              case 1 => check_ranges(ranges, more_commands)
5f9ad3583e0a tuned signature;
wenzelm
parents: 44385
diff changeset
   112
            }
5f9ad3583e0a tuned signature;
wenzelm
parents: 44385
diff changeset
   113
          case _ =>
5f9ad3583e0a tuned signature;
wenzelm
parents: 44385
diff changeset
   114
        }
5f9ad3583e0a tuned signature;
wenzelm
parents: 44385
diff changeset
   115
      }
44473
4f264fdf8d0e slightly more abstract Text.Perspective;
wenzelm
parents: 44443
diff changeset
   116
      check_ranges(perspective.ranges, node.command_range(perspective.range).toStream)
44474
681447a9ffe5 slightly more abstract Command.Perspective;
wenzelm
parents: 44473
diff changeset
   117
      Command.Perspective(result.toList)
44388
5f9ad3583e0a tuned signature;
wenzelm
parents: 44385
diff changeset
   118
    }
5f9ad3583e0a tuned signature;
wenzelm
parents: 44385
diff changeset
   119
  }
5f9ad3583e0a tuned signature;
wenzelm
parents: 44385
diff changeset
   120
5f9ad3583e0a tuned signature;
wenzelm
parents: 44385
diff changeset
   121
5f9ad3583e0a tuned signature;
wenzelm
parents: 44385
diff changeset
   122
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   123
  /** header edits: structure and outer syntax **/
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   124
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   125
  private def header_edits(
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   126
    base_syntax: Outer_Syntax,
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   127
    previous: Document.Version,
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   128
    edits: List[Document.Edit_Text])
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   129
    : (Outer_Syntax, List[Document.Node.Name], Document.Nodes, List[Document.Edit_Command]) =
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   130
  {
47987
4e9df6ffcc6e reparse descendants after update of imports, e.g. required for 'primrec' (line 17 of "src/HOL/Power.thy");
wenzelm
parents: 47346
diff changeset
   131
    var updated_imports = false
4e9df6ffcc6e reparse descendants after update of imports, e.g. required for 'primrec' (line 17 of "src/HOL/Power.thy");
wenzelm
parents: 47346
diff changeset
   132
    var updated_keywords = false
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   133
    var nodes = previous.nodes
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   134
    val doc_edits = new mutable.ListBuffer[Document.Edit_Command]
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   135
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   136
    edits foreach {
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 48706
diff changeset
   137
      case (name, Document.Node.Deps(header)) =>
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   138
        val node = nodes(name)
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   139
        val update_header =
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 48706
diff changeset
   140
          !node.header.errors.isEmpty || !header.errors.isEmpty || node.header != header
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   141
        if (update_header) {
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   142
          val node1 = node.update_header(header)
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 48706
diff changeset
   143
          updated_imports = updated_imports || (node.header.imports != node1.header.imports)
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 48706
diff changeset
   144
          updated_keywords = updated_keywords || (node.header.keywords != node1.header.keywords)
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   145
          nodes += (name -> node1)
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 48706
diff changeset
   146
          doc_edits += (name -> Document.Node.Deps(header))
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   147
        }
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   148
      case _ =>
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   149
    }
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   150
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   151
    val syntax =
47987
4e9df6ffcc6e reparse descendants after update of imports, e.g. required for 'primrec' (line 17 of "src/HOL/Power.thy");
wenzelm
parents: 47346
diff changeset
   152
      if (previous.is_init || updated_keywords)
48706
e2b512024eab tuned signature;
wenzelm
parents: 47987
diff changeset
   153
        (base_syntax /: nodes.entries) { case (syn, (_, node)) => syn.add_keywords(node.header) }
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   154
      else previous.syntax
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   155
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   156
    val reparse =
47987
4e9df6ffcc6e reparse descendants after update of imports, e.g. required for 'primrec' (line 17 of "src/HOL/Power.thy");
wenzelm
parents: 47346
diff changeset
   157
      if (updated_imports || updated_keywords)
4e9df6ffcc6e reparse descendants after update of imports, e.g. required for 'primrec' (line 17 of "src/HOL/Power.thy");
wenzelm
parents: 47346
diff changeset
   158
        nodes.descendants(doc_edits.iterator.map(_._1).toList)
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   159
      else Nil
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   160
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   161
    (syntax, reparse, nodes, doc_edits.toList)
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   162
  }
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   163
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   164
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   165
38374
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   166
  /** text edits **/
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   167
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   168
  /* phase 1: edit individual command source */
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   169
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   170
  @tailrec private def edit_text(eds: List[Text.Edit], commands: Linear_Set[Command])
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   171
      : Linear_Set[Command] =
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   172
  {
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   173
    eds match {
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   174
      case e :: es =>
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   175
        Document.Node.command_starts(commands.iterator).find {
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   176
          case (cmd, cmd_start) =>
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   177
            e.can_edit(cmd.source, cmd_start) ||
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   178
              e.is_insert && e.start == cmd_start + cmd.length
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   179
        } match {
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   180
          case Some((cmd, cmd_start)) if e.can_edit(cmd.source, cmd_start) =>
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   181
            val (rest, text) = e.edit(cmd.source, cmd_start)
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   182
            val new_commands = commands.insert_after(Some(cmd), Command.unparsed(text)) - cmd
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   183
            edit_text(rest.toList ::: es, new_commands)
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   184
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   185
          case Some((cmd, cmd_start)) =>
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   186
            edit_text(es, commands.insert_after(Some(cmd), Command.unparsed(e.text)))
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   187
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   188
          case None =>
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   189
            require(e.is_insert && e.start == 0)
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   190
            edit_text(es, commands.insert_after(None, Command.unparsed(e.text)))
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   191
        }
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   192
      case Nil => commands
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   193
    }
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   194
  }
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   195
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   196
48754
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   197
  /* phase 2a: reparse range of command spans */
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   198
48748
89b4e7d83d6f refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
wenzelm
parents: 48747
diff changeset
   199
  @tailrec private def chop_common(
89b4e7d83d6f refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
wenzelm
parents: 48747
diff changeset
   200
      cmds: List[Command], spans: List[Command.Span]): (List[Command], List[Command.Span]) =
89b4e7d83d6f refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
wenzelm
parents: 48747
diff changeset
   201
    (cmds, spans) match {
89b4e7d83d6f refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
wenzelm
parents: 48747
diff changeset
   202
      case (c :: cs, s :: ss) if c.span == s => chop_common(cs, ss)
89b4e7d83d6f refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
wenzelm
parents: 48747
diff changeset
   203
      case _ => (cmds, spans)
89b4e7d83d6f refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
wenzelm
parents: 48747
diff changeset
   204
    }
89b4e7d83d6f refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
wenzelm
parents: 48747
diff changeset
   205
48754
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   206
  private def reparse_spans(
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   207
    syntax: Outer_Syntax,
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   208
    name: Document.Node.Name,
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   209
    commands: Linear_Set[Command],
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   210
    first: Command, last: Command): Linear_Set[Command] =
48748
89b4e7d83d6f refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
wenzelm
parents: 48747
diff changeset
   211
  {
48754
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   212
    val cmds0 = commands.iterator(first, last).toList
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   213
    val spans0 = parse_spans(syntax.scan(cmds0.iterator.map(_.source).mkString))
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   214
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   215
    val (cmds1, spans1) = chop_common(cmds0, spans0)
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   216
48748
89b4e7d83d6f refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
wenzelm
parents: 48747
diff changeset
   217
    val (rev_cmds2, rev_spans2) = chop_common(cmds1.reverse, spans1.reverse)
48754
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   218
    val cmds2 = rev_cmds2.reverse
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   219
    val spans2 = rev_spans2.reverse
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   220
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   221
    cmds2 match {
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   222
      case Nil =>
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   223
        assert(spans2.isEmpty)
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   224
        commands
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   225
      case cmd :: _ =>
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   226
        val hook = commands.prev(cmd)
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   227
        val inserted = spans2.map(span => Command(Document.new_id(), name, span))
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   228
        (commands /: cmds2)(_ - _).append_after(hook, inserted)
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   229
    }
48748
89b4e7d83d6f refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
wenzelm
parents: 48747
diff changeset
   230
  }
89b4e7d83d6f refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
wenzelm
parents: 48747
diff changeset
   231
48754
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   232
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   233
  /* phase 2b: recover command spans after edits */
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   234
48746
9e1b2aafbc7f more direct Linear_Set.reverse, swapping orientation of the graph;
wenzelm
parents: 48718
diff changeset
   235
  private def recover_spans(
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   236
    syntax: Outer_Syntax,
48754
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   237
    name: Document.Node.Name,
48748
89b4e7d83d6f refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
wenzelm
parents: 48747
diff changeset
   238
    perspective: Command.Perspective,
48754
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   239
    commands: Linear_Set[Command]): Linear_Set[Command] =
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   240
  {
48754
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   241
    val visible = perspective.commands.toSet
48748
89b4e7d83d6f refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
wenzelm
parents: 48747
diff changeset
   242
48754
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   243
    def next_invisible_command(cmds: Linear_Set[Command], from: Command): Command =
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   244
      cmds.iterator(from).dropWhile(cmd => !cmd.is_command || visible(cmd))
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   245
        .find(_.is_command) getOrElse cmds.last
48746
9e1b2aafbc7f more direct Linear_Set.reverse, swapping orientation of the graph;
wenzelm
parents: 48718
diff changeset
   246
48754
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   247
    @tailrec def recover(cmds: Linear_Set[Command]): Linear_Set[Command] =
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   248
      cmds.find(_.is_unparsed) match {
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   249
        case Some(first_unparsed) =>
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   250
          val first = next_invisible_command(cmds.reverse, first_unparsed)
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   251
          val last = next_invisible_command(cmds, first_unparsed)
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   252
          recover(reparse_spans(syntax, name, cmds, first, last))
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   253
        case None => cmds
48746
9e1b2aafbc7f more direct Linear_Set.reverse, swapping orientation of the graph;
wenzelm
parents: 48718
diff changeset
   254
      }
48754
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   255
    recover(commands)
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   256
  }
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   257
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   258
48754
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   259
  /* phase 2c: consolidate unfinished spans */
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   260
48754
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   261
  private def consolidate_spans(
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   262
    syntax: Outer_Syntax,
48754
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   263
    name: Document.Node.Name,
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   264
    perspective: Command.Perspective,
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   265
    commands: Linear_Set[Command]): Linear_Set[Command] =
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   266
  {
48754
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   267
    if (perspective.commands.isEmpty) commands
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   268
    else {
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   269
      commands.find(_.is_unfinished) match {
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   270
        case Some(first_unfinished) =>
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   271
          val visible = perspective.commands.toSet
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   272
          commands.reverse.find(visible) match {
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   273
            case Some(last_visible) =>
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   274
              reparse_spans(syntax, name, commands, first_unfinished, last_visible)
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   275
            case None => commands
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   276
          }
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   277
        case None => commands
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   278
      }
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   279
    }
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   280
  }
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   281
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   282
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   283
  /* main phase */
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   284
48754
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   285
  private def diff_commands(old_cmds: Linear_Set[Command], new_cmds: Linear_Set[Command])
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   286
    : List[(Option[Command], Option[Command])] =
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   287
  {
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   288
    val removed = old_cmds.iterator.filter(!new_cmds.contains(_)).toList
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   289
    val inserted = new_cmds.iterator.filter(!old_cmds.contains(_)).toList
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   290
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   291
    removed.reverse.map(cmd => (old_cmds.prev(cmd), None)) :::
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   292
    inserted.map(cmd => (new_cmds.prev(cmd), Some(cmd)))
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   293
  }
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   294
43722
9b5dadb0c28d propagate header changes to prover process;
wenzelm
parents: 43715
diff changeset
   295
  def text_edits(
46942
f5c2d66faa04 basic support for outer syntax keywords in theory header;
wenzelm
parents: 46941
diff changeset
   296
      base_syntax: Outer_Syntax,
43722
9b5dadb0c28d propagate header changes to prover process;
wenzelm
parents: 43715
diff changeset
   297
      previous: Document.Version,
44157
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
   298
      edits: List[Document.Edit_Text])
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
   299
    : (List[Document.Edit_Command], Document.Version) =
38374
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   300
  {
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   301
    val (syntax, reparse, nodes0, doc_edits0) = header_edits(base_syntax, previous, edits)
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   302
    val reparse_set = reparse.toSet
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   303
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   304
    var nodes = nodes0
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   305
    val doc_edits = new mutable.ListBuffer[Document.Edit_Command]; doc_edits ++= doc_edits0
38374
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   306
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   307
    (edits ::: reparse.map((_, Document.Node.Edits(Nil)))) foreach {
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   308
      case (name, Document.Node.Clear()) =>
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   309
        doc_edits += (name -> Document.Node.Clear())
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   310
        nodes += (name -> nodes(name).clear)
38374
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   311
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   312
      case (name, Document.Node.Edits(text_edits)) =>
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   313
        val node = nodes(name)
48754
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   314
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   315
        val commands0 = node.commands
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   316
        val commands1 = edit_text(text_edits, commands0)
48748
89b4e7d83d6f refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
wenzelm
parents: 48747
diff changeset
   317
        val commands2 = recover_spans(syntax, name, node.perspective, commands1)   // FIXME somewhat slow
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   318
        val commands3 =
48754
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   319
          if (reparse_set.contains(name) && !commands2.isEmpty)
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   320
            reparse_spans(syntax, name, commands2, commands2.head, commands2.last)  // FIXME somewhat slow
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   321
          else commands2
38374
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   322
48754
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   323
        doc_edits += (name -> Document.Node.Edits(diff_commands(commands0, commands3)))
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   324
        nodes += (name -> node.update_commands(commands3))
38374
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   325
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 48706
diff changeset
   326
      case (name, Document.Node.Deps(_)) =>
38374
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   327
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   328
      case (name, Document.Node.Perspective(text_perspective)) =>
47346
cd3ab7625519 discontinued Document.update_perspective side-entry (cf. 546adfa8a6fc) -- NB: re-assignment is always necessary due to non-monotonic cancel_execution;
wenzelm
parents: 47012
diff changeset
   329
        val node = nodes(name)
cd3ab7625519 discontinued Document.update_perspective side-entry (cf. 546adfa8a6fc) -- NB: re-assignment is always necessary due to non-monotonic cancel_execution;
wenzelm
parents: 47012
diff changeset
   330
        val perspective = command_perspective(node, text_perspective)
cd3ab7625519 discontinued Document.update_perspective side-entry (cf. 546adfa8a6fc) -- NB: re-assignment is always necessary due to non-monotonic cancel_execution;
wenzelm
parents: 47012
diff changeset
   331
        if (!(node.perspective same perspective)) {
48754
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   332
/* FIXME
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   333
          val commands1 = consolidate_spans(syntax, name, perspective, node.commands)
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   334
          doc_edits += (name -> Document.Node.Edits(diff_commands(node.commands, commands1)))
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   335
*/
47346
cd3ab7625519 discontinued Document.update_perspective side-entry (cf. 546adfa8a6fc) -- NB: re-assignment is always necessary due to non-monotonic cancel_execution;
wenzelm
parents: 47012
diff changeset
   336
          doc_edits += (name -> Document.Node.Perspective(perspective))
cd3ab7625519 discontinued Document.update_perspective side-entry (cf. 546adfa8a6fc) -- NB: re-assignment is always necessary due to non-monotonic cancel_execution;
wenzelm
parents: 47012
diff changeset
   337
          nodes += (name -> node.update_perspective(perspective))
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   338
        }
38374
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   339
    }
48754
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48748
diff changeset
   340
46946
acc8ebf980ca more explicit header_edits before main text_edits;
wenzelm
parents: 46942
diff changeset
   341
    (doc_edits.toList, Document.Version.make(syntax, nodes))
38374
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   342
  }
34268
b149b7083236 separate module Thy_Syntax for command span parsing;
wenzelm
parents:
diff changeset
   343
}