author | wenzelm |
Tue, 31 Aug 2010 23:46:49 +0200 | |
changeset 38888 | 8248cda328de |
parent 38876 | ec7045139e70 |
child 39232 | 69c6d3e87660 |
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 |
26602
5534b6a6b810
made purely value-oriented, moved global state to structure Isar (cf. isar.ML);
wenzelm
parents:
26491
diff
changeset
|
11 |
val toplevel: state |
7732 | 12 |
val is_toplevel: state -> bool |
18589 | 13 |
val is_theory: state -> bool |
14 |
val is_proof: state -> bool |
|
17076 | 15 |
val level: state -> int |
30398 | 16 |
val presentation_context_of: state -> Proof.context |
30801 | 17 |
val previous_context_of: state -> Proof.context option |
21506 | 18 |
val context_of: state -> Proof.context |
22089 | 19 |
val generic_theory_of: state -> generic_theory |
5828 | 20 |
val theory_of: state -> theory |
21 |
val proof_of: state -> Proof.state |
|
18589 | 22 |
val proof_position_of: state -> int |
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
23 |
val end_theory: Position.T -> state -> theory |
16815 | 24 |
val print_state_context: state -> unit |
25 |
val print_state: bool -> state -> unit |
|
37858 | 26 |
val pretty_abstract: state -> Pretty.T |
32738 | 27 |
val quiet: bool Unsynchronized.ref |
28 |
val debug: bool Unsynchronized.ref |
|
29 |
val interact: bool Unsynchronized.ref |
|
30 |
val timing: bool Unsynchronized.ref |
|
31 |
val profiling: int Unsynchronized.ref |
|
32 |
val skip_proofs: bool Unsynchronized.ref |
|
27583 | 33 |
exception TOPLEVEL_ERROR |
20128
8f0e07d7cf92
keep/transaction: unified execution model (with debugging etc.);
wenzelm
parents:
19996
diff
changeset
|
34 |
val program: (unit -> 'a) -> 'a |
33604
d4220df6fde2
Toplevel.thread provides Isar-style exception output;
wenzelm
parents:
33553
diff
changeset
|
35 |
val thread: bool -> (unit -> unit) -> Thread.thread |
16682 | 36 |
type transition |
5828 | 37 |
val empty: transition |
27441 | 38 |
val init_of: transition -> string option |
38888
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38876
diff
changeset
|
39 |
val print_of: transition -> bool |
27427 | 40 |
val name_of: transition -> string |
28105 | 41 |
val pos_of: transition -> Position.T |
27500 | 42 |
val str_of: transition -> string |
5828 | 43 |
val name: string -> transition -> transition |
44 |
val position: Position.T -> transition -> transition |
|
45 |
val interactive: bool -> transition -> transition |
|
38888
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38876
diff
changeset
|
46 |
val set_print: bool -> transition -> transition |
5828 | 47 |
val print: transition -> transition |
9010 | 48 |
val no_timing: transition -> transition |
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
|
49 |
val init_theory: string -> (unit -> theory) -> transition -> transition |
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
|
50 |
val modify_init: (unit -> theory) -> transition -> transition |
6689 | 51 |
val exit: transition -> transition |
5828 | 52 |
val keep: (state -> unit) -> transition -> transition |
7612 | 53 |
val keep': (bool -> state -> unit) -> transition -> transition |
5828 | 54 |
val imperative: (unit -> unit) -> transition -> transition |
27840 | 55 |
val ignored: Position.T -> transition |
56 |
val malformed: Position.T -> string -> transition |
|
5828 | 57 |
val theory: (theory -> theory) -> transition -> transition |
26491 | 58 |
val generic_theory: (generic_theory -> generic_theory) -> transition -> transition |
7612 | 59 |
val theory': (bool -> theory -> theory) -> transition -> transition |
20985 | 60 |
val begin_local_theory: bool -> (theory -> local_theory) -> transition -> transition |
21007 | 61 |
val end_local_theory: transition -> transition |
29380 | 62 |
val local_theory': xstring option -> (bool -> local_theory -> local_theory) -> |
63 |
transition -> transition |
|
20963
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
64 |
val local_theory: xstring option -> (local_theory -> local_theory) -> transition -> transition |
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
65 |
val present_local_theory: xstring option -> (state -> unit) -> transition -> transition |
24453 | 66 |
val local_theory_to_proof': xstring option -> (bool -> local_theory -> Proof.state) -> |
67 |
transition -> transition |
|
21007 | 68 |
val local_theory_to_proof: xstring option -> (local_theory -> Proof.state) -> |
69 |
transition -> transition |
|
17363 | 70 |
val theory_to_proof: (theory -> Proof.state) -> transition -> transition |
21007 | 71 |
val end_proof: (bool -> Proof.state -> Proof.context) -> transition -> transition |
72 |
val forget_proof: transition -> transition |
|
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
73 |
val present_proof: (state -> unit) -> transition -> transition |
21177 | 74 |
val proofs': (bool -> Proof.state -> Proof.state Seq.seq) -> transition -> transition |
17904
21c6894b5998
simplified interfaces proof/proof' etc.: perform ProofHistory.apply(s)/current internally;
wenzelm
parents:
17513
diff
changeset
|
75 |
val proof': (bool -> Proof.state -> Proof.state) -> transition -> transition |
21177 | 76 |
val proofs: (Proof.state -> Proof.state Seq.seq) -> transition -> transition |
77 |
val proof: (Proof.state -> Proof.state) -> transition -> transition |
|
33390 | 78 |
val actual_proof: (Proof_Node.T -> Proof_Node.T) -> transition -> transition |
27564
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset
|
79 |
val skip_proof: (int -> int) -> transition -> transition |
17904
21c6894b5998
simplified interfaces proof/proof' etc.: perform ProofHistory.apply(s)/current internally;
wenzelm
parents:
17513
diff
changeset
|
80 |
val skip_proof_to_theory: (int -> bool) -> transition -> transition |
27427 | 81 |
val get_id: transition -> string option |
82 |
val put_id: string -> transition -> transition |
|
9512 | 83 |
val unknown_theory: transition -> transition |
84 |
val unknown_proof: transition -> transition |
|
85 |
val unknown_context: transition -> transition |
|
28425 | 86 |
val setmp_thread_position: transition -> ('a -> 'b) -> 'a -> 'b |
27606 | 87 |
val status: transition -> Markup.T -> unit |
38876
ec7045139e70
Toplevel.run_command: more careful treatment of interrupts stemming from nested multi-exceptions etc.;
wenzelm
parents:
38875
diff
changeset
|
88 |
val error_msg: transition -> string -> unit |
28103
b79e61861f0f
simplified Toplevel.add_hook: cover successful transactions only;
wenzelm
parents:
28095
diff
changeset
|
89 |
val add_hook: (transition -> state -> state -> unit) -> unit |
26602
5534b6a6b810
made purely value-oriented, moved global state to structure Isar (cf. isar.ML);
wenzelm
parents:
26491
diff
changeset
|
90 |
val transition: bool -> transition -> state -> (state * (exn * string) option) option |
28425 | 91 |
val command: transition -> state -> state |
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
92 |
val excursion: (transition * transition list) list -> (transition * state) list lazy * theory |
5828 | 93 |
end; |
94 |
||
6965 | 95 |
structure Toplevel: TOPLEVEL = |
5828 | 96 |
struct |
97 |
||
98 |
(** toplevel state **) |
|
99 |
||
31476
c5d2899b6de9
moved Isar toplevel runtime support to runtime.ML, which is loaded early (before ml_compiler.ML);
wenzelm
parents:
31431
diff
changeset
|
100 |
exception UNDEF = Runtime.UNDEF; |
19063 | 101 |
|
102 |
||
21294 | 103 |
(* local theory wrappers *) |
5828 | 104 |
|
38350
480b2de9927c
renamed Theory_Target to the more appropriate Named_Target
haftmann
parents:
38236
diff
changeset
|
105 |
val loc_init = Named_Target.context_cmd; |
33671 | 106 |
val loc_exit = Local_Theory.exit_global; |
21294 | 107 |
|
25292 | 108 |
fun loc_begin loc (Context.Theory thy) = loc_init (the_default "-" loc) thy |
21294 | 109 |
| loc_begin NONE (Context.Proof lthy) = lthy |
38391
ba1cc1815ce1
named target is optional; explicit Name_Target.reinit
haftmann
parents:
38389
diff
changeset
|
110 |
| loc_begin (SOME loc) (Context.Proof lthy) = (loc_init loc o loc_exit) lthy; |
21294 | 111 |
|
112 |
fun loc_finish _ (Context.Theory _) = Context.Theory o loc_exit |
|
33671 | 113 |
| loc_finish NONE (Context.Proof _) = Context.Proof o Local_Theory.restore |
38391
ba1cc1815ce1
named target is optional; explicit Name_Target.reinit
haftmann
parents:
38389
diff
changeset
|
114 |
| loc_finish (SOME _) (Context.Proof lthy) = Context.Proof o Named_Target.reinit lthy; |
21294 | 115 |
|
116 |
||
21958
9dfd1ca4c0a0
refined notion of empty toplevel, admits undo of 'end';
wenzelm
parents:
21861
diff
changeset
|
117 |
(* datatype node *) |
21294 | 118 |
|
5828 | 119 |
datatype node = |
27576
7afff36043e6
eliminated internal command history -- superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset
|
120 |
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
|
121 |
(*theory with presentation context*) | |
33390 | 122 |
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
|
123 |
(*proof node, finish, original theory*) | |
27564
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset
|
124 |
SkipProof of int * (generic_theory * generic_theory); |
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset
|
125 |
(*proof depth, resulting theory, original theory*) |
5828 | 126 |
|
20963
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
127 |
val theory_node = fn Theory (gthy, _) => SOME gthy | _ => NONE; |
18589 | 128 |
val proof_node = fn Proof (prf, _) => SOME prf | _ => NONE; |
129 |
||
20963
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
130 |
fun cases_node f _ (Theory (gthy, _)) = f gthy |
33390 | 131 |
| cases_node _ g (Proof (prf, _)) = g (Proof_Node.current prf) |
21007 | 132 |
| cases_node f _ (SkipProof (_, (gthy, _))) = f gthy; |
19063 | 133 |
|
29066 | 134 |
val context_node = cases_node Context.proof_of Proof.context_of; |
135 |
||
21958
9dfd1ca4c0a0
refined notion of empty toplevel, admits undo of 'end';
wenzelm
parents:
21861
diff
changeset
|
136 |
|
9dfd1ca4c0a0
refined notion of empty toplevel, admits undo of 'end';
wenzelm
parents:
21861
diff
changeset
|
137 |
(* datatype state *) |
9dfd1ca4c0a0
refined notion of empty toplevel, admits undo of 'end';
wenzelm
parents:
21861
diff
changeset
|
138 |
|
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
139 |
datatype state = State of node option * node option; (*current, previous*) |
5828 | 140 |
|
27576
7afff36043e6
eliminated internal command history -- superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset
|
141 |
val toplevel = State (NONE, NONE); |
5828 | 142 |
|
27576
7afff36043e6
eliminated internal command history -- superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset
|
143 |
fun is_toplevel (State (NONE, _)) = true |
7732 | 144 |
| is_toplevel _ = false; |
145 |
||
27576
7afff36043e6
eliminated internal command history -- superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset
|
146 |
fun level (State (NONE, _)) = 0 |
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
147 |
| level (State (SOME (Theory _), _)) = 0 |
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
148 |
| level (State (SOME (Proof (prf, _)), _)) = Proof.level (Proof_Node.current prf) |
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
149 |
| level (State (SOME (SkipProof (d, _)), _)) = d + 1; (*different notion of proof depth!*) |
17076 | 150 |
|
27576
7afff36043e6
eliminated internal command history -- superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset
|
151 |
fun 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
|
152 |
| 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
|
153 |
| 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
|
154 |
| str_of_state (State (SOME (Proof _), _)) = "in proof mode" |
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
155 |
| str_of_state (State (SOME (SkipProof _), _)) = "in skipped proof mode"; |
5946
a4600d21b59b
print_state hook, obeys Goals.current_goals_markers by default;
wenzelm
parents:
5939
diff
changeset
|
156 |
|
a4600d21b59b
print_state hook, obeys Goals.current_goals_markers by default;
wenzelm
parents:
5939
diff
changeset
|
157 |
|
27576
7afff36043e6
eliminated internal command history -- superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset
|
158 |
(* current node *) |
5828 | 159 |
|
27576
7afff36043e6
eliminated internal command history -- superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset
|
160 |
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
|
161 |
| node_of (State (SOME node, _)) = node; |
5828 | 162 |
|
18589 | 163 |
fun is_theory state = not (is_toplevel state) andalso is_some (theory_node (node_of state)); |
164 |
fun is_proof state = not (is_toplevel state) andalso is_some (proof_node (node_of state)); |
|
165 |
||
19063 | 166 |
fun node_case f g state = cases_node f g (node_of state); |
5828 | 167 |
|
30398 | 168 |
fun presentation_context_of state = |
169 |
(case try node_of state of |
|
170 |
SOME (Theory (_, SOME ctxt)) => ctxt |
|
171 |
| SOME node => context_node node |
|
172 |
| NONE => raise UNDEF); |
|
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
173 |
|
30801 | 174 |
fun previous_context_of (State (_, NONE)) = NONE |
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
175 |
| previous_context_of (State (_, SOME prev)) = SOME (context_node prev); |
30801 | 176 |
|
21506 | 177 |
val context_of = node_case Context.proof_of Proof.context_of; |
22089 | 178 |
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
|
179 |
val theory_of = node_case Context.theory_of Proof.theory_of; |
18589 | 180 |
val proof_of = node_case (fn _ => raise UNDEF) I; |
17208 | 181 |
|
18589 | 182 |
fun proof_position_of state = |
183 |
(case node_of state of |
|
33390 | 184 |
Proof (prf, _) => Proof_Node.position prf |
18589 | 185 |
| _ => raise UNDEF); |
6664 | 186 |
|
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
187 |
fun end_theory _ (State (NONE, SOME (Theory (Context.Theory thy, _)))) = Theory.end_theory thy |
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
188 |
| end_theory pos _ = error ("Unfinished theory at end of input" ^ Position.str_of pos); |
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
189 |
|
5828 | 190 |
|
16815 | 191 |
(* print state *) |
192 |
||
38388 | 193 |
val pretty_context = Local_Theory.pretty o Context.cases (Named_Target.theory_init) I; |
16815 | 194 |
|
23640
baec2e674461
toplevel prompt/print_state: proper markup, removed hooks;
wenzelm
parents:
23619
diff
changeset
|
195 |
fun print_state_context state = |
24795
6f5cb7885fd7
print_state_context: local theory context, not proof context;
wenzelm
parents:
24780
diff
changeset
|
196 |
(case try node_of state of |
21506 | 197 |
NONE => [] |
24795
6f5cb7885fd7
print_state_context: local theory context, not proof context;
wenzelm
parents:
24780
diff
changeset
|
198 |
| SOME (Theory (gthy, _)) => pretty_context gthy |
6f5cb7885fd7
print_state_context: local theory context, not proof context;
wenzelm
parents:
24780
diff
changeset
|
199 |
| SOME (Proof (_, (_, gthy))) => pretty_context gthy |
6f5cb7885fd7
print_state_context: local theory context, not proof context;
wenzelm
parents:
24780
diff
changeset
|
200 |
| SOME (SkipProof (_, (gthy, _))) => pretty_context gthy) |
23640
baec2e674461
toplevel prompt/print_state: proper markup, removed hooks;
wenzelm
parents:
23619
diff
changeset
|
201 |
|> Pretty.chunks |> Pretty.writeln; |
16815 | 202 |
|
23640
baec2e674461
toplevel prompt/print_state: proper markup, removed hooks;
wenzelm
parents:
23619
diff
changeset
|
203 |
fun print_state prf_only state = |
23701 | 204 |
(case try node_of state of |
205 |
NONE => [] |
|
206 |
| SOME (Theory (gthy, _)) => if prf_only then [] else pretty_context gthy |
|
207 |
| SOME (Proof (prf, _)) => |
|
33390 | 208 |
Proof.pretty_state (Proof_Node.position prf) (Proof_Node.current prf) |
27564
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset
|
209 |
| SOME (SkipProof (d, _)) => [Pretty.str ("skipped proof: depth " ^ string_of_int d)]) |
23701 | 210 |
|> Pretty.markup_chunks Markup.state |> Pretty.writeln; |
16815 | 211 |
|
37858 | 212 |
fun pretty_abstract state = Pretty.str ("<Isar " ^ str_of_state state ^ ">"); |
213 |
||
16815 | 214 |
|
15668 | 215 |
|
5828 | 216 |
(** toplevel transitions **) |
217 |
||
32738 | 218 |
val quiet = Unsynchronized.ref false; |
22135 | 219 |
val debug = Output.debugging; |
32738 | 220 |
val interact = Unsynchronized.ref false; |
16682 | 221 |
val timing = Output.timing; |
32738 | 222 |
val profiling = Unsynchronized.ref 0; |
223 |
val skip_proofs = Unsynchronized.ref false; |
|
16682 | 224 |
|
31476
c5d2899b6de9
moved Isar toplevel runtime support to runtime.ML, which is loaded early (before ml_compiler.ML);
wenzelm
parents:
31431
diff
changeset
|
225 |
exception TOPLEVEL_ERROR = Runtime.TOPLEVEL_ERROR; |
20128
8f0e07d7cf92
keep/transaction: unified execution model (with debugging etc.);
wenzelm
parents:
19996
diff
changeset
|
226 |
|
33604
d4220df6fde2
Toplevel.thread provides Isar-style exception output;
wenzelm
parents:
33553
diff
changeset
|
227 |
fun program body = |
d4220df6fde2
Toplevel.thread provides Isar-style exception output;
wenzelm
parents:
33553
diff
changeset
|
228 |
(body |
31476
c5d2899b6de9
moved Isar toplevel runtime support to runtime.ML, which is loaded early (before ml_compiler.ML);
wenzelm
parents:
31431
diff
changeset
|
229 |
|> Runtime.controlled_execution |
33604
d4220df6fde2
Toplevel.thread provides Isar-style exception output;
wenzelm
parents:
33553
diff
changeset
|
230 |
|> Runtime.toplevel_error (Output.error_msg o ML_Compiler.exn_message)) (); |
d4220df6fde2
Toplevel.thread provides Isar-style exception output;
wenzelm
parents:
33553
diff
changeset
|
231 |
|
d4220df6fde2
Toplevel.thread provides Isar-style exception output;
wenzelm
parents:
33553
diff
changeset
|
232 |
fun thread interrupts body = |
d4220df6fde2
Toplevel.thread provides Isar-style exception output;
wenzelm
parents:
33553
diff
changeset
|
233 |
Thread.fork |
d4220df6fde2
Toplevel.thread provides Isar-style exception output;
wenzelm
parents:
33553
diff
changeset
|
234 |
(((fn () => body () handle Exn.Interrupt => ()) |
d4220df6fde2
Toplevel.thread provides Isar-style exception output;
wenzelm
parents:
33553
diff
changeset
|
235 |
|> Runtime.debugging |
d4220df6fde2
Toplevel.thread provides Isar-style exception output;
wenzelm
parents:
33553
diff
changeset
|
236 |
|> Runtime.toplevel_error |
d4220df6fde2
Toplevel.thread provides Isar-style exception output;
wenzelm
parents:
33553
diff
changeset
|
237 |
(fn exn => priority ("## INTERNAL ERROR ##\n" ^ ML_Compiler.exn_message exn))), |
37216
3165bc303f66
modernized some structure names, keeping a few legacy aliases;
wenzelm
parents:
37208
diff
changeset
|
238 |
Simple_Thread.attributes interrupts); |
20128
8f0e07d7cf92
keep/transaction: unified execution model (with debugging etc.);
wenzelm
parents:
19996
diff
changeset
|
239 |
|
5828 | 240 |
|
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset
|
241 |
(* node transactions -- maintaining stable checkpoints *) |
7022 | 242 |
|
31476
c5d2899b6de9
moved Isar toplevel runtime support to runtime.ML, which is loaded early (before ml_compiler.ML);
wenzelm
parents:
31431
diff
changeset
|
243 |
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
|
244 |
|
6689 | 245 |
local |
246 |
||
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
247 |
fun reset_presentation (Theory (gthy, _)) = Theory (gthy, NONE) |
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
248 |
| reset_presentation node = node; |
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
249 |
|
26624
770265032999
transaction/init: ensure stable theory (non-draft);
wenzelm
parents:
26621
diff
changeset
|
250 |
fun is_draft_theory (Theory (gthy, _)) = Context.is_draft (Context.theory_of gthy) |
770265032999
transaction/init: ensure stable theory (non-draft);
wenzelm
parents:
26621
diff
changeset
|
251 |
| is_draft_theory _ = false; |
770265032999
transaction/init: ensure stable theory (non-draft);
wenzelm
parents:
26621
diff
changeset
|
252 |
|
31476
c5d2899b6de9
moved Isar toplevel runtime support to runtime.ML, which is loaded early (before ml_compiler.ML);
wenzelm
parents:
31431
diff
changeset
|
253 |
fun is_stale state = Context.is_stale (theory_of state) handle Runtime.UNDEF => false; |
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset
|
254 |
|
26624
770265032999
transaction/init: ensure stable theory (non-draft);
wenzelm
parents:
26621
diff
changeset
|
255 |
fun stale_error NONE = SOME (ERROR "Stale theory encountered after successful execution!") |
770265032999
transaction/init: ensure stable theory (non-draft);
wenzelm
parents:
26621
diff
changeset
|
256 |
| stale_error some = some; |
16815 | 257 |
|
27576
7afff36043e6
eliminated internal command history -- superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset
|
258 |
fun map_theory f (Theory (gthy, ctxt)) = |
33671 | 259 |
Theory (Context.mapping f (Local_Theory.raw_theory f) gthy, ctxt) |
27576
7afff36043e6
eliminated internal command history -- superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset
|
260 |
| map_theory _ node = node; |
6689 | 261 |
|
262 |
in |
|
263 |
||
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
264 |
fun apply_transaction f g node = |
20128
8f0e07d7cf92
keep/transaction: unified execution model (with debugging etc.);
wenzelm
parents:
19996
diff
changeset
|
265 |
let |
27576
7afff36043e6
eliminated internal command history -- superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset
|
266 |
val _ = is_draft_theory node andalso error "Illegal draft theory in toplevel state"; |
7afff36043e6
eliminated internal command history -- superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset
|
267 |
val cont_node = reset_presentation node; |
7afff36043e6
eliminated internal command history -- superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset
|
268 |
val back_node = map_theory (Theory.checkpoint o Theory.copy) cont_node; |
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
269 |
fun state_error e nd = (State (SOME nd, SOME node), e); |
6689 | 270 |
|
20128
8f0e07d7cf92
keep/transaction: unified execution model (with debugging etc.);
wenzelm
parents:
19996
diff
changeset
|
271 |
val (result, err) = |
8f0e07d7cf92
keep/transaction: unified execution model (with debugging etc.);
wenzelm
parents:
19996
diff
changeset
|
272 |
cont_node |
31476
c5d2899b6de9
moved Isar toplevel runtime support to runtime.ML, which is loaded early (before ml_compiler.ML);
wenzelm
parents:
31431
diff
changeset
|
273 |
|> Runtime.controlled_execution f |
26624
770265032999
transaction/init: ensure stable theory (non-draft);
wenzelm
parents:
26621
diff
changeset
|
274 |
|> map_theory Theory.checkpoint |
770265032999
transaction/init: ensure stable theory (non-draft);
wenzelm
parents:
26621
diff
changeset
|
275 |
|> state_error NONE |
770265032999
transaction/init: ensure stable theory (non-draft);
wenzelm
parents:
26621
diff
changeset
|
276 |
handle exn => state_error (SOME exn) cont_node; |
770265032999
transaction/init: ensure stable theory (non-draft);
wenzelm
parents:
26621
diff
changeset
|
277 |
|
770265032999
transaction/init: ensure stable theory (non-draft);
wenzelm
parents:
26621
diff
changeset
|
278 |
val (result', err') = |
770265032999
transaction/init: ensure stable theory (non-draft);
wenzelm
parents:
26621
diff
changeset
|
279 |
if is_stale result then state_error (stale_error err) back_node |
770265032999
transaction/init: ensure stable theory (non-draft);
wenzelm
parents:
26621
diff
changeset
|
280 |
else (result, err); |
20128
8f0e07d7cf92
keep/transaction: unified execution model (with debugging etc.);
wenzelm
parents:
19996
diff
changeset
|
281 |
in |
26624
770265032999
transaction/init: ensure stable theory (non-draft);
wenzelm
parents:
26621
diff
changeset
|
282 |
(case err' of |
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
283 |
NONE => tap g result' |
26624
770265032999
transaction/init: ensure stable theory (non-draft);
wenzelm
parents:
26621
diff
changeset
|
284 |
| SOME exn => raise FAILURE (result', exn)) |
20128
8f0e07d7cf92
keep/transaction: unified execution model (with debugging etc.);
wenzelm
parents:
19996
diff
changeset
|
285 |
end; |
6689 | 286 |
|
287 |
end; |
|
288 |
||
289 |
||
290 |
(* primitive transitions *) |
|
291 |
||
5828 | 292 |
datatype trans = |
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
|
293 |
Init of string * (unit -> theory) | (*theory name, init*) |
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
294 |
Exit | (*formal exit of theory*) |
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
295 |
Keep of bool -> state -> unit | (*peek at state*) |
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
296 |
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
|
297 |
|
6689 | 298 |
local |
5828 | 299 |
|
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
|
300 |
fun apply_tr _ (Init (_, f)) (State (NONE, _)) = |
33727
e2d5d7f51aa3
init_theory: Runtime.controlled_execution for proper exception trace etc.;
wenzelm
parents:
33725
diff
changeset
|
301 |
State (SOME (Theory (Context.Theory |
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
|
302 |
(Theory.checkpoint (Runtime.controlled_execution f ())), NONE)), NONE) |
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
303 |
| apply_tr _ Exit (State (prev as SOME (Theory (Context.Theory _, _)), _)) = |
27603 | 304 |
State (NONE, prev) |
32792 | 305 |
| apply_tr int (Keep f) state = |
31476
c5d2899b6de9
moved Isar toplevel runtime support to runtime.ML, which is loaded early (before ml_compiler.ML);
wenzelm
parents:
31431
diff
changeset
|
306 |
Runtime.controlled_execution (fn x => tap (f int) x) state |
32792 | 307 |
| apply_tr int (Transaction (f, g)) (State (SOME state, _)) = |
308 |
apply_transaction (fn x => f int x) g state |
|
309 |
| apply_tr _ _ _ = raise UNDEF; |
|
5828 | 310 |
|
32792 | 311 |
fun apply_union _ [] state = raise FAILURE (state, UNDEF) |
312 |
| apply_union int (tr :: trs) state = |
|
313 |
apply_union int trs state |
|
314 |
handle Runtime.UNDEF => apply_tr int tr state |
|
315 |
| FAILURE (alt_state, UNDEF) => apply_tr int tr alt_state |
|
6689 | 316 |
| exn as FAILURE _ => raise exn |
317 |
| exn => raise FAILURE (state, exn); |
|
318 |
||
319 |
in |
|
320 |
||
32792 | 321 |
fun apply_trans int trs state = (apply_union int trs state, NONE) |
15531 | 322 |
handle FAILURE (alt_state, exn) => (alt_state, SOME exn) | exn => (state, SOME exn); |
6689 | 323 |
|
324 |
end; |
|
5828 | 325 |
|
326 |
||
327 |
(* datatype transition *) |
|
328 |
||
329 |
datatype transition = Transition of |
|
26621
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset
|
330 |
{name: string, (*command name*) |
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset
|
331 |
pos: Position.T, (*source position*) |
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset
|
332 |
int_only: bool, (*interactive-only*) |
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset
|
333 |
print: bool, (*print result state*) |
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset
|
334 |
no_timing: bool, (*suppress timing*) |
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset
|
335 |
trans: trans list}; (*primitive transitions (union)*) |
5828 | 336 |
|
26621
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset
|
337 |
fun make_transition (name, pos, int_only, print, no_timing, trans) = |
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset
|
338 |
Transition {name = name, pos = pos, int_only = int_only, print = print, no_timing = no_timing, |
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset
|
339 |
trans = trans}; |
5828 | 340 |
|
26621
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset
|
341 |
fun map_transition f (Transition {name, pos, int_only, print, no_timing, trans}) = |
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset
|
342 |
make_transition (f (name, pos, int_only, print, no_timing, trans)); |
5828 | 343 |
|
27441 | 344 |
val empty = make_transition ("", Position.none, false, false, false, []); |
5828 | 345 |
|
346 |
||
347 |
(* diagnostics *) |
|
348 |
||
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
349 |
fun init_of (Transition {trans = [Init (name, _)], ...}) = SOME name |
27441 | 350 |
| init_of _ = NONE; |
351 |
||
38888
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38876
diff
changeset
|
352 |
fun print_of (Transition {print, ...}) = print; |
27427 | 353 |
fun name_of (Transition {name, ...}) = name; |
28105 | 354 |
fun pos_of (Transition {pos, ...}) = pos; |
355 |
fun str_of tr = quote (name_of tr) ^ Position.str_of (pos_of tr); |
|
5828 | 356 |
|
27427 | 357 |
fun command_msg msg tr = msg ^ "command " ^ str_of tr; |
38875
c7a66b584147
tuned messages: discontinued spurious full-stops (messages are occasionally composed unexpectedly);
wenzelm
parents:
38721
diff
changeset
|
358 |
fun at_command tr = command_msg "At " tr; |
5828 | 359 |
|
360 |
fun type_error tr state = |
|
18685 | 361 |
ERROR (command_msg "Illegal application of " tr ^ " " ^ str_of_state state); |
5828 | 362 |
|
363 |
||
364 |
(* modify transitions *) |
|
365 |
||
28451
0586b855c2b5
datatype transition: internal trans field is maintained in reverse order;
wenzelm
parents:
28446
diff
changeset
|
366 |
fun name name = map_transition (fn (_, pos, int_only, print, no_timing, trans) => |
0586b855c2b5
datatype transition: internal trans field is maintained in reverse order;
wenzelm
parents:
28446
diff
changeset
|
367 |
(name, pos, int_only, print, no_timing, trans)); |
9010 | 368 |
|
26621
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset
|
369 |
fun position pos = map_transition (fn (name, _, int_only, print, no_timing, trans) => |
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset
|
370 |
(name, pos, int_only, print, no_timing, trans)); |
5828 | 371 |
|
26621
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset
|
372 |
fun interactive int_only = map_transition (fn (name, pos, _, print, no_timing, trans) => |
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset
|
373 |
(name, pos, int_only, print, no_timing, trans)); |
14923 | 374 |
|
26621
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset
|
375 |
val no_timing = map_transition (fn (name, pos, int_only, print, _, trans) => |
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset
|
376 |
(name, pos, int_only, print, true, trans)); |
17363 | 377 |
|
26621
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset
|
378 |
fun add_trans tr = map_transition (fn (name, pos, int_only, print, no_timing, trans) => |
28451
0586b855c2b5
datatype transition: internal trans field is maintained in reverse order;
wenzelm
parents:
28446
diff
changeset
|
379 |
(name, pos, int_only, print, no_timing, tr :: trans)); |
16607 | 380 |
|
28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset
|
381 |
val reset_trans = map_transition (fn (name, pos, int_only, print, no_timing, _) => |
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset
|
382 |
(name, pos, int_only, print, no_timing, [])); |
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset
|
383 |
|
28453
06702e7acd1d
excursion/unit_result: no print for forked end, finish into global theory, pick resul from presentation context;
wenzelm
parents:
28451
diff
changeset
|
384 |
fun set_print print = map_transition (fn (name, pos, int_only, _, no_timing, trans) => |
06702e7acd1d
excursion/unit_result: no print for forked end, finish into global theory, pick resul from presentation context;
wenzelm
parents:
28451
diff
changeset
|
385 |
(name, pos, int_only, print, no_timing, trans)); |
06702e7acd1d
excursion/unit_result: no print for forked end, finish into global theory, pick resul from presentation context;
wenzelm
parents:
28451
diff
changeset
|
386 |
|
06702e7acd1d
excursion/unit_result: no print for forked end, finish into global theory, pick resul from presentation context;
wenzelm
parents:
28451
diff
changeset
|
387 |
val print = set_print true; |
5828 | 388 |
|
389 |
||
21007 | 390 |
(* basic transitions *) |
5828 | 391 |
|
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
392 |
fun init_theory name f = add_trans (Init (name, 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
|
393 |
|
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
|
394 |
fun modify_init f tr = |
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
|
395 |
(case init_of tr of |
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
|
396 |
SOME name => init_theory name f (reset_trans tr) |
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
|
397 |
| NONE => tr); |
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
|
398 |
|
6689 | 399 |
val exit = add_trans Exit; |
7612 | 400 |
val keep' = add_trans o Keep; |
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
401 |
|
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
402 |
fun present_transaction f g = add_trans (Transaction (f, g)); |
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
403 |
fun transaction f = present_transaction f (K ()); |
5828 | 404 |
|
7612 | 405 |
fun keep f = add_trans (Keep (fn _ => f)); |
5828 | 406 |
fun imperative f = keep (fn _ => f ()); |
407 |
||
27840 | 408 |
fun ignored pos = empty |> name "<ignored>" |> position pos |> imperative I; |
409 |
fun malformed pos msg = |
|
410 |
empty |> name "<malformed>" |> position pos |> imperative (fn () => error msg); |
|
411 |
||
21007 | 412 |
val unknown_theory = imperative (fn () => warning "Unknown theory context"); |
413 |
val unknown_proof = imperative (fn () => warning "Unknown proof context"); |
|
414 |
val unknown_context = imperative (fn () => warning "Unknown context"); |
|
15668 | 415 |
|
21007 | 416 |
|
417 |
(* theory transitions *) |
|
15668 | 418 |
|
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset
|
419 |
fun generic_theory f = transaction (fn _ => |
26491 | 420 |
(fn Theory (gthy, _) => Theory (f gthy, NONE) |
421 |
| _ => raise UNDEF)); |
|
422 |
||
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset
|
423 |
fun theory' f = transaction (fn int => |
33725
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
424 |
(fn Theory (Context.Theory thy, _) => |
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
425 |
let val thy' = thy |
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
426 |
|> Sign.new_group |
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
427 |
|> Theory.checkpoint |
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
428 |
|> f int |
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
429 |
|> Sign.reset_group; |
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
430 |
in Theory (Context.Theory thy', NONE) end |
20963
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
431 |
| _ => raise UNDEF)); |
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
432 |
|
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
433 |
fun theory f = theory' (K f); |
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
434 |
|
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset
|
435 |
fun begin_local_theory begin f = transaction (fn _ => |
20963
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
436 |
(fn Theory (Context.Theory thy, _) => |
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
437 |
let |
20985 | 438 |
val lthy = f thy; |
21294 | 439 |
val gthy = if begin then Context.Proof lthy else Context.Theory (loc_exit lthy); |
440 |
in Theory (gthy, SOME lthy) end |
|
20963
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
441 |
| _ => raise UNDEF)); |
17076 | 442 |
|
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset
|
443 |
val end_local_theory = transaction (fn _ => |
21294 | 444 |
(fn Theory (Context.Proof lthy, _) => Theory (Context.Theory (loc_exit lthy), SOME lthy) |
21007 | 445 |
| _ => raise UNDEF)); |
446 |
||
447 |
local |
|
448 |
||
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
449 |
fun local_theory_presentation loc f = present_transaction (fn int => |
21294 | 450 |
(fn Theory (gthy, _) => |
451 |
let |
|
452 |
val finish = loc_finish loc gthy; |
|
33725
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
453 |
val lthy' = loc_begin loc gthy |
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
454 |
|> Local_Theory.new_group |
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
455 |
|> f int |
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
456 |
|> Local_Theory.reset_group; |
21294 | 457 |
in Theory (finish lthy', SOME lthy') end |
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
458 |
| _ => raise UNDEF)); |
15668 | 459 |
|
21007 | 460 |
in |
461 |
||
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
462 |
fun local_theory' loc f = local_theory_presentation loc f (K ()); |
29380 | 463 |
fun local_theory loc f = local_theory' loc (K f); |
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
464 |
fun present_local_theory loc = local_theory_presentation loc (K I); |
18955 | 465 |
|
21007 | 466 |
end; |
467 |
||
468 |
||
469 |
(* proof transitions *) |
|
470 |
||
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset
|
471 |
fun end_proof f = transaction (fn int => |
24795
6f5cb7885fd7
print_state_context: local theory context, not proof context;
wenzelm
parents:
24780
diff
changeset
|
472 |
(fn Proof (prf, (finish, _)) => |
33390 | 473 |
let val state = Proof_Node.current prf in |
21007 | 474 |
if can (Proof.assert_bottom true) state then |
475 |
let |
|
476 |
val ctxt' = f int state; |
|
477 |
val gthy' = finish ctxt'; |
|
478 |
in Theory (gthy', SOME ctxt') end |
|
479 |
else raise UNDEF |
|
480 |
end |
|
27564
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset
|
481 |
| SkipProof (0, (gthy, _)) => Theory (gthy, NONE) |
21007 | 482 |
| _ => raise UNDEF)); |
483 |
||
21294 | 484 |
local |
485 |
||
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset
|
486 |
fun begin_proof init finish = transaction (fn int => |
21294 | 487 |
(fn Theory (gthy, _) => |
488 |
let |
|
24453 | 489 |
val prf = init int gthy; |
28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset
|
490 |
val skip = ! skip_proofs; |
21294 | 491 |
val schematic = Proof.schematic_goal prf; |
492 |
in |
|
28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset
|
493 |
if skip andalso schematic then |
21294 | 494 |
warning "Cannot skip proof of schematic goal statement" |
495 |
else (); |
|
28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset
|
496 |
if skip andalso not schematic then |
27564
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset
|
497 |
SkipProof (0, (finish gthy (Proof.global_skip_proof int prf), gthy)) |
33390 | 498 |
else Proof (Proof_Node.init prf, (finish gthy, gthy)) |
21294 | 499 |
end |
500 |
| _ => raise UNDEF)); |
|
501 |
||
502 |
in |
|
503 |
||
24780
47bb1e380d83
local_theory transactions: more careful treatment of context position;
wenzelm
parents:
24634
diff
changeset
|
504 |
fun local_theory_to_proof' loc f = begin_proof |
33725
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
505 |
(fn int => fn gthy => f int (Local_Theory.new_group (loc_begin loc gthy))) |
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
506 |
(fn gthy => loc_finish loc gthy o Local_Theory.reset_group); |
24780
47bb1e380d83
local_theory transactions: more careful treatment of context position;
wenzelm
parents:
24634
diff
changeset
|
507 |
|
24453 | 508 |
fun local_theory_to_proof loc f = local_theory_to_proof' loc (K f); |
21294 | 509 |
|
510 |
fun theory_to_proof f = begin_proof |
|
33725
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
511 |
(K (fn Context.Theory thy => f (Theory.checkpoint (Sign.new_group thy)) | _ => raise UNDEF)) |
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
512 |
(K (Context.Theory o Sign.reset_group o ProofContext.theory_of)); |
21294 | 513 |
|
514 |
end; |
|
515 |
||
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset
|
516 |
val forget_proof = transaction (fn _ => |
21007 | 517 |
(fn Proof (_, (_, orig_gthy)) => Theory (orig_gthy, NONE) |
518 |
| SkipProof (_, (_, orig_gthy)) => Theory (orig_gthy, NONE) |
|
519 |
| _ => raise UNDEF)); |
|
520 |
||
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
521 |
val present_proof = present_transaction (fn _ => |
33390 | 522 |
(fn Proof (prf, x) => Proof (Proof_Node.apply I prf, x) |
27564
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset
|
523 |
| skip as SkipProof _ => skip |
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
524 |
| _ => raise UNDEF)); |
21177 | 525 |
|
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset
|
526 |
fun proofs' f = transaction (fn int => |
33390 | 527 |
(fn Proof (prf, x) => Proof (Proof_Node.applys (f int) prf, x) |
27564
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset
|
528 |
| skip as SkipProof _ => skip |
16815 | 529 |
| _ => raise UNDEF)); |
15668 | 530 |
|
17904
21c6894b5998
simplified interfaces proof/proof' etc.: perform ProofHistory.apply(s)/current internally;
wenzelm
parents:
17513
diff
changeset
|
531 |
fun proof' f = proofs' (Seq.single oo f); |
21c6894b5998
simplified interfaces proof/proof' etc.: perform ProofHistory.apply(s)/current internally;
wenzelm
parents:
17513
diff
changeset
|
532 |
val proofs = proofs' o K; |
6689 | 533 |
val proof = proof' o K; |
16815 | 534 |
|
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset
|
535 |
fun actual_proof f = transaction (fn _ => |
21007 | 536 |
(fn Proof (prf, x) => Proof (f prf, x) |
20963
a7fd8f05a2be
added type global_theory -- theory or local_theory;
wenzelm
parents:
20928
diff
changeset
|
537 |
| _ => raise UNDEF)); |
16815 | 538 |
|
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset
|
539 |
fun skip_proof f = transaction (fn _ => |
21007 | 540 |
(fn SkipProof (h, x) => SkipProof (f h, x) |
18563 | 541 |
| _ => raise UNDEF)); |
542 |
||
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset
|
543 |
fun skip_proof_to_theory pred = transaction (fn _ => |
27564
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset
|
544 |
(fn SkipProof (d, (gthy, _)) => if pred d then Theory (gthy, NONE) else raise UNDEF |
33725
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset
|
545 |
| _ => raise UNDEF)); |
5828 | 546 |
|
547 |
||
548 |
||
549 |
(** toplevel transactions **) |
|
550 |
||
27427 | 551 |
(* identification *) |
552 |
||
553 |
fun get_id (Transition {pos, ...}) = Position.get_id pos; |
|
554 |
fun put_id id (tr as Transition {pos, ...}) = position (Position.put_id id pos) tr; |
|
555 |
||
556 |
||
25960 | 557 |
(* thread position *) |
25799 | 558 |
|
25960 | 559 |
fun setmp_thread_position (Transition {pos, ...}) f x = |
25819
e6feb08b7f4b
replaced thread_properties by simplified version in position.ML;
wenzelm
parents:
25809
diff
changeset
|
560 |
Position.setmp_thread_data pos f x; |
25799 | 561 |
|
27606 | 562 |
fun status tr m = |
563 |
setmp_thread_position tr (fn () => Output.status (Markup.markup m "")) (); |
|
564 |
||
38876
ec7045139e70
Toplevel.run_command: more careful treatment of interrupts stemming from nested multi-exceptions etc.;
wenzelm
parents:
38875
diff
changeset
|
565 |
fun error_msg tr msg = |
ec7045139e70
Toplevel.run_command: more careful treatment of interrupts stemming from nested multi-exceptions etc.;
wenzelm
parents:
38875
diff
changeset
|
566 |
setmp_thread_position tr (fn () => Output.error_msg msg) (); |
26602
5534b6a6b810
made purely value-oriented, moved global state to structure Isar (cf. isar.ML);
wenzelm
parents:
26491
diff
changeset
|
567 |
|
25799 | 568 |
|
28095
7eaf0813bdc3
added add_hook interface for post-transition hooks;
wenzelm
parents:
27859
diff
changeset
|
569 |
(* post-transition hooks *) |
7eaf0813bdc3
added add_hook interface for post-transition hooks;
wenzelm
parents:
27859
diff
changeset
|
570 |
|
37905 | 571 |
local |
572 |
val hooks = Unsynchronized.ref ([]: (transition -> state -> state -> unit) list); |
|
573 |
in |
|
28095
7eaf0813bdc3
added add_hook interface for post-transition hooks;
wenzelm
parents:
27859
diff
changeset
|
574 |
|
32738 | 575 |
fun add_hook f = CRITICAL (fn () => Unsynchronized.change hooks (cons f)); |
33223 | 576 |
fun get_hooks () = ! hooks; |
28095
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 |
end; |
7eaf0813bdc3
added add_hook interface for post-transition hooks;
wenzelm
parents:
27859
diff
changeset
|
579 |
|
7eaf0813bdc3
added add_hook interface for post-transition hooks;
wenzelm
parents:
27859
diff
changeset
|
580 |
|
5828 | 581 |
(* apply transitions *) |
582 |
||
6664 | 583 |
local |
584 |
||
32792 | 585 |
fun app int (tr as Transition {trans, print, no_timing, ...}) = |
25819
e6feb08b7f4b
replaced thread_properties by simplified version in position.ML;
wenzelm
parents:
25809
diff
changeset
|
586 |
setmp_thread_position tr (fn state => |
25799 | 587 |
let |
588 |
fun do_timing f x = (warning (command_msg "" tr); timeap f x); |
|
589 |
fun do_profiling f x = profile (! profiling) f x; |
|
590 |
||
26256
3e7939e978c6
added exception CONTEXT, indicating context of another exception;
wenzelm
parents:
26081
diff
changeset
|
591 |
val (result, status) = |
37905 | 592 |
state |> |
593 |
(apply_trans int trans |
|
594 |
|> (! profiling > 0 andalso not no_timing) ? do_profiling |
|
595 |
|> (! profiling > 0 orelse ! timing andalso not no_timing) ? do_timing); |
|
26256
3e7939e978c6
added exception CONTEXT, indicating context of another exception;
wenzelm
parents:
26081
diff
changeset
|
596 |
|
26621
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset
|
597 |
val _ = if int andalso not (! quiet) andalso print then print_state false result else (); |
26256
3e7939e978c6
added exception CONTEXT, indicating context of another exception;
wenzelm
parents:
26081
diff
changeset
|
598 |
in (result, Option.map (fn UNDEF => type_error tr state | exn => exn) status) end); |
6664 | 599 |
|
600 |
in |
|
5828 | 601 |
|
26602
5534b6a6b810
made purely value-oriented, moved global state to structure Isar (cf. isar.ML);
wenzelm
parents:
26491
diff
changeset
|
602 |
fun transition int tr st = |
28095
7eaf0813bdc3
added add_hook interface for post-transition hooks;
wenzelm
parents:
27859
diff
changeset
|
603 |
let |
7eaf0813bdc3
added add_hook interface for post-transition hooks;
wenzelm
parents:
27859
diff
changeset
|
604 |
val hooks = get_hooks (); |
28103
b79e61861f0f
simplified Toplevel.add_hook: cover successful transactions only;
wenzelm
parents:
28095
diff
changeset
|
605 |
fun apply_hooks st' = hooks |> List.app (fn f => (try (fn () => f tr st st') (); ())); |
28095
7eaf0813bdc3
added add_hook interface for post-transition hooks;
wenzelm
parents:
27859
diff
changeset
|
606 |
|
7eaf0813bdc3
added add_hook interface for post-transition hooks;
wenzelm
parents:
27859
diff
changeset
|
607 |
val ctxt = try context_of st; |
7eaf0813bdc3
added add_hook interface for post-transition hooks;
wenzelm
parents:
27859
diff
changeset
|
608 |
val res = |
7eaf0813bdc3
added add_hook interface for post-transition hooks;
wenzelm
parents:
27859
diff
changeset
|
609 |
(case app int tr st of |
38888
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38876
diff
changeset
|
610 |
(_, SOME Runtime.TERMINATE) => NONE |
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38876
diff
changeset
|
611 |
| (st', SOME (Runtime.EXCURSION_FAIL exn_info)) => SOME (st', SOME exn_info) |
31476
c5d2899b6de9
moved Isar toplevel runtime support to runtime.ML, which is loaded early (before ml_compiler.ML);
wenzelm
parents:
31431
diff
changeset
|
612 |
| (st', SOME exn) => SOME (st', SOME (Runtime.exn_context ctxt exn, at_command tr)) |
28103
b79e61861f0f
simplified Toplevel.add_hook: cover successful transactions only;
wenzelm
parents:
28095
diff
changeset
|
613 |
| (st', NONE) => SOME (st', NONE)); |
b79e61861f0f
simplified Toplevel.add_hook: cover successful transactions only;
wenzelm
parents:
28095
diff
changeset
|
614 |
val _ = (case res of SOME (st', NONE) => apply_hooks st' | _ => ()); |
28095
7eaf0813bdc3
added add_hook interface for post-transition hooks;
wenzelm
parents:
27859
diff
changeset
|
615 |
in res end; |
6664 | 616 |
|
617 |
end; |
|
5828 | 618 |
|
619 |
||
28425 | 620 |
(* nested commands *) |
5828 | 621 |
|
28425 | 622 |
fun command tr st = |
27576
7afff36043e6
eliminated internal command history -- superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset
|
623 |
(case transition (! interact) tr st of |
28425 | 624 |
SOME (st', NONE) => st' |
38888
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38876
diff
changeset
|
625 |
| SOME (_, SOME exn_info) => raise Runtime.EXCURSION_FAIL exn_info |
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38876
diff
changeset
|
626 |
| NONE => raise Runtime.EXCURSION_FAIL (Runtime.TERMINATE, at_command tr)); |
27576
7afff36043e6
eliminated internal command history -- superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset
|
627 |
|
29483 | 628 |
fun command_result tr st = |
629 |
let val st' = command tr st |
|
630 |
in (st', st') end; |
|
631 |
||
28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset
|
632 |
|
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset
|
633 |
(* excursion of units, consisting of commands with proof *) |
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset
|
634 |
|
33519 | 635 |
structure States = 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
|
636 |
( |
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
|
637 |
type T = state list future option; |
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
|
638 |
fun init _ = NONE; |
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
|
639 |
); |
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
|
640 |
|
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
|
641 |
fun proof_result immediate (tr, proof_trs) st = |
28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset
|
642 |
let val st' = command tr st in |
36315
e859879079c8
added keyword category "schematic goal", which prevents any attempt to fork the proof;
wenzelm
parents:
35205
diff
changeset
|
643 |
if immediate orelse |
e859879079c8
added keyword category "schematic goal", which prevents any attempt to fork the proof;
wenzelm
parents:
35205
diff
changeset
|
644 |
null proof_trs orelse |
36950 | 645 |
Keyword.is_schematic_goal (name_of tr) orelse |
646 |
exists (Keyword.is_qed_global o name_of) proof_trs orelse |
|
36315
e859879079c8
added keyword category "schematic goal", which prevents any attempt to fork the proof;
wenzelm
parents:
35205
diff
changeset
|
647 |
not (can proof_of st') orelse |
e859879079c8
added keyword category "schematic goal", which prevents any attempt to fork the proof;
wenzelm
parents:
35205
diff
changeset
|
648 |
Proof.is_relevant (proof_of st') |
28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset
|
649 |
then |
28453
06702e7acd1d
excursion/unit_result: no print for forked end, finish into global theory, pick resul from presentation context;
wenzelm
parents:
28451
diff
changeset
|
650 |
let val (states, st'') = fold_map command_result proof_trs st' |
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
|
651 |
in (Lazy.value ((tr, st') :: (proof_trs ~~ states)), st'') end |
28453
06702e7acd1d
excursion/unit_result: no print for forked end, finish into global theory, pick resul from presentation context;
wenzelm
parents:
28451
diff
changeset
|
652 |
else |
28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset
|
653 |
let |
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset
|
654 |
val (body_trs, end_tr) = split_last proof_trs; |
28453
06702e7acd1d
excursion/unit_result: no print for forked end, finish into global theory, pick resul from presentation context;
wenzelm
parents:
28451
diff
changeset
|
655 |
val finish = Context.Theory o ProofContext.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
|
656 |
|
29386 | 657 |
val future_proof = Proof.global_future_proof |
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
|
658 |
(fn prf => |
32062
457f5bcd3d76
Proof.future_proof: declare all assumptions as well;
wenzelm
parents:
32058
diff
changeset
|
659 |
Future.fork_pri ~1 (fn () => |
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset
|
660 |
let val (states, result_state) = |
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
661 |
(case st' of State (SOME (Proof (_, (_, orig_gthy))), prev) |
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
662 |
=> State (SOME (Proof (Proof_Node.init prf, (finish, orig_gthy))), prev)) |
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
|
663 |
|> fold_map command_result body_trs |
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
|
664 |
||> command (end_tr |> set_print false); |
30398 | 665 |
in (states, presentation_context_of result_state) end)) |
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
|
666 |
#> (fn (states, ctxt) => States.put (SOME states) ctxt); |
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
|
667 |
|
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 |
val st'' = st' |> command (end_tr |> reset_trans |> end_proof (K future_proof)); |
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 |
|
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
|
670 |
val states = |
30398 | 671 |
(case States.get (presentation_context_of st'') of |
37852
a902f158b4fc
eliminated old-style sys_error/SYS_ERROR in favour of exception Fail -- after careful checking that there is no overlap with existing handling of that;
wenzelm
parents:
37711
diff
changeset
|
672 |
NONE => raise Fail ("No future states for " ^ name_of tr ^ Position.str_of (pos_of tr)) |
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
|
673 |
| SOME states => states); |
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
|
674 |
val result = Lazy.lazy |
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
|
675 |
(fn () => (tr, st') :: (body_trs ~~ Future.join states) @ [(end_tr, st'')]); |
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
|
676 |
|
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
|
677 |
in (result, st'') end |
28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset
|
678 |
end; |
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset
|
679 |
|
29068 | 680 |
fun excursion input = |
28425 | 681 |
let |
28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset
|
682 |
val end_pos = if null input then error "No input" else pos_of (fst (List.last input)); |
29448
34b9652b2f45
added Goal.future_enabled abstraction -- now also checks that this is already
wenzelm
parents:
29435
diff
changeset
|
683 |
val immediate = not (Goal.future_enabled ()); |
29427
7ba952481e29
excursion: commit_exit internally -- checkpoints are fully persistent now;
wenzelm
parents:
29386
diff
changeset
|
684 |
val (results, end_state) = fold_map (proof_result immediate) input toplevel; |
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
685 |
val thy = end_theory end_pos end_state; |
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset
|
686 |
in (Lazy.lazy (fn () => maps Lazy.force results), thy) end; |
7062 | 687 |
|
6664 | 688 |
end; |