src/Pure/General/markup.ML
author wenzelm
Sun, 09 Jan 2011 20:30:47 +0100
changeset 41484 51310e1ccd6f
parent 41483 4a8431c73cf2
child 42012 2c3fe3cbebae
permissions -rw-r--r--
more direct treatment of Position.end_offset; tuned;
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
30221
14145e81a2fe added markup for binding;
wenzelm
parents: 29522
diff changeset
    18
  val bindingN: string val binding: string -> T
33088
757d7787b10c markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents: 32738
diff changeset
    19
  val entityN: string val entity: string -> T
757d7787b10c markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents: 32738
diff changeset
    20
  val defN: string
757d7787b10c markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents: 32738
diff changeset
    21
  val refN: string
23671
9e8257472c27 proper position markup;
wenzelm
parents: 23658
diff changeset
    22
  val lineN: string
26001
d0a133941155 added column property;
wenzelm
parents: 25982
diff changeset
    23
  val columnN: 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
23644
e28b8e8a85b6 added markup for pretty printing;
wenzelm
parents: 23642
diff changeset
    31
  val indentN: string
23704
18d6ee425689 added print_mode setup (from pretty.ML);
wenzelm
parents: 23695
diff changeset
    32
  val blockN: string val block: int -> T
23695
6c4662bb4862 Add widthN to signature
aspinall
parents: 23671
diff changeset
    33
  val widthN: string
23644
e28b8e8a85b6 added markup for pretty printing;
wenzelm
parents: 23642
diff changeset
    34
  val breakN: string val break: int -> T
e28b8e8a85b6 added markup for pretty printing;
wenzelm
parents: 23642
diff changeset
    35
  val fbreakN: string val fbreak: T
33985
1d33e85a3fa9 added markup for hidden text;
wenzelm
parents: 33643
diff changeset
    36
  val hiddenN: string val hidden: T
27828
edafacb690a3 renamed Markup.class to Markup.tclass, to avoid potential conflicts with spacial meaning in markup languages (e.g. HTML);
wenzelm
parents: 27818
diff changeset
    37
  val tclassN: string val tclass: string -> T
23637
f3e16ee56f32 added toplevel markup;
wenzelm
parents: 23626
diff changeset
    38
  val tyconN: string val tycon: string -> T
28077
d6102a4fcfce added fixed_decl, fact_decl, local_fact_decl;
wenzelm
parents: 28031
diff changeset
    39
  val fixed_declN: string val fixed_decl: string -> T
26702
a079f8f0080b added markup for fixed variables (local constants);
wenzelm
parents: 26255
diff changeset
    40
  val fixedN: string val fixed: string -> T
28113
f6e38928b77c added const_decl;
wenzelm
parents: 28077
diff changeset
    41
  val const_declN: string val const_decl: string -> T
23637
f3e16ee56f32 added toplevel markup;
wenzelm
parents: 23626
diff changeset
    42
  val constN: string val const: string -> T
28077
d6102a4fcfce added fixed_decl, fact_decl, local_fact_decl;
wenzelm
parents: 28031
diff changeset
    43
  val fact_declN: string val fact_decl: string -> T
27740
0b22524c05e2 removed axiom;
wenzelm
parents: 27735
diff changeset
    44
  val factN: string val fact: string -> T
0b22524c05e2 removed axiom;
wenzelm
parents: 27735
diff changeset
    45
  val dynamic_factN: string val dynamic_fact: string -> T
28077
d6102a4fcfce added fixed_decl, fact_decl, local_fact_decl;
wenzelm
parents: 28031
diff changeset
    46
  val local_fact_declN: string val local_fact_decl: string -> T
27818
74087a19879f added name property operation;
wenzelm
parents: 27804
diff changeset
    47
  val local_factN: string val local_fact: string -> T
23719
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
    48
  val tfreeN: string val tfree: T
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
    49
  val tvarN: string val tvar: T
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
    50
  val freeN: string val free: T
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
    51
  val skolemN: string val skolem: T
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
    52
  val boundN: string val bound: T
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
    53
  val varN: string val var: T
29318
6337d1cb2ba0 added numeral, which supercedes num, xnum, float;
wenzelm
parents: 28904
diff changeset
    54
  val numeralN: string val numeral: T
27804
f682666352c4 added literal;
wenzelm
parents: 27794
diff changeset
    55
  val literalN: string val literal: T
29318
6337d1cb2ba0 added numeral, which supercedes num, xnum, float;
wenzelm
parents: 28904
diff changeset
    56
  val inner_stringN: string val inner_string: T
27883
e506f0c6d3f0 added is_none;
wenzelm
parents: 27879
diff changeset
    57
  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
    58
  val token_rangeN: string val token_range: T
23637
f3e16ee56f32 added toplevel markup;
wenzelm
parents: 23626
diff changeset
    59
  val sortN: string val sort: T
f3e16ee56f32 added toplevel markup;
wenzelm
parents: 23626
diff changeset
    60
  val typN: string val typ: T
f3e16ee56f32 added toplevel markup;
wenzelm
parents: 23626
diff changeset
    61
  val termN: string val term: T
27818
74087a19879f added name property operation;
wenzelm
parents: 27804
diff changeset
    62
  val propN: string val prop: T
27748
c421ee0d2350 added position_properties';
wenzelm
parents: 27743
diff changeset
    63
  val attributeN: string val attribute: string -> T
c421ee0d2350 added position_properties';
wenzelm
parents: 27743
diff changeset
    64
  val methodN: string val method: string -> T
30614
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
    65
  val ML_keywordN: string val ML_keyword: T
37195
e87d305a4490 separate markup for ML delimiters;
wenzelm
parents: 37193
diff changeset
    66
  val ML_delimiterN: string val ML_delimiter: T
30614
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
    67
  val ML_identN: string val ML_ident: T
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
    68
  val ML_tvarN: string val ML_tvar: T
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
    69
  val ML_numeralN: string val ML_numeral: T
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
    70
  val ML_charN: string val ML_char: T
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
    71
  val ML_stringN: string val ML_string: T
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
    72
  val ML_commentN: string val ML_comment: T
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
    73
  val ML_malformedN: string val ML_malformed: T
30702
274626e2b2dd more markup elements for ML programs;
wenzelm
parents: 30614
diff changeset
    74
  val ML_defN: string val ML_def: T
31472
d7929d74acb4 added markup ML_open, ML_struct;
wenzelm
parents: 31384
diff changeset
    75
  val ML_openN: string val ML_open: T
d7929d74acb4 added markup ML_open, ML_struct;
wenzelm
parents: 31384
diff changeset
    76
  val ML_structN: string val ML_struct: T
30702
274626e2b2dd more markup elements for ML programs;
wenzelm
parents: 30614
diff changeset
    77
  val ML_refN: string val ML_ref: T
274626e2b2dd more markup elements for ML programs;
wenzelm
parents: 30614
diff changeset
    78
  val ML_typingN: string val ML_typing: T
27875
1b46d9ec3788 added ML_source, doc_source;
wenzelm
parents: 27851
diff changeset
    79
  val ML_sourceN: string val ML_source: T
1b46d9ec3788 added ML_source, doc_source;
wenzelm
parents: 27851
diff changeset
    80
  val doc_sourceN: string val doc_source: T
27879
wenzelm
parents: 27875
diff changeset
    81
  val antiqN: string val antiq: T
27894
a06f78f917e0 added ML_antiq, doc_antiq;
wenzelm
parents: 27883
diff changeset
    82
  val ML_antiqN: string val ML_antiq: string -> T
a06f78f917e0 added ML_antiq, doc_antiq;
wenzelm
parents: 27883
diff changeset
    83
  val doc_antiqN: string val doc_antiq: string -> T
27836
74e8228757c5 renamed unknown_span to malformed_span;
wenzelm
parents: 27828
diff changeset
    84
  val keyword_declN: string val keyword_decl: string -> T
74e8228757c5 renamed unknown_span to malformed_span;
wenzelm
parents: 27828
diff changeset
    85
  val command_declN: string val command_decl: string -> string -> T
37193
a4b2bb0dab08 simplified command/keyword markup;
wenzelm
parents: 37192
diff changeset
    86
  val keywordN: string val keyword: T
37192
8cdddd689ea9 markup non-identifier keyword as operator;
wenzelm
parents: 37186
diff changeset
    87
  val operatorN: string val operator: T
37193
a4b2bb0dab08 simplified command/keyword markup;
wenzelm
parents: 37192
diff changeset
    88
  val commandN: string val command: T
27836
74e8228757c5 renamed unknown_span to malformed_span;
wenzelm
parents: 27828
diff changeset
    89
  val identN: string val ident: T
23719
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
    90
  val stringN: string val string: T
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
    91
  val altstringN: string val altstring: T
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
    92
  val verbatimN: string val verbatim: T
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
    93
  val commentN: string val comment: T
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
    94
  val controlN: string val control: T
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
    95
  val malformedN: string val malformed: T
38229
61d0fe8b96ac more robust treatment of Markup.token;
wenzelm
parents: 37195
diff changeset
    96
  val tokenN: string val token: Properties.T -> T
27660
61fef1137a25 renamed command span markup;
wenzelm
parents: 27615
diff changeset
    97
  val command_spanN: string val command_span: string -> T
61fef1137a25 renamed command span markup;
wenzelm
parents: 27615
diff changeset
    98
  val ignored_spanN: string val ignored_span: T
27836
74e8228757c5 renamed unknown_span to malformed_span;
wenzelm
parents: 27828
diff changeset
    99
  val malformed_spanN: string val malformed_span: T
40394
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   100
  val elapsedN: string
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   101
  val cpuN: string
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   102
  val gcN: string
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   103
  val timingN: string val timing: timing -> T
38721
ca8b14fa0d0d added some proof state markup, notably number of subgoals (e.g. for indentation);
wenzelm
parents: 38474
diff changeset
   104
  val subgoalsN: string
ca8b14fa0d0d added some proof state markup, notably number of subgoals (e.g. for indentation);
wenzelm
parents: 38474
diff changeset
   105
  val proof_stateN: string val proof_state: int -> T
23637
f3e16ee56f32 added toplevel markup;
wenzelm
parents: 23626
diff changeset
   106
  val stateN: string val state: T
f3e16ee56f32 added toplevel markup;
wenzelm
parents: 23626
diff changeset
   107
  val subgoalN: string val subgoal: T
24289
bfd59eb6e24e added sendback;
wenzelm
parents: 23922
diff changeset
   108
  val sendbackN: string val sendback: T
24555
ea220faa69e7 added hilite markup;
wenzelm
parents: 24289
diff changeset
   109
  val hiliteN: string val hilite: T
29417
779ff1187327 added running task markup;
wenzelm
parents: 29325
diff changeset
   110
  val taskN: string
37186
349e9223c685 explicit markup for forked goals, as indicated by Goal.fork;
wenzelm
parents: 34242
diff changeset
   111
  val forkedN: string val forked: T
349e9223c685 explicit markup for forked goals, as indicated by Goal.fork;
wenzelm
parents: 34242
diff changeset
   112
  val joinedN: string val joined: T
27615
wenzelm
parents: 27606
diff changeset
   113
  val failedN: string val failed: T
27606
82399f3a8ca8 support for command status;
wenzelm
parents: 27523
diff changeset
   114
  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
   115
  val versionN: string
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   116
  val execN: string
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   117
  val assignN: string val assign: int -> T
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   118
  val editN: string val edit: int -> int -> T
38871
28496da3bec2 message serial number indicates physical order;
wenzelm
parents: 38721
diff changeset
   119
  val serialN: string
27969
46d7057b8614 added messages and process information;
wenzelm
parents: 27894
diff changeset
   120
  val promptN: string val prompt: T
31384
ce169bd37fc0 IsabelleProcess: emit status "ready" after initialization and reports;
wenzelm
parents: 30702
diff changeset
   121
  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
   122
  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
   123
  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
   124
  val badN: string val bad: T
40131
7cbebd636e79 explicitly qualify type Output.output, which is a slightly odd internal feature;
wenzelm
parents: 39585
diff changeset
   125
  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
   126
  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
   127
  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
   128
  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
   129
  val enclose: T -> Output.output -> Output.output
25552
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   130
  val markup: T -> string -> string
23623
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   131
end;
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   132
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   133
structure Markup: MARKUP =
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   134
struct
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   135
30221
14145e81a2fe added markup for binding;
wenzelm
parents: 29522
diff changeset
   136
(** markup elements **)
14145e81a2fe added markup for binding;
wenzelm
parents: 29522
diff changeset
   137
38414
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   138
(* integers *)
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   139
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   140
fun parse_int s =
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   141
  (case Int.fromString s of
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   142
    SOME i => i
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   143
  | NONE => raise Fail ("Bad integer: " ^ quote s));
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   144
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   145
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
   146
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   147
23658
wenzelm
parents: 23644
diff changeset
   148
(* basic markup *)
23623
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   149
28017
4919bd124a58 type Properties.T;
wenzelm
parents: 27969
diff changeset
   150
type T = string * Properties.T;
23637
f3e16ee56f32 added toplevel markup;
wenzelm
parents: 23626
diff changeset
   151
38474
e498dc2eb576 uniform Markup.empty/Markup.Empty in ML and Scala;
wenzelm
parents: 38429
diff changeset
   152
val empty = ("", []);
23637
f3e16ee56f32 added toplevel markup;
wenzelm
parents: 23626
diff changeset
   153
38474
e498dc2eb576 uniform Markup.empty/Markup.Empty in ML and Scala;
wenzelm
parents: 38429
diff changeset
   154
fun is_empty ("", _) = true
e498dc2eb576 uniform Markup.empty/Markup.Empty in ML and Scala;
wenzelm
parents: 38429
diff changeset
   155
  | is_empty _ = false;
27883
e506f0c6d3f0 added is_none;
wenzelm
parents: 27879
diff changeset
   156
23794
ab2edd87b912 added get_string, get_int;
wenzelm
parents: 23786
diff changeset
   157
23671
9e8257472c27 proper position markup;
wenzelm
parents: 23658
diff changeset
   158
fun properties more_props ((elem, props): T) =
28017
4919bd124a58 type Properties.T;
wenzelm
parents: 27969
diff changeset
   159
  (elem, fold_rev Properties.put more_props props);
23671
9e8257472c27 proper position markup;
wenzelm
parents: 23658
diff changeset
   160
25552
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   161
fun markup_elem elem = (elem, (elem, []): T);
23794
ab2edd87b912 added get_string, get_int;
wenzelm
parents: 23786
diff changeset
   162
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
   163
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
   164
26977
e736139b553d added theory_nameN;
wenzelm
parents: 26702
diff changeset
   165
38721
ca8b14fa0d0d added some proof state markup, notably number of subgoals (e.g. for indentation);
wenzelm
parents: 38474
diff changeset
   166
(* misc properties *)
26977
e736139b553d added theory_nameN;
wenzelm
parents: 26702
diff changeset
   167
23658
wenzelm
parents: 23644
diff changeset
   168
val nameN = "name";
27818
74087a19879f added name property operation;
wenzelm
parents: 27804
diff changeset
   169
fun name a = properties [(nameN, a)];
74087a19879f added name property operation;
wenzelm
parents: 27804
diff changeset
   170
23658
wenzelm
parents: 23644
diff changeset
   171
val kindN = "kind";
23671
9e8257472c27 proper position markup;
wenzelm
parents: 23658
diff changeset
   172
23658
wenzelm
parents: 23644
diff changeset
   173
33088
757d7787b10c markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents: 32738
diff changeset
   174
(* formal entities *)
757d7787b10c markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents: 32738
diff changeset
   175
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
   176
val (bindingN, binding) = markup_string "binding" nameN;
33088
757d7787b10c markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents: 32738
diff changeset
   177
val (entityN, entity) = markup_string "entity" nameN;
757d7787b10c markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents: 32738
diff changeset
   178
757d7787b10c markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents: 32738
diff changeset
   179
val defN = "def";
757d7787b10c markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents: 32738
diff changeset
   180
val refN = "ref";
757d7787b10c markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents: 32738
diff changeset
   181
757d7787b10c markup for formal entities, with "def" or "ref" occurrences;
wenzelm
parents: 32738
diff changeset
   182
23671
9e8257472c27 proper position markup;
wenzelm
parents: 23658
diff changeset
   183
(* position *)
9e8257472c27 proper position markup;
wenzelm
parents: 23658
diff changeset
   184
9e8257472c27 proper position markup;
wenzelm
parents: 23658
diff changeset
   185
val lineN = "line";
26001
d0a133941155 added column property;
wenzelm
parents: 25982
diff changeset
   186
val columnN = "column";
27794
bdea6e17cbe3 added offset/end_offset;
wenzelm
parents: 27748
diff changeset
   187
val offsetN = "offset";
bdea6e17cbe3 added offset/end_offset;
wenzelm
parents: 27748
diff changeset
   188
val end_offsetN = "end_offset";
23671
9e8257472c27 proper position markup;
wenzelm
parents: 23658
diff changeset
   189
val fileN = "file";
25816
d2a94e6a7d1e moved id to position properties;
wenzelm
parents: 25808
diff changeset
   190
val idN = "id";
23671
9e8257472c27 proper position markup;
wenzelm
parents: 23658
diff changeset
   191
41484
51310e1ccd6f more direct treatment of Position.end_offset;
wenzelm
parents: 41483
diff changeset
   192
val position_properties' = [fileN, idN];
51310e1ccd6f more direct treatment of Position.end_offset;
wenzelm
parents: 41483
diff changeset
   193
val position_properties = [lineN, columnN, offsetN, end_offsetN] @ position_properties';
27748
c421ee0d2350 added position_properties';
wenzelm
parents: 27743
diff changeset
   194
25552
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   195
val (positionN, position) = markup_elem "position";
26255
2246d8bbe89d added location;
wenzelm
parents: 26051
diff changeset
   196
23644
e28b8e8a85b6 added markup for pretty printing;
wenzelm
parents: 23642
diff changeset
   197
e28b8e8a85b6 added markup for pretty printing;
wenzelm
parents: 23642
diff changeset
   198
(* pretty printing *)
e28b8e8a85b6 added markup for pretty printing;
wenzelm
parents: 23642
diff changeset
   199
e28b8e8a85b6 added markup for pretty printing;
wenzelm
parents: 23642
diff changeset
   200
val indentN = "indent";
e28b8e8a85b6 added markup for pretty printing;
wenzelm
parents: 23642
diff changeset
   201
val (blockN, block) = markup_int "block" indentN;
e28b8e8a85b6 added markup for pretty printing;
wenzelm
parents: 23642
diff changeset
   202
e28b8e8a85b6 added markup for pretty printing;
wenzelm
parents: 23642
diff changeset
   203
val widthN = "width";
e28b8e8a85b6 added markup for pretty printing;
wenzelm
parents: 23642
diff changeset
   204
val (breakN, break) = markup_int "break" widthN;
e28b8e8a85b6 added markup for pretty printing;
wenzelm
parents: 23642
diff changeset
   205
25552
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   206
val (fbreakN, fbreak) = markup_elem "fbreak";
23637
f3e16ee56f32 added toplevel markup;
wenzelm
parents: 23626
diff changeset
   207
f3e16ee56f32 added toplevel markup;
wenzelm
parents: 23626
diff changeset
   208
33985
1d33e85a3fa9 added markup for hidden text;
wenzelm
parents: 33643
diff changeset
   209
(* hidden text *)
1d33e85a3fa9 added markup for hidden text;
wenzelm
parents: 33643
diff changeset
   210
1d33e85a3fa9 added markup for hidden text;
wenzelm
parents: 33643
diff changeset
   211
val (hiddenN, hidden) = markup_elem "hidden";
1d33e85a3fa9 added markup for hidden text;
wenzelm
parents: 33643
diff changeset
   212
1d33e85a3fa9 added markup for hidden text;
wenzelm
parents: 33643
diff changeset
   213
23623
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   214
(* logical entities *)
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   215
27828
edafacb690a3 renamed Markup.class to Markup.tclass, to avoid potential conflicts with spacial meaning in markup languages (e.g. HTML);
wenzelm
parents: 27818
diff changeset
   216
val (tclassN, tclass) = markup_string "tclass" nameN;
23658
wenzelm
parents: 23644
diff changeset
   217
val (tyconN, tycon) = markup_string "tycon" nameN;
28077
d6102a4fcfce added fixed_decl, fact_decl, local_fact_decl;
wenzelm
parents: 28031
diff changeset
   218
val (fixed_declN, fixed_decl) = markup_string "fixed_decl" nameN;
26702
a079f8f0080b added markup for fixed variables (local constants);
wenzelm
parents: 26255
diff changeset
   219
val (fixedN, fixed) = markup_string "fixed" nameN;
28113
f6e38928b77c added const_decl;
wenzelm
parents: 28077
diff changeset
   220
val (const_declN, const_decl) = markup_string "const_decl" nameN;
23658
wenzelm
parents: 23644
diff changeset
   221
val (constN, const) = markup_string "const" nameN;
28077
d6102a4fcfce added fixed_decl, fact_decl, local_fact_decl;
wenzelm
parents: 28031
diff changeset
   222
val (fact_declN, fact_decl) = markup_string "fact_decl" nameN;
27740
0b22524c05e2 removed axiom;
wenzelm
parents: 27735
diff changeset
   223
val (factN, fact) = markup_string "fact" nameN;
0b22524c05e2 removed axiom;
wenzelm
parents: 27735
diff changeset
   224
val (dynamic_factN, dynamic_fact) = markup_string "dynamic_fact" nameN;
28077
d6102a4fcfce added fixed_decl, fact_decl, local_fact_decl;
wenzelm
parents: 28031
diff changeset
   225
val (local_fact_declN, local_fact_decl) = markup_string "local_fact_decl" nameN;
27818
74087a19879f added name property operation;
wenzelm
parents: 27804
diff changeset
   226
val (local_factN, local_fact) = markup_string "local_fact" nameN;
23623
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   227
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   228
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   229
(* inner syntax *)
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   230
25552
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   231
val (tfreeN, tfree) = markup_elem "tfree";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   232
val (tvarN, tvar) = markup_elem "tvar";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   233
val (freeN, free) = markup_elem "free";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   234
val (skolemN, skolem) = markup_elem "skolem";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   235
val (boundN, bound) = markup_elem "bound";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   236
val (varN, var) = markup_elem "var";
29318
6337d1cb2ba0 added numeral, which supercedes num, xnum, float;
wenzelm
parents: 28904
diff changeset
   237
val (numeralN, numeral) = markup_elem "numeral";
27804
f682666352c4 added literal;
wenzelm
parents: 27794
diff changeset
   238
val (literalN, literal) = markup_elem "literal";
29318
6337d1cb2ba0 added numeral, which supercedes num, xnum, float;
wenzelm
parents: 28904
diff changeset
   239
val (inner_stringN, inner_string) = markup_elem "inner_string";
27883
e506f0c6d3f0 added is_none;
wenzelm
parents: 27879
diff changeset
   240
val (inner_commentN, inner_comment) = markup_elem "inner_comment";
23719
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
   241
39168
e3ac771235f7 report token range after inner parse error -- often provides important clues about misunderstanding concerning lexical phase;
wenzelm
parents: 38887
diff changeset
   242
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
   243
25552
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   244
val (sortN, sort) = markup_elem "sort";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   245
val (typN, typ) = markup_elem "typ";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   246
val (termN, term) = markup_elem "term";
27818
74087a19879f added name property operation;
wenzelm
parents: 27804
diff changeset
   247
val (propN, prop) = markup_elem "prop";
27748
c421ee0d2350 added position_properties';
wenzelm
parents: 27743
diff changeset
   248
c421ee0d2350 added position_properties';
wenzelm
parents: 27743
diff changeset
   249
val (attributeN, attribute) = markup_string "attribute" nameN;
c421ee0d2350 added position_properties';
wenzelm
parents: 27743
diff changeset
   250
val (methodN, method) = markup_string "method" nameN;
23623
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   251
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   252
30614
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
   253
(* ML syntax *)
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
   254
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
   255
val (ML_keywordN, ML_keyword) = markup_elem "ML_keyword";
37195
e87d305a4490 separate markup for ML delimiters;
wenzelm
parents: 37193
diff changeset
   256
val (ML_delimiterN, ML_delimiter) = markup_elem "ML_delimiter";
30614
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
   257
val (ML_identN, ML_ident) = markup_elem "ML_ident";
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
   258
val (ML_tvarN, ML_tvar) = markup_elem "ML_tvar";
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
   259
val (ML_numeralN, ML_numeral) = markup_elem "ML_numeral";
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
   260
val (ML_charN, ML_char) = markup_elem "ML_char";
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
   261
val (ML_stringN, ML_string) = markup_elem "ML_string";
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
   262
val (ML_commentN, ML_comment) = markup_elem "ML_comment";
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
   263
val (ML_malformedN, ML_malformed) = markup_elem "ML_malformed";
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
   264
30702
274626e2b2dd more markup elements for ML programs;
wenzelm
parents: 30614
diff changeset
   265
val (ML_defN, ML_def) = markup_elem "ML_def";
31472
d7929d74acb4 added markup ML_open, ML_struct;
wenzelm
parents: 31384
diff changeset
   266
val (ML_openN, ML_open) = markup_elem "ML_open";
d7929d74acb4 added markup ML_open, ML_struct;
wenzelm
parents: 31384
diff changeset
   267
val (ML_structN, ML_struct) = markup_elem "ML_struct";
30702
274626e2b2dd more markup elements for ML programs;
wenzelm
parents: 30614
diff changeset
   268
val (ML_refN, ML_ref) = markup_elem "ML_ref";
274626e2b2dd more markup elements for ML programs;
wenzelm
parents: 30614
diff changeset
   269
val (ML_typingN, ML_typing) = markup_elem "ML_typing";
274626e2b2dd more markup elements for ML programs;
wenzelm
parents: 30614
diff changeset
   270
30614
845bcfd3e9cd report markup for ML tokens;
wenzelm
parents: 30221
diff changeset
   271
27875
1b46d9ec3788 added ML_source, doc_source;
wenzelm
parents: 27851
diff changeset
   272
(* embedded source text *)
1b46d9ec3788 added ML_source, doc_source;
wenzelm
parents: 27851
diff changeset
   273
1b46d9ec3788 added ML_source, doc_source;
wenzelm
parents: 27851
diff changeset
   274
val (ML_sourceN, ML_source) = markup_elem "ML_source";
1b46d9ec3788 added ML_source, doc_source;
wenzelm
parents: 27851
diff changeset
   275
val (doc_sourceN, doc_source) = markup_elem "doc_source";
1b46d9ec3788 added ML_source, doc_source;
wenzelm
parents: 27851
diff changeset
   276
27879
wenzelm
parents: 27875
diff changeset
   277
val (antiqN, antiq) = markup_elem "antiq";
27894
a06f78f917e0 added ML_antiq, doc_antiq;
wenzelm
parents: 27883
diff changeset
   278
val (ML_antiqN, ML_antiq) = markup_string "ML_antiq" nameN;
a06f78f917e0 added ML_antiq, doc_antiq;
wenzelm
parents: 27883
diff changeset
   279
val (doc_antiqN, doc_antiq) = markup_string "doc_antiq" nameN;
27879
wenzelm
parents: 27875
diff changeset
   280
27875
1b46d9ec3788 added ML_source, doc_source;
wenzelm
parents: 27851
diff changeset
   281
23623
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   282
(* outer syntax *)
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   283
24870
9d057ff8e74c added keyword_decl, command_decl;
wenzelm
parents: 24777
diff changeset
   284
val (keyword_declN, keyword_decl) = markup_string "keyword_decl" nameN;
9d057ff8e74c added keyword_decl, command_decl;
wenzelm
parents: 24777
diff changeset
   285
9d057ff8e74c added keyword_decl, command_decl;
wenzelm
parents: 24777
diff changeset
   286
val command_declN = "command_decl";
9d057ff8e74c added keyword_decl, command_decl;
wenzelm
parents: 24777
diff changeset
   287
fun command_decl name kind : T = (command_declN, [(nameN, name), (kindN, kind)]);
9d057ff8e74c added keyword_decl, command_decl;
wenzelm
parents: 24777
diff changeset
   288
37193
a4b2bb0dab08 simplified command/keyword markup;
wenzelm
parents: 37192
diff changeset
   289
val (keywordN, keyword) = markup_elem "keyword";
37192
8cdddd689ea9 markup non-identifier keyword as operator;
wenzelm
parents: 37186
diff changeset
   290
val (operatorN, operator) = markup_elem "operator";
37193
a4b2bb0dab08 simplified command/keyword markup;
wenzelm
parents: 37192
diff changeset
   291
val (commandN, command) = markup_elem "command";
27836
74e8228757c5 renamed unknown_span to malformed_span;
wenzelm
parents: 27828
diff changeset
   292
val (identN, ident) = markup_elem "ident";
25552
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   293
val (stringN, string) = markup_elem "string";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   294
val (altstringN, altstring) = markup_elem "altstring";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   295
val (verbatimN, verbatim) = markup_elem "verbatim";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   296
val (commentN, comment) = markup_elem "comment";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   297
val (controlN, control) = markup_elem "control";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   298
val (malformedN, malformed) = markup_elem "malformed";
23719
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
   299
38229
61d0fe8b96ac more robust treatment of Markup.token;
wenzelm
parents: 37195
diff changeset
   300
val tokenN = "token";
61d0fe8b96ac more robust treatment of Markup.token;
wenzelm
parents: 37195
diff changeset
   301
fun token props = (tokenN, props);
27851
wenzelm
parents: 27836
diff changeset
   302
27660
61fef1137a25 renamed command span markup;
wenzelm
parents: 27615
diff changeset
   303
val (command_spanN, command_span) = markup_string "command_span" nameN;
61fef1137a25 renamed command span markup;
wenzelm
parents: 27615
diff changeset
   304
val (ignored_spanN, ignored_span) = markup_elem "ignored_span";
27836
74e8228757c5 renamed unknown_span to malformed_span;
wenzelm
parents: 27828
diff changeset
   305
val (malformed_spanN, malformed_span) = markup_elem "malformed_span";
23719
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
   306
23623
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   307
40394
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   308
(* timing *)
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   309
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   310
val timingN = "timing";
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   311
val elapsedN = "elapsed";
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   312
val cpuN = "cpu";
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   313
val gcN = "gc";
23637
f3e16ee56f32 added toplevel markup;
wenzelm
parents: 23626
diff changeset
   314
40391
b0dafbfc05b7 explicit "timing" status for toplevel transactions;
wenzelm
parents: 40131
diff changeset
   315
fun timing ({elapsed, cpu, gc, ...}: timing) =
40394
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   316
  (timingN,
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   317
   [(elapsedN, Time.toString elapsed),
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   318
    (cpuN, Time.toString cpu),
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   319
    (gcN, Time.toString gc)]);
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   320
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   321
6dcb6cbf0719 somewhat more uniform timing markup in ML vs. Scala;
wenzelm
parents: 40391
diff changeset
   322
(* toplevel *)
40391
b0dafbfc05b7 explicit "timing" status for toplevel transactions;
wenzelm
parents: 40131
diff changeset
   323
38721
ca8b14fa0d0d added some proof state markup, notably number of subgoals (e.g. for indentation);
wenzelm
parents: 38474
diff changeset
   324
val subgoalsN = "subgoals";
ca8b14fa0d0d added some proof state markup, notably number of subgoals (e.g. for indentation);
wenzelm
parents: 38474
diff changeset
   325
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
   326
25552
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   327
val (stateN, state) = markup_elem "state";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   328
val (subgoalN, subgoal) = markup_elem "subgoal";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   329
val (sendbackN, sendback) = markup_elem "sendback";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   330
val (hiliteN, hilite) = markup_elem "hilite";
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   331
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   332
27606
82399f3a8ca8 support for command status;
wenzelm
parents: 27523
diff changeset
   333
(* command status *)
82399f3a8ca8 support for command status;
wenzelm
parents: 27523
diff changeset
   334
29417
779ff1187327 added running task markup;
wenzelm
parents: 29325
diff changeset
   335
val taskN = "task";
779ff1187327 added running task markup;
wenzelm
parents: 29325
diff changeset
   336
37186
349e9223c685 explicit markup for forked goals, as indicated by Goal.fork;
wenzelm
parents: 34242
diff changeset
   337
val (forkedN, forked) = markup_elem "forked";
349e9223c685 explicit markup for forked goals, as indicated by Goal.fork;
wenzelm
parents: 34242
diff changeset
   338
val (joinedN, joined) = markup_elem "joined";
38429
9951852fae91 simplified command status: interpret stacked markup on demand;
wenzelm
parents: 38414
diff changeset
   339
27615
wenzelm
parents: 27606
diff changeset
   340
val (failedN, failed) = markup_elem "failed";
27606
82399f3a8ca8 support for command status;
wenzelm
parents: 27523
diff changeset
   341
val (finishedN, finished) = markup_elem "finished";
82399f3a8ca8 support for command status;
wenzelm
parents: 27523
diff changeset
   342
29488
8fc3aeece219 replaced command_state by edits/edit;
wenzelm
parents: 29482
diff changeset
   343
8fc3aeece219 replaced command_state by edits/edit;
wenzelm
parents: 29482
diff changeset
   344
(* interactive documents *)
8fc3aeece219 replaced command_state by edits/edit;
wenzelm
parents: 29482
diff changeset
   345
38414
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   346
val versionN = "version";
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   347
val execN = "exec";
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   348
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
   349
29488
8fc3aeece219 replaced command_state by edits/edit;
wenzelm
parents: 29482
diff changeset
   350
val editN = "edit";
38414
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38229
diff changeset
   351
fun edit cmd_id exec_id : T = (editN, [(idN, print_int cmd_id), (execN, print_int exec_id)]);
29482
fe044b49e34f added command_state markup;
wenzelm
parents: 29417
diff changeset
   352
27606
82399f3a8ca8 support for command status;
wenzelm
parents: 27523
diff changeset
   353
27969
46d7057b8614 added messages and process information;
wenzelm
parents: 27894
diff changeset
   354
(* messages *)
46d7057b8614 added messages and process information;
wenzelm
parents: 27894
diff changeset
   355
38871
28496da3bec2 message serial number indicates physical order;
wenzelm
parents: 38721
diff changeset
   356
val serialN = "serial";
27969
46d7057b8614 added messages and process information;
wenzelm
parents: 27894
diff changeset
   357
46d7057b8614 added messages and process information;
wenzelm
parents: 27894
diff changeset
   358
val (promptN, prompt) = markup_elem "prompt";
31384
ce169bd37fc0 IsabelleProcess: emit status "ready" after initialization and reports;
wenzelm
parents: 30702
diff changeset
   359
val (readyN, ready) = markup_elem "ready";
27969
46d7057b8614 added messages and process information;
wenzelm
parents: 27894
diff changeset
   360
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
   361
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
   362
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
   363
39171
525a13b9ac74 highlight bad range of nested error (here from inner parsing);
wenzelm
parents: 39168
diff changeset
   364
val (badN, bad) = markup_elem "bad";
525a13b9ac74 highlight bad range of nested error (here from inner parsing);
wenzelm
parents: 39168
diff changeset
   365
27969
46d7057b8614 added messages and process information;
wenzelm
parents: 27894
diff changeset
   366
46d7057b8614 added messages and process information;
wenzelm
parents: 27894
diff changeset
   367
30221
14145e81a2fe added markup for binding;
wenzelm
parents: 29522
diff changeset
   368
(** print mode operations **)
23704
18d6ee425689 added print_mode setup (from pretty.ML);
wenzelm
parents: 23695
diff changeset
   369
29325
a205acc94356 Markup.no_output;
wenzelm
parents: 29318
diff changeset
   370
val no_output = ("", "");
a205acc94356 Markup.no_output;
wenzelm
parents: 29318
diff changeset
   371
fun default_output (_: T) = no_output;
23704
18d6ee425689 added print_mode setup (from pretty.ML);
wenzelm
parents: 23695
diff changeset
   372
18d6ee425689 added print_mode setup (from pretty.ML);
wenzelm
parents: 23695
diff changeset
   373
local
18d6ee425689 added print_mode setup (from pretty.ML);
wenzelm
parents: 23695
diff changeset
   374
  val default = {output = default_output};
32738
15bb09ca0378 explicit indication of Unsynchronized.ref;
wenzelm
parents: 31472
diff changeset
   375
  val modes = Unsynchronized.ref (Symtab.make [("", default)]);
23704
18d6ee425689 added print_mode setup (from pretty.ML);
wenzelm
parents: 23695
diff changeset
   376
in
23922
707639e9497d marked some CRITICAL sections (for multithreading);
wenzelm
parents: 23794
diff changeset
   377
  fun add_mode name output = CRITICAL (fn () =>
32738
15bb09ca0378 explicit indication of Unsynchronized.ref;
wenzelm
parents: 31472
diff changeset
   378
    Unsynchronized.change modes (Symtab.update_new (name, {output = output})));
23704
18d6ee425689 added print_mode setup (from pretty.ML);
wenzelm
parents: 23695
diff changeset
   379
  fun get_mode () =
24612
d1b315bdb8d7 avoid direct access to print_mode;
wenzelm
parents: 24555
diff changeset
   380
    the_default default (Library.get_first (Symtab.lookup (! modes)) (print_mode_value ()));
23623
939b58b527ee Common markup elements.
wenzelm
parents:
diff changeset
   381
end;
23704
18d6ee425689 added print_mode setup (from pretty.ML);
wenzelm
parents: 23695
diff changeset
   382
38474
e498dc2eb576 uniform Markup.empty/Markup.Empty in ML and Scala;
wenzelm
parents: 38429
diff changeset
   383
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
   384
23719
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
   385
val enclose = output #-> Library.enclose;
ccd9cb15c062 more markup for inner and outer syntax;
wenzelm
parents: 23704
diff changeset
   386
25552
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   387
fun markup m =
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   388
  let val (bg, en) = output m
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   389
  in Library.enclose (Output.escape bg) (Output.escape en) end;
e4d465bc5b35 added channels;
wenzelm
parents: 24870
diff changeset
   390
23704
18d6ee425689 added print_mode setup (from pretty.ML);
wenzelm
parents: 23695
diff changeset
   391
end;