author | wenzelm |
Sat, 23 Mar 2013 16:10:46 +0100 | |
changeset 51494 | 8f3d1a7bee26 |
parent 51048 | 123be08eed88 |
child 51496 | cb677987b7e3 |
permissions | -rw-r--r-- |
36676 | 1 |
/* Title: Pure/PIDE/command.scala |
2 |
Author: Fabian Immler, TU Munich |
|
3 |
Author: Makarius |
|
4 |
||
5 |
Prover commands with semantic state. |
|
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 |
|
43520
cec9b95fa35d
explicit import java.lang.System to prevent odd scope problems;
wenzelm
parents:
40572
diff
changeset
|
10 |
import java.lang.System |
34451 | 11 |
|
45644 | 12 |
import scala.collection.mutable |
38872 | 13 |
import scala.collection.immutable.SortedMap |
14 |
||
15 |
||
34637 | 16 |
object Command |
17 |
{ |
|
38361 | 18 |
/** accumulated results from prover **/ |
19 |
||
50507 | 20 |
/* results */ |
21 |
||
22 |
object Results |
|
23 |
{ |
|
24 |
val empty = new Results(SortedMap.empty) |
|
25 |
def merge(rs: Iterable[Results]): Results = (empty /: rs.iterator)(_ ++ _) |
|
26 |
} |
|
27 |
||
51494 | 28 |
final class Results private(private val rep: SortedMap[Long, XML.Tree]) |
50507 | 29 |
{ |
30 |
def defined(serial: Long): Boolean = rep.isDefinedAt(serial) |
|
31 |
def get(serial: Long): Option[XML.Tree] = rep.get(serial) |
|
32 |
def entries: Iterator[(Long, XML.Tree)] = rep.iterator |
|
50508
5b7150395568
tuned implementation according to Library.insert/merge in ML;
wenzelm
parents:
50507
diff
changeset
|
33 |
|
5b7150395568
tuned implementation according to Library.insert/merge in ML;
wenzelm
parents:
50507
diff
changeset
|
34 |
def + (entry: (Long, XML.Tree)): Results = |
5b7150395568
tuned implementation according to Library.insert/merge in ML;
wenzelm
parents:
50507
diff
changeset
|
35 |
if (defined(entry._1)) this |
5b7150395568
tuned implementation according to Library.insert/merge in ML;
wenzelm
parents:
50507
diff
changeset
|
36 |
else new Results(rep + entry) |
5b7150395568
tuned implementation according to Library.insert/merge in ML;
wenzelm
parents:
50507
diff
changeset
|
37 |
|
5b7150395568
tuned implementation according to Library.insert/merge in ML;
wenzelm
parents:
50507
diff
changeset
|
38 |
def ++ (other: Results): Results = |
5b7150395568
tuned implementation according to Library.insert/merge in ML;
wenzelm
parents:
50507
diff
changeset
|
39 |
if (this eq other) this |
5b7150395568
tuned implementation according to Library.insert/merge in ML;
wenzelm
parents:
50507
diff
changeset
|
40 |
else if (rep.isEmpty) other |
5b7150395568
tuned implementation according to Library.insert/merge in ML;
wenzelm
parents:
50507
diff
changeset
|
41 |
else (this /: other.entries)(_ + _) |
50540 | 42 |
|
51494 | 43 |
override def hashCode: Int = rep.hashCode |
44 |
override def equals(that: Any): Boolean = |
|
45 |
that match { |
|
46 |
case other: Results => rep == other.rep |
|
47 |
case _ => false |
|
48 |
} |
|
50540 | 49 |
override def toString: String = entries.mkString("Results(", ", ", ")") |
50507 | 50 |
} |
51 |
||
52 |
||
53 |
/* state */ |
|
50501
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
54 |
|
43714 | 55 |
sealed case class State( |
50501
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
56 |
command: Command, |
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
57 |
status: List[Markup] = Nil, |
50507 | 58 |
results: Results = Results.empty, |
50501
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
59 |
markup: Markup_Tree = Markup_Tree.empty) |
38361 | 60 |
{ |
49645 | 61 |
def markup_to_XML(filter: XML.Elem => Boolean): XML.Body = |
62 |
markup.to_XML(command.range, command.source, filter) |
|
49614 | 63 |
|
64 |
||
51494 | 65 |
/* content */ |
66 |
||
67 |
def eq_content(other: State): Boolean = |
|
68 |
command.source == other.command.source && |
|
69 |
status == other.status && |
|
70 |
results == other.results && |
|
71 |
markup == other.markup |
|
38361 | 72 |
|
46152
793cecd4ffc0
accumulate status as regular markup for command range;
wenzelm
parents:
45709
diff
changeset
|
73 |
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
|
74 |
private def add_markup(m: Text.Markup): State = copy(markup = markup + m) |
38361 | 75 |
|
49527 | 76 |
def + (alt_id: Document.ID, message: XML.Elem): Command.State = |
38361 | 77 |
message match { |
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50163
diff
changeset
|
78 |
case XML.Elem(Markup(Markup.STATUS, _), msgs) => |
38714 | 79 |
(this /: msgs)((state, msg) => |
80 |
msg match { |
|
46152
793cecd4ffc0
accumulate status as regular markup for command range;
wenzelm
parents:
45709
diff
changeset
|
81 |
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
|
82 |
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
|
83 |
.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
|
84 |
|
38714 | 85 |
case _ => System.err.println("Ignored status message: " + msg); state |
86 |
}) |
|
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
|
87 |
|
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50163
diff
changeset
|
88 |
case XML.Elem(Markup(Markup.REPORT, _), msgs) => |
38572
0fe2c01ef7da
Command.State: accumulate markup reports uniformly;
wenzelm
parents:
38564
diff
changeset
|
89 |
(this /: msgs)((state, msg) => |
0fe2c01ef7da
Command.State: accumulate markup reports uniformly;
wenzelm
parents:
38564
diff
changeset
|
90 |
msg match { |
39173
ed3946086358
Command.State.accumulate: check actual source range;
wenzelm
parents:
39172
diff
changeset
|
91 |
case XML.Elem(Markup(name, atts @ Position.Id_Range(id, raw_range)), args) |
49527 | 92 |
if (id == command.id || id == alt_id) && |
93 |
command.range.contains(command.decode(raw_range)) => |
|
39173
ed3946086358
Command.State.accumulate: check actual source range;
wenzelm
parents:
39172
diff
changeset
|
94 |
val range = command.decode(raw_range) |
38872 | 95 |
val props = Position.purge(atts) |
45455 | 96 |
val info: Text.Markup = Text.Info(range, XML.Elem(Markup(name, props), args)) |
38723 | 97 |
state.add_markup(info) |
49526
6d1465c00f2e
more restrictive pattern, to avoid malformed positions intruding the command range (cf. d7a1973b063c);
wenzelm
parents:
49493
diff
changeset
|
98 |
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
|
99 |
if !atts.exists({ case (a, _) => Markup.POSITION_PROPERTIES(a) }) => |
49037
d7a1973b063c
more markup for failed goal forks, reusing "bad";
wenzelm
parents:
48922
diff
changeset
|
100 |
val range = command.proper_range |
d7a1973b063c
more markup for failed goal forks, reusing "bad";
wenzelm
parents:
48922
diff
changeset
|
101 |
val props = Position.purge(atts) |
d7a1973b063c
more markup for failed goal forks, reusing "bad";
wenzelm
parents:
48922
diff
changeset
|
102 |
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
|
103 |
state.add_markup(info) |
40572 | 104 |
case _ => |
105 |
// FIXME System.err.println("Ignored report message: " + msg) |
|
106 |
state |
|
38361 | 107 |
}) |
38872 | 108 |
case XML.Elem(Markup(name, atts), body) => |
109 |
atts match { |
|
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50163
diff
changeset
|
110 |
case Markup.Serial(i) => |
50163
c62ce309dc26
more abstract Sendback operations, with explicit id/exec_id properties;
wenzelm
parents:
50158
diff
changeset
|
111 |
val props = Position.purge(atts) |
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50163
diff
changeset
|
112 |
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
|
113 |
val message2 = XML.Elem(Markup(name, props), body) |
c62ce309dc26
more abstract Sendback operations, with explicit id/exec_id properties;
wenzelm
parents:
50158
diff
changeset
|
114 |
|
c62ce309dc26
more abstract Sendback operations, with explicit id/exec_id properties;
wenzelm
parents:
50158
diff
changeset
|
115 |
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
|
116 |
val st1 = |
50500
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50499
diff
changeset
|
117 |
if (Protocol.is_inlined(message)) |
45709
87017fcbad83
clarified modules (again) -- NB: both Document and Protocol are specific to this particular prover;
wenzelm
parents:
45672
diff
changeset
|
118 |
(st0 /: Protocol.message_positions(command, message))( |
50163
c62ce309dc26
more abstract Sendback operations, with explicit id/exec_id properties;
wenzelm
parents:
50158
diff
changeset
|
119 |
(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
|
120 |
else st0 |
49445
638cefe3ee99
earlier treatment of embedded report/no_report messages (see also 4110cc1b8f9f);
wenzelm
parents:
49418
diff
changeset
|
121 |
|
638cefe3ee99
earlier treatment of embedded report/no_report messages (see also 4110cc1b8f9f);
wenzelm
parents:
49418
diff
changeset
|
122 |
st1 |
38872 | 123 |
case _ => System.err.println("Ignored message without serial number: " + message); this |
124 |
} |
|
38361 | 125 |
} |
126 |
} |
|
38367 | 127 |
|
128 |
||
45644 | 129 |
/* make commands */ |
130 |
||
48745 | 131 |
type Span = List[Token] |
132 |
||
50501
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
133 |
def apply(id: Document.Command_ID, node_name: Document.Node.Name, span: Span, |
50507 | 134 |
results: Results = Results.empty, markup: Markup_Tree = Markup_Tree.empty): Command = |
45644 | 135 |
{ |
136 |
val source: String = |
|
48745 | 137 |
span match { |
45644 | 138 |
case List(tok) => tok.source |
48745 | 139 |
case _ => span.map(_.source).mkString |
45644 | 140 |
} |
141 |
||
48745 | 142 |
val span1 = new mutable.ListBuffer[Token] |
45644 | 143 |
var i = 0 |
48745 | 144 |
for (Token(kind, s) <- span) { |
45644 | 145 |
val n = s.length |
146 |
val s1 = source.substring(i, i + n) |
|
48745 | 147 |
span1 += Token(kind, s1) |
45644 | 148 |
i += n |
149 |
} |
|
150 |
||
50501
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
151 |
new Command(id, node_name, span1.toList, source, results, markup) |
45644 | 152 |
} |
153 |
||
50501
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
154 |
val empty = Command(Document.no_id, Document.Node.Name.empty, Nil) |
49414 | 155 |
|
50501
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
156 |
def unparsed(id: Document.Command_ID, source: String, results: Results, markup: Markup_Tree) |
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
157 |
: Command = |
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
158 |
Command(id, Document.Node.Name.empty, List(Token(Token.Kind.UNPARSED, source)), results, markup) |
49414 | 159 |
|
50501
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
160 |
def unparsed(source: String): Command = |
50507 | 161 |
unparsed(Document.no_id, source, Results.empty, Markup_Tree.empty) |
44384 | 162 |
|
50501
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
163 |
def rich_text(id: Document.Command_ID, results: Results, body: XML.Body): Command = |
49414 | 164 |
{ |
49466 | 165 |
val text = XML.content(body) |
166 |
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
|
167 |
unparsed(id, text, results, markup) |
49414 | 168 |
} |
49359
c1262d7389fb
refined output panel: more value-oriented approach to update and caret focus;
wenzelm
parents:
49037
diff
changeset
|
169 |
|
44384 | 170 |
|
171 |
/* perspective */ |
|
172 |
||
44474 | 173 |
object Perspective |
174 |
{ |
|
175 |
val empty: Perspective = Perspective(Nil) |
|
176 |
} |
|
44385
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44384
diff
changeset
|
177 |
|
44474 | 178 |
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
|
179 |
{ |
44474 | 180 |
def same(that: Perspective): Boolean = |
181 |
{ |
|
182 |
val cmds1 = this.commands |
|
183 |
val cmds2 = that.commands |
|
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48745
diff
changeset
|
184 |
require(!cmds1.exists(_.is_undefined)) |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48745
diff
changeset
|
185 |
require(!cmds2.exists(_.is_undefined)) |
44474 | 186 |
cmds1.length == cmds2.length && |
187 |
(cmds1.iterator zip cmds2.iterator).forall({ case (c1, c2) => c1.id == c2.id }) |
|
188 |
} |
|
44385
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44384
diff
changeset
|
189 |
} |
34318
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
190 |
} |
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
191 |
|
38361 | 192 |
|
46712 | 193 |
final class Command private( |
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
37373
diff
changeset
|
194 |
val id: Document.Command_ID, |
44615 | 195 |
val node_name: Document.Node.Name, |
48745 | 196 |
val span: Command.Span, |
49414 | 197 |
val source: String, |
50501
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
198 |
val init_results: Command.Results, |
49414 | 199 |
val init_markup: Markup_Tree) |
34451 | 200 |
{ |
34859 | 201 |
/* classification */ |
34500
384427c750c8
state_results: separate buffer for messages from running command;
wenzelm
parents:
34497
diff
changeset
|
202 |
|
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48745
diff
changeset
|
203 |
def is_undefined: Boolean = id == Document.no_id |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48745
diff
changeset
|
204 |
val is_unparsed: Boolean = span.exists(_.is_unparsed) |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48745
diff
changeset
|
205 |
val is_unfinished: Boolean = span.exists(_.is_unfinished) |
44385
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44384
diff
changeset
|
206 |
|
48599 | 207 |
val is_ignored: Boolean = !span.exists(_.is_proper) |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48745
diff
changeset
|
208 |
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
|
209 |
def is_command: Boolean = !is_ignored && !is_malformed |
34859 | 210 |
|
47012
0e246130486b
clarified command span classification: strict Command.is_command, permissive Command.name;
wenzelm
parents:
46910
diff
changeset
|
211 |
def name: String = |
48718 | 212 |
span.find(_.is_command) match { case Some(tok) => tok.source case _ => "" } |
47012
0e246130486b
clarified command span classification: strict Command.is_command, permissive Command.name;
wenzelm
parents:
46910
diff
changeset
|
213 |
|
37129 | 214 |
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
|
215 |
id + "/" + (if (is_command) name else if (is_ignored) "IGNORED" else "MALFORMED") |
34495 | 216 |
|
34859 | 217 |
|
218 |
/* source text */ |
|
34451 | 219 |
|
46813 | 220 |
def length: Int = source.length |
221 |
val range: Text.Range = Text.Range(0, length) |
|
222 |
||
223 |
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
|
224 |
Text.Range(0, (length /: span.reverse.iterator.takeWhile(_.is_improper))(_ - _.source.length)) |
46813 | 225 |
|
38426 | 226 |
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
|
227 |
|
34859 | 228 |
lazy val symbol_index = new Symbol.Index(source) |
38579 | 229 |
def decode(i: Text.Offset): Text.Offset = symbol_index.decode(i) |
230 |
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
|
231 |
|
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
232 |
|
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
233 |
/* accumulated results */ |
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
234 |
|
50501
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
235 |
val init_state: Command.State = |
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
236 |
Command.State(this, results = init_results, markup = init_markup) |
34676
9e725d34df7b
Command and Command_State handle results from prover as Accumulator
immler@in.tum.de
parents:
34675
diff
changeset
|
237 |
} |