| author | wenzelm | 
| Thu, 11 Jan 2018 13:48:17 +0100 | |
| changeset 67405 | e9ab4ad7bd15 | 
| parent 67219 | 81e9804b2014 | 
| child 67471 | bddfa23a4ea9 | 
| permissions | -rw-r--r-- | 
| 45709 
87017fcbad83
clarified modules (again) -- NB: both Document and Protocol are specific to this particular prover;
 wenzelm parents: 
45672diff
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: 
45672diff
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: 
45672diff
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: 
38483diff
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: 
44474diff
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: 
44644diff
changeset | 17 |       try {
 | 
| 
383c9d758a56
raw message function "assign_execs" avoids full overhead of decoding and caching message body;
 wenzelm parents: 
44644diff
changeset | 18 | import XML.Decode._ | 
| 65345 
2fdd4431b30e
clarified YXML vs. symbol encoding: operate on whole message;
 wenzelm parents: 
65313diff
changeset | 19 | Some(pair(long, list(pair(long, list(long))))(Symbol.decode_yxml(text))) | 
| 44661 
383c9d758a56
raw message function "assign_execs" avoids full overhead of decoding and caching message body;
 wenzelm parents: 
44644diff
changeset | 20 | } | 
| 
383c9d758a56
raw message function "assign_execs" avoids full overhead of decoding and caching message body;
 wenzelm parents: 
44644diff
changeset | 21 |       catch {
 | 
| 
383c9d758a56
raw message function "assign_execs" avoids full overhead of decoding and caching message body;
 wenzelm parents: 
44644diff
changeset | 22 | case ERROR(_) => None | 
| 51987 | 23 | case _: XML.Error => None | 
| 38412 
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
 wenzelm parents: diff
changeset | 24 | } | 
| 
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
 wenzelm parents: diff
changeset | 25 | } | 
| 38567 
b670faa807c9
concentrate protocol message formats in Isar_Document;
 wenzelm parents: 
38483diff
changeset | 26 | |
| 44676 | 27 | object Removed | 
| 28 |   {
 | |
| 52530 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 wenzelm parents: 
52527diff
changeset | 29 | def unapply(text: String): Option[List[Document_ID.Version]] = | 
| 44676 | 30 |       try {
 | 
| 31 | import XML.Decode._ | |
| 65345 
2fdd4431b30e
clarified YXML vs. symbol encoding: operate on whole message;
 wenzelm parents: 
65313diff
changeset | 32 | Some(list(long)(Symbol.decode_yxml(text))) | 
| 44676 | 33 | } | 
| 34 |       catch {
 | |
| 35 | case ERROR(_) => None | |
| 51987 | 36 | case _: XML.Error => None | 
| 44676 | 37 | } | 
| 38 | } | |
| 39 | ||
| 38567 
b670faa807c9
concentrate protocol message formats in Isar_Document;
 wenzelm parents: 
38483diff
changeset | 40 | |
| 46209 | 41 | /* command status */ | 
| 38567 
b670faa807c9
concentrate protocol message formats in Isar_Document;
 wenzelm parents: 
38483diff
changeset | 42 | |
| 56359 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 43 | object Status | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 44 |   {
 | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 45 | def make(markup_iterator: Iterator[Markup]): Status = | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 46 |     {
 | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 47 | var touched = false | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 48 | var accepted = false | 
| 56395 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 49 | var warned = false | 
| 56359 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 50 | var failed = false | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 51 | var forks = 0 | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 52 | var runs = 0 | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 53 |       for (markup <- markup_iterator) {
 | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 54 |         markup.name match {
 | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 55 | case Markup.ACCEPTED => accepted = true | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 56 | case Markup.FORKED => touched = true; forks += 1 | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 57 | case Markup.JOINED => forks -= 1 | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 58 | case Markup.RUNNING => touched = true; runs += 1 | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 59 | case Markup.FINISHED => runs -= 1 | 
| 59203 
5f0bd5afc16d
explicit message channel for "legacy", which is nonetheless a variant of "warning";
 wenzelm parents: 
59184diff
changeset | 60 | case Markup.WARNING | Markup.LEGACY => warned = true | 
| 56395 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 61 | case Markup.FAILED | Markup.ERROR => failed = true | 
| 56359 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 62 | case _ => | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 63 | } | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 64 | } | 
| 56395 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 65 | Status(touched, accepted, warned, failed, forks, runs) | 
| 56359 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 66 | } | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 67 | |
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 68 | val empty = make(Iterator.empty) | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 69 | |
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 70 | def merge(status_iterator: Iterator[Status]): Status = | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 71 |       if (status_iterator.hasNext) {
 | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 72 | val status0 = status_iterator.next | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 73 | (status0 /: status_iterator)(_ + _) | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 74 | } | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 75 | else empty | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 76 | } | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 77 | |
| 46166 | 78 | sealed case class Status( | 
| 56352 
abdc524db8b4
more frugal command_status, which is often used in a tight loop;
 wenzelm parents: 
56335diff
changeset | 79 | private val touched: Boolean, | 
| 
abdc524db8b4
more frugal command_status, which is often used in a tight loop;
 wenzelm parents: 
56335diff
changeset | 80 | private val accepted: Boolean, | 
| 56395 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 81 | private val warned: Boolean, | 
| 56352 
abdc524db8b4
more frugal command_status, which is often used in a tight loop;
 wenzelm parents: 
56335diff
changeset | 82 | private val failed: Boolean, | 
| 
abdc524db8b4
more frugal command_status, which is often used in a tight loop;
 wenzelm parents: 
56335diff
changeset | 83 | forks: Int, | 
| 
abdc524db8b4
more frugal command_status, which is often used in a tight loop;
 wenzelm parents: 
56335diff
changeset | 84 | runs: Int) | 
| 38567 
b670faa807c9
concentrate protocol message formats in Isar_Document;
 wenzelm parents: 
38483diff
changeset | 85 |   {
 | 
| 56359 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 86 | def + (that: Status): Status = | 
| 56395 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 87 | Status( | 
| 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 88 | touched || that.touched, | 
| 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 89 | accepted || that.accepted, | 
| 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 90 | warned || that.warned, | 
| 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 91 | failed || that.failed, | 
| 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 92 | forks + that.forks, | 
| 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 93 | runs + that.runs) | 
| 56359 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 94 | |
| 49036 
4680c4046814
further refinement of command status, to accomodate forked proofs;
 wenzelm parents: 
49009diff
changeset | 95 | def is_unprocessed: Boolean = accepted && !failed && (!touched || (forks != 0 && runs == 0)) | 
| 
4680c4046814
further refinement of command status, to accomodate forked proofs;
 wenzelm parents: 
49009diff
changeset | 96 | def is_running: Boolean = runs != 0 | 
| 56474 
4df2727a0b5f
more direct interpretation of "warned" status, like "failed" and independently of "finished", e.g. relevant for Rendering.overview_color of aux. files where main command status is unavailable (amending 0546e036d1c0);
 wenzelm parents: 
56470diff
changeset | 97 | def is_warned: Boolean = warned | 
| 
4df2727a0b5f
more direct interpretation of "warned" status, like "failed" and independently of "finished", e.g. relevant for Rendering.overview_color of aux. files where main command status is unavailable (amending 0546e036d1c0);
 wenzelm parents: 
56470diff
changeset | 98 | def is_failed: Boolean = failed | 
| 49039 | 99 | def is_finished: Boolean = !failed && touched && forks == 0 && runs == 0 | 
| 46166 | 100 | } | 
| 101 | ||
| 56395 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 102 | val proper_status_elements = | 
| 56743 | 103 | Markup.Elements(Markup.ACCEPTED, Markup.FORKED, Markup.JOINED, Markup.RUNNING, | 
| 55646 | 104 | Markup.FINISHED, Markup.FAILED) | 
| 105 | ||
| 56395 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 106 | val liberal_status_elements = | 
| 59203 
5f0bd5afc16d
explicit message channel for "legacy", which is nonetheless a variant of "warning";
 wenzelm parents: 
59184diff
changeset | 107 | proper_status_elements + Markup.WARNING + Markup.LEGACY + Markup.ERROR | 
| 55646 | 108 | |
| 46209 | 109 | |
| 51818 
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
 wenzelm parents: 
51533diff
changeset | 110 | /* command timing */ | 
| 
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
 wenzelm parents: 
51533diff
changeset | 111 | |
| 
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
 wenzelm parents: 
51533diff
changeset | 112 | object Command_Timing | 
| 
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
 wenzelm parents: 
51533diff
changeset | 113 |   {
 | 
| 52531 | 114 | 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: 
51533diff
changeset | 115 |       props match {
 | 
| 66873 
9953ae603a23
provide theory timing information, similar to command timing but always considered relevant;
 wenzelm parents: 
66717diff
changeset | 116 | case Markup.COMMAND_TIMING :: args => | 
| 51818 
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
 wenzelm parents: 
51533diff
changeset | 117 |           (args, args) match {
 | 
| 
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
 wenzelm parents: 
51533diff
changeset | 118 | case (Position.Id(id), Markup.Timing_Properties(timing)) => Some((id, timing)) | 
| 
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
 wenzelm parents: 
51533diff
changeset | 119 | case _ => None | 
| 
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
 wenzelm parents: 
51533diff
changeset | 120 | } | 
| 
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
 wenzelm parents: 
51533diff
changeset | 121 | case _ => None | 
| 
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
 wenzelm parents: 
51533diff
changeset | 122 | } | 
| 
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
 wenzelm parents: 
51533diff
changeset | 123 | } | 
| 
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
 wenzelm parents: 
51533diff
changeset | 124 | |
| 
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
 wenzelm parents: 
51533diff
changeset | 125 | |
| 66873 
9953ae603a23
provide theory timing information, similar to command timing but always considered relevant;
 wenzelm parents: 
66717diff
changeset | 126 | /* theory timing */ | 
| 
9953ae603a23
provide theory timing information, similar to command timing but always considered relevant;
 wenzelm parents: 
66717diff
changeset | 127 | |
| 
9953ae603a23
provide theory timing information, similar to command timing but always considered relevant;
 wenzelm parents: 
66717diff
changeset | 128 | object Theory_Timing | 
| 
9953ae603a23
provide theory timing information, similar to command timing but always considered relevant;
 wenzelm parents: 
66717diff
changeset | 129 |   {
 | 
| 
9953ae603a23
provide theory timing information, similar to command timing but always considered relevant;
 wenzelm parents: 
66717diff
changeset | 130 | def unapply(props: Properties.T): Option[(String, isabelle.Timing)] = | 
| 
9953ae603a23
provide theory timing information, similar to command timing but always considered relevant;
 wenzelm parents: 
66717diff
changeset | 131 |       props match {
 | 
| 
9953ae603a23
provide theory timing information, similar to command timing but always considered relevant;
 wenzelm parents: 
66717diff
changeset | 132 | case Markup.THEORY_TIMING :: args => | 
| 
9953ae603a23
provide theory timing information, similar to command timing but always considered relevant;
 wenzelm parents: 
66717diff
changeset | 133 |           (args, args) match {
 | 
| 
9953ae603a23
provide theory timing information, similar to command timing but always considered relevant;
 wenzelm parents: 
66717diff
changeset | 134 | case (Markup.Name(name), Markup.Timing_Properties(timing)) => Some((name, timing)) | 
| 
9953ae603a23
provide theory timing information, similar to command timing but always considered relevant;
 wenzelm parents: 
66717diff
changeset | 135 | case _ => None | 
| 
9953ae603a23
provide theory timing information, similar to command timing but always considered relevant;
 wenzelm parents: 
66717diff
changeset | 136 | } | 
| 
9953ae603a23
provide theory timing information, similar to command timing but always considered relevant;
 wenzelm parents: 
66717diff
changeset | 137 | case _ => None | 
| 
9953ae603a23
provide theory timing information, similar to command timing but always considered relevant;
 wenzelm parents: 
66717diff
changeset | 138 | } | 
| 
9953ae603a23
provide theory timing information, similar to command timing but always considered relevant;
 wenzelm parents: 
66717diff
changeset | 139 | } | 
| 
9953ae603a23
provide theory timing information, similar to command timing but always considered relevant;
 wenzelm parents: 
66717diff
changeset | 140 | |
| 
9953ae603a23
provide theory timing information, similar to command timing but always considered relevant;
 wenzelm parents: 
66717diff
changeset | 141 | |
| 46209 | 142 | /* node status */ | 
| 143 | ||
| 46688 | 144 | sealed case class Node_Status( | 
| 66410 | 145 | unprocessed: Int, running: Int, warned: Int, failed: Int, finished: Int, consolidated: Boolean) | 
| 44866 | 146 |   {
 | 
| 56474 
4df2727a0b5f
more direct interpretation of "warned" status, like "failed" and independently of "finished", e.g. relevant for Rendering.overview_color of aux. files where main command status is unavailable (amending 0546e036d1c0);
 wenzelm parents: 
56470diff
changeset | 147 | def total: Int = unprocessed + running + warned + failed + finished | 
| 66411 | 148 | def ok: Boolean = failed == 0 | 
| 44866 | 149 | } | 
| 44613 | 150 | |
| 151 | def node_status( | |
| 66410 | 152 | state: Document.State, | 
| 153 | version: Document.Version, | |
| 154 | name: Document.Node.Name, | |
| 155 | node: Document.Node): Node_Status = | |
| 44613 | 156 |   {
 | 
| 157 | var unprocessed = 0 | |
| 158 | var running = 0 | |
| 46688 | 159 | var warned = 0 | 
| 44613 | 160 | var failed = 0 | 
| 56474 
4df2727a0b5f
more direct interpretation of "warned" status, like "failed" and independently of "finished", e.g. relevant for Rendering.overview_color of aux. files where main command status is unavailable (amending 0546e036d1c0);
 wenzelm parents: 
56470diff
changeset | 161 | var finished = 0 | 
| 56356 
c3dbaa155ece
tuned for-comprehensions -- less structure mapping;
 wenzelm parents: 
56355diff
changeset | 162 |     for (command <- node.commands.iterator) {
 | 
| 56355 
1a9f569b5b7e
some rephrasing to ensure that this becomes cheap "foreach" and not expensive "map" (cf. 0fc032898b05);
 wenzelm parents: 
56353diff
changeset | 163 | val states = state.command_states(version, command) | 
| 56359 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 164 | 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: 
56353diff
changeset | 165 | |
| 56299 
8201790fdeb9
more careful treatment of multiple command states (eval + prints): merge content that is actually required;
 wenzelm parents: 
56295diff
changeset | 166 | if (status.is_running) running += 1 | 
| 57843 
d8966c09025c
proper priority for error over warning also for node_status (see 9c5220e05e04);
 wenzelm parents: 
56801diff
changeset | 167 | else if (status.is_failed) failed += 1 | 
| 56395 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 168 | else if (status.is_warned) warned += 1 | 
| 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 169 | else if (status.is_finished) finished += 1 | 
| 56299 
8201790fdeb9
more careful treatment of multiple command states (eval + prints): merge content that is actually required;
 wenzelm parents: 
56295diff
changeset | 170 | else unprocessed += 1 | 
| 
8201790fdeb9
more careful treatment of multiple command states (eval + prints): merge content that is actually required;
 wenzelm parents: 
56295diff
changeset | 171 | } | 
| 66410 | 172 | val consolidated = state.node_consolidated(version, name) | 
| 173 | ||
| 174 | Node_Status(unprocessed, running, warned, failed, finished, consolidated) | |
| 44613 | 175 | } | 
| 176 | ||
| 38887 
1261481ef5e5
Command.State: add reported positions to markup tree, according main message position or Markup.binding/entity/report occurrences in body;
 wenzelm parents: 
38581diff
changeset | 177 | |
| 51533 | 178 | /* node timing */ | 
| 179 | ||
| 180 | sealed case class Node_Timing(total: Double, commands: Map[Command, Double]) | |
| 181 | ||
| 182 | val empty_node_timing = Node_Timing(0.0, Map.empty) | |
| 183 | ||
| 184 | def node_timing( | |
| 185 | state: Document.State, | |
| 186 | version: Document.Version, | |
| 187 | node: Document.Node, | |
| 188 | threshold: Double): Node_Timing = | |
| 189 |   {
 | |
| 190 | var total = 0.0 | |
| 191 | var commands = Map.empty[Command, Double] | |
| 192 |     for {
 | |
| 193 | command <- node.commands.iterator | |
| 56299 
8201790fdeb9
more careful treatment of multiple command states (eval + prints): merge content that is actually required;
 wenzelm parents: 
56295diff
changeset | 194 | st <- state.command_states(version, command) | 
| 56356 
c3dbaa155ece
tuned for-comprehensions -- less structure mapping;
 wenzelm parents: 
56355diff
changeset | 195 |     } {
 | 
| 
c3dbaa155ece
tuned for-comprehensions -- less structure mapping;
 wenzelm parents: 
56355diff
changeset | 196 | val command_timing = | 
| 51533 | 197 |         (0.0 /: st.status)({
 | 
| 198 | case (timing, Markup.Timing(t)) => timing + t.elapsed.seconds | |
| 199 | case (timing, _) => timing | |
| 200 | }) | |
| 201 | total += command_timing | |
| 202 | if (command_timing >= threshold) commands += (command -> command_timing) | |
| 203 | } | |
| 204 | Node_Timing(total, commands) | |
| 205 | } | |
| 206 | ||
| 207 | ||
| 39441 
4110cc1b8f9f
allow embedded reports in regular prover messages, to avoid side-effects for errors for example;
 wenzelm parents: 
39439diff
changeset | 208 | /* result messages */ | 
| 39439 
1c294d150ded
eliminated markup "location" in favour of more explicit "no_report", which is actually deleted from messages;
 wenzelm parents: 
39181diff
changeset | 209 | |
| 50500 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 210 | def is_result(msg: XML.Tree): Boolean = | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 211 |     msg match {
 | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 212 | case XML.Elem(Markup(Markup.RESULT, _), _) => true | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 213 | case _ => false | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 214 | } | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 215 | |
| 50157 | 216 | def is_tracing(msg: XML.Tree): Boolean = | 
| 39622 
53365ba766ac
Command.accumulate: refrain from adding tracing messages to markup tree -- potential scalability problem;
 wenzelm parents: 
39511diff
changeset | 217 |     msg match {
 | 
| 50201 
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
 wenzelm parents: 
50157diff
changeset | 218 | case XML.Elem(Markup(Markup.TRACING, _), _) => true | 
| 
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
 wenzelm parents: 
50157diff
changeset | 219 | 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: 
39511diff
changeset | 220 | case _ => false | 
| 
53365ba766ac
Command.accumulate: refrain from adding tracing messages to markup tree -- potential scalability problem;
 wenzelm parents: 
39511diff
changeset | 221 | } | 
| 
53365ba766ac
Command.accumulate: refrain from adding tracing messages to markup tree -- potential scalability problem;
 wenzelm parents: 
39511diff
changeset | 222 | |
| 59184 
830bb7ddb3ab
explicit message channels for "state", "information";
 wenzelm parents: 
59085diff
changeset | 223 | def is_state(msg: XML.Tree): Boolean = | 
| 50500 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 224 |     msg match {
 | 
| 59184 
830bb7ddb3ab
explicit message channels for "state", "information";
 wenzelm parents: 
59085diff
changeset | 225 | case XML.Elem(Markup(Markup.STATE, _), _) => true | 
| 
830bb7ddb3ab
explicit message channels for "state", "information";
 wenzelm parents: 
59085diff
changeset | 226 | case XML.Elem(Markup(Markup.STATE_MESSAGE, _), _) => true | 
| 
830bb7ddb3ab
explicit message channels for "state", "information";
 wenzelm parents: 
59085diff
changeset | 227 | case _ => false | 
| 
830bb7ddb3ab
explicit message channels for "state", "information";
 wenzelm parents: 
59085diff
changeset | 228 | } | 
| 
830bb7ddb3ab
explicit message channels for "state", "information";
 wenzelm parents: 
59085diff
changeset | 229 | |
| 
830bb7ddb3ab
explicit message channels for "state", "information";
 wenzelm parents: 
59085diff
changeset | 230 | def is_information(msg: XML.Tree): Boolean = | 
| 
830bb7ddb3ab
explicit message channels for "state", "information";
 wenzelm parents: 
59085diff
changeset | 231 |     msg match {
 | 
| 
830bb7ddb3ab
explicit message channels for "state", "information";
 wenzelm parents: 
59085diff
changeset | 232 | case XML.Elem(Markup(Markup.INFORMATION, _), _) => true | 
| 
830bb7ddb3ab
explicit message channels for "state", "information";
 wenzelm parents: 
59085diff
changeset | 233 | case XML.Elem(Markup(Markup.INFORMATION_MESSAGE, _), _) => true | 
| 50500 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 234 | case _ => false | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 235 | } | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 236 | |
| 39511 | 237 | def is_warning(msg: XML.Tree): Boolean = | 
| 238 |     msg match {
 | |
| 50201 
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
 wenzelm parents: 
50157diff
changeset | 239 | case XML.Elem(Markup(Markup.WARNING, _), _) => true | 
| 
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
 wenzelm parents: 
50157diff
changeset | 240 | case XML.Elem(Markup(Markup.WARNING_MESSAGE, _), _) => true | 
| 39511 | 241 | case _ => false | 
| 242 | } | |
| 243 | ||
| 59203 
5f0bd5afc16d
explicit message channel for "legacy", which is nonetheless a variant of "warning";
 wenzelm parents: 
59184diff
changeset | 244 | def is_legacy(msg: XML.Tree): Boolean = | 
| 
5f0bd5afc16d
explicit message channel for "legacy", which is nonetheless a variant of "warning";
 wenzelm parents: 
59184diff
changeset | 245 |     msg match {
 | 
| 
5f0bd5afc16d
explicit message channel for "legacy", which is nonetheless a variant of "warning";
 wenzelm parents: 
59184diff
changeset | 246 | case XML.Elem(Markup(Markup.LEGACY, _), _) => true | 
| 
5f0bd5afc16d
explicit message channel for "legacy", which is nonetheless a variant of "warning";
 wenzelm parents: 
59184diff
changeset | 247 | case XML.Elem(Markup(Markup.LEGACY_MESSAGE, _), _) => true | 
| 
5f0bd5afc16d
explicit message channel for "legacy", which is nonetheless a variant of "warning";
 wenzelm parents: 
59184diff
changeset | 248 | case _ => false | 
| 
5f0bd5afc16d
explicit message channel for "legacy", which is nonetheless a variant of "warning";
 wenzelm parents: 
59184diff
changeset | 249 | } | 
| 
5f0bd5afc16d
explicit message channel for "legacy", which is nonetheless a variant of "warning";
 wenzelm parents: 
59184diff
changeset | 250 | |
| 39511 | 251 | def is_error(msg: XML.Tree): Boolean = | 
| 252 |     msg match {
 | |
| 50201 
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
 wenzelm parents: 
50157diff
changeset | 253 | case XML.Elem(Markup(Markup.ERROR, _), _) => true | 
| 
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
 wenzelm parents: 
50157diff
changeset | 254 | case XML.Elem(Markup(Markup.ERROR_MESSAGE, _), _) => true | 
| 39511 | 255 | case _ => false | 
| 256 | } | |
| 38887 
1261481ef5e5
Command.State: add reported positions to markup tree, according main message position or Markup.binding/entity/report occurrences in body;
 wenzelm parents: 
38581diff
changeset | 257 | |
| 56495 | 258 | def is_inlined(msg: XML.Tree): Boolean = | 
| 259 | !(is_result(msg) || is_tracing(msg) || is_state(msg)) | |
| 260 | ||
| 50500 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 261 | |
| 60882 | 262 | /* breakpoints */ | 
| 263 | ||
| 264 | object ML_Breakpoint | |
| 265 |   {
 | |
| 266 | def unapply(tree: XML.Tree): Option[Long] = | |
| 267 |     tree match {
 | |
| 268 | case XML.Elem(Markup(Markup.ML_BREAKPOINT, Markup.Serial(breakpoint)), _) => Some(breakpoint) | |
| 269 | case _ => None | |
| 270 | } | |
| 271 | } | |
| 272 | ||
| 273 | ||
| 50500 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 274 | /* dialogs */ | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 275 | |
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 276 | object Dialog_Args | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 277 |   {
 | 
| 52531 | 278 | 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: 
50498diff
changeset | 279 |       (props, props, props) match {
 | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 280 | case (Position.Id(id), Markup.Serial(serial), Markup.Result(result)) => | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 281 | Some((id, serial, result)) | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 282 | case _ => None | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 283 | } | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 284 | } | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 285 | |
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 286 | object Dialog | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 287 |   {
 | 
| 52531 | 288 | 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: 
50498diff
changeset | 289 |       tree match {
 | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 290 | case XML.Elem(Markup(Markup.DIALOG, Dialog_Args(id, serial, result)), _) => | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 291 | Some((id, serial, result)) | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 292 | case _ => None | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 293 | } | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 294 | } | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 295 | |
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 296 | object Dialog_Result | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 297 |   {
 | 
| 52531 | 298 | 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: 
50500diff
changeset | 299 |     {
 | 
| 
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
 wenzelm parents: 
50500diff
changeset | 300 | val props = Position.Id(id) ::: Markup.Serial(serial) | 
| 
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
 wenzelm parents: 
50500diff
changeset | 301 | 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: 
50500diff
changeset | 302 | } | 
| 50500 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 303 | |
| 50501 
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
 wenzelm parents: 
50500diff
changeset | 304 | def unapply(tree: XML.Tree): Option[String] = | 
| 50500 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 305 |       tree match {
 | 
| 50501 
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
 wenzelm parents: 
50500diff
changeset | 306 | 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: 
50498diff
changeset | 307 | case _ => None | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 308 | } | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 309 | } | 
| 38412 
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
 wenzelm parents: diff
changeset | 310 | } | 
| 
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
 wenzelm parents: diff
changeset | 311 | |
| 
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
 wenzelm parents: diff
changeset | 312 | |
| 57916 | 313 | trait Protocol | 
| 38412 
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
 wenzelm parents: diff
changeset | 314 | {
 | 
| 57916 | 315 | /* protocol commands */ | 
| 316 | ||
| 317 | def protocol_command_bytes(name: String, args: Bytes*): Unit | |
| 318 | def protocol_command(name: String, args: String*): Unit | |
| 319 | ||
| 320 | ||
| 56387 | 321 | /* options */ | 
| 322 | ||
| 323 | def options(opts: Options): Unit = | |
| 65345 
2fdd4431b30e
clarified YXML vs. symbol encoding: operate on whole message;
 wenzelm parents: 
65313diff
changeset | 324 |     protocol_command("Prover.options", Symbol.encode_yxml(opts.encode))
 | 
| 56387 | 325 | |
| 326 | ||
| 65470 | 327 | /* session base */ | 
| 328 | ||
| 329 | private def encode_table(table: List[(String, String)]): String = | |
| 330 |   {
 | |
| 331 | import XML.Encode._ | |
| 332 | Symbol.encode_yxml(list(pair(string, string))(table)) | |
| 333 | } | |
| 334 | ||
| 66712 | 335 | private def encode_list(lst: List[String]): String = | 
| 336 |   {
 | |
| 337 | import XML.Encode._ | |
| 338 | Symbol.encode_yxml(list(string)(lst)) | |
| 339 | } | |
| 340 | ||
| 66668 
6019cfb8256c
proper standard_path to revert platform_path in JEdit_Sessions.session_base;
 wenzelm parents: 
66411diff
changeset | 341 | def session_base(resources: Resources) | 
| 
6019cfb8256c
proper standard_path to revert platform_path in JEdit_Sessions.session_base;
 wenzelm parents: 
66411diff
changeset | 342 |   {
 | 
| 
6019cfb8256c
proper standard_path to revert platform_path in JEdit_Sessions.session_base;
 wenzelm parents: 
66411diff
changeset | 343 | val base = resources.session_base.standard_path | 
| 67219 | 344 |     protocol_command("Prover.init_session_base",
 | 
| 345 | encode_list(base.known.sessions.toList), | |
| 66668 
6019cfb8256c
proper standard_path to revert platform_path in JEdit_Sessions.session_base;
 wenzelm parents: 
66411diff
changeset | 346 | encode_table(base.global_theories.toList), | 
| 66717 
67dbf5cdc056
more informative loaded_theories: dependencies and syntax;
 wenzelm parents: 
66712diff
changeset | 347 | encode_list(base.loaded_theories.keys), | 
| 66668 
6019cfb8256c
proper standard_path to revert platform_path in JEdit_Sessions.session_base;
 wenzelm parents: 
66411diff
changeset | 348 | encode_table(base.dest_known_theories)) | 
| 
6019cfb8256c
proper standard_path to revert platform_path in JEdit_Sessions.session_base;
 wenzelm parents: 
66411diff
changeset | 349 | } | 
| 65470 | 350 | |
| 351 | ||
| 56387 | 352 | /* interned items */ | 
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54515diff
changeset | 353 | |
| 56335 
8953d4cc060a
store blob content within document node: aux. files that were once open are made persistent;
 wenzelm parents: 
56306diff
changeset | 354 | def define_blob(digest: SHA1.Digest, bytes: Bytes): Unit = | 
| 56387 | 355 |     protocol_command_bytes("Document.define_blob", Bytes(digest.toString), bytes)
 | 
| 38412 
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
 wenzelm parents: diff
changeset | 356 | |
| 59671 
9715eb8e9408
more precise position information in Isabelle/Scala, with YXML markup as in Isabelle/ML;
 wenzelm parents: 
59364diff
changeset | 357 | def define_command(command: Command) | 
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54515diff
changeset | 358 |   {
 | 
| 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54515diff
changeset | 359 | val blobs_yxml = | 
| 61376 
93224745477f
output HTML text according to Isabelle/Scala Symbol.Interpretation;
 wenzelm parents: 
60992diff
changeset | 360 |     {
 | 
| 
93224745477f
output HTML text according to Isabelle/Scala Symbol.Interpretation;
 wenzelm parents: 
60992diff
changeset | 361 | import XML.Encode._ | 
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54515diff
changeset | 362 | val encode_blob: T[Command.Blob] = | 
| 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54515diff
changeset | 363 | variant(List( | 
| 54526 | 364 |           { case Exn.Res((a, b)) =>
 | 
| 65345 
2fdd4431b30e
clarified YXML vs. symbol encoding: operate on whole message;
 wenzelm parents: 
65313diff
changeset | 365 | (Nil, pair(string, option(string))((a.node, b.map(p => p._1.toString)))) }, | 
| 
2fdd4431b30e
clarified YXML vs. symbol encoding: operate on whole message;
 wenzelm parents: 
65313diff
changeset | 366 |           { case Exn.Exn(e) => (Nil, string(Exn.message(e))) }))
 | 
| 59085 
08a6901eb035
clarified define_command: send tokens more directly, without requiring keywords in ML;
 wenzelm parents: 
58015diff
changeset | 367 | |
| 65345 
2fdd4431b30e
clarified YXML vs. symbol encoding: operate on whole message;
 wenzelm parents: 
65313diff
changeset | 368 | Symbol.encode_yxml(pair(list(encode_blob), int)(command.blobs, command.blobs_index)) | 
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54515diff
changeset | 369 | } | 
| 59085 
08a6901eb035
clarified define_command: send tokens more directly, without requiring keywords in ML;
 wenzelm parents: 
58015diff
changeset | 370 | |
| 
08a6901eb035
clarified define_command: send tokens more directly, without requiring keywords in ML;
 wenzelm parents: 
58015diff
changeset | 371 | val toks = command.span.content | 
| 
08a6901eb035
clarified define_command: send tokens more directly, without requiring keywords in ML;
 wenzelm parents: 
58015diff
changeset | 372 | val toks_yxml = | 
| 61376 
93224745477f
output HTML text according to Isabelle/Scala Symbol.Interpretation;
 wenzelm parents: 
60992diff
changeset | 373 |     {
 | 
| 
93224745477f
output HTML text according to Isabelle/Scala Symbol.Interpretation;
 wenzelm parents: 
60992diff
changeset | 374 | import XML.Encode._ | 
| 64616 | 375 | val encode_tok: T[Token] = (tok => pair(int, int)((tok.kind.id, Symbol.length(tok.source)))) | 
| 65345 
2fdd4431b30e
clarified YXML vs. symbol encoding: operate on whole message;
 wenzelm parents: 
65313diff
changeset | 376 | Symbol.encode_yxml(list(encode_tok)(toks)) | 
| 59085 
08a6901eb035
clarified define_command: send tokens more directly, without requiring keywords in ML;
 wenzelm parents: 
58015diff
changeset | 377 | } | 
| 
08a6901eb035
clarified define_command: send tokens more directly, without requiring keywords in ML;
 wenzelm parents: 
58015diff
changeset | 378 | |
| 52582 | 379 |     protocol_command("Document.define_command",
 | 
| 65345 
2fdd4431b30e
clarified YXML vs. symbol encoding: operate on whole message;
 wenzelm parents: 
65313diff
changeset | 380 | (Document_ID(command.id) :: Symbol.encode(command.span.name) :: blobs_yxml :: toks_yxml :: | 
| 
2fdd4431b30e
clarified YXML vs. symbol encoding: operate on whole message;
 wenzelm parents: 
65313diff
changeset | 381 | toks.map(tok => Symbol.encode(tok.source))): _*) | 
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54515diff
changeset | 382 | } | 
| 38412 
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
 wenzelm parents: diff
changeset | 383 | |
| 
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
 wenzelm parents: diff
changeset | 384 | |
| 52931 
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
 wenzelm parents: 
52862diff
changeset | 385 | /* execution */ | 
| 
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
 wenzelm parents: 
52862diff
changeset | 386 | |
| 66379 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
65532diff
changeset | 387 | def consolidate_execution(): Unit = | 
| 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
65532diff
changeset | 388 |     protocol_command("Document.consolidate_execution")
 | 
| 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
65532diff
changeset | 389 | |
| 52931 
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
 wenzelm parents: 
52862diff
changeset | 390 | def discontinue_execution(): Unit = | 
| 
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
 wenzelm parents: 
52862diff
changeset | 391 |     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 | 392 | |
| 52931 
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
 wenzelm parents: 
52862diff
changeset | 393 | 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: 
52862diff
changeset | 394 |     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: 
52862diff
changeset | 395 | |
| 
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
 wenzelm parents: 
52862diff
changeset | 396 | |
| 
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
 wenzelm parents: 
52862diff
changeset | 397 | /* document versions */ | 
| 47343 
b8aeab386414
less aggressive discontinue_execution before document update, to avoid unstable execs that need to be re-assigned;
 wenzelm parents: 
46938diff
changeset | 398 | |
| 52530 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 wenzelm parents: 
52527diff
changeset | 399 | def update(old_id: Document_ID.Version, new_id: Document_ID.Version, | 
| 44383 | 400 | 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 | 401 |   {
 | 
| 44157 
a21d3e1e64fd
uniform treatment of header edits as document edits;
 wenzelm parents: 
44156diff
changeset | 402 | val edits_yxml = | 
| 61376 
93224745477f
output HTML text according to Isabelle/Scala Symbol.Interpretation;
 wenzelm parents: 
60992diff
changeset | 403 |     {
 | 
| 
93224745477f
output HTML text according to Isabelle/Scala Symbol.Interpretation;
 wenzelm parents: 
60992diff
changeset | 404 | import XML.Encode._ | 
| 44383 | 405 | def id: T[Command] = (cmd => long(cmd.id)) | 
| 46737 | 406 | def encode_edit(name: Document.Node.Name) | 
| 52849 | 407 | : 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: 
44866diff
changeset | 408 | 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: 
44866diff
changeset | 409 |           { case Document.Node.Edits(a) => (Nil, list(pair(option(id), option(id)))(a)) },
 | 
| 48707 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 wenzelm parents: 
48705diff
changeset | 410 |           { case Document.Node.Deps(header) =>
 | 
| 60992 | 411 | val master_dir = File.standard_url(name.master_dir) | 
| 59695 | 412 |               val imports = header.imports.map({ case (a, _) => a.node })
 | 
| 65384 | 413 | val keywords = | 
| 414 |                 header.keywords.map({ case (a, Keyword.Spec(b, c, d)) => (a, ((b, c), d)) })
 | |
| 44979 
68b990e950b1
explicit master_dir as part of header -- still required (for Cygwin) since Scala layer does not pass file content yet;
 wenzelm parents: 
44866diff
changeset | 415 | (Nil, | 
| 65345 
2fdd4431b30e
clarified YXML vs. symbol encoding: operate on whole message;
 wenzelm parents: 
65313diff
changeset | 416 | pair(string, pair(string, pair(list(string), pair(list(pair(string, | 
| 
2fdd4431b30e
clarified YXML vs. symbol encoding: operate on whole message;
 wenzelm parents: 
65313diff
changeset | 417 | pair(pair(string, list(string)), list(string)))), list(string)))))( | 
| 65445 
e9e7f5f5794c
more qualifier treatment, but in the end it is still ignored;
 wenzelm parents: 
65439diff
changeset | 418 | (master_dir, (name.theory, (imports, (keywords, header.errors)))))) }, | 
| 52849 | 419 |           { case Document.Node.Perspective(a, b, c) =>
 | 
| 420 | (bool_atom(a) :: b.commands.map(cmd => long_atom(cmd.id)), | |
| 65345 
2fdd4431b30e
clarified YXML vs. symbol encoding: operate on whole message;
 wenzelm parents: 
65313diff
changeset | 421 | list(pair(id, pair(string, list(string))))(c.dest)) })) | 
| 48705 
dd32321d6eef
tuned signature -- slightly more abstract text representation of prover process;
 wenzelm parents: 
47542diff
changeset | 422 | 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: 
44866diff
changeset | 423 |       {
 | 
| 
68b990e950b1
explicit master_dir as part of header -- still required (for Cygwin) since Scala layer does not pass file content yet;
 wenzelm parents: 
44866diff
changeset | 424 | val (name, edit) = node_edit | 
| 65345 
2fdd4431b30e
clarified YXML vs. symbol encoding: operate on whole message;
 wenzelm parents: 
65313diff
changeset | 425 | 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: 
44866diff
changeset | 426 | }) | 
| 65345 
2fdd4431b30e
clarified YXML vs. symbol encoding: operate on whole message;
 wenzelm parents: 
65313diff
changeset | 427 | Symbol.encode_yxml(encode_edits(edits)) } | 
| 52582 | 428 |     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 | 429 | } | 
| 43748 | 430 | |
| 44673 | 431 | def remove_versions(versions: List[Document.Version]) | 
| 432 |   {
 | |
| 433 | val versions_yxml = | |
| 59364 | 434 |     { import XML.Encode._
 | 
| 65345 
2fdd4431b30e
clarified YXML vs. symbol encoding: operate on whole message;
 wenzelm parents: 
65313diff
changeset | 435 | Symbol.encode_yxml(list(long)(versions.map(_.id))) } | 
| 52582 | 436 |     protocol_command("Document.remove_versions", versions_yxml)
 | 
| 44673 | 437 | } | 
| 438 | ||
| 43748 | 439 | |
| 50498 | 440 | /* dialog via document content */ | 
| 441 | ||
| 52931 
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
 wenzelm parents: 
52862diff
changeset | 442 | def dialog_result(serial: Long, result: String): Unit = | 
| 63805 | 443 |     protocol_command("Document.dialog_result", Value.Long(serial), result)
 | 
| 38412 
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
 wenzelm parents: diff
changeset | 444 | } |