src/Tools/jEdit/src/proofdocument/document.scala
author wenzelm
Mon, 11 Jan 2010 13:58:51 +0100
changeset 34862 a1d394600a92
parent 34860 847c00f5535a
child 34863 3e655d0ff936
permissions -rw-r--r--
updated header;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
34407
aad6834ba380 added some headers and comments;
wenzelm
parents: 34390
diff changeset
     1
/*
34862
a1d394600a92 updated header;
wenzelm
parents: 34860
diff changeset
     2
 * Document as editable list of commands
34407
aad6834ba380 added some headers and comments;
wenzelm
parents: 34390
diff changeset
     3
 *
34485
6475bfb4ff99 joined Document with ProofDocument;
wenzelm
parents: 34483
diff changeset
     4
 * @author Makarius
34407
aad6834ba380 added some headers and comments;
wenzelm
parents: 34390
diff changeset
     5
 */
aad6834ba380 added some headers and comments;
wenzelm
parents: 34390
diff changeset
     6
34318
c13e168a8ae6 original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff changeset
     7
package isabelle.proofdocument
c13e168a8ae6 original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff changeset
     8
34760
dc7f5e0d9d27 misc modernization of names;
wenzelm
parents: 34759
diff changeset
     9
34823
2f3ea37c5958 renamed Proof_Document to Document;
wenzelm
parents: 34819
diff changeset
    10
object Document
34483
0923926022d7 superficial tuning;
wenzelm
parents: 34482
diff changeset
    11
{
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    12
  /* command start positions */
34818
7df68a8f0e3e register Proof_Document instances as session entities -- handle Markup.EDIT messages locally;
wenzelm
parents: 34815
diff changeset
    13
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    14
  def command_starts(commands: Linear_Set[Command]): Iterator[(Command, Int)] =
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    15
  {
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    16
    var offset = 0
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    17
    for (cmd <- commands.elements) yield {
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    18
      val start = offset
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    19
      offset += cmd.length
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    20
      (cmd, start)
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    21
    }
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    22
  }
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    23
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    24
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    25
  /* empty document */
34485
6475bfb4ff99 joined Document with ProofDocument;
wenzelm
parents: 34483
diff changeset
    26
34823
2f3ea37c5958 renamed Proof_Document to Document;
wenzelm
parents: 34819
diff changeset
    27
  def empty(id: Isar_Document.Document_ID): Document =
34835
67733fd0e3fa back to explicit management of documents -- not as generic Session.Entity -- to avoid ill-defined referencing of new states;
wenzelm
parents: 34832
diff changeset
    28
  {
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    29
    val doc = new Document(id, Linear_Set(), Map())
34835
67733fd0e3fa back to explicit management of documents -- not as generic Session.Entity -- to avoid ill-defined referencing of new states;
wenzelm
parents: 34832
diff changeset
    30
    doc.assign_states(Nil)
67733fd0e3fa back to explicit management of documents -- not as generic Session.Entity -- to avoid ill-defined referencing of new states;
wenzelm
parents: 34832
diff changeset
    31
    doc
67733fd0e3fa back to explicit management of documents -- not as generic Session.Entity -- to avoid ill-defined referencing of new states;
wenzelm
parents: 34832
diff changeset
    32
  }
34660
e0561943bfc9 Change consisting of a list of Edits
immler@in.tum.de
parents: 34657
diff changeset
    33
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    34
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    35
  // FIXME
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    36
  var phase0: List[Text_Edit] = null
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    37
  var phase1: Linear_Set[Command] = null
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    38
  var phase2: Linear_Set[Command] = null
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    39
  var phase3: List[Edit] = null
34860
847c00f5535a do not override Command.hashCode -- which was inconsistent with eq anyway;
wenzelm
parents: 34859
diff changeset
    40
  var raw_source: String = null
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    41
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    42
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    43
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    44
  /** document edits **/
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    45
34853
32b49207ca20 misc tuning and clarification of Document/Change;
wenzelm
parents: 34840
diff changeset
    46
  type Edit = (Option[Command], Option[Command])
34824
ac35eee85f5c renamed current_document to recent_document (might be a bit older than current_change);
wenzelm
parents: 34823
diff changeset
    47
ac35eee85f5c renamed current_document to recent_document (might be a bit older than current_change);
wenzelm
parents: 34823
diff changeset
    48
  def text_edits(session: Session, old_doc: Document, new_id: Isar_Document.Document_ID,
34853
32b49207ca20 misc tuning and clarification of Document/Change;
wenzelm
parents: 34840
diff changeset
    49
    edits: List[Text_Edit]): (List[Edit], Document) =
34824
ac35eee85f5c renamed current_document to recent_document (might be a bit older than current_change);
wenzelm
parents: 34823
diff changeset
    50
  {
34840
6c5560d48561 more precise treatment of document/state assigment;
wenzelm
parents: 34838
diff changeset
    51
    require(old_doc.assignment.is_finished)
6c5560d48561 more precise treatment of document/state assigment;
wenzelm
parents: 34838
diff changeset
    52
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    53
    phase0 = edits
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    54
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    55
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    56
    /* unparsed dummy commands */
34538
20bfcca24658 Prover as actor managing ProofDocument-versions (removed EventBus structural_changes);
immler@in.tum.de
parents: 34532
diff changeset
    57
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    58
    def unparsed(source: String) =
34860
847c00f5535a do not override Command.hashCode -- which was inconsistent with eq anyway;
wenzelm
parents: 34859
diff changeset
    59
      new Command(null, List(Outer_Lex.Token(Outer_Lex.Token_Kind.UNPARSED, source)))
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    60
34860
847c00f5535a do not override Command.hashCode -- which was inconsistent with eq anyway;
wenzelm
parents: 34859
diff changeset
    61
    def is_unparsed(command: Command) = command.id == null
34835
67733fd0e3fa back to explicit management of documents -- not as generic Session.Entity -- to avoid ill-defined referencing of new states;
wenzelm
parents: 34832
diff changeset
    62
34860
847c00f5535a do not override Command.hashCode -- which was inconsistent with eq anyway;
wenzelm
parents: 34859
diff changeset
    63
    assert(!old_doc.commands.exists(is_unparsed))
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    64
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    65
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    66
    /* phase 1: edit individual command source */
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    67
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    68
    var commands = old_doc.commands
34485
6475bfb4ff99 joined Document with ProofDocument;
wenzelm
parents: 34483
diff changeset
    69
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    70
    def edit_text(eds: List[Text_Edit]): Unit =
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    71
    {
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    72
      eds match {
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    73
        case e :: es =>
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    74
          command_starts(commands).find {   // FIXME relative search!
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    75
            case (cmd, cmd_start) => e.can_edit(cmd.length, cmd_start)
34860
847c00f5535a do not override Command.hashCode -- which was inconsistent with eq anyway;
wenzelm
parents: 34859
diff changeset
    76
          } match {  // FIXME try to append after command
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    77
            case Some((cmd, cmd_start)) =>
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    78
              val (rest, source) = e.edit(cmd.source, cmd_start)
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    79
              // FIXME Linear_Set.edit (?)
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    80
              commands = commands.insert_after(Some(cmd), unparsed(source))
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    81
              commands -= cmd
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    82
              edit_text(rest.toList ::: es)
34318
c13e168a8ae6 original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff changeset
    83
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    84
            case None =>
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    85
              require(e.isInstanceOf[Text_Edit.Insert] && e.start == 0)
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    86
              commands = commands.insert_after(None, unparsed(e.text))
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    87
              edit_text(es)
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    88
          }
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    89
        case Nil =>
34318
c13e168a8ae6 original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff changeset
    90
      }
c13e168a8ae6 original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff changeset
    91
    }
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    92
    edit_text(edits)
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    93
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    94
    phase1 = commands
34582
5d5d253c7c29 superficial tuning;
wenzelm
parents: 34575
diff changeset
    95
34818
7df68a8f0e3e register Proof_Document instances as session entities -- handle Markup.EDIT messages locally;
wenzelm
parents: 34815
diff changeset
    96
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    97
    /* phase 2: command range edits */
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    98
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
    99
    def edit_commands(): Unit =
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   100
    {
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   101
      // FIXME relative search!
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   102
      commands.elements.find(is_unparsed) match {
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   103
        case Some(first_unparsed) =>
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   104
          val prefix = commands.prev(first_unparsed)
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   105
          val body = commands.elements(first_unparsed).takeWhile(is_unparsed).toList
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   106
          val suffix = commands.next(body.last)
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   107
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   108
          val source =
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   109
            (prefix.toList ::: body ::: suffix.toList).flatMap(_.span.map(_.source)).mkString
34860
847c00f5535a do not override Command.hashCode -- which was inconsistent with eq anyway;
wenzelm
parents: 34859
diff changeset
   110
          assert(source != "")
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   111
          raw_source = source
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   112
          
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   113
          val spans0 = Thy_Syntax.parse_spans(session.current_syntax.scan(source))
34485
6475bfb4ff99 joined Document with ProofDocument;
wenzelm
parents: 34483
diff changeset
   114
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   115
          val (before_edit, spans1) =
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   116
            if (!spans0.isEmpty && Some(spans0.first) == prefix.map(_.span))
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   117
              (prefix, spans0.tail)
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   118
            else (if (prefix.isDefined) commands.prev(prefix.get) else None, spans0)
34544
56217d219e27 proofdocument-versions get id from changes
immler@in.tum.de
parents: 34541
diff changeset
   119
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   120
          val (after_edit, spans2) =
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   121
            if (!spans1.isEmpty && Some(spans1.last) == suffix.map(_.span))
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   122
              (suffix, spans1.take(spans1.length - 1))
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   123
            else (if (suffix.isDefined) commands.next(suffix.get) else None, spans1)
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   124
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   125
          val new_commands = spans2.map(span => new Command(session.create_id(), span))
34485
6475bfb4ff99 joined Document with ProofDocument;
wenzelm
parents: 34483
diff changeset
   126
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   127
          commands = commands.delete_between(before_edit, after_edit)
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   128
          commands = commands.append_after(before_edit, new_commands)
34554
7dc6c231da40 abs. stops, markup nodes depend on doc-version;
immler@in.tum.de
parents: 34551
diff changeset
   129
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   130
          edit_commands()
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   131
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   132
        case None =>
34485
6475bfb4ff99 joined Document with ProofDocument;
wenzelm
parents: 34483
diff changeset
   133
      }
6475bfb4ff99 joined Document with ProofDocument;
wenzelm
parents: 34483
diff changeset
   134
    }
34860
847c00f5535a do not override Command.hashCode -- which was inconsistent with eq anyway;
wenzelm
parents: 34859
diff changeset
   135
    edit_commands()
847c00f5535a do not override Command.hashCode -- which was inconsistent with eq anyway;
wenzelm
parents: 34859
diff changeset
   136
    
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   137
    phase2 = commands
34739
34b0aadab7ee Linear_Set.append_after;
wenzelm
parents: 34724
diff changeset
   138
34554
7dc6c231da40 abs. stops, markup nodes depend on doc-version;
immler@in.tum.de
parents: 34551
diff changeset
   139
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   140
    /* phase 3: resulting document edits */
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   141
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   142
    val removed_commands = old_doc.commands.elements.filter(!commands.contains(_)).toList
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   143
    val inserted_commands = commands.elements.filter(!old_doc.commands.contains(_)).toList
34660
e0561943bfc9 Change consisting of a list of Edits
immler@in.tum.de
parents: 34657
diff changeset
   144
34860
847c00f5535a do not override Command.hashCode -- which was inconsistent with eq anyway;
wenzelm
parents: 34859
diff changeset
   145
    // FIXME proper order
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   146
    val doc_edits =
34860
847c00f5535a do not override Command.hashCode -- which was inconsistent with eq anyway;
wenzelm
parents: 34859
diff changeset
   147
      removed_commands.reverse.map(cmd => (commands.prev(cmd), None)) :::
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   148
      inserted_commands.map(cmd => (commands.prev(cmd), Some(cmd)))
34660
e0561943bfc9 Change consisting of a list of Edits
immler@in.tum.de
parents: 34657
diff changeset
   149
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   150
    val former_states = old_doc.assignment.join -- removed_commands
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   151
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   152
    phase3 = doc_edits
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   153
    (doc_edits, new Document(new_id, commands, former_states))
34485
6475bfb4ff99 joined Document with ProofDocument;
wenzelm
parents: 34483
diff changeset
   154
  }
34840
6c5560d48561 more precise treatment of document/state assigment;
wenzelm
parents: 34838
diff changeset
   155
}
6c5560d48561 more precise treatment of document/state assigment;
wenzelm
parents: 34838
diff changeset
   156
34855
81d0410dc3ac iterators for ranges of commands/starts -- avoid extra array per document;
wenzelm
parents: 34853
diff changeset
   157
34840
6c5560d48561 more precise treatment of document/state assigment;
wenzelm
parents: 34838
diff changeset
   158
class Document(
6c5560d48561 more precise treatment of document/state assigment;
wenzelm
parents: 34838
diff changeset
   159
    val id: Isar_Document.Document_ID,
6c5560d48561 more precise treatment of document/state assigment;
wenzelm
parents: 34838
diff changeset
   160
    val commands: Linear_Set[Command],
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   161
    former_states: Map[Command, Command])
34840
6c5560d48561 more precise treatment of document/state assigment;
wenzelm
parents: 34838
diff changeset
   162
{
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   163
  /* command ranges */
34855
81d0410dc3ac iterators for ranges of commands/starts -- avoid extra array per document;
wenzelm
parents: 34853
diff changeset
   164
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   165
  def command_starts: Iterator[(Command, Int)] = Document.command_starts(commands)
34855
81d0410dc3ac iterators for ranges of commands/starts -- avoid extra array per document;
wenzelm
parents: 34853
diff changeset
   166
81d0410dc3ac iterators for ranges of commands/starts -- avoid extra array per document;
wenzelm
parents: 34853
diff changeset
   167
  def command_start(cmd: Command): Option[Int] =
81d0410dc3ac iterators for ranges of commands/starts -- avoid extra array per document;
wenzelm
parents: 34853
diff changeset
   168
    command_starts.find(_._1 == cmd).map(_._2)
81d0410dc3ac iterators for ranges of commands/starts -- avoid extra array per document;
wenzelm
parents: 34853
diff changeset
   169
81d0410dc3ac iterators for ranges of commands/starts -- avoid extra array per document;
wenzelm
parents: 34853
diff changeset
   170
  def command_range(i: Int): Iterator[(Command, Int)] =
81d0410dc3ac iterators for ranges of commands/starts -- avoid extra array per document;
wenzelm
parents: 34853
diff changeset
   171
    command_starts dropWhile { case (cmd, start) => start + cmd.length <= i }
81d0410dc3ac iterators for ranges of commands/starts -- avoid extra array per document;
wenzelm
parents: 34853
diff changeset
   172
81d0410dc3ac iterators for ranges of commands/starts -- avoid extra array per document;
wenzelm
parents: 34853
diff changeset
   173
  def command_range(i: Int, j: Int): Iterator[(Command, Int)] =
81d0410dc3ac iterators for ranges of commands/starts -- avoid extra array per document;
wenzelm
parents: 34853
diff changeset
   174
    command_range(i) takeWhile { case (_, start) => start < j }
81d0410dc3ac iterators for ranges of commands/starts -- avoid extra array per document;
wenzelm
parents: 34853
diff changeset
   175
81d0410dc3ac iterators for ranges of commands/starts -- avoid extra array per document;
wenzelm
parents: 34853
diff changeset
   176
  def command_at(i: Int): Option[(Command, Int)] =
81d0410dc3ac iterators for ranges of commands/starts -- avoid extra array per document;
wenzelm
parents: 34853
diff changeset
   177
  {
81d0410dc3ac iterators for ranges of commands/starts -- avoid extra array per document;
wenzelm
parents: 34853
diff changeset
   178
    val range = command_range(i)
81d0410dc3ac iterators for ranges of commands/starts -- avoid extra array per document;
wenzelm
parents: 34853
diff changeset
   179
    if (range.hasNext) Some(range.next) else None
81d0410dc3ac iterators for ranges of commands/starts -- avoid extra array per document;
wenzelm
parents: 34853
diff changeset
   180
  }
81d0410dc3ac iterators for ranges of commands/starts -- avoid extra array per document;
wenzelm
parents: 34853
diff changeset
   181
81d0410dc3ac iterators for ranges of commands/starts -- avoid extra array per document;
wenzelm
parents: 34853
diff changeset
   182
81d0410dc3ac iterators for ranges of commands/starts -- avoid extra array per document;
wenzelm
parents: 34853
diff changeset
   183
  /* command state assignment */
34840
6c5560d48561 more precise treatment of document/state assigment;
wenzelm
parents: 34838
diff changeset
   184
6c5560d48561 more precise treatment of document/state assigment;
wenzelm
parents: 34838
diff changeset
   185
  val assignment = Future.promise[Map[Command, Command]]
34853
32b49207ca20 misc tuning and clarification of Document/Change;
wenzelm
parents: 34840
diff changeset
   186
  def await_assignment { assignment.join }
34840
6c5560d48561 more precise treatment of document/state assigment;
wenzelm
parents: 34838
diff changeset
   187
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34855
diff changeset
   188
  @volatile private var tmp_states = former_states
34840
6c5560d48561 more precise treatment of document/state assigment;
wenzelm
parents: 34838
diff changeset
   189
6c5560d48561 more precise treatment of document/state assigment;
wenzelm
parents: 34838
diff changeset
   190
  def assign_states(new_states: List[(Command, Command)])
6c5560d48561 more precise treatment of document/state assigment;
wenzelm
parents: 34838
diff changeset
   191
  {
6c5560d48561 more precise treatment of document/state assigment;
wenzelm
parents: 34838
diff changeset
   192
    assignment.fulfill(tmp_states ++ new_states)
6c5560d48561 more precise treatment of document/state assigment;
wenzelm
parents: 34838
diff changeset
   193
    tmp_states = Map()
6c5560d48561 more precise treatment of document/state assigment;
wenzelm
parents: 34838
diff changeset
   194
  }
6c5560d48561 more precise treatment of document/state assigment;
wenzelm
parents: 34838
diff changeset
   195
6c5560d48561 more precise treatment of document/state assigment;
wenzelm
parents: 34838
diff changeset
   196
  def current_state(cmd: Command): State =
6c5560d48561 more precise treatment of document/state assigment;
wenzelm
parents: 34838
diff changeset
   197
  {
6c5560d48561 more precise treatment of document/state assigment;
wenzelm
parents: 34838
diff changeset
   198
    require(assignment.is_finished)
6c5560d48561 more precise treatment of document/state assigment;
wenzelm
parents: 34838
diff changeset
   199
    (assignment.join)(cmd).current_state
6c5560d48561 more precise treatment of document/state assigment;
wenzelm
parents: 34838
diff changeset
   200
  }
34318
c13e168a8ae6 original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff changeset
   201
}