author | wenzelm |
Sat, 02 Aug 2014 19:38:32 +0200 | |
changeset 57844 | ae3eac418c5f |
parent 57839 | d5b0fa6f1f7a |
child 57905 | c0c5652e796e |
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 |
55798 | 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 |
55798 | 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 = |
56291
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
23 |
{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
|
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 |
|
55798 | 89 |
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
|
90 |
(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
|
91 |
|
56504
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
92 |
fun read_file_node file_node master_dir pos src_path = |
54526 | 93 |
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
|
94 |
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
|
95 |
val _ = |
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
96 |
(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
|
97 |
NONE => () |
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
98 |
| SOME (Url.File _) => () |
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
99 |
| _ => |
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
100 |
(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
|
101 |
error ("Prover cannot load remote file " ^ |
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
102 |
Markup.markup (Markup.path file_node) (quote file_node) ^ Position.here pos))); |
54526 | 103 |
val full_path = File.check_file (File.full_path master_dir src_path); |
104 |
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
|
105 |
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
|
106 |
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
|
107 |
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
|
108 |
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
|
109 |
|
56504
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
110 |
val read_file = read_file_node ""; |
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
111 |
|
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
|
112 |
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
|
113 |
|
56447
1e77ed11f2f7
separate file_node vs. file_path, e.g. relevant on Windows for hyperlink to the latter;
wenzelm
parents:
56333
diff
changeset
|
114 |
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
|
115 |
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
|
116 |
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
|
117 |
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
|
118 |
(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
|
119 |
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
|
120 |
| 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
|
121 |
in {src_path = src_path, lines = lines, digest = digest, pos = file_pos} end |
54526 | 122 |
|
123 |
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
|
124 |
(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
|
125 |
[span] => span |
54523 | 126 |
|> Thy_Syntax.resolve_files (fn cmd => fn (path, pos) => |
127 |
let |
|
56504
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
128 |
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
|
129 |
Exn.interruptible_capture (fn () => |
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
130 |
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
|
131 |
| 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
|
132 |
(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
|
133 |
Exn.Res (blob_file src_path lines digest file_node)) |
54523 | 134 |
| make_file _ (Exn.Exn e) = Exn.Exn e; |
135 |
val src_paths = Keyword.command_files cmd path; |
|
136 |
in |
|
54527
bfeb0ea6c2c0
proper static resolution of files via Thy_Load.load_thy, instead of TTY fall-back;
wenzelm
parents:
54526
diff
changeset
|
137 |
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
|
138 |
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
|
139 |
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
|
140 |
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
|
141 |
else error ("Misalignment of inlined files" ^ Position.here pos) |
54523 | 142 |
end) |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
53976
diff
changeset
|
143 |
|> Thy_Syntax.span_content |
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
53976
diff
changeset
|
144 |
| _ => toks); |
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
53976
diff
changeset
|
145 |
|
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
|
146 |
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
|
147 |
|
54526 | 148 |
fun read init master_dir blobs span = |
52510 | 149 |
let |
150 |
val outer_syntax = #2 (Outer_Syntax.get_syntax ()); |
|
151 |
val command_reports = Outer_Syntax.command_reports outer_syntax; |
|
52509 | 152 |
|
55709
4e5a83a46ded
clarified Token.range_of in accordance to Symbol_Pos.range;
wenzelm
parents:
55708
diff
changeset
|
153 |
val proper_range = Token.range_of (#1 (take_suffix Token.is_improper span)); |
52510 | 154 |
val pos = |
155 |
(case find_first Token.is_command span of |
|
55708 | 156 |
SOME tok => Token.pos_of tok |
55709
4e5a83a46ded
clarified Token.range_of in accordance to Symbol_Pos.range;
wenzelm
parents:
55708
diff
changeset
|
157 |
| NONE => #1 proper_range); |
52509 | 158 |
|
52510 | 159 |
val (is_malformed, token_reports) = Thy_Syntax.reports_of_tokens span; |
160 |
val _ = Position.reports_text (token_reports @ maps command_reports span); |
|
161 |
in |
|
162 |
if is_malformed then Toplevel.malformed pos "Malformed command syntax" |
|
163 |
else |
|
54526 | 164 |
(case Outer_Syntax.read_spans outer_syntax (resolve_files master_dir blobs span) of |
52510 | 165 |
[tr] => |
166 |
if Keyword.is_control (Toplevel.name_of tr) then |
|
167 |
Toplevel.malformed pos "Illegal control command" |
|
52534 | 168 |
else Toplevel.modify_init init tr |
55709
4e5a83a46ded
clarified Token.range_of in accordance to Symbol_Pos.range;
wenzelm
parents:
55708
diff
changeset
|
169 |
| [] => Toplevel.ignored (#1 (Token.range_of span)) |
4e5a83a46ded
clarified Token.range_of in accordance to Symbol_Pos.range;
wenzelm
parents:
55708
diff
changeset
|
170 |
| _ => 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
|
171 |
handle ERROR msg => Toplevel.malformed (#1 proper_range) msg |
52510 | 172 |
end; |
52509 | 173 |
|
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
|
174 |
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
|
175 |
|
52509 | 176 |
|
177 |
(* eval *) |
|
47336 | 178 |
|
52600 | 179 |
type eval_state = |
180 |
{failed: bool, malformed: bool, command: Toplevel.transition, state: Toplevel.state}; |
|
181 |
val init_eval_state = |
|
182 |
{failed = false, malformed = false, command = Toplevel.empty, state = Toplevel.toplevel}; |
|
183 |
||
184 |
datatype eval = Eval of {exec_id: Document_ID.exec, eval_process: eval_state memo}; |
|
185 |
||
56291
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
186 |
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
|
187 |
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
|
188 |
|
56291
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
189 |
val eval_running = Execution.is_running_exec o eval_exec_id; |
52772 | 190 |
fun eval_finished (Eval {eval_process, ...}) = memo_finished eval_process; |
191 |
||
52600 | 192 |
fun eval_result (Eval {eval_process, ...}) = memo_result eval_process; |
193 |
val eval_result_state = #state o eval_result; |
|
194 |
||
47336 | 195 |
local |
196 |
||
56937 | 197 |
fun reset_state tr st0 = Toplevel.setmp_thread_position tr (fn () => |
198 |
let |
|
199 |
val name = Toplevel.name_of tr; |
|
200 |
val res = |
|
56944
578dc6b4be89
no reset for 'end' -- e.g. relevant for 'notepad';
wenzelm
parents:
56937
diff
changeset
|
201 |
if Keyword.is_theory_body name then Toplevel.reset_theory st0 |
578dc6b4be89
no reset for 'end' -- e.g. relevant for 'notepad';
wenzelm
parents:
56937
diff
changeset
|
202 |
else if Keyword.is_proof name then Toplevel.reset_proof st0 |
56937 | 203 |
else NONE; |
204 |
in |
|
205 |
(case res of |
|
206 |
NONE => st0 |
|
57844
ae3eac418c5f
more emphatic warning via error_message (violating historic TTY protocol);
wenzelm
parents:
57839
diff
changeset
|
207 |
| SOME st => (Output.error_message (Toplevel.type_error tr st0 ^ " -- using reset state"); st)) |
56937 | 208 |
end) (); |
209 |
||
47336 | 210 |
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
|
211 |
if Goal.future_enabled 1 andalso Keyword.is_diag (Toplevel.name_of tr) then |
53192 | 212 |
(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
|
213 |
(fn () => Toplevel.command_exception int tr st); ([], SOME st)) |
51284
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51266
diff
changeset
|
214 |
else Toplevel.command_errors int tr st; |
47336 | 215 |
|
52510 | 216 |
fun check_cmts span tr st' = |
217 |
Toplevel.setmp_thread_position tr |
|
218 |
(fn () => |
|
219 |
Outer_Syntax.side_comments span |> maps (fn cmt => |
|
220 |
(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
|
221 |
handle exn => |
70d5f2f7d27f
reraise interrupts outside command regular transactions -- relevant for memo_stable;
wenzelm
parents:
52609
diff
changeset
|
222 |
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
|
223 |
else Runtime.exn_messages_ids exn)) (); |
52510 | 224 |
|
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
|
225 |
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
|
226 |
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
|
227 |
|
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 |
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
|
229 |
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
|
230 |
|
47336 | 231 |
fun proof_status tr st = |
232 |
(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
|
233 |
SOME prf => status tr (Proof.status_markup prf) |
47336 | 234 |
| NONE => ()); |
235 |
||
56937 | 236 |
fun eval_state span tr ({malformed, state, ...}: eval_state) = |
52509 | 237 |
if malformed then |
52526 | 238 |
{failed = true, malformed = malformed, command = tr, state = Toplevel.toplevel} |
48772 | 239 |
else |
240 |
let |
|
56937 | 241 |
val _ = Multithreading.interrupted (); |
47336 | 242 |
|
56937 | 243 |
val malformed' = Toplevel.is_malformed tr; |
244 |
val st = reset_state tr state; |
|
245 |
||
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
|
246 |
val _ = status tr Markup.running; |
56896
1e3c3df3a77c
run commands as interactive, again after long history of fluctuation (9e196062bf88, 173974e07dea, e07dacec79e7) and quite different infrastructure for print tasks;
wenzelm
parents:
56895
diff
changeset
|
247 |
val (errs1, result) = run true tr st; |
52509 | 248 |
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
|
249 |
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
|
250 |
val _ = List.app (Future.error_message (Toplevel.pos_of tr)) errs; |
48772 | 251 |
in |
252 |
(case result of |
|
253 |
NONE => |
|
254 |
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
|
255 |
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
|
256 |
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
|
257 |
val _ = if null errs then (report tr Markup.bad; Exn.interrupt ()) else (); |
52526 | 258 |
in {failed = true, malformed = malformed', command = tr, state = st} end |
48772 | 259 |
| SOME st' => |
260 |
let |
|
261 |
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
|
262 |
val _ = status tr Markup.finished; |
52526 | 263 |
in {failed = false, malformed = malformed', command = tr, state = st'} end) |
48772 | 264 |
end; |
47336 | 265 |
|
52534 | 266 |
in |
267 |
||
54526 | 268 |
fun eval init master_dir blobs span eval0 = |
52534 | 269 |
let |
270 |
val exec_id = Document_ID.make (); |
|
271 |
fun process () = |
|
272 |
let |
|
273 |
val tr = |
|
274 |
Position.setmp_thread_data (Position.id_only (Document_ID.print exec_id)) |
|
54526 | 275 |
(fn () => read init master_dir blobs span |> Toplevel.exec_id exec_id) (); |
52534 | 276 |
in eval_state span tr (eval_result eval0) end; |
52600 | 277 |
in Eval {exec_id = exec_id, eval_process = memo exec_id process} end; |
52534 | 278 |
|
47336 | 279 |
end; |
280 |
||
52509 | 281 |
|
282 |
(* print *) |
|
283 |
||
52600 | 284 |
datatype print = Print of |
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
285 |
{name: string, args: string list, delay: Time.time option, pri: int, persistent: bool, |
52600 | 286 |
exec_id: Document_ID.exec, print_process: unit memo}; |
287 |
||
56291
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
288 |
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
|
289 |
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
|
290 |
|
52526 | 291 |
type print_fn = Toplevel.transition -> Toplevel.state -> unit; |
52515 | 292 |
|
52647
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
293 |
type print_function = |
56291
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
294 |
{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
|
295 |
{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
|
296 |
|
52511 | 297 |
local |
298 |
||
52647
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
299 |
val print_functions = |
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
300 |
Synchronized.var "Command.print_functions" ([]: (string * print_function) list); |
52511 | 301 |
|
56265
785569927666
discontinued Toplevel.debug in favour of system option "exception_trace";
wenzelm
parents:
56034
diff
changeset
|
302 |
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
|
303 |
(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
|
304 |
handle exn => |
70d5f2f7d27f
reraise interrupts outside command regular transactions -- relevant for memo_stable;
wenzelm
parents:
52609
diff
changeset
|
305 |
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
|
306 |
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
|
307 |
|
52775
e0169f13bd37
keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents:
52774
diff
changeset
|
308 |
fun print_finished (Print {print_process, ...}) = memo_finished print_process; |
52656
9437f440ef3f
keep persistent prints only if actually finished;
wenzelm
parents:
52651
diff
changeset
|
309 |
|
52600 | 310 |
fun print_persistent (Print {persistent, ...}) = persistent; |
52596
40298d383463
global management of command execution fragments;
wenzelm
parents:
52586
diff
changeset
|
311 |
|
52853
4ab66773a41f
prefer canonical order, to avoid potential fluctuation due to front-end edits;
wenzelm
parents:
52850
diff
changeset
|
312 |
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
|
313 |
|
52511 | 314 |
in |
52509 | 315 |
|
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
316 |
fun print command_visible command_overlays command_name eval old_prints = |
52570 | 317 |
let |
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
318 |
val print_functions = Synchronized.value print_functions; |
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
319 |
|
52999
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
320 |
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
|
321 |
let |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
322 |
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
|
323 |
fun process () = |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
324 |
let |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
325 |
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
|
326 |
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
|
327 |
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
|
328 |
in |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
329 |
if failed andalso strict then () |
56265
785569927666
discontinued Toplevel.debug in favour of system option "exception_trace";
wenzelm
parents:
56034
diff
changeset
|
330 |
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
|
331 |
end; |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
332 |
in |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
333 |
Print { |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
334 |
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
|
335 |
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
|
336 |
end; |
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
337 |
|
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
wenzelm
parents:
52953
diff
changeset
|
338 |
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
|
339 |
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
|
340 |
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
|
341 |
|
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
342 |
fun new_print name args get_pr = |
52570 | 343 |
let |
56291
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
344 |
val params = {command_name = command_name, args = args, exec_id = eval_exec_id eval}; |
52570 | 345 |
in |
56303
4cc3f4db3447
clarified Isabelle/ML bootstrap, such that Execution does not require ML_Compiler;
wenzelm
parents:
56292
diff
changeset
|
346 |
(case Exn.capture (Runtime.controlled_execution NONE get_pr) params of |
52570 | 347 |
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
|
348 |
| 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
|
349 |
| Exn.Exn exn => SOME (bad_print name args exn)) |
52570 | 350 |
end; |
351 |
||
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
352 |
fun get_print (a, b) = |
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
353 |
(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
|
354 |
NONE => |
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
355 |
(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
|
356 |
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
|
357 |
| 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
|
358 |
| some => some); |
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
359 |
|
52570 | 360 |
val new_prints = |
361 |
if command_visible then |
|
52853
4ab66773a41f
prefer canonical order, to avoid potential fluctuation due to front-end edits;
wenzelm
parents:
52850
diff
changeset
|
362 |
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
|
363 |
|> sort_distinct overlay_ord |
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
364 |
|> map_filter get_print |
52656
9437f440ef3f
keep persistent prints only if actually finished;
wenzelm
parents:
52651
diff
changeset
|
365 |
else filter (fn print => print_finished print andalso print_persistent print) old_prints; |
52570 | 366 |
in |
52600 | 367 |
if eq_list print_eq (old_prints, new_prints) then NONE else SOME new_prints |
52570 | 368 |
end; |
52511 | 369 |
|
52647
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
370 |
fun print_function name f = |
52511 | 371 |
Synchronized.change print_functions (fn funs => |
372 |
(if not (AList.defined (op =) funs name) then () |
|
373 |
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
|
374 |
AList.update (op =) (name, f) funs)); |
52511 | 375 |
|
52571 | 376 |
fun no_print_function name = |
377 |
Synchronized.change print_functions (filter_out (equal name o #1)); |
|
378 |
||
52511 | 379 |
end; |
380 |
||
52526 | 381 |
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
|
382 |
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
|
383 |
(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
|
384 |
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
|
385 |
SOME {delay = NONE, pri = 1, persistent = false, strict = false, |
56292 | 386 |
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
|
387 |
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
|
388 |
|
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
389 |
val _ = |
52647
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
390 |
print_function "print_state" |
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
391 |
(fn {command_name, ...} => |
56895
f058120aaad4
discontinued Toplevel.print flag -- print uniformly according to Keyword.is_printed;
wenzelm
parents:
56887
diff
changeset
|
392 |
if Keyword.is_printed command_name then |
f058120aaad4
discontinued Toplevel.print flag -- print uniformly according to Keyword.is_printed;
wenzelm
parents:
56887
diff
changeset
|
393 |
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
|
394 |
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
|
395 |
else NONE); |
52509 | 396 |
|
52532 | 397 |
|
52600 | 398 |
(* combined execution *) |
399 |
||
400 |
type exec = eval * print list; |
|
401 |
val no_exec: exec = |
|
402 |
(Eval {exec_id = Document_ID.none, eval_process = memo_value init_eval_state}, []); |
|
52532 | 403 |
|
52600 | 404 |
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
|
405 |
| exec_ids (SOME (eval, prints)) = eval_exec_id eval :: map print_exec_id prints; |
52600 | 406 |
|
407 |
local |
|
408 |
||
52651 | 409 |
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
|
410 |
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
|
411 |
then |
52651 | 412 |
let |
413 |
val group = Future.worker_subgroup (); |
|
414 |
fun fork () = |
|
415 |
memo_fork {name = name, group = SOME group, deps = [], pri = pri, interrupts = true} |
|
416 |
execution_id print_process; |
|
417 |
in |
|
52762 | 418 |
(case delay of |
419 |
NONE => fork () |
|
420 |
| SOME d => ignore (Event_Timer.request (Time.+ (Time.now (), d)) fork)) |
|
52651 | 421 |
end |
422 |
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
|
423 |
|
52600 | 424 |
in |
425 |
||
52607
33a133d50616
clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents:
52606
diff
changeset
|
426 |
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
|
427 |
(memo_exec execution_id eval_process; List.app (run_print execution_id) prints); |
52532 | 428 |
|
47336 | 429 |
end; |
430 |
||
52600 | 431 |
end; |
432 |