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