| author | wenzelm | 
| Wed, 30 Dec 2015 20:12:26 +0100 | |
| changeset 61992 | 6d02bb8b5fe1 | 
| parent 61381 | ddca85598c65 | 
| child 63429 | baedd4724f08 | 
| 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._ | 
| 
383c9d758a56
raw message function "assign_execs" avoids full overhead of decoding and caching message body;
 wenzelm parents: 
44644diff
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: 
52111diff
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: 
44644diff
changeset | 21 | } | 
| 
383c9d758a56
raw message function "assign_execs" avoids full overhead of decoding and caching message body;
 wenzelm parents: 
44644diff
changeset | 22 |       catch {
 | 
| 
383c9d758a56
raw message function "assign_execs" avoids full overhead of decoding and caching message body;
 wenzelm parents: 
44644diff
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: 
38483diff
changeset | 27 | |
| 44676 | 28 | object Removed | 
| 29 |   {
 | |
| 52530 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 wenzelm parents: 
52527diff
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: 
38483diff
changeset | 41 | |
| 46209 | 42 | /* command status */ | 
| 38567 
b670faa807c9
concentrate protocol message formats in Isar_Document;
 wenzelm parents: 
38483diff
changeset | 43 | |
| 56359 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 44 | object Status | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 45 |   {
 | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 46 | def make(markup_iterator: Iterator[Markup]): Status = | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 47 |     {
 | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 48 | var touched = false | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 49 | var accepted = false | 
| 56395 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 50 | var warned = false | 
| 56359 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 51 | var failed = false | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 52 | var forks = 0 | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 53 | var runs = 0 | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 54 |       for (markup <- markup_iterator) {
 | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 55 |         markup.name match {
 | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 56 | case Markup.ACCEPTED => accepted = true | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 57 | case Markup.FORKED => touched = true; forks += 1 | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 58 | case Markup.JOINED => forks -= 1 | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 59 | case Markup.RUNNING => touched = true; runs += 1 | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 60 | case Markup.FINISHED => runs -= 1 | 
| 59203 
5f0bd5afc16d
explicit message channel for "legacy", which is nonetheless a variant of "warning";
 wenzelm parents: 
59184diff
changeset | 61 | case Markup.WARNING | Markup.LEGACY => warned = true | 
| 56395 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 62 | case Markup.FAILED | Markup.ERROR => failed = true | 
| 56359 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 63 | case _ => | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 64 | } | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 65 | } | 
| 56395 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 66 | Status(touched, accepted, warned, failed, forks, runs) | 
| 56359 
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 | |
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 69 | val empty = make(Iterator.empty) | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 70 | |
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 71 | def merge(status_iterator: Iterator[Status]): Status = | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 72 |       if (status_iterator.hasNext) {
 | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 73 | val status0 = status_iterator.next | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 74 | (status0 /: status_iterator)(_ + _) | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 75 | } | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 76 | else empty | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 77 | } | 
| 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 78 | |
| 46166 | 79 | sealed case class Status( | 
| 56352 
abdc524db8b4
more frugal command_status, which is often used in a tight loop;
 wenzelm parents: 
56335diff
changeset | 80 | private val touched: Boolean, | 
| 
abdc524db8b4
more frugal command_status, which is often used in a tight loop;
 wenzelm parents: 
56335diff
changeset | 81 | private val accepted: Boolean, | 
| 56395 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 82 | private val warned: Boolean, | 
| 56352 
abdc524db8b4
more frugal command_status, which is often used in a tight loop;
 wenzelm parents: 
56335diff
changeset | 83 | private val failed: Boolean, | 
| 
abdc524db8b4
more frugal command_status, which is often used in a tight loop;
 wenzelm parents: 
56335diff
changeset | 84 | forks: Int, | 
| 
abdc524db8b4
more frugal command_status, which is often used in a tight loop;
 wenzelm parents: 
56335diff
changeset | 85 | runs: Int) | 
| 38567 
b670faa807c9
concentrate protocol message formats in Isar_Document;
 wenzelm parents: 
38483diff
changeset | 86 |   {
 | 
| 56359 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 87 | def + (that: Status): Status = | 
| 56395 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 88 | Status( | 
| 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 89 | touched || that.touched, | 
| 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 90 | accepted || that.accepted, | 
| 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 91 | warned || that.warned, | 
| 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 92 | failed || that.failed, | 
| 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 93 | forks + that.forks, | 
| 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 94 | runs + that.runs) | 
| 56359 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 95 | |
| 49036 
4680c4046814
further refinement of command status, to accomodate forked proofs;
 wenzelm parents: 
49009diff
changeset | 96 | 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 | 97 | 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 | 98 | 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 | 99 | def is_failed: Boolean = failed | 
| 49039 | 100 | def is_finished: Boolean = !failed && touched && forks == 0 && runs == 0 | 
| 46166 | 101 | } | 
| 102 | ||
| 56395 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 103 | val proper_status_elements = | 
| 56743 | 104 | Markup.Elements(Markup.ACCEPTED, Markup.FORKED, Markup.JOINED, Markup.RUNNING, | 
| 55646 | 105 | Markup.FINISHED, Markup.FAILED) | 
| 106 | ||
| 56395 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 107 | val liberal_status_elements = | 
| 59203 
5f0bd5afc16d
explicit message channel for "legacy", which is nonetheless a variant of "warning";
 wenzelm parents: 
59184diff
changeset | 108 | proper_status_elements + Markup.WARNING + Markup.LEGACY + Markup.ERROR | 
| 55646 | 109 | |
| 46209 | 110 | |
| 51818 
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
 wenzelm parents: 
51533diff
changeset | 111 | /* command timing */ | 
| 
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
 wenzelm parents: 
51533diff
changeset | 112 | |
| 
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
 wenzelm parents: 
51533diff
changeset | 113 | object Command_Timing | 
| 
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
 wenzelm parents: 
51533diff
changeset | 114 |   {
 | 
| 52531 | 115 | 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 | 116 |       props match {
 | 
| 
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
 wenzelm parents: 
51533diff
changeset | 117 | case (Markup.FUNCTION, Markup.COMMAND_TIMING) :: args => | 
| 
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
 wenzelm parents: 
51533diff
changeset | 118 |           (args, args) match {
 | 
| 
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
 wenzelm parents: 
51533diff
changeset | 119 | 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 | 120 | case _ => None | 
| 
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
 wenzelm parents: 
51533diff
changeset | 121 | } | 
| 
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
 wenzelm parents: 
51533diff
changeset | 122 | case _ => None | 
| 
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 | |
| 
517f232e867d
clarified module dependencies: avoid Properties and Document introding minimal "PIDE";
 wenzelm parents: 
51533diff
changeset | 126 | |
| 46209 | 127 | /* node status */ | 
| 128 | ||
| 46688 | 129 | sealed case class Node_Status( | 
| 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 | 130 | unprocessed: Int, running: Int, warned: Int, failed: Int, finished: Int) | 
| 44866 | 131 |   {
 | 
| 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 | 132 | def total: Int = unprocessed + running + warned + failed + finished | 
| 44866 | 133 | } | 
| 44613 | 134 | |
| 135 | def node_status( | |
| 136 | state: Document.State, version: Document.Version, node: Document.Node): Node_Status = | |
| 137 |   {
 | |
| 138 | var unprocessed = 0 | |
| 139 | var running = 0 | |
| 46688 | 140 | var warned = 0 | 
| 44613 | 141 | 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 | 142 | var finished = 0 | 
| 56356 
c3dbaa155ece
tuned for-comprehensions -- less structure mapping;
 wenzelm parents: 
56355diff
changeset | 143 |     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 | 144 | val states = state.command_states(version, command) | 
| 56359 
bca016a9a18d
persistent protocol_status, to improve performance of node_status a little;
 wenzelm parents: 
56356diff
changeset | 145 | 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 | 146 | |
| 56299 
8201790fdeb9
more careful treatment of multiple command states (eval + prints): merge content that is actually required;
 wenzelm parents: 
56295diff
changeset | 147 | if (status.is_running) running += 1 | 
| 57843 
d8966c09025c
proper priority for error over warning also for node_status (see 9c5220e05e04);
 wenzelm parents: 
56801diff
changeset | 148 | else if (status.is_failed) failed += 1 | 
| 56395 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 149 | else if (status.is_warned) warned += 1 | 
| 
0546e036d1c0
more direct warning within persistent Protocol.Status;
 wenzelm parents: 
56387diff
changeset | 150 | 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 | 151 | else unprocessed += 1 | 
| 
8201790fdeb9
more careful treatment of multiple command states (eval + prints): merge content that is actually required;
 wenzelm parents: 
56295diff
changeset | 152 | } | 
| 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 | 153 | Node_Status(unprocessed, running, warned, failed, finished) | 
| 44613 | 154 | } | 
| 155 | ||
| 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 | 156 | |
| 51533 | 157 | /* node timing */ | 
| 158 | ||
| 159 | sealed case class Node_Timing(total: Double, commands: Map[Command, Double]) | |
| 160 | ||
| 161 | val empty_node_timing = Node_Timing(0.0, Map.empty) | |
| 162 | ||
| 163 | def node_timing( | |
| 164 | state: Document.State, | |
| 165 | version: Document.Version, | |
| 166 | node: Document.Node, | |
| 167 | threshold: Double): Node_Timing = | |
| 168 |   {
 | |
| 169 | var total = 0.0 | |
| 170 | var commands = Map.empty[Command, Double] | |
| 171 |     for {
 | |
| 172 | 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 | 173 | st <- state.command_states(version, command) | 
| 56356 
c3dbaa155ece
tuned for-comprehensions -- less structure mapping;
 wenzelm parents: 
56355diff
changeset | 174 |     } {
 | 
| 
c3dbaa155ece
tuned for-comprehensions -- less structure mapping;
 wenzelm parents: 
56355diff
changeset | 175 | val command_timing = | 
| 51533 | 176 |         (0.0 /: st.status)({
 | 
| 177 | case (timing, Markup.Timing(t)) => timing + t.elapsed.seconds | |
| 178 | case (timing, _) => timing | |
| 179 | }) | |
| 180 | total += command_timing | |
| 181 | if (command_timing >= threshold) commands += (command -> command_timing) | |
| 182 | } | |
| 183 | Node_Timing(total, commands) | |
| 184 | } | |
| 185 | ||
| 186 | ||
| 39441 
4110cc1b8f9f
allow embedded reports in regular prover messages, to avoid side-effects for errors for example;
 wenzelm parents: 
39439diff
changeset | 187 | /* result messages */ | 
| 39439 
1c294d150ded
eliminated markup "location" in favour of more explicit "no_report", which is actually deleted from messages;
 wenzelm parents: 
39181diff
changeset | 188 | |
| 50500 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 189 | def is_result(msg: XML.Tree): Boolean = | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 190 |     msg match {
 | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 191 | case XML.Elem(Markup(Markup.RESULT, _), _) => true | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 192 | case _ => false | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 193 | } | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 194 | |
| 50157 | 195 | 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 | 196 |     msg match {
 | 
| 50201 
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
 wenzelm parents: 
50157diff
changeset | 197 | 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 | 198 | 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 | 199 | case _ => false | 
| 
53365ba766ac
Command.accumulate: refrain from adding tracing messages to markup tree -- potential scalability problem;
 wenzelm parents: 
39511diff
changeset | 200 | } | 
| 
53365ba766ac
Command.accumulate: refrain from adding tracing messages to markup tree -- potential scalability problem;
 wenzelm parents: 
39511diff
changeset | 201 | |
| 59184 
830bb7ddb3ab
explicit message channels for "state", "information";
 wenzelm parents: 
59085diff
changeset | 202 | def is_state(msg: XML.Tree): Boolean = | 
| 50500 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 203 |     msg match {
 | 
| 59184 
830bb7ddb3ab
explicit message channels for "state", "information";
 wenzelm parents: 
59085diff
changeset | 204 | case XML.Elem(Markup(Markup.STATE, _), _) => true | 
| 
830bb7ddb3ab
explicit message channels for "state", "information";
 wenzelm parents: 
59085diff
changeset | 205 | case XML.Elem(Markup(Markup.STATE_MESSAGE, _), _) => true | 
| 
830bb7ddb3ab
explicit message channels for "state", "information";
 wenzelm parents: 
59085diff
changeset | 206 | case _ => false | 
| 
830bb7ddb3ab
explicit message channels for "state", "information";
 wenzelm parents: 
59085diff
changeset | 207 | } | 
| 
830bb7ddb3ab
explicit message channels for "state", "information";
 wenzelm parents: 
59085diff
changeset | 208 | |
| 
830bb7ddb3ab
explicit message channels for "state", "information";
 wenzelm parents: 
59085diff
changeset | 209 | def is_information(msg: XML.Tree): Boolean = | 
| 
830bb7ddb3ab
explicit message channels for "state", "information";
 wenzelm parents: 
59085diff
changeset | 210 |     msg match {
 | 
| 
830bb7ddb3ab
explicit message channels for "state", "information";
 wenzelm parents: 
59085diff
changeset | 211 | case XML.Elem(Markup(Markup.INFORMATION, _), _) => true | 
| 
830bb7ddb3ab
explicit message channels for "state", "information";
 wenzelm parents: 
59085diff
changeset | 212 | case XML.Elem(Markup(Markup.INFORMATION_MESSAGE, _), _) => true | 
| 50500 
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 | |
| 39511 | 216 | def is_warning(msg: XML.Tree): Boolean = | 
| 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.WARNING, _), _) => 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.WARNING_MESSAGE, _), _) => true | 
| 39511 | 220 | case _ => false | 
| 221 | } | |
| 222 | ||
| 59203 
5f0bd5afc16d
explicit message channel for "legacy", which is nonetheless a variant of "warning";
 wenzelm parents: 
59184diff
changeset | 223 | def is_legacy(msg: XML.Tree): Boolean = | 
| 
5f0bd5afc16d
explicit message channel for "legacy", which is nonetheless a variant of "warning";
 wenzelm parents: 
59184diff
changeset | 224 |     msg match {
 | 
| 
5f0bd5afc16d
explicit message channel for "legacy", which is nonetheless a variant of "warning";
 wenzelm parents: 
59184diff
changeset | 225 | case XML.Elem(Markup(Markup.LEGACY, _), _) => true | 
| 
5f0bd5afc16d
explicit message channel for "legacy", which is nonetheless a variant of "warning";
 wenzelm parents: 
59184diff
changeset | 226 | 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 | 227 | case _ => false | 
| 
5f0bd5afc16d
explicit message channel for "legacy", which is nonetheless a variant of "warning";
 wenzelm parents: 
59184diff
changeset | 228 | } | 
| 
5f0bd5afc16d
explicit message channel for "legacy", which is nonetheless a variant of "warning";
 wenzelm parents: 
59184diff
changeset | 229 | |
| 39511 | 230 | def is_error(msg: XML.Tree): Boolean = | 
| 231 |     msg match {
 | |
| 50201 
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
 wenzelm parents: 
50157diff
changeset | 232 | 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 | 233 | case XML.Elem(Markup(Markup.ERROR_MESSAGE, _), _) => true | 
| 39511 | 234 | case _ => false | 
| 235 | } | |
| 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 | 236 | |
| 56495 | 237 | def is_inlined(msg: XML.Tree): Boolean = | 
| 238 | !(is_result(msg) || is_tracing(msg) || is_state(msg)) | |
| 239 | ||
| 50500 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 240 | |
| 60882 | 241 | /* breakpoints */ | 
| 242 | ||
| 243 | object ML_Breakpoint | |
| 244 |   {
 | |
| 245 | def unapply(tree: XML.Tree): Option[Long] = | |
| 246 |     tree match {
 | |
| 247 | case XML.Elem(Markup(Markup.ML_BREAKPOINT, Markup.Serial(breakpoint)), _) => Some(breakpoint) | |
| 248 | case _ => None | |
| 249 | } | |
| 250 | } | |
| 251 | ||
| 252 | ||
| 50500 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 253 | /* dialogs */ | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 254 | |
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 255 | object Dialog_Args | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
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: 
50498diff
changeset | 258 |       (props, props, props) match {
 | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
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: 
50498diff
changeset | 260 | Some((id, serial, result)) | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 261 | case _ => None | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 262 | } | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 263 | } | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 264 | |
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 265 | object Dialog | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
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: 
50498diff
changeset | 268 |       tree match {
 | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
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: 
50498diff
changeset | 270 | Some((id, serial, result)) | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 271 | case _ => None | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 272 | } | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 273 | } | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 274 | |
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 275 | object Dialog_Result | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
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: 
50500diff
changeset | 278 |     {
 | 
| 
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
 wenzelm parents: 
50500diff
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: 
50500diff
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: 
50500diff
changeset | 281 | } | 
| 50500 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 282 | |
| 50501 
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
 wenzelm parents: 
50500diff
changeset | 283 | def unapply(tree: XML.Tree): Option[String] = | 
| 50500 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 284 |       tree match {
 | 
| 50501 
6f41f1646617
more careful handling of Dialog_Result, with active area and color feedback;
 wenzelm parents: 
50500diff
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: 
50498diff
changeset | 286 | case _ => None | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 287 | } | 
| 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50498diff
changeset | 288 | } | 
| 38412 
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
 wenzelm parents: diff
changeset | 289 | } | 
| 
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
 wenzelm parents: diff
changeset | 290 | |
| 
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
 wenzelm parents: diff
changeset | 291 | |
| 57916 | 292 | trait Protocol | 
| 38412 
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
 wenzelm parents: diff
changeset | 293 | {
 | 
| 57916 | 294 | /* text */ | 
| 295 | ||
| 296 | def encode(s: String): String | |
| 297 | def decode(s: String): String | |
| 298 | ||
| 299 | object Encode | |
| 300 |   {
 | |
| 301 | val string: XML.Encode.T[String] = (s => XML.Encode.string(encode(s))) | |
| 302 | } | |
| 303 | ||
| 304 | ||
| 305 | /* protocol commands */ | |
| 306 | ||
| 307 | def protocol_command_bytes(name: String, args: Bytes*): Unit | |
| 308 | def protocol_command(name: String, args: String*): Unit | |
| 309 | ||
| 310 | ||
| 56387 | 311 | /* options */ | 
| 312 | ||
| 313 | def options(opts: Options): Unit = | |
| 314 |     protocol_command("Prover.options", YXML.string_of_body(opts.encode))
 | |
| 315 | ||
| 316 | ||
| 317 | /* interned items */ | |
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54515diff
changeset | 318 | |
| 56335 
8953d4cc060a
store blob content within document node: aux. files that were once open are made persistent;
 wenzelm parents: 
56306diff
changeset | 319 | def define_blob(digest: SHA1.Digest, bytes: Bytes): Unit = | 
| 56387 | 320 |     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 | 321 | |
| 59671 
9715eb8e9408
more precise position information in Isabelle/Scala, with YXML markup as in Isabelle/ML;
 wenzelm parents: 
59364diff
changeset | 322 | def define_command(command: Command) | 
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54515diff
changeset | 323 |   {
 | 
| 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54515diff
changeset | 324 | val blobs_yxml = | 
| 61376 
93224745477f
output HTML text according to Isabelle/Scala Symbol.Interpretation;
 wenzelm parents: 
60992diff
changeset | 325 |     {
 | 
| 
93224745477f
output HTML text according to Isabelle/Scala Symbol.Interpretation;
 wenzelm parents: 
60992diff
changeset | 326 | import XML.Encode._ | 
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54515diff
changeset | 327 | val encode_blob: T[Command.Blob] = | 
| 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54515diff
changeset | 328 | variant(List( | 
| 54526 | 329 |           { case Exn.Res((a, b)) =>
 | 
| 60879 | 330 | (Nil, pair(Encode.string, option(string))((a.node, b.map(p => p._1.toString)))) }, | 
| 331 |           { case Exn.Exn(e) => (Nil, Encode.string(Exn.message(e))) }))
 | |
| 59085 
08a6901eb035
clarified define_command: send tokens more directly, without requiring keywords in ML;
 wenzelm parents: 
58015diff
changeset | 332 | |
| 59685 
c043306d2598
clarified markup for embedded files, early before execution;
 wenzelm parents: 
59671diff
changeset | 333 | YXML.string_of_body(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 | 334 | } | 
| 59085 
08a6901eb035
clarified define_command: send tokens more directly, without requiring keywords in ML;
 wenzelm parents: 
58015diff
changeset | 335 | |
| 
08a6901eb035
clarified define_command: send tokens more directly, without requiring keywords in ML;
 wenzelm parents: 
58015diff
changeset | 336 | val toks = command.span.content | 
| 
08a6901eb035
clarified define_command: send tokens more directly, without requiring keywords in ML;
 wenzelm parents: 
58015diff
changeset | 337 | val toks_yxml = | 
| 61376 
93224745477f
output HTML text according to Isabelle/Scala Symbol.Interpretation;
 wenzelm parents: 
60992diff
changeset | 338 |     {
 | 
| 
93224745477f
output HTML text according to Isabelle/Scala Symbol.Interpretation;
 wenzelm parents: 
60992diff
changeset | 339 | import XML.Encode._ | 
| 59085 
08a6901eb035
clarified define_command: send tokens more directly, without requiring keywords in ML;
 wenzelm parents: 
58015diff
changeset | 340 | val encode_tok: T[Token] = | 
| 
08a6901eb035
clarified define_command: send tokens more directly, without requiring keywords in ML;
 wenzelm parents: 
58015diff
changeset | 341 | (tok => pair(int, int)((tok.kind.id, Symbol.iterator(tok.source).length))) | 
| 
08a6901eb035
clarified define_command: send tokens more directly, without requiring keywords in ML;
 wenzelm parents: 
58015diff
changeset | 342 | YXML.string_of_body(list(encode_tok)(toks)) | 
| 
08a6901eb035
clarified define_command: send tokens more directly, without requiring keywords in ML;
 wenzelm parents: 
58015diff
changeset | 343 | } | 
| 
08a6901eb035
clarified define_command: send tokens more directly, without requiring keywords in ML;
 wenzelm parents: 
58015diff
changeset | 344 | |
| 52582 | 345 |     protocol_command("Document.define_command",
 | 
| 59735 | 346 | (Document_ID(command.id) :: encode(command.span.name) :: blobs_yxml :: toks_yxml :: | 
| 59085 
08a6901eb035
clarified define_command: send tokens more directly, without requiring keywords in ML;
 wenzelm parents: 
58015diff
changeset | 347 | toks.map(tok => encode(tok.source))): _*) | 
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54515diff
changeset | 348 | } | 
| 38412 
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
 wenzelm parents: diff
changeset | 349 | |
| 
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
 wenzelm parents: diff
changeset | 350 | |
| 52931 
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
 wenzelm parents: 
52862diff
changeset | 351 | /* execution */ | 
| 
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
 wenzelm parents: 
52862diff
changeset | 352 | |
| 
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
 wenzelm parents: 
52862diff
changeset | 353 | def discontinue_execution(): Unit = | 
| 
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
 wenzelm parents: 
52862diff
changeset | 354 |     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 | 355 | |
| 52931 
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
 wenzelm parents: 
52862diff
changeset | 356 | 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 | 357 |     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 | 358 | |
| 
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
 wenzelm parents: 
52862diff
changeset | 359 | |
| 
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
 wenzelm parents: 
52862diff
changeset | 360 | /* 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 | 361 | |
| 52530 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 wenzelm parents: 
52527diff
changeset | 362 | def update(old_id: Document_ID.Version, new_id: Document_ID.Version, | 
| 44383 | 363 | 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 | 364 |   {
 | 
| 44157 
a21d3e1e64fd
uniform treatment of header edits as document edits;
 wenzelm parents: 
44156diff
changeset | 365 | val edits_yxml = | 
| 61376 
93224745477f
output HTML text according to Isabelle/Scala Symbol.Interpretation;
 wenzelm parents: 
60992diff
changeset | 366 |     {
 | 
| 
93224745477f
output HTML text according to Isabelle/Scala Symbol.Interpretation;
 wenzelm parents: 
60992diff
changeset | 367 | import XML.Encode._ | 
| 44383 | 368 | def id: T[Command] = (cmd => long(cmd.id)) | 
| 46737 | 369 | def encode_edit(name: Document.Node.Name) | 
| 52849 | 370 | : 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 | 371 | 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 | 372 |           { 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 | 373 |           { case Document.Node.Deps(header) =>
 | 
| 60992 | 374 | val master_dir = File.standard_url(name.master_dir) | 
| 56801 
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
 wenzelm parents: 
56746diff
changeset | 375 | val theory = Long_Name.base_name(name.theory) | 
| 59695 | 376 |               val imports = header.imports.map({ case (a, _) => a.node })
 | 
| 50128 
599c935aac82
alternative completion for outer syntax keywords;
 wenzelm parents: 
49650diff
changeset | 377 |               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: 
44866diff
changeset | 378 | (Nil, | 
| 48707 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 wenzelm parents: 
48705diff
changeset | 379 | 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: 
48755diff
changeset | 380 | pair(list(pair(Encode.string, | 
| 
3ee314ae1e0a
added keyword kind "thy_load" (with optional list of file extensions);
 wenzelm parents: 
48755diff
changeset | 381 | 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: 
51293diff
changeset | 382 | list(Encode.string)))))( | 
| 56801 
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
 wenzelm parents: 
56746diff
changeset | 383 | (master_dir, (theory, (imports, (keywords, header.errors)))))) }, | 
| 52849 | 384 |           { case Document.Node.Perspective(a, b, c) =>
 | 
| 385 | (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: 
52849diff
changeset | 386 | 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: 
47542diff
changeset | 387 | 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 | 388 |       {
 | 
| 
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 | 389 | val (name, edit) = node_edit | 
| 60879 | 390 | pair(Encode.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 | 391 | }) | 
| 48705 
dd32321d6eef
tuned signature -- slightly more abstract text representation of prover process;
 wenzelm parents: 
47542diff
changeset | 392 | YXML.string_of_body(encode_edits(edits)) } | 
| 52582 | 393 |     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 | 394 | } | 
| 43748 | 395 | |
| 44673 | 396 | def remove_versions(versions: List[Document.Version]) | 
| 397 |   {
 | |
| 398 | val versions_yxml = | |
| 59364 | 399 |     { import XML.Encode._
 | 
| 400 | YXML.string_of_body(list(long)(versions.map(_.id))) } | |
| 52582 | 401 |     protocol_command("Document.remove_versions", versions_yxml)
 | 
| 44673 | 402 | } | 
| 403 | ||
| 43748 | 404 | |
| 50498 | 405 | /* dialog via document content */ | 
| 406 | ||
| 52931 
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
 wenzelm parents: 
52862diff
changeset | 407 | def dialog_result(serial: Long, result: String): Unit = | 
| 52582 | 408 |     protocol_command("Document.dialog_result", Properties.Value.Long(serial), result)
 | 
| 56616 
abc2da18d08d
added protocol command "use_theories", with core functionality of batch build;
 wenzelm parents: 
56495diff
changeset | 409 | |
| 
abc2da18d08d
added protocol command "use_theories", with core functionality of batch build;
 wenzelm parents: 
56495diff
changeset | 410 | |
| 59364 | 411 | /* build_theories */ | 
| 56616 
abc2da18d08d
added protocol command "use_theories", with core functionality of batch build;
 wenzelm parents: 
56495diff
changeset | 412 | |
| 59364 | 413 | def build_theories(id: String, master_dir: Path, theories: List[(Options, List[Path])]) | 
| 414 |   {
 | |
| 61381 | 415 | val symbol_codes_yxml = | 
| 416 |     { import XML.Encode._
 | |
| 417 | YXML.string_of_body(list(pair(string, int))(Symbol.codes)) } | |
| 59364 | 418 | val theories_yxml = | 
| 419 |     { import XML.Encode._
 | |
| 420 | YXML.string_of_body(list(pair(Options.encode, list(Path.encode)))(theories)) } | |
| 421 |     protocol_command("build_theories", id, master_dir.implode, theories_yxml)
 | |
| 422 | } | |
| 38412 
c23f3abbf42d
moved isar_document.ML/scala to Pure/System/ -- side-by-side with isar.ML;
 wenzelm parents: diff
changeset | 423 | } |