author  wenzelm 
Wed, 11 Aug 2010 18:11:07 +0200  
changeset 38337  f6c1e169f51b 
parent 38236  d8c7be27e01d 
child 38351  ea1ee55aa41f 
permissions  rwrr 
5828  1 
(* Title: Pure/Isar/toplevel.ML 
2 
Author: Markus Wenzel, TU Muenchen 

3 

26602
5534b6a6b810
made purely valueoriented, moved global state to structure Isar (cf. isar.ML);
wenzelm
parents:
26491
diff
changeset

4 
Isabelle/Isar toplevel transactions. 
5828  5 
*) 
6 

7 
signature TOPLEVEL = 

8 
sig 

19063  9 
exception UNDEF 
5828  10 
type state 
26602
5534b6a6b810
made purely valueoriented, moved global state to structure Isar (cf. isar.ML);
wenzelm
parents:
26491
diff
changeset

11 
val toplevel: state 
7732  12 
val is_toplevel: state > bool 
18589  13 
val is_theory: state > bool 
14 
val is_proof: state > bool 

17076  15 
val level: state > int 
30398  16 
val presentation_context_of: state > Proof.context 
30801  17 
val previous_context_of: state > Proof.context option 
21506  18 
val context_of: state > Proof.context 
22089  19 
val generic_theory_of: state > generic_theory 
5828  20 
val theory_of: state > theory 
21 
val proof_of: state > Proof.state 

18589  22 
val proof_position_of: state > int 
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset

23 
val end_theory: Position.T > state > theory 
16815  24 
val print_state_context: state > unit 
25 
val print_state: bool > state > unit 

37858  26 
val pretty_abstract: state > Pretty.T 
32738  27 
val quiet: bool Unsynchronized.ref 
28 
val debug: bool Unsynchronized.ref 

29 
val interact: bool Unsynchronized.ref 

30 
val timing: bool Unsynchronized.ref 

31 
val profiling: int Unsynchronized.ref 

32 
val skip_proofs: bool Unsynchronized.ref 

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 
33604
d4220df6fde2
Toplevel.thread provides Isarstyle exception output;
wenzelm
parents:
33553
diff
changeset

36 
val thread: bool > (unit > unit) > Thread.thread 
16682  37 
type transition 
5828  38 
val empty: transition 
27441  39 
val init_of: transition > string option 
27427  40 
val name_of: transition > string 
28105  41 
val pos_of: transition > Position.T 
27500  42 
val str_of: transition > string 
5828  43 
val name: string > transition > transition 
44 
val position: Position.T > transition > transition 

45 
val interactive: bool > transition > transition 

46 
val print: transition > transition 

9010  47 
val no_timing: transition > transition 
37977
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, nonoptional master dependency, do not store text in deps;
wenzelm
parents:
37953
diff
changeset

48 
val init_theory: string > (unit > theory) > transition > transition 
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, nonoptional master dependency, do not store text in deps;
wenzelm
parents:
37953
diff
changeset

49 
val modify_init: (unit > theory) > transition > transition 
6689  50 
val exit: transition > transition 
5828  51 
val keep: (state > unit) > transition > transition 
7612  52 
val keep': (bool > state > unit) > transition > transition 
5828  53 
val imperative: (unit > unit) > transition > transition 
27840  54 
val ignored: Position.T > transition 
55 
val malformed: Position.T > string > transition 

5828  56 
val theory: (theory > theory) > transition > transition 
26491  57 
val generic_theory: (generic_theory > generic_theory) > transition > transition 
7612  58 
val theory': (bool > theory > theory) > transition > transition 
20985  59 
val begin_local_theory: bool > (theory > local_theory) > transition > transition 
21007  60 
val end_local_theory: transition > transition 
29380  61 
val local_theory': xstring option > (bool > local_theory > local_theory) > 
62 
transition > transition 

20963
a7fd8f05a2be
added type global_theory  theory or local_theory;
wenzelm
parents:
20928
diff
changeset

63 
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

64 
val present_local_theory: xstring option > (state > unit) > transition > transition 
24453  65 
val local_theory_to_proof': xstring option > (bool > local_theory > Proof.state) > 
66 
transition > transition 

21007  67 
val local_theory_to_proof: xstring option > (local_theory > Proof.state) > 
68 
transition > transition 

17363  69 
val theory_to_proof: (theory > Proof.state) > transition > transition 
21007  70 
val end_proof: (bool > Proof.state > Proof.context) > transition > transition 
71 
val forget_proof: transition > transition 

30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset

72 
val present_proof: (state > unit) > transition > transition 
21177  73 
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

74 
val proof': (bool > Proof.state > Proof.state) > transition > transition 
21177  75 
val proofs: (Proof.state > Proof.state Seq.seq) > transition > transition 
76 
val proof: (Proof.state > Proof.state) > transition > transition 

33390  77 
val actual_proof: (Proof_Node.T > Proof_Node.T) > transition > transition 
27564
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset

78 
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

79 
val skip_proof_to_theory: (int > bool) > transition > transition 
27427  80 
val get_id: transition > string option 
81 
val put_id: string > transition > transition 

9512  82 
val unknown_theory: transition > transition 
83 
val unknown_proof: transition > transition 

84 
val unknown_context: transition > transition 

28425  85 
val setmp_thread_position: transition > ('a > 'b) > 'a > 'b 
27606  86 
val status: transition > Markup.T > unit 
26602
5534b6a6b810
made purely valueoriented, moved global state to structure Isar (cf. isar.ML);
wenzelm
parents:
26491
diff
changeset

87 
val error_msg: transition > exn * string > unit 
28103
b79e61861f0f
simplified Toplevel.add_hook: cover successful transactions only;
wenzelm
parents:
28095
diff
changeset

88 
val add_hook: (transition > state > state > unit) > unit 
26602
5534b6a6b810
made purely valueoriented, moved global state to structure Isar (cf. isar.ML);
wenzelm
parents:
26491
diff
changeset

89 
val transition: bool > transition > state > (state * (exn * string) option) option 
37687
e07dacec79e7
Toplevel.run_command: asynchronous state output, as an attempt to address potentially slow pretty printing (e.g. in HOL/Bali);
wenzelm
parents:
37216
diff
changeset

90 
val run_command: string > transition > state > state option 
28425  91 
val command: transition > state > state 
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset

92 
val excursion: (transition * transition list) list > (transition * state) list lazy * theory 
5828  93 
end; 
94 

6965  95 
structure Toplevel: TOPLEVEL = 
5828  96 
struct 
97 

98 
(** toplevel state **) 

99 

31476
c5d2899b6de9
moved Isar toplevel runtime support to runtime.ML, which is loaded early (before ml_compiler.ML);
wenzelm
parents:
31431
diff
changeset

100 
exception UNDEF = Runtime.UNDEF; 
19063  101 

102 

21294  103 
(* local theory wrappers *) 
5828  104 

35205  105 
val loc_init = Theory_Target.context_cmd; 
33671  106 
val loc_exit = Local_Theory.exit_global; 
21294  107 

25292  108 
fun loc_begin loc (Context.Theory thy) = loc_init (the_default "" loc) thy 
21294  109 
 loc_begin NONE (Context.Proof lthy) = lthy 
25269  110 
 loc_begin (SOME loc) (Context.Proof lthy) = loc_init loc (loc_exit lthy); 
21294  111 

112 
fun loc_finish _ (Context.Theory _) = Context.Theory o loc_exit 

33671  113 
 loc_finish NONE (Context.Proof _) = Context.Proof o Local_Theory.restore 
25292  114 
 loc_finish (SOME _) (Context.Proof lthy) = fn lthy' => 
33671  115 
Context.Proof (Local_Theory.reinit (Local_Theory.raw_theory (K (loc_exit lthy')) lthy)); 
21294  116 

117 

21958
9dfd1ca4c0a0
refined notion of empty toplevel, admits undo of 'end';
wenzelm
parents:
21861
diff
changeset

118 
(* datatype node *) 
21294  119 

5828  120 
datatype node = 
27576
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

121 
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

122 
(*theory with presentation context*)  
33390  123 
Proof of Proof_Node.T * ((Proof.context > generic_theory) * generic_theory) 
27576
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

124 
(*proof node, finish, original theory*)  
27564
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset

125 
SkipProof of int * (generic_theory * generic_theory); 
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset

126 
(*proof depth, resulting theory, original theory*) 
5828  127 

20963
a7fd8f05a2be
added type global_theory  theory or local_theory;
wenzelm
parents:
20928
diff
changeset

128 
val theory_node = fn Theory (gthy, _) => SOME gthy  _ => NONE; 
18589  129 
val proof_node = fn Proof (prf, _) => SOME prf  _ => NONE; 
130 

20963
a7fd8f05a2be
added type global_theory  theory or local_theory;
wenzelm
parents:
20928
diff
changeset

131 
fun cases_node f _ (Theory (gthy, _)) = f gthy 
33390  132 
 cases_node _ g (Proof (prf, _)) = g (Proof_Node.current prf) 
21007  133 
 cases_node f _ (SkipProof (_, (gthy, _))) = f gthy; 
19063  134 

29066  135 
val context_node = cases_node Context.proof_of Proof.context_of; 
136 

21958
9dfd1ca4c0a0
refined notion of empty toplevel, admits undo of 'end';
wenzelm
parents:
21861
diff
changeset

137 

9dfd1ca4c0a0
refined notion of empty toplevel, admits undo of 'end';
wenzelm
parents:
21861
diff
changeset

138 
(* datatype state *) 
9dfd1ca4c0a0
refined notion of empty toplevel, admits undo of 'end';
wenzelm
parents:
21861
diff
changeset

139 

37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset

140 
datatype state = State of node option * node option; (*current, previous*) 
5828  141 

27576
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

142 
val toplevel = State (NONE, NONE); 
5828  143 

27576
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

144 
fun is_toplevel (State (NONE, _)) = true 
7732  145 
 is_toplevel _ = false; 
146 

27576
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

147 
fun level (State (NONE, _)) = 0 
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset

148 
 level (State (SOME (Theory _), _)) = 0 
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset

149 
 level (State (SOME (Proof (prf, _)), _)) = Proof.level (Proof_Node.current prf) 
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset

150 
 level (State (SOME (SkipProof (d, _)), _)) = d + 1; (*different notion of proof depth!*) 
17076  151 

27576
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

152 
fun str_of_state (State (NONE, _)) = "at top level" 
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset

153 
 str_of_state (State (SOME (Theory (Context.Theory _, _)), _)) = "in theory mode" 
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset

154 
 str_of_state (State (SOME (Theory (Context.Proof _, _)), _)) = "in local theory mode" 
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset

155 
 str_of_state (State (SOME (Proof _), _)) = "in proof mode" 
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset

156 
 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

157 

a4600d21b59b
print_state hook, obeys Goals.current_goals_markers by default;
wenzelm
parents:
5939
diff
changeset

158 

27576
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

159 
(* current node *) 
5828  160 

27576
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

161 
fun node_of (State (NONE, _)) = raise UNDEF 
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset

162 
 node_of (State (SOME node, _)) = node; 
5828  163 

18589  164 
fun is_theory state = not (is_toplevel state) andalso is_some (theory_node (node_of state)); 
165 
fun is_proof state = not (is_toplevel state) andalso is_some (proof_node (node_of state)); 

166 

19063  167 
fun node_case f g state = cases_node f g (node_of state); 
5828  168 

30398  169 
fun presentation_context_of state = 
170 
(case try node_of state of 

171 
SOME (Theory (_, SOME ctxt)) => ctxt 

172 
 SOME node => context_node node 

173 
 NONE => raise UNDEF); 

30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset

174 

30801  175 
fun previous_context_of (State (_, NONE)) = NONE 
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset

176 
 previous_context_of (State (_, SOME prev)) = SOME (context_node prev); 
30801  177 

21506  178 
val context_of = node_case Context.proof_of Proof.context_of; 
22089  179 
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

180 
val theory_of = node_case Context.theory_of Proof.theory_of; 
18589  181 
val proof_of = node_case (fn _ => raise UNDEF) I; 
17208  182 

18589  183 
fun proof_position_of state = 
184 
(case node_of state of 

33390  185 
Proof (prf, _) => Proof_Node.position prf 
18589  186 
 _ => raise UNDEF); 
6664  187 

37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset

188 
fun end_theory _ (State (NONE, SOME (Theory (Context.Theory thy, _)))) = Theory.end_theory thy 
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset

189 
 end_theory pos _ = error ("Unfinished theory at end of input" ^ Position.str_of pos); 
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset

190 

5828  191 

16815  192 
(* print state *) 
193 

33671  194 
val pretty_context = Local_Theory.pretty o Context.cases (Theory_Target.init NONE) I; 
16815  195 

23640
baec2e674461
toplevel prompt/print_state: proper markup, removed hooks;
wenzelm
parents:
23619
diff
changeset

196 
fun print_state_context state = 
24795
6f5cb7885fd7
print_state_context: local theory context, not proof context;
wenzelm
parents:
24780
diff
changeset

197 
(case try node_of state of 
21506  198 
NONE => [] 
24795
6f5cb7885fd7
print_state_context: local theory context, not proof context;
wenzelm
parents:
24780
diff
changeset

199 
 SOME (Theory (gthy, _)) => pretty_context gthy 
6f5cb7885fd7
print_state_context: local theory context, not proof context;
wenzelm
parents:
24780
diff
changeset

200 
 SOME (Proof (_, (_, gthy))) => pretty_context gthy 
6f5cb7885fd7
print_state_context: local theory context, not proof context;
wenzelm
parents:
24780
diff
changeset

201 
 SOME (SkipProof (_, (gthy, _))) => pretty_context gthy) 
23640
baec2e674461
toplevel prompt/print_state: proper markup, removed hooks;
wenzelm
parents:
23619
diff
changeset

202 
> Pretty.chunks > Pretty.writeln; 
16815  203 

23640
baec2e674461
toplevel prompt/print_state: proper markup, removed hooks;
wenzelm
parents:
23619
diff
changeset

204 
fun print_state prf_only state = 
23701  205 
(case try node_of state of 
206 
NONE => [] 

207 
 SOME (Theory (gthy, _)) => if prf_only then [] else pretty_context gthy 

208 
 SOME (Proof (prf, _)) => 

33390  209 
Proof.pretty_state (Proof_Node.position prf) (Proof_Node.current prf) 
27564
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset

210 
 SOME (SkipProof (d, _)) => [Pretty.str ("skipped proof: depth " ^ string_of_int d)]) 
23701  211 
> Pretty.markup_chunks Markup.state > Pretty.writeln; 
16815  212 

37858  213 
fun pretty_abstract state = Pretty.str ("<Isar " ^ str_of_state state ^ ">"); 
214 

16815  215 

15668  216 

5828  217 
(** toplevel transitions **) 
218 

32738  219 
val quiet = Unsynchronized.ref false; 
22135  220 
val debug = Output.debugging; 
32738  221 
val interact = Unsynchronized.ref false; 
16682  222 
val timing = Output.timing; 
32738  223 
val profiling = Unsynchronized.ref 0; 
224 
val skip_proofs = Unsynchronized.ref false; 

16682  225 

31476
c5d2899b6de9
moved Isar toplevel runtime support to runtime.ML, which is loaded early (before ml_compiler.ML);
wenzelm
parents:
31431
diff
changeset

226 
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

227 
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

228 
exception TOPLEVEL_ERROR = Runtime.TOPLEVEL_ERROR; 
20128
8f0e07d7cf92
keep/transaction: unified execution model (with debugging etc.);
wenzelm
parents:
19996
diff
changeset

229 

33604
d4220df6fde2
Toplevel.thread provides Isarstyle exception output;
wenzelm
parents:
33553
diff
changeset

230 
fun program body = 
d4220df6fde2
Toplevel.thread provides Isarstyle exception output;
wenzelm
parents:
33553
diff
changeset

231 
(body 
31476
c5d2899b6de9
moved Isar toplevel runtime support to runtime.ML, which is loaded early (before ml_compiler.ML);
wenzelm
parents:
31431
diff
changeset

232 
> Runtime.controlled_execution 
33604
d4220df6fde2
Toplevel.thread provides Isarstyle exception output;
wenzelm
parents:
33553
diff
changeset

233 
> Runtime.toplevel_error (Output.error_msg o ML_Compiler.exn_message)) (); 
d4220df6fde2
Toplevel.thread provides Isarstyle exception output;
wenzelm
parents:
33553
diff
changeset

234 

d4220df6fde2
Toplevel.thread provides Isarstyle exception output;
wenzelm
parents:
33553
diff
changeset

235 
fun thread interrupts body = 
d4220df6fde2
Toplevel.thread provides Isarstyle exception output;
wenzelm
parents:
33553
diff
changeset

236 
Thread.fork 
d4220df6fde2
Toplevel.thread provides Isarstyle exception output;
wenzelm
parents:
33553
diff
changeset

237 
(((fn () => body () handle Exn.Interrupt => ()) 
d4220df6fde2
Toplevel.thread provides Isarstyle exception output;
wenzelm
parents:
33553
diff
changeset

238 
> Runtime.debugging 
d4220df6fde2
Toplevel.thread provides Isarstyle exception output;
wenzelm
parents:
33553
diff
changeset

239 
> Runtime.toplevel_error 
d4220df6fde2
Toplevel.thread provides Isarstyle exception output;
wenzelm
parents:
33553
diff
changeset

240 
(fn exn => priority ("## INTERNAL ERROR ##\n" ^ ML_Compiler.exn_message exn))), 
37216
3165bc303f66
modernized some structure names, keeping a few legacy aliases;
wenzelm
parents:
37208
diff
changeset

241 
Simple_Thread.attributes interrupts); 
20128
8f0e07d7cf92
keep/transaction: unified execution model (with debugging etc.);
wenzelm
parents:
19996
diff
changeset

242 

5828  243 

27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset

244 
(* node transactions  maintaining stable checkpoints *) 
7022  245 

31476
c5d2899b6de9
moved Isar toplevel runtime support to runtime.ML, which is loaded early (before ml_compiler.ML);
wenzelm
parents:
31431
diff
changeset

246 
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

247 

6689  248 
local 
249 

30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset

250 
fun reset_presentation (Theory (gthy, _)) = Theory (gthy, NONE) 
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset

251 
 reset_presentation node = node; 
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset

252 

26624
770265032999
transaction/init: ensure stable theory (nondraft);
wenzelm
parents:
26621
diff
changeset

253 
fun is_draft_theory (Theory (gthy, _)) = Context.is_draft (Context.theory_of gthy) 
770265032999
transaction/init: ensure stable theory (nondraft);
wenzelm
parents:
26621
diff
changeset

254 
 is_draft_theory _ = false; 
770265032999
transaction/init: ensure stable theory (nondraft);
wenzelm
parents:
26621
diff
changeset

255 

31476
c5d2899b6de9
moved Isar toplevel runtime support to runtime.ML, which is loaded early (before ml_compiler.ML);
wenzelm
parents:
31431
diff
changeset

256 
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

257 

26624
770265032999
transaction/init: ensure stable theory (nondraft);
wenzelm
parents:
26621
diff
changeset

258 
fun stale_error NONE = SOME (ERROR "Stale theory encountered after successful execution!") 
770265032999
transaction/init: ensure stable theory (nondraft);
wenzelm
parents:
26621
diff
changeset

259 
 stale_error some = some; 
16815  260 

27576
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

261 
fun map_theory f (Theory (gthy, ctxt)) = 
33671  262 
Theory (Context.mapping f (Local_Theory.raw_theory f) gthy, ctxt) 
27576
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

263 
 map_theory _ node = node; 
6689  264 

265 
in 

266 

37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset

267 
fun apply_transaction f g node = 
20128
8f0e07d7cf92
keep/transaction: unified execution model (with debugging etc.);
wenzelm
parents:
19996
diff
changeset

268 
let 
27576
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

269 
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

270 
val cont_node = reset_presentation node; 
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

271 
val back_node = map_theory (Theory.checkpoint o Theory.copy) cont_node; 
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset

272 
fun state_error e nd = (State (SOME nd, SOME node), e); 
6689  273 

20128
8f0e07d7cf92
keep/transaction: unified execution model (with debugging etc.);
wenzelm
parents:
19996
diff
changeset

274 
val (result, err) = 
8f0e07d7cf92
keep/transaction: unified execution model (with debugging etc.);
wenzelm
parents:
19996
diff
changeset

275 
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

276 
> Runtime.controlled_execution f 
26624
770265032999
transaction/init: ensure stable theory (nondraft);
wenzelm
parents:
26621
diff
changeset

277 
> map_theory Theory.checkpoint 
770265032999
transaction/init: ensure stable theory (nondraft);
wenzelm
parents:
26621
diff
changeset

278 
> state_error NONE 
770265032999
transaction/init: ensure stable theory (nondraft);
wenzelm
parents:
26621
diff
changeset

279 
handle exn => state_error (SOME exn) cont_node; 
770265032999
transaction/init: ensure stable theory (nondraft);
wenzelm
parents:
26621
diff
changeset

280 

770265032999
transaction/init: ensure stable theory (nondraft);
wenzelm
parents:
26621
diff
changeset

281 
val (result', err') = 
770265032999
transaction/init: ensure stable theory (nondraft);
wenzelm
parents:
26621
diff
changeset

282 
if is_stale result then state_error (stale_error err) back_node 
770265032999
transaction/init: ensure stable theory (nondraft);
wenzelm
parents:
26621
diff
changeset

283 
else (result, err); 
20128
8f0e07d7cf92
keep/transaction: unified execution model (with debugging etc.);
wenzelm
parents:
19996
diff
changeset

284 
in 
26624
770265032999
transaction/init: ensure stable theory (nondraft);
wenzelm
parents:
26621
diff
changeset

285 
(case err' of 
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset

286 
NONE => tap g result' 
26624
770265032999
transaction/init: ensure stable theory (nondraft);
wenzelm
parents:
26621
diff
changeset

287 
 SOME exn => raise FAILURE (result', exn)) 
20128
8f0e07d7cf92
keep/transaction: unified execution model (with debugging etc.);
wenzelm
parents:
19996
diff
changeset

288 
end; 
6689  289 

290 
end; 

291 

292 

293 
(* primitive transitions *) 

294 

5828  295 
datatype trans = 
37977
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, nonoptional master dependency, do not store text in deps;
wenzelm
parents:
37953
diff
changeset

296 
Init of string * (unit > theory)  (*theory name, init*) 
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset

297 
Exit  (*formal exit of theory*) 
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset

298 
Keep of bool > state > unit  (*peek at state*) 
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset

299 
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

300 

6689  301 
local 
5828  302 

37977
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, nonoptional master dependency, do not store text in deps;
wenzelm
parents:
37953
diff
changeset

303 
fun apply_tr _ (Init (_, f)) (State (NONE, _)) = 
33727
e2d5d7f51aa3
init_theory: Runtime.controlled_execution for proper exception trace etc.;
wenzelm
parents:
33725
diff
changeset

304 
State (SOME (Theory (Context.Theory 
37977
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, nonoptional master dependency, do not store text in deps;
wenzelm
parents:
37953
diff
changeset

305 
(Theory.checkpoint (Runtime.controlled_execution f ())), NONE)), NONE) 
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset

306 
 apply_tr _ Exit (State (prev as SOME (Theory (Context.Theory _, _)), _)) = 
27603  307 
State (NONE, prev) 
32792  308 
 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

309 
Runtime.controlled_execution (fn x => tap (f int) x) state 
32792  310 
 apply_tr int (Transaction (f, g)) (State (SOME state, _)) = 
311 
apply_transaction (fn x => f int x) g state 

312 
 apply_tr _ _ _ = raise UNDEF; 

5828  313 

32792  314 
fun apply_union _ [] state = raise FAILURE (state, UNDEF) 
315 
 apply_union int (tr :: trs) state = 

316 
apply_union int trs state 

317 
handle Runtime.UNDEF => apply_tr int tr state 

318 
 FAILURE (alt_state, UNDEF) => apply_tr int tr alt_state 

6689  319 
 exn as FAILURE _ => raise exn 
320 
 exn => raise FAILURE (state, exn); 

321 

322 
in 

323 

32792  324 
fun apply_trans int trs state = (apply_union int trs state, NONE) 
15531  325 
handle FAILURE (alt_state, exn) => (alt_state, SOME exn)  exn => (state, SOME exn); 
6689  326 

327 
end; 

5828  328 

329 

330 
(* datatype transition *) 

331 

332 
datatype transition = Transition of 

26621
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset

333 
{name: string, (*command name*) 
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset

334 
pos: Position.T, (*source position*) 
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset

335 
int_only: bool, (*interactiveonly*) 
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset

336 
print: bool, (*print result state*) 
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset

337 
no_timing: bool, (*suppress timing*) 
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset

338 
trans: trans list}; (*primitive transitions (union)*) 
5828  339 

26621
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset

340 
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

341 
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

342 
trans = trans}; 
5828  343 

26621
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset

344 
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

345 
make_transition (f (name, pos, int_only, print, no_timing, trans)); 
5828  346 

27441  347 
val empty = make_transition ("", Position.none, false, false, false, []); 
5828  348 

349 

350 
(* diagnostics *) 

351 

37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset

352 
fun init_of (Transition {trans = [Init (name, _)], ...}) = SOME name 
27441  353 
 init_of _ = NONE; 
354 

27427  355 
fun name_of (Transition {name, ...}) = name; 
28105  356 
fun pos_of (Transition {pos, ...}) = pos; 
357 
fun str_of tr = quote (name_of tr) ^ Position.str_of (pos_of tr); 

5828  358 

27427  359 
fun command_msg msg tr = msg ^ "command " ^ str_of tr; 
5828  360 
fun at_command tr = command_msg "At " tr ^ "."; 
361 

362 
fun type_error tr state = 

18685  363 
ERROR (command_msg "Illegal application of " tr ^ " " ^ str_of_state state); 
5828  364 

365 

366 
(* modify transitions *) 

367 

28451
0586b855c2b5
datatype transition: internal trans field is maintained in reverse order;
wenzelm
parents:
28446
diff
changeset

368 
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

369 
(name, pos, int_only, print, no_timing, trans)); 
9010  370 

26621
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset

371 
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

372 
(name, pos, int_only, print, no_timing, trans)); 
5828  373 

26621
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset

374 
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

375 
(name, pos, int_only, print, no_timing, trans)); 
14923  376 

26621
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset

377 
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

378 
(name, pos, int_only, print, true, trans)); 
17363  379 

26621
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset

380 
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

381 
(name, pos, int_only, print, no_timing, tr :: trans)); 
16607  382 

28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset

383 
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

384 
(name, pos, int_only, print, no_timing, [])); 
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset

385 

28453
06702e7acd1d
excursion/unit_result: no print for forked end, finish into global theory, pick resul from presentation context;
wenzelm
parents:
28451
diff
changeset

386 
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

387 
(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

388 

06702e7acd1d
excursion/unit_result: no print for forked end, finish into global theory, pick resul from presentation context;
wenzelm
parents:
28451
diff
changeset

389 
val print = set_print true; 
5828  390 

391 

21007  392 
(* basic transitions *) 
5828  393 

37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset

394 
fun init_theory name f = add_trans (Init (name, f)); 
37977
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, nonoptional master dependency, do not store text in deps;
wenzelm
parents:
37953
diff
changeset

395 

3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, nonoptional master dependency, do not store text in deps;
wenzelm
parents:
37953
diff
changeset

396 
fun modify_init f tr = 
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, nonoptional master dependency, do not store text in deps;
wenzelm
parents:
37953
diff
changeset

397 
(case init_of tr of 
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, nonoptional master dependency, do not store text in deps;
wenzelm
parents:
37953
diff
changeset

398 
SOME name => init_theory name f (reset_trans tr) 
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, nonoptional master dependency, do not store text in deps;
wenzelm
parents:
37953
diff
changeset

399 
 NONE => tr); 
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, nonoptional master dependency, do not store text in deps;
wenzelm
parents:
37953
diff
changeset

400 

6689  401 
val exit = add_trans Exit; 
7612  402 
val keep' = add_trans o Keep; 
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset

403 

e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset

404 
fun present_transaction f g = add_trans (Transaction (f, g)); 
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset

405 
fun transaction f = present_transaction f (K ()); 
5828  406 

7612  407 
fun keep f = add_trans (Keep (fn _ => f)); 
5828  408 
fun imperative f = keep (fn _ => f ()); 
409 

27840  410 
fun ignored pos = empty > name "<ignored>" > position pos > imperative I; 
411 
fun malformed pos msg = 

412 
empty > name "<malformed>" > position pos > imperative (fn () => error msg); 

413 

21007  414 
val unknown_theory = imperative (fn () => warning "Unknown theory context"); 
415 
val unknown_proof = imperative (fn () => warning "Unknown proof context"); 

416 
val unknown_context = imperative (fn () => warning "Unknown context"); 

15668  417 

21007  418 

419 
(* theory transitions *) 

15668  420 

27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset

421 
fun generic_theory f = transaction (fn _ => 
26491  422 
(fn Theory (gthy, _) => Theory (f gthy, NONE) 
423 
 _ => raise UNDEF)); 

424 

27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset

425 
fun theory' f = transaction (fn int => 
33725
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset

426 
(fn Theory (Context.Theory thy, _) => 
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset

427 
let val thy' = thy 
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset

428 
> Sign.new_group 
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset

429 
> Theory.checkpoint 
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset

430 
> f int 
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset

431 
> Sign.reset_group; 
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset

432 
in Theory (Context.Theory thy', NONE) end 
20963
a7fd8f05a2be
added type global_theory  theory or local_theory;
wenzelm
parents:
20928
diff
changeset

433 
 _ => raise UNDEF)); 
a7fd8f05a2be
added type global_theory  theory or local_theory;
wenzelm
parents:
20928
diff
changeset

434 

a7fd8f05a2be
added type global_theory  theory or local_theory;
wenzelm
parents:
20928
diff
changeset

435 
fun theory f = theory' (K f); 
a7fd8f05a2be
added type global_theory  theory or local_theory;
wenzelm
parents:
20928
diff
changeset

436 

27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset

437 
fun begin_local_theory begin f = transaction (fn _ => 
20963
a7fd8f05a2be
added type global_theory  theory or local_theory;
wenzelm
parents:
20928
diff
changeset

438 
(fn Theory (Context.Theory thy, _) => 
a7fd8f05a2be
added type global_theory  theory or local_theory;
wenzelm
parents:
20928
diff
changeset

439 
let 
20985  440 
val lthy = f thy; 
21294  441 
val gthy = if begin then Context.Proof lthy else Context.Theory (loc_exit lthy); 
442 
in Theory (gthy, SOME lthy) end 

20963
a7fd8f05a2be
added type global_theory  theory or local_theory;
wenzelm
parents:
20928
diff
changeset

443 
 _ => raise UNDEF)); 
17076  444 

27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset

445 
val end_local_theory = transaction (fn _ => 
21294  446 
(fn Theory (Context.Proof lthy, _) => Theory (Context.Theory (loc_exit lthy), SOME lthy) 
21007  447 
 _ => raise UNDEF)); 
448 

449 
local 

450 

30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset

451 
fun local_theory_presentation loc f = present_transaction (fn int => 
21294  452 
(fn Theory (gthy, _) => 
453 
let 

454 
val finish = loc_finish loc gthy; 

33725
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset

455 
val lthy' = loc_begin loc gthy 
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset

456 
> Local_Theory.new_group 
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset

457 
> f int 
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset

458 
> Local_Theory.reset_group; 
21294  459 
in Theory (finish lthy', SOME lthy') end 
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset

460 
 _ => raise UNDEF)); 
15668  461 

21007  462 
in 
463 

30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset

464 
fun local_theory' loc f = local_theory_presentation loc f (K ()); 
29380  465 
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

466 
fun present_local_theory loc = local_theory_presentation loc (K I); 
18955  467 

21007  468 
end; 
469 

470 

471 
(* proof transitions *) 

472 

27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset

473 
fun end_proof f = transaction (fn int => 
24795
6f5cb7885fd7
print_state_context: local theory context, not proof context;
wenzelm
parents:
24780
diff
changeset

474 
(fn Proof (prf, (finish, _)) => 
33390  475 
let val state = Proof_Node.current prf in 
21007  476 
if can (Proof.assert_bottom true) state then 
477 
let 

478 
val ctxt' = f int state; 

479 
val gthy' = finish ctxt'; 

480 
in Theory (gthy', SOME ctxt') end 

481 
else raise UNDEF 

482 
end 

27564
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset

483 
 SkipProof (0, (gthy, _)) => Theory (gthy, NONE) 
21007  484 
 _ => raise UNDEF)); 
485 

21294  486 
local 
487 

27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset

488 
fun begin_proof init finish = transaction (fn int => 
21294  489 
(fn Theory (gthy, _) => 
490 
let 

24453  491 
val prf = init int gthy; 
28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset

492 
val skip = ! skip_proofs; 
21294  493 
val schematic = Proof.schematic_goal prf; 
494 
in 

28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset

495 
if skip andalso schematic then 
21294  496 
warning "Cannot skip proof of schematic goal statement" 
497 
else (); 

28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset

498 
if skip andalso not schematic then 
27564
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset

499 
SkipProof (0, (finish gthy (Proof.global_skip_proof int prf), gthy)) 
33390  500 
else Proof (Proof_Node.init prf, (finish gthy, gthy)) 
21294  501 
end 
502 
 _ => raise UNDEF)); 

503 

504 
in 

505 

24780
47bb1e380d83
local_theory transactions: more careful treatment of context position;
wenzelm
parents:
24634
diff
changeset

506 
fun local_theory_to_proof' loc f = begin_proof 
33725
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset

507 
(fn int => fn gthy => f int (Local_Theory.new_group (loc_begin loc gthy))) 
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset

508 
(fn gthy => loc_finish loc gthy o Local_Theory.reset_group); 
24780
47bb1e380d83
local_theory transactions: more careful treatment of context position;
wenzelm
parents:
24634
diff
changeset

509 

24453  510 
fun local_theory_to_proof loc f = local_theory_to_proof' loc (K f); 
21294  511 

512 
fun theory_to_proof f = begin_proof 

33725
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset

513 
(K (fn Context.Theory thy => f (Theory.checkpoint (Sign.new_group thy))  _ => raise UNDEF)) 
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset

514 
(K (Context.Theory o Sign.reset_group o ProofContext.theory_of)); 
21294  515 

516 
end; 

517 

27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset

518 
val forget_proof = transaction (fn _ => 
21007  519 
(fn Proof (_, (_, orig_gthy)) => Theory (orig_gthy, NONE) 
520 
 SkipProof (_, (_, orig_gthy)) => Theory (orig_gthy, NONE) 

521 
 _ => raise UNDEF)); 

522 

30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset

523 
val present_proof = present_transaction (fn _ => 
33390  524 
(fn Proof (prf, x) => Proof (Proof_Node.apply I prf, x) 
27564
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset

525 
 skip as SkipProof _ => skip 
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset

526 
 _ => raise UNDEF)); 
21177  527 

27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset

528 
fun proofs' f = transaction (fn int => 
33390  529 
(fn Proof (prf, x) => Proof (Proof_Node.applys (f int) prf, x) 
27564
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset

530 
 skip as SkipProof _ => skip 
16815  531 
 _ => raise UNDEF)); 
15668  532 

17904
21c6894b5998
simplified interfaces proof/proof' etc.: perform ProofHistory.apply(s)/current internally;
wenzelm
parents:
17513
diff
changeset

533 
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

534 
val proofs = proofs' o K; 
6689  535 
val proof = proof' o K; 
16815  536 

27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset

537 
fun actual_proof f = transaction (fn _ => 
21007  538 
(fn Proof (prf, x) => Proof (f prf, x) 
20963
a7fd8f05a2be
added type global_theory  theory or local_theory;
wenzelm
parents:
20928
diff
changeset

539 
 _ => raise UNDEF)); 
16815  540 

27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset

541 
fun skip_proof f = transaction (fn _ => 
21007  542 
(fn SkipProof (h, x) => SkipProof (f h, x) 
18563  543 
 _ => raise UNDEF)); 
544 

27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset

545 
fun skip_proof_to_theory pred = transaction (fn _ => 
27564
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset

546 
(fn SkipProof (d, (gthy, _)) => if pred d then Theory (gthy, NONE) else raise UNDEF 
33725
a8481da77270
implicit name space grouping for theory/local_theory transactions;
wenzelm
parents:
33671
diff
changeset

547 
 _ => raise UNDEF)); 
5828  548 

549 

550 

551 
(** toplevel transactions **) 

552 

27427  553 
(* identification *) 
554 

555 
fun get_id (Transition {pos, ...}) = Position.get_id pos; 

556 
fun put_id id (tr as Transition {pos, ...}) = position (Position.put_id id pos) tr; 

557 

558 

25960  559 
(* thread position *) 
25799  560 

25960  561 
fun setmp_thread_position (Transition {pos, ...}) f x = 
25819
e6feb08b7f4b
replaced thread_properties by simplified version in position.ML;
wenzelm
parents:
25809
diff
changeset

562 
Position.setmp_thread_data pos f x; 
25799  563 

27606  564 
fun status tr m = 
565 
setmp_thread_position tr (fn () => Output.status (Markup.markup m "")) (); 

566 

37688  567 
fun async_state (tr as Transition {print, ...}) st = 
568 
if print then 

37711
f1ea60bb7754
async_state: report within proper transaction context;
wenzelm
parents:
37690
diff
changeset

569 
ignore 
37865
3a6ec95a9f68
clarified/exported Future.worker_subgroup, which is already the default for Future.fork;
wenzelm
parents:
37859
diff
changeset

570 
(Future.fork (fn () => 
38236
d8c7be27e01d
explicitly distinguish Output.status (essential feedback) vs. Output.report (useful markup);
wenzelm
parents:
37977
diff
changeset

571 
setmp_thread_position tr (fn () => Future.status (fn () => print_state false st)) ())) 
37688  572 
else (); 
37687
e07dacec79e7
Toplevel.run_command: asynchronous state output, as an attempt to address potentially slow pretty printing (e.g. in HOL/Bali);
wenzelm
parents:
37216
diff
changeset

573 

26602
5534b6a6b810
made purely valueoriented, moved global state to structure Isar (cf. isar.ML);
wenzelm
parents:
26491
diff
changeset

574 
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

575 
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

576 
Output.error_msg (ML_Compiler.exn_message (EXCURSION_FAIL exn_info))) (); 
26602
5534b6a6b810
made purely valueoriented, moved global state to structure Isar (cf. isar.ML);
wenzelm
parents:
26491
diff
changeset

577 

25799  578 

28095
7eaf0813bdc3
added add_hook interface for posttransition hooks;
wenzelm
parents:
27859
diff
changeset

579 
(* posttransition hooks *) 
7eaf0813bdc3
added add_hook interface for posttransition hooks;
wenzelm
parents:
27859
diff
changeset

580 

37905  581 
local 
582 
val hooks = Unsynchronized.ref ([]: (transition > state > state > unit) list); 

583 
in 

28095
7eaf0813bdc3
added add_hook interface for posttransition hooks;
wenzelm
parents:
27859
diff
changeset

584 

32738  585 
fun add_hook f = CRITICAL (fn () => Unsynchronized.change hooks (cons f)); 
33223  586 
fun get_hooks () = ! hooks; 
28095
7eaf0813bdc3
added add_hook interface for posttransition hooks;
wenzelm
parents:
27859
diff
changeset

587 

7eaf0813bdc3
added add_hook interface for posttransition hooks;
wenzelm
parents:
27859
diff
changeset

588 
end; 
7eaf0813bdc3
added add_hook interface for posttransition hooks;
wenzelm
parents:
27859
diff
changeset

589 

7eaf0813bdc3
added add_hook interface for posttransition hooks;
wenzelm
parents:
27859
diff
changeset

590 

5828  591 
(* apply transitions *) 
592 

6664  593 
local 
594 

32792  595 
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

596 
setmp_thread_position tr (fn state => 
25799  597 
let 
598 
fun do_timing f x = (warning (command_msg "" tr); timeap f x); 

599 
fun do_profiling f x = profile (! profiling) f x; 

600 

26256
3e7939e978c6
added exception CONTEXT, indicating context of another exception;
wenzelm
parents:
26081
diff
changeset

601 
val (result, status) = 
37905  602 
state > 
603 
(apply_trans int trans 

604 
> (! profiling > 0 andalso not no_timing) ? do_profiling 

605 
> (! profiling > 0 orelse ! timing andalso not no_timing) ? do_timing); 

26256
3e7939e978c6
added exception CONTEXT, indicating context of another exception;
wenzelm
parents:
26081
diff
changeset

606 

26621
78b3ad7af5d5
eliminated unused name_of, source, source_of, print', print3, three_buffersN;
wenzelm
parents:
26602
diff
changeset

607 
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

608 
in (result, Option.map (fn UNDEF => type_error tr state  exn => exn) status) end); 
6664  609 

610 
in 

5828  611 

26602
5534b6a6b810
made purely valueoriented, moved global state to structure Isar (cf. isar.ML);
wenzelm
parents:
26491
diff
changeset

612 
fun transition int tr st = 
28095
7eaf0813bdc3
added add_hook interface for posttransition hooks;
wenzelm
parents:
27859
diff
changeset

613 
let 
7eaf0813bdc3
added add_hook interface for posttransition hooks;
wenzelm
parents:
27859
diff
changeset

614 
val hooks = get_hooks (); 
28103
b79e61861f0f
simplified Toplevel.add_hook: cover successful transactions only;
wenzelm
parents:
28095
diff
changeset

615 
fun apply_hooks st' = hooks > List.app (fn f => (try (fn () => f tr st st') (); ())); 
28095
7eaf0813bdc3
added add_hook interface for posttransition hooks;
wenzelm
parents:
27859
diff
changeset

616 

7eaf0813bdc3
added add_hook interface for posttransition hooks;
wenzelm
parents:
27859
diff
changeset

617 
val ctxt = try context_of st; 
7eaf0813bdc3
added add_hook interface for posttransition hooks;
wenzelm
parents:
27859
diff
changeset

618 
val res = 
7eaf0813bdc3
added add_hook interface for posttransition hooks;
wenzelm
parents:
27859
diff
changeset

619 
(case app int tr st of 
7eaf0813bdc3
added add_hook interface for posttransition hooks;
wenzelm
parents:
27859
diff
changeset

620 
(_, SOME TERMINATE) => NONE 
28103
b79e61861f0f
simplified Toplevel.add_hook: cover successful transactions only;
wenzelm
parents:
28095
diff
changeset

621 
 (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

622 
 (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

623 
 (st', NONE) => SOME (st', NONE)); 
b79e61861f0f
simplified Toplevel.add_hook: cover successful transactions only;
wenzelm
parents:
28095
diff
changeset

624 
val _ = (case res of SOME (st', NONE) => apply_hooks st'  _ => ()); 
28095
7eaf0813bdc3
added add_hook interface for posttransition hooks;
wenzelm
parents:
27859
diff
changeset

625 
in res end; 
6664  626 

627 
end; 

5828  628 

629 

37687
e07dacec79e7
Toplevel.run_command: asynchronous state output, as an attempt to address potentially slow pretty printing (e.g. in HOL/Bali);
wenzelm
parents:
37216
diff
changeset

630 
(* managed execution *) 
e07dacec79e7
Toplevel.run_command: asynchronous state output, as an attempt to address potentially slow pretty printing (e.g. in HOL/Bali);
wenzelm
parents:
37216
diff
changeset

631 

37906  632 
fun run_command thy_name tr st = 
37687
e07dacec79e7
Toplevel.run_command: asynchronous state output, as an attempt to address potentially slow pretty printing (e.g. in HOL/Bali);
wenzelm
parents:
37216
diff
changeset

633 
(case 
e07dacec79e7
Toplevel.run_command: asynchronous state output, as an attempt to address potentially slow pretty printing (e.g. in HOL/Bali);
wenzelm
parents:
37216
diff
changeset

634 
(case init_of tr of 
37950
bc285d91041e
moved basic thy file name operations from Thy_Load to Thy_Header;
wenzelm
parents:
37949
diff
changeset

635 
SOME name => Exn.capture (fn () => Thy_Header.consistent_name thy_name name) () 
37687
e07dacec79e7
Toplevel.run_command: asynchronous state output, as an attempt to address potentially slow pretty printing (e.g. in HOL/Bali);
wenzelm
parents:
37216
diff
changeset

636 
 NONE => Exn.Result ()) of 
e07dacec79e7
Toplevel.run_command: asynchronous state output, as an attempt to address potentially slow pretty printing (e.g. in HOL/Bali);
wenzelm
parents:
37216
diff
changeset

637 
Exn.Result () => 
37859
575a14dd4167
avoid duplicate printing of 'theory' state (cf. 173974e07dea);
wenzelm
parents:
37858
diff
changeset

638 
let val int = is_some (init_of tr) in 
575a14dd4167
avoid duplicate printing of 'theory' state (cf. 173974e07dea);
wenzelm
parents:
37858
diff
changeset

639 
(case transition int tr st of 
575a14dd4167
avoid duplicate printing of 'theory' state (cf. 173974e07dea);
wenzelm
parents:
37858
diff
changeset

640 
SOME (st', NONE) => 
575a14dd4167
avoid duplicate printing of 'theory' state (cf. 173974e07dea);
wenzelm
parents:
37858
diff
changeset

641 
(status tr Markup.finished; if int then () else async_state tr st'; SOME st') 
575a14dd4167
avoid duplicate printing of 'theory' state (cf. 173974e07dea);
wenzelm
parents:
37858
diff
changeset

642 
 SOME (_, SOME (exn as Exn.Interrupt, _)) => reraise exn 
575a14dd4167
avoid duplicate printing of 'theory' state (cf. 173974e07dea);
wenzelm
parents:
37858
diff
changeset

643 
 SOME (_, SOME exn_info) => (error_msg tr exn_info; status tr Markup.failed; NONE) 
575a14dd4167
avoid duplicate printing of 'theory' state (cf. 173974e07dea);
wenzelm
parents:
37858
diff
changeset

644 
 NONE => (error_msg tr (TERMINATE, at_command tr); status tr Markup.failed; NONE)) 
575a14dd4167
avoid duplicate printing of 'theory' state (cf. 173974e07dea);
wenzelm
parents:
37858
diff
changeset

645 
end 
37687
e07dacec79e7
Toplevel.run_command: asynchronous state output, as an attempt to address potentially slow pretty printing (e.g. in HOL/Bali);
wenzelm
parents:
37216
diff
changeset

646 
 Exn.Exn exn => (error_msg tr (exn, at_command tr); status tr Markup.failed; NONE)); 
e07dacec79e7
Toplevel.run_command: asynchronous state output, as an attempt to address potentially slow pretty printing (e.g. in HOL/Bali);
wenzelm
parents:
37216
diff
changeset

647 

e07dacec79e7
Toplevel.run_command: asynchronous state output, as an attempt to address potentially slow pretty printing (e.g. in HOL/Bali);
wenzelm
parents:
37216
diff
changeset

648 

28425  649 
(* nested commands *) 
5828  650 

28425  651 
fun command tr st = 
27576
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

652 
(case transition (! interact) tr st of 
28425  653 
SOME (st', NONE) => st' 
654 
 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

655 
 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

656 

29483  657 
fun command_result tr st = 
658 
let val st' = command tr st 

659 
in (st', st') end; 

660 

28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset

661 

b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset

662 
(* excursion of units, consisting of commands with proof *) 
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset

663 

33519  664 
structure States = Proof_Data 
28974
d6b190efa01a
excursion: pass explicit proof states as result of future proof, replaced lowlevel Thm.join_futures by PureThy.force_proofs;
wenzelm
parents:
28645
diff
changeset

665 
( 
d6b190efa01a
excursion: pass explicit proof states as result of future proof, replaced lowlevel Thm.join_futures by PureThy.force_proofs;
wenzelm
parents:
28645
diff
changeset

666 
type T = state list future option; 
d6b190efa01a
excursion: pass explicit proof states as result of future proof, replaced lowlevel Thm.join_futures by PureThy.force_proofs;
wenzelm
parents:
28645
diff
changeset

667 
fun init _ = NONE; 
d6b190efa01a
excursion: pass explicit proof states as result of future proof, replaced lowlevel Thm.join_futures by PureThy.force_proofs;
wenzelm
parents:
28645
diff
changeset

668 
); 
d6b190efa01a
excursion: pass explicit proof states as result of future proof, replaced lowlevel Thm.join_futures by PureThy.force_proofs;
wenzelm
parents:
28645
diff
changeset

669 

d6b190efa01a
excursion: pass explicit proof states as result of future proof, replaced lowlevel Thm.join_futures by PureThy.force_proofs;
wenzelm
parents:
28645
diff
changeset

670 
fun proof_result immediate (tr, proof_trs) st = 
28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset

671 
let val st' = command tr st in 
36315
e859879079c8
added keyword category "schematic goal", which prevents any attempt to fork the proof;
wenzelm
parents:
35205
diff
changeset

672 
if immediate orelse 
e859879079c8
added keyword category "schematic goal", which prevents any attempt to fork the proof;
wenzelm
parents:
35205
diff
changeset

673 
null proof_trs orelse 
36950  674 
Keyword.is_schematic_goal (name_of tr) orelse 
675 
exists (Keyword.is_qed_global o name_of) proof_trs orelse 

36315
e859879079c8
added keyword category "schematic goal", which prevents any attempt to fork the proof;
wenzelm
parents:
35205
diff
changeset

676 
not (can proof_of st') orelse 
e859879079c8
added keyword category "schematic goal", which prevents any attempt to fork the proof;
wenzelm
parents:
35205
diff
changeset

677 
Proof.is_relevant (proof_of st') 
28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset

678 
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

679 
let val (states, st'') = fold_map command_result proof_trs st' 
28974
d6b190efa01a
excursion: pass explicit proof states as result of future proof, replaced lowlevel Thm.join_futures by PureThy.force_proofs;
wenzelm
parents:
28645
diff
changeset

680 
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

681 
else 
28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset

682 
let 
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset

683 
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

684 
val finish = Context.Theory o ProofContext.theory_of; 
28974
d6b190efa01a
excursion: pass explicit proof states as result of future proof, replaced lowlevel Thm.join_futures by PureThy.force_proofs;
wenzelm
parents:
28645
diff
changeset

685 

29386  686 
val future_proof = Proof.global_future_proof 
28974
d6b190efa01a
excursion: pass explicit proof states as result of future proof, replaced lowlevel Thm.join_futures by PureThy.force_proofs;
wenzelm
parents:
28645
diff
changeset

687 
(fn prf => 
32062
457f5bcd3d76
Proof.future_proof: declare all assumptions as well;
wenzelm
parents:
32058
diff
changeset

688 
Future.fork_pri ~1 (fn () => 
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset

689 
let val (states, result_state) = 
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset

690 
(case st' of State (SOME (Proof (_, (_, orig_gthy))), prev) 
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset

691 
=> State (SOME (Proof (Proof_Node.init prf, (finish, orig_gthy))), prev)) 
28974
d6b190efa01a
excursion: pass explicit proof states as result of future proof, replaced lowlevel Thm.join_futures by PureThy.force_proofs;
wenzelm
parents:
28645
diff
changeset

692 
> fold_map command_result body_trs 
d6b190efa01a
excursion: pass explicit proof states as result of future proof, replaced lowlevel Thm.join_futures by PureThy.force_proofs;
wenzelm
parents:
28645
diff
changeset

693 
> command (end_tr > set_print false); 
30398  694 
in (states, presentation_context_of result_state) end)) 
28974
d6b190efa01a
excursion: pass explicit proof states as result of future proof, replaced lowlevel Thm.join_futures by PureThy.force_proofs;
wenzelm
parents:
28645
diff
changeset

695 
#> (fn (states, ctxt) => States.put (SOME states) ctxt); 
d6b190efa01a
excursion: pass explicit proof states as result of future proof, replaced lowlevel Thm.join_futures by PureThy.force_proofs;
wenzelm
parents:
28645
diff
changeset

696 

d6b190efa01a
excursion: pass explicit proof states as result of future proof, replaced lowlevel Thm.join_futures by PureThy.force_proofs;
wenzelm
parents:
28645
diff
changeset

697 
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 lowlevel Thm.join_futures by PureThy.force_proofs;
wenzelm
parents:
28645
diff
changeset

698 

d6b190efa01a
excursion: pass explicit proof states as result of future proof, replaced lowlevel Thm.join_futures by PureThy.force_proofs;
wenzelm
parents:
28645
diff
changeset

699 
val states = 
30398  700 
(case States.get (presentation_context_of st'') of 
37852
a902f158b4fc
eliminated oldstyle sys_error/SYS_ERROR in favour of exception Fail  after careful checking that there is no overlap with existing handling of that;
wenzelm
parents:
37711
diff
changeset

701 
NONE => raise Fail ("No future states for " ^ name_of tr ^ Position.str_of (pos_of tr)) 
28974
d6b190efa01a
excursion: pass explicit proof states as result of future proof, replaced lowlevel Thm.join_futures by PureThy.force_proofs;
wenzelm
parents:
28645
diff
changeset

702 
 SOME states => states); 
d6b190efa01a
excursion: pass explicit proof states as result of future proof, replaced lowlevel Thm.join_futures by PureThy.force_proofs;
wenzelm
parents:
28645
diff
changeset

703 
val result = Lazy.lazy 
d6b190efa01a
excursion: pass explicit proof states as result of future proof, replaced lowlevel Thm.join_futures by PureThy.force_proofs;
wenzelm
parents:
28645
diff
changeset

704 
(fn () => (tr, st') :: (body_trs ~~ Future.join states) @ [(end_tr, st'')]); 
d6b190efa01a
excursion: pass explicit proof states as result of future proof, replaced lowlevel Thm.join_futures by PureThy.force_proofs;
wenzelm
parents:
28645
diff
changeset

705 

d6b190efa01a
excursion: pass explicit proof states as result of future proof, replaced lowlevel Thm.join_futures by PureThy.force_proofs;
wenzelm
parents:
28645
diff
changeset

706 
in (result, st'') end 
28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset

707 
end; 
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset

708 

29068  709 
fun excursion input = 
28425  710 
let 
28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset

711 
val end_pos = if null input then error "No input" else pos_of (fst (List.last input)); 
29448
34b9652b2f45
added Goal.future_enabled abstraction  now also checks that this is already
wenzelm
parents:
29435
diff
changeset

712 
val immediate = not (Goal.future_enabled ()); 
29427
7ba952481e29
excursion: commit_exit internally  checkpoints are fully persistent now;
wenzelm
parents:
29386
diff
changeset

713 
val (results, end_state) = fold_map (proof_result immediate) input toplevel; 
37953
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset

714 
val thy = end_theory end_pos end_state; 
ddc3b72f9a42
simplified handling of theory begin/end wrt. toplevel and theory loader;
wenzelm
parents:
37951
diff
changeset

715 
in (Lazy.lazy (fn () => maps Lazy.force results), thy) end; 
7062  716 

6664  717 
end; 