src/Pure/General/markup.ML
author wenzelm
Thu, 25 Aug 2011 16:44:06 +0200
changeset 44476 e8a87398f35d
parent 44298 b8f8488704e2
child 44549 5e5e6ad3922c
permissions -rw-r--r--
propagate information about last command with exec state assignment through document model;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
23623
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
     1
(*  Title:      Pure/General/markup.ML
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
     2
    Author:     Makarius
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
     3
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
     4
Common markup elements.
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
     5
*)
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
     6
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
     7
signature MARKUP =
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
     8
sig
38414
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
     9
  val parse_int: string -> int
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
    10
  val print_int: int -> string
28017
4919bd124a58 type Properties.T;
wenzelm
parents: 27969
diff changeset
    11
  type T = string * Properties.T
38474
e498dc2eb576 uniform Markup.empty/Markup.Empty in ML and Scala;
wenzelm
parents: 38429
diff changeset
    12
  val empty: T
e498dc2eb576 uniform Markup.empty/Markup.Empty in ML and Scala;
wenzelm
parents: 38429
diff changeset
    13
  val is_empty: T -> bool
38229
61d0fe8b96ac more robust treatment of Markup.token;
wenzelm
parents: 37195
diff changeset
    14
  val properties: Properties.T -> T -> T
23623
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
    15
  val nameN: string
27818
74087a19879f added name property operation;
wenzelm
parents: 27804
diff changeset
    16
  val name: string -> T -> T
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
    17
  val kindN: string
43547
f3a8476285c6 clarified Binding.pretty/print: no quotes, only markup -- Binding.str_of is rendered obsolete;
wenzelm
parents: 43432
diff changeset
    18
  val bindingN: string val binding: T
42135
da200fa2768c decode_term: some context-sensitive markup;
wenzelm
parents: 42012
diff changeset
    19
  val entityN: string val entity: string -> string -> T
43548
f231a7594e54 type classes: entity markup instead of old-style token markup;
wenzelm
parents: 43547
diff changeset
    20
  val get_entity_kind: T -> string option
33088
757d7787b10c markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents: 32738
diff changeset
    21
  val defN: string
757d7787b10c markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents: 32738
diff changeset
    22
  val refN: string
23671
9e8257472c27 proper position markup;
wenzelm
parents: 23658
diff changeset
    23
  val lineN: string
27794
bdea6e17cbe3 added offset/end_offset;
wenzelm
parents: 27748
diff changeset
    24
  val offsetN: string
bdea6e17cbe3 added offset/end_offset;
wenzelm
parents: 27748
diff changeset
    25
  val end_offsetN: string
23671
9e8257472c27 proper position markup;
wenzelm
parents: 23658
diff changeset
    26
  val fileN: string
30221
14145e81a2fe added markup for binding;
wenzelm
parents: 29522
diff changeset
    27
  val idN: string
27748
c421ee0d2350 added position_properties';
wenzelm
parents: 27743
diff changeset
    28
  val position_properties': string list
26051
43bcb30a6d97 added position_properties;
wenzelm
parents: 26001
diff changeset
    29
  val position_properties: string list
23671
9e8257472c27 proper position markup;
wenzelm
parents: 23658
diff changeset
    30
  val positionN: string val position: T
43593
11140987d415 print Path.T with some markup;
wenzelm
parents: 43564
diff changeset
    31
  val pathN: string val path: string -> T
23644
e28b8e8a85b6 added markup for pretty printing;
wenzelm
parents: 23642
diff changeset
    32
  val indentN: string
23704
18d6ee425689 added print_mode setup (from pretty.ML);
wenzelm
parents: 23695
diff changeset
    33
  val blockN: string val block: int -> T
23695
6c4662bb4862 Add widthN to signature
aspinall
parents: 23671
diff changeset
    34
  val widthN: string
23644
e28b8e8a85b6 added markup for pretty printing;
wenzelm
parents: 23642
diff changeset
    35
  val breakN: string val break: int -> T
e28b8e8a85b6 added markup for pretty printing;
wenzelm
parents: 23642
diff changeset
    36
  val fbreakN: string val fbreak: T
33985
1d33e85a3fa9 added markup for hidden text;
wenzelm
parents: 33643
diff changeset
    37
  val hiddenN: string val hidden: T
43548
f231a7594e54 type classes: entity markup instead of old-style token markup;
wenzelm
parents: 43547
diff changeset
    38
  val classN: string
43552
156c822f181a entity markup for "type", "constant";
wenzelm
parents: 43548
diff changeset
    39
  val typeN: string
156c822f181a entity markup for "type", "constant";
wenzelm
parents: 43548
diff changeset
    40
  val constantN: string
26702
a079f8f0080b added markup for fixed variables (local constants);
wenzelm
parents: 26255
diff changeset
    41
  val fixedN: string val fixed: string -> T
27740
0b22524c05e2 removed axiom;
wenzelm
parents: 27735
diff changeset
    42
  val dynamic_factN: string val dynamic_fact: string -> T
23719
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
    43
  val tfreeN: string val tfree: T
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
    44
  val tvarN: string val tvar: T
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
    45
  val freeN: string val free: T
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
    46
  val skolemN: string val skolem: T
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
    47
  val boundN: string val bound: T
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
    48
  val varN: string val var: T
29318
6337d1cb2ba0 added numeral, which supercedes num, xnum, float;
wenzelm
parents: 28904
diff changeset
    49
  val numeralN: string val numeral: T
27804
f682666352c4 added literal;
wenzelm
parents: 27794
diff changeset
    50
  val literalN: string val literal: T
43432
224006e5ac46 inner literal/delimiter corresponds to outer keyword/operator;
wenzelm
parents: 42492
diff changeset
    51
  val delimiterN: string val delimiter: T
29318
6337d1cb2ba0 added numeral, which supercedes num, xnum, float;
wenzelm
parents: 28904
diff changeset
    52
  val inner_stringN: string val inner_string: T
27883
e506f0c6d3f0 added is_none;
wenzelm
parents: 27879
diff changeset
    53
  val inner_commentN: string val inner_comment: T
39168
e3ac771235f7 report token range after inner parse error -- often provides important clues about misunderstanding concerning lexical phase;
wenzelm
parents: 38887
diff changeset
    54
  val token_rangeN: string val token_range: T
23637
f3e16ee56f32 added toplevel markup;
wenzelm
parents: 23626
diff changeset
    55
  val sortN: string val sort: T
f3e16ee56f32 added toplevel markup;
wenzelm
parents: 23626
diff changeset
    56
  val typN: string val typ: T
f3e16ee56f32 added toplevel markup;
wenzelm
parents: 23626
diff changeset
    57
  val termN: string val term: T
27818
74087a19879f added name property operation;
wenzelm
parents: 27804
diff changeset
    58
  val propN: string val prop: T
30614
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
    59
  val ML_keywordN: string val ML_keyword: T
37195
e87d305a4490 separate markup for ML delimiters;
wenzelm
parents: 37193
diff changeset
    60
  val ML_delimiterN: string val ML_delimiter: T
30614
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
    61
  val ML_identN: string val ML_ident: T
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
    62
  val ML_tvarN: string val ML_tvar: T
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
    63
  val ML_numeralN: string val ML_numeral: T
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
    64
  val ML_charN: string val ML_char: T
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
    65
  val ML_stringN: string val ML_string: T
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
    66
  val ML_commentN: string val ML_comment: T
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
    67
  val ML_malformedN: string val ML_malformed: T
42327
7c7cc7590eb3 Name_Space.entry_markup: keep def position as separate properties;
wenzelm
parents: 42135
diff changeset
    68
  val ML_defN: string
7c7cc7590eb3 Name_Space.entry_markup: keep def position as separate properties;
wenzelm
parents: 42135
diff changeset
    69
  val ML_openN: string
7c7cc7590eb3 Name_Space.entry_markup: keep def position as separate properties;
wenzelm
parents: 42135
diff changeset
    70
  val ML_structN: string
30702
274626e2b2dd more markup elements for ML programs;
wenzelm
parents: 30614
diff changeset
    71
  val ML_typingN: string val ML_typing: T
27875
1b46d9ec3788 added ML_source, doc_source;
wenzelm
parents: 27851
diff changeset
    72
  val ML_sourceN: string val ML_source: T
1b46d9ec3788 added ML_source, doc_source;
wenzelm
parents: 27851
diff changeset
    73
  val doc_sourceN: string val doc_source: T
27879
wenzelm
parents: 27875
diff changeset
    74
  val antiqN: string val antiq: T
43560
d1650e3720fd ML antiquotations are managed as theory data, with proper name space and entity markup;
wenzelm
parents: 43552
diff changeset
    75
  val ML_antiquotationN: string
43564
9864182c6bad document antiquotations are managed as theory data, with proper name space and entity markup;
wenzelm
parents: 43560
diff changeset
    76
  val doc_antiquotationN: string
9864182c6bad document antiquotations are managed as theory data, with proper name space and entity markup;
wenzelm
parents: 43560
diff changeset
    77
  val doc_antiquotation_optionN: string
27836
74e8228757c5 renamed unknown_span to malformed_span;
wenzelm
parents: 27828
diff changeset
    78
  val keyword_declN: string val keyword_decl: string -> T
74e8228757c5 renamed unknown_span to malformed_span;
wenzelm
parents: 27828
diff changeset
    79
  val command_declN: string val command_decl: string -> string -> T
37193
a4b2bb0dab08 simplified command/keyword markup;
wenzelm
parents: 37192
diff changeset
    80
  val keywordN: string val keyword: T
37192
8cdddd689ea9 markup non-identifier keyword as operator;
wenzelm
parents: 37186
diff changeset
    81
  val operatorN: string val operator: T
37193
a4b2bb0dab08 simplified command/keyword markup;
wenzelm
parents: 37192
diff changeset
    82
  val commandN: string val command: T
27836
74e8228757c5 renamed unknown_span to malformed_span;
wenzelm
parents: 27828
diff changeset
    83
  val identN: string val ident: T
23719
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
    84
  val stringN: string val string: T
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
    85
  val altstringN: string val altstring: T
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
    86
  val verbatimN: string val verbatim: T
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
    87
  val commentN: string val comment: T
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
    88
  val controlN: string val control: T
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
    89
  val malformedN: string val malformed: T
38229
61d0fe8b96ac more robust treatment of Markup.token;
wenzelm
parents: 37195
diff changeset
    90
  val tokenN: string val token: Properties.T -> T
27660
61fef1137a25 renamed command span markup;
wenzelm
parents: 27615
diff changeset
    91
  val command_spanN: string val command_span: string -> T
61fef1137a25 renamed command span markup;
wenzelm
parents: 27615
diff changeset
    92
  val ignored_spanN: string val ignored_span: T
27836
74e8228757c5 renamed unknown_span to malformed_span;
wenzelm
parents: 27828
diff changeset
    93
  val malformed_spanN: string val malformed_span: T
43673
29eb1cd29961 Thy_Info.dependencies: ignore already loaded theories, according to initial prover session status;
wenzelm
parents: 43665
diff changeset
    94
  val loaded_theoryN: string val loaded_theory: string -> T
40394
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
    95
  val elapsedN: string
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
    96
  val cpuN: string
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
    97
  val gcN: string
42012
2c3fe3cbebae structure Timing: covers former start_timing/end_timing and Output.timeit etc;
wenzelm
parents: 41484
diff changeset
    98
  val timingN: string val timing: Timing.timing -> T
38721
ca8b14fa0d0d added some proof state markup, notably number of subgoals (e.g. for indentation);
wenzelm
parents: 38474
diff changeset
    99
  val subgoalsN: string
ca8b14fa0d0d added some proof state markup, notably number of subgoals (e.g. for indentation);
wenzelm
parents: 38474
diff changeset
   100
  val proof_stateN: string val proof_state: int -> T
23637
f3e16ee56f32 added toplevel markup;
wenzelm
parents: 23626
diff changeset
   101
  val stateN: string val state: T
f3e16ee56f32 added toplevel markup;
wenzelm
parents: 23626
diff changeset
   102
  val subgoalN: string val subgoal: T
24289
bfd59eb6e24e added sendback;
wenzelm
parents: 23922
diff changeset
   103
  val sendbackN: string val sendback: T
24555
ea220faa69e7 added hilite markup;
wenzelm
parents: 24289
diff changeset
   104
  val hiliteN: string val hilite: T
29417
779ff1187327 added running task markup;
wenzelm
parents: 29325
diff changeset
   105
  val taskN: string
37186
349e9223c685 explicit markup for forked goals, as indicated by Goal.fork;
wenzelm
parents: 34242
diff changeset
   106
  val forkedN: string val forked: T
349e9223c685 explicit markup for forked goals, as indicated by Goal.fork;
wenzelm
parents: 34242
diff changeset
   107
  val joinedN: string val joined: T
27615
wenzelm
parents: 27606
diff changeset
   108
  val failedN: string val failed: T
27606
82399f3a8ca8 support for command status;
wenzelm
parents: 27523
diff changeset
   109
  val finishedN: string val finished: T
38414
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   110
  val versionN: string
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   111
  val assignN: string val assign: int -> T
38871
28496da3bec2 message serial number indicates physical order;
wenzelm
parents: 38721
diff changeset
   112
  val serialN: string
27969
46d7057b8614 added messages and process information;
wenzelm
parents: 27894
diff changeset
   113
  val promptN: string val prompt: T
31384
ce169bd37fc0 IsabelleProcess: emit status "ready" after initialization and reports;
wenzelm
parents: 30702
diff changeset
   114
  val readyN: string val ready: T
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
   115
  val reportN: string val report: T
39439
1c294d150ded eliminated markup "location" in favour of more explicit "no_report", which is actually deleted from messages;
wenzelm
parents: 39171
diff changeset
   116
  val no_reportN: string val no_report: T
39171
525a13b9ac74 highlight bad range of nested error (here from inner parsing);
wenzelm
parents: 39168
diff changeset
   117
  val badN: string val bad: T
43748
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43710
diff changeset
   118
  val functionN: string
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43710
diff changeset
   119
  val invoke_scala: string -> string -> Properties.T
44298
b8f8488704e2 Future.promise: explicit abort operation (like uninterruptible future job);
wenzelm
parents: 43797
diff changeset
   120
  val cancel_scala: string -> Properties.T
40131
7cbebd636e79 explicitly qualify type Output.output, which is a slightly odd internal feature;
wenzelm
parents: 39585
diff changeset
   121
  val no_output: Output.output * Output.output
7cbebd636e79 explicitly qualify type Output.output, which is a slightly odd internal feature;
wenzelm
parents: 39585
diff changeset
   122
  val default_output: T -> Output.output * Output.output
7cbebd636e79 explicitly qualify type Output.output, which is a slightly odd internal feature;
wenzelm
parents: 39585
diff changeset
   123
  val add_mode: string -> (T -> Output.output * Output.output) -> unit
7cbebd636e79 explicitly qualify type Output.output, which is a slightly odd internal feature;
wenzelm
parents: 39585
diff changeset
   124
  val output: T -> Output.output * Output.output
7cbebd636e79 explicitly qualify type Output.output, which is a slightly odd internal feature;
wenzelm
parents: 39585
diff changeset
   125
  val enclose: T -> Output.output -> Output.output
25552
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   126
  val markup: T -> string -> string
43665
573d1272f36d tuned signature;
wenzelm
parents: 43593
diff changeset
   127
  val markup_only: T -> string
23623
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   128
end;
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   129
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   130
structure Markup: MARKUP =
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   131
struct
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   132
30221
14145e81a2fe added markup for binding;
wenzelm
parents: 29522
diff changeset
   133
(** markup elements **)
14145e81a2fe added markup for binding;
wenzelm
parents: 29522
diff changeset
   134
38414
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   135
(* integers *)
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   136
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   137
fun parse_int s =
43797
fad7758421bf more precise integer Markup.properties/XML.attributes: disallow ML-style ~ minus;
wenzelm
parents: 43748
diff changeset
   138
  let val i = Int.fromString s in
fad7758421bf more precise integer Markup.properties/XML.attributes: disallow ML-style ~ minus;
wenzelm
parents: 43748
diff changeset
   139
    if is_none i orelse String.isPrefix "~" s
fad7758421bf more precise integer Markup.properties/XML.attributes: disallow ML-style ~ minus;
wenzelm
parents: 43748
diff changeset
   140
    then raise Fail ("Bad integer: " ^ quote s)
fad7758421bf more precise integer Markup.properties/XML.attributes: disallow ML-style ~ minus;
wenzelm
parents: 43748
diff changeset
   141
    else the i
fad7758421bf more precise integer Markup.properties/XML.attributes: disallow ML-style ~ minus;
wenzelm
parents: 43748
diff changeset
   142
  end;
38414
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   143
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   144
val print_int = signed_string_of_int;
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   145
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   146
23658
wenzelm
parents: 23644
diff changeset
   147
(* basic markup *)
23623
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   148
28017
4919bd124a58 type Properties.T;
wenzelm
parents: 27969
diff changeset
   149
type T = string * Properties.T;
23637
f3e16ee56f32 added toplevel markup;
wenzelm
parents: 23626
diff changeset
   150
38474
e498dc2eb576 uniform Markup.empty/Markup.Empty in ML and Scala;
wenzelm
parents: 38429
diff changeset
   151
val empty = ("", []);
23637
f3e16ee56f32 added toplevel markup;
wenzelm
parents: 23626
diff changeset
   152
38474
e498dc2eb576 uniform Markup.empty/Markup.Empty in ML and Scala;
wenzelm
parents: 38429
diff changeset
   153
fun is_empty ("", _) = true
e498dc2eb576 uniform Markup.empty/Markup.Empty in ML and Scala;
wenzelm
parents: 38429
diff changeset
   154
  | is_empty _ = false;
27883
e506f0c6d3f0 added is_none;
wenzelm
parents: 27879
diff changeset
   155
23794
ab2edd87b912 added get_string, get_int;
wenzelm
parents: 23786
diff changeset
   156
23671
9e8257472c27 proper position markup;
wenzelm
parents: 23658
diff changeset
   157
fun properties more_props ((elem, props): T) =
28017
4919bd124a58 type Properties.T;
wenzelm
parents: 27969
diff changeset
   158
  (elem, fold_rev Properties.put more_props props);
23671
9e8257472c27 proper position markup;
wenzelm
parents: 23658
diff changeset
   159
25552
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   160
fun markup_elem elem = (elem, (elem, []): T);
23794
ab2edd87b912 added get_string, get_int;
wenzelm
parents: 23786
diff changeset
   161
fun markup_string elem prop = (elem, fn s => (elem, [(prop, s)]): T);
38414
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   162
fun markup_int elem prop = (elem, fn i => (elem, [(prop, print_int i)]): T);
23794
ab2edd87b912 added get_string, get_int;
wenzelm
parents: 23786
diff changeset
   163
26977
e736139b553d added theory_nameN;
wenzelm
parents: 26702
diff changeset
   164
38721
ca8b14fa0d0d added some proof state markup, notably number of subgoals (e.g. for indentation);
wenzelm
parents: 38474
diff changeset
   165
(* misc properties *)
26977
e736139b553d added theory_nameN;
wenzelm
parents: 26702
diff changeset
   166
23658
wenzelm
parents: 23644
diff changeset
   167
val nameN = "name";
27818
74087a19879f added name property operation;
wenzelm
parents: 27804
diff changeset
   168
fun name a = properties [(nameN, a)];
74087a19879f added name property operation;
wenzelm
parents: 27804
diff changeset
   169
23658
wenzelm
parents: 23644
diff changeset
   170
val kindN = "kind";
23671
9e8257472c27 proper position markup;
wenzelm
parents: 23658
diff changeset
   171
23658
wenzelm
parents: 23644
diff changeset
   172
33088
757d7787b10c markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents: 32738
diff changeset
   173
(* formal entities *)
757d7787b10c markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents: 32738
diff changeset
   174
43547
f3a8476285c6 clarified Binding.pretty/print: no quotes, only markup -- Binding.str_of is rendered obsolete;
wenzelm
parents: 43432
diff changeset
   175
val (bindingN, binding) = markup_elem "binding";
42135
da200fa2768c decode_term: some context-sensitive markup;
wenzelm
parents: 42012
diff changeset
   176
da200fa2768c decode_term: some context-sensitive markup;
wenzelm
parents: 42012
diff changeset
   177
val entityN = "entity";
42377
c113db12bf8b tuned -- order in memory according to variance;
wenzelm
parents: 42376
diff changeset
   178
fun entity kind name = (entityN, [(nameN, name), (kindN, kind)]);
33088
757d7787b10c markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents: 32738
diff changeset
   179
43548
f231a7594e54 type classes: entity markup instead of old-style token markup;
wenzelm
parents: 43547
diff changeset
   180
fun get_entity_kind (name, props) =
f231a7594e54 type classes: entity markup instead of old-style token markup;
wenzelm
parents: 43547
diff changeset
   181
  if name = entityN then AList.lookup (op =) props kindN
f231a7594e54 type classes: entity markup instead of old-style token markup;
wenzelm
parents: 43547
diff changeset
   182
  else NONE;
f231a7594e54 type classes: entity markup instead of old-style token markup;
wenzelm
parents: 43547
diff changeset
   183
33088
757d7787b10c markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents: 32738
diff changeset
   184
val defN = "def";
757d7787b10c markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents: 32738
diff changeset
   185
val refN = "ref";
757d7787b10c markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents: 32738
diff changeset
   186
757d7787b10c markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents: 32738
diff changeset
   187
23671
9e8257472c27 proper position markup;
wenzelm
parents: 23658
diff changeset
   188
(* position *)
9e8257472c27 proper position markup;
wenzelm
parents: 23658
diff changeset
   189
9e8257472c27 proper position markup;
wenzelm
parents: 23658
diff changeset
   190
val lineN = "line";
27794
bdea6e17cbe3 added offset/end_offset;
wenzelm
parents: 27748
diff changeset
   191
val offsetN = "offset";
bdea6e17cbe3 added offset/end_offset;
wenzelm
parents: 27748
diff changeset
   192
val end_offsetN = "end_offset";
23671
9e8257472c27 proper position markup;
wenzelm
parents: 23658
diff changeset
   193
val fileN = "file";
25816
d2a94e6a7d1e moved id to position properties;
wenzelm
parents: 25808
diff changeset
   194
val idN = "id";
23671
9e8257472c27 proper position markup;
wenzelm
parents: 23658
diff changeset
   195
41484
51310e1ccd6f more direct treatment of Position.end_offset;
wenzelm
parents: 41483
diff changeset
   196
val position_properties' = [fileN, idN];
43710
7270ae921cf2 discontinued odd Position.column -- left-over from attempts at PGIP implementation;
wenzelm
parents: 43684
diff changeset
   197
val position_properties = [lineN, offsetN, end_offsetN] @ position_properties';
27748
c421ee0d2350 added position_properties';
wenzelm
parents: 27743
diff changeset
   198
25552
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   199
val (positionN, position) = markup_elem "position";
26255
2246d8bbe89d added location;
wenzelm
parents: 26051
diff changeset
   200
23644
e28b8e8a85b6 added markup for pretty printing;
wenzelm
parents: 23642
diff changeset
   201
43593
11140987d415 print Path.T with some markup;
wenzelm
parents: 43564
diff changeset
   202
(* path *)
11140987d415 print Path.T with some markup;
wenzelm
parents: 43564
diff changeset
   203
11140987d415 print Path.T with some markup;
wenzelm
parents: 43564
diff changeset
   204
val (pathN, path) = markup_string "path" nameN;
11140987d415 print Path.T with some markup;
wenzelm
parents: 43564
diff changeset
   205
11140987d415 print Path.T with some markup;
wenzelm
parents: 43564
diff changeset
   206
23644
e28b8e8a85b6 added markup for pretty printing;
wenzelm
parents: 23642
diff changeset
   207
(* pretty printing *)
e28b8e8a85b6 added markup for pretty printing;
wenzelm
parents: 23642
diff changeset
   208
e28b8e8a85b6 added markup for pretty printing;
wenzelm
parents: 23642
diff changeset
   209
val indentN = "indent";
e28b8e8a85b6 added markup for pretty printing;
wenzelm
parents: 23642
diff changeset
   210
val (blockN, block) = markup_int "block" indentN;
e28b8e8a85b6 added markup for pretty printing;
wenzelm
parents: 23642
diff changeset
   211
e28b8e8a85b6 added markup for pretty printing;
wenzelm
parents: 23642
diff changeset
   212
val widthN = "width";
e28b8e8a85b6 added markup for pretty printing;
wenzelm
parents: 23642
diff changeset
   213
val (breakN, break) = markup_int "break" widthN;
e28b8e8a85b6 added markup for pretty printing;
wenzelm
parents: 23642
diff changeset
   214
25552
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   215
val (fbreakN, fbreak) = markup_elem "fbreak";
23637
f3e16ee56f32 added toplevel markup;
wenzelm
parents: 23626
diff changeset
   216
f3e16ee56f32 added toplevel markup;
wenzelm
parents: 23626
diff changeset
   217
33985
1d33e85a3fa9 added markup for hidden text;
wenzelm
parents: 33643
diff changeset
   218
(* hidden text *)
1d33e85a3fa9 added markup for hidden text;
wenzelm
parents: 33643
diff changeset
   219
1d33e85a3fa9 added markup for hidden text;
wenzelm
parents: 33643
diff changeset
   220
val (hiddenN, hidden) = markup_elem "hidden";
1d33e85a3fa9 added markup for hidden text;
wenzelm
parents: 33643
diff changeset
   221
1d33e85a3fa9 added markup for hidden text;
wenzelm
parents: 33643
diff changeset
   222
23623
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   223
(* logical entities *)
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   224
43548
f231a7594e54 type classes: entity markup instead of old-style token markup;
wenzelm
parents: 43547
diff changeset
   225
val classN = "class";
43552
156c822f181a entity markup for "type", "constant";
wenzelm
parents: 43548
diff changeset
   226
val typeN = "type";
156c822f181a entity markup for "type", "constant";
wenzelm
parents: 43548
diff changeset
   227
val constantN = "constant";
156c822f181a entity markup for "type", "constant";
wenzelm
parents: 43548
diff changeset
   228
26702
a079f8f0080b added markup for fixed variables (local constants);
wenzelm
parents: 26255
diff changeset
   229
val (fixedN, fixed) = markup_string "fixed" nameN;
27740
0b22524c05e2 removed axiom;
wenzelm
parents: 27735
diff changeset
   230
val (dynamic_factN, dynamic_fact) = markup_string "dynamic_fact" nameN;
23623
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   231
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   232
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   233
(* inner syntax *)
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   234
25552
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   235
val (tfreeN, tfree) = markup_elem "tfree";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   236
val (tvarN, tvar) = markup_elem "tvar";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   237
val (freeN, free) = markup_elem "free";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   238
val (skolemN, skolem) = markup_elem "skolem";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   239
val (boundN, bound) = markup_elem "bound";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   240
val (varN, var) = markup_elem "var";
29318
6337d1cb2ba0 added numeral, which supercedes num, xnum, float;
wenzelm
parents: 28904
diff changeset
   241
val (numeralN, numeral) = markup_elem "numeral";
27804
f682666352c4 added literal;
wenzelm
parents: 27794
diff changeset
   242
val (literalN, literal) = markup_elem "literal";
43432
224006e5ac46 inner literal/delimiter corresponds to outer keyword/operator;
wenzelm
parents: 42492
diff changeset
   243
val (delimiterN, delimiter) = markup_elem "delimiter";
29318
6337d1cb2ba0 added numeral, which supercedes num, xnum, float;
wenzelm
parents: 28904
diff changeset
   244
val (inner_stringN, inner_string) = markup_elem "inner_string";
27883
e506f0c6d3f0 added is_none;
wenzelm
parents: 27879
diff changeset
   245
val (inner_commentN, inner_comment) = markup_elem "inner_comment";
23719
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
   246
39168
e3ac771235f7 report token range after inner parse error -- often provides important clues about misunderstanding concerning lexical phase;
wenzelm
parents: 38887
diff changeset
   247
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
   248
25552
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   249
val (sortN, sort) = markup_elem "sort";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   250
val (typN, typ) = markup_elem "typ";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   251
val (termN, term) = markup_elem "term";
27818
74087a19879f added name property operation;
wenzelm
parents: 27804
diff changeset
   252
val (propN, prop) = markup_elem "prop";
27748
c421ee0d2350 added position_properties';
wenzelm
parents: 27743
diff changeset
   253
23623
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   254
30614
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
   255
(* ML syntax *)
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
   256
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
   257
val (ML_keywordN, ML_keyword) = markup_elem "ML_keyword";
37195
e87d305a4490 separate markup for ML delimiters;
wenzelm
parents: 37193
diff changeset
   258
val (ML_delimiterN, ML_delimiter) = markup_elem "ML_delimiter";
30614
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
   259
val (ML_identN, ML_ident) = markup_elem "ML_ident";
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
   260
val (ML_tvarN, ML_tvar) = markup_elem "ML_tvar";
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
   261
val (ML_numeralN, ML_numeral) = markup_elem "ML_numeral";
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
   262
val (ML_charN, ML_char) = markup_elem "ML_char";
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
   263
val (ML_stringN, ML_string) = markup_elem "ML_string";
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
   264
val (ML_commentN, ML_comment) = markup_elem "ML_comment";
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
   265
val (ML_malformedN, ML_malformed) = markup_elem "ML_malformed";
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
   266
42327
7c7cc7590eb3 Name_Space.entry_markup: keep def position as separate properties;
wenzelm
parents: 42135
diff changeset
   267
val ML_defN = "ML_def";
7c7cc7590eb3 Name_Space.entry_markup: keep def position as separate properties;
wenzelm
parents: 42135
diff changeset
   268
val ML_openN = "ML_open";
7c7cc7590eb3 Name_Space.entry_markup: keep def position as separate properties;
wenzelm
parents: 42135
diff changeset
   269
val ML_structN = "ML_struct";
30702
274626e2b2dd more markup elements for ML programs;
wenzelm
parents: 30614
diff changeset
   270
val (ML_typingN, ML_typing) = markup_elem "ML_typing";
274626e2b2dd more markup elements for ML programs;
wenzelm
parents: 30614
diff changeset
   271
30614
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
   272
27875
1b46d9ec3788 added ML_source, doc_source;
wenzelm
parents: 27851
diff changeset
   273
(* embedded source text *)
1b46d9ec3788 added ML_source, doc_source;
wenzelm
parents: 27851
diff changeset
   274
1b46d9ec3788 added ML_source, doc_source;
wenzelm
parents: 27851
diff changeset
   275
val (ML_sourceN, ML_source) = markup_elem "ML_source";
1b46d9ec3788 added ML_source, doc_source;
wenzelm
parents: 27851
diff changeset
   276
val (doc_sourceN, doc_source) = markup_elem "doc_source";
1b46d9ec3788 added ML_source, doc_source;
wenzelm
parents: 27851
diff changeset
   277
27879
wenzelm
parents: 27875
diff changeset
   278
val (antiqN, antiq) = markup_elem "antiq";
43560
d1650e3720fd ML antiquotations are managed as theory data, with proper name space and entity markup;
wenzelm
parents: 43552
diff changeset
   279
val ML_antiquotationN = "ML antiquotation";
43564
9864182c6bad document antiquotations are managed as theory data, with proper name space and entity markup;
wenzelm
parents: 43560
diff changeset
   280
val doc_antiquotationN = "document antiquotation";
9864182c6bad document antiquotations are managed as theory data, with proper name space and entity markup;
wenzelm
parents: 43560
diff changeset
   281
val doc_antiquotation_optionN = "document antiquotation option";
27879
wenzelm
parents: 27875
diff changeset
   282
27875
1b46d9ec3788 added ML_source, doc_source;
wenzelm
parents: 27851
diff changeset
   283
23623
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   284
(* outer syntax *)
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   285
24870
9d057ff8e74c added keyword_decl, command_decl;
wenzelm
parents: 24777
diff changeset
   286
val (keyword_declN, keyword_decl) = markup_string "keyword_decl" nameN;
9d057ff8e74c added keyword_decl, command_decl;
wenzelm
parents: 24777
diff changeset
   287
9d057ff8e74c added keyword_decl, command_decl;
wenzelm
parents: 24777
diff changeset
   288
val command_declN = "command_decl";
9d057ff8e74c added keyword_decl, command_decl;
wenzelm
parents: 24777
diff changeset
   289
fun command_decl name kind : T = (command_declN, [(nameN, name), (kindN, kind)]);
9d057ff8e74c added keyword_decl, command_decl;
wenzelm
parents: 24777
diff changeset
   290
37193
a4b2bb0dab08 simplified command/keyword markup;
wenzelm
parents: 37192
diff changeset
   291
val (keywordN, keyword) = markup_elem "keyword";
37192
8cdddd689ea9 markup non-identifier keyword as operator;
wenzelm
parents: 37186
diff changeset
   292
val (operatorN, operator) = markup_elem "operator";
37193
a4b2bb0dab08 simplified command/keyword markup;
wenzelm
parents: 37192
diff changeset
   293
val (commandN, command) = markup_elem "command";
27836
74e8228757c5 renamed unknown_span to malformed_span;
wenzelm
parents: 27828
diff changeset
   294
val (identN, ident) = markup_elem "ident";
25552
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   295
val (stringN, string) = markup_elem "string";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   296
val (altstringN, altstring) = markup_elem "altstring";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   297
val (verbatimN, verbatim) = markup_elem "verbatim";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   298
val (commentN, comment) = markup_elem "comment";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   299
val (controlN, control) = markup_elem "control";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   300
val (malformedN, malformed) = markup_elem "malformed";
23719
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
   301
38229
61d0fe8b96ac more robust treatment of Markup.token;
wenzelm
parents: 37195
diff changeset
   302
val tokenN = "token";
61d0fe8b96ac more robust treatment of Markup.token;
wenzelm
parents: 37195
diff changeset
   303
fun token props = (tokenN, props);
27851
wenzelm
parents: 27836
diff changeset
   304
27660
61fef1137a25 renamed command span markup;
wenzelm
parents: 27615
diff changeset
   305
val (command_spanN, command_span) = markup_string "command_span" nameN;
61fef1137a25 renamed command span markup;
wenzelm
parents: 27615
diff changeset
   306
val (ignored_spanN, ignored_span) = markup_elem "ignored_span";
27836
74e8228757c5 renamed unknown_span to malformed_span;
wenzelm
parents: 27828
diff changeset
   307
val (malformed_spanN, malformed_span) = markup_elem "malformed_span";
23719
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
   308
23623
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   309
43673
29eb1cd29961 Thy_Info.dependencies: ignore already loaded theories, according to initial prover session status;
wenzelm
parents: 43665
diff changeset
   310
(* theory loader *)
29eb1cd29961 Thy_Info.dependencies: ignore already loaded theories, according to initial prover session status;
wenzelm
parents: 43665
diff changeset
   311
29eb1cd29961 Thy_Info.dependencies: ignore already loaded theories, according to initial prover session status;
wenzelm
parents: 43665
diff changeset
   312
val (loaded_theoryN, loaded_theory) = markup_string "loaded_theory" nameN;
29eb1cd29961 Thy_Info.dependencies: ignore already loaded theories, according to initial prover session status;
wenzelm
parents: 43665
diff changeset
   313
29eb1cd29961 Thy_Info.dependencies: ignore already loaded theories, according to initial prover session status;
wenzelm
parents: 43665
diff changeset
   314
40394
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   315
(* timing *)
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   316
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   317
val timingN = "timing";
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   318
val elapsedN = "elapsed";
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   319
val cpuN = "cpu";
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   320
val gcN = "gc";
23637
f3e16ee56f32 added toplevel markup;
wenzelm
parents: 23626
diff changeset
   321
42012
2c3fe3cbebae structure Timing: covers former start_timing/end_timing and Output.timeit etc;
wenzelm
parents: 41484
diff changeset
   322
fun timing {elapsed, cpu, gc} =
40394
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   323
  (timingN,
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   324
   [(elapsedN, Time.toString elapsed),
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   325
    (cpuN, Time.toString cpu),
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   326
    (gcN, Time.toString gc)]);
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   327
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   328
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   329
(* toplevel *)
40391
b0dafbfc05b7 explicit "timing" status for toplevel transactions;
wenzelm
parents: 40131
diff changeset
   330
38721
ca8b14fa0d0d added some proof state markup, notably number of subgoals (e.g. for indentation);
wenzelm
parents: 38474
diff changeset
   331
val subgoalsN = "subgoals";
ca8b14fa0d0d added some proof state markup, notably number of subgoals (e.g. for indentation);
wenzelm
parents: 38474
diff changeset
   332
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
   333
25552
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   334
val (stateN, state) = markup_elem "state";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   335
val (subgoalN, subgoal) = markup_elem "subgoal";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   336
val (sendbackN, sendback) = markup_elem "sendback";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   337
val (hiliteN, hilite) = markup_elem "hilite";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   338
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   339
27606
82399f3a8ca8 support for command status;
wenzelm
parents: 27523
diff changeset
   340
(* command status *)
82399f3a8ca8 support for command status;
wenzelm
parents: 27523
diff changeset
   341
29417
779ff1187327 added running task markup;
wenzelm
parents: 29325
diff changeset
   342
val taskN = "task";
779ff1187327 added running task markup;
wenzelm
parents: 29325
diff changeset
   343
37186
349e9223c685 explicit markup for forked goals, as indicated by Goal.fork;
wenzelm
parents: 34242
diff changeset
   344
val (forkedN, forked) = markup_elem "forked";
349e9223c685 explicit markup for forked goals, as indicated by Goal.fork;
wenzelm
parents: 34242
diff changeset
   345
val (joinedN, joined) = markup_elem "joined";
38429
9951852fae91 simplified command status: interpret stacked markup on demand;
wenzelm
parents: 38414
diff changeset
   346
27615
wenzelm
parents: 27606
diff changeset
   347
val (failedN, failed) = markup_elem "failed";
27606
82399f3a8ca8 support for command status;
wenzelm
parents: 27523
diff changeset
   348
val (finishedN, finished) = markup_elem "finished";
82399f3a8ca8 support for command status;
wenzelm
parents: 27523
diff changeset
   349
29488
8fc3aeece219 replaced command_state by edits/edit;
wenzelm
parents: 29482
diff changeset
   350
8fc3aeece219 replaced command_state by edits/edit;
wenzelm
parents: 29482
diff changeset
   351
(* interactive documents *)
8fc3aeece219 replaced command_state by edits/edit;
wenzelm
parents: 29482
diff changeset
   352
38414
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   353
val versionN = "version";
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   354
val (assignN, assign) = markup_int "assign" versionN;
34242
5ccdc8bf3849 explicit markup of document assigment message (simplified variant of earlier "edits" 8c3e1f73953d);
wenzelm
parents: 34214
diff changeset
   355
27606
82399f3a8ca8 support for command status;
wenzelm
parents: 27523
diff changeset
   356
27969
46d7057b8614 added messages and process information;
wenzelm
parents: 27894
diff changeset
   357
(* messages *)
46d7057b8614 added messages and process information;
wenzelm
parents: 27894
diff changeset
   358
38871
28496da3bec2 message serial number indicates physical order;
wenzelm
parents: 38721
diff changeset
   359
val serialN = "serial";
27969
46d7057b8614 added messages and process information;
wenzelm
parents: 27894
diff changeset
   360
46d7057b8614 added messages and process information;
wenzelm
parents: 27894
diff changeset
   361
val (promptN, prompt) = markup_elem "prompt";
31384
ce169bd37fc0 IsabelleProcess: emit status "ready" after initialization and reports;
wenzelm
parents: 30702
diff changeset
   362
val (readyN, ready) = markup_elem "ready";
27969
46d7057b8614 added messages and process information;
wenzelm
parents: 27894
diff changeset
   363
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
   364
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
   365
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
   366
39171
525a13b9ac74 highlight bad range of nested error (here from inner parsing);
wenzelm
parents: 39168
diff changeset
   367
val (badN, bad) = markup_elem "bad";
525a13b9ac74 highlight bad range of nested error (here from inner parsing);
wenzelm
parents: 39168
diff changeset
   368
27969
46d7057b8614 added messages and process information;
wenzelm
parents: 27894
diff changeset
   369
43748
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43710
diff changeset
   370
(* raw message functions *)
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43710
diff changeset
   371
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43710
diff changeset
   372
val functionN = "function"
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43710
diff changeset
   373
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43710
diff changeset
   374
fun invoke_scala name id = [(functionN, "invoke_scala"), (nameN, name), (idN, id)];
44298
b8f8488704e2 Future.promise: explicit abort operation (like uninterruptible future job);
wenzelm
parents: 43797
diff changeset
   375
fun cancel_scala id = [(functionN, "cancel_scala"), (idN, id)];
43748
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43710
diff changeset
   376
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43710
diff changeset
   377
27969
46d7057b8614 added messages and process information;
wenzelm
parents: 27894
diff changeset
   378
30221
14145e81a2fe added markup for binding;
wenzelm
parents: 29522
diff changeset
   379
(** print mode operations **)
23704
18d6ee425689 added print_mode setup (from pretty.ML);
wenzelm
parents: 23695
diff changeset
   380
29325
a205acc94356 Markup.no_output;
wenzelm
parents: 29318
diff changeset
   381
val no_output = ("", "");
a205acc94356 Markup.no_output;
wenzelm
parents: 29318
diff changeset
   382
fun default_output (_: T) = no_output;
23704
18d6ee425689 added print_mode setup (from pretty.ML);
wenzelm
parents: 23695
diff changeset
   383
18d6ee425689 added print_mode setup (from pretty.ML);
wenzelm
parents: 23695
diff changeset
   384
local
18d6ee425689 added print_mode setup (from pretty.ML);
wenzelm
parents: 23695
diff changeset
   385
  val default = {output = default_output};
43684
85388f5570c4 prefer Synchronized.var;
wenzelm
parents: 43673
diff changeset
   386
  val modes = Synchronized.var "Markup.modes" (Symtab.make [("", default)]);
23704
18d6ee425689 added print_mode setup (from pretty.ML);
wenzelm
parents: 23695
diff changeset
   387
in
43684
85388f5570c4 prefer Synchronized.var;
wenzelm
parents: 43673
diff changeset
   388
  fun add_mode name output =
85388f5570c4 prefer Synchronized.var;
wenzelm
parents: 43673
diff changeset
   389
    Synchronized.change modes (Symtab.update_new (name, {output = output}));
23704
18d6ee425689 added print_mode setup (from pretty.ML);
wenzelm
parents: 23695
diff changeset
   390
  fun get_mode () =
43684
85388f5570c4 prefer Synchronized.var;
wenzelm
parents: 43673
diff changeset
   391
    the_default default
85388f5570c4 prefer Synchronized.var;
wenzelm
parents: 43673
diff changeset
   392
      (Library.get_first (Symtab.lookup (Synchronized.value modes)) (print_mode_value ()));
23623
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   393
end;
23704
18d6ee425689 added print_mode setup (from pretty.ML);
wenzelm
parents: 23695
diff changeset
   394
38474
e498dc2eb576 uniform Markup.empty/Markup.Empty in ML and Scala;
wenzelm
parents: 38429
diff changeset
   395
fun output m = if is_empty m then no_output else #output (get_mode ()) m;
23704
18d6ee425689 added print_mode setup (from pretty.ML);
wenzelm
parents: 23695
diff changeset
   396
23719
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
   397
val enclose = output #-> Library.enclose;
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
   398
25552
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   399
fun markup m =
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   400
  let val (bg, en) = output m
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   401
  in Library.enclose (Output.escape bg) (Output.escape en) end;
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   402
43665
573d1272f36d tuned signature;
wenzelm
parents: 43593
diff changeset
   403
fun markup_only m = markup m "";
573d1272f36d tuned signature;
wenzelm
parents: 43593
diff changeset
   404
23704
18d6ee425689 added print_mode setup (from pretty.ML);
wenzelm
parents: 23695
diff changeset
   405
end;