author | wenzelm |
Thu, 05 Dec 2013 20:22:53 +0100 | |
changeset 54678 | 87910da843d5 |
parent 54671 | d64a4ef26edb |
child 55429 | 4a50f9e70dc1 |
permissions | -rw-r--r-- |
47336 | 1 |
(* Title: Pure/PIDE/command.ML |
2 |
Author: Makarius |
|
3 |
||
52534 | 4 |
Prover command execution: read -- eval -- print. |
47336 | 5 |
*) |
6 |
||
7 |
signature COMMAND = |
|
8 |
sig |
|
54526 | 9 |
type blob = (string * string option) Exn.result |
10 |
val read_file: Path.T -> Position.T -> Path.T -> Token.file |
|
11 |
val read: (unit -> theory) -> Path.T -> blob list -> Token.T list -> Toplevel.transition |
|
52600 | 12 |
type eval |
52607
33a133d50616
clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents:
52606
diff
changeset
|
13 |
val eval_eq: eval * eval -> bool |
52784
4ba2e8b9972f
de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents:
52775
diff
changeset
|
14 |
val eval_running: eval -> bool |
52772 | 15 |
val eval_finished: eval -> bool |
52536 | 16 |
val eval_result_state: eval -> Toplevel.state |
54526 | 17 |
val eval: (unit -> theory) -> Path.T -> blob list -> Token.T list -> eval -> eval |
52600 | 18 |
type print |
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
19 |
val print: bool -> (string * string list) list -> string -> |
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
20 |
eval -> print list -> print list option |
52526 | 21 |
type print_fn = Toplevel.transition -> Toplevel.state -> unit |
52953
2c927b7501c5
explicit "strict" flag for print functions (flipped internal meaning);
wenzelm
parents:
52853
diff
changeset
|
22 |
type print_function = |
2c927b7501c5
explicit "strict" flag for print functions (flipped internal meaning);
wenzelm
parents:
52853
diff
changeset
|
23 |
{command_name: string, args: string list} -> |
2c927b7501c5
explicit "strict" flag for print functions (flipped internal meaning);
wenzelm
parents:
52853
diff
changeset
|
24 |
{delay: Time.time option, pri: int, persistent: bool, strict: bool, print_fn: print_fn} option |
2c927b7501c5
explicit "strict" flag for print functions (flipped internal meaning);
wenzelm
parents:
52853
diff
changeset
|
25 |
val print_function: string -> print_function -> unit |
52571 | 26 |
val no_print_function: string -> unit |
52600 | 27 |
type exec = eval * print list |
28 |
val no_exec: exec |
|
29 |
val exec_ids: exec option -> Document_ID.exec list |
|
52606 | 30 |
val exec: Document_ID.execution -> exec -> unit |
47336 | 31 |
end; |
32 |
||
33 |
structure Command: COMMAND = |
|
34 |
struct |
|
35 |
||
52775
e0169f13bd37
keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents:
52774
diff
changeset
|
36 |
(** memo results **) |
47341
00f6279bb67a
Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents:
47336
diff
changeset
|
37 |
|
00f6279bb67a
Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents:
47336
diff
changeset
|
38 |
datatype 'a expr = |
52596
40298d383463
global management of command execution fragments;
wenzelm
parents:
52586
diff
changeset
|
39 |
Expr of Document_ID.exec * (unit -> 'a) | |
47341
00f6279bb67a
Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents:
47336
diff
changeset
|
40 |
Result of 'a Exn.result; |
00f6279bb67a
Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents:
47336
diff
changeset
|
41 |
|
00f6279bb67a
Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents:
47336
diff
changeset
|
42 |
abstype 'a memo = Memo of 'a expr Synchronized.var |
00f6279bb67a
Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents:
47336
diff
changeset
|
43 |
with |
00f6279bb67a
Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents:
47336
diff
changeset
|
44 |
|
52596
40298d383463
global management of command execution fragments;
wenzelm
parents:
52586
diff
changeset
|
45 |
fun memo exec_id e = Memo (Synchronized.var "Command.memo" (Expr (exec_id, e))); |
47341
00f6279bb67a
Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents:
47336
diff
changeset
|
46 |
fun memo_value a = Memo (Synchronized.var "Command.memo" (Result (Exn.Res a))); |
00f6279bb67a
Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents:
47336
diff
changeset
|
47 |
|
47342
7828c7b3c143
more explicit memo_eval vs. memo_result, to enforce bottom-up execution;
wenzelm
parents:
47341
diff
changeset
|
48 |
fun memo_result (Memo v) = |
7828c7b3c143
more explicit memo_eval vs. memo_result, to enforce bottom-up execution;
wenzelm
parents:
47341
diff
changeset
|
49 |
(case Synchronized.value v of |
52607
33a133d50616
clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents:
52606
diff
changeset
|
50 |
Expr (exec_id, _) => error ("Unfinished execution result: " ^ Document_ID.print exec_id) |
33a133d50616
clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents:
52606
diff
changeset
|
51 |
| Result res => Exn.release res); |
47341
00f6279bb67a
Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents:
47336
diff
changeset
|
52 |
|
52656
9437f440ef3f
keep persistent prints only if actually finished;
wenzelm
parents:
52651
diff
changeset
|
53 |
fun memo_finished (Memo v) = |
52785 | 54 |
(case Synchronized.value v of Expr _ => false | Result _ => true); |
52656
9437f440ef3f
keep persistent prints only if actually finished;
wenzelm
parents:
52651
diff
changeset
|
55 |
|
52607
33a133d50616
clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents:
52606
diff
changeset
|
56 |
fun memo_exec execution_id (Memo v) = |
52774
627fb639a2d9
maintain explicit execution frontier: avoid conflict with former task via static dependency;
wenzelm
parents:
52772
diff
changeset
|
57 |
Synchronized.timed_access v (K (SOME Time.zeroTime)) |
52609
c8f8c29193de
clarified memo_exec: plain synchronized access without any special tricks;
wenzelm
parents:
52607
diff
changeset
|
58 |
(fn expr => |
c8f8c29193de
clarified memo_exec: plain synchronized access without any special tricks;
wenzelm
parents:
52607
diff
changeset
|
59 |
(case expr of |
52775
e0169f13bd37
keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents:
52774
diff
changeset
|
60 |
Expr (exec_id, body) => |
52609
c8f8c29193de
clarified memo_exec: plain synchronized access without any special tricks;
wenzelm
parents:
52607
diff
changeset
|
61 |
uninterruptible (fn restore_attributes => fn () => |
54637
db3d3d99c69d
register actual group of nested worker context -- relevant for insulated cancellation of exec_ids (see also 78693e46a237, e0169f13bd37);
wenzelm
parents:
53976
diff
changeset
|
62 |
let val group = Future.worker_subgroup () in |
db3d3d99c69d
register actual group of nested worker context -- relevant for insulated cancellation of exec_ids (see also 78693e46a237, e0169f13bd37);
wenzelm
parents:
53976
diff
changeset
|
63 |
if Execution.running execution_id exec_id [group] then |
db3d3d99c69d
register actual group of nested worker context -- relevant for insulated cancellation of exec_ids (see also 78693e46a237, e0169f13bd37);
wenzelm
parents:
53976
diff
changeset
|
64 |
let |
db3d3d99c69d
register actual group of nested worker context -- relevant for insulated cancellation of exec_ids (see also 78693e46a237, e0169f13bd37);
wenzelm
parents:
53976
diff
changeset
|
65 |
val res = |
db3d3d99c69d
register actual group of nested worker context -- relevant for insulated cancellation of exec_ids (see also 78693e46a237, e0169f13bd37);
wenzelm
parents:
53976
diff
changeset
|
66 |
(body |
db3d3d99c69d
register actual group of nested worker context -- relevant for insulated cancellation of exec_ids (see also 78693e46a237, e0169f13bd37);
wenzelm
parents:
53976
diff
changeset
|
67 |
|> restore_attributes |
54649
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
wenzelm
parents:
54647
diff
changeset
|
68 |
|> Future.task_context "Command.memo_exec" group |
54637
db3d3d99c69d
register actual group of nested worker context -- relevant for insulated cancellation of exec_ids (see also 78693e46a237, e0169f13bd37);
wenzelm
parents:
53976
diff
changeset
|
69 |
|> Exn.interruptible_capture) (); |
db3d3d99c69d
register actual group of nested worker context -- relevant for insulated cancellation of exec_ids (see also 78693e46a237, e0169f13bd37);
wenzelm
parents:
53976
diff
changeset
|
70 |
in SOME ((), Result res) end |
db3d3d99c69d
register actual group of nested worker context -- relevant for insulated cancellation of exec_ids (see also 78693e46a237, e0169f13bd37);
wenzelm
parents:
53976
diff
changeset
|
71 |
else SOME ((), expr) |
db3d3d99c69d
register actual group of nested worker context -- relevant for insulated cancellation of exec_ids (see also 78693e46a237, e0169f13bd37);
wenzelm
parents:
53976
diff
changeset
|
72 |
end) () |
52775
e0169f13bd37
keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents:
52774
diff
changeset
|
73 |
| Result _ => SOME ((), expr))) |
e0169f13bd37
keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents:
52774
diff
changeset
|
74 |
|> (fn NONE => error "Conflicting command execution" | _ => ()); |
52596
40298d383463
global management of command execution fragments;
wenzelm
parents:
52586
diff
changeset
|
75 |
|
52607
33a133d50616
clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents:
52606
diff
changeset
|
76 |
fun memo_fork params execution_id (Memo v) = |
52596
40298d383463
global management of command execution fragments;
wenzelm
parents:
52586
diff
changeset
|
77 |
(case Synchronized.value v of |
40298d383463
global management of command execution fragments;
wenzelm
parents:
52586
diff
changeset
|
78 |
Result _ => () |
52607
33a133d50616
clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents:
52606
diff
changeset
|
79 |
| _ => ignore ((singleton o Future.forks) params (fn () => memo_exec execution_id (Memo v)))); |
52526 | 80 |
|
47341
00f6279bb67a
Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents:
47336
diff
changeset
|
81 |
end; |
00f6279bb67a
Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents:
47336
diff
changeset
|
82 |
|
00f6279bb67a
Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents:
47336
diff
changeset
|
83 |
|
52607
33a133d50616
clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents:
52606
diff
changeset
|
84 |
|
52536 | 85 |
(** main phases of execution **) |
86 |
||
52510 | 87 |
(* read *) |
52509 | 88 |
|
54526 | 89 |
type blob = (string * string option) Exn.result; (*file node name, digest or text*) |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
53976
diff
changeset
|
90 |
|
54526 | 91 |
fun read_file master_dir pos src_path = |
92 |
let |
|
93 |
val full_path = File.check_file (File.full_path master_dir src_path); |
|
94 |
val _ = Position.report pos (Markup.path (Path.implode full_path)); |
|
95 |
in {src_path = src_path, text = File.read full_path, pos = Path.position full_path} end; |
|
96 |
||
97 |
fun resolve_files master_dir blobs toks = |
|
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
53976
diff
changeset
|
98 |
(case Thy_Syntax.parse_spans toks of |
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
53976
diff
changeset
|
99 |
[span] => span |
54523 | 100 |
|> Thy_Syntax.resolve_files (fn cmd => fn (path, pos) => |
101 |
let |
|
54526 | 102 |
fun make_file src_path (Exn.Res (_, NONE)) = |
103 |
Exn.interruptible_capture (fn () => read_file master_dir pos src_path) () |
|
104 |
| make_file src_path (Exn.Res (file, SOME text)) = |
|
105 |
let val _ = Position.report pos (Markup.path file) |
|
54523 | 106 |
in Exn.Res {src_path = src_path, text = text, pos = Position.file file} end |
107 |
| make_file _ (Exn.Exn e) = Exn.Exn e; |
|
108 |
||
109 |
val src_paths = Keyword.command_files cmd path; |
|
110 |
in |
|
54527
bfeb0ea6c2c0
proper static resolution of files via Thy_Load.load_thy, instead of TTY fall-back;
wenzelm
parents:
54526
diff
changeset
|
111 |
if null blobs then |
bfeb0ea6c2c0
proper static resolution of files via Thy_Load.load_thy, instead of TTY fall-back;
wenzelm
parents:
54526
diff
changeset
|
112 |
map2 make_file src_paths (map (K (Exn.Res ("", NONE))) src_paths) |
bfeb0ea6c2c0
proper static resolution of files via Thy_Load.load_thy, instead of TTY fall-back;
wenzelm
parents:
54526
diff
changeset
|
113 |
else if length src_paths = length blobs then |
bfeb0ea6c2c0
proper static resolution of files via Thy_Load.load_thy, instead of TTY fall-back;
wenzelm
parents:
54526
diff
changeset
|
114 |
map2 make_file src_paths blobs |
bfeb0ea6c2c0
proper static resolution of files via Thy_Load.load_thy, instead of TTY fall-back;
wenzelm
parents:
54526
diff
changeset
|
115 |
else error ("Misalignment of inlined files" ^ Position.here pos) |
54523 | 116 |
end) |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
53976
diff
changeset
|
117 |
|> Thy_Syntax.span_content |
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
53976
diff
changeset
|
118 |
| _ => toks); |
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
53976
diff
changeset
|
119 |
|
54526 | 120 |
fun read init master_dir blobs span = |
52510 | 121 |
let |
122 |
val outer_syntax = #2 (Outer_Syntax.get_syntax ()); |
|
123 |
val command_reports = Outer_Syntax.command_reports outer_syntax; |
|
52509 | 124 |
|
52534 | 125 |
val proper_range = |
126 |
Position.set_range (Token.position_range_of (#1 (take_suffix Token.is_improper span))); |
|
52510 | 127 |
val pos = |
128 |
(case find_first Token.is_command span of |
|
129 |
SOME tok => Token.position_of tok |
|
130 |
| NONE => proper_range); |
|
52509 | 131 |
|
52510 | 132 |
val (is_malformed, token_reports) = Thy_Syntax.reports_of_tokens span; |
133 |
val _ = Position.reports_text (token_reports @ maps command_reports span); |
|
134 |
in |
|
135 |
if is_malformed then Toplevel.malformed pos "Malformed command syntax" |
|
136 |
else |
|
54526 | 137 |
(case Outer_Syntax.read_spans outer_syntax (resolve_files master_dir blobs span) of |
52510 | 138 |
[tr] => |
139 |
if Keyword.is_control (Toplevel.name_of tr) then |
|
140 |
Toplevel.malformed pos "Illegal control command" |
|
52534 | 141 |
else Toplevel.modify_init init tr |
142 |
| [] => Toplevel.ignored (Position.set_range (Token.position_range_of span)) |
|
52510 | 143 |
| _ => Toplevel.malformed proper_range "Exactly one command expected") |
144 |
handle ERROR msg => Toplevel.malformed proper_range msg |
|
145 |
end; |
|
52509 | 146 |
|
147 |
||
148 |
(* eval *) |
|
47336 | 149 |
|
52600 | 150 |
type eval_state = |
151 |
{failed: bool, malformed: bool, command: Toplevel.transition, state: Toplevel.state}; |
|
152 |
val init_eval_state = |
|
153 |
{failed = false, malformed = false, command = Toplevel.empty, state = Toplevel.toplevel}; |
|
154 |
||
155 |
datatype eval = Eval of {exec_id: Document_ID.exec, eval_process: eval_state memo}; |
|
156 |
||
52607
33a133d50616
clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents:
52606
diff
changeset
|
157 |
fun eval_eq (Eval {exec_id, ...}, Eval {exec_id = exec_id', ...}) = exec_id = exec_id'; |
33a133d50616
clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents:
52606
diff
changeset
|
158 |
|
52784
4ba2e8b9972f
de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents:
52775
diff
changeset
|
159 |
fun eval_running (Eval {exec_id, ...}) = Execution.is_running_exec exec_id; |
52772 | 160 |
fun eval_finished (Eval {eval_process, ...}) = memo_finished eval_process; |
161 |
||
52600 | 162 |
fun eval_result (Eval {eval_process, ...}) = memo_result eval_process; |
163 |
val eval_result_state = #state o eval_result; |
|
164 |
||
47336 | 165 |
local |
166 |
||
167 |
fun run int tr st = |
|
53189
ee8b8dafef0e
discontinued parallel_subproofs_saturation and related internal counters (superseded by parallel_subproofs_threshold and timing information);
wenzelm
parents:
52999
diff
changeset
|
168 |
if Goal.future_enabled 1 andalso Keyword.is_diag (Toplevel.name_of tr) then |
53192 | 169 |
(Execution.fork {name = "Toplevel.diag", pos = Toplevel.pos_of tr, pri = ~1} |
51605
eca8acb42e4a
more explicit Goal.fork_params -- avoid implicit arguments via thread data;
wenzelm
parents:
51603
diff
changeset
|
170 |
(fn () => Toplevel.command_exception int tr st); ([], SOME st)) |
51284
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51266
diff
changeset
|
171 |
else Toplevel.command_errors int tr st; |
47336 | 172 |
|
52510 | 173 |
fun check_cmts span tr st' = |
174 |
Toplevel.setmp_thread_position tr |
|
175 |
(fn () => |
|
176 |
Outer_Syntax.side_comments span |> maps (fn cmt => |
|
177 |
(Thy_Output.check_text (Token.source_position_of cmt) st'; []) |
|
52619
70d5f2f7d27f
reraise interrupts outside command regular transactions -- relevant for memo_stable;
wenzelm
parents:
52609
diff
changeset
|
178 |
handle exn => |
70d5f2f7d27f
reraise interrupts outside command regular transactions -- relevant for memo_stable;
wenzelm
parents:
52609
diff
changeset
|
179 |
if Exn.is_interrupt exn then reraise exn |
70d5f2f7d27f
reraise interrupts outside command regular transactions -- relevant for memo_stable;
wenzelm
parents:
52609
diff
changeset
|
180 |
else ML_Compiler.exn_messages_ids exn)) (); |
52510 | 181 |
|
54678
87910da843d5
more uniform status -- accommodate spurious Exn.Interrupt from user code, allow ML_Compiler.exn_messages_id to crash;
wenzelm
parents:
54671
diff
changeset
|
182 |
fun report tr m = |
87910da843d5
more uniform status -- accommodate spurious Exn.Interrupt from user code, allow ML_Compiler.exn_messages_id to crash;
wenzelm
parents:
54671
diff
changeset
|
183 |
Toplevel.setmp_thread_position tr (fn () => Output.report (Markup.markup_only m)) (); |
87910da843d5
more uniform status -- accommodate spurious Exn.Interrupt from user code, allow ML_Compiler.exn_messages_id to crash;
wenzelm
parents:
54671
diff
changeset
|
184 |
|
87910da843d5
more uniform status -- accommodate spurious Exn.Interrupt from user code, allow ML_Compiler.exn_messages_id to crash;
wenzelm
parents:
54671
diff
changeset
|
185 |
fun status tr m = |
87910da843d5
more uniform status -- accommodate spurious Exn.Interrupt from user code, allow ML_Compiler.exn_messages_id to crash;
wenzelm
parents:
54671
diff
changeset
|
186 |
Toplevel.setmp_thread_position tr (fn () => Output.status (Markup.markup_only m)) (); |
87910da843d5
more uniform status -- accommodate spurious Exn.Interrupt from user code, allow ML_Compiler.exn_messages_id to crash;
wenzelm
parents:
54671
diff
changeset
|
187 |
|
47336 | 188 |
fun proof_status tr st = |
189 |
(case try Toplevel.proof_of st of |
|
54678
87910da843d5
more uniform status -- accommodate spurious Exn.Interrupt from user code, allow ML_Compiler.exn_messages_id to crash;
wenzelm
parents:
54671
diff
changeset
|
190 |
SOME prf => status tr (Proof.status_markup prf) |
47336 | 191 |
| NONE => ()); |
192 |
||
52534 | 193 |
fun eval_state span tr ({malformed, state = st, ...}: eval_state) = |
52509 | 194 |
if malformed then |
52526 | 195 |
{failed = true, malformed = malformed, command = tr, state = Toplevel.toplevel} |
48772 | 196 |
else |
197 |
let |
|
198 |
val malformed' = Toplevel.is_malformed tr; |
|
199 |
val is_init = Toplevel.is_init tr; |
|
200 |
val is_proof = Keyword.is_proof (Toplevel.name_of tr); |
|
47336 | 201 |
|
48772 | 202 |
val _ = Multithreading.interrupted (); |
54678
87910da843d5
more uniform status -- accommodate spurious Exn.Interrupt from user code, allow ML_Compiler.exn_messages_id to crash;
wenzelm
parents:
54671
diff
changeset
|
203 |
val _ = status tr Markup.running; |
48918
6e5fd4585512
check side-comments of command spans (normally filtered out in Outer_Syntax.toplevel_source);
wenzelm
parents:
48772
diff
changeset
|
204 |
val (errs1, result) = run (is_init orelse is_proof) (Toplevel.set_print false tr) st; |
52509 | 205 |
val errs2 = (case result of NONE => [] | SOME st' => check_cmts span tr st'); |
48918
6e5fd4585512
check side-comments of command spans (normally filtered out in Outer_Syntax.toplevel_source);
wenzelm
parents:
48772
diff
changeset
|
206 |
val errs = errs1 @ errs2; |
50914
fe4714886d92
identify future results more carefully, to avoid odd duplication of error messages, notably from forked goals;
wenzelm
parents:
50911
diff
changeset
|
207 |
val _ = List.app (Future.error_msg (Toplevel.pos_of tr)) errs; |
48772 | 208 |
in |
209 |
(case result of |
|
210 |
NONE => |
|
211 |
let |
|
54678
87910da843d5
more uniform status -- accommodate spurious Exn.Interrupt from user code, allow ML_Compiler.exn_messages_id to crash;
wenzelm
parents:
54671
diff
changeset
|
212 |
val _ = status tr Markup.failed; |
87910da843d5
more uniform status -- accommodate spurious Exn.Interrupt from user code, allow ML_Compiler.exn_messages_id to crash;
wenzelm
parents:
54671
diff
changeset
|
213 |
val _ = status tr Markup.finished; |
87910da843d5
more uniform status -- accommodate spurious Exn.Interrupt from user code, allow ML_Compiler.exn_messages_id to crash;
wenzelm
parents:
54671
diff
changeset
|
214 |
val _ = if null errs then (report tr Markup.bad; Exn.interrupt ()) else (); |
52526 | 215 |
in {failed = true, malformed = malformed', command = tr, state = st} end |
48772 | 216 |
| SOME st' => |
217 |
let |
|
218 |
val _ = proof_status tr st'; |
|
54678
87910da843d5
more uniform status -- accommodate spurious Exn.Interrupt from user code, allow ML_Compiler.exn_messages_id to crash;
wenzelm
parents:
54671
diff
changeset
|
219 |
val _ = status tr Markup.finished; |
52526 | 220 |
in {failed = false, malformed = malformed', command = tr, state = st'} end) |
48772 | 221 |
end; |
47336 | 222 |
|
52534 | 223 |
in |
224 |
||
54526 | 225 |
fun eval init master_dir blobs span eval0 = |
52534 | 226 |
let |
227 |
val exec_id = Document_ID.make (); |
|
228 |
fun process () = |
|
229 |
let |
|
230 |
val tr = |
|
231 |
Position.setmp_thread_data (Position.id_only (Document_ID.print exec_id)) |
|
54526 | 232 |
(fn () => read init master_dir blobs span |> Toplevel.exec_id exec_id) (); |
52534 | 233 |
in eval_state span tr (eval_result eval0) end; |
52600 | 234 |
in Eval {exec_id = exec_id, eval_process = memo exec_id process} end; |
52534 | 235 |
|
47336 | 236 |
end; |
237 |
||
52509 | 238 |
|
239 |
(* print *) |
|
240 |
||
52600 | 241 |
datatype print = Print of |
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
242 |
{name: string, args: string list, delay: Time.time option, pri: int, persistent: bool, |
52600 | 243 |
exec_id: Document_ID.exec, print_process: unit memo}; |
244 |
||
52526 | 245 |
type print_fn = Toplevel.transition -> Toplevel.state -> unit; |
52515 | 246 |
|
52647
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
247 |
type print_function = |
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
248 |
{command_name: string, args: string list} -> |
52953
2c927b7501c5
explicit "strict" flag for print functions (flipped internal meaning);
wenzelm
parents:
52853
diff
changeset
|
249 |
{delay: Time.time option, pri: int, persistent: bool, strict: bool, print_fn: print_fn} option; |
52647
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
250 |
|
52511 | 251 |
local |
252 |
||
52647
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
253 |
val print_functions = |
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
254 |
Synchronized.var "Command.print_functions" ([]: (string * print_function) list); |
52511 | 255 |
|
52570 | 256 |
fun print_error tr e = |
53709
84522727f9d3
improved printing of exception trace in Poly/ML 5.5.1;
wenzelm
parents:
53404
diff
changeset
|
257 |
(Toplevel.setmp_thread_position tr o Toplevel.controlled_execution) e () |
52619
70d5f2f7d27f
reraise interrupts outside command regular transactions -- relevant for memo_stable;
wenzelm
parents:
52609
diff
changeset
|
258 |
handle exn => |
70d5f2f7d27f
reraise interrupts outside command regular transactions -- relevant for memo_stable;
wenzelm
parents:
52609
diff
changeset
|
259 |
if Exn.is_interrupt exn then reraise exn |
70d5f2f7d27f
reraise interrupts outside command regular transactions -- relevant for memo_stable;
wenzelm
parents:
52609
diff
changeset
|
260 |
else List.app (Future.error_msg (Toplevel.pos_of tr)) (ML_Compiler.exn_messages_ids exn); |
52516
b5b3c888df9f
more exception handling -- make print functions total;
wenzelm
parents:
52515
diff
changeset
|
261 |
|
52607
33a133d50616
clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents:
52606
diff
changeset
|
262 |
fun print_eq (Print {exec_id, ...}, Print {exec_id = exec_id', ...}) = exec_id = exec_id'; |
33a133d50616
clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents:
52606
diff
changeset
|
263 |
|
52775
e0169f13bd37
keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents:
52774
diff
changeset
|
264 |
fun print_finished (Print {print_process, ...}) = memo_finished print_process; |
52656
9437f440ef3f
keep persistent prints only if actually finished;
wenzelm
parents:
52651
diff
changeset
|
265 |
|
52600 | 266 |
fun print_persistent (Print {persistent, ...}) = persistent; |
52596
40298d383463
global management of command execution fragments;
wenzelm
parents:
52586
diff
changeset
|
267 |
|
52853
4ab66773a41f
prefer canonical order, to avoid potential fluctuation due to front-end edits;
wenzelm
parents:
52850
diff
changeset
|
268 |
val overlay_ord = prod_ord string_ord (list_ord string_ord); |
4ab66773a41f
prefer canonical order, to avoid potential fluctuation due to front-end edits;
wenzelm
parents:
52850
diff
changeset
|
269 |
|
52511 | 270 |
in |
52509 | 271 |
|
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
272 |
fun print command_visible command_overlays command_name eval old_prints = |
52570 | 273 |
let |
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
274 |
val print_functions = Synchronized.value print_functions; |
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
275 |
|
52999
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
276 |
fun make_print name args {delay, pri, persistent, strict, print_fn} = |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
277 |
let |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
278 |
val exec_id = Document_ID.make (); |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
279 |
fun process () = |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
280 |
let |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
281 |
val {failed, command, state = st', ...} = eval_result eval; |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
282 |
val tr = Toplevel.exec_id exec_id command; |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
283 |
in |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
284 |
if failed andalso strict then () |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
285 |
else print_error tr (fn () => print_fn tr st') |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
286 |
end; |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
287 |
in |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
288 |
Print { |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
289 |
name = name, args = args, delay = delay, pri = pri, persistent = persistent, |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
290 |
exec_id = exec_id, print_process = memo exec_id process} |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
291 |
end; |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
292 |
|
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
293 |
fun bad_print name args exn = |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
294 |
make_print name args {delay = NONE, pri = 0, persistent = false, |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
295 |
strict = false, print_fn = fn _ => fn _ => reraise exn}; |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
296 |
|
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
297 |
fun new_print name args get_pr = |
52570 | 298 |
let |
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
299 |
val params = {command_name = command_name, args = args}; |
52570 | 300 |
in |
53709
84522727f9d3
improved printing of exception trace in Poly/ML 5.5.1;
wenzelm
parents:
53404
diff
changeset
|
301 |
(case Exn.capture (Toplevel.controlled_execution get_pr) params of |
52570 | 302 |
Exn.Res NONE => NONE |
52999
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
303 |
| Exn.Res (SOME pr) => SOME (make_print name args pr) |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
304 |
| Exn.Exn exn => SOME (bad_print name args exn)) |
52570 | 305 |
end; |
306 |
||
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
307 |
fun get_print (a, b) = |
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
308 |
(case find_first (fn Print {name, args, ...} => name = a andalso args = b) old_prints of |
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
309 |
NONE => |
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
310 |
(case AList.lookup (op =) print_functions a of |
52999
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
311 |
NONE => SOME (bad_print a b (ERROR ("Missing print function " ^ quote a))) |
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
312 |
| SOME get_pr => new_print a b get_pr) |
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
313 |
| some => some); |
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
314 |
|
52570 | 315 |
val new_prints = |
316 |
if command_visible then |
|
52853
4ab66773a41f
prefer canonical order, to avoid potential fluctuation due to front-end edits;
wenzelm
parents:
52850
diff
changeset
|
317 |
fold (fn (a, _) => cons (a, [])) print_functions command_overlays |
4ab66773a41f
prefer canonical order, to avoid potential fluctuation due to front-end edits;
wenzelm
parents:
52850
diff
changeset
|
318 |
|> sort_distinct overlay_ord |
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
319 |
|> map_filter get_print |
52656
9437f440ef3f
keep persistent prints only if actually finished;
wenzelm
parents:
52651
diff
changeset
|
320 |
else filter (fn print => print_finished print andalso print_persistent print) old_prints; |
52570 | 321 |
in |
52600 | 322 |
if eq_list print_eq (old_prints, new_prints) then NONE else SOME new_prints |
52570 | 323 |
end; |
52511 | 324 |
|
52647
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
325 |
fun print_function name f = |
52511 | 326 |
Synchronized.change print_functions (fn funs => |
327 |
(if not (AList.defined (op =) funs name) then () |
|
328 |
else warning ("Redefining command print function: " ^ quote name); |
|
52647
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
329 |
AList.update (op =) (name, f) funs)); |
52511 | 330 |
|
52571 | 331 |
fun no_print_function name = |
332 |
Synchronized.change print_functions (filter_out (equal name o #1)); |
|
333 |
||
52511 | 334 |
end; |
335 |
||
52526 | 336 |
val _ = |
52647
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
337 |
print_function "print_state" |
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
338 |
(fn {command_name, ...} => |
53404
d598b6231ff7
non-persistent print_state: trade-off between JVM space vs. ML time;
wenzelm
parents:
53375
diff
changeset
|
339 |
SOME {delay = NONE, pri = 1, persistent = false, strict = true, |
52651 | 340 |
print_fn = fn tr => fn st' => |
341 |
let |
|
342 |
val is_init = Keyword.is_theory_begin command_name; |
|
343 |
val is_proof = Keyword.is_proof command_name; |
|
344 |
val do_print = |
|
345 |
not is_init andalso |
|
346 |
(Toplevel.print_of tr orelse (is_proof andalso Toplevel.is_proof st')); |
|
347 |
in if do_print then Toplevel.print_state false st' else () end}); |
|
52509 | 348 |
|
52532 | 349 |
|
52600 | 350 |
(* combined execution *) |
351 |
||
352 |
type exec = eval * print list; |
|
353 |
val no_exec: exec = |
|
354 |
(Eval {exec_id = Document_ID.none, eval_process = memo_value init_eval_state}, []); |
|
52532 | 355 |
|
52600 | 356 |
fun exec_ids NONE = [] |
357 |
| exec_ids (SOME (Eval {exec_id, ...}, prints)) = |
|
358 |
exec_id :: map (fn Print {exec_id, ...} => exec_id) prints; |
|
359 |
||
360 |
local |
|
361 |
||
52651 | 362 |
fun run_print execution_id (Print {name, delay, pri, print_process, ...}) = |
53976
da610b507799
low-priority print task is always asynchronous -- relevant for single-core machine and automatically tried tools;
wenzelm
parents:
53709
diff
changeset
|
363 |
if Multithreading.enabled () orelse pri <= 0 then |
52651 | 364 |
let |
365 |
val group = Future.worker_subgroup (); |
|
366 |
fun fork () = |
|
367 |
memo_fork {name = name, group = SOME group, deps = [], pri = pri, interrupts = true} |
|
368 |
execution_id print_process; |
|
369 |
in |
|
52762 | 370 |
(case delay of |
371 |
NONE => fork () |
|
372 |
| SOME d => ignore (Event_Timer.request (Time.+ (Time.now (), d)) fork)) |
|
52651 | 373 |
end |
374 |
else memo_exec execution_id print_process; |
|
52559
ddaf277e0d8c
more direct interleaving of eval/print and update/execution -- refrain from crude manipulation of max_threads;
wenzelm
parents:
52536
diff
changeset
|
375 |
|
52600 | 376 |
in |
377 |
||
52607
33a133d50616
clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents:
52606
diff
changeset
|
378 |
fun exec execution_id (Eval {eval_process, ...}, prints) = |
33a133d50616
clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents:
52606
diff
changeset
|
379 |
(memo_exec execution_id eval_process; List.app (run_print execution_id) prints); |
52532 | 380 |
|
47336 | 381 |
end; |
382 |
||
52600 | 383 |
end; |
384 |