author  wenzelm 
Tue, 29 Sep 2009 11:49:22 +0200  
changeset 32738  15bb09ca0378 
parent 32062  457f5bcd3d76 
child 32792  a08a2b962a09 
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 
16682  36 
type transition 
5828  37 
val empty: transition 
27441  38 
val init_of: transition > string option 
27427  39 
val name_of: transition > string 
28105  40 
val pos_of: transition > Position.T 
27500  41 
val str_of: transition > string 
5828  42 
val name: string > transition > transition 
43 
val position: Position.T > transition > transition 

44 
val interactive: bool > transition > transition 

45 
val print: transition > transition 

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

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

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

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

61 
val local_theory: xstring option > (local_theory > local_theory) > transition > transition 
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset

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

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

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

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

70 
val present_proof: (state > unit) > transition > transition 
21177  71 
val proofs': (bool > Proof.state > Proof.state Seq.seq) > transition > transition 
17904
21c6894b5998
simplified interfaces proof/proof' etc.: perform ProofHistory.apply(s)/current internally;
wenzelm
parents:
17513
diff
changeset

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

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

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

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

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

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

82 
val unknown_context: transition > transition 

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

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

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

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

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

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

6965  94 
structure Toplevel: TOPLEVEL = 
5828  95 
struct 
96 

97 
(** toplevel state **) 

98 

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

99 
exception UNDEF = Runtime.UNDEF; 
19063  100 

101 

21294  102 
(* local theory wrappers *) 
5828  103 

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

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

105 

25292  106 
val loc_init = TheoryTarget.context; 
28394  107 
val loc_exit = LocalTheory.exit_global; 
21294  108 

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

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

114 
 loc_finish NONE (Context.Proof _) = Context.Proof o LocalTheory.restore 

25292  115 
 loc_finish (SOME _) (Context.Proof lthy) = fn lthy' => 
116 
Context.Proof (LocalTheory.reinit (LocalTheory.raw_theory (K (loc_exit lthy')) lthy)); 

21294  117 

118 

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

119 
(* datatype node *) 
21294  120 

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

122 
Theory of generic_theory * Proof.context option 
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

123 
(*theory with presentation context*)  
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

124 
Proof of ProofNode.T * ((Proof.context > generic_theory) * generic_theory) 
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

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

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

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

22056  129 
val the_global_theory = fn Theory (Context.Theory thy, _) => thy  _ => raise UNDEF; 
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 
27564
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset

134 
 cases_node _ g (Proof (prf, _)) = g (ProofNode.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 
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

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

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 

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

188 
Proof (prf, _) => ProofNode.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 

25292  196 
val pretty_context = LocalTheory.pretty o Context.cases (TheoryTarget.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, _)) => 

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

211 
Proof.pretty_state (ProofNode.position prf) (ProofNode.current prf) 
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 

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

230 
fun program f = 
24055
f7483532537b
added TOPLEVEL_ERROR (simplified version from output.ML);
wenzelm
parents:
23975
diff
changeset

231 
(f 
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 
c5d2899b6de9
moved Isar toplevel runtime support to runtime.ML, which is loaded early (before ml_compiler.ML);
wenzelm
parents:
31431
diff
changeset

233 
> Runtime.toplevel_error ML_Compiler.exn_message) (); 
20128
8f0e07d7cf92
keep/transaction: unified execution model (with debugging etc.);
wenzelm
parents:
19996
diff
changeset

234 

5828  235 

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

236 
(* node transactions  maintaining stable checkpoints *) 
7022  237 

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

238 
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

239 

6689  240 
local 
241 

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

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

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

244 

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

245 
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

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

247 

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

248 
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

249 

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

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

251 
 stale_error some = some; 
16815  252 

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

253 
fun map_theory f (Theory (gthy, ctxt)) = 
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

254 
Theory (Context.mapping f (LocalTheory.raw_theory f) gthy, ctxt) 
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

255 
 map_theory _ node = node; 
6689  256 

257 
in 

258 

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

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

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

261 
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

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

263 
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

264 
fun state_error e nd = (State (SOME (nd, exit), SOME (node, exit)), e); 
6689  265 

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

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

267 
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

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

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

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

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

272 

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

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

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

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

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

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

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

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

280 
end; 
6689  281 

282 
end; 

283 

284 

285 
(* primitive transitions *) 

286 

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

288 
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

289 
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

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

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

292 
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

293 

6689  294 
local 
5828  295 

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

296 
fun apply_tr int _ (Init (_, f, exit)) (State (NONE, _)) = 
7afff36043e6
eliminated internal command history  superceeded by global Isar state (cf. isar.ML);
wenzelm
parents:
27564
diff
changeset

297 
State (SOME (Theory (Context.Theory (Theory.checkpoint (f int)), NONE), exit), NONE) 
27603  298 
 apply_tr _ _ Exit (State (prev as SOME (Theory (Context.Theory _, _), _), _)) = 
299 
State (NONE, prev) 

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

300 
 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

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

302 
 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

303 
Runtime.controlled_execution (fn x => tap (f int) x) state 
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset

304 
 apply_tr int pos (Transaction (f, g)) (State (SOME state, _)) = 
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset

305 
apply_transaction pos (fn x => f int x) g state 
23363
9981199bf865
transaction: context_position (nondestructive only);
wenzelm
parents:
22588
diff
changeset

306 
 apply_tr _ _ _ _ = raise UNDEF; 
5828  307 

23363
9981199bf865
transaction: context_position (nondestructive only);
wenzelm
parents:
22588
diff
changeset

308 
fun apply_union _ _ [] state = raise FAILURE (state, UNDEF) 
9981199bf865
transaction: context_position (nondestructive only);
wenzelm
parents:
22588
diff
changeset

309 
 apply_union int pos (tr :: trs) state = 
28451
0586b855c2b5
datatype transition: internal trans field is maintained in reverse order;
wenzelm
parents:
28446
diff
changeset

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

311 
handle Runtime.UNDEF => apply_tr int pos tr state 
28451
0586b855c2b5
datatype transition: internal trans field is maintained in reverse order;
wenzelm
parents:
28446
diff
changeset

312 
 FAILURE (alt_state, UNDEF) => apply_tr int pos tr alt_state 
6689  313 
 exn as FAILURE _ => raise exn 
314 
 exn => raise FAILURE (state, exn); 

315 

316 
in 

317 

23363
9981199bf865
transaction: context_position (nondestructive only);
wenzelm
parents:
22588
diff
changeset

318 
fun apply_trans int pos trs state = (apply_union int pos trs state, NONE) 
15531  319 
handle FAILURE (alt_state, exn) => (alt_state, SOME exn)  exn => (state, SOME exn); 
6689  320 

321 
end; 

5828  322 

323 

324 
(* datatype transition *) 

325 

326 
datatype transition = Transition of 

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

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

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

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

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

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

332 
trans: trans list}; (*primitive transitions (union)*) 
5828  333 

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

334 
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

335 
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

336 
trans = trans}; 
5828  337 

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

338 
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

339 
make_transition (f (name, pos, int_only, print, no_timing, trans)); 
5828  340 

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

343 

344 
(* diagnostics *) 

345 

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

348 

27427  349 
fun name_of (Transition {name, ...}) = name; 
28105  350 
fun pos_of (Transition {pos, ...}) = pos; 
351 
fun str_of tr = quote (name_of tr) ^ Position.str_of (pos_of tr); 

5828  352 

27427  353 
fun command_msg msg tr = msg ^ "command " ^ str_of tr; 
5828  354 
fun at_command tr = command_msg "At " tr ^ "."; 
355 

356 
fun type_error tr state = 

18685  357 
ERROR (command_msg "Illegal application of " tr ^ " " ^ str_of_state state); 
5828  358 

359 

360 
(* modify transitions *) 

361 

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

362 
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

363 
(name, pos, int_only, print, no_timing, trans)); 
9010  364 

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

365 
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

366 
(name, pos, int_only, print, no_timing, trans)); 
5828  367 

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

368 
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

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

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

371 
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

372 
(name, pos, int_only, print, true, trans)); 
17363  373 

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

374 
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

375 
(name, pos, int_only, print, no_timing, tr :: trans)); 
16607  376 

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

377 
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

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

379 

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

380 
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

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

382 

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

383 
val print = set_print true; 
5828  384 

385 

21007  386 
(* basic transitions *) 
5828  387 

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

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

391 

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

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

393 
fun transaction f = present_transaction f (K ()); 
5828  394 

7612  395 
fun keep f = add_trans (Keep (fn _ => f)); 
5828  396 
fun imperative f = keep (fn _ => f ()); 
397 

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

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

401 

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

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

15668  405 

21007  406 

407 
(* theory transitions *) 

15668  408 

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

409 
fun generic_theory f = transaction (fn _ => 
26491  410 
(fn Theory (gthy, _) => Theory (f gthy, NONE) 
411 
 _ => raise UNDEF)); 

412 

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

413 
fun theory' f = transaction (fn int => 
20963
a7fd8f05a2be
added type global_theory  theory or local_theory;
wenzelm
parents:
20928
diff
changeset

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

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

416 

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

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

418 

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

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

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

421 
let 
20985  422 
val lthy = f thy; 
21294  423 
val gthy = if begin then Context.Proof lthy else Context.Theory (loc_exit lthy); 
424 
in Theory (gthy, SOME lthy) end 

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

425 
 _ => raise UNDEF)); 
17076  426 

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

427 
val end_local_theory = transaction (fn _ => 
21294  428 
(fn Theory (Context.Proof lthy, _) => Theory (Context.Theory (loc_exit lthy), SOME lthy) 
21007  429 
 _ => raise UNDEF)); 
430 

431 
local 

432 

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

433 
fun local_theory_presentation loc f = present_transaction (fn int => 
21294  434 
(fn Theory (gthy, _) => 
435 
let 

436 
val finish = loc_finish loc gthy; 

29380  437 
val lthy' = f int (loc_begin loc gthy); 
21294  438 
in Theory (finish lthy', SOME lthy') end 
30366
e3d788b9dffb
simplified presentation: built into transaction, pass state directly;
wenzelm
parents:
29516
diff
changeset

439 
 _ => raise UNDEF)); 
15668  440 

21007  441 
in 
442 

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

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

445 
fun present_local_theory loc = local_theory_presentation loc (K I); 
18955  446 

21007  447 
end; 
448 

449 

450 
(* proof transitions *) 

451 

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

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

453 
(fn Proof (prf, (finish, _)) => 
27564
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset

454 
let val state = ProofNode.current prf in 
21007  455 
if can (Proof.assert_bottom true) state then 
456 
let 

457 
val ctxt' = f int state; 

458 
val gthy' = finish ctxt'; 

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

460 
else raise UNDEF 

461 
end 

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

462 
 SkipProof (0, (gthy, _)) => Theory (gthy, NONE) 
21007  463 
 _ => raise UNDEF)); 
464 

21294  465 
local 
466 

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

467 
fun begin_proof init finish = transaction (fn int => 
21294  468 
(fn Theory (gthy, _) => 
469 
let 

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

471 
val skip = ! skip_proofs; 
21294  472 
val schematic = Proof.schematic_goal prf; 
473 
in 

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

474 
if skip andalso schematic then 
21294  475 
warning "Cannot skip proof of schematic goal statement" 
476 
else (); 

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

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

478 
SkipProof (0, (finish gthy (Proof.global_skip_proof int prf), gthy)) 
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset

479 
else Proof (ProofNode.init prf, (finish gthy, gthy)) 
21294  480 
end 
481 
 _ => raise UNDEF)); 

482 

483 
in 

484 

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

485 
fun local_theory_to_proof' loc f = begin_proof 
25960  486 
(fn int => fn gthy => f int (loc_begin loc gthy)) 
24780
47bb1e380d83
local_theory transactions: more careful treatment of context position;
wenzelm
parents:
24634
diff
changeset

487 
(loc_finish loc); 
47bb1e380d83
local_theory transactions: more careful treatment of context position;
wenzelm
parents:
24634
diff
changeset

488 

24453  489 
fun local_theory_to_proof loc f = local_theory_to_proof' loc (K f); 
21294  490 

491 
fun theory_to_proof f = begin_proof 

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

492 
(K (fn Context.Theory thy => f thy  _ => raise UNDEF)) 
47bb1e380d83
local_theory transactions: more careful treatment of context position;
wenzelm
parents:
24634
diff
changeset

493 
(K (Context.Theory o ProofContext.theory_of)); 
21294  494 

495 
end; 

496 

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

497 
val forget_proof = transaction (fn _ => 
21007  498 
(fn Proof (_, (_, orig_gthy)) => Theory (orig_gthy, NONE) 
499 
 SkipProof (_, (_, orig_gthy)) => Theory (orig_gthy, NONE) 

500 
 _ => raise UNDEF)); 

501 

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

502 
val present_proof = present_transaction (fn _ => 
27564
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset

503 
(fn Proof (prf, x) => Proof (ProofNode.apply I prf, x) 
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset

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

505 
 _ => raise UNDEF)); 
21177  506 

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

507 
fun proofs' f = transaction (fn int => 
27564
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset

508 
(fn Proof (prf, x) => Proof (ProofNode.applys (f int) prf, x) 
fc6d34e49e17
replaced obsolete ProofHistory by ProofNode (backtracking only);
wenzelm
parents:
27500
diff
changeset

509 
 skip as SkipProof _ => skip 
16815  510 
 _ => raise UNDEF)); 
15668  511 

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

512 
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

513 
val proofs = proofs' o K; 
6689  514 
val proof = proof' o K; 
16815  515 

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

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

518 
 _ => raise UNDEF)); 
16815  519 

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

520 
fun skip_proof f = transaction (fn _ => 
21007  521 
(fn SkipProof (h, x) => SkipProof (f h, x) 
18563  522 
 _ => raise UNDEF)); 
523 

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

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

525 
(fn SkipProof (d, (gthy, _)) => if pred d then Theory (gthy, NONE) else raise UNDEF 
17904
21c6894b5998
simplified interfaces proof/proof' etc.: perform ProofHistory.apply(s)/current internally;
wenzelm
parents:
17513
diff
changeset

526 
 _ => raise UNDEF)); 
5828  527 

528 

529 

530 
(** toplevel transactions **) 

531 

27427  532 
(* identification *) 
533 

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

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

536 

537 

25960  538 
(* thread position *) 
25799  539 

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

541 
Position.setmp_thread_data pos f x; 
25799  542 

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

545 

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

546 
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

547 
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

548 
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

549 

25799  550 

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

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

552 

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

554 

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

556 
fun get_hooks () = CRITICAL (fn () => ! hooks); 
7eaf0813bdc3
added add_hook interface for posttransition hooks;
wenzelm
parents:
27859
diff
changeset

557 

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

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

559 

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

560 

5828  561 
(* apply transitions *) 
562 

6664  563 
local 
564 

30571  565 
fun app int (tr as Transition {trans, pos, print, no_timing, ...}) = 
25819
e6feb08b7f4b
replaced thread_properties by simplified version in position.ML;
wenzelm
parents:
25809
diff
changeset

566 
setmp_thread_position tr (fn state => 
25799  567 
let 
568 
fun do_timing f x = (warning (command_msg "" tr); timeap f x); 

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

570 

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

571 
val (result, status) = 
25799  572 
state > (apply_trans int pos trans 
573 
> (if ! profiling > 0 andalso not no_timing then do_profiling else I) 

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

575 

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

576 
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

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

579 
in 

5828  580 

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

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

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

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

584 
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

585 

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

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

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

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

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

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

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

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

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

594 
in res end; 
6664  595 

596 
end; 

5828  597 

598 

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

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

600 

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

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

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

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

606 

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

607 

28425  608 
(* nested commands *) 
5828  609 

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

611 
(case transition (! interact) tr st of 
28425  612 
SOME (st', NONE) => st' 
613 
 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

614 
 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

615 

29483  616 
fun command_result tr st = 
617 
let val st' = command tr st 

618 
in (st', st') end; 

619 

29516  620 
fun run_command thy_name tr st = 
621 
(case 

622 
(case init_of tr of 

623 
SOME name => Exn.capture (fn () => ThyLoad.check_name thy_name name) () 

624 
 NONE => Exn.Result ()) of 

625 
Exn.Result () => 

626 
(case transition true tr st of 

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

628 
 SOME (_, SOME exn_info) => (error_msg tr exn_info; status tr Markup.failed; NONE) 

629 
 NONE => (error_msg tr (TERMINATE, at_command tr); status tr Markup.failed; NONE)) 

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

29483  631 

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

632 

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

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

634 

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

635 
structure States = ProofDataFun 
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

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

637 
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

638 
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

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

640 

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

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

642 
let val st' = command tr st in 
28453
06702e7acd1d
excursion/unit_result: no print for forked end, finish into global theory, pick resul from presentation context;
wenzelm
parents:
28451
diff
changeset

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

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

645 
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

646 
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

647 
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

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

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

650 
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

651 
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

652 

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

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

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

656 
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

657 
(case st' of State (SOME (Proof (_, (_, orig_gthy)), exit), prev) 
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 
=> State (SOME (Proof (ProofNode.init prf, (finish, orig_gthy)), exit), prev)) 
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 
> 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

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

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

663 

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

664 
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

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 
val states = 
30398  667 
(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

668 
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

669 
 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

670 
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

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

672 

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

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

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

675 

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

678 
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

679 

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

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

681 
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

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

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

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

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

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

687 
in Lazy.lazy (fn () => maps Lazy.force results) end; 
7062  688 

6664  689 
end; 