author  wenzelm 
Mon, 31 May 2010 21:06:57 +0200  
changeset 37216  3165bc303f66 
parent 37208  e8b1c3a0562c 
child 37687  e07dacec79e7 
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 
20963
a7fd8f05a2be
added type global_theory  theory or local_theory;
wenzelm
parents:
20928
diff
changeset

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

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

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

18589  23 
val proof_position_of: state > int 
21007  24 
val enter_proof_body: state > Proof.state 
16815  25 
val print_state_context: state > unit 
26 
val print_state: bool > state > unit 

32738  27 
val quiet: bool Unsynchronized.ref 
28 
val debug: bool Unsynchronized.ref 

29 
val interact: bool Unsynchronized.ref 

30 
val timing: bool Unsynchronized.ref 

31 
val profiling: int Unsynchronized.ref 

32 
val skip_proofs: bool Unsynchronized.ref 

5828  33 
exception TERMINATE 
27583  34 
exception TOPLEVEL_ERROR 
20128
8f0e07d7cf92
keep/transaction: unified execution model (with debugging etc.);
wenzelm
parents:
19996
diff
changeset

35 
val program: (unit > 'a) > 'a 
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 
27576
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

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

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

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

62 
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

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

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

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

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

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

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

33390  76 
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

77 
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

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

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

83 
val unknown_context: transition > transition 

28425  84 
val setmp_thread_position: transition > ('a > 'b) > 'a > 'b 
27606  85 
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

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

87 
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

88 
val transition: bool > transition > state > (state * (exn * string) option) option 
28425  89 
val commit_exit: Position.T > transition 
90 
val command: transition > state > state 

29516  91 
val run_command: string > transition > state > state option 
29427
7ba952481e29
excursion: commit_exit internally  checkpoints are fully persistent now;
wenzelm
parents:
29386
diff
changeset

92 
val excursion: (transition * transition list) list > (transition * state) list lazy 
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 

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

105 
type generic_theory = Context.generic; (*theory or local_theory*) 
a7fd8f05a2be
added type global_theory  theory or local_theory;
wenzelm
parents:
20928
diff
changeset

106 

35205  107 
val loc_init = Theory_Target.context_cmd; 
33671  108 
val loc_exit = Local_Theory.exit_global; 
21294  109 

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

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

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

119 

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

120 
(* datatype node *) 
21294  121 

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

123 
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

124 
(*theory with presentation context*)  
33390  125 
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

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

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

128 
(*proof depth, resulting theory, original theory*) 
5828  129 

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

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

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

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

29066  137 
val context_node = cases_node Context.proof_of Proof.context_of; 
138 

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

139 

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

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

141 

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

142 
type node_info = node * (theory > unit); (*node with exit operation*) 
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset

143 
datatype state = State of node_info option * node_info option; (*current, previous*) 
5828  144 

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

145 
val toplevel = State (NONE, NONE); 
5828  146 

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

147 
fun is_toplevel (State (NONE, _)) = true 
7732  148 
 is_toplevel _ = false; 
149 

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

150 
fun level (State (NONE, _)) = 0 
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

151 
 level (State (SOME (Theory _, _), _)) = 0 
33390  152 
 level (State (SOME (Proof (prf, _), _), _)) = Proof.level (Proof_Node.current prf) 
27576
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

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

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

155 
fun str_of_state (State (NONE, _)) = "at top level" 
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

156 
 str_of_state (State (SOME (Theory (Context.Theory _, _), _), _)) = "in theory mode" 
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

157 
 str_of_state (State (SOME (Theory (Context.Proof _, _), _), _)) = "in local theory mode" 
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

158 
 str_of_state (State (SOME (Proof _, _), _)) = "in proof mode" 
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

159 
 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

160 

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

161 

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

162 
(* current node *) 
5828  163 

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

164 
fun node_of (State (NONE, _)) = raise UNDEF 
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

165 
 node_of (State (SOME (node, _), _)) = node; 
5828  166 

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

169 

19063  170 
fun node_case f g state = cases_node f g (node_of state); 
5828  171 

30398  172 
fun presentation_context_of state = 
173 
(case try node_of state of 

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

175 
 SOME node => context_node node 

176 
 NONE => raise UNDEF); 

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

177 

30801  178 
fun previous_context_of (State (_, NONE)) = NONE 
179 
 previous_context_of (State (_, SOME (prev, _))) = SOME (context_node prev); 

180 

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

183 
val theory_of = node_case Context.theory_of Proof.theory_of; 
18589  184 
val proof_of = node_case (fn _ => raise UNDEF) I; 
17208  185 

18589  186 
fun proof_position_of state = 
187 
(case node_of state of 

33390  188 
Proof (prf, _) => Proof_Node.position prf 
18589  189 
 _ => raise UNDEF); 
6664  190 

21007  191 
val enter_proof_body = node_case (Proof.init o Context.proof_of) Proof.enter_forward; 
5828  192 

193 

16815  194 
(* print state *) 
195 

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

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

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

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

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

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

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

204 
> Pretty.chunks > Pretty.writeln; 
16815  205 

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

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

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

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

33390  211 
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

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

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 

32792  267 
fun apply_transaction f g (node, exit) = 
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; 
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset

272 
fun state_error e nd = (State (SOME (nd, exit), SOME (node, exit)), 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 = 
27576
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

296 
Init of string * (bool > theory) * (theory > unit)  (*theory name, init, exit*) 
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

297 
Exit  (*formal exit of theory  without committing*) 
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

298 
CommitExit  (*exit and commit final theory*) 
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

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

300 
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

301 

6689  302 
local 
5828  303 

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

305 
State (SOME (Theory (Context.Theory 
e2d5d7f51aa3
init_theory: Runtime.controlled_execution for proper exception trace etc.;
wenzelm
parents:
33725
diff
changeset

306 
(Theory.checkpoint (Runtime.controlled_execution f int)), NONE), exit), NONE) 
32792  307 
 apply_tr _ Exit (State (prev as SOME (Theory (Context.Theory _, _), _), _)) = 
27603  308 
State (NONE, prev) 
32792  309 
 apply_tr _ CommitExit (State (NONE, SOME (Theory (Context.Theory thy, _), exit))) = 
31476
c5d2899b6de9
moved Isar toplevel runtime support to runtime.ML, which is loaded early (before ml_compiler.ML);
wenzelm
parents:
31431
diff
changeset

310 
(Runtime.controlled_execution exit thy; toplevel) 
32792  311 
 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

312 
Runtime.controlled_execution (fn x => tap (f int) x) state 
32792  313 
 apply_tr int (Transaction (f, g)) (State (SOME state, _)) = 
314 
apply_transaction (fn x => f int x) g state 

315 
 apply_tr _ _ _ = raise UNDEF; 

5828  316 

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

319 
apply_union int trs state 

320 
handle Runtime.UNDEF => apply_tr int tr state 

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

6689  322 
 exn as FAILURE _ => raise exn 
323 
 exn => raise FAILURE (state, exn); 

324 

325 
in 

326 

32792  327 
fun apply_trans int trs state = (apply_union int trs state, NONE) 
15531  328 
handle FAILURE (alt_state, exn) => (alt_state, SOME exn)  exn => (state, SOME exn); 
6689  329 

330 
end; 

5828  331 

332 

333 
(* datatype transition *) 

334 

335 
datatype transition = Transition of 

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

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

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

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

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

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

341 
trans: trans list}; (*primitive transitions (union)*) 
5828  342 

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

343 
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

344 
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

345 
trans = trans}; 
5828  346 

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

347 
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

348 
make_transition (f (name, pos, int_only, print, no_timing, trans)); 
5828  349 

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

352 

353 
(* diagnostics *) 

354 

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

357 

27427  358 
fun name_of (Transition {name, ...}) = name; 
28105  359 
fun pos_of (Transition {pos, ...}) = pos; 
360 
fun str_of tr = quote (name_of tr) ^ Position.str_of (pos_of tr); 

5828  361 

27427  362 
fun command_msg msg tr = msg ^ "command " ^ str_of tr; 
5828  363 
fun at_command tr = command_msg "At " tr ^ "."; 
364 

365 
fun type_error tr state = 

18685  366 
ERROR (command_msg "Illegal application of " tr ^ " " ^ str_of_state state); 
5828  367 

368 

369 
(* modify transitions *) 

370 

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

371 
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

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

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

374 
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

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

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

377 
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

378 
(name, pos, int_only, print, no_timing, trans)); 
14923  379 

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

380 
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

381 
(name, pos, int_only, print, true, trans)); 
17363  382 

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

383 
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

384 
(name, pos, int_only, print, no_timing, tr :: trans)); 
16607  385 

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

386 
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

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

388 

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

389 
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

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

391 

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

392 
val print = set_print true; 
5828  393 

394 

21007  395 
(* basic transitions *) 
5828  396 

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

397 
fun init_theory name f exit = add_trans (Init (name, f, exit)); 
6689  398 
val exit = add_trans Exit; 
7612  399 
val keep' = add_trans o Keep; 
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset

400 

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

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

402 
fun transaction f = present_transaction f (K ()); 
5828  403 

7612  404 
fun keep f = add_trans (Keep (fn _ => f)); 
5828  405 
fun imperative f = keep (fn _ => f ()); 
406 

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

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

410 

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

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

15668  414 

21007  415 

416 
(* theory transitions *) 

15668  417 

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

418 
fun generic_theory f = transaction (fn _ => 
26491  419 
(fn Theory (gthy, _) => Theory (f gthy, NONE) 
420 
 _ => raise UNDEF)); 

421 

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

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

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

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

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

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

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

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

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

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

431 

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

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

433 

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

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

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

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

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

440 
 _ => raise UNDEF)); 
17076  441 

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

442 
val end_local_theory = transaction (fn _ => 
21294  443 
(fn Theory (Context.Proof lthy, _) => Theory (Context.Theory (loc_exit lthy), SOME lthy) 
21007  444 
 _ => raise UNDEF)); 
445 

446 
local 

447 

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

448 
fun local_theory_presentation loc f = present_transaction (fn int => 
21294  449 
(fn Theory (gthy, _) => 
450 
let 

451 
val finish = loc_finish loc gthy; 

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

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

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

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

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

457 
 _ => raise UNDEF)); 
15668  458 

21007  459 
in 
460 

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

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

463 
fun present_local_theory loc = local_theory_presentation loc (K I); 
18955  464 

21007  465 
end; 
466 

467 

468 
(* proof transitions *) 

469 

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

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

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

475 
val ctxt' = f int state; 

476 
val gthy' = finish ctxt'; 

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

478 
else raise UNDEF 

479 
end 

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

480 
 SkipProof (0, (gthy, _)) => Theory (gthy, NONE) 
21007  481 
 _ => raise UNDEF)); 
482 

21294  483 
local 
484 

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

485 
fun begin_proof init finish = transaction (fn int => 
21294  486 
(fn Theory (gthy, _) => 
487 
let 

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

489 
val skip = ! skip_proofs; 
21294  490 
val schematic = Proof.schematic_goal prf; 
491 
in 

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

492 
if skip andalso schematic then 
21294  493 
warning "Cannot skip proof of schematic goal statement" 
494 
else (); 

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

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

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

500 

501 
in 

502 

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

503 
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

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

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

506 

24453  507 
fun local_theory_to_proof loc f = local_theory_to_proof' loc (K f); 
21294  508 

509 
fun theory_to_proof f = begin_proof 

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

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

511 
(K (Context.Theory o Sign.reset_group o ProofContext.theory_of)); 
21294  512 

513 
end; 

514 

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

515 
val forget_proof = transaction (fn _ => 
21007  516 
(fn Proof (_, (_, orig_gthy)) => Theory (orig_gthy, NONE) 
517 
 SkipProof (_, (_, orig_gthy)) => Theory (orig_gthy, NONE) 

518 
 _ => raise UNDEF)); 

519 

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

520 
val present_proof = present_transaction (fn _ => 
33390  521 
(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

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

523 
 _ => raise UNDEF)); 
21177  524 

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

525 
fun proofs' f = transaction (fn int => 
33390  526 
(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

527 
 skip as SkipProof _ => skip 
16815  528 
 _ => raise UNDEF)); 
15668  529 

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

530 
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

531 
val proofs = proofs' o K; 
6689  532 
val proof = proof' o K; 
16815  533 

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

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

536 
 _ => raise UNDEF)); 
16815  537 

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

538 
fun skip_proof f = transaction (fn _ => 
21007  539 
(fn SkipProof (h, x) => SkipProof (f h, x) 
18563  540 
 _ => raise UNDEF)); 
541 

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

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

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

544 
 _ => raise UNDEF)); 
5828  545 

546 

547 

548 
(** toplevel transactions **) 

549 

27427  550 
(* identification *) 
551 

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

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

554 

555 

25960  556 
(* thread position *) 
25799  557 

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

559 
Position.setmp_thread_data pos f x; 
25799  560 

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

563 

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

564 
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

565 
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

566 
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

567 

25799  568 

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

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

570 

32738  571 
local val hooks = Unsynchronized.ref ([]: (transition > state > state > unit) list) in 
28095
7eaf0813bdc3
added add_hook interface for posttransition hooks;
wenzelm
parents:
27859
diff
changeset

572 

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

575 

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

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

577 

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

578 

5828  579 
(* apply transitions *) 
580 

6664  581 
local 
582 

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

584 
setmp_thread_position tr (fn state => 
25799  585 
let 
586 
fun do_timing f x = (warning (command_msg "" tr); timeap f x); 

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

588 

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

589 
val (result, status) = 
32792  590 
state > (apply_trans int trans 
25799  591 
> (if ! profiling > 0 andalso not no_timing then do_profiling else I) 
592 
> (if ! profiling > 0 orelse ! timing andalso not no_timing then do_timing else I)); 

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

593 

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

594 
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

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

597 
in 

5828  598 

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

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

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

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

602 
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

603 

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

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

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

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

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

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

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

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

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

612 
in res end; 
6664  613 

614 
end; 

5828  615 

616 

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

617 
(* commit final exit *) 
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset

618 

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

620 
name "end" empty 
28425  621 
> position pos 
27601
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset

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

623 
> imperative (fn () => warning "Expected to find finished theory"); 
6683cdb94af8
simplified commit_exit: operate on previous node of final state, include warning here;
wenzelm
parents:
27583
diff
changeset

624 

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

625 

28425  626 
(* nested commands *) 
5828  627 

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

629 
(case transition (! interact) tr st of 
28425  630 
SOME (st', NONE) => st' 
631 
 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

632 
 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

633 

29483  634 
fun command_result tr st = 
635 
let val st' = command tr st 

636 
in (st', st') end; 

637 

29516  638 
fun run_command thy_name tr st = 
639 
(case 

640 
(case init_of tr of 

37216
3165bc303f66
modernized some structure names, keeping a few legacy aliases;
wenzelm
parents:
37208
diff
changeset

641 
SOME name => Exn.capture (fn () => Thy_Load.check_name thy_name name) () 
29516  642 
 NONE => Exn.Result ()) of 
643 
Exn.Result () => 

644 
(case transition true tr st of 

645 
SOME (st', NONE) => (status tr Markup.finished; SOME st') 

37208
e8b1c3a0562c
Toplevel.run_command: reraise Interrupt, to terminate the Isar_Document.execution and not store a failed attempt;
wenzelm
parents:
36950
diff
changeset

646 
 SOME (_, SOME (exn as Exn.Interrupt, _)) => reraise exn 
29516  647 
 SOME (_, SOME exn_info) => (error_msg tr exn_info; status tr Markup.failed; NONE) 
648 
 NONE => (error_msg tr (TERMINATE, at_command tr); status tr Markup.failed; NONE)) 

649 
 Exn.Exn exn => (error_msg tr (exn, at_command tr); status tr Markup.failed; NONE)); 

29483  650 

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

651 

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

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

653 

33519  654 
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

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

656 
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

657 
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

658 
); 
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

659 

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

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

661 
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

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

663 
null proof_trs orelse 
36950  664 
Keyword.is_schematic_goal (name_of tr) orelse 
665 
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

666 
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

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

668 
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

669 
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

670 
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

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

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

673 
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

674 
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

675 

29386  676 
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

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

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

679 
let val (states, result_state) = 
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 
(case st' of State (SOME (Proof (_, (_, orig_gthy)), exit), prev) 
33390  681 
=> State (SOME (Proof (Proof_Node.init prf, (finish, orig_gthy)), exit), 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

682 
> 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

683 
> command (end_tr > set_print false); 
30398  684 
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

685 
#> (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

686 

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

688 

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

689 
val states = 
30398  690 
(case States.get (presentation_context_of st'') 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

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

692 
 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

693 
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

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

695 

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 
in (result, st'') end 
28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset

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

698 

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

701 
val end_pos = if null input then error "No input" else pos_of (fst (List.last input)); 
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset

702 

29448
34b9652b2f45
added Goal.future_enabled abstraction  now also checks that this is already
wenzelm
parents:
29435
diff
changeset

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

704 
val (results, end_state) = fold_map (proof_result immediate) input toplevel; 
28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset

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

706 
(case end_state of 
29427
7ba952481e29
excursion: commit_exit internally  checkpoints are fully persistent now;
wenzelm
parents:
29386
diff
changeset

707 
State (NONE, SOME (Theory (Context.Theory _, _), _)) => 
7ba952481e29
excursion: commit_exit internally  checkpoints are fully persistent now;
wenzelm
parents:
29386
diff
changeset

708 
command (commit_exit end_pos) end_state 
28433
b3dab95f098f
begin_proof: avoid race condition wrt. skip_proofs flag;
wenzelm
parents:
28425
diff
changeset

709 
 _ => error "Unfinished development at end of input"); 
29427
7ba952481e29
excursion: commit_exit internally  checkpoints are fully persistent now;
wenzelm
parents:
29386
diff
changeset

710 
in Lazy.lazy (fn () => maps Lazy.force results) end; 
7062  711 

6664  712 
end; 