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