author | wenzelm |
Tue, 11 Feb 2014 17:44:29 +0100 | |
changeset 55431 | e0f20a44ff9d |
parent 55430 | 8eb6c740ec1a |
child 55432 | 9c53198dbb1c |
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]) |
18 |
||
19 |
||
38361 | 20 |
/** accumulated results from prover **/ |
21 |
||
50507 | 22 |
/* results */ |
23 |
||
24 |
object Results |
|
25 |
{ |
|
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
|
26 |
type Entry = (Long, XML.Tree) |
50507 | 27 |
val empty = new Results(SortedMap.empty) |
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
|
28 |
def make(es: Iterable[Results.Entry]): Results = (empty /: es.iterator)(_ + _) |
50507 | 29 |
def merge(rs: Iterable[Results]): Results = (empty /: rs.iterator)(_ ++ _) |
30 |
} |
|
31 |
||
51494 | 32 |
final class Results private(private val rep: SortedMap[Long, XML.Tree]) |
50507 | 33 |
{ |
34 |
def defined(serial: Long): Boolean = rep.isDefinedAt(serial) |
|
35 |
def get(serial: Long): Option[XML.Tree] = rep.get(serial) |
|
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
|
36 |
def entries: Iterator[Results.Entry] = rep.iterator |
50508
5b7150395568
tuned implementation according to Library.insert/merge in ML;
wenzelm
parents:
50507
diff
changeset
|
37 |
|
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
|
38 |
def + (entry: Results.Entry): Results = |
50508
5b7150395568
tuned implementation according to Library.insert/merge in ML;
wenzelm
parents:
50507
diff
changeset
|
39 |
if (defined(entry._1)) this |
5b7150395568
tuned implementation according to Library.insert/merge in ML;
wenzelm
parents:
50507
diff
changeset
|
40 |
else new Results(rep + entry) |
5b7150395568
tuned implementation according to Library.insert/merge in ML;
wenzelm
parents:
50507
diff
changeset
|
41 |
|
5b7150395568
tuned implementation according to Library.insert/merge in ML;
wenzelm
parents:
50507
diff
changeset
|
42 |
def ++ (other: Results): Results = |
5b7150395568
tuned implementation according to Library.insert/merge in ML;
wenzelm
parents:
50507
diff
changeset
|
43 |
if (this eq other) this |
5b7150395568
tuned implementation according to Library.insert/merge in ML;
wenzelm
parents:
50507
diff
changeset
|
44 |
else if (rep.isEmpty) other |
5b7150395568
tuned implementation according to Library.insert/merge in ML;
wenzelm
parents:
50507
diff
changeset
|
45 |
else (this /: other.entries)(_ + _) |
50540 | 46 |
|
51494 | 47 |
override def hashCode: Int = rep.hashCode |
48 |
override def equals(that: Any): Boolean = |
|
49 |
that match { |
|
50 |
case other: Results => rep == other.rep |
|
51 |
case _ => false |
|
52 |
} |
|
50540 | 53 |
override def toString: String = entries.mkString("Results(", ", ", ")") |
50507 | 54 |
} |
55 |
||
56 |
||
57 |
/* state */ |
|
50501
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
58 |
|
43714 | 59 |
sealed case class State( |
50501
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
60 |
command: Command, |
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
61 |
status: List[Markup] = Nil, |
50507 | 62 |
results: Results = Results.empty, |
50501
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
63 |
markup: Markup_Tree = Markup_Tree.empty) |
38361 | 64 |
{ |
49645 | 65 |
def markup_to_XML(filter: XML.Elem => Boolean): XML.Body = |
66 |
markup.to_XML(command.range, command.source, filter) |
|
49614 | 67 |
|
68 |
||
51494 | 69 |
/* content */ |
70 |
||
71 |
def eq_content(other: State): Boolean = |
|
72 |
command.source == other.command.source && |
|
73 |
status == other.status && |
|
74 |
results == other.results && |
|
75 |
markup == other.markup |
|
38361 | 76 |
|
46152
793cecd4ffc0
accumulate status as regular markup for command range;
wenzelm
parents:
45709
diff
changeset
|
77 |
private def add_status(st: Markup): State = copy(status = st :: status) |
793cecd4ffc0
accumulate status as regular markup for command range;
wenzelm
parents:
45709
diff
changeset
|
78 |
private def add_markup(m: Text.Markup): State = copy(markup = markup + m) |
38361 | 79 |
|
52531 | 80 |
def + (alt_id: Document_ID.Generic, message: XML.Elem): State = |
38361 | 81 |
message match { |
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50163
diff
changeset
|
82 |
case XML.Elem(Markup(Markup.STATUS, _), msgs) => |
38714 | 83 |
(this /: msgs)((state, msg) => |
84 |
msg match { |
|
46152
793cecd4ffc0
accumulate status as regular markup for command range;
wenzelm
parents:
45709
diff
changeset
|
85 |
case elem @ XML.Elem(markup, Nil) => |
50499
f496b2b7bafb
rendering of selected dialog_result as active_result_color, depending on dynamic command status in output panel, but not static popups etc.;
wenzelm
parents:
50201
diff
changeset
|
86 |
state.add_status(markup) |
f496b2b7bafb
rendering of selected dialog_result as active_result_color, depending on dynamic command status in output panel, but not static popups etc.;
wenzelm
parents:
50201
diff
changeset
|
87 |
.add_markup(Text.Info(command.proper_range, elem)) // FIXME cumulation order!? |
46152
793cecd4ffc0
accumulate status as regular markup for command range;
wenzelm
parents:
45709
diff
changeset
|
88 |
|
52536 | 89 |
case _ => |
90 |
java.lang.System.err.println("Ignored status message: " + msg) |
|
91 |
state |
|
38714 | 92 |
}) |
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
|
93 |
|
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50163
diff
changeset
|
94 |
case XML.Elem(Markup(Markup.REPORT, _), msgs) => |
38572
0fe2c01ef7da
Command.State: accumulate markup reports uniformly;
wenzelm
parents:
38564
diff
changeset
|
95 |
(this /: msgs)((state, msg) => |
0fe2c01ef7da
Command.State: accumulate markup reports uniformly;
wenzelm
parents:
38564
diff
changeset
|
96 |
msg match { |
55431
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
97 |
case XML.Elem(Markup(name, atts @ Position.Reported(id, file_name, raw_range)), args) |
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
98 |
if (id == command.id || id == alt_id) && file_name == "" && |
49527 | 99 |
command.range.contains(command.decode(raw_range)) => |
39173
ed3946086358
Command.State.accumulate: check actual source range;
wenzelm
parents:
39172
diff
changeset
|
100 |
val range = command.decode(raw_range) |
38872 | 101 |
val props = Position.purge(atts) |
45455 | 102 |
val info: Text.Markup = Text.Info(range, XML.Elem(Markup(name, props), args)) |
38723 | 103 |
state.add_markup(info) |
49526
6d1465c00f2e
more restrictive pattern, to avoid malformed positions intruding the command range (cf. d7a1973b063c);
wenzelm
parents:
49493
diff
changeset
|
104 |
case XML.Elem(Markup(name, atts), args) |
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50163
diff
changeset
|
105 |
if !atts.exists({ case (a, _) => Markup.POSITION_PROPERTIES(a) }) => |
49037
d7a1973b063c
more markup for failed goal forks, reusing "bad";
wenzelm
parents:
48922
diff
changeset
|
106 |
val range = command.proper_range |
d7a1973b063c
more markup for failed goal forks, reusing "bad";
wenzelm
parents:
48922
diff
changeset
|
107 |
val props = Position.purge(atts) |
d7a1973b063c
more markup for failed goal forks, reusing "bad";
wenzelm
parents:
48922
diff
changeset
|
108 |
val info: Text.Markup = Text.Info(range, XML.Elem(Markup(name, props), args)) |
d7a1973b063c
more markup for failed goal forks, reusing "bad";
wenzelm
parents:
48922
diff
changeset
|
109 |
state.add_markup(info) |
40572 | 110 |
case _ => |
52536 | 111 |
// FIXME java.lang.System.err.println("Ignored report message: " + msg) |
40572 | 112 |
state |
38361 | 113 |
}) |
52930
5fab62ae3532
retain original messages properties, e.g. for retrieval via Command.Results;
wenzelm
parents:
52849
diff
changeset
|
114 |
case XML.Elem(Markup(name, props), body) => |
5fab62ae3532
retain original messages properties, e.g. for retrieval via Command.Results;
wenzelm
parents:
52849
diff
changeset
|
115 |
props match { |
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50163
diff
changeset
|
116 |
case Markup.Serial(i) => |
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50163
diff
changeset
|
117 |
val message1 = XML.Elem(Markup(Markup.message(name), props), body) |
50163
c62ce309dc26
more abstract Sendback operations, with explicit id/exec_id properties;
wenzelm
parents:
50158
diff
changeset
|
118 |
val message2 = XML.Elem(Markup(name, props), body) |
c62ce309dc26
more abstract Sendback operations, with explicit id/exec_id properties;
wenzelm
parents:
50158
diff
changeset
|
119 |
|
c62ce309dc26
more abstract Sendback operations, with explicit id/exec_id properties;
wenzelm
parents:
50158
diff
changeset
|
120 |
val st0 = copy(results = results + (i -> message1)) |
39441
4110cc1b8f9f
allow embedded reports in regular prover messages, to avoid side-effects for errors for example;
wenzelm
parents:
39173
diff
changeset
|
121 |
val st1 = |
50500
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50499
diff
changeset
|
122 |
if (Protocol.is_inlined(message)) |
55431
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
123 |
(st0 /: Protocol.message_positions(command.id, command, message))( |
50163
c62ce309dc26
more abstract Sendback operations, with explicit id/exec_id properties;
wenzelm
parents:
50158
diff
changeset
|
124 |
(st, range) => st.add_markup(Text.Info(range, message2))) |
50500
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50499
diff
changeset
|
125 |
else st0 |
49445
638cefe3ee99
earlier treatment of embedded report/no_report messages (see also 4110cc1b8f9f);
wenzelm
parents:
49418
diff
changeset
|
126 |
|
638cefe3ee99
earlier treatment of embedded report/no_report messages (see also 4110cc1b8f9f);
wenzelm
parents:
49418
diff
changeset
|
127 |
st1 |
52536 | 128 |
case _ => |
129 |
java.lang.System.err.println("Ignored message without serial number: " + message) |
|
130 |
this |
|
38872 | 131 |
} |
38361 | 132 |
} |
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52524
diff
changeset
|
133 |
|
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52524
diff
changeset
|
134 |
def ++ (other: State): State = |
52642
84eb792224a8
full merge of Command.State, which enables Command.prints to augment markup as well (assuming that these dynamic overlays are relatively few);
wenzelm
parents:
52536
diff
changeset
|
135 |
copy( |
84eb792224a8
full merge of Command.State, which enables Command.prints to augment markup as well (assuming that these dynamic overlays are relatively few);
wenzelm
parents:
52536
diff
changeset
|
136 |
status = other.status ::: status, |
84eb792224a8
full merge of Command.State, which enables Command.prints to augment markup as well (assuming that these dynamic overlays are relatively few);
wenzelm
parents:
52536
diff
changeset
|
137 |
results = results ++ other.results, |
84eb792224a8
full merge of Command.State, which enables Command.prints to augment markup as well (assuming that these dynamic overlays are relatively few);
wenzelm
parents:
52536
diff
changeset
|
138 |
markup = markup ++ other.markup) |
38361 | 139 |
} |
38367 | 140 |
|
141 |
||
55431
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
142 |
|
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
143 |
/** static content **/ |
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
144 |
|
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
145 |
/* text chunks */ |
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
146 |
|
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
147 |
abstract class Chunk |
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
148 |
{ |
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
149 |
def file_name: String |
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
150 |
def length: Int |
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
151 |
def range: Text.Range |
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
152 |
def decode(r: Text.Range): Text.Range |
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
153 |
} |
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
154 |
|
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
155 |
class File(val file_name: String, text: CharSequence) extends Chunk |
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
156 |
{ |
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
157 |
val length = text.length |
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
158 |
val range = Text.Range(0, length) |
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
159 |
private val symbol_index = Symbol.Index(text) |
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
160 |
def decode(r: Text.Range): Text.Range = symbol_index.decode(r) |
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
161 |
} |
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
162 |
|
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
163 |
|
45644 | 164 |
/* make commands */ |
165 |
||
54462 | 166 |
def name(span: List[Token]): String = |
167 |
span.find(_.is_command) match { case Some(tok) => tok.source case _ => "" } |
|
48745 | 168 |
|
55431
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
169 |
type Blob = Exn.Result[(Document.Node.Name, Option[(SHA1.Digest, File)])] |
54513 | 170 |
|
52524 | 171 |
def apply( |
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
172 |
id: Document_ID.Command, |
52524 | 173 |
node_name: Document.Node.Name, |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54517
diff
changeset
|
174 |
blobs: List[Blob], |
54462 | 175 |
span: List[Token], |
52524 | 176 |
results: Results = Results.empty, |
177 |
markup: Markup_Tree = Markup_Tree.empty): Command = |
|
45644 | 178 |
{ |
179 |
val source: String = |
|
48745 | 180 |
span match { |
45644 | 181 |
case List(tok) => tok.source |
48745 | 182 |
case _ => span.map(_.source).mkString |
45644 | 183 |
} |
184 |
||
48745 | 185 |
val span1 = new mutable.ListBuffer[Token] |
45644 | 186 |
var i = 0 |
48745 | 187 |
for (Token(kind, s) <- span) { |
45644 | 188 |
val n = s.length |
189 |
val s1 = source.substring(i, i + n) |
|
48745 | 190 |
span1 += Token(kind, s1) |
45644 | 191 |
i += n |
192 |
} |
|
193 |
||
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54517
diff
changeset
|
194 |
new Command(id, node_name, blobs, span1.toList, source, results, markup) |
45644 | 195 |
} |
196 |
||
54513 | 197 |
val empty = Command(Document_ID.none, Document.Node.Name.empty, Nil, Nil) |
49414 | 198 |
|
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
199 |
def unparsed(id: Document_ID.Command, source: String, results: Results, markup: Markup_Tree) |
50501
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
200 |
: Command = |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54517
diff
changeset
|
201 |
Command(id, Document.Node.Name.empty, Nil, List(Token(Token.Kind.UNPARSED, source)), |
54462 | 202 |
results, markup) |
49414 | 203 |
|
50501
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
204 |
def unparsed(source: String): Command = |
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
205 |
unparsed(Document_ID.none, source, Results.empty, Markup_Tree.empty) |
44384 | 206 |
|
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
207 |
def rich_text(id: Document_ID.Command, results: Results, body: XML.Body): Command = |
49414 | 208 |
{ |
49466 | 209 |
val text = XML.content(body) |
210 |
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
|
211 |
unparsed(id, text, results, markup) |
49414 | 212 |
} |
49359
c1262d7389fb
refined output panel: more value-oriented approach to update and caret focus;
wenzelm
parents:
49037
diff
changeset
|
213 |
|
44384 | 214 |
|
215 |
/* perspective */ |
|
216 |
||
44474 | 217 |
object Perspective |
218 |
{ |
|
219 |
val empty: Perspective = Perspective(Nil) |
|
220 |
} |
|
44385
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44384
diff
changeset
|
221 |
|
44474 | 222 |
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
|
223 |
{ |
44474 | 224 |
def same(that: Perspective): Boolean = |
225 |
{ |
|
226 |
val cmds1 = this.commands |
|
227 |
val cmds2 = that.commands |
|
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48745
diff
changeset
|
228 |
require(!cmds1.exists(_.is_undefined)) |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48745
diff
changeset
|
229 |
require(!cmds2.exists(_.is_undefined)) |
44474 | 230 |
cmds1.length == cmds2.length && |
231 |
(cmds1.iterator zip cmds2.iterator).forall({ case (c1, c2) => c1.id == c2.id }) |
|
232 |
} |
|
44385
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44384
diff
changeset
|
233 |
} |
34318
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
234 |
} |
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
235 |
|
38361 | 236 |
|
46712 | 237 |
final class Command private( |
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
238 |
val id: Document_ID.Command, |
44615 | 239 |
val node_name: Document.Node.Name, |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54517
diff
changeset
|
240 |
val blobs: List[Command.Blob], |
52535
b7badd371e4d
tuned signature -- eliminated pointless type synonym;
wenzelm
parents:
52531
diff
changeset
|
241 |
val span: List[Token], |
49414 | 242 |
val source: String, |
50501
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
243 |
val init_results: Command.Results, |
49414 | 244 |
val init_markup: Markup_Tree) |
55431
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
245 |
extends Command.Chunk |
34451 | 246 |
{ |
34859 | 247 |
/* classification */ |
34500
384427c750c8
state_results: separate buffer for messages from running command;
wenzelm
parents:
34497
diff
changeset
|
248 |
|
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
249 |
def is_undefined: Boolean = id == Document_ID.none |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48745
diff
changeset
|
250 |
val is_unparsed: Boolean = span.exists(_.is_unparsed) |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48745
diff
changeset
|
251 |
val is_unfinished: Boolean = span.exists(_.is_unfinished) |
44385
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44384
diff
changeset
|
252 |
|
48599 | 253 |
val is_ignored: Boolean = !span.exists(_.is_proper) |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48745
diff
changeset
|
254 |
val is_malformed: Boolean = !is_ignored && (!span.head.is_command || span.exists(_.is_error)) |
47012
0e246130486b
clarified command span classification: strict Command.is_command, permissive Command.name;
wenzelm
parents:
46910
diff
changeset
|
255 |
def is_command: Boolean = !is_ignored && !is_malformed |
34859 | 256 |
|
54462 | 257 |
def name: String = Command.name(span) |
47012
0e246130486b
clarified command span classification: strict Command.is_command, permissive Command.name;
wenzelm
parents:
46910
diff
changeset
|
258 |
|
37129 | 259 |
override def toString = |
37373
25078ba44436
tuned Command.toString -- preserving uniqueness allows the Scala toplevel to print Linear_Set[Command] results without crashing;
wenzelm
parents:
37197
diff
changeset
|
260 |
id + "/" + (if (is_command) name else if (is_ignored) "IGNORED" else "MALFORMED") |
34495 | 261 |
|
34859 | 262 |
|
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54517
diff
changeset
|
263 |
/* blobs */ |
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54517
diff
changeset
|
264 |
|
54530
2c1440f70028
ranges of thy_load commands count as visible within perspective;
wenzelm
parents:
54524
diff
changeset
|
265 |
def blobs_names: List[Document.Node.Name] = |
2c1440f70028
ranges of thy_load commands count as visible within perspective;
wenzelm
parents:
54524
diff
changeset
|
266 |
for (Exn.Res((name, _)) <- blobs) yield name |
2c1440f70028
ranges of thy_load commands count as visible within perspective;
wenzelm
parents:
54524
diff
changeset
|
267 |
|
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54517
diff
changeset
|
268 |
def blobs_digests: List[SHA1.Digest] = |
55431
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
269 |
for (Exn.Res((_, Some((digest, _)))) <- blobs) yield digest |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54517
diff
changeset
|
270 |
|
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54517
diff
changeset
|
271 |
|
52509 | 272 |
/* source */ |
34451 | 273 |
|
55431
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
274 |
def file_name: String = "" |
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55430
diff
changeset
|
275 |
|
46813 | 276 |
def length: Int = source.length |
277 |
val range: Text.Range = Text.Range(0, length) |
|
278 |
||
279 |
val proper_range: Text.Range = |
|
51048
123be08eed88
clarified notion of Command.proper_range (according to Token.is_proper), especially relevant for Active.try_replace_command, to avoid loosing subsequent comments accidentally;
wenzelm
parents:
50540
diff
changeset
|
280 |
Text.Range(0, (length /: span.reverse.iterator.takeWhile(_.is_improper))(_ - _.source.length)) |
46813 | 281 |
|
38426 | 282 |
def source(range: Text.Range): String = source.substring(range.start, range.stop) |
38572
0fe2c01ef7da
Command.State: accumulate markup reports uniformly;
wenzelm
parents:
38564
diff
changeset
|
283 |
|
55430 | 284 |
private lazy val symbol_index = Symbol.Index(source) |
38579 | 285 |
def decode(i: Text.Offset): Text.Offset = symbol_index.decode(i) |
286 |
def decode(r: Text.Range): Text.Range = symbol_index.decode(r) |
|
38370
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
287 |
|
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
288 |
|
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
289 |
/* accumulated results */ |
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
290 |
|
50501
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
291 |
val init_state: Command.State = |
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
292 |
Command.State(this, results = init_results, markup = init_markup) |
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52524
diff
changeset
|
293 |
|
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52524
diff
changeset
|
294 |
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
|
295 |
} |