author | wenzelm |
Sat, 17 Feb 2018 16:42:15 +0100 | |
changeset 67643 | b846f7a11fda |
parent 67642 | 10ff1f077119 |
child 67932 | 04352338f7f3 |
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 |
62895
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
wenzelm
parents:
62889
diff
changeset
|
11 |
val theory_toplevel: theory -> state |
26602
5534b6a6b810
made purely value-oriented, moved global state to structure Isar (cf. isar.ML);
wenzelm
parents:
26491
diff
changeset
|
12 |
val toplevel: state |
7732 | 13 |
val is_toplevel: state -> bool |
18589 | 14 |
val is_theory: state -> bool |
15 |
val is_proof: state -> bool |
|
51555 | 16 |
val is_skipped_proof: state -> bool |
17076 | 17 |
val level: state -> int |
67391 | 18 |
val previous_theory_of: state -> theory option |
21506 | 19 |
val context_of: state -> Proof.context |
22089 | 20 |
val generic_theory_of: state -> generic_theory |
5828 | 21 |
val theory_of: state -> theory |
22 |
val proof_of: state -> Proof.state |
|
18589 | 23 |
val proof_position_of: state -> int |
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
24 |
val end_theory: Position.T -> state -> theory |
67381 | 25 |
val presentation_context: state -> Proof.context |
26 |
val presentation_state: Proof.context -> state |
|
56893 | 27 |
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
|
28 |
val pretty_state: state -> Pretty.T list |
61208 | 29 |
val string_of_state: state -> string |
37858 | 30 |
val pretty_abstract: state -> Pretty.T |
16682 | 31 |
type transition |
5828 | 32 |
val empty: transition |
27427 | 33 |
val name_of: transition -> string |
28105 | 34 |
val pos_of: transition -> Position.T |
60076 | 35 |
val type_error: transition -> string |
5828 | 36 |
val name: string -> transition -> transition |
37 |
val position: Position.T -> transition -> transition |
|
44187
88d770052bac
simplified Toplevel.init_theory: discontinued special name argument;
wenzelm
parents:
44186
diff
changeset
|
38 |
val init_theory: (unit -> theory) -> transition -> transition |
88d770052bac
simplified Toplevel.init_theory: discontinued special name argument;
wenzelm
parents:
44186
diff
changeset
|
39 |
val is_init: transition -> bool |
44186
806f0ec1a43d
simplified Toplevel.init_theory: discontinued special master argument;
wenzelm
parents:
44185
diff
changeset
|
40 |
val modify_init: (unit -> theory) -> transition -> transition |
6689 | 41 |
val exit: transition -> transition |
5828 | 42 |
val keep: (state -> unit) -> transition -> transition |
7612 | 43 |
val keep': (bool -> state -> unit) -> transition -> transition |
60190
906de96ba68a
allow diagnostic proof commands with skip_proofs;
wenzelm
parents:
60189
diff
changeset
|
44 |
val keep_proof: (state -> unit) -> transition -> transition |
27840 | 45 |
val ignored: Position.T -> transition |
51268
fcc4b89a600d
simplified Outer_Syntax.read_span: internalized Toplevel.is_ignored;
wenzelm
parents:
51241
diff
changeset
|
46 |
val is_ignored: transition -> bool |
27840 | 47 |
val malformed: Position.T -> string -> transition |
26491 | 48 |
val generic_theory: (generic_theory -> generic_theory) -> transition -> transition |
7612 | 49 |
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
|
50 |
val theory: (theory -> theory) -> transition -> transition |
20985 | 51 |
val begin_local_theory: bool -> (theory -> local_theory) -> transition -> transition |
21007 | 52 |
val end_local_theory: transition -> transition |
47069 | 53 |
val open_target: (generic_theory -> local_theory) -> transition -> transition |
54 |
val close_target: transition -> transition |
|
59939
7d46aa03696e
support for 'restricted' modifier: only qualified accesses outside the local scope;
wenzelm
parents:
59923
diff
changeset
|
55 |
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
|
56 |
(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
|
57 |
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
|
58 |
(local_theory -> local_theory) -> transition -> transition |
45488
6d71d9e52369
pass positions for named targets, for formal links in the document model;
wenzelm
parents:
44304
diff
changeset
|
59 |
val present_local_theory: (xstring * Position.T) option -> (state -> unit) -> |
24453 | 60 |
transition -> transition |
59939
7d46aa03696e
support for 'restricted' modifier: only qualified accesses outside the local scope;
wenzelm
parents:
59923
diff
changeset
|
61 |
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
|
62 |
(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
|
63 |
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
|
64 |
(local_theory -> Proof.state) -> transition -> transition |
17363 | 65 |
val theory_to_proof: (theory -> Proof.state) -> transition -> transition |
21007 | 66 |
val end_proof: (bool -> Proof.state -> Proof.context) -> transition -> transition |
58798
49ed5eea15d4
'oops' requires proper goal statement -- exclude 'notepad' to avoid disrupting begin/end structure;
wenzelm
parents:
58795
diff
changeset
|
67 |
val forget_proof: bool -> transition -> transition |
49863
b5fb6e7f8d81
more informative errors for 'proof' and 'apply' steps;
wenzelm
parents:
49062
diff
changeset
|
68 |
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
|
69 |
val proof': (bool -> Proof.state -> Proof.state) -> transition -> transition |
49863
b5fb6e7f8d81
more informative errors for 'proof' and 'apply' steps;
wenzelm
parents:
49062
diff
changeset
|
70 |
val proofs: (Proof.state -> Proof.state Seq.result Seq.seq) -> transition -> transition |
21177 | 71 |
val proof: (Proof.state -> Proof.state) -> transition -> transition |
33390 | 72 |
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
|
73 |
val skip_proof: (unit -> unit) -> transition -> transition |
044f8bb3dd30
more accurate skip_proofs nesting, e.g. relevant for 'subgoal' command;
wenzelm
parents:
60403
diff
changeset
|
74 |
val skip_proof_open: transition -> transition |
044f8bb3dd30
more accurate skip_proofs nesting, e.g. relevant for 'subgoal' command;
wenzelm
parents:
60403
diff
changeset
|
75 |
val skip_proof_close: transition -> transition |
52536 | 76 |
val exec_id: Document_ID.exec -> transition -> transition |
28425 | 77 |
val setmp_thread_position: transition -> ('a -> 'b) -> 'a -> 'b |
28103
b79e61861f0f
simplified Toplevel.add_hook: cover successful transactions only;
wenzelm
parents:
28095
diff
changeset
|
78 |
val add_hook: (transition -> state -> state -> unit) -> unit |
65058
3e9f382fb67e
absent timing information means zero, according to 0070053570c4, f235646b1b73;
wenzelm
parents:
65054
diff
changeset
|
79 |
val get_timing: transition -> Time.time |
3e9f382fb67e
absent timing information means zero, according to 0070053570c4, f235646b1b73;
wenzelm
parents:
65054
diff
changeset
|
80 |
val put_timing: Time.time -> transition -> transition |
59055
5a7157b8e870
more informative failure of protocol commands, with exception trace;
wenzelm
parents:
59032
diff
changeset
|
81 |
val transition: bool -> transition -> state -> state * (exn * string) option |
51323 | 82 |
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
|
83 |
val command_exception: bool -> transition -> state -> state |
56937 | 84 |
val reset_theory: state -> state option |
85 |
val reset_proof: state -> state option |
|
51332
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
86 |
type result |
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
87 |
val join_results: result -> (transition * state) list |
58923 | 88 |
val element_result: Keyword.keywords -> transition Thy_Syntax.element -> state -> result * state |
5828 | 89 |
end; |
90 |
||
6965 | 91 |
structure Toplevel: TOPLEVEL = |
5828 | 92 |
struct |
93 |
||
94 |
(** toplevel state **) |
|
95 |
||
31476
c5d2899b6de9
moved Isar toplevel runtime support to runtime.ML, which is loaded early (before ml_compiler.ML);
wenzelm
parents:
31431
diff
changeset
|
96 |
exception UNDEF = Runtime.UNDEF; |
19063 | 97 |
|
98 |
||
21958
9dfd1ca4c0a0
refined notion of empty toplevel, admits undo of 'end';
wenzelm
parents:
21861
diff
changeset
|
99 |
(* datatype node *) |
21294 | 100 |
|
5828 | 101 |
datatype node = |
27576
7afff36043e6
eliminated internal command history -- superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset
|
102 |
Theory of generic_theory * Proof.context option |
7afff36043e6
eliminated internal command history -- superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset
|
103 |
(*theory with presentation context*) | |
33390 | 104 |
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
|
105 |
(*proof node, finish, original theory*) | |
51555 | 106 |
Skipped_Proof of int * (generic_theory * generic_theory); |
27564
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset
|
107 |
(*proof depth, resulting theory, original theory*) |
5828 | 108 |
|
20963
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
109 |
val theory_node = fn Theory (gthy, _) => SOME gthy | _ => NONE; |
18589 | 110 |
val proof_node = fn Proof (prf, _) => SOME prf | _ => NONE; |
51555 | 111 |
val skipped_proof_node = fn Skipped_Proof _ => true | _ => false; |
18589 | 112 |
|
20963
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
113 |
fun cases_node f _ (Theory (gthy, _)) = f gthy |
33390 | 114 |
| cases_node _ g (Proof (prf, _)) = g (Proof_Node.current prf) |
51555 | 115 |
| cases_node f _ (Skipped_Proof (_, (gthy, _))) = f gthy; |
19063 | 116 |
|
21958
9dfd1ca4c0a0
refined notion of empty toplevel, admits undo of 'end';
wenzelm
parents:
21861
diff
changeset
|
117 |
|
9dfd1ca4c0a0
refined notion of empty toplevel, admits undo of 'end';
wenzelm
parents:
21861
diff
changeset
|
118 |
(* datatype state *) |
9dfd1ca4c0a0
refined notion of empty toplevel, admits undo of 'end';
wenzelm
parents:
21861
diff
changeset
|
119 |
|
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
120 |
datatype state = State of node option * node option; (*current, previous*) |
5828 | 121 |
|
67390
a256051dd3d6
clarified presentation_state with provide presentation_context;
wenzelm
parents:
67381
diff
changeset
|
122 |
fun theory_toplevel thy = State (SOME (Theory (Context.Theory thy, NONE)), NONE); |
62895
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
wenzelm
parents:
62889
diff
changeset
|
123 |
|
27576
7afff36043e6
eliminated internal command history -- superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset
|
124 |
val toplevel = State (NONE, NONE); |
5828 | 125 |
|
27576
7afff36043e6
eliminated internal command history -- superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset
|
126 |
fun is_toplevel (State (NONE, _)) = true |
7732 | 127 |
| is_toplevel _ = false; |
128 |
||
27576
7afff36043e6
eliminated internal command history -- superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset
|
129 |
fun level (State (NONE, _)) = 0 |
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
130 |
| level (State (SOME (Theory _), _)) = 0 |
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
131 |
| level (State (SOME (Proof (prf, _)), _)) = Proof.level (Proof_Node.current prf) |
51555 | 132 |
| level (State (SOME (Skipped_Proof (d, _)), _)) = d + 1; (*different notion of proof depth!*) |
17076 | 133 |
|
52565 | 134 |
fun str_of_state (State (NONE, SOME (Theory (Context.Theory thy, _)))) = |
135 |
"at top level, result theory " ^ quote (Context.theory_name thy) |
|
136 |
| str_of_state (State (NONE, _)) = "at top level" |
|
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
137 |
| str_of_state (State (SOME (Theory (Context.Theory _, _)), _)) = "in theory mode" |
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
138 |
| str_of_state (State (SOME (Theory (Context.Proof _, _)), _)) = "in local theory mode" |
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
139 |
| str_of_state (State (SOME (Proof _), _)) = "in proof mode" |
51555 | 140 |
| str_of_state (State (SOME (Skipped_Proof _), _)) = "in skipped proof mode"; |
5946
a4600d21b59b
print_state hook, obeys Goals.current_goals_markers by default;
wenzelm
parents:
5939
diff
changeset
|
141 |
|
a4600d21b59b
print_state hook, obeys Goals.current_goals_markers by default;
wenzelm
parents:
5939
diff
changeset
|
142 |
|
27576
7afff36043e6
eliminated internal command history -- superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset
|
143 |
(* current node *) |
5828 | 144 |
|
27576
7afff36043e6
eliminated internal command history -- superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset
|
145 |
fun node_of (State (NONE, _)) = raise UNDEF |
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
146 |
| node_of (State (SOME node, _)) = node; |
5828 | 147 |
|
18589 | 148 |
fun is_theory state = not (is_toplevel state) andalso is_some (theory_node (node_of state)); |
149 |
fun is_proof state = not (is_toplevel state) andalso is_some (proof_node (node_of state)); |
|
51555 | 150 |
fun is_skipped_proof state = not (is_toplevel state) andalso skipped_proof_node (node_of state); |
18589 | 151 |
|
19063 | 152 |
fun node_case f g state = cases_node f g (node_of state); |
5828 | 153 |
|
67391 | 154 |
fun previous_theory_of (State (_, NONE)) = NONE |
155 |
| previous_theory_of (State (_, SOME prev)) = |
|
156 |
SOME (cases_node Context.theory_of Proof.theory_of prev); |
|
30801 | 157 |
|
21506 | 158 |
val context_of = node_case Context.proof_of Proof.context_of; |
22089 | 159 |
val generic_theory_of = node_case I (Context.Proof o Proof.context_of); |
20963
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
160 |
val theory_of = node_case Context.theory_of Proof.theory_of; |
60094 | 161 |
val proof_of = node_case (fn _ => error "No proof state") I; |
17208 | 162 |
|
18589 | 163 |
fun proof_position_of state = |
164 |
(case node_of state of |
|
33390 | 165 |
Proof (prf, _) => Proof_Node.position prf |
60094 | 166 |
| _ => ~1); |
6664 | 167 |
|
43667
6d73cceb1503
explicit exit_transaction with Theory.end_theory (which could include sanity checks as in HOL-SPARK for example);
wenzelm
parents:
43665
diff
changeset
|
168 |
fun end_theory _ (State (NONE, SOME (Theory (Context.Theory thy, _)))) = thy |
48992 | 169 |
| end_theory pos (State (NONE, _)) = error ("Bad theory" ^ Position.here pos) |
170 |
| end_theory pos (State (SOME _, _)) = error ("Unfinished theory" ^ Position.here pos); |
|
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
171 |
|
5828 | 172 |
|
67381 | 173 |
(* presentation context *) |
174 |
||
175 |
structure Presentation_State = Proof_Data |
|
176 |
( |
|
177 |
type T = state option; |
|
178 |
fun init _ = NONE; |
|
179 |
); |
|
180 |
||
67642
10ff1f077119
more tight presentation context: avoid storing full Toplevel.state;
wenzelm
parents:
67641
diff
changeset
|
181 |
fun presentation_context0 state = |
67381 | 182 |
(case try node_of state of |
183 |
SOME (Theory (_, SOME ctxt)) => ctxt |
|
67392 | 184 |
| SOME node => cases_node Context.proof_of Proof.context_of node |
67381 | 185 |
| NONE => |
186 |
(case try Theory.get_pure () of |
|
187 |
SOME thy => Proof_Context.init_global thy |
|
67642
10ff1f077119
more tight presentation context: avoid storing full Toplevel.state;
wenzelm
parents:
67641
diff
changeset
|
188 |
| NONE => raise UNDEF)); |
10ff1f077119
more tight presentation context: avoid storing full Toplevel.state;
wenzelm
parents:
67641
diff
changeset
|
189 |
|
10ff1f077119
more tight presentation context: avoid storing full Toplevel.state;
wenzelm
parents:
67641
diff
changeset
|
190 |
fun presentation_context (state as State (current, _)) = |
10ff1f077119
more tight presentation context: avoid storing full Toplevel.state;
wenzelm
parents:
67641
diff
changeset
|
191 |
presentation_context0 state |
10ff1f077119
more tight presentation context: avoid storing full Toplevel.state;
wenzelm
parents:
67641
diff
changeset
|
192 |
|> Presentation_State.put (SOME (State (current, NONE))); |
67381 | 193 |
|
194 |
fun presentation_state ctxt = |
|
195 |
(case Presentation_State.get ctxt of |
|
67390
a256051dd3d6
clarified presentation_state with provide presentation_context;
wenzelm
parents:
67381
diff
changeset
|
196 |
NONE => State (SOME (Theory (Context.Proof ctxt, SOME ctxt)), NONE) |
67381 | 197 |
| SOME state => state); |
198 |
||
199 |
||
16815 | 200 |
(* print state *) |
201 |
||
56893 | 202 |
fun pretty_context state = |
24795
6f5cb7885fd7
print_state_context: local theory context, not proof context;
wenzelm
parents:
24780
diff
changeset
|
203 |
(case try node_of state of |
21506 | 204 |
NONE => [] |
56893 | 205 |
| SOME node => |
206 |
let |
|
207 |
val gthy = |
|
208 |
(case node of |
|
209 |
Theory (gthy, _) => gthy |
|
210 |
| Proof (_, (_, gthy)) => gthy |
|
67162 | 211 |
| Skipped_Proof (_, (_, gthy)) => gthy); |
56893 | 212 |
val lthy = Context.cases (Named_Target.theory_init) I gthy; |
213 |
in Local_Theory.pretty lthy end); |
|
16815 | 214 |
|
56887
1ca814da47ae
clarified print_state, which goes back to TTY loop before Proof General, and before separate print_context;
wenzelm
parents:
56867
diff
changeset
|
215 |
fun pretty_state state = |
23701 | 216 |
(case try node_of state of |
217 |
NONE => [] |
|
56887
1ca814da47ae
clarified print_state, which goes back to TTY loop before Proof General, and before separate print_context;
wenzelm
parents:
56867
diff
changeset
|
218 |
| SOME (Theory _) => [] |
60403 | 219 |
| SOME (Proof (prf, _)) => Proof.pretty_state (Proof_Node.current prf) |
56867 | 220 |
| SOME (Skipped_Proof (d, _)) => [Pretty.str ("skipped proof: depth " ^ string_of_int d)]); |
221 |
||
61208 | 222 |
val string_of_state = pretty_state #> Pretty.chunks #> Pretty.string_of; |
16815 | 223 |
|
37858 | 224 |
fun pretty_abstract state = Pretty.str ("<Isar " ^ str_of_state state ^ ">"); |
225 |
||
62819
d3ff367a16a0
careful export of type-dependent functions, without losing their special status;
wenzelm
parents:
62663
diff
changeset
|
226 |
val _ = ML_system_pp (fn _ => fn _ => Pretty.to_polyml o pretty_abstract); |
62663 | 227 |
|
16815 | 228 |
|
15668 | 229 |
|
5828 | 230 |
(** toplevel transitions **) |
231 |
||
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset
|
232 |
(* node transactions -- maintaining stable checkpoints *) |
7022 | 233 |
|
31476
c5d2899b6de9
moved Isar toplevel runtime support to runtime.ML, which is loaded early (before ml_compiler.ML);
wenzelm
parents:
31431
diff
changeset
|
234 |
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
|
235 |
|
6689 | 236 |
local |
237 |
||
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
238 |
fun reset_presentation (Theory (gthy, _)) = Theory (gthy, NONE) |
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
239 |
| reset_presentation node = node; |
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
240 |
|
6689 | 241 |
in |
242 |
||
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
243 |
fun apply_transaction f g node = |
20128
8f0e07d7cf92
keep/transaction: unified execution model (with debugging etc.);
wenzelm
parents:
19996
diff
changeset
|
244 |
let |
27576
7afff36043e6
eliminated internal command history -- superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset
|
245 |
val cont_node = reset_presentation node; |
56265
785569927666
discontinued Toplevel.debug in favour of system option "exception_trace";
wenzelm
parents:
56147
diff
changeset
|
246 |
val context = cases_node I (Context.Proof o Proof.context_of) cont_node; |
67643
b846f7a11fda
clarified apply_transaction: always continue without presentation context;
wenzelm
parents:
67642
diff
changeset
|
247 |
fun state_error e nd = (State (SOME nd, SOME cont_node), e); |
6689 | 248 |
|
20128
8f0e07d7cf92
keep/transaction: unified execution model (with debugging etc.);
wenzelm
parents:
19996
diff
changeset
|
249 |
val (result, err) = |
8f0e07d7cf92
keep/transaction: unified execution model (with debugging etc.);
wenzelm
parents:
19996
diff
changeset
|
250 |
cont_node |
56303
4cc3f4db3447
clarified Isabelle/ML bootstrap, such that Execution does not require ML_Compiler;
wenzelm
parents:
56265
diff
changeset
|
251 |
|> Runtime.controlled_execution (SOME context) f |
26624
770265032999
transaction/init: ensure stable theory (non-draft);
wenzelm
parents:
26621
diff
changeset
|
252 |
|> state_error NONE |
770265032999
transaction/init: ensure stable theory (non-draft);
wenzelm
parents:
26621
diff
changeset
|
253 |
handle exn => state_error (SOME exn) cont_node; |
20128
8f0e07d7cf92
keep/transaction: unified execution model (with debugging etc.);
wenzelm
parents:
19996
diff
changeset
|
254 |
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
|
255 |
(case err of |
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
|
256 |
NONE => tap g result |
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
|
257 |
| SOME exn => raise FAILURE (result, exn)) |
20128
8f0e07d7cf92
keep/transaction: unified execution model (with debugging etc.);
wenzelm
parents:
19996
diff
changeset
|
258 |
end; |
6689 | 259 |
|
43667
6d73cceb1503
explicit exit_transaction with Theory.end_theory (which could include sanity checks as in HOL-SPARK for example);
wenzelm
parents:
43665
diff
changeset
|
260 |
val exit_transaction = |
6d73cceb1503
explicit exit_transaction with Theory.end_theory (which could include sanity checks as in HOL-SPARK for example);
wenzelm
parents:
43665
diff
changeset
|
261 |
apply_transaction |
6d73cceb1503
explicit exit_transaction with Theory.end_theory (which could include sanity checks as in HOL-SPARK for example);
wenzelm
parents:
43665
diff
changeset
|
262 |
(fn Theory (Context.Theory thy, _) => Theory (Context.Theory (Theory.end_theory thy), NONE) |
6d73cceb1503
explicit exit_transaction with Theory.end_theory (which could include sanity checks as in HOL-SPARK for example);
wenzelm
parents:
43665
diff
changeset
|
263 |
| node => node) (K ()) |
6d73cceb1503
explicit exit_transaction with Theory.end_theory (which could include sanity checks as in HOL-SPARK for example);
wenzelm
parents:
43665
diff
changeset
|
264 |
#> (fn State (node', _) => State (NONE, node')); |
6d73cceb1503
explicit exit_transaction with Theory.end_theory (which could include sanity checks as in HOL-SPARK for example);
wenzelm
parents:
43665
diff
changeset
|
265 |
|
6689 | 266 |
end; |
267 |
||
268 |
||
269 |
(* primitive transitions *) |
|
270 |
||
5828 | 271 |
datatype trans = |
44187
88d770052bac
simplified Toplevel.init_theory: discontinued special name argument;
wenzelm
parents:
44186
diff
changeset
|
272 |
Init of unit -> theory | (*init theory*) |
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
273 |
Exit | (*formal exit of theory*) |
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
274 |
Keep of bool -> state -> unit | (*peek at state*) |
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
275 |
Transaction of (bool -> node -> node) * (state -> unit); (*node transaction and presentation*) |
21958
9dfd1ca4c0a0
refined notion of empty toplevel, admits undo of 'end';
wenzelm
parents:
21861
diff
changeset
|
276 |
|
6689 | 277 |
local |
5828 | 278 |
|
44187
88d770052bac
simplified Toplevel.init_theory: discontinued special name argument;
wenzelm
parents:
44186
diff
changeset
|
279 |
fun apply_tr _ (Init f) (State (NONE, _)) = |
56303
4cc3f4db3447
clarified Isabelle/ML bootstrap, such that Execution does not require ML_Compiler;
wenzelm
parents:
56265
diff
changeset
|
280 |
State (SOME (Theory (Context.Theory (Runtime.controlled_execution NONE f ()), NONE)), NONE) |
43667
6d73cceb1503
explicit exit_transaction with Theory.end_theory (which could include sanity checks as in HOL-SPARK for example);
wenzelm
parents:
43665
diff
changeset
|
281 |
| apply_tr _ Exit (State (SOME (state as Theory (Context.Theory _, _)), _)) = |
6d73cceb1503
explicit exit_transaction with Theory.end_theory (which could include sanity checks as in HOL-SPARK for example);
wenzelm
parents:
43665
diff
changeset
|
282 |
exit_transaction state |
32792 | 283 |
| apply_tr int (Keep f) state = |
56303
4cc3f4db3447
clarified Isabelle/ML bootstrap, such that Execution does not require ML_Compiler;
wenzelm
parents:
56265
diff
changeset
|
284 |
Runtime.controlled_execution (try generic_theory_of state) (fn x => tap (f int) x) state |
67641 | 285 |
| apply_tr int (Transaction (f, g)) (State (SOME node, _)) = |
286 |
apply_transaction (fn x => f int x) g node |
|
32792 | 287 |
| apply_tr _ _ _ = raise UNDEF; |
5828 | 288 |
|
32792 | 289 |
fun apply_union _ [] state = raise FAILURE (state, UNDEF) |
290 |
| apply_union int (tr :: trs) state = |
|
291 |
apply_union int trs state |
|
292 |
handle Runtime.UNDEF => apply_tr int tr state |
|
293 |
| FAILURE (alt_state, UNDEF) => apply_tr int tr alt_state |
|
6689 | 294 |
| exn as FAILURE _ => raise exn |
295 |
| exn => raise FAILURE (state, exn); |
|
296 |
||
297 |
in |
|
298 |
||
32792 | 299 |
fun apply_trans int trs state = (apply_union int trs state, NONE) |
15531 | 300 |
handle FAILURE (alt_state, exn) => (alt_state, SOME exn) | exn => (state, SOME exn); |
6689 | 301 |
|
302 |
end; |
|
5828 | 303 |
|
304 |
||
305 |
(* datatype transition *) |
|
306 |
||
307 |
datatype transition = Transition of |
|
26621
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset
|
308 |
{name: string, (*command name*) |
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset
|
309 |
pos: Position.T, (*source position*) |
65058
3e9f382fb67e
absent timing information means zero, according to 0070053570c4, f235646b1b73;
wenzelm
parents:
65054
diff
changeset
|
310 |
timing: Time.time, (*prescient timing information*) |
26621
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset
|
311 |
trans: trans list}; (*primitive transitions (union)*) |
5828 | 312 |
|
58893
9e0ecb66d6a7
eliminated unused int_only flag (see also c12484a27367);
wenzelm
parents:
58849
diff
changeset
|
313 |
fun make_transition (name, pos, timing, trans) = |
9e0ecb66d6a7
eliminated unused int_only flag (see also c12484a27367);
wenzelm
parents:
58849
diff
changeset
|
314 |
Transition {name = name, pos = pos, timing = timing, trans = trans}; |
5828 | 315 |
|
58893
9e0ecb66d6a7
eliminated unused int_only flag (see also c12484a27367);
wenzelm
parents:
58849
diff
changeset
|
316 |
fun map_transition f (Transition {name, pos, timing, trans}) = |
9e0ecb66d6a7
eliminated unused int_only flag (see also c12484a27367);
wenzelm
parents:
58849
diff
changeset
|
317 |
make_transition (f (name, pos, timing, trans)); |
5828 | 318 |
|
65058
3e9f382fb67e
absent timing information means zero, according to 0070053570c4, f235646b1b73;
wenzelm
parents:
65054
diff
changeset
|
319 |
val empty = make_transition ("", Position.none, Time.zeroTime, []); |
5828 | 320 |
|
321 |
||
322 |
(* diagnostics *) |
|
323 |
||
27427 | 324 |
fun name_of (Transition {name, ...}) = name; |
28105 | 325 |
fun pos_of (Transition {pos, ...}) = pos; |
5828 | 326 |
|
60076 | 327 |
fun command_msg msg tr = |
328 |
msg ^ "command " ^ quote (Markup.markup Markup.keyword1 (name_of tr)) ^ |
|
329 |
Position.here (pos_of tr); |
|
5828 | 330 |
|
60076 | 331 |
fun at_command tr = command_msg "At " tr; |
332 |
fun type_error tr = command_msg "Bad context for " tr; |
|
5828 | 333 |
|
334 |
||
335 |
(* modify transitions *) |
|
336 |
||
58893
9e0ecb66d6a7
eliminated unused int_only flag (see also c12484a27367);
wenzelm
parents:
58849
diff
changeset
|
337 |
fun name name = map_transition (fn (_, pos, timing, trans) => |
9e0ecb66d6a7
eliminated unused int_only flag (see also c12484a27367);
wenzelm
parents:
58849
diff
changeset
|
338 |
(name, pos, timing, trans)); |
9010 | 339 |
|
58893
9e0ecb66d6a7
eliminated unused int_only flag (see also c12484a27367);
wenzelm
parents:
58849
diff
changeset
|
340 |
fun position pos = map_transition (fn (name, _, timing, trans) => |
9e0ecb66d6a7
eliminated unused int_only flag (see also c12484a27367);
wenzelm
parents:
58849
diff
changeset
|
341 |
(name, pos, timing, trans)); |
14923 | 342 |
|
58893
9e0ecb66d6a7
eliminated unused int_only flag (see also c12484a27367);
wenzelm
parents:
58849
diff
changeset
|
343 |
fun add_trans tr = map_transition (fn (name, pos, timing, trans) => |
9e0ecb66d6a7
eliminated unused int_only flag (see also c12484a27367);
wenzelm
parents:
58849
diff
changeset
|
344 |
(name, pos, timing, tr :: trans)); |
16607 | 345 |
|
58893
9e0ecb66d6a7
eliminated unused int_only flag (see also c12484a27367);
wenzelm
parents:
58849
diff
changeset
|
346 |
val reset_trans = map_transition (fn (name, pos, timing, _) => |
9e0ecb66d6a7
eliminated unused int_only flag (see also c12484a27367);
wenzelm
parents:
58849
diff
changeset
|
347 |
(name, pos, timing, [])); |
5828 | 348 |
|
349 |
||
21007 | 350 |
(* basic transitions *) |
5828 | 351 |
|
44187
88d770052bac
simplified Toplevel.init_theory: discontinued special name argument;
wenzelm
parents:
44186
diff
changeset
|
352 |
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
|
353 |
|
44187
88d770052bac
simplified Toplevel.init_theory: discontinued special name argument;
wenzelm
parents:
44186
diff
changeset
|
354 |
fun is_init (Transition {trans = [Init _], ...}) = true |
88d770052bac
simplified Toplevel.init_theory: discontinued special name argument;
wenzelm
parents:
44186
diff
changeset
|
355 |
| is_init _ = false; |
88d770052bac
simplified Toplevel.init_theory: discontinued special name argument;
wenzelm
parents:
44186
diff
changeset
|
356 |
|
88d770052bac
simplified Toplevel.init_theory: discontinued special name argument;
wenzelm
parents:
44186
diff
changeset
|
357 |
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
|
358 |
|
6689 | 359 |
val exit = add_trans Exit; |
7612 | 360 |
val keep' = add_trans o Keep; |
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
361 |
|
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
362 |
fun present_transaction f g = add_trans (Transaction (f, g)); |
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
363 |
fun transaction f = present_transaction f (K ()); |
5828 | 364 |
|
7612 | 365 |
fun keep f = add_trans (Keep (fn _ => f)); |
5828 | 366 |
|
60190
906de96ba68a
allow diagnostic proof commands with skip_proofs;
wenzelm
parents:
60189
diff
changeset
|
367 |
fun keep_proof f = |
906de96ba68a
allow diagnostic proof commands with skip_proofs;
wenzelm
parents:
60189
diff
changeset
|
368 |
keep (fn st => |
906de96ba68a
allow diagnostic proof commands with skip_proofs;
wenzelm
parents:
60189
diff
changeset
|
369 |
if is_proof st then f st |
906de96ba68a
allow diagnostic proof commands with skip_proofs;
wenzelm
parents:
60189
diff
changeset
|
370 |
else if is_skipped_proof st then () |
906de96ba68a
allow diagnostic proof commands with skip_proofs;
wenzelm
parents:
60189
diff
changeset
|
371 |
else warning "No proof state"); |
906de96ba68a
allow diagnostic proof commands with skip_proofs;
wenzelm
parents:
60189
diff
changeset
|
372 |
|
60189 | 373 |
fun ignored pos = empty |> name "<ignored>" |> position pos |> keep (fn _ => ()); |
51268
fcc4b89a600d
simplified Outer_Syntax.read_span: internalized Toplevel.is_ignored;
wenzelm
parents:
51241
diff
changeset
|
374 |
fun is_ignored tr = name_of tr = "<ignored>"; |
48772 | 375 |
|
27840 | 376 |
fun malformed pos msg = |
60189 | 377 |
empty |> name "<malformed>" |> position pos |> keep (fn _ => error msg); |
27840 | 378 |
|
21007 | 379 |
|
49012
8686c36fa27d
refined treatment of forked proofs at transaction boundaries, including proof commands (see also 7ee000ce5390);
wenzelm
parents:
49011
diff
changeset
|
380 |
(* theory transitions *) |
44304
7ee000ce5390
maintain recent future proofs at transaction boundaries;
wenzelm
parents:
44270
diff
changeset
|
381 |
|
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset
|
382 |
fun generic_theory f = transaction (fn _ => |
26491 | 383 |
(fn Theory (gthy, _) => Theory (f gthy, NONE) |
384 |
| _ => raise UNDEF)); |
|
385 |
||
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset
|
386 |
fun theory' f = transaction (fn int => |
33725
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
387 |
(fn Theory (Context.Theory thy, _) => |
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
388 |
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
|
389 |
|> Sign.new_group |
33725
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
390 |
|> f int |
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
391 |
|> Sign.reset_group; |
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
392 |
in Theory (Context.Theory thy', NONE) end |
20963
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
393 |
| _ => raise UNDEF)); |
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
394 |
|
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
395 |
fun theory f = theory' (K f); |
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
396 |
|
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset
|
397 |
fun begin_local_theory begin f = transaction (fn _ => |
20963
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
398 |
(fn Theory (Context.Theory thy, _) => |
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
399 |
let |
20985 | 400 |
val lthy = f thy; |
57483
950dc7446454
centralized (ad-hoc) switching of targets in named_target.ML
haftmann
parents:
57184
diff
changeset
|
401 |
val gthy = if begin then Context.Proof lthy else Context.Theory (Named_Target.exit lthy); |
56897
c668735fb8b5
print results as "state", to avoid intrusion into the source text;
wenzelm
parents:
56895
diff
changeset
|
402 |
val _ = |
60245 | 403 |
(case Local_Theory.pretty lthy of |
404 |
[] => () |
|
405 |
| prts => Output.state (Pretty.string_of (Pretty.chunks prts))); |
|
21294 | 406 |
in Theory (gthy, SOME lthy) end |
20963
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
407 |
| _ => raise UNDEF)); |
17076 | 408 |
|
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset
|
409 |
val end_local_theory = transaction (fn _ => |
57483
950dc7446454
centralized (ad-hoc) switching of targets in named_target.ML
haftmann
parents:
57184
diff
changeset
|
410 |
(fn Theory (Context.Proof lthy, _) => Theory (Context.Theory (Named_Target.exit lthy), SOME lthy) |
21007 | 411 |
| _ => raise UNDEF)); |
412 |
||
47069 | 413 |
fun open_target f = transaction (fn _ => |
414 |
(fn Theory (gthy, _) => |
|
415 |
let val lthy = f gthy |
|
416 |
in Theory (Context.Proof lthy, SOME lthy) end |
|
417 |
| _ => raise UNDEF)); |
|
418 |
||
419 |
val close_target = transaction (fn _ => |
|
420 |
(fn Theory (Context.Proof lthy, _) => |
|
421 |
(case try Local_Theory.close_target lthy of |
|
50739
5165d7e6d3b9
more precise Local_Theory.level: 1 really means main target and >= 2 nested context;
wenzelm
parents:
50201
diff
changeset
|
422 |
SOME ctxt' => |
5165d7e6d3b9
more precise Local_Theory.level: 1 really means main target and >= 2 nested context;
wenzelm
parents:
50201
diff
changeset
|
423 |
let |
5165d7e6d3b9
more precise Local_Theory.level: 1 really means main target and >= 2 nested context;
wenzelm
parents:
50201
diff
changeset
|
424 |
val gthy' = |
5165d7e6d3b9
more precise Local_Theory.level: 1 really means main target and >= 2 nested context;
wenzelm
parents:
50201
diff
changeset
|
425 |
if can Local_Theory.assert ctxt' |
5165d7e6d3b9
more precise Local_Theory.level: 1 really means main target and >= 2 nested context;
wenzelm
parents:
50201
diff
changeset
|
426 |
then Context.Proof ctxt' |
5165d7e6d3b9
more precise Local_Theory.level: 1 really means main target and >= 2 nested context;
wenzelm
parents:
50201
diff
changeset
|
427 |
else Context.Theory (Proof_Context.theory_of ctxt'); |
5165d7e6d3b9
more precise Local_Theory.level: 1 really means main target and >= 2 nested context;
wenzelm
parents:
50201
diff
changeset
|
428 |
in Theory (gthy', SOME lthy) end |
47069 | 429 |
| NONE => raise UNDEF) |
430 |
| _ => raise UNDEF)); |
|
431 |
||
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
|
432 |
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
|
433 |
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
|
434 |
| restricted_context NONE = I; |
59939
7d46aa03696e
support for 'restricted' modifier: only qualified accesses outside the local scope;
wenzelm
parents:
59923
diff
changeset
|
435 |
|
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
|
436 |
fun local_theory' restricted target f = present_transaction (fn int => |
21294 | 437 |
(fn Theory (gthy, _) => |
438 |
let |
|
59923
b21c82422d65
support private scope for individual local theory commands;
wenzelm
parents:
59472
diff
changeset
|
439 |
val (finish, lthy) = Named_Target.switch target gthy; |
47274 | 440 |
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
|
441 |
|> restricted_context restricted |
49012
8686c36fa27d
refined treatment of forked proofs at transaction boundaries, including proof commands (see also 7ee000ce5390);
wenzelm
parents:
49011
diff
changeset
|
442 |
|> Local_Theory.new_group |
33725
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
443 |
|> f int |
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
444 |
|> Local_Theory.reset_group; |
21294 | 445 |
in Theory (finish lthy', SOME lthy') end |
59032 | 446 |
| _ => raise UNDEF)) |
447 |
(K ()); |
|
15668 | 448 |
|
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
|
449 |
fun local_theory restricted target f = local_theory' restricted target (K f); |
21007 | 450 |
|
65054 | 451 |
fun present_local_theory target = present_transaction (fn _ => |
59032 | 452 |
(fn Theory (gthy, _) => |
59923
b21c82422d65
support private scope for individual local theory commands;
wenzelm
parents:
59472
diff
changeset
|
453 |
let val (finish, lthy) = Named_Target.switch target gthy; |
59032 | 454 |
in Theory (finish lthy, SOME lthy) end |
455 |
| _ => raise UNDEF)); |
|
21007 | 456 |
|
457 |
||
458 |
(* proof transitions *) |
|
459 |
||
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset
|
460 |
fun end_proof f = transaction (fn int => |
24795
6f5cb7885fd7
print_state_context: local theory context, not proof context;
wenzelm
parents:
24780
diff
changeset
|
461 |
(fn Proof (prf, (finish, _)) => |
33390 | 462 |
let val state = Proof_Node.current prf in |
21007 | 463 |
if can (Proof.assert_bottom true) state then |
464 |
let |
|
465 |
val ctxt' = f int state; |
|
466 |
val gthy' = finish ctxt'; |
|
467 |
in Theory (gthy', SOME ctxt') end |
|
468 |
else raise UNDEF |
|
469 |
end |
|
51555 | 470 |
| Skipped_Proof (0, (gthy, _)) => Theory (gthy, NONE) |
21007 | 471 |
| _ => raise UNDEF)); |
472 |
||
21294 | 473 |
local |
474 |
||
47274 | 475 |
fun begin_proof init = transaction (fn int => |
21294 | 476 |
(fn Theory (gthy, _) => |
477 |
let |
|
47274 | 478 |
val (finish, prf) = init int gthy; |
67157 | 479 |
val document = Options.default_string "document"; |
480 |
val skip = (document = "" orelse document = "false") andalso Goal.skip_proofs_enabled (); |
|
58795 | 481 |
val schematic_goal = try Proof.schematic_goal prf; |
47274 | 482 |
val _ = |
58795 | 483 |
if skip andalso schematic_goal = SOME true then |
47274 | 484 |
warning "Cannot skip proof of schematic goal statement" |
485 |
else (); |
|
21294 | 486 |
in |
58795 | 487 |
if skip andalso schematic_goal = SOME false then |
51555 | 488 |
Skipped_Proof (0, (finish (Proof.global_skip_proof true prf), gthy)) |
47274 | 489 |
else Proof (Proof_Node.init prf, (finish, gthy)) |
21294 | 490 |
end |
491 |
| _ => raise UNDEF)); |
|
492 |
||
493 |
in |
|
494 |
||
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
|
495 |
fun local_theory_to_proof' restricted target f = begin_proof |
47274 | 496 |
(fn int => fn gthy => |
59923
b21c82422d65
support private scope for individual local theory commands;
wenzelm
parents:
59472
diff
changeset
|
497 |
let |
b21c82422d65
support private scope for individual local theory commands;
wenzelm
parents:
59472
diff
changeset
|
498 |
val (finish, lthy) = Named_Target.switch target gthy; |
b21c82422d65
support private scope for individual local theory commands;
wenzelm
parents:
59472
diff
changeset
|
499 |
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
|
500 |
|> restricted_context restricted |
59923
b21c82422d65
support private scope for individual local theory commands;
wenzelm
parents:
59472
diff
changeset
|
501 |
|> Local_Theory.new_group |
b21c82422d65
support private scope for individual local theory commands;
wenzelm
parents:
59472
diff
changeset
|
502 |
|> f int; |
b21c82422d65
support private scope for individual local theory commands;
wenzelm
parents:
59472
diff
changeset
|
503 |
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
|
504 |
|
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
|
505 |
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
|
506 |
local_theory_to_proof' restricted target (K f); |
21294 | 507 |
|
508 |
fun theory_to_proof f = begin_proof |
|
47274 | 509 |
(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
|
510 |
(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
|
511 |
(case gthy of |
52788 | 512 |
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
|
513 |
| _ => raise UNDEF))); |
21294 | 514 |
|
515 |
end; |
|
516 |
||
58798
49ed5eea15d4
'oops' requires proper goal statement -- exclude 'notepad' to avoid disrupting begin/end structure;
wenzelm
parents:
58795
diff
changeset
|
517 |
fun forget_proof strict = transaction (fn _ => |
49ed5eea15d4
'oops' requires proper goal statement -- exclude 'notepad' to avoid disrupting begin/end structure;
wenzelm
parents:
58795
diff
changeset
|
518 |
(fn Proof (prf, (_, orig_gthy)) => |
49ed5eea15d4
'oops' requires proper goal statement -- exclude 'notepad' to avoid disrupting begin/end structure;
wenzelm
parents:
58795
diff
changeset
|
519 |
if strict andalso not (Proof.has_bottom_goal (Proof_Node.current prf)) |
49ed5eea15d4
'oops' requires proper goal statement -- exclude 'notepad' to avoid disrupting begin/end structure;
wenzelm
parents:
58795
diff
changeset
|
520 |
then raise UNDEF else Theory (orig_gthy, NONE) |
51555 | 521 |
| Skipped_Proof (_, (_, orig_gthy)) => Theory (orig_gthy, NONE) |
21007 | 522 |
| _ => raise UNDEF)); |
523 |
||
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset
|
524 |
fun proofs' f = transaction (fn int => |
49062
7e31dfd99ce7
discontinued complicated/unreliable notion of recent proofs within context;
wenzelm
parents:
49042
diff
changeset
|
525 |
(fn Proof (prf, x) => Proof (Proof_Node.applys (f int) prf, x) |
51555 | 526 |
| skip as Skipped_Proof _ => skip |
16815 | 527 |
| _ => raise UNDEF)); |
15668 | 528 |
|
49863
b5fb6e7f8d81
more informative errors for 'proof' and 'apply' steps;
wenzelm
parents:
49062
diff
changeset
|
529 |
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
|
530 |
val proofs = proofs' o K; |
6689 | 531 |
val proof = proof' o K; |
16815 | 532 |
|
60693
044f8bb3dd30
more accurate skip_proofs nesting, e.g. relevant for 'subgoal' command;
wenzelm
parents:
60403
diff
changeset
|
533 |
|
044f8bb3dd30
more accurate skip_proofs nesting, e.g. relevant for 'subgoal' command;
wenzelm
parents:
60403
diff
changeset
|
534 |
(* skipped proofs *) |
044f8bb3dd30
more accurate skip_proofs nesting, e.g. relevant for 'subgoal' command;
wenzelm
parents:
60403
diff
changeset
|
535 |
|
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset
|
536 |
fun actual_proof f = transaction (fn _ => |
21007 | 537 |
(fn Proof (prf, x) => Proof (f prf, x) |
20963
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
538 |
| _ => raise UNDEF)); |
16815 | 539 |
|
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset
|
540 |
fun skip_proof f = transaction (fn _ => |
60693
044f8bb3dd30
more accurate skip_proofs nesting, e.g. relevant for 'subgoal' command;
wenzelm
parents:
60403
diff
changeset
|
541 |
(fn skip as Skipped_Proof _ => (f (); skip) |
18563 | 542 |
| _ => raise UNDEF)); |
543 |
||
60693
044f8bb3dd30
more accurate skip_proofs nesting, e.g. relevant for 'subgoal' command;
wenzelm
parents:
60403
diff
changeset
|
544 |
val skip_proof_open = transaction (fn _ => |
044f8bb3dd30
more accurate skip_proofs nesting, e.g. relevant for 'subgoal' command;
wenzelm
parents:
60403
diff
changeset
|
545 |
(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
|
546 |
| _ => raise UNDEF)); |
044f8bb3dd30
more accurate skip_proofs nesting, e.g. relevant for 'subgoal' command;
wenzelm
parents:
60403
diff
changeset
|
547 |
|
044f8bb3dd30
more accurate skip_proofs nesting, e.g. relevant for 'subgoal' command;
wenzelm
parents:
60403
diff
changeset
|
548 |
val skip_proof_close = transaction (fn _ => |
044f8bb3dd30
more accurate skip_proofs nesting, e.g. relevant for 'subgoal' command;
wenzelm
parents:
60403
diff
changeset
|
549 |
(fn Skipped_Proof (0, (gthy, _)) => Theory (gthy, NONE) |
044f8bb3dd30
more accurate skip_proofs nesting, e.g. relevant for 'subgoal' command;
wenzelm
parents:
60403
diff
changeset
|
550 |
| 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
|
551 |
| _ => raise UNDEF)); |
5828 | 552 |
|
553 |
||
554 |
||
555 |
(** toplevel transactions **) |
|
556 |
||
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52499
diff
changeset
|
557 |
(* runtime position *) |
27427 | 558 |
|
52536 | 559 |
fun exec_id id (tr as Transition {pos, ...}) = |
560 |
position (Position.put_id (Document_ID.print id) pos) tr; |
|
25799 | 561 |
|
25960 | 562 |
fun setmp_thread_position (Transition {pos, ...}) f x = |
25819
e6feb08b7f4b
replaced thread_properties by simplified version in position.ML;
wenzelm
parents:
25809
diff
changeset
|
563 |
Position.setmp_thread_data pos f x; |
25799 | 564 |
|
565 |
||
28095
7eaf0813bdc3
added add_hook interface for post-transition hooks;
wenzelm
parents:
27859
diff
changeset
|
566 |
(* post-transition hooks *) |
7eaf0813bdc3
added add_hook interface for post-transition hooks;
wenzelm
parents:
27859
diff
changeset
|
567 |
|
37905 | 568 |
local |
56147 | 569 |
val hooks = |
570 |
Synchronized.var "Toplevel.hooks" ([]: (transition -> state -> state -> unit) list); |
|
37905 | 571 |
in |
28095
7eaf0813bdc3
added add_hook interface for post-transition hooks;
wenzelm
parents:
27859
diff
changeset
|
572 |
|
56147 | 573 |
fun add_hook hook = Synchronized.change hooks (cons hook); |
574 |
fun get_hooks () = Synchronized.value hooks; |
|
28095
7eaf0813bdc3
added add_hook interface for post-transition hooks;
wenzelm
parents:
27859
diff
changeset
|
575 |
|
7eaf0813bdc3
added add_hook interface for post-transition hooks;
wenzelm
parents:
27859
diff
changeset
|
576 |
end; |
7eaf0813bdc3
added add_hook interface for post-transition hooks;
wenzelm
parents:
27859
diff
changeset
|
577 |
|
7eaf0813bdc3
added add_hook interface for post-transition hooks;
wenzelm
parents:
27859
diff
changeset
|
578 |
|
5828 | 579 |
(* apply transitions *) |
580 |
||
51217
65ab2c4f4c32
support for prescient timing information within command transactions;
wenzelm
parents:
51216
diff
changeset
|
581 |
fun get_timing (Transition {timing, ...}) = timing; |
58893
9e0ecb66d6a7
eliminated unused int_only flag (see also c12484a27367);
wenzelm
parents:
58849
diff
changeset
|
582 |
fun put_timing timing = map_transition (fn (name, pos, _, trans) => (name, pos, timing, trans)); |
51217
65ab2c4f4c32
support for prescient timing information within command transactions;
wenzelm
parents:
51216
diff
changeset
|
583 |
|
6664 | 584 |
local |
585 |
||
65054 | 586 |
fun app int (tr as Transition {trans, ...}) = |
25819
e6feb08b7f4b
replaced thread_properties by simplified version in position.ML;
wenzelm
parents:
25809
diff
changeset
|
587 |
setmp_thread_position tr (fn state => |
25799 | 588 |
let |
51595 | 589 |
val timing_start = Timing.start (); |
61884
d4c89ea5e6dc
discontinued built-in profiling: avoid danger of conflicting invocations (multithreading etc.);
wenzelm
parents:
61208
diff
changeset
|
590 |
val (result, opt_err) = apply_trans int trans state; |
51595 | 591 |
val timing_result = Timing.result timing_start; |
51662
3391a493f39a
just one timing protocol function, with 3 implementations: TTY/PG, PIDE/document, build;
wenzelm
parents:
51661
diff
changeset
|
592 |
val timing_props = |
3391a493f39a
just one timing protocol function, with 3 implementations: TTY/PG, PIDE/document, build;
wenzelm
parents:
51661
diff
changeset
|
593 |
Markup.command_timing :: (Markup.nameN, name_of tr) :: Position.properties_of (pos_of tr); |
3391a493f39a
just one timing protocol function, with 3 implementations: TTY/PG, PIDE/document, build;
wenzelm
parents:
51661
diff
changeset
|
594 |
val _ = Timing.protocol_message timing_props timing_result; |
60076 | 595 |
in (result, Option.map (fn UNDEF => ERROR (type_error tr) | exn => exn) opt_err) end); |
6664 | 596 |
|
597 |
in |
|
5828 | 598 |
|
26602
5534b6a6b810
made purely value-oriented, moved global state to structure Isar (cf. isar.ML);
wenzelm
parents:
26491
diff
changeset
|
599 |
fun transition int tr st = |
28095
7eaf0813bdc3
added add_hook interface for post-transition hooks;
wenzelm
parents:
27859
diff
changeset
|
600 |
let |
60895
501be4aa75b4
default ML context for all command transactions, e.g. relevant for debugging and toplevel pretty-printing;
wenzelm
parents:
60693
diff
changeset
|
601 |
val (st', opt_err) = |
67642
10ff1f077119
more tight presentation context: avoid storing full Toplevel.state;
wenzelm
parents:
67641
diff
changeset
|
602 |
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
|
603 |
(fn () => app int tr st) (); |
59055
5a7157b8e870
more informative failure of protocol commands, with exception trace;
wenzelm
parents:
59032
diff
changeset
|
604 |
val opt_err' = opt_err |> Option.map |
5a7157b8e870
more informative failure of protocol commands, with exception trace;
wenzelm
parents:
59032
diff
changeset
|
605 |
(fn Runtime.EXCURSION_FAIL exn_info => exn_info |
5a7157b8e870
more informative failure of protocol commands, with exception trace;
wenzelm
parents:
59032
diff
changeset
|
606 |
| 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
|
607 |
val _ = get_hooks () |> List.app (fn f => (try (fn () => f tr st st') (); ())); |
5a7157b8e870
more informative failure of protocol commands, with exception trace;
wenzelm
parents:
59032
diff
changeset
|
608 |
in (st', opt_err') end; |
6664 | 609 |
|
610 |
end; |
|
5828 | 611 |
|
612 |
||
51284
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51282
diff
changeset
|
613 |
(* managed commands *) |
5828 | 614 |
|
51323 | 615 |
fun command_errors int tr st = |
616 |
(case transition int tr st of |
|
59055
5a7157b8e870
more informative failure of protocol commands, with exception trace;
wenzelm
parents:
59032
diff
changeset
|
617 |
(st', NONE) => ([], SOME st') |
65948 | 618 |
| (_, SOME (exn, _)) => (Runtime.exn_messages exn, NONE)); |
51323 | 619 |
|
51284
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51282
diff
changeset
|
620 |
fun command_exception int tr st = |
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51282
diff
changeset
|
621 |
(case transition int tr st of |
59055
5a7157b8e870
more informative failure of protocol commands, with exception trace;
wenzelm
parents:
59032
diff
changeset
|
622 |
(st', NONE) => st' |
5a7157b8e870
more informative failure of protocol commands, with exception trace;
wenzelm
parents:
59032
diff
changeset
|
623 |
| (_, SOME (exn, info)) => |
62505 | 624 |
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
|
625 |
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
|
626 |
|
58848 | 627 |
val command = command_exception false; |
51284
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51282
diff
changeset
|
628 |
|
28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset
|
629 |
|
56937 | 630 |
(* reset state *) |
631 |
||
632 |
local |
|
633 |
||
634 |
fun reset_state check trans st = |
|
635 |
if check st then NONE |
|
636 |
else #2 (command_errors false (trans empty) st); |
|
637 |
||
638 |
in |
|
639 |
||
58798
49ed5eea15d4
'oops' requires proper goal statement -- exclude 'notepad' to avoid disrupting begin/end structure;
wenzelm
parents:
58795
diff
changeset
|
640 |
val reset_theory = reset_state is_theory (forget_proof false); |
56937 | 641 |
|
642 |
val reset_proof = |
|
643 |
reset_state is_proof |
|
644 |
(transaction (fn _ => |
|
645 |
(fn Theory (gthy, _) => Skipped_Proof (0, (gthy, gthy)) |
|
646 |
| _ => raise UNDEF))); |
|
647 |
||
648 |
end; |
|
649 |
||
650 |
||
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
|
651 |
(* scheduled proof result *) |
28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset
|
652 |
|
51332
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
653 |
datatype result = |
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
654 |
Result of transition * state | |
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
655 |
Result_List of result list | |
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
656 |
Result_Future of result future; |
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
657 |
|
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
658 |
fun join_results (Result x) = [x] |
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
659 |
| join_results (Result_List xs) = maps join_results xs |
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
660 |
| join_results (Result_Future x) = join_results (Future.join x); |
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
661 |
|
51323 | 662 |
local |
663 |
||
47417 | 664 |
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
|
665 |
( |
51332
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
666 |
type T = result; |
59150 | 667 |
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
|
668 |
); |
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
|
669 |
|
51332
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
670 |
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
|
671 |
val put_result = Proof.map_context o Result.put; |
51324 | 672 |
|
66169
8cfa8c7ee1f6
keep original bottom-up order of proof forks, which potentially reduces thread congestion due to Proofterm.consolidate;
wenzelm
parents:
65948
diff
changeset
|
673 |
fun timing_estimate elem = |
8cfa8c7ee1f6
keep original bottom-up order of proof forks, which potentially reduces thread congestion due to Proofterm.consolidate;
wenzelm
parents:
65948
diff
changeset
|
674 |
let val trs = tl (Thy_Syntax.flat_element elem) |
65058
3e9f382fb67e
absent timing information means zero, according to 0070053570c4, f235646b1b73;
wenzelm
parents:
65054
diff
changeset
|
675 |
in fold (fn tr => fn t => get_timing 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
|
676 |
|
e5f9a6d9ca82
clarified parallel_subproofs_saturation (blind guess) vs. parallel_subproofs_threshold (precient timing estimate);
wenzelm
parents:
51332
diff
changeset
|
677 |
fun proof_future_enabled estimate st = |
51324 | 678 |
(case try proof_of st of |
679 |
NONE => false |
|
680 |
| SOME state => |
|
681 |
not (Proof.is_relevant state) andalso |
|
682 |
(if can (Proof.assert_bottom true) state |
|
53189
ee8b8dafef0e
discontinued parallel_subproofs_saturation and related internal counters (superseded by parallel_subproofs_threshold and timing information);
wenzelm
parents:
52788
diff
changeset
|
683 |
then Goal.future_enabled 1 |
65058
3e9f382fb67e
absent timing information means zero, according to 0070053570c4, f235646b1b73;
wenzelm
parents:
65054
diff
changeset
|
684 |
else Goal.future_enabled 2 orelse Goal.future_enabled_timing estimate)); |
51278 | 685 |
|
58923 | 686 |
fun atom_result keywords tr st = |
51323 | 687 |
let |
688 |
val st' = |
|
58923 | 689 |
if Goal.future_enabled 1 andalso Keyword.is_diag keywords (name_of tr) then |
53192 | 690 |
(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
|
691 |
{name = "Toplevel.diag", pos = pos_of tr, pri = ~1} |
51605
eca8acb42e4a
more explicit Goal.fork_params -- avoid implicit arguments via thread data;
wenzelm
parents:
51595
diff
changeset
|
692 |
(fn () => command tr st); st) |
51323 | 693 |
else command tr st; |
51332
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
694 |
in (Result (tr, st'), st') end; |
51323 | 695 |
|
696 |
in |
|
697 |
||
58923 | 698 |
fun element_result keywords (Thy_Syntax.Element (tr, NONE)) st = atom_result keywords tr st |
699 |
| element_result keywords (elem as Thy_Syntax.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
|
700 |
let |
58923 | 701 |
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
|
702 |
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
|
703 |
val estimate = timing_estimate elem; |
51324 | 704 |
in |
51423
e5f9a6d9ca82
clarified parallel_subproofs_saturation (blind guess) vs. parallel_subproofs_threshold (precient timing estimate);
wenzelm
parents:
51332
diff
changeset
|
705 |
if not (proof_future_enabled estimate st') |
51324 | 706 |
then |
51332
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
707 |
let |
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
708 |
val proof_trs = maps Thy_Syntax.flat_element body_elems @ [end_tr]; |
58923 | 709 |
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
|
710 |
in (Result_List (head_result :: proof_results), st'') end |
51324 | 711 |
else |
712 |
let |
|
713 |
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
|
714 |
|
51605
eca8acb42e4a
more explicit Goal.fork_params -- avoid implicit arguments via thread data;
wenzelm
parents:
51595
diff
changeset
|
715 |
val future_proof = |
eca8acb42e4a
more explicit Goal.fork_params -- avoid implicit arguments via thread data;
wenzelm
parents:
51595
diff
changeset
|
716 |
Proof.future_proof (fn state => |
53192 | 717 |
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
|
718 |
{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
|
719 |
(fn () => |
eca8acb42e4a
more explicit Goal.fork_params -- avoid implicit arguments via thread data;
wenzelm
parents:
51595
diff
changeset
|
720 |
let |
eca8acb42e4a
more explicit Goal.fork_params -- avoid implicit arguments via thread data;
wenzelm
parents:
51595
diff
changeset
|
721 |
val State (SOME (Proof (prf, (_, orig_gthy))), prev) = st'; |
eca8acb42e4a
more explicit Goal.fork_params -- avoid implicit arguments via thread data;
wenzelm
parents:
51595
diff
changeset
|
722 |
val prf' = Proof_Node.apply (K state) prf; |
eca8acb42e4a
more explicit Goal.fork_params -- avoid implicit arguments via thread data;
wenzelm
parents:
51595
diff
changeset
|
723 |
val (result, result_state) = |
eca8acb42e4a
more explicit Goal.fork_params -- avoid implicit arguments via thread data;
wenzelm
parents:
51595
diff
changeset
|
724 |
State (SOME (Proof (prf', (finish, orig_gthy))), prev) |
58923 | 725 |
|> fold_map (element_result keywords) body_elems ||> command end_tr; |
67642
10ff1f077119
more tight presentation context: avoid storing full Toplevel.state;
wenzelm
parents:
67641
diff
changeset
|
726 |
in (Result_List result, 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
|
727 |
#> (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
|
728 |
|
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
729 |
val forked_proof = |
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
730 |
proof (future_proof #> |
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
731 |
(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
|
732 |
end_proof (fn _ => future_proof #> |
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
733 |
(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
|
734 |
|
51324 | 735 |
val st'' = st' |
56895
f058120aaad4
discontinued Toplevel.print flag -- print uniformly according to Keyword.is_printed;
wenzelm
parents:
56893
diff
changeset
|
736 |
|> command (head_tr |> reset_trans |> forked_proof); |
51332
8707df0b0255
refined parallel_proofs = 2: fork whole Isar sub-proofs, not just terminal ones;
wenzelm
parents:
51324
diff
changeset
|
737 |
val end_result = Result (end_tr, st''); |
51324 | 738 |
val result = |
67642
10ff1f077119
more tight presentation context: avoid storing full Toplevel.state;
wenzelm
parents:
67641
diff
changeset
|
739 |
Result_List [head_result, Result.get (presentation_context0 st''), end_result]; |
51324 | 740 |
in (result, st'') end |
741 |
end; |
|
28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset
|
742 |
|
6664 | 743 |
end; |
51323 | 744 |
|
745 |
end; |