author | wenzelm |
Wed, 02 Apr 2014 20:22:12 +0200 | |
changeset 56372 | fadb0fef09d7 |
parent 56359 | bca016a9a18d |
child 56387 | d92eb5c3960d |
permissions | -rw-r--r-- |
45709
87017fcbad83
clarified modules (again) -- NB: both Document and Protocol are specific to this particular prover;
wenzelm
parents:
45672
diff
changeset
|
1 |
/* Title: Pure/PIDE/protocol.scala |
38412
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
wenzelm
parents:
diff
changeset
|
2 |
Author: Makarius |
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
wenzelm
parents:
diff
changeset
|
3 |
|
45709
87017fcbad83
clarified modules (again) -- NB: both Document and Protocol are specific to this particular prover;
wenzelm
parents:
45672
diff
changeset
|
4 |
Protocol message formats for interactive proof documents. |
38412
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
wenzelm
parents:
diff
changeset
|
5 |
*/ |
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
wenzelm
parents:
diff
changeset
|
6 |
|
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
wenzelm
parents:
diff
changeset
|
7 |
package isabelle |
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
wenzelm
parents:
diff
changeset
|
8 |
|
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
wenzelm
parents:
diff
changeset
|
9 |
|
45709
87017fcbad83
clarified modules (again) -- NB: both Document and Protocol are specific to this particular prover;
wenzelm
parents:
45672
diff
changeset
|
10 |
object Protocol |
38412
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
wenzelm
parents:
diff
changeset
|
11 |
{ |
38567
b670faa807c9
concentrate protocol message formats in Isar_Document;
wenzelm
parents:
38483
diff
changeset
|
12 |
/* document editing */ |
38412
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
wenzelm
parents:
diff
changeset
|
13 |
|
52563 | 14 |
object Assign_Update |
44476
e8a87398f35d
propagate information about last command with exec state assignment through document model;
wenzelm
parents:
44474
diff
changeset
|
15 |
{ |
52563 | 16 |
def unapply(text: String): Option[(Document_ID.Version, Document.Assign_Update)] = |
44661
383c9d758a56
raw message function "assign_execs" avoids full overhead of decoding and caching message body;
wenzelm
parents:
44644
diff
changeset
|
17 |
try { |
383c9d758a56
raw message function "assign_execs" avoids full overhead of decoding and caching message body;
wenzelm
parents:
44644
diff
changeset
|
18 |
import XML.Decode._ |
383c9d758a56
raw message function "assign_execs" avoids full overhead of decoding and caching message body;
wenzelm
parents:
44644
diff
changeset
|
19 |
val body = YXML.parse_body(text) |
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52111
diff
changeset
|
20 |
Some(pair(long, list(pair(long, list(long))))(body)) |
44661
383c9d758a56
raw message function "assign_execs" avoids full overhead of decoding and caching message body;
wenzelm
parents:
44644
diff
changeset
|
21 |
} |
383c9d758a56
raw message function "assign_execs" avoids full overhead of decoding and caching message body;
wenzelm
parents:
44644
diff
changeset
|
22 |
catch { |
383c9d758a56
raw message function "assign_execs" avoids full overhead of decoding and caching message body;
wenzelm
parents:
44644
diff
changeset
|
23 |
case ERROR(_) => None |
51987 | 24 |
case _: XML.Error => None |
38412
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
wenzelm
parents:
diff
changeset
|
25 |
} |
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
wenzelm
parents:
diff
changeset
|
26 |
} |
38567
b670faa807c9
concentrate protocol message formats in Isar_Document;
wenzelm
parents:
38483
diff
changeset
|
27 |
|
44676 | 28 |
object Removed |
29 |
{ |
|
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
30 |
def unapply(text: String): Option[List[Document_ID.Version]] = |
44676 | 31 |
try { |
32 |
import XML.Decode._ |
|
33 |
Some(list(long)(YXML.parse_body(text))) |
|
34 |
} |
|
35 |
catch { |
|
36 |
case ERROR(_) => None |
|
51987 | 37 |
case _: XML.Error => None |
44676 | 38 |
} |
39 |
} |
|
40 |
||
38567
b670faa807c9
concentrate protocol message formats in Isar_Document;
wenzelm
parents:
38483
diff
changeset
|
41 |
|
46209 | 42 |
/* command status */ |
38567
b670faa807c9
concentrate protocol message formats in Isar_Document;
wenzelm
parents:
38483
diff
changeset
|
43 |
|
56359
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
44 |
object Status |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
45 |
{ |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
46 |
def make(markup_iterator: Iterator[Markup]): Status = |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
47 |
{ |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
48 |
var touched = false |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
49 |
var accepted = false |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
50 |
var failed = false |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
51 |
var forks = 0 |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
52 |
var runs = 0 |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
53 |
for (markup <- markup_iterator) { |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
54 |
markup.name match { |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
55 |
case Markup.ACCEPTED => accepted = true |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
56 |
case Markup.FORKED => touched = true; forks += 1 |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
57 |
case Markup.JOINED => forks -= 1 |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
58 |
case Markup.RUNNING => touched = true; runs += 1 |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
59 |
case Markup.FINISHED => runs -= 1 |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
60 |
case Markup.FAILED => failed = true |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
61 |
case _ => |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
62 |
} |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
63 |
} |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
64 |
Status(touched, accepted, failed, forks, runs) |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
65 |
} |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
66 |
|
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
67 |
val empty = make(Iterator.empty) |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
68 |
|
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
69 |
def merge(status_iterator: Iterator[Status]): Status = |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
70 |
if (status_iterator.hasNext) { |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
71 |
val status0 = status_iterator.next |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
72 |
(status0 /: status_iterator)(_ + _) |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
73 |
} |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
74 |
else empty |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
75 |
} |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
76 |
|
46166 | 77 |
sealed case class Status( |
56352
abdc524db8b4
more frugal command_status, which is often used in a tight loop;
wenzelm
parents:
56335
diff
changeset
|
78 |
private val touched: Boolean, |
abdc524db8b4
more frugal command_status, which is often used in a tight loop;
wenzelm
parents:
56335
diff
changeset
|
79 |
private val accepted: Boolean, |
abdc524db8b4
more frugal command_status, which is often used in a tight loop;
wenzelm
parents:
56335
diff
changeset
|
80 |
private val failed: Boolean, |
abdc524db8b4
more frugal command_status, which is often used in a tight loop;
wenzelm
parents:
56335
diff
changeset
|
81 |
forks: Int, |
abdc524db8b4
more frugal command_status, which is often used in a tight loop;
wenzelm
parents:
56335
diff
changeset
|
82 |
runs: Int) |
38567
b670faa807c9
concentrate protocol message formats in Isar_Document;
wenzelm
parents:
38483
diff
changeset
|
83 |
{ |
56359
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
84 |
def + (that: Status): Status = |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
85 |
Status(touched || that.touched, accepted || that.accepted, failed || that.failed, |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
86 |
forks + that.forks, runs + that.runs) |
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
87 |
|
49036
4680c4046814
further refinement of command status, to accomodate forked proofs;
wenzelm
parents:
49009
diff
changeset
|
88 |
def is_unprocessed: Boolean = accepted && !failed && (!touched || (forks != 0 && runs == 0)) |
4680c4046814
further refinement of command status, to accomodate forked proofs;
wenzelm
parents:
49009
diff
changeset
|
89 |
def is_running: Boolean = runs != 0 |
49039 | 90 |
def is_finished: Boolean = !failed && touched && forks == 0 && runs == 0 |
49036
4680c4046814
further refinement of command status, to accomodate forked proofs;
wenzelm
parents:
49009
diff
changeset
|
91 |
def is_failed: Boolean = failed |
46166 | 92 |
} |
93 |
||
55820
61869776ce1f
tuned signature -- more explicit Document.Elements;
wenzelm
parents:
55783
diff
changeset
|
94 |
val command_status_elements = |
61869776ce1f
tuned signature -- more explicit Document.Elements;
wenzelm
parents:
55783
diff
changeset
|
95 |
Document.Elements(Markup.ACCEPTED, Markup.FORKED, Markup.JOINED, Markup.RUNNING, |
55646 | 96 |
Markup.FINISHED, Markup.FAILED) |
97 |
||
55820
61869776ce1f
tuned signature -- more explicit Document.Elements;
wenzelm
parents:
55783
diff
changeset
|
98 |
val status_elements = |
55646 | 99 |
command_status_elements + Markup.WARNING + Markup.ERROR |
100 |
||
46209 | 101 |
|
51818
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
wenzelm
parents:
51533
diff
changeset
|
102 |
/* command timing */ |
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
wenzelm
parents:
51533
diff
changeset
|
103 |
|
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
wenzelm
parents:
51533
diff
changeset
|
104 |
object Command_Timing |
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
wenzelm
parents:
51533
diff
changeset
|
105 |
{ |
52531 | 106 |
def unapply(props: Properties.T): Option[(Document_ID.Generic, isabelle.Timing)] = |
51818
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
wenzelm
parents:
51533
diff
changeset
|
107 |
props match { |
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
wenzelm
parents:
51533
diff
changeset
|
108 |
case (Markup.FUNCTION, Markup.COMMAND_TIMING) :: args => |
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
wenzelm
parents:
51533
diff
changeset
|
109 |
(args, args) match { |
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
wenzelm
parents:
51533
diff
changeset
|
110 |
case (Position.Id(id), Markup.Timing_Properties(timing)) => Some((id, timing)) |
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
wenzelm
parents:
51533
diff
changeset
|
111 |
case _ => None |
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
wenzelm
parents:
51533
diff
changeset
|
112 |
} |
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
wenzelm
parents:
51533
diff
changeset
|
113 |
case _ => None |
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
wenzelm
parents:
51533
diff
changeset
|
114 |
} |
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
wenzelm
parents:
51533
diff
changeset
|
115 |
} |
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
wenzelm
parents:
51533
diff
changeset
|
116 |
|
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
wenzelm
parents:
51533
diff
changeset
|
117 |
|
46209 | 118 |
/* node status */ |
119 |
||
46688 | 120 |
sealed case class Node_Status( |
121 |
unprocessed: Int, running: Int, finished: Int, warned: Int, failed: Int) |
|
44866 | 122 |
{ |
46688 | 123 |
def total: Int = unprocessed + running + finished + warned + failed |
44866 | 124 |
} |
44613 | 125 |
|
126 |
def node_status( |
|
127 |
state: Document.State, version: Document.Version, node: Document.Node): Node_Status = |
|
128 |
{ |
|
129 |
var unprocessed = 0 |
|
130 |
var running = 0 |
|
131 |
var finished = 0 |
|
46688 | 132 |
var warned = 0 |
44613 | 133 |
var failed = 0 |
56356
c3dbaa155ece
tuned for-comprehensions -- less structure mapping;
wenzelm
parents:
56355
diff
changeset
|
134 |
for (command <- node.commands.iterator) { |
56355
1a9f569b5b7e
some rephrasing to ensure that this becomes cheap "foreach" and not expensive "map" (cf. 0fc032898b05);
wenzelm
parents:
56353
diff
changeset
|
135 |
val states = state.command_states(version, command) |
56359
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
wenzelm
parents:
56356
diff
changeset
|
136 |
val status = Status.merge(states.iterator.map(_.protocol_status)) |
56355
1a9f569b5b7e
some rephrasing to ensure that this becomes cheap "foreach" and not expensive "map" (cf. 0fc032898b05);
wenzelm
parents:
56353
diff
changeset
|
137 |
|
56299
8201790fdeb9
more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents:
56295
diff
changeset
|
138 |
if (status.is_running) running += 1 |
8201790fdeb9
more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents:
56295
diff
changeset
|
139 |
else if (status.is_finished) { |
56372
fadb0fef09d7
more explicit iterator terminology, in accordance to Scala 2.8 library;
wenzelm
parents:
56359
diff
changeset
|
140 |
val warning = states.exists(st => st.results.iterator.exists(p => is_warning(p._2))) |
56306
0fc032898b05
back to cumulative treatment of command status, which is important for total accounting (amending 8201790fdeb9);
wenzelm
parents:
56299
diff
changeset
|
141 |
if (warning) warned += 1 else finished += 1 |
56299
8201790fdeb9
more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents:
56295
diff
changeset
|
142 |
} |
8201790fdeb9
more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents:
56295
diff
changeset
|
143 |
else if (status.is_failed) failed += 1 |
8201790fdeb9
more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents:
56295
diff
changeset
|
144 |
else unprocessed += 1 |
8201790fdeb9
more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents:
56295
diff
changeset
|
145 |
} |
46688 | 146 |
Node_Status(unprocessed, running, finished, warned, failed) |
44613 | 147 |
} |
148 |
||
38887
1261481ef5e5
Command.State: add reported positions to markup tree, according main message position or Markup.binding/entity/report occurrences in body;
wenzelm
parents:
38581
diff
changeset
|
149 |
|
51533 | 150 |
/* node timing */ |
151 |
||
152 |
sealed case class Node_Timing(total: Double, commands: Map[Command, Double]) |
|
153 |
||
154 |
val empty_node_timing = Node_Timing(0.0, Map.empty) |
|
155 |
||
156 |
def node_timing( |
|
157 |
state: Document.State, |
|
158 |
version: Document.Version, |
|
159 |
node: Document.Node, |
|
160 |
threshold: Double): Node_Timing = |
|
161 |
{ |
|
162 |
var total = 0.0 |
|
163 |
var commands = Map.empty[Command, Double] |
|
164 |
for { |
|
165 |
command <- node.commands.iterator |
|
56299
8201790fdeb9
more careful treatment of multiple command states (eval + prints): merge content that is actually required;
wenzelm
parents:
56295
diff
changeset
|
166 |
st <- state.command_states(version, command) |
56356
c3dbaa155ece
tuned for-comprehensions -- less structure mapping;
wenzelm
parents:
56355
diff
changeset
|
167 |
} { |
c3dbaa155ece
tuned for-comprehensions -- less structure mapping;
wenzelm
parents:
56355
diff
changeset
|
168 |
val command_timing = |
51533 | 169 |
(0.0 /: st.status)({ |
170 |
case (timing, Markup.Timing(t)) => timing + t.elapsed.seconds |
|
171 |
case (timing, _) => timing |
|
172 |
}) |
|
173 |
total += command_timing |
|
174 |
if (command_timing >= threshold) commands += (command -> command_timing) |
|
175 |
} |
|
176 |
Node_Timing(total, commands) |
|
177 |
} |
|
178 |
||
179 |
||
39441
4110cc1b8f9f
allow embedded reports in regular prover messages, to avoid side-effects for errors for example;
wenzelm
parents:
39439
diff
changeset
|
180 |
/* result messages */ |
39439
1c294d150ded
eliminated markup "location" in favour of more explicit "no_report", which is actually deleted from messages;
wenzelm
parents:
39181
diff
changeset
|
181 |
|
55820
61869776ce1f
tuned signature -- more explicit Document.Elements;
wenzelm
parents:
55783
diff
changeset
|
182 |
private val clean_elements = |
61869776ce1f
tuned signature -- more explicit Document.Elements;
wenzelm
parents:
55783
diff
changeset
|
183 |
Document.Elements(Markup.REPORT, Markup.NO_REPORT) |
50450
358b6020f8b6
generalized notion of active area, where sendback is just one application;
wenzelm
parents:
50201
diff
changeset
|
184 |
|
39439
1c294d150ded
eliminated markup "location" in favour of more explicit "no_report", which is actually deleted from messages;
wenzelm
parents:
39181
diff
changeset
|
185 |
def clean_message(body: XML.Body): XML.Body = |
49445
638cefe3ee99
earlier treatment of embedded report/no_report messages (see also 4110cc1b8f9f);
wenzelm
parents:
49418
diff
changeset
|
186 |
body filter { |
55646 | 187 |
case XML.Wrapped_Elem(Markup(name, _), _, _) => !clean_elements(name) |
188 |
case XML.Elem(Markup(name, _), _) => !clean_elements(name) |
|
49445
638cefe3ee99
earlier treatment of embedded report/no_report messages (see also 4110cc1b8f9f);
wenzelm
parents:
49418
diff
changeset
|
189 |
case _ => true |
49650
9fad6480300d
support for wrapped XML elements, which allows to preserve full markup tree information in to_XML/from_XML conversion;
wenzelm
parents:
49648
diff
changeset
|
190 |
} map { |
9fad6480300d
support for wrapped XML elements, which allows to preserve full markup tree information in to_XML/from_XML conversion;
wenzelm
parents:
49648
diff
changeset
|
191 |
case XML.Wrapped_Elem(markup, body, ts) => XML.Wrapped_Elem(markup, body, clean_message(ts)) |
9fad6480300d
support for wrapped XML elements, which allows to preserve full markup tree information in to_XML/from_XML conversion;
wenzelm
parents:
49648
diff
changeset
|
192 |
case XML.Elem(markup, ts) => XML.Elem(markup, clean_message(ts)) |
9fad6480300d
support for wrapped XML elements, which allows to preserve full markup tree information in to_XML/from_XML conversion;
wenzelm
parents:
49648
diff
changeset
|
193 |
case t => t |
9fad6480300d
support for wrapped XML elements, which allows to preserve full markup tree information in to_XML/from_XML conversion;
wenzelm
parents:
49648
diff
changeset
|
194 |
} |
39439
1c294d150ded
eliminated markup "location" in favour of more explicit "no_report", which is actually deleted from messages;
wenzelm
parents:
39181
diff
changeset
|
195 |
|
49445
638cefe3ee99
earlier treatment of embedded report/no_report messages (see also 4110cc1b8f9f);
wenzelm
parents:
49418
diff
changeset
|
196 |
def message_reports(props: Properties.T, body: XML.Body): List[XML.Elem] = |
638cefe3ee99
earlier treatment of embedded report/no_report messages (see also 4110cc1b8f9f);
wenzelm
parents:
49418
diff
changeset
|
197 |
body flatMap { |
50450
358b6020f8b6
generalized notion of active area, where sendback is just one application;
wenzelm
parents:
50201
diff
changeset
|
198 |
case XML.Wrapped_Elem(Markup(Markup.REPORT, ps), body, ts) => |
358b6020f8b6
generalized notion of active area, where sendback is just one application;
wenzelm
parents:
50201
diff
changeset
|
199 |
List(XML.Wrapped_Elem(Markup(Markup.REPORT, props ::: ps), body, ts)) |
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50157
diff
changeset
|
200 |
case XML.Elem(Markup(Markup.REPORT, ps), ts) => |
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50157
diff
changeset
|
201 |
List(XML.Elem(Markup(Markup.REPORT, props ::: ps), ts)) |
49650
9fad6480300d
support for wrapped XML elements, which allows to preserve full markup tree information in to_XML/from_XML conversion;
wenzelm
parents:
49648
diff
changeset
|
202 |
case XML.Wrapped_Elem(_, _, ts) => message_reports(props, ts) |
49445
638cefe3ee99
earlier treatment of embedded report/no_report messages (see also 4110cc1b8f9f);
wenzelm
parents:
49418
diff
changeset
|
203 |
case XML.Elem(_, ts) => message_reports(props, ts) |
39441
4110cc1b8f9f
allow embedded reports in regular prover messages, to avoid side-effects for errors for example;
wenzelm
parents:
39439
diff
changeset
|
204 |
case XML.Text(_) => Nil |
4110cc1b8f9f
allow embedded reports in regular prover messages, to avoid side-effects for errors for example;
wenzelm
parents:
39439
diff
changeset
|
205 |
} |
4110cc1b8f9f
allow embedded reports in regular prover messages, to avoid side-effects for errors for example;
wenzelm
parents:
39439
diff
changeset
|
206 |
|
39439
1c294d150ded
eliminated markup "location" in favour of more explicit "no_report", which is actually deleted from messages;
wenzelm
parents:
39181
diff
changeset
|
207 |
|
39511 | 208 |
/* specific messages */ |
209 |
||
50500
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
210 |
def is_inlined(msg: XML.Tree): Boolean = |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
211 |
!(is_result(msg) || is_tracing(msg) || is_state(msg)) |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
212 |
|
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
213 |
def is_result(msg: XML.Tree): Boolean = |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
214 |
msg match { |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
215 |
case XML.Elem(Markup(Markup.RESULT, _), _) => true |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
216 |
case _ => false |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
217 |
} |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
218 |
|
50157 | 219 |
def is_tracing(msg: XML.Tree): Boolean = |
39622
53365ba766ac
Command.accumulate: refrain from adding tracing messages to markup tree -- potential scalability problem;
wenzelm
parents:
39511
diff
changeset
|
220 |
msg match { |
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50157
diff
changeset
|
221 |
case XML.Elem(Markup(Markup.TRACING, _), _) => true |
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50157
diff
changeset
|
222 |
case XML.Elem(Markup(Markup.TRACING_MESSAGE, _), _) => true |
39622
53365ba766ac
Command.accumulate: refrain from adding tracing messages to markup tree -- potential scalability problem;
wenzelm
parents:
39511
diff
changeset
|
223 |
case _ => false |
53365ba766ac
Command.accumulate: refrain from adding tracing messages to markup tree -- potential scalability problem;
wenzelm
parents:
39511
diff
changeset
|
224 |
} |
53365ba766ac
Command.accumulate: refrain from adding tracing messages to markup tree -- potential scalability problem;
wenzelm
parents:
39511
diff
changeset
|
225 |
|
52650 | 226 |
def is_writeln_markup(msg: XML.Tree, name: String): Boolean = |
50500
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
227 |
msg match { |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
228 |
case XML.Elem(Markup(Markup.WRITELN, _), |
52650 | 229 |
List(XML.Elem(markup, _))) => markup.name == name |
50500
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
230 |
case XML.Elem(Markup(Markup.WRITELN_MESSAGE, _), |
52650 | 231 |
List(XML.Elem(markup, _))) => markup.name == name |
50500
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
232 |
case _ => false |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
233 |
} |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
234 |
|
52650 | 235 |
def is_state(msg: XML.Tree): Boolean = is_writeln_markup(msg, Markup.STATE) |
236 |
def is_information(msg: XML.Tree): Boolean = is_writeln_markup(msg, Markup.INFORMATION) |
|
237 |
||
39511 | 238 |
def is_warning(msg: XML.Tree): Boolean = |
239 |
msg match { |
|
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50157
diff
changeset
|
240 |
case XML.Elem(Markup(Markup.WARNING, _), _) => true |
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50157
diff
changeset
|
241 |
case XML.Elem(Markup(Markup.WARNING_MESSAGE, _), _) => true |
39511 | 242 |
case _ => false |
243 |
} |
|
244 |
||
245 |
def is_error(msg: XML.Tree): Boolean = |
|
246 |
msg match { |
|
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50157
diff
changeset
|
247 |
case XML.Elem(Markup(Markup.ERROR, _), _) => true |
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
50157
diff
changeset
|
248 |
case XML.Elem(Markup(Markup.ERROR_MESSAGE, _), _) => true |
39511 | 249 |
case _ => false |
250 |
} |
|
38887
1261481ef5e5
Command.State: add reported positions to markup tree, according main message position or Markup.binding/entity/report occurrences in body;
wenzelm
parents:
38581
diff
changeset
|
251 |
|
50500
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
252 |
|
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
253 |
/* dialogs */ |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
254 |
|
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
255 |
object Dialog_Args |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
256 |
{ |
52531 | 257 |
def unapply(props: Properties.T): Option[(Document_ID.Generic, Long, String)] = |
50500
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
258 |
(props, props, props) match { |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
259 |
case (Position.Id(id), Markup.Serial(serial), Markup.Result(result)) => |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
260 |
Some((id, serial, result)) |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
261 |
case _ => None |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
262 |
} |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
263 |
} |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
264 |
|
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
265 |
object Dialog |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
266 |
{ |
52531 | 267 |
def unapply(tree: XML.Tree): Option[(Document_ID.Generic, Long, String)] = |
50500
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
268 |
tree match { |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
269 |
case XML.Elem(Markup(Markup.DIALOG, Dialog_Args(id, serial, result)), _) => |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
270 |
Some((id, serial, result)) |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
271 |
case _ => None |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
272 |
} |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
273 |
} |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
274 |
|
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
275 |
object Dialog_Result |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
276 |
{ |
52531 | 277 |
def apply(id: Document_ID.Generic, serial: Long, result: String): XML.Elem = |
50501
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
278 |
{ |
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
279 |
val props = Position.Id(id) ::: Markup.Serial(serial) |
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
280 |
XML.Elem(Markup(Markup.RESULT, props), List(XML.Text(result))) |
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
281 |
} |
50500
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
282 |
|
50501
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
283 |
def unapply(tree: XML.Tree): Option[String] = |
50500
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
284 |
tree match { |
50501
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
wenzelm
parents:
50500
diff
changeset
|
285 |
case XML.Elem(Markup(Markup.RESULT, _), List(XML.Text(result))) => Some(result) |
50500
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
286 |
case _ => None |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
287 |
} |
c94bba7906d2
identify dialogs via official serial and maintain as result message;
wenzelm
parents:
50498
diff
changeset
|
288 |
} |
39170
04ad0fed81f5
Isar_Document.reported_positions: exclude proof state output;
wenzelm
parents:
39042
diff
changeset
|
289 |
|
39511 | 290 |
|
291 |
/* reported positions */ |
|
292 |
||
55646 | 293 |
private val position_elements = |
55820
61869776ce1f
tuned signature -- more explicit Document.Elements;
wenzelm
parents:
55783
diff
changeset
|
294 |
Document.Elements(Markup.BINDING, Markup.ENTITY, Markup.REPORT, Markup.POSITION) |
39441
4110cc1b8f9f
allow embedded reports in regular prover messages, to avoid side-effects for errors for example;
wenzelm
parents:
39439
diff
changeset
|
295 |
|
55433
d2960d67f163
clarified message_positions: cover alt_id as well;
wenzelm
parents:
55432
diff
changeset
|
296 |
def message_positions( |
56295
a40e67ce4f84
clarified valid_id: always standardize towards static command.id;
wenzelm
parents:
55884
diff
changeset
|
297 |
valid_id: Document_ID.Generic => Boolean, |
55433
d2960d67f163
clarified message_positions: cover alt_id as well;
wenzelm
parents:
55432
diff
changeset
|
298 |
chunk: Command.Chunk, |
d2960d67f163
clarified message_positions: cover alt_id as well;
wenzelm
parents:
55432
diff
changeset
|
299 |
message: XML.Elem): Set[Text.Range] = |
38887
1261481ef5e5
Command.State: add reported positions to markup tree, according main message position or Markup.binding/entity/report occurrences in body;
wenzelm
parents:
38581
diff
changeset
|
300 |
{ |
55433
d2960d67f163
clarified message_positions: cover alt_id as well;
wenzelm
parents:
55432
diff
changeset
|
301 |
def elem_positions(props: Properties.T, set: Set[Text.Range]): Set[Text.Range] = |
d2960d67f163
clarified message_positions: cover alt_id as well;
wenzelm
parents:
55432
diff
changeset
|
302 |
props match { |
55884
f2c0eaedd579
tuned signature -- emphasize symbol positions (prover) vs. decoded text offsets (editor);
wenzelm
parents:
55822
diff
changeset
|
303 |
case Position.Reported(id, file_name, symbol_range) |
56295
a40e67ce4f84
clarified valid_id: always standardize towards static command.id;
wenzelm
parents:
55884
diff
changeset
|
304 |
if valid_id(id) && file_name == chunk.file_name => |
55884
f2c0eaedd579
tuned signature -- emphasize symbol positions (prover) vs. decoded text offsets (editor);
wenzelm
parents:
55822
diff
changeset
|
305 |
chunk.incorporate(symbol_range) match { |
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:
55820
diff
changeset
|
306 |
case Some(range) => set + range |
55548
a645277885cf
more uniform/robust restriction of reported positions, e.g. relevant for "bad" markup due to unclosed comment in ML file;
wenzelm
parents:
55433
diff
changeset
|
307 |
case _ => set |
a645277885cf
more uniform/robust restriction of reported positions, e.g. relevant for "bad" markup due to unclosed comment in ML file;
wenzelm
parents:
55433
diff
changeset
|
308 |
} |
55433
d2960d67f163
clarified message_positions: cover alt_id as well;
wenzelm
parents:
55432
diff
changeset
|
309 |
case _ => set |
d2960d67f163
clarified message_positions: cover alt_id as well;
wenzelm
parents:
55432
diff
changeset
|
310 |
} |
50157 | 311 |
|
39441
4110cc1b8f9f
allow embedded reports in regular prover messages, to avoid side-effects for errors for example;
wenzelm
parents:
39439
diff
changeset
|
312 |
def positions(set: Set[Text.Range], tree: XML.Tree): Set[Text.Range] = |
38887
1261481ef5e5
Command.State: add reported positions to markup tree, according main message position or Markup.binding/entity/report occurrences in body;
wenzelm
parents:
38581
diff
changeset
|
313 |
tree match { |
55433
d2960d67f163
clarified message_positions: cover alt_id as well;
wenzelm
parents:
55432
diff
changeset
|
314 |
case XML.Wrapped_Elem(Markup(name, props), _, body) => |
55646 | 315 |
body.foldLeft(if (position_elements(name)) elem_positions(props, set) else set)(positions) |
55433
d2960d67f163
clarified message_positions: cover alt_id as well;
wenzelm
parents:
55432
diff
changeset
|
316 |
case XML.Elem(Markup(name, props), body) => |
55646 | 317 |
body.foldLeft(if (position_elements(name)) elem_positions(props, set) else set)(positions) |
55433
d2960d67f163
clarified message_positions: cover alt_id as well;
wenzelm
parents:
55432
diff
changeset
|
318 |
case XML.Text(_) => set |
38887
1261481ef5e5
Command.State: add reported positions to markup tree, according main message position or Markup.binding/entity/report occurrences in body;
wenzelm
parents:
38581
diff
changeset
|
319 |
} |
50157 | 320 |
|
39441
4110cc1b8f9f
allow embedded reports in regular prover messages, to avoid side-effects for errors for example;
wenzelm
parents:
39439
diff
changeset
|
321 |
val set = positions(Set.empty, message) |
55433
d2960d67f163
clarified message_positions: cover alt_id as well;
wenzelm
parents:
55432
diff
changeset
|
322 |
if (set.isEmpty) elem_positions(message.markup.properties, set) |
39042
470fd769ae53
Isar_Document.reported_positions: more precise include/exclude, include root as last resort only;
wenzelm
parents:
38887
diff
changeset
|
323 |
else set |
38887
1261481ef5e5
Command.State: add reported positions to markup tree, according main message position or Markup.binding/entity/report occurrences in body;
wenzelm
parents:
38581
diff
changeset
|
324 |
} |
38412
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
wenzelm
parents:
diff
changeset
|
325 |
} |
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
wenzelm
parents:
diff
changeset
|
326 |
|
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
wenzelm
parents:
diff
changeset
|
327 |
|
45709
87017fcbad83
clarified modules (again) -- NB: both Document and Protocol are specific to this particular prover;
wenzelm
parents:
45672
diff
changeset
|
328 |
trait Protocol extends Isabelle_Process |
38412
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
wenzelm
parents:
diff
changeset
|
329 |
{ |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54515
diff
changeset
|
330 |
/* inlined files */ |
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54515
diff
changeset
|
331 |
|
56335
8953d4cc060a
store blob content within document node: aux. files that were once open are made persistent;
wenzelm
parents:
56306
diff
changeset
|
332 |
def define_blob(digest: SHA1.Digest, bytes: Bytes): Unit = |
8953d4cc060a
store blob content within document node: aux. files that were once open are made persistent;
wenzelm
parents:
56306
diff
changeset
|
333 |
protocol_command_raw("Document.define_blob", Bytes(digest.toString), bytes) |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54515
diff
changeset
|
334 |
|
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54515
diff
changeset
|
335 |
|
38412
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
wenzelm
parents:
diff
changeset
|
336 |
/* commands */ |
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
wenzelm
parents:
diff
changeset
|
337 |
|
44644
317e4962dd0f
clarified define_command: store name as structural information;
wenzelm
parents:
44615
diff
changeset
|
338 |
def define_command(command: Command): Unit = |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54515
diff
changeset
|
339 |
{ |
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54515
diff
changeset
|
340 |
val blobs_yxml = |
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54515
diff
changeset
|
341 |
{ import XML.Encode._ |
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54515
diff
changeset
|
342 |
val encode_blob: T[Command.Blob] = |
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54515
diff
changeset
|
343 |
variant(List( |
54526 | 344 |
{ case Exn.Res((a, b)) => |
55431
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55429
diff
changeset
|
345 |
(Nil, pair(string, option(string))((a.node, b.map(p => p._1.toString)))) }, |
54526 | 346 |
{ case Exn.Exn(e) => (Nil, string(Exn.message(e))) })) |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54515
diff
changeset
|
347 |
YXML.string_of_body(list(encode_blob)(command.blobs)) |
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54515
diff
changeset
|
348 |
} |
52582 | 349 |
protocol_command("Document.define_command", |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54515
diff
changeset
|
350 |
Document_ID(command.id), encode(command.name), blobs_yxml, encode(command.source)) |
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54515
diff
changeset
|
351 |
} |
38412
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
wenzelm
parents:
diff
changeset
|
352 |
|
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
wenzelm
parents:
diff
changeset
|
353 |
|
52931
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
wenzelm
parents:
52862
diff
changeset
|
354 |
/* execution */ |
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
wenzelm
parents:
52862
diff
changeset
|
355 |
|
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
wenzelm
parents:
52862
diff
changeset
|
356 |
def discontinue_execution(): Unit = |
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
wenzelm
parents:
52862
diff
changeset
|
357 |
protocol_command("Document.discontinue_execution") |
38412
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
wenzelm
parents:
diff
changeset
|
358 |
|
52931
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
wenzelm
parents:
52862
diff
changeset
|
359 |
def cancel_exec(id: Document_ID.Exec): Unit = |
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
wenzelm
parents:
52862
diff
changeset
|
360 |
protocol_command("Document.cancel_exec", Document_ID(id)) |
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
wenzelm
parents:
52862
diff
changeset
|
361 |
|
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
wenzelm
parents:
52862
diff
changeset
|
362 |
|
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
wenzelm
parents:
52862
diff
changeset
|
363 |
/* document versions */ |
47343
b8aeab386414
less aggressive discontinue_execution before document update, to avoid unstable execs that need to be re-assigned;
wenzelm
parents:
46938
diff
changeset
|
364 |
|
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
365 |
def update(old_id: Document_ID.Version, new_id: Document_ID.Version, |
44383 | 366 |
edits: List[Document.Edit_Command]) |
38412
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
wenzelm
parents:
diff
changeset
|
367 |
{ |
44157
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
368 |
val edits_yxml = |
43767 | 369 |
{ import XML.Encode._ |
44383 | 370 |
def id: T[Command] = (cmd => long(cmd.id)) |
46737 | 371 |
def encode_edit(name: Document.Node.Name) |
52849 | 372 |
: T[Document.Node.Edit[Command.Edit, Command.Perspective]] = |
44979
68b990e950b1
explicit master_dir as part of header -- still required (for Cygwin) since Scala layer does not pass file content yet;
wenzelm
parents:
44866
diff
changeset
|
373 |
variant(List( |
68b990e950b1
explicit master_dir as part of header -- still required (for Cygwin) since Scala layer does not pass file content yet;
wenzelm
parents:
44866
diff
changeset
|
374 |
{ case Document.Node.Edits(a) => (Nil, list(pair(option(id), option(id)))(a)) }, |
48707
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
48705
diff
changeset
|
375 |
{ case Document.Node.Deps(header) => |
54515 | 376 |
val master_dir = Isabelle_System.posix_path(name.master_dir) |
48707
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
48705
diff
changeset
|
377 |
val imports = header.imports.map(_.node) |
50128
599c935aac82
alternative completion for outer syntax keywords;
wenzelm
parents:
49650
diff
changeset
|
378 |
val keywords = header.keywords.map({ case (a, b, _) => (a, b) }) |
44979
68b990e950b1
explicit master_dir as part of header -- still required (for Cygwin) since Scala layer does not pass file content yet;
wenzelm
parents:
44866
diff
changeset
|
379 |
(Nil, |
48707
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
48705
diff
changeset
|
380 |
pair(Encode.string, pair(Encode.string, pair(list(Encode.string), |
48864
3ee314ae1e0a
added keyword kind "thy_load" (with optional list of file extensions);
wenzelm
parents:
48755
diff
changeset
|
381 |
pair(list(pair(Encode.string, |
3ee314ae1e0a
added keyword kind "thy_load" (with optional list of file extensions);
wenzelm
parents:
48755
diff
changeset
|
382 |
option(pair(pair(Encode.string, list(Encode.string)), list(Encode.string))))), |
51294
0850d43cb355
discontinued obsolete header "files" -- these are loaded explicitly after exploring dependencies;
wenzelm
parents:
51293
diff
changeset
|
383 |
list(Encode.string)))))( |
54515 | 384 |
(master_dir, (name.theory, (imports, (keywords, header.errors)))))) }, |
52849 | 385 |
{ case Document.Node.Perspective(a, b, c) => |
386 |
(bool_atom(a) :: b.commands.map(cmd => long_atom(cmd.id)), |
|
52862
930ce8eacb87
tuned signature -- more uniform treatment of overlays as command mapping;
wenzelm
parents:
52849
diff
changeset
|
387 |
list(pair(id, pair(Encode.string, list(Encode.string))))(c.dest)) })) |
48705
dd32321d6eef
tuned signature -- slightly more abstract text representation of prover process;
wenzelm
parents:
47542
diff
changeset
|
388 |
def encode_edits: T[List[Document.Edit_Command]] = list((node_edit: Document.Edit_Command) => |
44979
68b990e950b1
explicit master_dir as part of header -- still required (for Cygwin) since Scala layer does not pass file content yet;
wenzelm
parents:
44866
diff
changeset
|
389 |
{ |
68b990e950b1
explicit master_dir as part of header -- still required (for Cygwin) since Scala layer does not pass file content yet;
wenzelm
parents:
44866
diff
changeset
|
390 |
val (name, edit) = node_edit |
46737 | 391 |
pair(string, encode_edit(name))(name.node, edit) |
44979
68b990e950b1
explicit master_dir as part of header -- still required (for Cygwin) since Scala layer does not pass file content yet;
wenzelm
parents:
44866
diff
changeset
|
392 |
}) |
48705
dd32321d6eef
tuned signature -- slightly more abstract text representation of prover process;
wenzelm
parents:
47542
diff
changeset
|
393 |
YXML.string_of_body(encode_edits(edits)) } |
52582 | 394 |
protocol_command("Document.update", Document_ID(old_id), Document_ID(new_id), edits_yxml) |
38412
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
wenzelm
parents:
diff
changeset
|
395 |
} |
43748 | 396 |
|
44673 | 397 |
def remove_versions(versions: List[Document.Version]) |
398 |
{ |
|
399 |
val versions_yxml = |
|
400 |
{ import XML.Encode._ |
|
401 |
YXML.string_of_body(list(long)(versions.map(_.id))) } |
|
52582 | 402 |
protocol_command("Document.remove_versions", versions_yxml) |
44673 | 403 |
} |
404 |
||
43748 | 405 |
|
50498 | 406 |
/* dialog via document content */ |
407 |
||
52931
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
wenzelm
parents:
52862
diff
changeset
|
408 |
def dialog_result(serial: Long, result: String): Unit = |
52582 | 409 |
protocol_command("Document.dialog_result", Properties.Value.Long(serial), result) |
38412
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
wenzelm
parents:
diff
changeset
|
410 |
} |