author | wenzelm |
Thu, 22 Nov 2012 12:22:03 +0100 | |
changeset 50162 | e06eabc421e7 |
parent 49677 | c4e2762a265c |
permissions | -rw-r--r-- |
45670 | 1 |
(* Title: Pure/PIDE/isabelle_markup.ML |
23623 | 2 |
Author: Makarius |
3 |
||
45666 | 4 |
Isabelle markup elements. |
23623 | 5 |
*) |
6 |
||
45666 | 7 |
signature ISABELLE_MARKUP = |
23623 | 8 |
sig |
45666 | 9 |
val bindingN: string val binding: Markup.T |
10 |
val entityN: string val entity: string -> string -> Markup.T |
|
11 |
val get_entity_kind: Markup.T -> string option |
|
33088
757d7787b10c
markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents:
32738
diff
changeset
|
12 |
val defN: string |
757d7787b10c
markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents:
32738
diff
changeset
|
13 |
val refN: string |
23671 | 14 |
val lineN: string |
27794 | 15 |
val offsetN: string |
16 |
val end_offsetN: string |
|
23671 | 17 |
val fileN: string |
30221 | 18 |
val idN: string |
27748 | 19 |
val position_properties': string list |
26051 | 20 |
val position_properties: string list |
45666 | 21 |
val positionN: string val position: Markup.T |
22 |
val pathN: string val path: string -> Markup.T |
|
23644 | 23 |
val indentN: string |
45666 | 24 |
val blockN: string val block: int -> Markup.T |
23695 | 25 |
val widthN: string |
45666 | 26 |
val breakN: string val break: int -> Markup.T |
27 |
val fbreakN: string val fbreak: Markup.T |
|
28 |
val hiddenN: string val hidden: Markup.T |
|
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48768
diff
changeset
|
29 |
val theoryN: string |
43548
f231a7594e54
type classes: entity markup instead of old-style token markup;
wenzelm
parents:
43547
diff
changeset
|
30 |
val classN: string |
46649
bb185c45037e
clarifed name space "type name", which covers logical and non-logical types, and often occurs inside outer syntax "type" markup;
wenzelm
parents:
46123
diff
changeset
|
31 |
val type_nameN: string |
43552 | 32 |
val constantN: string |
45666 | 33 |
val fixedN: string val fixed: string -> Markup.T |
34 |
val dynamic_factN: string val dynamic_fact: string -> Markup.T |
|
35 |
val tfreeN: string val tfree: Markup.T |
|
36 |
val tvarN: string val tvar: Markup.T |
|
37 |
val freeN: string val free: Markup.T |
|
38 |
val skolemN: string val skolem: Markup.T |
|
39 |
val boundN: string val bound: Markup.T |
|
40 |
val varN: string val var: Markup.T |
|
41 |
val numeralN: string val numeral: Markup.T |
|
42 |
val literalN: string val literal: Markup.T |
|
43 |
val delimiterN: string val delimiter: Markup.T |
|
44 |
val inner_stringN: string val inner_string: Markup.T |
|
45 |
val inner_commentN: string val inner_comment: Markup.T |
|
46 |
val token_rangeN: string val token_range: Markup.T |
|
47 |
val sortN: string val sort: Markup.T |
|
48 |
val typN: string val typ: Markup.T |
|
49 |
val termN: string val term: Markup.T |
|
50 |
val propN: string val prop: Markup.T |
|
49674
dbadb4d03cbc
report sort assignment of visible type variables;
wenzelm
parents:
49566
diff
changeset
|
51 |
val sortingN: string val sorting: Markup.T |
45666 | 52 |
val typingN: string val typing: Markup.T |
53 |
val ML_keywordN: string val ML_keyword: Markup.T |
|
54 |
val ML_delimiterN: string val ML_delimiter: Markup.T |
|
55 |
val ML_tvarN: string val ML_tvar: Markup.T |
|
56 |
val ML_numeralN: string val ML_numeral: Markup.T |
|
57 |
val ML_charN: string val ML_char: Markup.T |
|
58 |
val ML_stringN: string val ML_string: Markup.T |
|
59 |
val ML_commentN: string val ML_comment: Markup.T |
|
42327
7c7cc7590eb3
Name_Space.entry_markup: keep def position as separate properties;
wenzelm
parents:
42135
diff
changeset
|
60 |
val ML_defN: string |
7c7cc7590eb3
Name_Space.entry_markup: keep def position as separate properties;
wenzelm
parents:
42135
diff
changeset
|
61 |
val ML_openN: string |
7c7cc7590eb3
Name_Space.entry_markup: keep def position as separate properties;
wenzelm
parents:
42135
diff
changeset
|
62 |
val ML_structN: string |
45666 | 63 |
val ML_typingN: string val ML_typing: Markup.T |
64 |
val ML_sourceN: string val ML_source: Markup.T |
|
65 |
val doc_sourceN: string val doc_source: Markup.T |
|
66 |
val antiqN: string val antiq: Markup.T |
|
43560
d1650e3720fd
ML antiquotations are managed as theory data, with proper name space and entity markup;
wenzelm
parents:
43552
diff
changeset
|
67 |
val ML_antiquotationN: string |
49321
a48f9bbbe720
avoid spaces in markup names, which might cause problems in boundary situations (e.g. HTML class);
wenzelm
parents:
49036
diff
changeset
|
68 |
val document_antiquotationN: string |
a48f9bbbe720
avoid spaces in markup names, which might cause problems in boundary situations (e.g. HTML class);
wenzelm
parents:
49036
diff
changeset
|
69 |
val document_antiquotation_optionN: string |
50162 | 70 |
val paragraphN: string val paragraph: Markup.T |
45666 | 71 |
val keywordN: string val keyword: Markup.T |
72 |
val operatorN: string val operator: Markup.T |
|
73 |
val commandN: string val command: Markup.T |
|
74 |
val stringN: string val string: Markup.T |
|
75 |
val altstringN: string val altstring: Markup.T |
|
76 |
val verbatimN: string val verbatim: Markup.T |
|
77 |
val commentN: string val comment: Markup.T |
|
78 |
val controlN: string val control: Markup.T |
|
79 |
val tokenN: string val token: Properties.T -> Markup.T |
|
49554
7b7bd2d7661d
more explicit keyword1/keyword2 markup -- avoid potential conflict with input token markup produced by Token_Marker;
wenzelm
parents:
49358
diff
changeset
|
80 |
val keyword1N: string val keyword1: Markup.T |
7b7bd2d7661d
more explicit keyword1/keyword2 markup -- avoid potential conflict with input token markup produced by Token_Marker;
wenzelm
parents:
49358
diff
changeset
|
81 |
val keyword2N: string val keyword2: Markup.T |
45674 | 82 |
val elapsedN: string |
83 |
val cpuN: string |
|
84 |
val gcN: string |
|
85 |
val timingN: string val timing: Timing.timing -> Markup.T |
|
38721
ca8b14fa0d0d
added some proof state markup, notably number of subgoals (e.g. for indentation);
wenzelm
parents:
38474
diff
changeset
|
86 |
val subgoalsN: string |
45666 | 87 |
val proof_stateN: string val proof_state: int -> Markup.T |
88 |
val stateN: string val state: Markup.T |
|
89 |
val subgoalN: string val subgoal: Markup.T |
|
90 |
val sendbackN: string val sendback: Markup.T |
|
49358 | 91 |
val intensifyN: string val intensify: Markup.T |
29417 | 92 |
val taskN: string |
47395
e6261a493f04
added static command status markup, to emphasize accepted but unassigned/unparsed commands (notably in overview panel);
wenzelm
parents:
46910
diff
changeset
|
93 |
val acceptedN: string val accepted: Markup.T |
45666 | 94 |
val forkedN: string val forked: Markup.T |
95 |
val joinedN: string val joined: Markup.T |
|
49036
4680c4046814
further refinement of command status, to accomodate forked proofs;
wenzelm
parents:
49009
diff
changeset
|
96 |
val runningN: string val running: Markup.T |
4680c4046814
further refinement of command status, to accomodate forked proofs;
wenzelm
parents:
49009
diff
changeset
|
97 |
val finishedN: string val finished: Markup.T |
45666 | 98 |
val failedN: string val failed: Markup.T |
38871 | 99 |
val serialN: string |
49677
c4e2762a265c
more direct message header: eliminated historic encoding via single letter;
wenzelm
parents:
49674
diff
changeset
|
100 |
val initN: string |
c4e2762a265c
more direct message header: eliminated historic encoding via single letter;
wenzelm
parents:
49674
diff
changeset
|
101 |
val statusN: string |
c4e2762a265c
more direct message header: eliminated historic encoding via single letter;
wenzelm
parents:
49674
diff
changeset
|
102 |
val writelnN: string |
c4e2762a265c
more direct message header: eliminated historic encoding via single letter;
wenzelm
parents:
49674
diff
changeset
|
103 |
val tracingN: string |
c4e2762a265c
more direct message header: eliminated historic encoding via single letter;
wenzelm
parents:
49674
diff
changeset
|
104 |
val warningN: string |
c4e2762a265c
more direct message header: eliminated historic encoding via single letter;
wenzelm
parents:
49674
diff
changeset
|
105 |
val errorN: string |
c4e2762a265c
more direct message header: eliminated historic encoding via single letter;
wenzelm
parents:
49674
diff
changeset
|
106 |
val protocolN: string |
45666 | 107 |
val legacyN: string val legacy: Markup.T |
108 |
val promptN: string val prompt: Markup.T |
|
109 |
val reportN: string val report: Markup.T |
|
110 |
val no_reportN: string val no_report: Markup.T |
|
48768
abc45de5bb22
clarified "bad" markup: proper body text, invent missing serial on Scala side (counting backwards);
wenzelm
parents:
48756
diff
changeset
|
111 |
val badN: string val bad: Markup.T |
49566
66cbf8bb4693
basic integration of graphview into document model;
wenzelm
parents:
49554
diff
changeset
|
112 |
val graphviewN: string |
43748 | 113 |
val functionN: string |
44661
383c9d758a56
raw message function "assign_execs" avoids full overhead of decoding and caching message body;
wenzelm
parents:
44549
diff
changeset
|
114 |
val assign_execs: Properties.T |
44676 | 115 |
val removed_versions: Properties.T |
43748 | 116 |
val invoke_scala: string -> string -> Properties.T |
44298
b8f8488704e2
Future.promise: explicit abort operation (like uninterruptible future job);
wenzelm
parents:
43797
diff
changeset
|
117 |
val cancel_scala: string -> Properties.T |
23623 | 118 |
end; |
119 |
||
45666 | 120 |
structure Isabelle_Markup: ISABELLE_MARKUP = |
23623 | 121 |
struct |
122 |
||
30221 | 123 |
(** markup elements **) |
124 |
||
45666 | 125 |
fun markup_elem elem = (elem, (elem, []): Markup.T); |
126 |
fun markup_string elem prop = (elem, fn s => (elem, [(prop, s)]): Markup.T); |
|
127 |
fun markup_int elem prop = (elem, fn i => (elem, [(prop, Markup.print_int i)]): Markup.T); |
|
23671 | 128 |
|
23658 | 129 |
|
33088
757d7787b10c
markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents:
32738
diff
changeset
|
130 |
(* formal entities *) |
757d7787b10c
markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents:
32738
diff
changeset
|
131 |
|
43547
f3a8476285c6
clarified Binding.pretty/print: no quotes, only markup -- Binding.str_of is rendered obsolete;
wenzelm
parents:
43432
diff
changeset
|
132 |
val (bindingN, binding) = markup_elem "binding"; |
42135 | 133 |
|
134 |
val entityN = "entity"; |
|
45666 | 135 |
fun entity kind name = (entityN, [(Markup.nameN, name), (Markup.kindN, kind)]); |
33088
757d7787b10c
markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents:
32738
diff
changeset
|
136 |
|
43548
f231a7594e54
type classes: entity markup instead of old-style token markup;
wenzelm
parents:
43547
diff
changeset
|
137 |
fun get_entity_kind (name, props) = |
45666 | 138 |
if name = entityN then AList.lookup (op =) props Markup.kindN |
43548
f231a7594e54
type classes: entity markup instead of old-style token markup;
wenzelm
parents:
43547
diff
changeset
|
139 |
else NONE; |
f231a7594e54
type classes: entity markup instead of old-style token markup;
wenzelm
parents:
43547
diff
changeset
|
140 |
|
33088
757d7787b10c
markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents:
32738
diff
changeset
|
141 |
val defN = "def"; |
757d7787b10c
markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents:
32738
diff
changeset
|
142 |
val refN = "ref"; |
757d7787b10c
markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents:
32738
diff
changeset
|
143 |
|
757d7787b10c
markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents:
32738
diff
changeset
|
144 |
|
23671 | 145 |
(* position *) |
146 |
||
147 |
val lineN = "line"; |
|
27794 | 148 |
val offsetN = "offset"; |
149 |
val end_offsetN = "end_offset"; |
|
23671 | 150 |
val fileN = "file"; |
25816 | 151 |
val idN = "id"; |
23671 | 152 |
|
41484 | 153 |
val position_properties' = [fileN, idN]; |
43710
7270ae921cf2
discontinued odd Position.column -- left-over from attempts at PGIP implementation;
wenzelm
parents:
43684
diff
changeset
|
154 |
val position_properties = [lineN, offsetN, end_offsetN] @ position_properties'; |
27748 | 155 |
|
25552 | 156 |
val (positionN, position) = markup_elem "position"; |
26255 | 157 |
|
23644 | 158 |
|
43593 | 159 |
(* path *) |
160 |
||
45666 | 161 |
val (pathN, path) = markup_string "path" Markup.nameN; |
43593 | 162 |
|
163 |
||
23644 | 164 |
(* pretty printing *) |
165 |
||
166 |
val indentN = "indent"; |
|
167 |
val (blockN, block) = markup_int "block" indentN; |
|
168 |
||
169 |
val widthN = "width"; |
|
170 |
val (breakN, break) = markup_int "break" widthN; |
|
171 |
||
25552 | 172 |
val (fbreakN, fbreak) = markup_elem "fbreak"; |
23637 | 173 |
|
174 |
||
33985 | 175 |
(* hidden text *) |
176 |
||
177 |
val (hiddenN, hidden) = markup_elem "hidden"; |
|
178 |
||
179 |
||
23623 | 180 |
(* logical entities *) |
181 |
||
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48768
diff
changeset
|
182 |
val theoryN = "theory"; |
43548
f231a7594e54
type classes: entity markup instead of old-style token markup;
wenzelm
parents:
43547
diff
changeset
|
183 |
val classN = "class"; |
49321
a48f9bbbe720
avoid spaces in markup names, which might cause problems in boundary situations (e.g. HTML class);
wenzelm
parents:
49036
diff
changeset
|
184 |
val type_nameN = "type_name"; |
43552 | 185 |
val constantN = "constant"; |
186 |
||
45666 | 187 |
val (fixedN, fixed) = markup_string "fixed" Markup.nameN; |
188 |
val (dynamic_factN, dynamic_fact) = markup_string "dynamic_fact" Markup.nameN; |
|
23623 | 189 |
|
190 |
||
191 |
(* inner syntax *) |
|
192 |
||
25552 | 193 |
val (tfreeN, tfree) = markup_elem "tfree"; |
194 |
val (tvarN, tvar) = markup_elem "tvar"; |
|
195 |
val (freeN, free) = markup_elem "free"; |
|
196 |
val (skolemN, skolem) = markup_elem "skolem"; |
|
197 |
val (boundN, bound) = markup_elem "bound"; |
|
198 |
val (varN, var) = markup_elem "var"; |
|
29318
6337d1cb2ba0
added numeral, which supercedes num, xnum, float;
wenzelm
parents:
28904
diff
changeset
|
199 |
val (numeralN, numeral) = markup_elem "numeral"; |
27804 | 200 |
val (literalN, literal) = markup_elem "literal"; |
43432
224006e5ac46
inner literal/delimiter corresponds to outer keyword/operator;
wenzelm
parents:
42492
diff
changeset
|
201 |
val (delimiterN, delimiter) = markup_elem "delimiter"; |
29318
6337d1cb2ba0
added numeral, which supercedes num, xnum, float;
wenzelm
parents:
28904
diff
changeset
|
202 |
val (inner_stringN, inner_string) = markup_elem "inner_string"; |
27883 | 203 |
val (inner_commentN, inner_comment) = markup_elem "inner_comment"; |
23719 | 204 |
|
39168
e3ac771235f7
report token range after inner parse error -- often provides important clues about misunderstanding concerning lexical phase;
wenzelm
parents:
38887
diff
changeset
|
205 |
val (token_rangeN, token_range) = markup_elem "token_range"; |
e3ac771235f7
report token range after inner parse error -- often provides important clues about misunderstanding concerning lexical phase;
wenzelm
parents:
38887
diff
changeset
|
206 |
|
25552 | 207 |
val (sortN, sort) = markup_elem "sort"; |
208 |
val (typN, typ) = markup_elem "typ"; |
|
209 |
val (termN, term) = markup_elem "term"; |
|
27818 | 210 |
val (propN, prop) = markup_elem "prop"; |
27748 | 211 |
|
49674
dbadb4d03cbc
report sort assignment of visible type variables;
wenzelm
parents:
49566
diff
changeset
|
212 |
val (sortingN, sorting) = markup_elem "sorting"; |
45445
41e641a870de
pass term positions into check phase, where resulting types are reported accordingly, and eventually shown as tooltips;
wenzelm
parents:
44706
diff
changeset
|
213 |
val (typingN, typing) = markup_elem "typing"; |
41e641a870de
pass term positions into check phase, where resulting types are reported accordingly, and eventually shown as tooltips;
wenzelm
parents:
44706
diff
changeset
|
214 |
|
23623 | 215 |
|
30614 | 216 |
(* ML syntax *) |
217 |
||
218 |
val (ML_keywordN, ML_keyword) = markup_elem "ML_keyword"; |
|
37195 | 219 |
val (ML_delimiterN, ML_delimiter) = markup_elem "ML_delimiter"; |
30614 | 220 |
val (ML_tvarN, ML_tvar) = markup_elem "ML_tvar"; |
221 |
val (ML_numeralN, ML_numeral) = markup_elem "ML_numeral"; |
|
222 |
val (ML_charN, ML_char) = markup_elem "ML_char"; |
|
223 |
val (ML_stringN, ML_string) = markup_elem "ML_string"; |
|
224 |
val (ML_commentN, ML_comment) = markup_elem "ML_comment"; |
|
225 |
||
42327
7c7cc7590eb3
Name_Space.entry_markup: keep def position as separate properties;
wenzelm
parents:
42135
diff
changeset
|
226 |
val ML_defN = "ML_def"; |
7c7cc7590eb3
Name_Space.entry_markup: keep def position as separate properties;
wenzelm
parents:
42135
diff
changeset
|
227 |
val ML_openN = "ML_open"; |
7c7cc7590eb3
Name_Space.entry_markup: keep def position as separate properties;
wenzelm
parents:
42135
diff
changeset
|
228 |
val ML_structN = "ML_struct"; |
30702 | 229 |
val (ML_typingN, ML_typing) = markup_elem "ML_typing"; |
230 |
||
30614 | 231 |
|
27875 | 232 |
(* embedded source text *) |
233 |
||
234 |
val (ML_sourceN, ML_source) = markup_elem "ML_source"; |
|
235 |
val (doc_sourceN, doc_source) = markup_elem "doc_source"; |
|
236 |
||
27879 | 237 |
val (antiqN, antiq) = markup_elem "antiq"; |
49321
a48f9bbbe720
avoid spaces in markup names, which might cause problems in boundary situations (e.g. HTML class);
wenzelm
parents:
49036
diff
changeset
|
238 |
val ML_antiquotationN = "ML_antiquotation"; |
a48f9bbbe720
avoid spaces in markup names, which might cause problems in boundary situations (e.g. HTML class);
wenzelm
parents:
49036
diff
changeset
|
239 |
val document_antiquotationN = "document_antiquotation"; |
a48f9bbbe720
avoid spaces in markup names, which might cause problems in boundary situations (e.g. HTML class);
wenzelm
parents:
49036
diff
changeset
|
240 |
val document_antiquotation_optionN = "document_antiquotation_option"; |
27879 | 241 |
|
27875 | 242 |
|
50162 | 243 |
(* text structure *) |
244 |
||
245 |
val (paragraphN, paragraph) = markup_elem "paragraph"; |
|
246 |
||
247 |
||
23623 | 248 |
(* outer syntax *) |
249 |
||
37193 | 250 |
val (keywordN, keyword) = markup_elem "keyword"; |
37192 | 251 |
val (operatorN, operator) = markup_elem "operator"; |
37193 | 252 |
val (commandN, command) = markup_elem "command"; |
25552 | 253 |
val (stringN, string) = markup_elem "string"; |
254 |
val (altstringN, altstring) = markup_elem "altstring"; |
|
255 |
val (verbatimN, verbatim) = markup_elem "verbatim"; |
|
256 |
val (commentN, comment) = markup_elem "comment"; |
|
257 |
val (controlN, control) = markup_elem "control"; |
|
23719 | 258 |
|
38229 | 259 |
val tokenN = "token"; |
260 |
fun token props = (tokenN, props); |
|
27851 | 261 |
|
49554
7b7bd2d7661d
more explicit keyword1/keyword2 markup -- avoid potential conflict with input token markup produced by Token_Marker;
wenzelm
parents:
49358
diff
changeset
|
262 |
val (keyword1N, keyword1) = markup_elem "keyword1"; |
7b7bd2d7661d
more explicit keyword1/keyword2 markup -- avoid potential conflict with input token markup produced by Token_Marker;
wenzelm
parents:
49358
diff
changeset
|
263 |
val (keyword2N, keyword2) = markup_elem "keyword2"; |
7b7bd2d7661d
more explicit keyword1/keyword2 markup -- avoid potential conflict with input token markup produced by Token_Marker;
wenzelm
parents:
49358
diff
changeset
|
264 |
|
23623 | 265 |
|
45674 | 266 |
(* timing *) |
267 |
||
268 |
val timingN = "timing"; |
|
269 |
val elapsedN = "elapsed"; |
|
270 |
val cpuN = "cpu"; |
|
271 |
val gcN = "gc"; |
|
272 |
||
273 |
fun timing {elapsed, cpu, gc} = |
|
274 |
(timingN, |
|
275 |
[(elapsedN, Time.toString elapsed), |
|
276 |
(cpuN, Time.toString cpu), |
|
277 |
(gcN, Time.toString gc)]); |
|
278 |
||
279 |
||
40394
6dcb6cbf0719
somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents:
40391
diff
changeset
|
280 |
(* toplevel *) |
40391
b0dafbfc05b7
explicit "timing" status for toplevel transactions;
wenzelm
parents:
40131
diff
changeset
|
281 |
|
38721
ca8b14fa0d0d
added some proof state markup, notably number of subgoals (e.g. for indentation);
wenzelm
parents:
38474
diff
changeset
|
282 |
val subgoalsN = "subgoals"; |
ca8b14fa0d0d
added some proof state markup, notably number of subgoals (e.g. for indentation);
wenzelm
parents:
38474
diff
changeset
|
283 |
val (proof_stateN, proof_state) = markup_int "proof_state" subgoalsN; |
ca8b14fa0d0d
added some proof state markup, notably number of subgoals (e.g. for indentation);
wenzelm
parents:
38474
diff
changeset
|
284 |
|
25552 | 285 |
val (stateN, state) = markup_elem "state"; |
286 |
val (subgoalN, subgoal) = markup_elem "subgoal"; |
|
287 |
val (sendbackN, sendback) = markup_elem "sendback"; |
|
49358 | 288 |
val (intensifyN, intensify) = markup_elem "intensify"; |
25552 | 289 |
|
290 |
||
27606 | 291 |
(* command status *) |
292 |
||
29417 | 293 |
val taskN = "task"; |
294 |
||
47395
e6261a493f04
added static command status markup, to emphasize accepted but unassigned/unparsed commands (notably in overview panel);
wenzelm
parents:
46910
diff
changeset
|
295 |
val (acceptedN, accepted) = markup_elem "accepted"; |
37186
349e9223c685
explicit markup for forked goals, as indicated by Goal.fork;
wenzelm
parents:
34242
diff
changeset
|
296 |
val (forkedN, forked) = markup_elem "forked"; |
349e9223c685
explicit markup for forked goals, as indicated by Goal.fork;
wenzelm
parents:
34242
diff
changeset
|
297 |
val (joinedN, joined) = markup_elem "joined"; |
49036
4680c4046814
further refinement of command status, to accomodate forked proofs;
wenzelm
parents:
49009
diff
changeset
|
298 |
val (runningN, running) = markup_elem "running"; |
4680c4046814
further refinement of command status, to accomodate forked proofs;
wenzelm
parents:
49009
diff
changeset
|
299 |
val (finishedN, finished) = markup_elem "finished"; |
27615 | 300 |
val (failedN, failed) = markup_elem "failed"; |
27606 | 301 |
|
29488 | 302 |
|
27969 | 303 |
(* messages *) |
304 |
||
38871 | 305 |
val serialN = "serial"; |
27969 | 306 |
|
49677
c4e2762a265c
more direct message header: eliminated historic encoding via single letter;
wenzelm
parents:
49674
diff
changeset
|
307 |
val initN = "init"; |
c4e2762a265c
more direct message header: eliminated historic encoding via single letter;
wenzelm
parents:
49674
diff
changeset
|
308 |
val statusN = "status"; |
c4e2762a265c
more direct message header: eliminated historic encoding via single letter;
wenzelm
parents:
49674
diff
changeset
|
309 |
val writelnN = "writeln"; |
c4e2762a265c
more direct message header: eliminated historic encoding via single letter;
wenzelm
parents:
49674
diff
changeset
|
310 |
val tracingN = "tracing"; |
c4e2762a265c
more direct message header: eliminated historic encoding via single letter;
wenzelm
parents:
49674
diff
changeset
|
311 |
val warningN = "warning"; |
c4e2762a265c
more direct message header: eliminated historic encoding via single letter;
wenzelm
parents:
49674
diff
changeset
|
312 |
val errorN = "error"; |
c4e2762a265c
more direct message header: eliminated historic encoding via single letter;
wenzelm
parents:
49674
diff
changeset
|
313 |
val protocolN = "protocol"; |
c4e2762a265c
more direct message header: eliminated historic encoding via single letter;
wenzelm
parents:
49674
diff
changeset
|
314 |
|
44549 | 315 |
val (legacyN, legacy) = markup_elem "legacy"; |
27969 | 316 |
val (promptN, prompt) = markup_elem "prompt"; |
317 |
||
38887
1261481ef5e5
Command.State: add reported positions to markup tree, according main message position or Markup.binding/entity/report occurrences in body;
wenzelm
parents:
38871
diff
changeset
|
318 |
val (reportN, report) = markup_elem "report"; |
39439
1c294d150ded
eliminated markup "location" in favour of more explicit "no_report", which is actually deleted from messages;
wenzelm
parents:
39171
diff
changeset
|
319 |
val (no_reportN, no_report) = markup_elem "no_report"; |
38887
1261481ef5e5
Command.State: add reported positions to markup tree, according main message position or Markup.binding/entity/report occurrences in body;
wenzelm
parents:
38871
diff
changeset
|
320 |
|
48768
abc45de5bb22
clarified "bad" markup: proper body text, invent missing serial on Scala side (counting backwards);
wenzelm
parents:
48756
diff
changeset
|
321 |
val (badN, bad) = markup_elem "bad"; |
39171
525a13b9ac74
highlight bad range of nested error (here from inner parsing);
wenzelm
parents:
39168
diff
changeset
|
322 |
|
49566
66cbf8bb4693
basic integration of graphview into document model;
wenzelm
parents:
49554
diff
changeset
|
323 |
val graphviewN = "graphview"; |
66cbf8bb4693
basic integration of graphview into document model;
wenzelm
parents:
49554
diff
changeset
|
324 |
|
27969 | 325 |
|
46774 | 326 |
(* protocol message functions *) |
43748 | 327 |
|
328 |
val functionN = "function" |
|
329 |
||
44661
383c9d758a56
raw message function "assign_execs" avoids full overhead of decoding and caching message body;
wenzelm
parents:
44549
diff
changeset
|
330 |
val assign_execs = [(functionN, "assign_execs")]; |
44676 | 331 |
val removed_versions = [(functionN, "removed_versions")]; |
44661
383c9d758a56
raw message function "assign_execs" avoids full overhead of decoding and caching message body;
wenzelm
parents:
44549
diff
changeset
|
332 |
|
45666 | 333 |
fun invoke_scala name id = [(functionN, "invoke_scala"), (Markup.nameN, name), (idN, id)]; |
44298
b8f8488704e2
Future.promise: explicit abort operation (like uninterruptible future job);
wenzelm
parents:
43797
diff
changeset
|
334 |
fun cancel_scala id = [(functionN, "cancel_scala"), (idN, id)]; |
43748 | 335 |
|
23623 | 336 |
end; |