author | wenzelm |
Sat, 11 Dec 2021 11:24:48 +0100 | |
changeset 74913 | c2a2be496f35 |
parent 74833 | fe9e590ae52f |
child 74964 | 77a96ed74340 |
permissions | -rw-r--r-- |
5828 | 1 |
(* Title: Pure/Isar/toplevel.ML |
2 |
Author: Markus Wenzel, TU Muenchen |
|
3 |
||
26602
5534b6a6b810
made purely value-oriented, moved global state to structure Isar (cf. isar.ML);
wenzelm
parents:
26491
diff
changeset
|
4 |
Isabelle/Isar toplevel transactions. |
5828 | 5 |
*) |
6 |
||
7 |
signature TOPLEVEL = |
|
8 |
sig |
|
19063 | 9 |
exception UNDEF |
5828 | 10 |
type state |
69886 | 11 |
val init_toplevel: unit -> state |
62895
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
wenzelm
parents:
62889
diff
changeset
|
12 |
val theory_toplevel: theory -> state |
74463 | 13 |
val get_prev_theory: theory -> serial |
7732 | 14 |
val is_toplevel: state -> bool |
18589 | 15 |
val is_theory: state -> bool |
16 |
val is_proof: state -> bool |
|
51555 | 17 |
val is_skipped_proof: state -> bool |
17076 | 18 |
val level: state -> int |
67391 | 19 |
val previous_theory_of: state -> theory option |
74833
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
20 |
val output_of: state -> Latex.text option |
21506 | 21 |
val context_of: state -> Proof.context |
22089 | 22 |
val generic_theory_of: state -> generic_theory |
5828 | 23 |
val theory_of: state -> theory |
24 |
val proof_of: state -> Proof.state |
|
18589 | 25 |
val proof_position_of: state -> int |
68505 | 26 |
val is_end_theory: state -> bool |
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
27 |
val end_theory: Position.T -> state -> theory |
67381 | 28 |
val presentation_context: state -> Proof.context |
29 |
val presentation_state: Proof.context -> state |
|
56893 | 30 |
val pretty_context: state -> Pretty.T list |
56887
1ca814da47ae
clarified print_state, which goes back to TTY loop before Proof General, and before separate print_context;
wenzelm
parents:
56867
diff
changeset
|
31 |
val pretty_state: state -> Pretty.T list |
61208 | 32 |
val string_of_state: state -> string |
37858 | 33 |
val pretty_abstract: state -> Pretty.T |
74831
32490add64b4
tuned signature: more explicit types for presentation;
wenzelm
parents:
74672
diff
changeset
|
34 |
type presentation = state -> Latex.text option |
16682 | 35 |
type transition |
5828 | 36 |
val empty: transition |
27427 | 37 |
val name_of: transition -> string |
28105 | 38 |
val pos_of: transition -> Position.T |
69877 | 39 |
val timing_of: transition -> Time.time |
60076 | 40 |
val type_error: transition -> string |
5828 | 41 |
val name: string -> transition -> transition |
73106
3df45de0c079
discontinued body_range (again): does not quite work, because Position.thread_data is plain Toplevel.pos_of only;
wenzelm
parents:
73098
diff
changeset
|
42 |
val position: Position.T -> transition -> transition |
69887 | 43 |
val markers: Input.source list -> transition -> transition |
69877 | 44 |
val timing: Time.time -> transition -> transition |
44187
88d770052bac
simplified Toplevel.init_theory: discontinued special name argument;
wenzelm
parents:
44186
diff
changeset
|
45 |
val init_theory: (unit -> theory) -> transition -> transition |
88d770052bac
simplified Toplevel.init_theory: discontinued special name argument;
wenzelm
parents:
44186
diff
changeset
|
46 |
val is_init: transition -> bool |
44186
806f0ec1a43d
simplified Toplevel.init_theory: discontinued special master argument;
wenzelm
parents:
44185
diff
changeset
|
47 |
val modify_init: (unit -> theory) -> transition -> transition |
6689 | 48 |
val exit: transition -> transition |
74831
32490add64b4
tuned signature: more explicit types for presentation;
wenzelm
parents:
74672
diff
changeset
|
49 |
val present: (state -> Latex.text) -> transition -> transition |
5828 | 50 |
val keep: (state -> unit) -> transition -> transition |
7612 | 51 |
val keep': (bool -> state -> unit) -> transition -> transition |
60190
906de96ba68a
allow diagnostic proof commands with skip_proofs;
wenzelm
parents:
60189
diff
changeset
|
52 |
val keep_proof: (state -> unit) -> transition -> transition |
51268
fcc4b89a600d
simplified Outer_Syntax.read_span: internalized Toplevel.is_ignored;
wenzelm
parents:
51241
diff
changeset
|
53 |
val is_ignored: transition -> bool |
74672 | 54 |
val is_malformed: transition -> bool |
73106
3df45de0c079
discontinued body_range (again): does not quite work, because Position.thread_data is plain Toplevel.pos_of only;
wenzelm
parents:
73098
diff
changeset
|
55 |
val ignored: Position.T -> transition |
3df45de0c079
discontinued body_range (again): does not quite work, because Position.thread_data is plain Toplevel.pos_of only;
wenzelm
parents:
73098
diff
changeset
|
56 |
val malformed: Position.T -> string -> transition |
26491 | 57 |
val generic_theory: (generic_theory -> generic_theory) -> transition -> transition |
7612 | 58 |
val theory': (bool -> theory -> theory) -> transition -> transition |
49012
8686c36fa27d
refined treatment of forked proofs at transaction boundaries, including proof commands (see also 7ee000ce5390);
wenzelm
parents:
49011
diff
changeset
|
59 |
val theory: (theory -> theory) -> transition -> transition |
72434 | 60 |
val begin_main_target: bool -> (theory -> local_theory) -> transition -> transition |
61 |
val end_main_target: transition -> transition |
|
72453 | 62 |
val begin_nested_target: (Context.generic -> local_theory) -> transition -> transition |
72434 | 63 |
val end_nested_target: transition -> transition |
59939
7d46aa03696e
support for 'restricted' modifier: only qualified accesses outside the local scope;
wenzelm
parents:
59923
diff
changeset
|
64 |
val local_theory': (bool * Position.T) option -> (xstring * Position.T) option -> |
59923
b21c82422d65
support private scope for individual local theory commands;
wenzelm
parents:
59472
diff
changeset
|
65 |
(bool -> local_theory -> local_theory) -> transition -> transition |
59939
7d46aa03696e
support for 'restricted' modifier: only qualified accesses outside the local scope;
wenzelm
parents:
59923
diff
changeset
|
66 |
val local_theory: (bool * Position.T) option -> (xstring * Position.T) option -> |
59923
b21c82422d65
support private scope for individual local theory commands;
wenzelm
parents:
59472
diff
changeset
|
67 |
(local_theory -> local_theory) -> transition -> transition |
74831
32490add64b4
tuned signature: more explicit types for presentation;
wenzelm
parents:
74672
diff
changeset
|
68 |
val present_local_theory: (xstring * Position.T) option -> (state -> Latex.text) -> |
24453 | 69 |
transition -> transition |
59939
7d46aa03696e
support for 'restricted' modifier: only qualified accesses outside the local scope;
wenzelm
parents:
59923
diff
changeset
|
70 |
val local_theory_to_proof': (bool * Position.T) option -> (xstring * Position.T) option -> |
45488
6d71d9e52369
pass positions for named targets, for formal links in the document model;
wenzelm
parents:
44304
diff
changeset
|
71 |
(bool -> local_theory -> Proof.state) -> transition -> transition |
59939
7d46aa03696e
support for 'restricted' modifier: only qualified accesses outside the local scope;
wenzelm
parents:
59923
diff
changeset
|
72 |
val local_theory_to_proof: (bool * Position.T) option -> (xstring * Position.T) option -> |
45488
6d71d9e52369
pass positions for named targets, for formal links in the document model;
wenzelm
parents:
44304
diff
changeset
|
73 |
(local_theory -> Proof.state) -> transition -> transition |
17363 | 74 |
val theory_to_proof: (theory -> Proof.state) -> transition -> transition |
21007 | 75 |
val end_proof: (bool -> Proof.state -> Proof.context) -> transition -> transition |
68876
cefaac3d24ff
no reset_proof for notepad: begin/end structure takes precedence over goal/proof structure;
wenzelm
parents:
68875
diff
changeset
|
76 |
val forget_proof: transition -> transition |
49863
b5fb6e7f8d81
more informative errors for 'proof' and 'apply' steps;
wenzelm
parents:
49062
diff
changeset
|
77 |
val proofs': (bool -> Proof.state -> Proof.state Seq.result Seq.seq) -> transition -> transition |
17904
21c6894b5998
simplified interfaces proof/proof' etc.: perform ProofHistory.apply(s)/current internally;
wenzelm
parents:
17513
diff
changeset
|
78 |
val proof': (bool -> Proof.state -> Proof.state) -> transition -> transition |
49863
b5fb6e7f8d81
more informative errors for 'proof' and 'apply' steps;
wenzelm
parents:
49062
diff
changeset
|
79 |
val proofs: (Proof.state -> Proof.state Seq.result Seq.seq) -> transition -> transition |
21177 | 80 |
val proof: (Proof.state -> Proof.state) -> transition -> transition |
33390 | 81 |
val actual_proof: (Proof_Node.T -> Proof_Node.T) -> transition -> transition |
60693
044f8bb3dd30
more accurate skip_proofs nesting, e.g. relevant for 'subgoal' command;
wenzelm
parents:
60403
diff
changeset
|
82 |
val skip_proof: (unit -> unit) -> transition -> transition |
044f8bb3dd30
more accurate skip_proofs nesting, e.g. relevant for 'subgoal' command;
wenzelm
parents:
60403
diff
changeset
|
83 |
val skip_proof_open: transition -> transition |
044f8bb3dd30
more accurate skip_proofs nesting, e.g. relevant for 'subgoal' command;
wenzelm
parents:
60403
diff
changeset
|
84 |
val skip_proof_close: transition -> transition |
52536 | 85 |
val exec_id: Document_ID.exec -> transition -> transition |
28425 | 86 |
val setmp_thread_position: transition -> ('a -> 'b) -> 'a -> 'b |
59055
5a7157b8e870
more informative failure of protocol commands, with exception trace;
wenzelm
parents:
59032
diff
changeset
|
87 |
val transition: bool -> transition -> state -> state * (exn * string) option |
51323 | 88 |
val command_errors: bool -> transition -> state -> Runtime.error list * state option |
51284
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51282
diff
changeset
|
89 |
val command_exception: bool -> transition -> state -> state |
56937 | 90 |
val reset_theory: state -> state option |
91 |
val reset_proof: state -> state option |
|
68877
33d78e5e0a00
more robust reset_state: begin/end structure takes precedence over goal/proof structure;
wenzelm
parents:
68876
diff
changeset
|
92 |
val reset_notepad: state -> state option |
69887 | 93 |
val fork_presentation: transition -> transition * transition |
51332
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
94 |
type result |
73687
54fe8cc0e1c6
clarified signature: provide access to previous state;
wenzelm
parents:
73614
diff
changeset
|
95 |
val join_results: result -> (state * transition * state) list |
68839 | 96 |
val element_result: Keyword.keywords -> transition Thy_Element.element -> state -> result * state |
5828 | 97 |
end; |
98 |
||
6965 | 99 |
structure Toplevel: TOPLEVEL = |
5828 | 100 |
struct |
101 |
||
102 |
(** toplevel state **) |
|
103 |
||
31476
c5d2899b6de9
moved Isar toplevel runtime support to runtime.ML, which is loaded early (before ml_compiler.ML);
wenzelm
parents:
31431
diff
changeset
|
104 |
exception UNDEF = Runtime.UNDEF; |
19063 | 105 |
|
106 |
||
21958
9dfd1ca4c0a0
refined notion of empty toplevel, admits undo of 'end';
wenzelm
parents:
21861
diff
changeset
|
107 |
(* datatype node *) |
21294 | 108 |
|
5828 | 109 |
datatype node = |
69883 | 110 |
Toplevel |
111 |
(*toplevel outside of theory body*) | |
|
69878 | 112 |
Theory of generic_theory |
113 |
(*global or local theory*) | |
|
33390 | 114 |
Proof of Proof_Node.T * ((Proof.context -> generic_theory) * generic_theory) |
27576
7afff36043e6
eliminated internal command history -- superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset
|
115 |
(*proof node, finish, original theory*) | |
51555 | 116 |
Skipped_Proof of int * (generic_theory * generic_theory); |
27564
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset
|
117 |
(*proof depth, resulting theory, original theory*) |
5828 | 118 |
|
69878 | 119 |
val theory_node = fn Theory gthy => SOME gthy | _ => NONE; |
18589 | 120 |
val proof_node = fn Proof (prf, _) => SOME prf | _ => NONE; |
51555 | 121 |
val skipped_proof_node = fn Skipped_Proof _ => true | _ => false; |
18589 | 122 |
|
69883 | 123 |
fun cases_node f _ _ Toplevel = f () |
124 |
| cases_node _ g _ (Theory gthy) = g gthy |
|
125 |
| cases_node _ _ h (Proof (prf, _)) = h (Proof_Node.current prf) |
|
126 |
| cases_node _ g _ (Skipped_Proof (_, (gthy, _))) = g gthy; |
|
127 |
||
128 |
fun cases_proper_node g h = cases_node (fn () => raise UNDEF) g h; |
|
129 |
||
130 |
val get_theory = cases_node (K NONE) (SOME o Context.theory_of) (SOME o Proof.theory_of); |
|
19063 | 131 |
|
21958
9dfd1ca4c0a0
refined notion of empty toplevel, admits undo of 'end';
wenzelm
parents:
21861
diff
changeset
|
132 |
|
9dfd1ca4c0a0
refined notion of empty toplevel, admits undo of 'end';
wenzelm
parents:
21861
diff
changeset
|
133 |
(* datatype state *) |
9dfd1ca4c0a0
refined notion of empty toplevel, admits undo of 'end';
wenzelm
parents:
21861
diff
changeset
|
134 |
|
69883 | 135 |
type node_presentation = node * Proof.context; |
5828 | 136 |
|
69886 | 137 |
fun init_presentation () = |
138 |
Proof_Context.init_global (Theory.get_pure_bootstrap ()); |
|
139 |
||
140 |
fun node_presentation node = |
|
141 |
(node, cases_node init_presentation Context.proof_of Proof.context_of node); |
|
142 |
||
69883 | 143 |
datatype state = |
74833
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
144 |
State of node_presentation * (theory option * Latex.text option); |
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
145 |
(*current node with presentation context, previous theory, document output*) |
62895
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
wenzelm
parents:
62889
diff
changeset
|
146 |
|
69883 | 147 |
fun node_of (State ((node, _), _)) = node; |
74833
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
148 |
fun previous_theory_of (State (_, (prev_thy, _))) = prev_thy; |
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
149 |
fun output_of (State (_, (_, output))) = output; |
5828 | 150 |
|
74833
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
151 |
fun init_toplevel () = State (node_presentation Toplevel, (NONE, NONE)); |
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
152 |
fun theory_toplevel thy = State (node_presentation (Theory (Context.Theory thy)), (NONE, NONE)); |
69883 | 153 |
|
74462
b3d6bb2ebf77
maintain previous theory identifier to support semantic caching, notably in Isabelle/Naproche;
wenzelm
parents:
73691
diff
changeset
|
154 |
val prev_theory = Config.declare_int ("prev_theory", Position.none) (K 0); |
74463 | 155 |
fun get_prev_theory thy = Config.get_global thy prev_theory; |
74833
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
156 |
fun set_prev_theory (State (_, (SOME prev_thy, _))) (Theory gthy) = |
74462
b3d6bb2ebf77
maintain previous theory identifier to support semantic caching, notably in Isabelle/Naproche;
wenzelm
parents:
73691
diff
changeset
|
157 |
let |
b3d6bb2ebf77
maintain previous theory identifier to support semantic caching, notably in Isabelle/Naproche;
wenzelm
parents:
73691
diff
changeset
|
158 |
val put = Config.put_global prev_theory (Context.theory_identifier prev_thy); |
b3d6bb2ebf77
maintain previous theory identifier to support semantic caching, notably in Isabelle/Naproche;
wenzelm
parents:
73691
diff
changeset
|
159 |
val gthy' = gthy |> Context.mapping put (Local_Theory.raw_theory put); |
b3d6bb2ebf77
maintain previous theory identifier to support semantic caching, notably in Isabelle/Naproche;
wenzelm
parents:
73691
diff
changeset
|
160 |
in Theory gthy' end |
b3d6bb2ebf77
maintain previous theory identifier to support semantic caching, notably in Isabelle/Naproche;
wenzelm
parents:
73691
diff
changeset
|
161 |
| set_prev_theory _ node = node; |
69886 | 162 |
|
69883 | 163 |
fun level state = |
164 |
(case node_of state of |
|
165 |
Toplevel => 0 |
|
166 |
| Theory _ => 0 |
|
167 |
| Proof (prf, _) => Proof.level (Proof_Node.current prf) |
|
168 |
| Skipped_Proof (d, _) => d + 1); (*different notion of proof depth!*) |
|
17076 | 169 |
|
69883 | 170 |
fun str_of_state state = |
171 |
(case node_of state of |
|
172 |
Toplevel => |
|
173 |
(case previous_theory_of state of |
|
174 |
NONE => "at top level" |
|
175 |
| SOME thy => "at top level, result theory " ^ quote (Context.theory_name thy)) |
|
176 |
| Theory (Context.Theory _) => "in theory mode" |
|
177 |
| Theory (Context.Proof _) => "in local theory mode" |
|
178 |
| Proof _ => "in proof mode" |
|
179 |
| Skipped_Proof _ => "in skipped proof mode"); |
|
5946
a4600d21b59b
print_state hook, obeys Goals.current_goals_markers by default;
wenzelm
parents:
5939
diff
changeset
|
180 |
|
a4600d21b59b
print_state hook, obeys Goals.current_goals_markers by default;
wenzelm
parents:
5939
diff
changeset
|
181 |
|
27576
7afff36043e6
eliminated internal command history -- superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset
|
182 |
(* current node *) |
5828 | 183 |
|
69883 | 184 |
fun is_toplevel state = (case node_of state of Toplevel => true | _ => false); |
5828 | 185 |
|
69883 | 186 |
fun is_theory state = |
187 |
not (is_toplevel state) andalso is_some (theory_node (node_of state)); |
|
18589 | 188 |
|
69883 | 189 |
fun is_proof state = |
190 |
not (is_toplevel state) andalso is_some (proof_node (node_of state)); |
|
5828 | 191 |
|
69883 | 192 |
fun is_skipped_proof state = |
193 |
not (is_toplevel state) andalso skipped_proof_node (node_of state); |
|
30801 | 194 |
|
69883 | 195 |
fun proper_node_of state = if is_toplevel state then raise UNDEF else node_of state; |
196 |
fun proper_node_case f g state = cases_proper_node f g (proper_node_of state); |
|
197 |
||
198 |
val context_of = proper_node_case Context.proof_of Proof.context_of; |
|
199 |
val generic_theory_of = proper_node_case I (Context.Proof o Proof.context_of); |
|
200 |
val theory_of = proper_node_case Context.theory_of Proof.theory_of; |
|
201 |
val proof_of = proper_node_case (fn _ => error "No proof state") I; |
|
17208 | 202 |
|
18589 | 203 |
fun proof_position_of state = |
69883 | 204 |
(case proper_node_of state of |
33390 | 205 |
Proof (prf, _) => Proof_Node.position prf |
60094 | 206 |
| _ => ~1); |
6664 | 207 |
|
74833
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
208 |
fun is_end_theory (State ((Toplevel, _), (SOME _, _))) = true |
68505 | 209 |
| is_end_theory _ = false; |
210 |
||
74833
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
211 |
fun end_theory _ (State ((Toplevel, _), (SOME thy, _))) = thy |
68869 | 212 |
| end_theory pos _ = error ("Malformed theory" ^ Position.here pos); |
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
213 |
|
5828 | 214 |
|
67381 | 215 |
(* presentation context *) |
216 |
||
217 |
structure Presentation_State = Proof_Data |
|
218 |
( |
|
219 |
type T = state option; |
|
220 |
fun init _ = NONE; |
|
221 |
); |
|
222 |
||
69883 | 223 |
fun presentation_context0 (State ((_, pr_ctxt), _)) = pr_ctxt; |
67642
10ff1f077119
more tight presentation context: avoid storing full Toplevel.state;
wenzelm
parents:
67641
diff
changeset
|
224 |
|
10ff1f077119
more tight presentation context: avoid storing full Toplevel.state;
wenzelm
parents:
67641
diff
changeset
|
225 |
fun presentation_context (state as State (current, _)) = |
10ff1f077119
more tight presentation context: avoid storing full Toplevel.state;
wenzelm
parents:
67641
diff
changeset
|
226 |
presentation_context0 state |
74833
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
227 |
|> Presentation_State.put (SOME (State (current, (NONE, NONE)))); |
67381 | 228 |
|
229 |
fun presentation_state ctxt = |
|
230 |
(case Presentation_State.get ctxt of |
|
74833
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
231 |
NONE => State (node_presentation (Theory (Context.Proof ctxt)), (NONE, NONE)) |
67381 | 232 |
| SOME state => state); |
233 |
||
234 |
||
16815 | 235 |
(* print state *) |
236 |
||
56893 | 237 |
fun pretty_context state = |
69883 | 238 |
if is_toplevel state then [] |
239 |
else |
|
240 |
let |
|
241 |
val gthy = |
|
242 |
(case node_of state of |
|
243 |
Toplevel => raise Match |
|
244 |
| Theory gthy => gthy |
|
245 |
| Proof (_, (_, gthy)) => gthy |
|
246 |
| Skipped_Proof (_, (_, gthy)) => gthy); |
|
247 |
val lthy = Context.cases Named_Target.theory_init I gthy; |
|
248 |
in Local_Theory.pretty lthy end; |
|
16815 | 249 |
|
56887
1ca814da47ae
clarified print_state, which goes back to TTY loop before Proof General, and before separate print_context;
wenzelm
parents:
56867
diff
changeset
|
250 |
fun pretty_state state = |
69883 | 251 |
(case node_of state of |
252 |
Toplevel => [] |
|
253 |
| Theory _ => [] |
|
254 |
| Proof (prf, _) => Proof.pretty_state (Proof_Node.current prf) |
|
255 |
| Skipped_Proof (d, _) => [Pretty.str ("skipped proof: depth " ^ string_of_int d)]); |
|
56867 | 256 |
|
61208 | 257 |
val string_of_state = pretty_state #> Pretty.chunks #> Pretty.string_of; |
16815 | 258 |
|
37858 | 259 |
fun pretty_abstract state = Pretty.str ("<Isar " ^ str_of_state state ^ ">"); |
260 |
||
62819
d3ff367a16a0
careful export of type-dependent functions, without losing their special status;
wenzelm
parents:
62663
diff
changeset
|
261 |
val _ = ML_system_pp (fn _ => fn _ => Pretty.to_polyml o pretty_abstract); |
62663 | 262 |
|
16815 | 263 |
|
15668 | 264 |
|
5828 | 265 |
(** toplevel transitions **) |
266 |
||
74831
32490add64b4
tuned signature: more explicit types for presentation;
wenzelm
parents:
74672
diff
changeset
|
267 |
(* presentation *) |
32490add64b4
tuned signature: more explicit types for presentation;
wenzelm
parents:
74672
diff
changeset
|
268 |
|
32490add64b4
tuned signature: more explicit types for presentation;
wenzelm
parents:
74672
diff
changeset
|
269 |
type presentation = state -> Latex.text option; |
32490add64b4
tuned signature: more explicit types for presentation;
wenzelm
parents:
74672
diff
changeset
|
270 |
val no_presentation: presentation = K NONE; |
32490add64b4
tuned signature: more explicit types for presentation;
wenzelm
parents:
74672
diff
changeset
|
271 |
fun presentation g : presentation = SOME o g; |
32490add64b4
tuned signature: more explicit types for presentation;
wenzelm
parents:
74672
diff
changeset
|
272 |
|
32490add64b4
tuned signature: more explicit types for presentation;
wenzelm
parents:
74672
diff
changeset
|
273 |
|
69888 | 274 |
(* primitive transitions *) |
275 |
||
276 |
datatype trans = |
|
277 |
(*init theory*) |
|
278 |
Init of unit -> theory | |
|
279 |
(*formal exit of theory*) |
|
280 |
Exit | |
|
281 |
(*peek at state*) |
|
74831
32490add64b4
tuned signature: more explicit types for presentation;
wenzelm
parents:
74672
diff
changeset
|
282 |
Keep of bool -> presentation | |
69888 | 283 |
(*node transaction and presentation*) |
74831
32490add64b4
tuned signature: more explicit types for presentation;
wenzelm
parents:
74672
diff
changeset
|
284 |
Transaction of (bool -> node -> node_presentation) * presentation; |
69888 | 285 |
|
286 |
local |
|
7022 | 287 |
|
31476
c5d2899b6de9
moved Isar toplevel runtime support to runtime.ML, which is loaded early (before ml_compiler.ML);
wenzelm
parents:
31431
diff
changeset
|
288 |
exception FAILURE of state * exn; |
c5d2899b6de9
moved Isar toplevel runtime support to runtime.ML, which is loaded early (before ml_compiler.ML);
wenzelm
parents:
31431
diff
changeset
|
289 |
|
74833
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
290 |
fun apply_presentation g (st as State (node, (prev_thy, _))) = |
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
291 |
State (node, (prev_thy, g st)); |
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
292 |
|
69888 | 293 |
fun apply f g node = |
20128
8f0e07d7cf92
keep/transaction: unified execution model (with debugging etc.);
wenzelm
parents:
19996
diff
changeset
|
294 |
let |
69886 | 295 |
val node_pr = node_presentation node; |
69883 | 296 |
val context = cases_proper_node I (Context.Proof o Proof.context_of) node; |
74833
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
297 |
fun make_state node_pr' = State (node_pr', (get_theory node, NONE)); |
6689 | 298 |
|
74833
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
299 |
val (st', err) = |
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
300 |
(Runtime.controlled_execution (SOME context) (f #> make_state #> apply_presentation g) node, |
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
301 |
NONE) handle exn => (make_state node_pr, SOME exn); |
20128
8f0e07d7cf92
keep/transaction: unified execution model (with debugging etc.);
wenzelm
parents:
19996
diff
changeset
|
302 |
in |
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52565
diff
changeset
|
303 |
(case err of |
74833
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
304 |
NONE => st' |
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
305 |
| SOME exn => raise FAILURE (st', exn)) |
20128
8f0e07d7cf92
keep/transaction: unified execution model (with debugging etc.);
wenzelm
parents:
19996
diff
changeset
|
306 |
end; |
6689 | 307 |
|
69887 | 308 |
fun apply_tr int trans state = |
309 |
(case (trans, node_of state) of |
|
310 |
(Init f, Toplevel) => |
|
311 |
Runtime.controlled_execution NONE (fn () => |
|
74833
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
312 |
State (node_presentation (Theory (Context.Theory (f ()))), (NONE, NONE))) () |
69887 | 313 |
| (Exit, node as Theory (Context.Theory thy)) => |
69883 | 314 |
let |
315 |
val State ((node', pr_ctxt), _) = |
|
69888 | 316 |
node |> apply |
71023
35a8e15b7e03
more robust Thm.expose_theory -- ensure that PIDE export happens in the proper theory context;
wenzelm
parents:
70398
diff
changeset
|
317 |
(fn _ => |
35a8e15b7e03
more robust Thm.expose_theory -- ensure that PIDE export happens in the proper theory context;
wenzelm
parents:
70398
diff
changeset
|
318 |
node_presentation |
35a8e15b7e03
more robust Thm.expose_theory -- ensure that PIDE export happens in the proper theory context;
wenzelm
parents:
70398
diff
changeset
|
319 |
(Theory (Context.Theory (tap Thm.expose_theory (Theory.end_theory thy))))) |
74833
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
320 |
no_presentation; |
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
321 |
in State ((Toplevel, pr_ctxt), (get_theory node', NONE)) end |
69887 | 322 |
| (Keep f, node) => |
323 |
Runtime.controlled_execution (try generic_theory_of state) |
|
74833
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
324 |
(fn () => |
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
325 |
let |
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
326 |
val prev_thy = previous_theory_of state; |
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
327 |
val state' = State (node_presentation node, (prev_thy, NONE)); |
fe9e590ae52f
output for document commands like 'section', 'text' is defined in user-space, as part of the command transaction;
wenzelm
parents:
74831
diff
changeset
|
328 |
in apply_presentation (fn st => f int st) state' end) () |
69887 | 329 |
| (Transaction _, Toplevel) => raise UNDEF |
74462
b3d6bb2ebf77
maintain previous theory identifier to support semantic caching, notably in Isabelle/Naproche;
wenzelm
parents:
73691
diff
changeset
|
330 |
| (Transaction (f, g), node) => apply (fn x => f int x) g (set_prev_theory state node) |
69887 | 331 |
| _ => raise UNDEF); |
5828 | 332 |
|
32792 | 333 |
fun apply_union _ [] state = raise FAILURE (state, UNDEF) |
334 |
| apply_union int (tr :: trs) state = |
|
335 |
apply_union int trs state |
|
336 |
handle Runtime.UNDEF => apply_tr int tr state |
|
337 |
| FAILURE (alt_state, UNDEF) => apply_tr int tr alt_state |
|
6689 | 338 |
| exn as FAILURE _ => raise exn |
339 |
| exn => raise FAILURE (state, exn); |
|
340 |
||
70134 | 341 |
fun apply_markers name markers (state as State ((node, pr_ctxt), prev_thy)) = |
69887 | 342 |
let |
343 |
val state' = |
|
344 |
Runtime.controlled_execution (try generic_theory_of state) |
|
70134 | 345 |
(fn () => State ((node, fold (Document_Marker.evaluate name) markers pr_ctxt), prev_thy)) (); |
69887 | 346 |
in (state', NONE) end |
347 |
handle exn => (state, SOME exn); |
|
348 |
||
6689 | 349 |
in |
350 |
||
70134 | 351 |
fun apply_trans int name markers trans state = |
352 |
(apply_union int trans state |> apply_markers name markers) |
|
15531 | 353 |
handle FAILURE (alt_state, exn) => (alt_state, SOME exn) | exn => (state, SOME exn); |
6689 | 354 |
|
355 |
end; |
|
5828 | 356 |
|
357 |
||
358 |
(* datatype transition *) |
|
359 |
||
360 |
datatype transition = Transition of |
|
69887 | 361 |
{name: string, (*command name*) |
73106
3df45de0c079
discontinued body_range (again): does not quite work, because Position.thread_data is plain Toplevel.pos_of only;
wenzelm
parents:
73098
diff
changeset
|
362 |
pos: Position.T, (*source position*) |
69887 | 363 |
markers: Input.source list, (*semantic document markers*) |
364 |
timing: Time.time, (*prescient timing information*) |
|
365 |
trans: trans list}; (*primitive transitions (union)*) |
|
5828 | 366 |
|
73106
3df45de0c079
discontinued body_range (again): does not quite work, because Position.thread_data is plain Toplevel.pos_of only;
wenzelm
parents:
73098
diff
changeset
|
367 |
fun make_transition (name, pos, markers, timing, trans) = |
3df45de0c079
discontinued body_range (again): does not quite work, because Position.thread_data is plain Toplevel.pos_of only;
wenzelm
parents:
73098
diff
changeset
|
368 |
Transition {name = name, pos = pos, markers = markers, timing = timing, trans = trans}; |
5828 | 369 |
|
73106
3df45de0c079
discontinued body_range (again): does not quite work, because Position.thread_data is plain Toplevel.pos_of only;
wenzelm
parents:
73098
diff
changeset
|
370 |
fun map_transition f (Transition {name, pos, markers, timing, trans}) = |
3df45de0c079
discontinued body_range (again): does not quite work, because Position.thread_data is plain Toplevel.pos_of only;
wenzelm
parents:
73098
diff
changeset
|
371 |
make_transition (f (name, pos, markers, timing, trans)); |
5828 | 372 |
|
73106
3df45de0c079
discontinued body_range (again): does not quite work, because Position.thread_data is plain Toplevel.pos_of only;
wenzelm
parents:
73098
diff
changeset
|
373 |
val empty = make_transition ("", Position.none, [], Time.zeroTime, []); |
5828 | 374 |
|
375 |
||
376 |
(* diagnostics *) |
|
377 |
||
27427 | 378 |
fun name_of (Transition {name, ...}) = name; |
28105 | 379 |
fun pos_of (Transition {pos, ...}) = pos; |
69877 | 380 |
fun timing_of (Transition {timing, ...}) = timing; |
5828 | 381 |
|
60076 | 382 |
fun command_msg msg tr = |
383 |
msg ^ "command " ^ quote (Markup.markup Markup.keyword1 (name_of tr)) ^ |
|
384 |
Position.here (pos_of tr); |
|
5828 | 385 |
|
60076 | 386 |
fun at_command tr = command_msg "At " tr; |
387 |
fun type_error tr = command_msg "Bad context for " tr; |
|
5828 | 388 |
|
389 |
||
390 |
(* modify transitions *) |
|
391 |
||
73106
3df45de0c079
discontinued body_range (again): does not quite work, because Position.thread_data is plain Toplevel.pos_of only;
wenzelm
parents:
73098
diff
changeset
|
392 |
fun name name = map_transition (fn (_, pos, markers, timing, trans) => |
3df45de0c079
discontinued body_range (again): does not quite work, because Position.thread_data is plain Toplevel.pos_of only;
wenzelm
parents:
73098
diff
changeset
|
393 |
(name, pos, markers, timing, trans)); |
9010 | 394 |
|
73106
3df45de0c079
discontinued body_range (again): does not quite work, because Position.thread_data is plain Toplevel.pos_of only;
wenzelm
parents:
73098
diff
changeset
|
395 |
fun position pos = map_transition (fn (name, _, markers, timing, trans) => |
3df45de0c079
discontinued body_range (again): does not quite work, because Position.thread_data is plain Toplevel.pos_of only;
wenzelm
parents:
73098
diff
changeset
|
396 |
(name, pos, markers, timing, trans)); |
69887 | 397 |
|
73106
3df45de0c079
discontinued body_range (again): does not quite work, because Position.thread_data is plain Toplevel.pos_of only;
wenzelm
parents:
73098
diff
changeset
|
398 |
fun markers markers = map_transition (fn (name, pos, _, timing, trans) => |
3df45de0c079
discontinued body_range (again): does not quite work, because Position.thread_data is plain Toplevel.pos_of only;
wenzelm
parents:
73098
diff
changeset
|
399 |
(name, pos, markers, timing, trans)); |
14923 | 400 |
|
73106
3df45de0c079
discontinued body_range (again): does not quite work, because Position.thread_data is plain Toplevel.pos_of only;
wenzelm
parents:
73098
diff
changeset
|
401 |
fun timing timing = map_transition (fn (name, pos, markers, _, trans) => |
3df45de0c079
discontinued body_range (again): does not quite work, because Position.thread_data is plain Toplevel.pos_of only;
wenzelm
parents:
73098
diff
changeset
|
402 |
(name, pos, markers, timing, trans)); |
69877 | 403 |
|
73106
3df45de0c079
discontinued body_range (again): does not quite work, because Position.thread_data is plain Toplevel.pos_of only;
wenzelm
parents:
73098
diff
changeset
|
404 |
fun add_trans tr = map_transition (fn (name, pos, markers, timing, trans) => |
3df45de0c079
discontinued body_range (again): does not quite work, because Position.thread_data is plain Toplevel.pos_of only;
wenzelm
parents:
73098
diff
changeset
|
405 |
(name, pos, markers, timing, tr :: trans)); |
16607 | 406 |
|
73106
3df45de0c079
discontinued body_range (again): does not quite work, because Position.thread_data is plain Toplevel.pos_of only;
wenzelm
parents:
73098
diff
changeset
|
407 |
val reset_trans = map_transition (fn (name, pos, markers, timing, _) => |
3df45de0c079
discontinued body_range (again): does not quite work, because Position.thread_data is plain Toplevel.pos_of only;
wenzelm
parents:
73098
diff
changeset
|
408 |
(name, pos, markers, timing, [])); |
5828 | 409 |
|
410 |
||
21007 | 411 |
(* basic transitions *) |
5828 | 412 |
|
44187
88d770052bac
simplified Toplevel.init_theory: discontinued special name argument;
wenzelm
parents:
44186
diff
changeset
|
413 |
fun init_theory f = add_trans (Init f); |
37977
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, non-optional master dependency, do not store text in deps;
wenzelm
parents:
37953
diff
changeset
|
414 |
|
44187
88d770052bac
simplified Toplevel.init_theory: discontinued special name argument;
wenzelm
parents:
44186
diff
changeset
|
415 |
fun is_init (Transition {trans = [Init _], ...}) = true |
88d770052bac
simplified Toplevel.init_theory: discontinued special name argument;
wenzelm
parents:
44186
diff
changeset
|
416 |
| is_init _ = false; |
88d770052bac
simplified Toplevel.init_theory: discontinued special name argument;
wenzelm
parents:
44186
diff
changeset
|
417 |
|
88d770052bac
simplified Toplevel.init_theory: discontinued special name argument;
wenzelm
parents:
44186
diff
changeset
|
418 |
fun modify_init f tr = if is_init tr then init_theory f (reset_trans tr) else tr; |
37977
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, non-optional master dependency, do not store text in deps;
wenzelm
parents:
37953
diff
changeset
|
419 |
|
6689 | 420 |
val exit = add_trans Exit; |
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
421 |
|
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
422 |
fun present_transaction f g = add_trans (Transaction (f, g)); |
74831
32490add64b4
tuned signature: more explicit types for presentation;
wenzelm
parents:
74672
diff
changeset
|
423 |
fun transaction f = present_transaction f no_presentation; |
32490add64b4
tuned signature: more explicit types for presentation;
wenzelm
parents:
74672
diff
changeset
|
424 |
fun transaction0 f = present_transaction (node_presentation oo f) no_presentation; |
5828 | 425 |
|
74831
32490add64b4
tuned signature: more explicit types for presentation;
wenzelm
parents:
74672
diff
changeset
|
426 |
fun present f = add_trans (Keep (K (presentation f))); |
32490add64b4
tuned signature: more explicit types for presentation;
wenzelm
parents:
74672
diff
changeset
|
427 |
fun keep f = add_trans (Keep (fn _ => fn st => let val () = f st in NONE end)); |
32490add64b4
tuned signature: more explicit types for presentation;
wenzelm
parents:
74672
diff
changeset
|
428 |
fun keep' f = add_trans (Keep (fn int => fn st => let val () = f int st in NONE end)); |
5828 | 429 |
|
60190
906de96ba68a
allow diagnostic proof commands with skip_proofs;
wenzelm
parents:
60189
diff
changeset
|
430 |
fun keep_proof f = |
906de96ba68a
allow diagnostic proof commands with skip_proofs;
wenzelm
parents:
60189
diff
changeset
|
431 |
keep (fn st => |
906de96ba68a
allow diagnostic proof commands with skip_proofs;
wenzelm
parents:
60189
diff
changeset
|
432 |
if is_proof st then f st |
906de96ba68a
allow diagnostic proof commands with skip_proofs;
wenzelm
parents:
60189
diff
changeset
|
433 |
else if is_skipped_proof st then () |
906de96ba68a
allow diagnostic proof commands with skip_proofs;
wenzelm
parents:
60189
diff
changeset
|
434 |
else warning "No proof state"); |
906de96ba68a
allow diagnostic proof commands with skip_proofs;
wenzelm
parents:
60189
diff
changeset
|
435 |
|
74672 | 436 |
val ignoredN = "<ignored>"; |
437 |
val malformedN = "<malformed>"; |
|
438 |
||
439 |
fun is_ignored tr = name_of tr = ignoredN; |
|
440 |
fun is_malformed tr = name_of tr = malformedN; |
|
48772 | 441 |
|
73106
3df45de0c079
discontinued body_range (again): does not quite work, because Position.thread_data is plain Toplevel.pos_of only;
wenzelm
parents:
73098
diff
changeset
|
442 |
fun ignored pos = |
74672 | 443 |
empty |> name ignoredN |> position pos |> keep (fn _ => ()); |
73098
8a20737e4ebf
support more command positions, analogous to Command.core_range in Isabelle/Scala;
wenzelm
parents:
72505
diff
changeset
|
444 |
|
73106
3df45de0c079
discontinued body_range (again): does not quite work, because Position.thread_data is plain Toplevel.pos_of only;
wenzelm
parents:
73098
diff
changeset
|
445 |
fun malformed pos msg = |
74672 | 446 |
empty |> name malformedN |> position pos |> keep (fn _ => error msg); |
27840 | 447 |
|
21007 | 448 |
|
49012
8686c36fa27d
refined treatment of forked proofs at transaction boundaries, including proof commands (see also 7ee000ce5390);
wenzelm
parents:
49011
diff
changeset
|
449 |
(* theory transitions *) |
44304
7ee000ce5390
maintain recent future proofs at transaction boundaries;
wenzelm
parents:
44270
diff
changeset
|
450 |
|
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset
|
451 |
fun generic_theory f = transaction (fn _ => |
69886 | 452 |
(fn Theory gthy => node_presentation (Theory (f gthy)) |
26491 | 453 |
| _ => raise UNDEF)); |
454 |
||
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset
|
455 |
fun theory' f = transaction (fn int => |
69878 | 456 |
(fn Theory (Context.Theory thy) => |
33725
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
457 |
let val thy' = thy |
49012
8686c36fa27d
refined treatment of forked proofs at transaction boundaries, including proof commands (see also 7ee000ce5390);
wenzelm
parents:
49011
diff
changeset
|
458 |
|> Sign.new_group |
33725
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
459 |
|> f int |
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
460 |
|> Sign.reset_group; |
69886 | 461 |
in node_presentation (Theory (Context.Theory thy')) end |
20963
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
462 |
| _ => raise UNDEF)); |
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
463 |
|
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
464 |
fun theory f = theory' (K f); |
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
465 |
|
72434 | 466 |
fun begin_main_target begin f = transaction (fn _ => |
69878 | 467 |
(fn Theory (Context.Theory thy) => |
20963
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
468 |
let |
20985 | 469 |
val lthy = f thy; |
72453 | 470 |
val gthy = |
471 |
if begin |
|
472 |
then Context.Proof lthy |
|
72505 | 473 |
else Target_Context.end_named_cmd lthy; |
56897
c668735fb8b5
print results as "state", to avoid intrusion into the source text;
wenzelm
parents:
56895
diff
changeset
|
474 |
val _ = |
60245 | 475 |
(case Local_Theory.pretty lthy of |
476 |
[] => () |
|
477 |
| prts => Output.state (Pretty.string_of (Pretty.chunks prts))); |
|
69878 | 478 |
in (Theory gthy, lthy) end |
20963
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
479 |
| _ => raise UNDEF)); |
17076 | 480 |
|
72434 | 481 |
val end_main_target = transaction (fn _ => |
72505 | 482 |
(fn Theory (Context.Proof lthy) => (Theory (Target_Context.end_named_cmd lthy), lthy) |
21007 | 483 |
| _ => raise UNDEF)); |
484 |
||
72434 | 485 |
fun begin_nested_target f = transaction0 (fn _ => |
69878 | 486 |
(fn Theory gthy => |
72449
e1ee4a9902bd
centralized case distinction for beginning and ending nested targets in one place
haftmann
parents:
72436
diff
changeset
|
487 |
let |
72453 | 488 |
val lthy' = f gthy; |
72449
e1ee4a9902bd
centralized case distinction for beginning and ending nested targets in one place
haftmann
parents:
72436
diff
changeset
|
489 |
in Theory (Context.Proof lthy') end |
47069 | 490 |
| _ => raise UNDEF)); |
491 |
||
72434 | 492 |
val end_nested_target = transaction (fn _ => |
69878 | 493 |
(fn Theory (Context.Proof lthy) => |
72505 | 494 |
(case try Target_Context.end_nested_cmd lthy of |
495 |
SOME gthy' => (Theory gthy', lthy) |
|
47069 | 496 |
| NONE => raise UNDEF) |
497 |
| _ => raise UNDEF)); |
|
498 |
||
59990
a81dc82ecba3
clarified keyword 'qualified' in accordance to a similar keyword from Haskell (despite unrelated Binding.qualified in Isabelle/ML);
wenzelm
parents:
59939
diff
changeset
|
499 |
fun restricted_context (SOME (strict, scope)) = |
a81dc82ecba3
clarified keyword 'qualified' in accordance to a similar keyword from Haskell (despite unrelated Binding.qualified in Isabelle/ML);
wenzelm
parents:
59939
diff
changeset
|
500 |
Proof_Context.map_naming (Name_Space.restricted strict scope) |
a81dc82ecba3
clarified keyword 'qualified' in accordance to a similar keyword from Haskell (despite unrelated Binding.qualified in Isabelle/ML);
wenzelm
parents:
59939
diff
changeset
|
501 |
| restricted_context NONE = I; |
59939
7d46aa03696e
support for 'restricted' modifier: only qualified accesses outside the local scope;
wenzelm
parents:
59923
diff
changeset
|
502 |
|
59990
a81dc82ecba3
clarified keyword 'qualified' in accordance to a similar keyword from Haskell (despite unrelated Binding.qualified in Isabelle/ML);
wenzelm
parents:
59939
diff
changeset
|
503 |
fun local_theory' restricted target f = present_transaction (fn int => |
69878 | 504 |
(fn Theory gthy => |
21294 | 505 |
let |
72453 | 506 |
val (finish, lthy) = Target_Context.switch_named_cmd target gthy; |
47274 | 507 |
val lthy' = lthy |
59990
a81dc82ecba3
clarified keyword 'qualified' in accordance to a similar keyword from Haskell (despite unrelated Binding.qualified in Isabelle/ML);
wenzelm
parents:
59939
diff
changeset
|
508 |
|> restricted_context restricted |
49012
8686c36fa27d
refined treatment of forked proofs at transaction boundaries, including proof commands (see also 7ee000ce5390);
wenzelm
parents:
49011
diff
changeset
|
509 |
|> Local_Theory.new_group |
33725
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
510 |
|> f int |
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
511 |
|> Local_Theory.reset_group; |
69878 | 512 |
in (Theory (finish lthy'), lthy') end |
59032 | 513 |
| _ => raise UNDEF)) |
74831
32490add64b4
tuned signature: more explicit types for presentation;
wenzelm
parents:
74672
diff
changeset
|
514 |
no_presentation; |
15668 | 515 |
|
59990
a81dc82ecba3
clarified keyword 'qualified' in accordance to a similar keyword from Haskell (despite unrelated Binding.qualified in Isabelle/ML);
wenzelm
parents:
59939
diff
changeset
|
516 |
fun local_theory restricted target f = local_theory' restricted target (K f); |
21007 | 517 |
|
74831
32490add64b4
tuned signature: more explicit types for presentation;
wenzelm
parents:
74672
diff
changeset
|
518 |
fun present_local_theory target g = present_transaction (fn _ => |
69878 | 519 |
(fn Theory gthy => |
72453 | 520 |
let val (finish, lthy) = Target_Context.switch_named_cmd target gthy; |
69878 | 521 |
in (Theory (finish lthy), lthy) end |
74831
32490add64b4
tuned signature: more explicit types for presentation;
wenzelm
parents:
74672
diff
changeset
|
522 |
| _ => raise UNDEF)) |
32490add64b4
tuned signature: more explicit types for presentation;
wenzelm
parents:
74672
diff
changeset
|
523 |
(presentation g); |
21007 | 524 |
|
525 |
||
526 |
(* proof transitions *) |
|
527 |
||
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset
|
528 |
fun end_proof f = transaction (fn int => |
24795
6f5cb7885fd7
print_state_context: local theory context, not proof context;
wenzelm
parents:
24780
diff
changeset
|
529 |
(fn Proof (prf, (finish, _)) => |
33390 | 530 |
let val state = Proof_Node.current prf in |
21007 | 531 |
if can (Proof.assert_bottom true) state then |
532 |
let |
|
533 |
val ctxt' = f int state; |
|
534 |
val gthy' = finish ctxt'; |
|
69878 | 535 |
in (Theory gthy', ctxt') end |
21007 | 536 |
else raise UNDEF |
537 |
end |
|
69886 | 538 |
| Skipped_Proof (0, (gthy, _)) => node_presentation (Theory gthy) |
21007 | 539 |
| _ => raise UNDEF)); |
540 |
||
21294 | 541 |
local |
542 |
||
69882 | 543 |
fun begin_proof init_proof = transaction0 (fn int => |
69878 | 544 |
(fn Theory gthy => |
21294 | 545 |
let |
69882 | 546 |
val (finish, prf) = init_proof int gthy; |
67157 | 547 |
val document = Options.default_string "document"; |
548 |
val skip = (document = "" orelse document = "false") andalso Goal.skip_proofs_enabled (); |
|
58795 | 549 |
val schematic_goal = try Proof.schematic_goal prf; |
47274 | 550 |
val _ = |
58795 | 551 |
if skip andalso schematic_goal = SOME true then |
47274 | 552 |
warning "Cannot skip proof of schematic goal statement" |
553 |
else (); |
|
21294 | 554 |
in |
58795 | 555 |
if skip andalso schematic_goal = SOME false then |
51555 | 556 |
Skipped_Proof (0, (finish (Proof.global_skip_proof true prf), gthy)) |
47274 | 557 |
else Proof (Proof_Node.init prf, (finish, gthy)) |
21294 | 558 |
end |
559 |
| _ => raise UNDEF)); |
|
560 |
||
561 |
in |
|
562 |
||
59990
a81dc82ecba3
clarified keyword 'qualified' in accordance to a similar keyword from Haskell (despite unrelated Binding.qualified in Isabelle/ML);
wenzelm
parents:
59939
diff
changeset
|
563 |
fun local_theory_to_proof' restricted target f = begin_proof |
47274 | 564 |
(fn int => fn gthy => |
59923
b21c82422d65
support private scope for individual local theory commands;
wenzelm
parents:
59472
diff
changeset
|
565 |
let |
72453 | 566 |
val (finish, lthy) = Target_Context.switch_named_cmd target gthy; |
59923
b21c82422d65
support private scope for individual local theory commands;
wenzelm
parents:
59472
diff
changeset
|
567 |
val prf = lthy |
59990
a81dc82ecba3
clarified keyword 'qualified' in accordance to a similar keyword from Haskell (despite unrelated Binding.qualified in Isabelle/ML);
wenzelm
parents:
59939
diff
changeset
|
568 |
|> restricted_context restricted |
59923
b21c82422d65
support private scope for individual local theory commands;
wenzelm
parents:
59472
diff
changeset
|
569 |
|> Local_Theory.new_group |
b21c82422d65
support private scope for individual local theory commands;
wenzelm
parents:
59472
diff
changeset
|
570 |
|> f int; |
b21c82422d65
support private scope for individual local theory commands;
wenzelm
parents:
59472
diff
changeset
|
571 |
in (finish o Local_Theory.reset_group, prf) end); |
24780
47bb1e380d83
local_theory transactions: more careful treatment of context position;
wenzelm
parents:
24634
diff
changeset
|
572 |
|
59990
a81dc82ecba3
clarified keyword 'qualified' in accordance to a similar keyword from Haskell (despite unrelated Binding.qualified in Isabelle/ML);
wenzelm
parents:
59939
diff
changeset
|
573 |
fun local_theory_to_proof restricted target f = |
a81dc82ecba3
clarified keyword 'qualified' in accordance to a similar keyword from Haskell (despite unrelated Binding.qualified in Isabelle/ML);
wenzelm
parents:
59939
diff
changeset
|
574 |
local_theory_to_proof' restricted target (K f); |
21294 | 575 |
|
576 |
fun theory_to_proof f = begin_proof |
|
47274 | 577 |
(fn _ => fn gthy => |
56057
ad6bd8030d88
more explicit Sign.change_check -- detect structural mistakes where they emerge, not at later theory merges;
wenzelm
parents:
56055
diff
changeset
|
578 |
(Context.Theory o Sign.reset_group o Sign.change_check o Proof_Context.theory_of, |
49062
7e31dfd99ce7
discontinued complicated/unreliable notion of recent proofs within context;
wenzelm
parents:
49042
diff
changeset
|
579 |
(case gthy of |
52788 | 580 |
Context.Theory thy => f (Sign.new_group thy) |
49012
8686c36fa27d
refined treatment of forked proofs at transaction boundaries, including proof commands (see also 7ee000ce5390);
wenzelm
parents:
49011
diff
changeset
|
581 |
| _ => raise UNDEF))); |
21294 | 582 |
|
583 |
end; |
|
584 |
||
69878 | 585 |
val forget_proof = transaction0 (fn _ => |
58798
49ed5eea15d4
'oops' requires proper goal statement -- exclude 'notepad' to avoid disrupting begin/end structure;
wenzelm
parents:
58795
diff
changeset
|
586 |
(fn Proof (prf, (_, orig_gthy)) => |
68876
cefaac3d24ff
no reset_proof for notepad: begin/end structure takes precedence over goal/proof structure;
wenzelm
parents:
68875
diff
changeset
|
587 |
if Proof.is_notepad (Proof_Node.current prf) then raise UNDEF |
69878 | 588 |
else Theory orig_gthy |
589 |
| Skipped_Proof (_, (_, orig_gthy)) => Theory orig_gthy |
|
21007 | 590 |
| _ => raise UNDEF)); |
591 |
||
69878 | 592 |
fun proofs' f = transaction0 (fn int => |
49062
7e31dfd99ce7
discontinued complicated/unreliable notion of recent proofs within context;
wenzelm
parents:
49042
diff
changeset
|
593 |
(fn Proof (prf, x) => Proof (Proof_Node.applys (f int) prf, x) |
51555 | 594 |
| skip as Skipped_Proof _ => skip |
16815 | 595 |
| _ => raise UNDEF)); |
15668 | 596 |
|
49863
b5fb6e7f8d81
more informative errors for 'proof' and 'apply' steps;
wenzelm
parents:
49062
diff
changeset
|
597 |
fun proof' f = proofs' ((Seq.single o Seq.Result) oo f); |
17904
21c6894b5998
simplified interfaces proof/proof' etc.: perform ProofHistory.apply(s)/current internally;
wenzelm
parents:
17513
diff
changeset
|
598 |
val proofs = proofs' o K; |
6689 | 599 |
val proof = proof' o K; |
16815 | 600 |
|
60693
044f8bb3dd30
more accurate skip_proofs nesting, e.g. relevant for 'subgoal' command;
wenzelm
parents:
60403
diff
changeset
|
601 |
|
044f8bb3dd30
more accurate skip_proofs nesting, e.g. relevant for 'subgoal' command;
wenzelm
parents:
60403
diff
changeset
|
602 |
(* skipped proofs *) |
044f8bb3dd30
more accurate skip_proofs nesting, e.g. relevant for 'subgoal' command;
wenzelm
parents:
60403
diff
changeset
|
603 |
|
69878 | 604 |
fun actual_proof f = transaction0 (fn _ => |
21007 | 605 |
(fn Proof (prf, x) => Proof (f prf, x) |
20963
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
606 |
| _ => raise UNDEF)); |
16815 | 607 |
|
69878 | 608 |
fun skip_proof f = transaction0 (fn _ => |
60693
044f8bb3dd30
more accurate skip_proofs nesting, e.g. relevant for 'subgoal' command;
wenzelm
parents:
60403
diff
changeset
|
609 |
(fn skip as Skipped_Proof _ => (f (); skip) |
18563 | 610 |
| _ => raise UNDEF)); |
611 |
||
69878 | 612 |
val skip_proof_open = transaction0 (fn _ => |
60693
044f8bb3dd30
more accurate skip_proofs nesting, e.g. relevant for 'subgoal' command;
wenzelm
parents:
60403
diff
changeset
|
613 |
(fn Skipped_Proof (d, x) => Skipped_Proof (d + 1, x) |
044f8bb3dd30
more accurate skip_proofs nesting, e.g. relevant for 'subgoal' command;
wenzelm
parents:
60403
diff
changeset
|
614 |
| _ => raise UNDEF)); |
044f8bb3dd30
more accurate skip_proofs nesting, e.g. relevant for 'subgoal' command;
wenzelm
parents:
60403
diff
changeset
|
615 |
|
69878 | 616 |
val skip_proof_close = transaction0 (fn _ => |
617 |
(fn Skipped_Proof (0, (gthy, _)) => Theory gthy |
|
60693
044f8bb3dd30
more accurate skip_proofs nesting, e.g. relevant for 'subgoal' command;
wenzelm
parents:
60403
diff
changeset
|
618 |
| Skipped_Proof (d, x) => Skipped_Proof (d - 1, x) |
33725
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
619 |
| _ => raise UNDEF)); |
5828 | 620 |
|
621 |
||
622 |
||
623 |
(** toplevel transactions **) |
|
624 |
||
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52499
diff
changeset
|
625 |
(* runtime position *) |
27427 | 626 |
|
73106
3df45de0c079
discontinued body_range (again): does not quite work, because Position.thread_data is plain Toplevel.pos_of only;
wenzelm
parents:
73098
diff
changeset
|
627 |
fun exec_id id (tr as Transition {pos, ...}) = |
73098
8a20737e4ebf
support more command positions, analogous to Command.core_range in Isabelle/Scala;
wenzelm
parents:
72505
diff
changeset
|
628 |
let val put_id = Position.put_id (Document_ID.print id) |
73106
3df45de0c079
discontinued body_range (again): does not quite work, because Position.thread_data is plain Toplevel.pos_of only;
wenzelm
parents:
73098
diff
changeset
|
629 |
in position (put_id pos) tr end; |
25799 | 630 |
|
25960 | 631 |
fun setmp_thread_position (Transition {pos, ...}) f x = |
25819
e6feb08b7f4b
replaced thread_properties by simplified version in position.ML;
wenzelm
parents:
25809
diff
changeset
|
632 |
Position.setmp_thread_data pos f x; |
25799 | 633 |
|
634 |
||
5828 | 635 |
(* apply transitions *) |
636 |
||
6664 | 637 |
local |
638 |
||
70134 | 639 |
fun app int (tr as Transition {name, markers, trans, ...}) = |
67932 | 640 |
setmp_thread_position tr |
70134 | 641 |
(Timing.protocol (name_of tr) (pos_of tr) (apply_trans int name markers trans) |
67932 | 642 |
##> Option.map (fn UNDEF => ERROR (type_error tr) | exn => exn)); |
6664 | 643 |
|
644 |
in |
|
5828 | 645 |
|
26602
5534b6a6b810
made purely value-oriented, moved global state to structure Isar (cf. isar.ML);
wenzelm
parents:
26491
diff
changeset
|
646 |
fun transition int tr st = |
28095
7eaf0813bdc3
added add_hook interface for post-transition hooks;
wenzelm
parents:
27859
diff
changeset
|
647 |
let |
60895
501be4aa75b4
default ML context for all command transactions, e.g. relevant for debugging and toplevel pretty-printing;
wenzelm
parents:
60693
diff
changeset
|
648 |
val (st', opt_err) = |
67642
10ff1f077119
more tight presentation context: avoid storing full Toplevel.state;
wenzelm
parents:
67641
diff
changeset
|
649 |
Context.setmp_generic_context (try (Context.Proof o presentation_context0) st) |
60895
501be4aa75b4
default ML context for all command transactions, e.g. relevant for debugging and toplevel pretty-printing;
wenzelm
parents:
60693
diff
changeset
|
650 |
(fn () => app int tr st) (); |
59055
5a7157b8e870
more informative failure of protocol commands, with exception trace;
wenzelm
parents:
59032
diff
changeset
|
651 |
val opt_err' = opt_err |> Option.map |
5a7157b8e870
more informative failure of protocol commands, with exception trace;
wenzelm
parents:
59032
diff
changeset
|
652 |
(fn Runtime.EXCURSION_FAIL exn_info => exn_info |
5a7157b8e870
more informative failure of protocol commands, with exception trace;
wenzelm
parents:
59032
diff
changeset
|
653 |
| exn => (Runtime.exn_context (try context_of st) exn, at_command tr)); |
5a7157b8e870
more informative failure of protocol commands, with exception trace;
wenzelm
parents:
59032
diff
changeset
|
654 |
in (st', opt_err') end; |
6664 | 655 |
|
656 |
end; |
|
5828 | 657 |
|
658 |
||
51284
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51282
diff
changeset
|
659 |
(* managed commands *) |
5828 | 660 |
|
51323 | 661 |
fun command_errors int tr st = |
662 |
(case transition int tr st of |
|
59055
5a7157b8e870
more informative failure of protocol commands, with exception trace;
wenzelm
parents:
59032
diff
changeset
|
663 |
(st', NONE) => ([], SOME st') |
65948 | 664 |
| (_, SOME (exn, _)) => (Runtime.exn_messages exn, NONE)); |
51323 | 665 |
|
51284
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51282
diff
changeset
|
666 |
fun command_exception int tr st = |
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51282
diff
changeset
|
667 |
(case transition int tr st of |
59055
5a7157b8e870
more informative failure of protocol commands, with exception trace;
wenzelm
parents:
59032
diff
changeset
|
668 |
(st', NONE) => st' |
5a7157b8e870
more informative failure of protocol commands, with exception trace;
wenzelm
parents:
59032
diff
changeset
|
669 |
| (_, SOME (exn, info)) => |
62505 | 670 |
if Exn.is_interrupt exn then Exn.reraise exn |
59055
5a7157b8e870
more informative failure of protocol commands, with exception trace;
wenzelm
parents:
59032
diff
changeset
|
671 |
else raise Runtime.EXCURSION_FAIL (exn, info)); |
27576
7afff36043e6
eliminated internal command history -- superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset
|
672 |
|
58848 | 673 |
val command = command_exception false; |
51284
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51282
diff
changeset
|
674 |
|
28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset
|
675 |
|
56937 | 676 |
(* reset state *) |
677 |
||
678 |
local |
|
679 |
||
680 |
fun reset_state check trans st = |
|
681 |
if check st then NONE |
|
682 |
else #2 (command_errors false (trans empty) st); |
|
683 |
||
684 |
in |
|
685 |
||
68876
cefaac3d24ff
no reset_proof for notepad: begin/end structure takes precedence over goal/proof structure;
wenzelm
parents:
68875
diff
changeset
|
686 |
val reset_theory = reset_state is_theory forget_proof; |
56937 | 687 |
|
688 |
val reset_proof = |
|
689 |
reset_state is_proof |
|
69878 | 690 |
(transaction0 (fn _ => |
691 |
(fn Theory gthy => Skipped_Proof (0, (gthy, gthy)) |
|
56937 | 692 |
| _ => raise UNDEF))); |
693 |
||
68877
33d78e5e0a00
more robust reset_state: begin/end structure takes precedence over goal/proof structure;
wenzelm
parents:
68876
diff
changeset
|
694 |
val reset_notepad = |
33d78e5e0a00
more robust reset_state: begin/end structure takes precedence over goal/proof structure;
wenzelm
parents:
68876
diff
changeset
|
695 |
reset_state |
33d78e5e0a00
more robust reset_state: begin/end structure takes precedence over goal/proof structure;
wenzelm
parents:
68876
diff
changeset
|
696 |
(fn st => |
33d78e5e0a00
more robust reset_state: begin/end structure takes precedence over goal/proof structure;
wenzelm
parents:
68876
diff
changeset
|
697 |
(case try proof_of st of |
33d78e5e0a00
more robust reset_state: begin/end structure takes precedence over goal/proof structure;
wenzelm
parents:
68876
diff
changeset
|
698 |
SOME state => not (Proof.is_notepad state) orelse can Proof.end_notepad state |
33d78e5e0a00
more robust reset_state: begin/end structure takes precedence over goal/proof structure;
wenzelm
parents:
68876
diff
changeset
|
699 |
| NONE => true)) |
68878 | 700 |
(proof Proof.reset_notepad); |
68877
33d78e5e0a00
more robust reset_state: begin/end structure takes precedence over goal/proof structure;
wenzelm
parents:
68876
diff
changeset
|
701 |
|
56937 | 702 |
end; |
703 |
||
704 |
||
46959
cdc791910460
defer actual parsing of command spans and thus allow new commands to be used in the same theory where defined;
wenzelm
parents:
45666
diff
changeset
|
705 |
(* scheduled proof result *) |
28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset
|
706 |
|
51332
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
707 |
datatype result = |
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
708 |
Result of transition * state | |
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
709 |
Result_List of result list | |
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
710 |
Result_Future of result future; |
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
711 |
|
73687
54fe8cc0e1c6
clarified signature: provide access to previous state;
wenzelm
parents:
73614
diff
changeset
|
712 |
fun join_results result = |
54fe8cc0e1c6
clarified signature: provide access to previous state;
wenzelm
parents:
73614
diff
changeset
|
713 |
let |
54fe8cc0e1c6
clarified signature: provide access to previous state;
wenzelm
parents:
73614
diff
changeset
|
714 |
fun add (tr, st') res = |
54fe8cc0e1c6
clarified signature: provide access to previous state;
wenzelm
parents:
73614
diff
changeset
|
715 |
(case res of |
54fe8cc0e1c6
clarified signature: provide access to previous state;
wenzelm
parents:
73614
diff
changeset
|
716 |
[] => [(init_toplevel (), tr, st')] |
54fe8cc0e1c6
clarified signature: provide access to previous state;
wenzelm
parents:
73614
diff
changeset
|
717 |
| (_, _, st) :: _ => (st, tr, st') :: res); |
54fe8cc0e1c6
clarified signature: provide access to previous state;
wenzelm
parents:
73614
diff
changeset
|
718 |
fun acc (Result r) = add r |
54fe8cc0e1c6
clarified signature: provide access to previous state;
wenzelm
parents:
73614
diff
changeset
|
719 |
| acc (Result_List rs) = fold acc rs |
54fe8cc0e1c6
clarified signature: provide access to previous state;
wenzelm
parents:
73614
diff
changeset
|
720 |
| acc (Result_Future x) = acc (Future.join x); |
54fe8cc0e1c6
clarified signature: provide access to previous state;
wenzelm
parents:
73614
diff
changeset
|
721 |
in rev (acc result []) end; |
51332
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
722 |
|
51323 | 723 |
local |
724 |
||
47417 | 725 |
structure Result = Proof_Data |
28974
d6b190efa01a
excursion: pass explicit proof states as result of future proof, replaced low-level Thm.join_futures by PureThy.force_proofs;
wenzelm
parents:
28645
diff
changeset
|
726 |
( |
51332
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
727 |
type T = result; |
59150 | 728 |
fun init _ = Result_List []; |
28974
d6b190efa01a
excursion: pass explicit proof states as result of future proof, replaced low-level Thm.join_futures by PureThy.force_proofs;
wenzelm
parents:
28645
diff
changeset
|
729 |
); |
d6b190efa01a
excursion: pass explicit proof states as result of future proof, replaced low-level Thm.join_futures by PureThy.force_proofs;
wenzelm
parents:
28645
diff
changeset
|
730 |
|
51332
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
731 |
val get_result = Result.get o Proof.context_of; |
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
732 |
val put_result = Proof.map_context o Result.put; |
51324 | 733 |
|
66169
8cfa8c7ee1f6
keep original bottom-up order of proof forks, which potentially reduces thread congestion due to Proofterm.consolidate;
wenzelm
parents:
65948
diff
changeset
|
734 |
fun timing_estimate elem = |
68839 | 735 |
let val trs = tl (Thy_Element.flat_element elem) |
69877 | 736 |
in fold (fn tr => fn t => timing_of tr + t) trs Time.zeroTime end; |
51423
e5f9a6d9ca82
clarified parallel_subproofs_saturation (blind guess) vs. parallel_subproofs_threshold (precient timing estimate);
wenzelm
parents:
51332
diff
changeset
|
737 |
|
68130
6fb85346cb79
clarified future scheduling parameters, with support for parallel_limit;
wenzelm
parents:
67932
diff
changeset
|
738 |
fun future_proofs_enabled estimate st = |
51324 | 739 |
(case try proof_of st of |
740 |
NONE => false |
|
741 |
| SOME state => |
|
70398 | 742 |
not (Proofterm.proofs_enabled ()) andalso |
51324 | 743 |
not (Proof.is_relevant state) andalso |
744 |
(if can (Proof.assert_bottom true) state |
|
68130
6fb85346cb79
clarified future scheduling parameters, with support for parallel_limit;
wenzelm
parents:
67932
diff
changeset
|
745 |
then Future.proofs_enabled 1 |
6fb85346cb79
clarified future scheduling parameters, with support for parallel_limit;
wenzelm
parents:
67932
diff
changeset
|
746 |
else Future.proofs_enabled 2 orelse Future.proofs_enabled_timing estimate)); |
51278 | 747 |
|
69887 | 748 |
val empty_markers = markers []; |
749 |
val empty_trans = reset_trans #> keep (K ()); |
|
750 |
||
751 |
in |
|
752 |
||
753 |
fun fork_presentation tr = (tr |> empty_markers, tr |> empty_trans); |
|
754 |
||
58923 | 755 |
fun atom_result keywords tr st = |
51323 | 756 |
let |
757 |
val st' = |
|
68130
6fb85346cb79
clarified future scheduling parameters, with support for parallel_limit;
wenzelm
parents:
67932
diff
changeset
|
758 |
if Future.proofs_enabled 1 andalso Keyword.is_diag keywords (name_of tr) then |
69887 | 759 |
let |
760 |
val (tr1, tr2) = fork_presentation tr; |
|
761 |
val _ = |
|
762 |
Execution.fork {name = "Toplevel.diag", pos = pos_of tr, pri = ~1} |
|
763 |
(fn () => command tr1 st); |
|
764 |
in command tr2 st end |
|
51323 | 765 |
else command tr st; |
51332
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
766 |
in (Result (tr, st'), st') end; |
51323 | 767 |
|
68839 | 768 |
fun element_result keywords (Thy_Element.Element (tr, NONE)) st = atom_result keywords tr st |
769 |
| element_result keywords (elem as Thy_Element.Element (head_tr, SOME element_rest)) st = |
|
48633
7cd32f9d4293
recovered comination of Toplevel.skip_proofs and Goal.parallel_proofs from 9679bab23f93 (NB: skip_proofs leads to failure of Toplevel.proof_of);
wenzelm
parents:
47881
diff
changeset
|
770 |
let |
58923 | 771 |
val (head_result, st') = atom_result keywords head_tr st; |
51332
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
772 |
val (body_elems, end_tr) = element_rest; |
66169
8cfa8c7ee1f6
keep original bottom-up order of proof forks, which potentially reduces thread congestion due to Proofterm.consolidate;
wenzelm
parents:
65948
diff
changeset
|
773 |
val estimate = timing_estimate elem; |
51324 | 774 |
in |
68130
6fb85346cb79
clarified future scheduling parameters, with support for parallel_limit;
wenzelm
parents:
67932
diff
changeset
|
775 |
if not (future_proofs_enabled estimate st') |
51324 | 776 |
then |
51332
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
777 |
let |
68839 | 778 |
val proof_trs = maps Thy_Element.flat_element body_elems @ [end_tr]; |
58923 | 779 |
val (proof_results, st'') = fold_map (atom_result keywords) proof_trs st'; |
51332
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
780 |
in (Result_List (head_result :: proof_results), st'') end |
51324 | 781 |
else |
782 |
let |
|
69887 | 783 |
val (end_tr1, end_tr2) = fork_presentation end_tr; |
784 |
||
51324 | 785 |
val finish = Context.Theory o Proof_Context.theory_of; |
28974
d6b190efa01a
excursion: pass explicit proof states as result of future proof, replaced low-level Thm.join_futures by PureThy.force_proofs;
wenzelm
parents:
28645
diff
changeset
|
786 |
|
51605
eca8acb42e4a
more explicit Goal.fork_params -- avoid implicit arguments via thread data;
wenzelm
parents:
51595
diff
changeset
|
787 |
val future_proof = |
eca8acb42e4a
more explicit Goal.fork_params -- avoid implicit arguments via thread data;
wenzelm
parents:
51595
diff
changeset
|
788 |
Proof.future_proof (fn state => |
53192 | 789 |
Execution.fork |
66169
8cfa8c7ee1f6
keep original bottom-up order of proof forks, which potentially reduces thread congestion due to Proofterm.consolidate;
wenzelm
parents:
65948
diff
changeset
|
790 |
{name = "Toplevel.future_proof", pos = pos_of head_tr, pri = ~1} |
51605
eca8acb42e4a
more explicit Goal.fork_params -- avoid implicit arguments via thread data;
wenzelm
parents:
51595
diff
changeset
|
791 |
(fn () => |
eca8acb42e4a
more explicit Goal.fork_params -- avoid implicit arguments via thread data;
wenzelm
parents:
51595
diff
changeset
|
792 |
let |
69883 | 793 |
val State ((Proof (prf, (_, orig_gthy)), _), prev_thy) = st'; |
69878 | 794 |
val node' = Proof (Proof_Node.apply (K state) prf, (finish, orig_gthy)); |
69887 | 795 |
val (results, result_state) = |
69886 | 796 |
State (node_presentation node', prev_thy) |
69887 | 797 |
|> fold_map (element_result keywords) body_elems ||> command end_tr1; |
798 |
in (Result_List results, presentation_context0 result_state) end)) |
|
51332
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
799 |
#> (fn (res, state') => state' |> put_result (Result_Future res)); |
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
800 |
|
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
801 |
val forked_proof = |
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
802 |
proof (future_proof #> |
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
803 |
(fn state => state |> Proof.local_done_proof |> put_result (get_result state))) o |
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
804 |
end_proof (fn _ => future_proof #> |
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
805 |
(fn state => state |> Proof.global_done_proof |> Result.put (get_result state))); |
28974
d6b190efa01a
excursion: pass explicit proof states as result of future proof, replaced low-level Thm.join_futures by PureThy.force_proofs;
wenzelm
parents:
28645
diff
changeset
|
806 |
|
69887 | 807 |
val st'' = st' |> command (head_tr |> reset_trans |> forked_proof); |
808 |
val end_st = st'' |> command end_tr2; |
|
809 |
val end_result = Result (end_tr, end_st); |
|
51324 | 810 |
val result = |
67642
10ff1f077119
more tight presentation context: avoid storing full Toplevel.state;
wenzelm
parents:
67641
diff
changeset
|
811 |
Result_List [head_result, Result.get (presentation_context0 st''), end_result]; |
69887 | 812 |
in (result, end_st) end |
51324 | 813 |
end; |
28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset
|
814 |
|
6664 | 815 |
end; |
51323 | 816 |
|
817 |
end; |