author | wenzelm |
Thu, 06 Nov 2014 15:47:04 +0100 | |
changeset 58923 | cb9b69cca999 |
parent 58862 | 63a16e98cc14 |
child 58928 | 23d0ffd48006 |
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 |
|
56458
a8d960baa5c2
simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
wenzelm
parents:
56447
diff
changeset
|
9 |
type blob = (string * (SHA1.digest * string list) option) Exn.result |
54526 | 10 |
val read_file: Path.T -> Position.T -> Path.T -> Token.file |
58923 | 11 |
val read: Keyword.keywords -> Path.T-> (unit -> theory) -> blob list -> Token.T list -> |
12 |
Toplevel.transition |
|
52600 | 13 |
type eval |
52607
33a133d50616
clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents:
52606
diff
changeset
|
14 |
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
|
15 |
val eval_running: eval -> bool |
52772 | 16 |
val eval_finished: eval -> bool |
52536 | 17 |
val eval_result_state: eval -> Toplevel.state |
58923 | 18 |
val eval: Keyword.keywords -> Path.T -> (unit -> theory) -> blob list -> Token.T list -> |
19 |
eval -> eval |
|
52600 | 20 |
type print |
58923 | 21 |
val print: bool -> (string * string list) list -> Keyword.keywords -> string -> |
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
22 |
eval -> print list -> print list option |
52526 | 23 |
type print_fn = Toplevel.transition -> Toplevel.state -> unit |
52953
2c927b7501c5
explicit "strict" flag for print functions (flipped internal meaning);
wenzelm
parents:
52853
diff
changeset
|
24 |
type print_function = |
58923 | 25 |
{keywords: Keyword.keywords, command_name: string, args: string list, exec_id: Document_ID.exec} -> |
52953
2c927b7501c5
explicit "strict" flag for print functions (flipped internal meaning);
wenzelm
parents:
52853
diff
changeset
|
26 |
{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
|
27 |
val print_function: string -> print_function -> unit |
52571 | 28 |
val no_print_function: string -> unit |
52600 | 29 |
type exec = eval * print list |
30 |
val no_exec: exec |
|
31 |
val exec_ids: exec option -> Document_ID.exec list |
|
52606 | 32 |
val exec: Document_ID.execution -> exec -> unit |
47336 | 33 |
end; |
34 |
||
35 |
structure Command: COMMAND = |
|
36 |
struct |
|
37 |
||
52775
e0169f13bd37
keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents:
52774
diff
changeset
|
38 |
(** memo results **) |
47341
00f6279bb67a
Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents:
47336
diff
changeset
|
39 |
|
00f6279bb67a
Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents:
47336
diff
changeset
|
40 |
datatype 'a expr = |
52596
40298d383463
global management of command execution fragments;
wenzelm
parents:
52586
diff
changeset
|
41 |
Expr of Document_ID.exec * (unit -> 'a) | |
47341
00f6279bb67a
Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents:
47336
diff
changeset
|
42 |
Result of 'a Exn.result; |
00f6279bb67a
Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents:
47336
diff
changeset
|
43 |
|
00f6279bb67a
Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents:
47336
diff
changeset
|
44 |
abstype 'a memo = Memo of 'a expr Synchronized.var |
00f6279bb67a
Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents:
47336
diff
changeset
|
45 |
with |
00f6279bb67a
Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents:
47336
diff
changeset
|
46 |
|
52596
40298d383463
global management of command execution fragments;
wenzelm
parents:
52586
diff
changeset
|
47 |
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
|
48 |
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
|
49 |
|
47342
7828c7b3c143
more explicit memo_eval vs. memo_result, to enforce bottom-up execution;
wenzelm
parents:
47341
diff
changeset
|
50 |
fun memo_result (Memo v) = |
7828c7b3c143
more explicit memo_eval vs. memo_result, to enforce bottom-up execution;
wenzelm
parents:
47341
diff
changeset
|
51 |
(case Synchronized.value v of |
52607
33a133d50616
clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents:
52606
diff
changeset
|
52 |
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
|
53 |
| Result res => Exn.release res); |
47341
00f6279bb67a
Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents:
47336
diff
changeset
|
54 |
|
52656
9437f440ef3f
keep persistent prints only if actually finished;
wenzelm
parents:
52651
diff
changeset
|
55 |
fun memo_finished (Memo v) = |
52785 | 56 |
(case Synchronized.value v of Expr _ => false | Result _ => true); |
52656
9437f440ef3f
keep persistent prints only if actually finished;
wenzelm
parents:
52651
diff
changeset
|
57 |
|
52607
33a133d50616
clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents:
52606
diff
changeset
|
58 |
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
|
59 |
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
|
60 |
(fn expr => |
c8f8c29193de
clarified memo_exec: plain synchronized access without any special tricks;
wenzelm
parents:
52607
diff
changeset
|
61 |
(case expr of |
52775
e0169f13bd37
keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents:
52774
diff
changeset
|
62 |
Expr (exec_id, body) => |
52609
c8f8c29193de
clarified memo_exec: plain synchronized access without any special tricks;
wenzelm
parents:
52607
diff
changeset
|
63 |
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
|
64 |
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
|
65 |
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
|
66 |
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
|
67 |
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
|
68 |
(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
|
69 |
|> 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
|
70 |
|> 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
|
71 |
|> 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
|
72 |
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
|
73 |
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
|
74 |
end) () |
52775
e0169f13bd37
keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents:
52774
diff
changeset
|
75 |
| Result _ => SOME ((), expr))) |
e0169f13bd37
keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents:
52774
diff
changeset
|
76 |
|> (fn NONE => error "Conflicting command execution" | _ => ()); |
52596
40298d383463
global management of command execution fragments;
wenzelm
parents:
52586
diff
changeset
|
77 |
|
52607
33a133d50616
clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents:
52606
diff
changeset
|
78 |
fun memo_fork params execution_id (Memo v) = |
52596
40298d383463
global management of command execution fragments;
wenzelm
parents:
52586
diff
changeset
|
79 |
(case Synchronized.value v of |
40298d383463
global management of command execution fragments;
wenzelm
parents:
52586
diff
changeset
|
80 |
Result _ => () |
52607
33a133d50616
clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents:
52606
diff
changeset
|
81 |
| _ => ignore ((singleton o Future.forks) params (fn () => memo_exec execution_id (Memo v)))); |
52526 | 82 |
|
47341
00f6279bb67a
Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents:
47336
diff
changeset
|
83 |
end; |
00f6279bb67a
Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents:
47336
diff
changeset
|
84 |
|
00f6279bb67a
Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents:
47336
diff
changeset
|
85 |
|
52607
33a133d50616
clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents:
52606
diff
changeset
|
86 |
|
52536 | 87 |
(** main phases of execution **) |
88 |
||
52510 | 89 |
(* read *) |
52509 | 90 |
|
55798 | 91 |
type blob = |
56458
a8d960baa5c2
simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
wenzelm
parents:
56447
diff
changeset
|
92 |
(string * (SHA1.digest * string list) option) Exn.result; (*file node name, digest, lines*) |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
53976
diff
changeset
|
93 |
|
56504
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
94 |
fun read_file_node file_node master_dir pos src_path = |
54526 | 95 |
let |
56034
1c59b555ac4a
some Markup.language_path to prevent completion of symbols (notably "~") -- always "delimited" for simplicity in contrast to 42ac3cfb89f6;
wenzelm
parents:
55798
diff
changeset
|
96 |
val _ = Position.report pos Markup.language_path; |
56504
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
97 |
val _ = |
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
98 |
(case try Url.explode file_node of |
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
99 |
NONE => () |
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
100 |
| SOME (Url.File _) => () |
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
101 |
| _ => |
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
102 |
(Position.report pos (Markup.path file_node); |
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
103 |
error ("Prover cannot load remote file " ^ |
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
104 |
Markup.markup (Markup.path file_node) (quote file_node) ^ Position.here pos))); |
54526 | 105 |
val full_path = File.check_file (File.full_path master_dir src_path); |
106 |
val _ = Position.report pos (Markup.path (Path.implode full_path)); |
|
55788
67699e08e969
store blobs / inlined files as separate text lines: smaller values are more healthy for the Poly/ML RTS and allow implicit sharing;
wenzelm
parents:
55709
diff
changeset
|
107 |
val text = File.read full_path; |
67699e08e969
store blobs / inlined files as separate text lines: smaller values are more healthy for the Poly/ML RTS and allow implicit sharing;
wenzelm
parents:
55709
diff
changeset
|
108 |
val lines = split_lines text; |
67699e08e969
store blobs / inlined files as separate text lines: smaller values are more healthy for the Poly/ML RTS and allow implicit sharing;
wenzelm
parents:
55709
diff
changeset
|
109 |
val digest = SHA1.digest text; |
67699e08e969
store blobs / inlined files as separate text lines: smaller values are more healthy for the Poly/ML RTS and allow implicit sharing;
wenzelm
parents:
55709
diff
changeset
|
110 |
in {src_path = src_path, lines = lines, digest = digest, pos = Path.position full_path} end; |
67699e08e969
store blobs / inlined files as separate text lines: smaller values are more healthy for the Poly/ML RTS and allow implicit sharing;
wenzelm
parents:
55709
diff
changeset
|
111 |
|
56504
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
112 |
val read_file = read_file_node ""; |
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
113 |
|
55788
67699e08e969
store blobs / inlined files as separate text lines: smaller values are more healthy for the Poly/ML RTS and allow implicit sharing;
wenzelm
parents:
55709
diff
changeset
|
114 |
local |
67699e08e969
store blobs / inlined files as separate text lines: smaller values are more healthy for the Poly/ML RTS and allow implicit sharing;
wenzelm
parents:
55709
diff
changeset
|
115 |
|
56447
1e77ed11f2f7
separate file_node vs. file_path, e.g. relevant on Windows for hyperlink to the latter;
wenzelm
parents:
56333
diff
changeset
|
116 |
fun blob_file src_path lines digest file_node = |
55788
67699e08e969
store blobs / inlined files as separate text lines: smaller values are more healthy for the Poly/ML RTS and allow implicit sharing;
wenzelm
parents:
55709
diff
changeset
|
117 |
let |
67699e08e969
store blobs / inlined files as separate text lines: smaller values are more healthy for the Poly/ML RTS and allow implicit sharing;
wenzelm
parents:
55709
diff
changeset
|
118 |
val file_pos = |
56447
1e77ed11f2f7
separate file_node vs. file_path, e.g. relevant on Windows for hyperlink to the latter;
wenzelm
parents:
56333
diff
changeset
|
119 |
Position.file file_node |> |
55788
67699e08e969
store blobs / inlined files as separate text lines: smaller values are more healthy for the Poly/ML RTS and allow implicit sharing;
wenzelm
parents:
55709
diff
changeset
|
120 |
(case Position.get_id (Position.thread_data ()) of |
67699e08e969
store blobs / inlined files as separate text lines: smaller values are more healthy for the Poly/ML RTS and allow implicit sharing;
wenzelm
parents:
55709
diff
changeset
|
121 |
NONE => I |
67699e08e969
store blobs / inlined files as separate text lines: smaller values are more healthy for the Poly/ML RTS and allow implicit sharing;
wenzelm
parents:
55709
diff
changeset
|
122 |
| SOME exec_id => Position.put_id exec_id); |
67699e08e969
store blobs / inlined files as separate text lines: smaller values are more healthy for the Poly/ML RTS and allow implicit sharing;
wenzelm
parents:
55709
diff
changeset
|
123 |
in {src_path = src_path, lines = lines, digest = digest, pos = file_pos} end |
54526 | 124 |
|
58923 | 125 |
fun resolve_files keywords master_dir blobs toks = |
57905
c0c5652e796e
separate module Command_Span: mostly syntactic representation;
wenzelm
parents:
57844
diff
changeset
|
126 |
(case Outer_Syntax.parse_spans toks of |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
53976
diff
changeset
|
127 |
[span] => span |
58923 | 128 |
|> Command_Span.resolve_files keywords (fn cmd => fn (path, pos) => |
54523 | 129 |
let |
56504
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
130 |
fun make_file src_path (Exn.Res (file_node, NONE)) = |
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
131 |
Exn.interruptible_capture (fn () => |
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
132 |
read_file_node file_node master_dir pos src_path) () |
56458
a8d960baa5c2
simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
wenzelm
parents:
56447
diff
changeset
|
133 |
| make_file src_path (Exn.Res (file_node, SOME (digest, lines))) = |
a8d960baa5c2
simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
wenzelm
parents:
56447
diff
changeset
|
134 |
(Position.reports [(pos, Markup.language_path), (pos, Markup.path file_node)]; |
56447
1e77ed11f2f7
separate file_node vs. file_path, e.g. relevant on Windows for hyperlink to the latter;
wenzelm
parents:
56333
diff
changeset
|
135 |
Exn.Res (blob_file src_path lines digest file_node)) |
54523 | 136 |
| make_file _ (Exn.Exn e) = Exn.Exn e; |
58923 | 137 |
val src_paths = Keyword.command_files keywords cmd path; |
54523 | 138 |
in |
54527
bfeb0ea6c2c0
proper static resolution of files via Thy_Load.load_thy, instead of TTY fall-back;
wenzelm
parents:
54526
diff
changeset
|
139 |
if null blobs then |
56458
a8d960baa5c2
simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
wenzelm
parents:
56447
diff
changeset
|
140 |
map2 make_file src_paths (map (K (Exn.Res ("", NONE))) src_paths) |
54527
bfeb0ea6c2c0
proper static resolution of files via Thy_Load.load_thy, instead of TTY fall-back;
wenzelm
parents:
54526
diff
changeset
|
141 |
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
|
142 |
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
|
143 |
else error ("Misalignment of inlined files" ^ Position.here pos) |
54523 | 144 |
end) |
57905
c0c5652e796e
separate module Command_Span: mostly syntactic representation;
wenzelm
parents:
57844
diff
changeset
|
145 |
|> Command_Span.content |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
53976
diff
changeset
|
146 |
| _ => toks); |
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
53976
diff
changeset
|
147 |
|
55788
67699e08e969
store blobs / inlined files as separate text lines: smaller values are more healthy for the Poly/ML RTS and allow implicit sharing;
wenzelm
parents:
55709
diff
changeset
|
148 |
in |
67699e08e969
store blobs / inlined files as separate text lines: smaller values are more healthy for the Poly/ML RTS and allow implicit sharing;
wenzelm
parents:
55709
diff
changeset
|
149 |
|
58923 | 150 |
fun read keywords master_dir init blobs span = |
52510 | 151 |
let |
58862 | 152 |
val syntax = #2 (Outer_Syntax.get_syntax ()); |
153 |
val command_reports = Outer_Syntax.command_reports syntax; |
|
52509 | 154 |
|
55709
4e5a83a46ded
clarified Token.range_of in accordance to Symbol_Pos.range;
wenzelm
parents:
55708
diff
changeset
|
155 |
val proper_range = Token.range_of (#1 (take_suffix Token.is_improper span)); |
52510 | 156 |
val pos = |
157 |
(case find_first Token.is_command span of |
|
55708 | 158 |
SOME tok => Token.pos_of tok |
55709
4e5a83a46ded
clarified Token.range_of in accordance to Symbol_Pos.range;
wenzelm
parents:
55708
diff
changeset
|
159 |
| NONE => #1 proper_range); |
52509 | 160 |
|
52510 | 161 |
val (is_malformed, token_reports) = Thy_Syntax.reports_of_tokens span; |
162 |
val _ = Position.reports_text (token_reports @ maps command_reports span); |
|
163 |
in |
|
164 |
if is_malformed then Toplevel.malformed pos "Malformed command syntax" |
|
165 |
else |
|
58923 | 166 |
(case Outer_Syntax.read_spans syntax (resolve_files keywords master_dir blobs span) of |
58853 | 167 |
[tr] => Toplevel.modify_init init tr |
55709
4e5a83a46ded
clarified Token.range_of in accordance to Symbol_Pos.range;
wenzelm
parents:
55708
diff
changeset
|
168 |
| [] => Toplevel.ignored (#1 (Token.range_of span)) |
4e5a83a46ded
clarified Token.range_of in accordance to Symbol_Pos.range;
wenzelm
parents:
55708
diff
changeset
|
169 |
| _ => Toplevel.malformed (#1 proper_range) "Exactly one command expected") |
4e5a83a46ded
clarified Token.range_of in accordance to Symbol_Pos.range;
wenzelm
parents:
55708
diff
changeset
|
170 |
handle ERROR msg => Toplevel.malformed (#1 proper_range) msg |
52510 | 171 |
end; |
52509 | 172 |
|
55788
67699e08e969
store blobs / inlined files as separate text lines: smaller values are more healthy for the Poly/ML RTS and allow implicit sharing;
wenzelm
parents:
55709
diff
changeset
|
173 |
end; |
67699e08e969
store blobs / inlined files as separate text lines: smaller values are more healthy for the Poly/ML RTS and allow implicit sharing;
wenzelm
parents:
55709
diff
changeset
|
174 |
|
52509 | 175 |
|
176 |
(* eval *) |
|
47336 | 177 |
|
52600 | 178 |
type eval_state = |
179 |
{failed: bool, malformed: bool, command: Toplevel.transition, state: Toplevel.state}; |
|
180 |
val init_eval_state = |
|
181 |
{failed = false, malformed = false, command = Toplevel.empty, state = Toplevel.toplevel}; |
|
182 |
||
183 |
datatype eval = Eval of {exec_id: Document_ID.exec, eval_process: eval_state memo}; |
|
184 |
||
56291
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
185 |
fun eval_exec_id (Eval {exec_id, ...}) = exec_id; |
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
186 |
val eval_eq = op = o pairself eval_exec_id; |
52607
33a133d50616
clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents:
52606
diff
changeset
|
187 |
|
56291
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
188 |
val eval_running = Execution.is_running_exec o eval_exec_id; |
52772 | 189 |
fun eval_finished (Eval {eval_process, ...}) = memo_finished eval_process; |
190 |
||
52600 | 191 |
fun eval_result (Eval {eval_process, ...}) = memo_result eval_process; |
192 |
val eval_result_state = #state o eval_result; |
|
193 |
||
47336 | 194 |
local |
195 |
||
58923 | 196 |
fun reset_state keywords tr st0 = Toplevel.setmp_thread_position tr (fn () => |
56937 | 197 |
let |
198 |
val name = Toplevel.name_of tr; |
|
199 |
val res = |
|
58923 | 200 |
if Keyword.is_theory_body keywords name then Toplevel.reset_theory st0 |
201 |
else if Keyword.is_proof keywords name then Toplevel.reset_proof st0 |
|
56937 | 202 |
else NONE; |
203 |
in |
|
204 |
(case res of |
|
205 |
NONE => st0 |
|
57844
ae3eac418c5f
more emphatic warning via error_message (violating historic TTY protocol);
wenzelm
parents:
57839
diff
changeset
|
206 |
| SOME st => (Output.error_message (Toplevel.type_error tr st0 ^ " -- using reset state"); st)) |
56937 | 207 |
end) (); |
208 |
||
58923 | 209 |
fun run keywords int tr st = |
210 |
if Goal.future_enabled 1 andalso Keyword.is_diag keywords (Toplevel.name_of tr) then |
|
53192 | 211 |
(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
|
212 |
(fn () => Toplevel.command_exception int tr st); ([], SOME st)) |
51284
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51266
diff
changeset
|
213 |
else Toplevel.command_errors int tr st; |
47336 | 214 |
|
52510 | 215 |
fun check_cmts span tr st' = |
216 |
Toplevel.setmp_thread_position tr |
|
217 |
(fn () => |
|
218 |
Outer_Syntax.side_comments span |> maps (fn cmt => |
|
219 |
(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
|
220 |
handle exn => |
70d5f2f7d27f
reraise interrupts outside command regular transactions -- relevant for memo_stable;
wenzelm
parents:
52609
diff
changeset
|
221 |
if Exn.is_interrupt exn then reraise exn |
56303
4cc3f4db3447
clarified Isabelle/ML bootstrap, such that Execution does not require ML_Compiler;
wenzelm
parents:
56292
diff
changeset
|
222 |
else Runtime.exn_messages_ids exn)) (); |
52510 | 223 |
|
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
|
224 |
fun report tr m = |
56333
38f1422ef473
support bulk messages consisting of small string segments, which are more healthy to the Poly/ML RTS and might prevent spurious GC crashes such as MTGCProcessMarkPointers::ScanAddressesInObject;
wenzelm
parents:
56303
diff
changeset
|
225 |
Toplevel.setmp_thread_position tr (fn () => Output.report [Markup.markup_only m]) (); |
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
|
226 |
|
87910da843d5
more uniform status -- accommodate spurious Exn.Interrupt from user code, allow ML_Compiler.exn_messages_id to crash;
wenzelm
parents:
54671
diff
changeset
|
227 |
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
|
228 |
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
|
229 |
|
47336 | 230 |
fun proof_status tr st = |
231 |
(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
|
232 |
SOME prf => status tr (Proof.status_markup prf) |
47336 | 233 |
| NONE => ()); |
234 |
||
58923 | 235 |
fun eval_state keywords span tr ({malformed, state, ...}: eval_state) = |
52509 | 236 |
if malformed then |
52526 | 237 |
{failed = true, malformed = malformed, command = tr, state = Toplevel.toplevel} |
48772 | 238 |
else |
239 |
let |
|
56937 | 240 |
val _ = Multithreading.interrupted (); |
47336 | 241 |
|
56937 | 242 |
val malformed' = Toplevel.is_malformed tr; |
58923 | 243 |
val st = reset_state keywords tr state; |
56937 | 244 |
|
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
|
245 |
val _ = status tr Markup.running; |
58923 | 246 |
val (errs1, result) = run keywords true tr st; |
52509 | 247 |
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
|
248 |
val errs = errs1 @ errs2; |
56333
38f1422ef473
support bulk messages consisting of small string segments, which are more healthy to the Poly/ML RTS and might prevent spurious GC crashes such as MTGCProcessMarkPointers::ScanAddressesInObject;
wenzelm
parents:
56303
diff
changeset
|
249 |
val _ = List.app (Future.error_message (Toplevel.pos_of tr)) errs; |
48772 | 250 |
in |
251 |
(case result of |
|
252 |
NONE => |
|
253 |
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
|
254 |
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
|
255 |
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
|
256 |
val _ = if null errs then (report tr Markup.bad; Exn.interrupt ()) else (); |
52526 | 257 |
in {failed = true, malformed = malformed', command = tr, state = st} end |
48772 | 258 |
| SOME st' => |
259 |
let |
|
260 |
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
|
261 |
val _ = status tr Markup.finished; |
52526 | 262 |
in {failed = false, malformed = malformed', command = tr, state = st'} end) |
48772 | 263 |
end; |
47336 | 264 |
|
52534 | 265 |
in |
266 |
||
58923 | 267 |
fun eval keywords master_dir init blobs span eval0 = |
52534 | 268 |
let |
269 |
val exec_id = Document_ID.make (); |
|
270 |
fun process () = |
|
271 |
let |
|
272 |
val tr = |
|
273 |
Position.setmp_thread_data (Position.id_only (Document_ID.print exec_id)) |
|
58923 | 274 |
(fn () => read keywords master_dir init blobs span |> Toplevel.exec_id exec_id) (); |
275 |
in eval_state keywords span tr (eval_result eval0) end; |
|
52600 | 276 |
in Eval {exec_id = exec_id, eval_process = memo exec_id process} end; |
52534 | 277 |
|
47336 | 278 |
end; |
279 |
||
52509 | 280 |
|
281 |
(* print *) |
|
282 |
||
52600 | 283 |
datatype print = Print of |
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
284 |
{name: string, args: string list, delay: Time.time option, pri: int, persistent: bool, |
52600 | 285 |
exec_id: Document_ID.exec, print_process: unit memo}; |
286 |
||
56291
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
287 |
fun print_exec_id (Print {exec_id, ...}) = exec_id; |
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
288 |
val print_eq = op = o pairself print_exec_id; |
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
289 |
|
52526 | 290 |
type print_fn = Toplevel.transition -> Toplevel.state -> unit; |
52515 | 291 |
|
52647
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
292 |
type print_function = |
58923 | 293 |
{keywords: Keyword.keywords, command_name: string, args: string list, exec_id: Document_ID.exec} -> |
52953
2c927b7501c5
explicit "strict" flag for print functions (flipped internal meaning);
wenzelm
parents:
52853
diff
changeset
|
294 |
{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
|
295 |
|
52511 | 296 |
local |
297 |
||
52647
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
298 |
val print_functions = |
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
299 |
Synchronized.var "Command.print_functions" ([]: (string * print_function) list); |
52511 | 300 |
|
56265
785569927666
discontinued Toplevel.debug in favour of system option "exception_trace";
wenzelm
parents:
56034
diff
changeset
|
301 |
fun print_error tr opt_context e = |
56303
4cc3f4db3447
clarified Isabelle/ML bootstrap, such that Execution does not require ML_Compiler;
wenzelm
parents:
56292
diff
changeset
|
302 |
(Toplevel.setmp_thread_position tr o Runtime.controlled_execution opt_context) e () |
52619
70d5f2f7d27f
reraise interrupts outside command regular transactions -- relevant for memo_stable;
wenzelm
parents:
52609
diff
changeset
|
303 |
handle exn => |
70d5f2f7d27f
reraise interrupts outside command regular transactions -- relevant for memo_stable;
wenzelm
parents:
52609
diff
changeset
|
304 |
if Exn.is_interrupt exn then reraise exn |
56333
38f1422ef473
support bulk messages consisting of small string segments, which are more healthy to the Poly/ML RTS and might prevent spurious GC crashes such as MTGCProcessMarkPointers::ScanAddressesInObject;
wenzelm
parents:
56303
diff
changeset
|
305 |
else List.app (Future.error_message (Toplevel.pos_of tr)) (Runtime.exn_messages_ids exn); |
52516
b5b3c888df9f
more exception handling -- make print functions total;
wenzelm
parents:
52515
diff
changeset
|
306 |
|
52775
e0169f13bd37
keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents:
52774
diff
changeset
|
307 |
fun print_finished (Print {print_process, ...}) = memo_finished print_process; |
52656
9437f440ef3f
keep persistent prints only if actually finished;
wenzelm
parents:
52651
diff
changeset
|
308 |
|
52600 | 309 |
fun print_persistent (Print {persistent, ...}) = persistent; |
52596
40298d383463
global management of command execution fragments;
wenzelm
parents:
52586
diff
changeset
|
310 |
|
52853
4ab66773a41f
prefer canonical order, to avoid potential fluctuation due to front-end edits;
wenzelm
parents:
52850
diff
changeset
|
311 |
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
|
312 |
|
52511 | 313 |
in |
52509 | 314 |
|
58923 | 315 |
fun print command_visible command_overlays keywords command_name eval old_prints = |
52570 | 316 |
let |
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
317 |
val print_functions = Synchronized.value print_functions; |
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
318 |
|
52999
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
319 |
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
|
320 |
let |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
321 |
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
|
322 |
fun process () = |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
323 |
let |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
324 |
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
|
325 |
val tr = Toplevel.exec_id exec_id command; |
56265
785569927666
discontinued Toplevel.debug in favour of system option "exception_trace";
wenzelm
parents:
56034
diff
changeset
|
326 |
val opt_context = try Toplevel.generic_theory_of st'; |
52999
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
327 |
in |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
328 |
if failed andalso strict then () |
56265
785569927666
discontinued Toplevel.debug in favour of system option "exception_trace";
wenzelm
parents:
56034
diff
changeset
|
329 |
else print_error tr opt_context (fn () => print_fn tr st') |
52999
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
330 |
end; |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
331 |
in |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
332 |
Print { |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
333 |
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
|
334 |
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
|
335 |
end; |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
336 |
|
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
337 |
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
|
338 |
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
|
339 |
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
|
340 |
|
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
341 |
fun new_print name args get_pr = |
52570 | 342 |
let |
58923 | 343 |
val params = |
344 |
{keywords = keywords, |
|
345 |
command_name = command_name, |
|
346 |
args = args, |
|
347 |
exec_id = eval_exec_id eval}; |
|
52570 | 348 |
in |
56303
4cc3f4db3447
clarified Isabelle/ML bootstrap, such that Execution does not require ML_Compiler;
wenzelm
parents:
56292
diff
changeset
|
349 |
(case Exn.capture (Runtime.controlled_execution NONE get_pr) params of |
52570 | 350 |
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
|
351 |
| 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
|
352 |
| Exn.Exn exn => SOME (bad_print name args exn)) |
52570 | 353 |
end; |
354 |
||
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
355 |
fun get_print (a, b) = |
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
356 |
(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
|
357 |
NONE => |
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
358 |
(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
|
359 |
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
|
360 |
| 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
|
361 |
| some => some); |
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
362 |
|
52570 | 363 |
val new_prints = |
364 |
if command_visible then |
|
52853
4ab66773a41f
prefer canonical order, to avoid potential fluctuation due to front-end edits;
wenzelm
parents:
52850
diff
changeset
|
365 |
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
|
366 |
|> sort_distinct overlay_ord |
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
367 |
|> map_filter get_print |
52656
9437f440ef3f
keep persistent prints only if actually finished;
wenzelm
parents:
52651
diff
changeset
|
368 |
else filter (fn print => print_finished print andalso print_persistent print) old_prints; |
52570 | 369 |
in |
52600 | 370 |
if eq_list print_eq (old_prints, new_prints) then NONE else SOME new_prints |
52570 | 371 |
end; |
52511 | 372 |
|
52647
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
373 |
fun print_function name f = |
52511 | 374 |
Synchronized.change print_functions (fn funs => |
375 |
(if not (AList.defined (op =) funs name) then () |
|
376 |
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
|
377 |
AList.update (op =) (name, f) funs)); |
52511 | 378 |
|
52571 | 379 |
fun no_print_function name = |
380 |
Synchronized.change print_functions (filter_out (equal name o #1)); |
|
381 |
||
52511 | 382 |
end; |
383 |
||
52526 | 384 |
val _ = |
56291
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
385 |
print_function "Execution.print" |
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
386 |
(fn {args, exec_id, ...} => |
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
387 |
if null args then |
57839
d5b0fa6f1f7a
prefer non-strict Execution.print, e.g relevant for redirected ML compiler reports after error (see also e79f76a48449 and 40274e4f5ebf);
wenzelm
parents:
56944
diff
changeset
|
388 |
SOME {delay = NONE, pri = 1, persistent = false, strict = false, |
56292 | 389 |
print_fn = fn _ => fn _ => Execution.fork_prints exec_id} |
56291
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
390 |
else NONE); |
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
391 |
|
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
392 |
val _ = |
52647
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
393 |
print_function "print_state" |
58923 | 394 |
(fn {keywords, command_name, ...} => |
395 |
if Keyword.is_printed keywords command_name then |
|
56895
f058120aaad4
discontinued Toplevel.print flag -- print uniformly according to Keyword.is_printed;
wenzelm
parents:
56887
diff
changeset
|
396 |
SOME {delay = NONE, pri = 1, persistent = false, strict = true, |
f058120aaad4
discontinued Toplevel.print flag -- print uniformly according to Keyword.is_printed;
wenzelm
parents:
56887
diff
changeset
|
397 |
print_fn = fn _ => fn st => if Toplevel.is_proof st then Toplevel.print_state st else ()} |
f058120aaad4
discontinued Toplevel.print flag -- print uniformly according to Keyword.is_printed;
wenzelm
parents:
56887
diff
changeset
|
398 |
else NONE); |
52509 | 399 |
|
52532 | 400 |
|
52600 | 401 |
(* combined execution *) |
402 |
||
403 |
type exec = eval * print list; |
|
404 |
val no_exec: exec = |
|
405 |
(Eval {exec_id = Document_ID.none, eval_process = memo_value init_eval_state}, []); |
|
52532 | 406 |
|
52600 | 407 |
fun exec_ids NONE = [] |
56291
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
408 |
| exec_ids (SOME (eval, prints)) = eval_exec_id eval :: map print_exec_id prints; |
52600 | 409 |
|
410 |
local |
|
411 |
||
52651 | 412 |
fun run_print execution_id (Print {name, delay, pri, print_process, ...}) = |
56875
f6259d6fb565
explicit option parallel_print to downgrade parallel scheduling, which might occasionally help for big and heavy "scripts";
wenzelm
parents:
56504
diff
changeset
|
413 |
if pri <= 0 orelse (Multithreading.enabled () andalso Options.default_bool "parallel_print") |
f6259d6fb565
explicit option parallel_print to downgrade parallel scheduling, which might occasionally help for big and heavy "scripts";
wenzelm
parents:
56504
diff
changeset
|
414 |
then |
52651 | 415 |
let |
416 |
val group = Future.worker_subgroup (); |
|
417 |
fun fork () = |
|
418 |
memo_fork {name = name, group = SOME group, deps = [], pri = pri, interrupts = true} |
|
419 |
execution_id print_process; |
|
420 |
in |
|
52762 | 421 |
(case delay of |
422 |
NONE => fork () |
|
423 |
| SOME d => ignore (Event_Timer.request (Time.+ (Time.now (), d)) fork)) |
|
52651 | 424 |
end |
425 |
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
|
426 |
|
52600 | 427 |
in |
428 |
||
52607
33a133d50616
clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents:
52606
diff
changeset
|
429 |
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
|
430 |
(memo_exec execution_id eval_process; List.app (run_print execution_id) prints); |
52532 | 431 |
|
47336 | 432 |
end; |
433 |
||
52600 | 434 |
end; |
435 |