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