src/Pure/Thy/thy_syntax.scala
author wenzelm
Wed, 10 Nov 2010 15:00:40 +0100
changeset 40454 2516ea25a54b
parent 38878 1d5b3175fd30
child 40457 3b0050718b31
permissions -rw-r--r--
some support for nested source structure, based on section headings;
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
  {
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    20
    sealed abstract class Entry
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    21
    {
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    22
      def length: Int
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    23
    }
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    24
    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
    25
    {
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    26
      val length: Int = (0 /: body)(_ + _.length)
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    27
    }
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    28
    case class Atom(val command: Command) extends Entry
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    29
    {
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    30
      def length: Int = command.length
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
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    33
    def parse_sections(syntax: Outer_Syntax, root_name: String, text: CharSequence): Entry =
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    34
    {
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    35
      /* stack operations */
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    36
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    37
      def buffer(): mutable.ListBuffer[Entry] = new mutable.ListBuffer[Entry]
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    38
      var stack: List[(Int, String, mutable.ListBuffer[Entry])] = List((0, root_name, buffer()))
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
      @tailrec def close(level: Int => Boolean)
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    41
      {
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    42
        stack match {
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    43
          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
    44
            body2 += Block(name, body.toList)
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    45
            stack = stack.tail
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    46
            close(level)
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    47
          case _ =>
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
      }
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
      def result(): Entry =
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    52
      {
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    53
        close(_ => true)
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    54
        val (_, name, body) = stack.head
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    55
        Block(name, body.toList)
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    56
      }
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
      def add(command: Command)
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    59
      {
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    60
        syntax.heading_level(command) match {
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    61
          case Some(i) =>
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    62
            close(_ > i)
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    63
            stack = (i, command.source, buffer()) :: stack
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    64
          case None =>
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
        stack.head._3 += Atom(command)
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
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
      /* result structure */
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    71
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    72
      val spans = parse_spans(syntax.scan(text))
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    73
      spans.foreach(span => add(Command.span(span)))
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    74
      result()
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
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    78
2516ea25a54b some support for nested source structure, based on section headings;
wenzelm
parents: 38878
diff changeset
    79
38374
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
    80
  /** parse spans **/
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
    81
38373
wenzelm
parents: 38239
diff changeset
    82
  def parse_spans(toks: List[Token]): List[List[Token]] =
34268
b149b7083236 separate module Thy_Syntax for command span parsing;
wenzelm
parents:
diff changeset
    83
  {
38373
wenzelm
parents: 38239
diff changeset
    84
    val result = new mutable.ListBuffer[List[Token]]
38239
89a4d1028fb3 parse_spans: somewhat faster low-level implementation;
wenzelm
parents: 36956
diff changeset
    85
    val span = new mutable.ListBuffer[Token]
89a4d1028fb3 parse_spans: somewhat faster low-level implementation;
wenzelm
parents: 36956
diff changeset
    86
    val whitespace = new mutable.ListBuffer[Token]
34268
b149b7083236 separate module Thy_Syntax for command span parsing;
wenzelm
parents:
diff changeset
    87
38239
89a4d1028fb3 parse_spans: somewhat faster low-level implementation;
wenzelm
parents: 36956
diff changeset
    88
    def flush(buffer: mutable.ListBuffer[Token])
89a4d1028fb3 parse_spans: somewhat faster low-level implementation;
wenzelm
parents: 36956
diff changeset
    89
    {
89a4d1028fb3 parse_spans: somewhat faster low-level implementation;
wenzelm
parents: 36956
diff changeset
    90
      if (!buffer.isEmpty) { result += buffer.toList; buffer.clear }
34268
b149b7083236 separate module Thy_Syntax for command span parsing;
wenzelm
parents:
diff changeset
    91
    }
38239
89a4d1028fb3 parse_spans: somewhat faster low-level implementation;
wenzelm
parents: 36956
diff changeset
    92
    for (tok <- toks) {
89a4d1028fb3 parse_spans: somewhat faster low-level implementation;
wenzelm
parents: 36956
diff changeset
    93
      if (tok.is_command) { flush(span); flush(whitespace); span += tok }
89a4d1028fb3 parse_spans: somewhat faster low-level implementation;
wenzelm
parents: 36956
diff changeset
    94
      else if (tok.is_ignored) whitespace += tok
89a4d1028fb3 parse_spans: somewhat faster low-level implementation;
wenzelm
parents: 36956
diff changeset
    95
      else { span ++= whitespace; whitespace.clear; span += tok }
89a4d1028fb3 parse_spans: somewhat faster low-level implementation;
wenzelm
parents: 36956
diff changeset
    96
    }
89a4d1028fb3 parse_spans: somewhat faster low-level implementation;
wenzelm
parents: 36956
diff changeset
    97
    flush(span); flush(whitespace)
89a4d1028fb3 parse_spans: somewhat faster low-level implementation;
wenzelm
parents: 36956
diff changeset
    98
    result.toList
34268
b149b7083236 separate module Thy_Syntax for command span parsing;
wenzelm
parents:
diff changeset
    99
  }
38374
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   100
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   101
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   102
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   103
  /** text edits **/
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   104
38417
b8922ae21111 renamed class Document to Document.Version etc.;
wenzelm
parents: 38374
diff changeset
   105
  def text_edits(session: Session, previous: Document.Version,
b8922ae21111 renamed class Document to Document.Version etc.;
wenzelm
parents: 38374
diff changeset
   106
      edits: List[Document.Node_Text_Edit]): (List[Document.Edit[Command]], Document.Version) =
38374
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   107
  {
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   108
    /* phase 1: edit individual command source */
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   109
38425
e467db701d78 moved Text_Edit to Text.Edit;
wenzelm
parents: 38419
diff changeset
   110
    @tailrec def edit_text(eds: List[Text.Edit], commands: Linear_Set[Command])
38374
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   111
        : Linear_Set[Command] =
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   112
    {
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   113
      eds match {
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   114
        case e :: es =>
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   115
          Document.Node.command_starts(commands.iterator).find {
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   116
            case (cmd, cmd_start) =>
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   117
              e.can_edit(cmd.source, cmd_start) ||
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   118
                e.is_insert && e.start == cmd_start + cmd.length
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   119
          } match {
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   120
            case Some((cmd, cmd_start)) if e.can_edit(cmd.source, cmd_start) =>
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   121
              val (rest, text) = e.edit(cmd.source, cmd_start)
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   122
              val new_commands = commands.insert_after(Some(cmd), Command.unparsed(text)) - cmd
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   123
              edit_text(rest.toList ::: es, new_commands)
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   124
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   125
            case Some((cmd, cmd_start)) =>
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   126
              edit_text(es, commands.insert_after(Some(cmd), Command.unparsed(e.text)))
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   127
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   128
            case None =>
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   129
              require(e.is_insert && e.start == 0)
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   130
              edit_text(es, commands.insert_after(None, Command.unparsed(e.text)))
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   131
          }
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   132
        case Nil => commands
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   133
      }
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   134
    }
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   135
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   136
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   137
    /* phase 2: recover command spans */
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   138
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   139
    @tailrec def recover_spans(commands: Linear_Set[Command]): Linear_Set[Command] =
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   140
    {
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   141
      commands.iterator.find(_.is_unparsed) match {
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   142
        case Some(first_unparsed) =>
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   143
          val first =
38878
1d5b3175fd30 text_edits/recover_spans: reparse at least until line boundary -- increases chance of recovery for bad ML text, for example;
wenzelm
parents: 38569
diff changeset
   144
            commands.reverse_iterator(first_unparsed).
1d5b3175fd30 text_edits/recover_spans: reparse at least until line boundary -- increases chance of recovery for bad ML text, for example;
wenzelm
parents: 38569
diff changeset
   145
              dropWhile(_.newlines == 0).find(_.is_command) getOrElse commands.head
38374
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   146
          val last =
38878
1d5b3175fd30 text_edits/recover_spans: reparse at least until line boundary -- increases chance of recovery for bad ML text, for example;
wenzelm
parents: 38569
diff changeset
   147
            commands.iterator(first_unparsed).
1d5b3175fd30 text_edits/recover_spans: reparse at least until line boundary -- increases chance of recovery for bad ML text, for example;
wenzelm
parents: 38569
diff changeset
   148
              dropWhile(_.newlines == 0).find(_.is_command) getOrElse commands.last
38374
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   149
          val range =
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   150
            commands.iterator(first).takeWhile(_ != last).toList ::: List(last)
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   151
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   152
          val sources = range.flatMap(_.span.map(_.source))
38569
9d480f6a2589 tuned signatures;
wenzelm
parents: 38425
diff changeset
   153
          val spans0 = parse_spans(session.current_syntax().scan(sources.mkString))
38374
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   154
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   155
          val (before_edit, spans1) =
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   156
            if (!spans0.isEmpty && first.is_command && first.span == spans0.head)
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   157
              (Some(first), spans0.tail)
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   158
            else (commands.prev(first), spans0)
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   159
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   160
          val (after_edit, spans2) =
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   161
            if (!spans1.isEmpty && last.is_command && last.span == spans1.last)
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   162
              (Some(last), spans1.take(spans1.length - 1))
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   163
            else (commands.next(last), spans1)
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   164
38419
f9dc924e54f8 renamed create_id to new_id;
wenzelm
parents: 38417
diff changeset
   165
          val inserted = spans2.map(span => new Command(session.new_id(), span))
38374
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   166
          val new_commands =
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   167
            commands.delete_between(before_edit, after_edit).append_after(before_edit, inserted)
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   168
          recover_spans(new_commands)
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   169
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   170
        case None => commands
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   171
      }
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   172
    }
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   173
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   174
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   175
    /* resulting document edits */
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   176
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   177
    {
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   178
      val doc_edits = new mutable.ListBuffer[Document.Edit[Command]]
38417
b8922ae21111 renamed class Document to Document.Version etc.;
wenzelm
parents: 38374
diff changeset
   179
      var nodes = previous.nodes
38374
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   180
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   181
      for ((name, text_edits) <- edits) {
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   182
        val commands0 = nodes(name).commands
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   183
        val commands1 = edit_text(text_edits, commands0)
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   184
        val commands2 = recover_spans(commands1)   // FIXME somewhat slow
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   185
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   186
        val removed_commands = commands0.iterator.filter(!commands2.contains(_)).toList
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   187
        val inserted_commands = commands2.iterator.filter(!commands0.contains(_)).toList
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   188
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   189
        val cmd_edits =
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   190
          removed_commands.reverse.map(cmd => (commands0.prev(cmd), None)) :::
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   191
          inserted_commands.map(cmd => (commands2.prev(cmd), Some(cmd)))
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   192
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   193
        doc_edits += (name -> Some(cmd_edits))
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   194
        nodes += (name -> new Document.Node(commands2))
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   195
      }
38419
f9dc924e54f8 renamed create_id to new_id;
wenzelm
parents: 38417
diff changeset
   196
      (doc_edits.toList, new Document.Version(session.new_id(), nodes))
38374
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   197
    }
7eb0f6991e25 moved Document.text_edits to Thy_Syntax;
wenzelm
parents: 38373
diff changeset
   198
  }
34268
b149b7083236 separate module Thy_Syntax for command span parsing;
wenzelm
parents:
diff changeset
   199
}