src/Pure/PIDE/command.scala
author wenzelm
Mon, 20 Mar 2017 20:43:26 +0100
changeset 65335 7634d33c1a79
parent 64825 e78b62c289bb
child 65341 c82a1620b274
permissions -rw-r--r--
support to encode/decode command state; support to merge full contents of command state;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
36676
ac7961d42ac3 some rearrangement of Scala sources;
wenzelm
parents: 36012
diff changeset
     1
/*  Title:      Pure/PIDE/command.scala
ac7961d42ac3 some rearrangement of Scala sources;
wenzelm
parents: 36012
diff changeset
     2
    Author:     Fabian Immler, TU Munich
ac7961d42ac3 some rearrangement of Scala sources;
wenzelm
parents: 36012
diff changeset
     3
    Author:     Makarius
ac7961d42ac3 some rearrangement of Scala sources;
wenzelm
parents: 36012
diff changeset
     4
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52535
diff changeset
     5
Prover commands with accumulated results from execution.
36676
ac7961d42ac3 some rearrangement of Scala sources;
wenzelm
parents: 36012
diff changeset
     6
*/
34407
aad6834ba380 added some headers and comments;
wenzelm
parents: 34401
diff changeset
     7
34871
e596a0b71f3c incorporate "proofdocument" part into main Isabelle/Pure.jar -- except for html_panel.scala, which depends on external library (Lobo/Cobra browser);
wenzelm
parents: 34865
diff changeset
     8
package isabelle
34318
c13e168a8ae6 original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff changeset
     9
34451
3b9d0074ed44 command id via Isabelle.plugin;
wenzelm
parents: 34410
diff changeset
    10
45644
8634b4e61b88 sharing of token source with span source;
wenzelm
parents: 45455
diff changeset
    11
import scala.collection.mutable
38872
26c505765024 Command.results: ordered by serial number;
wenzelm
parents: 38723
diff changeset
    12
import scala.collection.immutable.SortedMap
26c505765024 Command.results: ordered by serial number;
wenzelm
parents: 38723
diff changeset
    13
26c505765024 Command.results: ordered by serial number;
wenzelm
parents: 38723
diff changeset
    14
34637
f3b5d6e248be added symbol_index (presently unused);
wenzelm
parents: 34603
diff changeset
    15
object Command
f3b5d6e248be added symbol_index (presently unused);
wenzelm
parents: 34603
diff changeset
    16
{
52849
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52642
diff changeset
    17
  type Edit = (Option[Command], Option[Command])
59704
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
    18
56746
d37a5d09a277 tuned signature;
wenzelm
parents: 56743
diff changeset
    19
  type Blob = Exn.Result[(Document.Node.Name, Option[(SHA1.Digest, Symbol.Text_Chunk)])]
59704
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
    20
  type Blobs_Info = (List[Blob], Int)
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
    21
  val no_blobs: Blobs_Info = (Nil, -1)
52849
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52642
diff changeset
    22
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52642
diff changeset
    23
38361
b609d0b271fa specific command state;
wenzelm
parents: 38360
diff changeset
    24
  /** accumulated results from prover **/
b609d0b271fa specific command state;
wenzelm
parents: 38360
diff changeset
    25
50507
9605b0d93d1e more formal class Command.Results;
wenzelm
parents: 50501
diff changeset
    26
  /* results */
9605b0d93d1e more formal class Command.Results;
wenzelm
parents: 50501
diff changeset
    27
9605b0d93d1e more formal class Command.Results;
wenzelm
parents: 50501
diff changeset
    28
  object Results
9605b0d93d1e more formal class Command.Results;
wenzelm
parents: 50501
diff changeset
    29
  {
51496
cb677987b7e3 retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents: 51494
diff changeset
    30
    type Entry = (Long, XML.Tree)
50507
9605b0d93d1e more formal class Command.Results;
wenzelm
parents: 50501
diff changeset
    31
    val empty = new Results(SortedMap.empty)
59072
27c6936c6484 tuned signature;
wenzelm
parents: 57912
diff changeset
    32
    def make(args: TraversableOnce[Results.Entry]): Results = (empty /: args)(_ + _)
27c6936c6484 tuned signature;
wenzelm
parents: 57912
diff changeset
    33
    def merge(args: TraversableOnce[Results]): Results = (empty /: args)(_ ++ _)
65335
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
    34
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
    35
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
    36
    /* XML data representation */
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
    37
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
    38
    val encode: XML.Encode.T[Results] = (results: Results) =>
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
    39
    { import XML.Encode._; list(pair(long, tree))(results.rep.toList) }
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
    40
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
    41
    val decode: XML.Decode.T[Results] = (body: XML.Body) =>
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
    42
    { import XML.Decode._; make(list(pair(long, tree))(body)) }
50507
9605b0d93d1e more formal class Command.Results;
wenzelm
parents: 50501
diff changeset
    43
  }
9605b0d93d1e more formal class Command.Results;
wenzelm
parents: 50501
diff changeset
    44
51494
8f3d1a7bee26 structural equality for Command.Results;
wenzelm
parents: 51048
diff changeset
    45
  final class Results private(private val rep: SortedMap[Long, XML.Tree])
50507
9605b0d93d1e more formal class Command.Results;
wenzelm
parents: 50501
diff changeset
    46
  {
64802
adc4c84b692c suppress empty results;
wenzelm
parents: 64471
diff changeset
    47
    def is_empty: Boolean = rep.isEmpty
50507
9605b0d93d1e more formal class Command.Results;
wenzelm
parents: 50501
diff changeset
    48
    def defined(serial: Long): Boolean = rep.isDefinedAt(serial)
9605b0d93d1e more formal class Command.Results;
wenzelm
parents: 50501
diff changeset
    49
    def get(serial: Long): Option[XML.Tree] = rep.get(serial)
56372
fadb0fef09d7 more explicit iterator terminology, in accordance to Scala 2.8 library;
wenzelm
parents: 56359
diff changeset
    50
    def iterator: Iterator[Results.Entry] = rep.iterator
50508
5b7150395568 tuned implementation according to Library.insert/merge in ML;
wenzelm
parents: 50507
diff changeset
    51
51496
cb677987b7e3 retain original tooltip range, to avoid repeated window popup when the mouse is moved over the same content;
wenzelm
parents: 51494
diff changeset
    52
    def + (entry: Results.Entry): Results =
50508
5b7150395568 tuned implementation according to Library.insert/merge in ML;
wenzelm
parents: 50507
diff changeset
    53
      if (defined(entry._1)) this
5b7150395568 tuned implementation according to Library.insert/merge in ML;
wenzelm
parents: 50507
diff changeset
    54
      else new Results(rep + entry)
5b7150395568 tuned implementation according to Library.insert/merge in ML;
wenzelm
parents: 50507
diff changeset
    55
5b7150395568 tuned implementation according to Library.insert/merge in ML;
wenzelm
parents: 50507
diff changeset
    56
    def ++ (other: Results): Results =
5b7150395568 tuned implementation according to Library.insert/merge in ML;
wenzelm
parents: 50507
diff changeset
    57
      if (this eq other) this
5b7150395568 tuned implementation according to Library.insert/merge in ML;
wenzelm
parents: 50507
diff changeset
    58
      else if (rep.isEmpty) other
56372
fadb0fef09d7 more explicit iterator terminology, in accordance to Scala 2.8 library;
wenzelm
parents: 56359
diff changeset
    59
      else (this /: other.iterator)(_ + _)
50540
wenzelm
parents: 50508
diff changeset
    60
51494
8f3d1a7bee26 structural equality for Command.Results;
wenzelm
parents: 51048
diff changeset
    61
    override def hashCode: Int = rep.hashCode
8f3d1a7bee26 structural equality for Command.Results;
wenzelm
parents: 51048
diff changeset
    62
    override def equals(that: Any): Boolean =
8f3d1a7bee26 structural equality for Command.Results;
wenzelm
parents: 51048
diff changeset
    63
      that match {
8f3d1a7bee26 structural equality for Command.Results;
wenzelm
parents: 51048
diff changeset
    64
        case other: Results => rep == other.rep
8f3d1a7bee26 structural equality for Command.Results;
wenzelm
parents: 51048
diff changeset
    65
        case _ => false
8f3d1a7bee26 structural equality for Command.Results;
wenzelm
parents: 51048
diff changeset
    66
      }
56372
fadb0fef09d7 more explicit iterator terminology, in accordance to Scala 2.8 library;
wenzelm
parents: 56359
diff changeset
    67
    override def toString: String = iterator.mkString("Results(", ", ", ")")
50507
9605b0d93d1e more formal class Command.Results;
wenzelm
parents: 50501
diff changeset
    68
  }
9605b0d93d1e more formal class Command.Results;
wenzelm
parents: 50501
diff changeset
    69
9605b0d93d1e more formal class Command.Results;
wenzelm
parents: 50501
diff changeset
    70
55649
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
    71
  /* markup */
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
    72
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
    73
  object Markup_Index
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
    74
  {
56746
d37a5d09a277 tuned signature;
wenzelm
parents: 56743
diff changeset
    75
    val markup: Markup_Index = Markup_Index(false, Symbol.Text_Chunk.Default)
55649
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
    76
  }
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
    77
56746
d37a5d09a277 tuned signature;
wenzelm
parents: 56743
diff changeset
    78
  sealed case class Markup_Index(status: Boolean, chunk_name: Symbol.Text_Chunk.Name)
55649
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
    79
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
    80
  object Markups
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
    81
  {
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
    82
    val empty: Markups = new Markups(Map.empty)
65335
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
    83
    def init(markup: Markup_Tree): Markups = new Markups(Map(Markup_Index.markup -> markup))
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
    84
    def merge(args: TraversableOnce[Markups]): Markups = (empty /: args)(_ ++ _)
55649
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
    85
65335
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
    86
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
    87
    /* XML data representation */
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
    88
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
    89
    def encode(source_length: Int): XML.Encode.T[Markups] = (markups: Markups) =>
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
    90
    {
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
    91
      import XML.Encode._
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
    92
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
    93
      val markup_index: T[Markup_Index] = (index: Markup_Index) =>
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
    94
        pair(bool, Symbol.Text_Chunk.encode_name)(index.status, index.chunk_name)
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
    95
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
    96
      val markup_tree: T[Markup_Tree] =
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
    97
        _.to_XML(Text.Range(0, source_length), Symbol.spaces(source_length), Markup.Elements.full)
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
    98
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
    99
      list(pair(markup_index, markup_tree))(markups.rep.toList)
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   100
    }
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   101
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   102
    val decode: XML.Decode.T[Markups] = (body: XML.Body) =>
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   103
    {
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   104
      import XML.Decode._
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   105
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   106
      val markup_index: T[Markup_Index] = (body: XML.Body) =>
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   107
      {
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   108
        val (status, chunk_name) = pair(bool, Symbol.Text_Chunk.decode_name)(body)
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   109
        Markup_Index(status, chunk_name)
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   110
      }
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   111
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   112
      (Markups.empty /: list(pair(markup_index, Markup_Tree.from_XML(_)))(body))(_ + _)
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   113
    }
55649
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   114
  }
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   115
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   116
  final class Markups private(private val rep: Map[Markup_Index, Markup_Tree])
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   117
  {
56489
wenzelm
parents: 56476
diff changeset
   118
    def is_empty: Boolean = rep.isEmpty
wenzelm
parents: 56476
diff changeset
   119
55649
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   120
    def apply(index: Markup_Index): Markup_Tree =
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   121
      rep.getOrElse(index, Markup_Tree.empty)
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   122
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   123
    def add(index: Markup_Index, markup: Text.Markup): Markups =
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   124
      new Markups(rep + (index -> (this(index) + markup)))
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   125
65335
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   126
    def + (entry: (Markup_Index, Markup_Tree)): Markups =
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   127
    {
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   128
      val (index, tree) = entry
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   129
      new Markups(rep + (index -> (this(index).merge(tree, Text.Range.full, Markup.Elements.full))))
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   130
    }
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   131
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   132
    def ++ (other: Markups): Markups =
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   133
      if (this eq other) this
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   134
      else if (rep.isEmpty) other
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   135
      else (this /: other.rep.iterator)(_ + _)
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   136
56475
710dee42b3d0 tuned signature;
wenzelm
parents: 56473
diff changeset
   137
    def redirection_iterator: Iterator[Document_ID.Generic] =
56746
d37a5d09a277 tuned signature;
wenzelm
parents: 56743
diff changeset
   138
      for (Markup_Index(_, Symbol.Text_Chunk.Id(id)) <- rep.keysIterator)
56475
710dee42b3d0 tuned signature;
wenzelm
parents: 56473
diff changeset
   139
        yield id
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56469
diff changeset
   140
56475
710dee42b3d0 tuned signature;
wenzelm
parents: 56473
diff changeset
   141
    def redirect(other_id: Document_ID.Generic): Markups =
56489
wenzelm
parents: 56476
diff changeset
   142
    {
wenzelm
parents: 56476
diff changeset
   143
      val rep1 =
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56469
diff changeset
   144
        (for {
56746
d37a5d09a277 tuned signature;
wenzelm
parents: 56743
diff changeset
   145
          (Markup_Index(status, Symbol.Text_Chunk.Id(id)), markup) <- rep.iterator
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56469
diff changeset
   146
          if other_id == id
56746
d37a5d09a277 tuned signature;
wenzelm
parents: 56743
diff changeset
   147
        } yield (Markup_Index(status, Symbol.Text_Chunk.Default), markup)).toMap
56489
wenzelm
parents: 56476
diff changeset
   148
      if (rep1.isEmpty) Markups.empty else new Markups(rep1)
wenzelm
parents: 56476
diff changeset
   149
    }
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56469
diff changeset
   150
55649
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   151
    override def hashCode: Int = rep.hashCode
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   152
    override def equals(that: Any): Boolean =
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   153
      that match {
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   154
        case other: Markups => rep == other.rep
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   155
        case _ => false
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   156
      }
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   157
    override def toString: String = rep.iterator.mkString("Markups(", ", ", ")")
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   158
  }
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   159
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   160
50507
9605b0d93d1e more formal class Command.Results;
wenzelm
parents: 50501
diff changeset
   161
  /* state */
50501
6f41f1646617 more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents: 50500
diff changeset
   162
56299
8201790fdeb9 more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents: 56295
diff changeset
   163
  object State
8201790fdeb9 more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents: 56295
diff changeset
   164
  {
65335
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   165
    def merge_results(states: List[State]): Results =
56299
8201790fdeb9 more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents: 56295
diff changeset
   166
      Results.merge(states.map(_.results))
8201790fdeb9 more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents: 56295
diff changeset
   167
65335
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   168
    def merge_markups(states: List[State]): Markups =
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   169
      Markups.merge(states.map(_.markups))
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   170
56301
1da7b4c33db9 more frugal merge of markup trees: filter wrt. subsequent query;
wenzelm
parents: 56299
diff changeset
   171
    def merge_markup(states: List[State], index: Markup_Index,
56743
81370dfadb1d tuned signature;
wenzelm
parents: 56514
diff changeset
   172
        range: Text.Range, elements: Markup.Elements): Markup_Tree =
56301
1da7b4c33db9 more frugal merge of markup trees: filter wrt. subsequent query;
wenzelm
parents: 56299
diff changeset
   173
      Markup_Tree.merge(states.map(_.markup(index)), range, elements)
65335
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   174
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   175
    def merge(command: Command, states: List[State]): State =
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   176
      State(command, states.flatMap(_.status), merge_results(states), merge_markups(states))
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   177
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   178
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   179
    /* XML data representation */
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   180
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   181
    val encode: XML.Encode.T[State] = (st: State) =>
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   182
    {
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   183
      import XML.Encode._
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   184
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   185
      val command = st.command
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   186
      val blobs_names = command.blobs_names.map(_.node)
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   187
      val blobs_index = command.blobs_index
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   188
      require(command.blobs_ok)
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   189
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   190
      pair(long, pair(string, pair(pair(list(string), int), pair(Command_Span.encode,
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   191
          pair(list(Markup.encode), pair(Results.encode, Markups.encode(command.source.length)))))))(
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   192
        (command.id, (command.node_name.node, ((blobs_names, blobs_index), (command.span,
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   193
          (st.status, (st.results, st.markups)))))))
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   194
    }
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   195
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   196
    def decode(node_name: String => Document.Node.Name): XML.Decode.T[State] = (body: XML.Body) =>
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   197
    {
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   198
      import XML.Decode._
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   199
      val (id, (node, ((blobs_names, blobs_index), (span, (status, (results, markups)))))) =
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   200
        pair(long, pair(string, pair(pair(list(string), int), pair(Command_Span.decode,
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   201
          pair(list(Markup.decode), pair(Results.decode, Markups.decode))))))(body)
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   202
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   203
      val blobs_info: Blobs_Info =
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   204
        (blobs_names.map(name => Exn.Res((node_name(name), None)): Blob), blobs_index)
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   205
      val command = Command(id, node_name(node), blobs_info, span)
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   206
      State(command, status, results, markups)
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   207
    }
56299
8201790fdeb9 more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents: 56295
diff changeset
   208
  }
8201790fdeb9 more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents: 56295
diff changeset
   209
43714
3749d1e6dde9 tuned signature;
wenzelm
parents: 43662
diff changeset
   210
  sealed case class State(
50501
6f41f1646617 more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents: 50500
diff changeset
   211
    command: Command,
6f41f1646617 more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents: 50500
diff changeset
   212
    status: List[Markup] = Nil,
50507
9605b0d93d1e more formal class Command.Results;
wenzelm
parents: 50501
diff changeset
   213
    results: Results = Results.empty,
55649
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   214
    markups: Markups = Markups.empty)
38361
b609d0b271fa specific command state;
wenzelm
parents: 38360
diff changeset
   215
  {
56395
0546e036d1c0 more direct warning within persistent Protocol.Status;
wenzelm
parents: 56372
diff changeset
   216
    lazy val protocol_status: Protocol.Status =
0546e036d1c0 more direct warning within persistent Protocol.Status;
wenzelm
parents: 56372
diff changeset
   217
    {
0546e036d1c0 more direct warning within persistent Protocol.Status;
wenzelm
parents: 56372
diff changeset
   218
      val warnings =
59203
5f0bd5afc16d explicit message channel for "legacy", which is nonetheless a variant of "warning";
wenzelm
parents: 59072
diff changeset
   219
        if (results.iterator.exists(p => Protocol.is_warning(p._2) || Protocol.is_legacy(p._2)))
56395
0546e036d1c0 more direct warning within persistent Protocol.Status;
wenzelm
parents: 56372
diff changeset
   220
          List(Markup(Markup.WARNING, Nil))
0546e036d1c0 more direct warning within persistent Protocol.Status;
wenzelm
parents: 56372
diff changeset
   221
        else Nil
0546e036d1c0 more direct warning within persistent Protocol.Status;
wenzelm
parents: 56372
diff changeset
   222
      val errors =
0546e036d1c0 more direct warning within persistent Protocol.Status;
wenzelm
parents: 56372
diff changeset
   223
        if (results.iterator.exists(p => Protocol.is_error(p._2)))
0546e036d1c0 more direct warning within persistent Protocol.Status;
wenzelm
parents: 56372
diff changeset
   224
          List(Markup(Markup.ERROR, Nil))
0546e036d1c0 more direct warning within persistent Protocol.Status;
wenzelm
parents: 56372
diff changeset
   225
        else Nil
0546e036d1c0 more direct warning within persistent Protocol.Status;
wenzelm
parents: 56372
diff changeset
   226
      Protocol.Status.make((warnings ::: errors ::: status).iterator)
0546e036d1c0 more direct warning within persistent Protocol.Status;
wenzelm
parents: 56372
diff changeset
   227
    }
55432
9c53198dbb1c maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents: 55431
diff changeset
   228
55650
349afd0fa0c4 tuned signature;
wenzelm
parents: 55649
diff changeset
   229
    def markup(index: Markup_Index): Markup_Tree = markups(index)
55432
9c53198dbb1c maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents: 55431
diff changeset
   230
56489
wenzelm
parents: 56476
diff changeset
   231
    def redirect(other_command: Command): Option[State] =
wenzelm
parents: 56476
diff changeset
   232
    {
wenzelm
parents: 56476
diff changeset
   233
      val markups1 = markups.redirect(other_command.id)
wenzelm
parents: 56476
diff changeset
   234
      if (markups1.is_empty) None
wenzelm
parents: 56476
diff changeset
   235
      else Some(new State(other_command, Nil, Results.empty, markups1))
wenzelm
parents: 56476
diff changeset
   236
    }
49614
0009a6ebc83b operations to turn markup into XML;
wenzelm
parents: 49527
diff changeset
   237
55649
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   238
    private def add_status(st: Markup): State =
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   239
      copy(status = st :: status)
55432
9c53198dbb1c maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents: 55431
diff changeset
   240
56746
d37a5d09a277 tuned signature;
wenzelm
parents: 56743
diff changeset
   241
    private def add_markup(
d37a5d09a277 tuned signature;
wenzelm
parents: 56743
diff changeset
   242
      status: Boolean, chunk_name: Symbol.Text_Chunk.Name, m: Text.Markup): State =
55649
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   243
    {
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   244
      val markups1 =
56395
0546e036d1c0 more direct warning within persistent Protocol.Status;
wenzelm
parents: 56372
diff changeset
   245
        if (status || Protocol.liberal_status_elements(m.info.name))
56462
b64b0cb845fe more explicit Command.Chunk types, less ooddities;
wenzelm
parents: 56395
diff changeset
   246
          markups.add(Markup_Index(true, chunk_name), m)
55649
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   247
        else markups
56462
b64b0cb845fe more explicit Command.Chunk types, less ooddities;
wenzelm
parents: 56395
diff changeset
   248
      copy(markups = markups1.add(Markup_Index(false, chunk_name), m))
55649
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   249
    }
38361
b609d0b271fa specific command state;
wenzelm
parents: 38360
diff changeset
   250
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56469
diff changeset
   251
    def accumulate(
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56469
diff changeset
   252
        self_id: Document_ID.Generic => Boolean,
56746
d37a5d09a277 tuned signature;
wenzelm
parents: 56743
diff changeset
   253
        other_id: Document_ID.Generic => Option[(Symbol.Text_Chunk.Id, Symbol.Text_Chunk)],
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56469
diff changeset
   254
        message: XML.Elem): State =
38361
b609d0b271fa specific command state;
wenzelm
parents: 38360
diff changeset
   255
      message match {
50201
c26369c9eda6 Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents: 50163
diff changeset
   256
        case XML.Elem(Markup(Markup.STATUS, _), msgs) =>
38714
31da698fc4e5 more precise Command.State accumulation;
wenzelm
parents: 38658
diff changeset
   257
          (this /: msgs)((state, msg) =>
31da698fc4e5 more precise Command.State accumulation;
wenzelm
parents: 38658
diff changeset
   258
            msg match {
46152
793cecd4ffc0 accumulate status as regular markup for command range;
wenzelm
parents: 45709
diff changeset
   259
              case elem @ XML.Elem(markup, Nil) =>
55649
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   260
                state.
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   261
                  add_status(markup).
56746
d37a5d09a277 tuned signature;
wenzelm
parents: 56743
diff changeset
   262
                  add_markup(true, Symbol.Text_Chunk.Default, Text.Info(command.proper_range, elem))
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52535
diff changeset
   263
              case _ =>
56782
433cf57550fa more systematic Isabelle output, like in classic Isabelle/ML (without markup);
wenzelm
parents: 56746
diff changeset
   264
                Output.warning("Ignored status message: " + msg)
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52535
diff changeset
   265
                state
38714
31da698fc4e5 more precise Command.State accumulation;
wenzelm
parents: 38658
diff changeset
   266
            })
38581
d503a0912e14 simplified Command.status again, reverting most of e5eed57913d0 (note that more complex information can be represented with full markup reports);
wenzelm
parents: 38579
diff changeset
   267
50201
c26369c9eda6 Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents: 50163
diff changeset
   268
        case XML.Elem(Markup(Markup.REPORT, _), msgs) =>
38572
0fe2c01ef7da Command.State: accumulate markup reports uniformly;
wenzelm
parents: 38564
diff changeset
   269
          (this /: msgs)((state, msg) =>
55432
9c53198dbb1c maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents: 55431
diff changeset
   270
            {
56782
433cf57550fa more systematic Isabelle output, like in classic Isabelle/ML (without markup);
wenzelm
parents: 56746
diff changeset
   271
              def bad(): Unit = Output.warning("Ignored report message: " + msg)
55432
9c53198dbb1c maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents: 55431
diff changeset
   272
9c53198dbb1c maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents: 55431
diff changeset
   273
              msg match {
57911
dcb758188aa6 clarified Position.Identified: do not require range from prover, default to command position;
wenzelm
parents: 57910
diff changeset
   274
                case XML.Elem(Markup(name, atts @ Position.Identified(id, chunk_name)), args) =>
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56469
diff changeset
   275
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56469
diff changeset
   276
                  val target =
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56469
diff changeset
   277
                    if (self_id(id) && command.chunks.isDefinedAt(chunk_name))
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56469
diff changeset
   278
                      Some((chunk_name, command.chunks(chunk_name)))
56746
d37a5d09a277 tuned signature;
wenzelm
parents: 56743
diff changeset
   279
                    else if (chunk_name == Symbol.Text_Chunk.Default) other_id(id)
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56469
diff changeset
   280
                    else None
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56469
diff changeset
   281
57911
dcb758188aa6 clarified Position.Identified: do not require range from prover, default to command position;
wenzelm
parents: 57910
diff changeset
   282
                  (target, atts) match {
dcb758188aa6 clarified Position.Identified: do not require range from prover, default to command position;
wenzelm
parents: 57910
diff changeset
   283
                    case (Some((target_name, target_chunk)), Position.Range(symbol_range)) =>
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56469
diff changeset
   284
                      target_chunk.incorporate(symbol_range) match {
55550
a645277885cf more uniform/robust restriction of reported positions, e.g. relevant for "bad" markup due to unclosed comment in ML file;
wenzelm
parents: 55434
diff changeset
   285
                        case Some(range) =>
55822
ccf2d784be97 incorporate chunk range that is 1 off end-of-input, for improved error positions (NB: command spans are tight, without trailing whitespace);
wenzelm
parents: 55785
diff changeset
   286
                          val props = Position.purge(atts)
ccf2d784be97 incorporate chunk range that is 1 off end-of-input, for improved error positions (NB: command spans are tight, without trailing whitespace);
wenzelm
parents: 55785
diff changeset
   287
                          val info = Text.Info(range, XML.Elem(Markup(name, props), args))
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56469
diff changeset
   288
                          state.add_markup(false, target_name, info)
55550
a645277885cf more uniform/robust restriction of reported positions, e.g. relevant for "bad" markup due to unclosed comment in ML file;
wenzelm
parents: 55434
diff changeset
   289
                        case None => bad(); state
55432
9c53198dbb1c maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents: 55431
diff changeset
   290
                      }
57911
dcb758188aa6 clarified Position.Identified: do not require range from prover, default to command position;
wenzelm
parents: 57910
diff changeset
   291
                    case _ =>
56514
db929027e701 ignore other_id reports for now (see 8eda56033203): massive amounts of redirections to 'class' etc. makes it difficult to edit main HOL;
wenzelm
parents: 56489
diff changeset
   292
                      // silently ignore excessive reports
56476
dd596c2b5897 expose more bad cases;
wenzelm
parents: 56475
diff changeset
   293
                      state
55432
9c53198dbb1c maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents: 55431
diff changeset
   294
                  }
9c53198dbb1c maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents: 55431
diff changeset
   295
9c53198dbb1c maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents: 55431
diff changeset
   296
                case XML.Elem(Markup(name, atts), args)
9c53198dbb1c maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents: 55431
diff changeset
   297
                if !atts.exists({ case (a, _) => Markup.POSITION_PROPERTIES(a) }) =>
9c53198dbb1c maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents: 55431
diff changeset
   298
                  val range = command.proper_range
9c53198dbb1c maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents: 55431
diff changeset
   299
                  val props = Position.purge(atts)
9c53198dbb1c maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents: 55431
diff changeset
   300
                  val info: Text.Markup = Text.Info(range, XML.Elem(Markup(name, props), args))
56746
d37a5d09a277 tuned signature;
wenzelm
parents: 56743
diff changeset
   301
                  state.add_markup(false, Symbol.Text_Chunk.Default, info)
55432
9c53198dbb1c maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents: 55431
diff changeset
   302
56470
8eda56033203 accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents: 56469
diff changeset
   303
                case _ => bad(); state
55432
9c53198dbb1c maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents: 55431
diff changeset
   304
              }
38361
b609d0b271fa specific command state;
wenzelm
parents: 38360
diff changeset
   305
            })
52930
5fab62ae3532 retain original messages properties, e.g. for retrieval via Command.Results;
wenzelm
parents: 52849
diff changeset
   306
        case XML.Elem(Markup(name, props), body) =>
5fab62ae3532 retain original messages properties, e.g. for retrieval via Command.Results;
wenzelm
parents: 52849
diff changeset
   307
          props match {
50201
c26369c9eda6 Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents: 50163
diff changeset
   308
            case Markup.Serial(i) =>
c26369c9eda6 Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents: 50163
diff changeset
   309
              val message1 = XML.Elem(Markup(Markup.message(name), props), body)
50163
c62ce309dc26 more abstract Sendback operations, with explicit id/exec_id properties;
wenzelm
parents: 50158
diff changeset
   310
              val message2 = XML.Elem(Markup(name, props), body)
c62ce309dc26 more abstract Sendback operations, with explicit id/exec_id properties;
wenzelm
parents: 50158
diff changeset
   311
55433
d2960d67f163 clarified message_positions: cover alt_id as well;
wenzelm
parents: 55432
diff changeset
   312
              var st = copy(results = results + (i -> message1))
d2960d67f163 clarified message_positions: cover alt_id as well;
wenzelm
parents: 55432
diff changeset
   313
              if (Protocol.is_inlined(message)) {
d2960d67f163 clarified message_positions: cover alt_id as well;
wenzelm
parents: 55432
diff changeset
   314
                for {
56469
ffc94a271633 avoid data redundancy;
wenzelm
parents: 56468
diff changeset
   315
                  (chunk_name, chunk) <- command.chunks.iterator
59713
6da3efec20ca clarified modules;
wenzelm
parents: 59710
diff changeset
   316
                  range <- Protocol_Message.positions(
59735
24bee1b11fce misc tuning and simplification;
wenzelm
parents: 59715
diff changeset
   317
                    self_id, command.span.position, chunk_name, chunk, message)
56462
b64b0cb845fe more explicit Command.Chunk types, less ooddities;
wenzelm
parents: 56395
diff changeset
   318
                } st = st.add_markup(false, chunk_name, Text.Info(range, message2))
55433
d2960d67f163 clarified message_positions: cover alt_id as well;
wenzelm
parents: 55432
diff changeset
   319
              }
d2960d67f163 clarified message_positions: cover alt_id as well;
wenzelm
parents: 55432
diff changeset
   320
              st
55432
9c53198dbb1c maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents: 55431
diff changeset
   321
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52535
diff changeset
   322
            case _ =>
56782
433cf57550fa more systematic Isabelle output, like in classic Isabelle/ML (without markup);
wenzelm
parents: 56746
diff changeset
   323
              Output.warning("Ignored message without serial number: " + message)
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52535
diff changeset
   324
              this
38872
26c505765024 Command.results: ordered by serial number;
wenzelm
parents: 38723
diff changeset
   325
          }
56295
a40e67ce4f84 clarified valid_id: always standardize towards static command.id;
wenzelm
parents: 55884
diff changeset
   326
    }
38361
b609d0b271fa specific command state;
wenzelm
parents: 38360
diff changeset
   327
  }
38367
f7d2574dc3a6 more basic notion of unparsed input;
wenzelm
parents: 38363
diff changeset
   328
f7d2574dc3a6 more basic notion of unparsed input;
wenzelm
parents: 38363
diff changeset
   329
55431
e0f20a44ff9d common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents: 55430
diff changeset
   330
e0f20a44ff9d common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents: 55430
diff changeset
   331
  /** static content **/
e0f20a44ff9d common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents: 55430
diff changeset
   332
45644
8634b4e61b88 sharing of token source with span source;
wenzelm
parents: 45455
diff changeset
   333
  /* make commands */
8634b4e61b88 sharing of token source with span source;
wenzelm
parents: 45455
diff changeset
   334
55648
38f264741609 tuned signature -- avoid obscure default arguments;
wenzelm
parents: 55622
diff changeset
   335
  def apply(
38f264741609 tuned signature -- avoid obscure default arguments;
wenzelm
parents: 55622
diff changeset
   336
    id: Document_ID.Command,
38f264741609 tuned signature -- avoid obscure default arguments;
wenzelm
parents: 55622
diff changeset
   337
    node_name: Document.Node.Name,
59704
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   338
    blobs_info: Blobs_Info,
57905
c0c5652e796e separate module Command_Span: mostly syntactic representation;
wenzelm
parents: 57904
diff changeset
   339
    span: Command_Span.Span): Command =
55648
38f264741609 tuned signature -- avoid obscure default arguments;
wenzelm
parents: 55622
diff changeset
   340
  {
57901
e1abca2527da more explicit type Span in Scala, according to ML version;
wenzelm
parents: 57842
diff changeset
   341
    val (source, span1) = span.compact_source
59704
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   342
    new Command(id, node_name, blobs_info, span1, source, Results.empty, Markup_Tree.empty)
55648
38f264741609 tuned signature -- avoid obscure default arguments;
wenzelm
parents: 55622
diff changeset
   343
  }
49414
d7b5fb2e9ca2 some support for inital command markup;
wenzelm
parents: 49359
diff changeset
   344
57901
e1abca2527da more explicit type Span in Scala, according to ML version;
wenzelm
parents: 57842
diff changeset
   345
  val empty: Command =
59704
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   346
    Command(Document_ID.none, Document.Node.Name.empty, no_blobs, Command_Span.empty)
55648
38f264741609 tuned signature -- avoid obscure default arguments;
wenzelm
parents: 55622
diff changeset
   347
38f264741609 tuned signature -- avoid obscure default arguments;
wenzelm
parents: 55622
diff changeset
   348
  def unparsed(
38f264741609 tuned signature -- avoid obscure default arguments;
wenzelm
parents: 55622
diff changeset
   349
    id: Document_ID.Command,
38f264741609 tuned signature -- avoid obscure default arguments;
wenzelm
parents: 55622
diff changeset
   350
    source: String,
38f264741609 tuned signature -- avoid obscure default arguments;
wenzelm
parents: 55622
diff changeset
   351
    results: Results,
38f264741609 tuned signature -- avoid obscure default arguments;
wenzelm
parents: 55622
diff changeset
   352
    markup: Markup_Tree): Command =
38f264741609 tuned signature -- avoid obscure default arguments;
wenzelm
parents: 55622
diff changeset
   353
  {
57905
c0c5652e796e separate module Command_Span: mostly syntactic representation;
wenzelm
parents: 57904
diff changeset
   354
    val (source1, span1) = Command_Span.unparsed(source).compact_source
59704
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   355
    new Command(id, Document.Node.Name.empty, no_blobs, span1, source1, results, markup)
55648
38f264741609 tuned signature -- avoid obscure default arguments;
wenzelm
parents: 55622
diff changeset
   356
  }
49414
d7b5fb2e9ca2 some support for inital command markup;
wenzelm
parents: 49359
diff changeset
   357
50501
6f41f1646617 more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents: 50500
diff changeset
   358
  def unparsed(source: String): Command =
52530
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
   359
    unparsed(Document_ID.none, source, Results.empty, Markup_Tree.empty)
44384
8f6054a63f96 some support for editor perspective;
wenzelm
parents: 43714
diff changeset
   360
52530
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
   361
  def rich_text(id: Document_ID.Command, results: Results, body: XML.Body): Command =
49414
d7b5fb2e9ca2 some support for inital command markup;
wenzelm
parents: 49359
diff changeset
   362
  {
49466
99ed1f422635 tuned signature;
wenzelm
parents: 49445
diff changeset
   363
    val text = XML.content(body)
99ed1f422635 tuned signature;
wenzelm
parents: 49445
diff changeset
   364
    val markup = Markup_Tree.from_XML(body)
50501
6f41f1646617 more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents: 50500
diff changeset
   365
    unparsed(id, text, results, markup)
49414
d7b5fb2e9ca2 some support for inital command markup;
wenzelm
parents: 49359
diff changeset
   366
  }
49359
c1262d7389fb refined output panel: more value-oriented approach to update and caret focus;
wenzelm
parents: 49037
diff changeset
   367
44384
8f6054a63f96 some support for editor perspective;
wenzelm
parents: 43714
diff changeset
   368
8f6054a63f96 some support for editor perspective;
wenzelm
parents: 43714
diff changeset
   369
  /* perspective */
8f6054a63f96 some support for editor perspective;
wenzelm
parents: 43714
diff changeset
   370
44474
681447a9ffe5 slightly more abstract Command.Perspective;
wenzelm
parents: 44385
diff changeset
   371
  object Perspective
681447a9ffe5 slightly more abstract Command.Perspective;
wenzelm
parents: 44385
diff changeset
   372
  {
681447a9ffe5 slightly more abstract Command.Perspective;
wenzelm
parents: 44385
diff changeset
   373
    val empty: Perspective = Perspective(Nil)
681447a9ffe5 slightly more abstract Command.Perspective;
wenzelm
parents: 44385
diff changeset
   374
  }
44385
e7fdb008aa7d propagate editor perspective through document model;
wenzelm
parents: 44384
diff changeset
   375
44474
681447a9ffe5 slightly more abstract Command.Perspective;
wenzelm
parents: 44385
diff changeset
   376
  sealed case class Perspective(commands: List[Command])  // visible commands in canonical order
44385
e7fdb008aa7d propagate editor perspective through document model;
wenzelm
parents: 44384
diff changeset
   377
  {
57615
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 56782
diff changeset
   378
    def is_empty: Boolean = commands.isEmpty
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 56782
diff changeset
   379
44474
681447a9ffe5 slightly more abstract Command.Perspective;
wenzelm
parents: 44385
diff changeset
   380
    def same(that: Perspective): Boolean =
681447a9ffe5 slightly more abstract Command.Perspective;
wenzelm
parents: 44385
diff changeset
   381
    {
681447a9ffe5 slightly more abstract Command.Perspective;
wenzelm
parents: 44385
diff changeset
   382
      val cmds1 = this.commands
681447a9ffe5 slightly more abstract Command.Perspective;
wenzelm
parents: 44385
diff changeset
   383
      val cmds2 = that.commands
48754
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48745
diff changeset
   384
      require(!cmds1.exists(_.is_undefined))
c2c1e5944536 clarified undefined, unparsed, unfinished command spans;
wenzelm
parents: 48745
diff changeset
   385
      require(!cmds2.exists(_.is_undefined))
44474
681447a9ffe5 slightly more abstract Command.Perspective;
wenzelm
parents: 44385
diff changeset
   386
      cmds1.length == cmds2.length &&
681447a9ffe5 slightly more abstract Command.Perspective;
wenzelm
parents: 44385
diff changeset
   387
        (cmds1.iterator zip cmds2.iterator).forall({ case (c1, c2) => c1.id == c2.id })
681447a9ffe5 slightly more abstract Command.Perspective;
wenzelm
parents: 44385
diff changeset
   388
    }
44385
e7fdb008aa7d propagate editor perspective through document model;
wenzelm
parents: 44384
diff changeset
   389
  }
59689
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59684
diff changeset
   390
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59684
diff changeset
   391
59704
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   392
  /* blobs: inlined errors and auxiliary files */
59689
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59684
diff changeset
   393
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59684
diff changeset
   394
  private def clean_tokens(tokens: List[Token]): List[(Token, Int)] =
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59684
diff changeset
   395
  {
61579
634cd44bb1d3 symbolic syntax "\<comment> text";
wenzelm
parents: 61197
diff changeset
   396
    val markers = Set("%", "--", Symbol.comment, Symbol.comment_decoded)
59689
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59684
diff changeset
   397
    def clean(toks: List[(Token, Int)]): List[(Token, Int)] =
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59684
diff changeset
   398
      toks match {
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59684
diff changeset
   399
        case (t1, i1) :: (t2, i2) :: rest =>
61579
634cd44bb1d3 symbolic syntax "\<comment> text";
wenzelm
parents: 61197
diff changeset
   400
          if (t1.is_keyword && markers(t1.source)) clean(rest)
59689
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59684
diff changeset
   401
          else (t1, i1) :: clean((t2, i2) :: rest)
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59684
diff changeset
   402
        case _ => toks
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59684
diff changeset
   403
      }
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59684
diff changeset
   404
    clean(tokens.zipWithIndex.filter({ case (t, _) => t.is_proper }))
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59684
diff changeset
   405
  }
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59684
diff changeset
   406
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59684
diff changeset
   407
  private def find_file(tokens: List[(Token, Int)]): Option[(String, Int)] =
59924
801b979ec0c2 more general notion of command span: command keyword not necessarily at start;
wenzelm
parents: 59735
diff changeset
   408
    if (tokens.exists({ case (t, _) => t.is_command })) {
801b979ec0c2 more general notion of command span: command keyword not necessarily at start;
wenzelm
parents: 59735
diff changeset
   409
      tokens.dropWhile({ case (t, _) => !t.is_command }).
64471
c40c2975fb02 more uniform path syntax, as in ML (see 5a7c919a4ada);
wenzelm
parents: 63584
diff changeset
   410
        collectFirst({ case (t, i) if t.is_embedded => (t.content, i) })
59689
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59684
diff changeset
   411
    }
59924
801b979ec0c2 more general notion of command span: command keyword not necessarily at start;
wenzelm
parents: 59735
diff changeset
   412
    else None
59689
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59684
diff changeset
   413
63584
68751fe1c036 tuned signature -- prover-independence is presently theoretical;
wenzelm
parents: 62969
diff changeset
   414
  def span_files(syntax: Outer_Syntax, span: Command_Span.Span): (List[String], Int) =
59735
24bee1b11fce misc tuning and simplification;
wenzelm
parents: 59715
diff changeset
   415
    syntax.load_command(span.name) match {
24bee1b11fce misc tuning and simplification;
wenzelm
parents: 59715
diff changeset
   416
      case Some(exts) =>
24bee1b11fce misc tuning and simplification;
wenzelm
parents: 59715
diff changeset
   417
        find_file(clean_tokens(span.content)) match {
24bee1b11fce misc tuning and simplification;
wenzelm
parents: 59715
diff changeset
   418
          case Some((file, i)) =>
24bee1b11fce misc tuning and simplification;
wenzelm
parents: 59715
diff changeset
   419
            if (exts.isEmpty) (List(file), i)
24bee1b11fce misc tuning and simplification;
wenzelm
parents: 59715
diff changeset
   420
            else (exts.map(ext => file + "." + ext), i)
59689
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59684
diff changeset
   421
          case None => (Nil, -1)
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59684
diff changeset
   422
        }
59735
24bee1b11fce misc tuning and simplification;
wenzelm
parents: 59715
diff changeset
   423
      case None => (Nil, -1)
59689
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59684
diff changeset
   424
    }
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59684
diff changeset
   425
59704
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   426
  def blobs_info(
59701
wenzelm
parents: 59698
diff changeset
   427
    resources: Resources,
63584
68751fe1c036 tuned signature -- prover-independence is presently theoretical;
wenzelm
parents: 62969
diff changeset
   428
    syntax: Outer_Syntax,
59701
wenzelm
parents: 59698
diff changeset
   429
    get_blob: Document.Node.Name => Option[Document.Blob],
59704
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   430
    can_import: Document.Node.Name => Boolean,
59701
wenzelm
parents: 59698
diff changeset
   431
    node_name: Document.Node.Name,
59704
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   432
    span: Command_Span.Span): Blobs_Info =
59689
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59684
diff changeset
   433
  {
59735
24bee1b11fce misc tuning and simplification;
wenzelm
parents: 59715
diff changeset
   434
    span.name match {
59704
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   435
      // inlined errors
59735
24bee1b11fce misc tuning and simplification;
wenzelm
parents: 59715
diff changeset
   436
      case Thy_Header.THEORY =>
64825
e78b62c289bb more uniform node_header (non-strict);
wenzelm
parents: 64824
diff changeset
   437
        val reader = Scan.char_reader(Token.implode(span.content))
e78b62c289bb more uniform node_header (non-strict);
wenzelm
parents: 64824
diff changeset
   438
        val header = resources.check_thy_reader("", node_name, reader)
59715
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59713
diff changeset
   439
        val errors =
59710
aed304412e43 more markup, which helps to create missing imports;
wenzelm
parents: 59708
diff changeset
   440
          for ((imp, pos) <- header.imports if !can_import(imp)) yield {
59715
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59713
diff changeset
   441
            val msg =
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59713
diff changeset
   442
              "Bad theory import " +
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59713
diff changeset
   443
                Markup.Path(imp.node).markup(quote(imp.toString)) + Position.here(pos)
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59713
diff changeset
   444
            Exn.Exn(ERROR(msg)): Command.Blob
59710
aed304412e43 more markup, which helps to create missing imports;
wenzelm
parents: 59708
diff changeset
   445
          }
59715
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59713
diff changeset
   446
        (errors, -1)
59704
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   447
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   448
      // auxiliary files
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   449
      case _ =>
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   450
        val (files, index) = span_files(syntax, span)
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   451
        val blobs =
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   452
          files.map(file =>
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   453
            (Exn.capture {
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   454
              val name =
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   455
                Document.Node.Name(resources.append(node_name.master_dir, Path.explode(file)))
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   456
              val blob = get_blob(name).map(blob => ((blob.bytes.sha1_digest, blob.chunk)))
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   457
              (name, blob)
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   458
            }).user_error)
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   459
        (blobs, index)
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   460
    }
59689
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59684
diff changeset
   461
  }
34318
c13e168a8ae6 original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff changeset
   462
}
c13e168a8ae6 original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff changeset
   463
38361
b609d0b271fa specific command state;
wenzelm
parents: 38360
diff changeset
   464
46712
8650d9a95736 prefer final ADTs -- prevent ooddities;
wenzelm
parents: 46164
diff changeset
   465
final class Command private(
52530
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
   466
    val id: Document_ID.Command,
44615
a4ff8a787202 more abstract Document.Node.Name;
wenzelm
parents: 44607
diff changeset
   467
    val node_name: Document.Node.Name,
59704
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   468
    val blobs_info: Command.Blobs_Info,
57905
c0c5652e796e separate module Command_Span: mostly syntactic representation;
wenzelm
parents: 57904
diff changeset
   469
    val span: Command_Span.Span,
49414
d7b5fb2e9ca2 some support for inital command markup;
wenzelm
parents: 49359
diff changeset
   470
    val source: String,
50501
6f41f1646617 more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents: 50500
diff changeset
   471
    val init_results: Command.Results,
49414
d7b5fb2e9ca2 some support for inital command markup;
wenzelm
parents: 49359
diff changeset
   472
    val init_markup: Markup_Tree)
34451
3b9d0074ed44 command id via Isabelle.plugin;
wenzelm
parents: 34410
diff changeset
   473
{
57912
wenzelm
parents: 57911
diff changeset
   474
  override def toString: String = id + "/" + span.kind.toString
34495
722533c532da Command: added name field and toString;
wenzelm
parents: 34491
diff changeset
   475
57910
a50837b637dc maintain Command_Range position as in ML;
wenzelm
parents: 57905
diff changeset
   476
a50837b637dc maintain Command_Range position as in ML;
wenzelm
parents: 57905
diff changeset
   477
  /* classification */
a50837b637dc maintain Command_Range position as in ML;
wenzelm
parents: 57905
diff changeset
   478
57905
c0c5652e796e separate module Command_Span: mostly syntactic representation;
wenzelm
parents: 57904
diff changeset
   479
  def is_proper: Boolean = span.kind.isInstanceOf[Command_Span.Command_Span]
c0c5652e796e separate module Command_Span: mostly syntactic representation;
wenzelm
parents: 57904
diff changeset
   480
  def is_ignored: Boolean = span.kind == Command_Span.Ignored_Span
57904
922273b7bf8a tuned signature;
wenzelm
parents: 57902
diff changeset
   481
922273b7bf8a tuned signature;
wenzelm
parents: 57902
diff changeset
   482
  def is_undefined: Boolean = id == Document_ID.none
922273b7bf8a tuned signature;
wenzelm
parents: 57902
diff changeset
   483
  val is_unparsed: Boolean = span.content.exists(_.is_unparsed)
922273b7bf8a tuned signature;
wenzelm
parents: 57902
diff changeset
   484
  val is_unfinished: Boolean = span.content.exists(_.is_unfinished)
922273b7bf8a tuned signature;
wenzelm
parents: 57902
diff changeset
   485
34859
f986d84dd44b renamed Command.content to source;
wenzelm
parents: 34858
diff changeset
   486
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54517
diff changeset
   487
  /* blobs */
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54517
diff changeset
   488
59704
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   489
  def blobs: List[Command.Blob] = blobs_info._1
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   490
  def blobs_index: Int = blobs_info._2
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59701
diff changeset
   491
65335
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   492
  def blobs_ok: Boolean =
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   493
    blobs.forall({ case Exn.Res(_) => true case _ => false })
7634d33c1a79 support to encode/decode command state;
wenzelm
parents: 64825
diff changeset
   494
54530
2c1440f70028 ranges of thy_load commands count as visible within perspective;
wenzelm
parents: 54524
diff changeset
   495
  def blobs_names: List[Document.Node.Name] =
2c1440f70028 ranges of thy_load commands count as visible within perspective;
wenzelm
parents: 54524
diff changeset
   496
    for (Exn.Res((name, _)) <- blobs) yield name
2c1440f70028 ranges of thy_load commands count as visible within perspective;
wenzelm
parents: 54524
diff changeset
   497
60916
a6e2a667b0a8 resolve undefined blobs by default, e.g. relevant for ML debugger to avoid reset of breakpoints after reload;
wenzelm
parents: 60215
diff changeset
   498
  def blobs_undefined: List[Document.Node.Name] =
a6e2a667b0a8 resolve undefined blobs by default, e.g. relevant for ML debugger to avoid reset of breakpoints after reload;
wenzelm
parents: 60215
diff changeset
   499
    for (Exn.Res((name, None)) <- blobs) yield name
a6e2a667b0a8 resolve undefined blobs by default, e.g. relevant for ML debugger to avoid reset of breakpoints after reload;
wenzelm
parents: 60215
diff changeset
   500
57842
8e4ae2db1849 more direct access to persistent blobs (see also 8953d4cc060a), avoiding fragile digest lookup from later version (which might have removed unused blobs already);
wenzelm
parents: 57615
diff changeset
   501
  def blobs_defined: List[(Document.Node.Name, SHA1.Digest)] =
8e4ae2db1849 more direct access to persistent blobs (see also 8953d4cc060a), avoiding fragile digest lookup from later version (which might have removed unused blobs already);
wenzelm
parents: 57615
diff changeset
   502
    for (Exn.Res((name, Some((digest, _)))) <- blobs) yield (name, digest)
8e4ae2db1849 more direct access to persistent blobs (see also 8953d4cc060a), avoiding fragile digest lookup from later version (which might have removed unused blobs already);
wenzelm
parents: 57615
diff changeset
   503
8e4ae2db1849 more direct access to persistent blobs (see also 8953d4cc060a), avoiding fragile digest lookup from later version (which might have removed unused blobs already);
wenzelm
parents: 57615
diff changeset
   504
  def blobs_changed(doc_blobs: Document.Blobs): Boolean =
8e4ae2db1849 more direct access to persistent blobs (see also 8953d4cc060a), avoiding fragile digest lookup from later version (which might have removed unused blobs already);
wenzelm
parents: 57615
diff changeset
   505
    blobs.exists({ case Exn.Res((name, _)) => doc_blobs.changed(name) case _ => false })
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54517
diff changeset
   506
55432
9c53198dbb1c maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents: 55431
diff changeset
   507
56462
b64b0cb845fe more explicit Command.Chunk types, less ooddities;
wenzelm
parents: 56395
diff changeset
   508
  /* source chunks */
55431
e0f20a44ff9d common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents: 55430
diff changeset
   509
56746
d37a5d09a277 tuned signature;
wenzelm
parents: 56743
diff changeset
   510
  val chunk: Symbol.Text_Chunk = Symbol.Text_Chunk(source)
56473
5b5c750e9763 simplified Text.Chunk -- eliminated ooddities;
wenzelm
parents: 56470
diff changeset
   511
56746
d37a5d09a277 tuned signature;
wenzelm
parents: 56743
diff changeset
   512
  val chunks: Map[Symbol.Text_Chunk.Name, Symbol.Text_Chunk] =
d37a5d09a277 tuned signature;
wenzelm
parents: 56743
diff changeset
   513
    ((Symbol.Text_Chunk.Default -> chunk) ::
56473
5b5c750e9763 simplified Text.Chunk -- eliminated ooddities;
wenzelm
parents: 56470
diff changeset
   514
      (for (Exn.Res((name, Some((_, file)))) <- blobs)
60215
5fb4990dfc73 misc tuning, based on warnings by IntelliJ IDEA;
wenzelm
parents: 59924
diff changeset
   515
        yield Symbol.Text_Chunk.File(name.node) -> file)).toMap
56473
5b5c750e9763 simplified Text.Chunk -- eliminated ooddities;
wenzelm
parents: 56470
diff changeset
   516
46813
bb7280848c99 added Command.proper_range (still unused);
wenzelm
parents: 46712
diff changeset
   517
  def length: Int = source.length
56473
5b5c750e9763 simplified Text.Chunk -- eliminated ooddities;
wenzelm
parents: 56470
diff changeset
   518
  def range: Text.Range = chunk.range
46813
bb7280848c99 added Command.proper_range (still unused);
wenzelm
parents: 46712
diff changeset
   519
bb7280848c99 added Command.proper_range (still unused);
wenzelm
parents: 46712
diff changeset
   520
  val proper_range: Text.Range =
57901
e1abca2527da more explicit type Span in Scala, according to ML version;
wenzelm
parents: 57842
diff changeset
   521
    Text.Range(0,
e1abca2527da more explicit type Span in Scala, according to ML version;
wenzelm
parents: 57842
diff changeset
   522
      (length /: span.content.reverse.iterator.takeWhile(_.is_improper))(_ - _.source.length))
46813
bb7280848c99 added Command.proper_range (still unused);
wenzelm
parents: 46712
diff changeset
   523
38426
2858ec7b6dd8 specific types Text.Offset and Text.Range;
wenzelm
parents: 38415
diff changeset
   524
  def source(range: Text.Range): String = source.substring(range.start, range.stop)
38572
0fe2c01ef7da Command.State: accumulate markup reports uniformly;
wenzelm
parents: 38564
diff changeset
   525
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   526
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   527
  /* accumulated results */
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38367
diff changeset
   528
50501
6f41f1646617 more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents: 50500
diff changeset
   529
  val init_state: Command.State =
55649
1532ab0dc67b more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents: 55648
diff changeset
   530
    Command.State(this, results = init_results, markups = Command.Markups.init(init_markup))
52527
dbac84eab3bc separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents: 52524
diff changeset
   531
dbac84eab3bc separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents: 52524
diff changeset
   532
  val empty_state: Command.State = Command.State(this)
34676
9e725d34df7b Command and Command_State handle results from prover as Accumulator
immler@in.tum.de
parents: 34675
diff changeset
   533
}