author | wenzelm |
Sun, 11 Mar 2018 20:31:25 +0100 | |
changeset 67824 | 661cd25304ae |
parent 67446 | 1f4d167b6ac9 |
child 67825 | f9c071cc958b |
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:
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 | 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:
59699
diff
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:
59699
diff
changeset
|
20 |
type Blobs_Info = (List[Blob], Int) |
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents:
59699
diff
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:
51494
diff
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:
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 | 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:
56359
diff
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:
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 | 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 | 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 | 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:
55648
diff
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:
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 | 118 |
def is_empty: Boolean = rep.isEmpty |
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 | 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:
56469
diff
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:
56469
diff
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:
56469
diff
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:
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 | 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 |
{ |
67824
661cd25304ae
more compact markup tree: output messages are already stored in command results (e.g. relevant for XML data representation);
wenzelm
parents:
67446
diff
changeset
|
165 |
def get_result(states: List[State], serial: Long): Option[XML.Tree] = |
661cd25304ae
more compact markup tree: output messages are already stored in command results (e.g. relevant for XML data representation);
wenzelm
parents:
67446
diff
changeset
|
166 |
states.find(st => st.results.defined(serial)).map(st => st.results.get(serial).get) |
661cd25304ae
more compact markup tree: output messages are already stored in command results (e.g. relevant for XML data representation);
wenzelm
parents:
67446
diff
changeset
|
167 |
|
661cd25304ae
more compact markup tree: output messages are already stored in command results (e.g. relevant for XML data representation);
wenzelm
parents:
67446
diff
changeset
|
168 |
def get_result_proper(states: List[State], props: Properties.T): Option[Results.Entry] = |
661cd25304ae
more compact markup tree: output messages are already stored in command results (e.g. relevant for XML data representation);
wenzelm
parents:
67446
diff
changeset
|
169 |
for { |
661cd25304ae
more compact markup tree: output messages are already stored in command results (e.g. relevant for XML data representation);
wenzelm
parents:
67446
diff
changeset
|
170 |
serial <- Markup.Serial.unapply(props) |
661cd25304ae
more compact markup tree: output messages are already stored in command results (e.g. relevant for XML data representation);
wenzelm
parents:
67446
diff
changeset
|
171 |
tree @ XML.Elem(_, body) <- get_result(states, serial) |
661cd25304ae
more compact markup tree: output messages are already stored in command results (e.g. relevant for XML data representation);
wenzelm
parents:
67446
diff
changeset
|
172 |
if body.nonEmpty |
661cd25304ae
more compact markup tree: output messages are already stored in command results (e.g. relevant for XML data representation);
wenzelm
parents:
67446
diff
changeset
|
173 |
} yield (serial -> tree) |
661cd25304ae
more compact markup tree: output messages are already stored in command results (e.g. relevant for XML data representation);
wenzelm
parents:
67446
diff
changeset
|
174 |
|
65335 | 175 |
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
|
176 |
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
|
177 |
|
65335 | 178 |
def merge_markups(states: List[State]): Markups = |
179 |
Markups.merge(states.map(_.markups)) |
|
180 |
||
56301
1da7b4c33db9
more frugal merge of markup trees: filter wrt. subsequent query;
wenzelm
parents:
56299
diff
changeset
|
181 |
def merge_markup(states: List[State], index: Markup_Index, |
56743 | 182 |
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
|
183 |
Markup_Tree.merge(states.map(_.markup(index)), range, elements) |
65335 | 184 |
|
185 |
def merge(command: Command, states: List[State]): State = |
|
186 |
State(command, states.flatMap(_.status), merge_results(states), merge_markups(states)) |
|
187 |
||
188 |
||
189 |
/* XML data representation */ |
|
190 |
||
191 |
val encode: XML.Encode.T[State] = (st: State) => |
|
192 |
{ |
|
193 |
import XML.Encode._ |
|
194 |
||
195 |
val command = st.command |
|
196 |
val blobs_names = command.blobs_names.map(_.node) |
|
197 |
val blobs_index = command.blobs_index |
|
198 |
require(command.blobs_ok) |
|
199 |
||
200 |
pair(long, pair(string, pair(pair(list(string), int), pair(Command_Span.encode, |
|
201 |
pair(list(Markup.encode), pair(Results.encode, Markups.encode(command.source.length)))))))( |
|
202 |
(command.id, (command.node_name.node, ((blobs_names, blobs_index), (command.span, |
|
203 |
(st.status, (st.results, st.markups))))))) |
|
204 |
} |
|
205 |
||
206 |
def decode(node_name: String => Document.Node.Name): XML.Decode.T[State] = (body: XML.Body) => |
|
207 |
{ |
|
208 |
import XML.Decode._ |
|
209 |
val (id, (node, ((blobs_names, blobs_index), (span, (status, (results, markups)))))) = |
|
210 |
pair(long, pair(string, pair(pair(list(string), int), pair(Command_Span.decode, |
|
211 |
pair(list(Markup.decode), pair(Results.decode, Markups.decode))))))(body) |
|
212 |
||
213 |
val blobs_info: Blobs_Info = |
|
214 |
(blobs_names.map(name => Exn.Res((node_name(name), None)): Blob), blobs_index) |
|
215 |
val command = Command(id, node_name(node), blobs_info, span) |
|
216 |
State(command, status, results, markups) |
|
217 |
} |
|
56299
8201790fdeb9
more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents:
56295
diff
changeset
|
218 |
} |
8201790fdeb9
more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents:
56295
diff
changeset
|
219 |
|
43714 | 220 |
sealed case class State( |
50501
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
221 |
command: Command, |
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
222 |
status: List[Markup] = Nil, |
50507 | 223 |
results: Results = Results.empty, |
55649
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents:
55648
diff
changeset
|
224 |
markups: Markups = Markups.empty) |
38361 | 225 |
{ |
66379
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
wenzelm
parents:
65522
diff
changeset
|
226 |
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:
65522
diff
changeset
|
227 |
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:
65522
diff
changeset
|
228 |
|
56395
0546e036d1c0
more direct warning within persistent Protocol.Status;
wenzelm
parents:
56372
diff
changeset
|
229 |
lazy val protocol_status: Protocol.Status = |
0546e036d1c0
more direct warning within persistent Protocol.Status;
wenzelm
parents:
56372
diff
changeset
|
230 |
{ |
0546e036d1c0
more direct warning within persistent Protocol.Status;
wenzelm
parents:
56372
diff
changeset
|
231 |
val warnings = |
59203
5f0bd5afc16d
explicit message channel for "legacy", which is nonetheless a variant of "warning";
wenzelm
parents:
59072
diff
changeset
|
232 |
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
|
233 |
List(Markup(Markup.WARNING, Nil)) |
0546e036d1c0
more direct warning within persistent Protocol.Status;
wenzelm
parents:
56372
diff
changeset
|
234 |
else Nil |
0546e036d1c0
more direct warning within persistent Protocol.Status;
wenzelm
parents:
56372
diff
changeset
|
235 |
val errors = |
0546e036d1c0
more direct warning within persistent Protocol.Status;
wenzelm
parents:
56372
diff
changeset
|
236 |
if (results.iterator.exists(p => Protocol.is_error(p._2))) |
0546e036d1c0
more direct warning within persistent Protocol.Status;
wenzelm
parents:
56372
diff
changeset
|
237 |
List(Markup(Markup.ERROR, Nil)) |
0546e036d1c0
more direct warning within persistent Protocol.Status;
wenzelm
parents:
56372
diff
changeset
|
238 |
else Nil |
0546e036d1c0
more direct warning within persistent Protocol.Status;
wenzelm
parents:
56372
diff
changeset
|
239 |
Protocol.Status.make((warnings ::: errors ::: status).iterator) |
0546e036d1c0
more direct warning within persistent Protocol.Status;
wenzelm
parents:
56372
diff
changeset
|
240 |
} |
55432
9c53198dbb1c
maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents:
55431
diff
changeset
|
241 |
|
55650 | 242 |
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
|
243 |
|
56489 | 244 |
def redirect(other_command: Command): Option[State] = |
245 |
{ |
|
246 |
val markups1 = markups.redirect(other_command.id) |
|
247 |
if (markups1.is_empty) None |
|
248 |
else Some(new State(other_command, Nil, Results.empty, markups1)) |
|
249 |
} |
|
49614 | 250 |
|
55649
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents:
55648
diff
changeset
|
251 |
private def add_status(st: Markup): State = |
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents:
55648
diff
changeset
|
252 |
copy(status = st :: status) |
55432
9c53198dbb1c
maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents:
55431
diff
changeset
|
253 |
|
56746 | 254 |
private def add_markup( |
255 |
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
|
256 |
{ |
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents:
55648
diff
changeset
|
257 |
val markups1 = |
56395
0546e036d1c0
more direct warning within persistent Protocol.Status;
wenzelm
parents:
56372
diff
changeset
|
258 |
if (status || Protocol.liberal_status_elements(m.info.name)) |
56462
b64b0cb845fe
more explicit Command.Chunk types, less ooddities;
wenzelm
parents:
56395
diff
changeset
|
259 |
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
|
260 |
else markups |
56462
b64b0cb845fe
more explicit Command.Chunk types, less ooddities;
wenzelm
parents:
56395
diff
changeset
|
261 |
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
|
262 |
} |
38361 | 263 |
|
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
|
264 |
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
|
265 |
self_id: Document_ID.Generic => Boolean, |
56746 | 266 |
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
|
267 |
message: XML.Elem): State = |
38361 | 268 |
message match { |
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50163
diff
changeset
|
269 |
case XML.Elem(Markup(Markup.STATUS, _), msgs) => |
38714 | 270 |
(this /: msgs)((state, msg) => |
271 |
msg match { |
|
46152
793cecd4ffc0
accumulate status as regular markup for command range;
wenzelm
parents:
45709
diff
changeset
|
272 |
case elem @ XML.Elem(markup, Nil) => |
55649
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents:
55648
diff
changeset
|
273 |
state. |
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents:
55648
diff
changeset
|
274 |
add_status(markup). |
56746 | 275 |
add_markup(true, Symbol.Text_Chunk.Default, Text.Info(command.proper_range, elem)) |
52536 | 276 |
case _ => |
56782
433cf57550fa
more systematic Isabelle output, like in classic Isabelle/ML (without markup);
wenzelm
parents:
56746
diff
changeset
|
277 |
Output.warning("Ignored status message: " + msg) |
52536 | 278 |
state |
38714 | 279 |
}) |
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
|
280 |
|
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50163
diff
changeset
|
281 |
case XML.Elem(Markup(Markup.REPORT, _), msgs) => |
38572
0fe2c01ef7da
Command.State: accumulate markup reports uniformly;
wenzelm
parents:
38564
diff
changeset
|
282 |
(this /: msgs)((state, msg) => |
55432
9c53198dbb1c
maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents:
55431
diff
changeset
|
283 |
{ |
56782
433cf57550fa
more systematic Isabelle output, like in classic Isabelle/ML (without markup);
wenzelm
parents:
56746
diff
changeset
|
284 |
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
|
285 |
|
9c53198dbb1c
maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents:
55431
diff
changeset
|
286 |
msg match { |
57911
dcb758188aa6
clarified Position.Identified: do not require range from prover, default to command position;
wenzelm
parents:
57910
diff
changeset
|
287 |
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
|
288 |
|
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
wenzelm
parents:
56469
diff
changeset
|
289 |
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
|
290 |
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
|
291 |
Some((chunk_name, command.chunks(chunk_name))) |
56746 | 292 |
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
|
293 |
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
|
294 |
|
57911
dcb758188aa6
clarified Position.Identified: do not require range from prover, default to command position;
wenzelm
parents:
57910
diff
changeset
|
295 |
(target, atts) match { |
dcb758188aa6
clarified Position.Identified: do not require range from prover, default to command position;
wenzelm
parents:
57910
diff
changeset
|
296 |
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
|
297 |
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:
55434
diff
changeset
|
298 |
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
|
299 |
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
|
300 |
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
|
301 |
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:
55434
diff
changeset
|
302 |
case None => bad(); state |
55432
9c53198dbb1c
maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents:
55431
diff
changeset
|
303 |
} |
57911
dcb758188aa6
clarified Position.Identified: do not require range from prover, default to command position;
wenzelm
parents:
57910
diff
changeset
|
304 |
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
|
305 |
// silently ignore excessive reports |
56476 | 306 |
state |
55432
9c53198dbb1c
maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents:
55431
diff
changeset
|
307 |
} |
9c53198dbb1c
maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents:
55431
diff
changeset
|
308 |
|
9c53198dbb1c
maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents:
55431
diff
changeset
|
309 |
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
|
310 |
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
|
311 |
val range = command.proper_range |
9c53198dbb1c
maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents:
55431
diff
changeset
|
312 |
val props = Position.purge(atts) |
9c53198dbb1c
maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents:
55431
diff
changeset
|
313 |
val info: Text.Markup = Text.Info(range, XML.Elem(Markup(name, props), args)) |
56746 | 314 |
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
|
315 |
|
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
|
316 |
case _ => bad(); state |
55432
9c53198dbb1c
maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents:
55431
diff
changeset
|
317 |
} |
38361 | 318 |
}) |
52930
5fab62ae3532
retain original messages properties, e.g. for retrieval via Command.Results;
wenzelm
parents:
52849
diff
changeset
|
319 |
case XML.Elem(Markup(name, props), body) => |
5fab62ae3532
retain original messages properties, e.g. for retrieval via Command.Results;
wenzelm
parents:
52849
diff
changeset
|
320 |
props match { |
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50163
diff
changeset
|
321 |
case Markup.Serial(i) => |
67824
661cd25304ae
more compact markup tree: output messages are already stored in command results (e.g. relevant for XML data representation);
wenzelm
parents:
67446
diff
changeset
|
322 |
val markup_message = XML.Elem(Markup(Markup.message(name), props), body) |
661cd25304ae
more compact markup tree: output messages are already stored in command results (e.g. relevant for XML data representation);
wenzelm
parents:
67446
diff
changeset
|
323 |
val message_markup = XML.elem(Markup(name, props.filter(p => p._1 == Markup.SERIAL))) |
50163
c62ce309dc26
more abstract Sendback operations, with explicit id/exec_id properties;
wenzelm
parents:
50158
diff
changeset
|
324 |
|
67824
661cd25304ae
more compact markup tree: output messages are already stored in command results (e.g. relevant for XML data representation);
wenzelm
parents:
67446
diff
changeset
|
325 |
var st = copy(results = results + (i -> markup_message)) |
55433
d2960d67f163
clarified message_positions: cover alt_id as well;
wenzelm
parents:
55432
diff
changeset
|
326 |
if (Protocol.is_inlined(message)) { |
d2960d67f163
clarified message_positions: cover alt_id as well;
wenzelm
parents:
55432
diff
changeset
|
327 |
for { |
56469 | 328 |
(chunk_name, chunk) <- command.chunks.iterator |
59713 | 329 |
range <- Protocol_Message.positions( |
59735 | 330 |
self_id, command.span.position, chunk_name, chunk, message) |
67824
661cd25304ae
more compact markup tree: output messages are already stored in command results (e.g. relevant for XML data representation);
wenzelm
parents:
67446
diff
changeset
|
331 |
} st = st.add_markup(false, chunk_name, Text.Info(range, message_markup)) |
55433
d2960d67f163
clarified message_positions: cover alt_id as well;
wenzelm
parents:
55432
diff
changeset
|
332 |
} |
d2960d67f163
clarified message_positions: cover alt_id as well;
wenzelm
parents:
55432
diff
changeset
|
333 |
st |
55432
9c53198dbb1c
maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents:
55431
diff
changeset
|
334 |
|
52536 | 335 |
case _ => |
56782
433cf57550fa
more systematic Isabelle output, like in classic Isabelle/ML (without markup);
wenzelm
parents:
56746
diff
changeset
|
336 |
Output.warning("Ignored message without serial number: " + message) |
52536 | 337 |
this |
38872 | 338 |
} |
56295
a40e67ce4f84
clarified valid_id: always standardize towards static command.id;
wenzelm
parents:
55884
diff
changeset
|
339 |
} |
38361 | 340 |
} |
38367 | 341 |
|
342 |
||
55431
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
343 |
|
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
344 |
/** static content **/ |
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
345 |
|
45644 | 346 |
/* make commands */ |
347 |
||
55648
38f264741609
tuned signature -- avoid obscure default arguments;
wenzelm
parents:
55622
diff
changeset
|
348 |
def apply( |
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 |
node_name: Document.Node.Name, |
59702
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents:
59699
diff
changeset
|
351 |
blobs_info: Blobs_Info, |
57905
c0c5652e796e
separate module Command_Span: mostly syntactic representation;
wenzelm
parents:
57904
diff
changeset
|
352 |
span: Command_Span.Span): Command = |
55648
38f264741609
tuned signature -- avoid obscure default arguments;
wenzelm
parents:
55622
diff
changeset
|
353 |
{ |
57901
e1abca2527da
more explicit type Span in Scala, according to ML version;
wenzelm
parents:
57842
diff
changeset
|
354 |
val (source, span1) = span.compact_source |
59702
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents:
59699
diff
changeset
|
355 |
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
|
356 |
} |
49414 | 357 |
|
57901
e1abca2527da
more explicit type Span in Scala, according to ML version;
wenzelm
parents:
57842
diff
changeset
|
358 |
val empty: Command = |
59702
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents:
59699
diff
changeset
|
359 |
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
|
360 |
|
38f264741609
tuned signature -- avoid obscure default arguments;
wenzelm
parents:
55622
diff
changeset
|
361 |
def unparsed( |
38f264741609
tuned signature -- avoid obscure default arguments;
wenzelm
parents:
55622
diff
changeset
|
362 |
id: Document_ID.Command, |
38f264741609
tuned signature -- avoid obscure default arguments;
wenzelm
parents:
55622
diff
changeset
|
363 |
source: String, |
38f264741609
tuned signature -- avoid obscure default arguments;
wenzelm
parents:
55622
diff
changeset
|
364 |
results: Results, |
38f264741609
tuned signature -- avoid obscure default arguments;
wenzelm
parents:
55622
diff
changeset
|
365 |
markup: Markup_Tree): Command = |
38f264741609
tuned signature -- avoid obscure default arguments;
wenzelm
parents:
55622
diff
changeset
|
366 |
{ |
57905
c0c5652e796e
separate module Command_Span: mostly syntactic representation;
wenzelm
parents:
57904
diff
changeset
|
367 |
val (source1, span1) = Command_Span.unparsed(source).compact_source |
59702
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents:
59699
diff
changeset
|
368 |
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
|
369 |
} |
49414 | 370 |
|
65341 | 371 |
def text(source: String): Command = |
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
372 |
unparsed(Document_ID.none, source, Results.empty, Markup_Tree.empty) |
44384 | 373 |
|
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
374 |
def rich_text(id: Document_ID.Command, results: Results, body: XML.Body): Command = |
49414 | 375 |
{ |
49466 | 376 |
val text = XML.content(body) |
377 |
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
|
378 |
unparsed(id, text, results, markup) |
49414 | 379 |
} |
49359
c1262d7389fb
refined output panel: more value-oriented approach to update and caret focus;
wenzelm
parents:
49037
diff
changeset
|
380 |
|
44384 | 381 |
|
382 |
/* perspective */ |
|
383 |
||
44474 | 384 |
object Perspective |
385 |
{ |
|
386 |
val empty: Perspective = Perspective(Nil) |
|
387 |
} |
|
44385
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44384
diff
changeset
|
388 |
|
44474 | 389 |
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
|
390 |
{ |
57615
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents:
56782
diff
changeset
|
391 |
def is_empty: Boolean = commands.isEmpty |
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents:
56782
diff
changeset
|
392 |
|
44474 | 393 |
def same(that: Perspective): Boolean = |
394 |
{ |
|
395 |
val cmds1 = this.commands |
|
396 |
val cmds2 = that.commands |
|
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48745
diff
changeset
|
397 |
require(!cmds1.exists(_.is_undefined)) |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48745
diff
changeset
|
398 |
require(!cmds2.exists(_.is_undefined)) |
44474 | 399 |
cmds1.length == cmds2.length && |
400 |
(cmds1.iterator zip cmds2.iterator).forall({ case (c1, c2) => c1.id == c2.id }) |
|
401 |
} |
|
44385
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44384
diff
changeset
|
402 |
} |
59689
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 |
|
59702
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents:
59699
diff
changeset
|
405 |
/* blobs: inlined errors and auxiliary files */ |
59689
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 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
|
408 |
{ |
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59684
diff
changeset
|
409 |
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
|
410 |
toks match { |
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59684
diff
changeset
|
411 |
case (t1, i1) :: (t2, i2) :: rest => |
67446 | 412 |
if (t1.is_keyword && t1.source == "%" && t2.is_name) clean(rest) |
59689
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59684
diff
changeset
|
413 |
else (t1, i1) :: clean((t2, i2) :: rest) |
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59684
diff
changeset
|
414 |
case _ => toks |
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59684
diff
changeset
|
415 |
} |
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59684
diff
changeset
|
416 |
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
|
417 |
} |
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59684
diff
changeset
|
418 |
|
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59684
diff
changeset
|
419 |
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
|
420 |
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
|
421 |
tokens.dropWhile({ case (t, _) => !t.is_command }). |
64471
c40c2975fb02
more uniform path syntax, as in ML (see 5a7c919a4ada);
wenzelm
parents:
63584
diff
changeset
|
422 |
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
|
423 |
} |
59924
801b979ec0c2
more general notion of command span: command keyword not necessarily at start;
wenzelm
parents:
59735
diff
changeset
|
424 |
else None |
59689
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59684
diff
changeset
|
425 |
|
63584
68751fe1c036
tuned signature -- prover-independence is presently theoretical;
wenzelm
parents:
62969
diff
changeset
|
426 |
def span_files(syntax: Outer_Syntax, span: Command_Span.Span): (List[String], Int) = |
59735 | 427 |
syntax.load_command(span.name) match { |
428 |
case Some(exts) => |
|
429 |
find_file(clean_tokens(span.content)) match { |
|
430 |
case Some((file, i)) => |
|
431 |
if (exts.isEmpty) (List(file), i) |
|
432 |
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
|
433 |
case None => (Nil, -1) |
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59684
diff
changeset
|
434 |
} |
59735 | 435 |
case None => (Nil, -1) |
59689
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59684
diff
changeset
|
436 |
} |
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59684
diff
changeset
|
437 |
|
59702
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents:
59699
diff
changeset
|
438 |
def blobs_info( |
59699 | 439 |
resources: Resources, |
63584
68751fe1c036
tuned signature -- prover-independence is presently theoretical;
wenzelm
parents:
62969
diff
changeset
|
440 |
syntax: Outer_Syntax, |
59699 | 441 |
get_blob: Document.Node.Name => Option[Document.Blob], |
59702
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents:
59699
diff
changeset
|
442 |
can_import: Document.Node.Name => Boolean, |
59699 | 443 |
node_name: Document.Node.Name, |
59702
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents:
59699
diff
changeset
|
444 |
span: Command_Span.Span): Blobs_Info = |
59689
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59684
diff
changeset
|
445 |
{ |
59735 | 446 |
span.name match { |
59702
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents:
59699
diff
changeset
|
447 |
// inlined errors |
59735 | 448 |
case Thy_Header.THEORY => |
64825 | 449 |
val reader = Scan.char_reader(Token.implode(span.content)) |
66768 | 450 |
val imports = resources.check_thy_reader(node_name, reader).imports |
451 |
val raw_imports = |
|
452 |
try { |
|
453 |
val imports1 = Thy_Header.read(reader, Token.Pos.none).imports |
|
454 |
if (imports.length == imports1.length) imports1.map(_._1) else error("") |
|
455 |
} |
|
456 |
catch { case exn: Throwable => List.fill(imports.length)("") } |
|
457 |
||
59715
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
wenzelm
parents:
59713
diff
changeset
|
458 |
val errors = |
66768 | 459 |
for { ((import_name, pos), s) <- imports zip raw_imports if !can_import(import_name) } |
460 |
yield { |
|
461 |
val completion = |
|
462 |
if (Thy_Header.is_base_name(s)) { |
|
463 |
val completed = Completion.completed(import_name.theory_base_name) |
|
66966 | 464 |
val qualifier = resources.session_base.theory_qualifier(node_name) |
66768 | 465 |
val dir = node_name.master_dir |
466 |
for { |
|
467 |
(_, known_name) <- resources.session_base.known.theories.toList |
|
468 |
if completed(known_name.theory_base_name) |
|
66966 | 469 |
} |
470 |
yield { |
|
471 |
resources.standard_import( |
|
472 |
resources.session_base, qualifier, dir, known_name.theory) |
|
473 |
} |
|
66768 | 474 |
}.sorted |
475 |
else Nil |
|
59715
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
wenzelm
parents:
59713
diff
changeset
|
476 |
val msg = |
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
wenzelm
parents:
59713
diff
changeset
|
477 |
"Bad theory import " + |
66768 | 478 |
Markup.Path(import_name.node).markup(quote(import_name.toString)) + |
479 |
Position.here(pos) + Completion.report_theories(pos, completion) |
|
59715
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
wenzelm
parents:
59713
diff
changeset
|
480 |
Exn.Exn(ERROR(msg)): Command.Blob |
59708
aed304412e43
more markup, which helps to create missing imports;
wenzelm
parents:
59706
diff
changeset
|
481 |
} |
59715
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
wenzelm
parents:
59713
diff
changeset
|
482 |
(errors, -1) |
59702
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents:
59699
diff
changeset
|
483 |
|
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents:
59699
diff
changeset
|
484 |
// auxiliary files |
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents:
59699
diff
changeset
|
485 |
case _ => |
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents:
59699
diff
changeset
|
486 |
val (files, index) = span_files(syntax, span) |
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents:
59699
diff
changeset
|
487 |
val blobs = |
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents:
59699
diff
changeset
|
488 |
files.map(file => |
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents:
59699
diff
changeset
|
489 |
(Exn.capture { |
65488 | 490 |
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:
59699
diff
changeset
|
491 |
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:
59699
diff
changeset
|
492 |
(name, blob) |
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents:
59699
diff
changeset
|
493 |
}).user_error) |
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents:
59699
diff
changeset
|
494 |
(blobs, index) |
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents:
59699
diff
changeset
|
495 |
} |
59689
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59684
diff
changeset
|
496 |
} |
34318
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
497 |
} |
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
498 |
|
38361 | 499 |
|
46712 | 500 |
final class Command private( |
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
501 |
val id: Document_ID.Command, |
44615 | 502 |
val node_name: Document.Node.Name, |
59702
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents:
59699
diff
changeset
|
503 |
val blobs_info: Command.Blobs_Info, |
57905
c0c5652e796e
separate module Command_Span: mostly syntactic representation;
wenzelm
parents:
57904
diff
changeset
|
504 |
val span: Command_Span.Span, |
49414 | 505 |
val source: String, |
50501
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
506 |
val init_results: Command.Results, |
49414 | 507 |
val init_markup: Markup_Tree) |
34451 | 508 |
{ |
57912 | 509 |
override def toString: String = id + "/" + span.kind.toString |
34495 | 510 |
|
57910 | 511 |
|
512 |
/* classification */ |
|
513 |
||
57905
c0c5652e796e
separate module Command_Span: mostly syntactic representation;
wenzelm
parents:
57904
diff
changeset
|
514 |
def is_proper: Boolean = span.kind.isInstanceOf[Command_Span.Command_Span] |
c0c5652e796e
separate module Command_Span: mostly syntactic representation;
wenzelm
parents:
57904
diff
changeset
|
515 |
def is_ignored: Boolean = span.kind == Command_Span.Ignored_Span |
57904 | 516 |
|
517 |
def is_undefined: Boolean = id == Document_ID.none |
|
518 |
val is_unparsed: Boolean = span.content.exists(_.is_unparsed) |
|
519 |
val is_unfinished: Boolean = span.content.exists(_.is_unfinished) |
|
520 |
||
34859 | 521 |
|
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54517
diff
changeset
|
522 |
/* blobs */ |
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54517
diff
changeset
|
523 |
|
59702
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents:
59699
diff
changeset
|
524 |
def blobs: List[Command.Blob] = blobs_info._1 |
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents:
59699
diff
changeset
|
525 |
def blobs_index: Int = blobs_info._2 |
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents:
59699
diff
changeset
|
526 |
|
65335 | 527 |
def blobs_ok: Boolean = |
528 |
blobs.forall({ case Exn.Res(_) => true case _ => false }) |
|
529 |
||
54530
2c1440f70028
ranges of thy_load commands count as visible within perspective;
wenzelm
parents:
54524
diff
changeset
|
530 |
def blobs_names: List[Document.Node.Name] = |
2c1440f70028
ranges of thy_load commands count as visible within perspective;
wenzelm
parents:
54524
diff
changeset
|
531 |
for (Exn.Res((name, _)) <- blobs) yield name |
2c1440f70028
ranges of thy_load commands count as visible within perspective;
wenzelm
parents:
54524
diff
changeset
|
532 |
|
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
|
533 |
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
|
534 |
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
|
535 |
|
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
|
536 |
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
|
537 |
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
|
538 |
|
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
|
539 |
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
|
540 |
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
|
541 |
|
55432
9c53198dbb1c
maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents:
55431
diff
changeset
|
542 |
|
56462
b64b0cb845fe
more explicit Command.Chunk types, less ooddities;
wenzelm
parents:
56395
diff
changeset
|
543 |
/* 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
|
544 |
|
56746 | 545 |
val chunk: Symbol.Text_Chunk = Symbol.Text_Chunk(source) |
56473 | 546 |
|
56746 | 547 |
val chunks: Map[Symbol.Text_Chunk.Name, Symbol.Text_Chunk] = |
548 |
((Symbol.Text_Chunk.Default -> chunk) :: |
|
56473 | 549 |
(for (Exn.Res((name, Some((_, file)))) <- blobs) |
60215 | 550 |
yield Symbol.Text_Chunk.File(name.node) -> file)).toMap |
56473 | 551 |
|
46813 | 552 |
def length: Int = source.length |
56473 | 553 |
def range: Text.Range = chunk.range |
46813 | 554 |
|
555 |
val proper_range: Text.Range = |
|
57901
e1abca2527da
more explicit type Span in Scala, according to ML version;
wenzelm
parents:
57842
diff
changeset
|
556 |
Text.Range(0, |
e1abca2527da
more explicit type Span in Scala, according to ML version;
wenzelm
parents:
57842
diff
changeset
|
557 |
(length /: span.content.reverse.iterator.takeWhile(_.is_improper))(_ - _.source.length)) |
46813 | 558 |
|
65522 | 559 |
def source(range: Text.Range): String = range.substring(source) |
38572
0fe2c01ef7da
Command.State: accumulate markup reports uniformly;
wenzelm
parents:
38564
diff
changeset
|
560 |
|
38370
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
561 |
|
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
562 |
/* accumulated results */ |
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
563 |
|
50501
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
564 |
val init_state: Command.State = |
55649
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
wenzelm
parents:
55648
diff
changeset
|
565 |
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
|
566 |
|
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52524
diff
changeset
|
567 |
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
|
568 |
} |