author | wenzelm |
Fri, 18 Dec 2020 12:57:25 +0100 | |
changeset 72945 | 756b9cb8a176 |
parent 72841 | fd8d82c4433b |
child 72950 | ac6457a70db5 |
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 |
|
72747
5f9d66155081
clarified theory keywords: loaded_files are determined statically in Scala, but ML needs to do it semantically;
wenzelm
parents:
71675
diff
changeset
|
9 |
type blob = {file_node: string, src_path: Path.T, content: (SHA1.digest * string list) option} |
72841 | 10 |
val read_file: Path.T -> Position.T -> bool -> Path.T -> Token.file |
58928
23d0ffd48006
plain value Keywords.keywords, which might be used outside theory for bootstrap purposes;
wenzelm
parents:
58923
diff
changeset
|
11 |
val read_thy: Toplevel.state -> theory |
58934
385a4cc7426f
prefer externally provided keywords -- Command.read_thy may degenerate to bootstrap_thy in case of errors;
wenzelm
parents:
58928
diff
changeset
|
12 |
val read: Keyword.keywords -> theory -> Path.T-> (unit -> theory) -> |
72747
5f9d66155081
clarified theory keywords: loaded_files are determined statically in Scala, but ML needs to do it semantically;
wenzelm
parents:
71675
diff
changeset
|
13 |
blob Exn.result list * int -> Token.T list -> Toplevel.transition |
52600 | 14 |
type eval |
68184
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
15 |
val eval_command_id: eval -> Document_ID.command |
66379
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
wenzelm
parents:
66167
diff
changeset
|
16 |
val eval_exec_id: eval -> Document_ID.exec |
52607
33a133d50616
clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents:
52606
diff
changeset
|
17 |
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
|
18 |
val eval_running: eval -> bool |
52772 | 19 |
val eval_finished: eval -> bool |
68184
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
20 |
val eval_result_command: eval -> Toplevel.transition |
52536 | 21 |
val eval_result_state: eval -> Toplevel.state |
58934
385a4cc7426f
prefer externally provided keywords -- Command.read_thy may degenerate to bootstrap_thy in case of errors;
wenzelm
parents:
58928
diff
changeset
|
22 |
val eval: Keyword.keywords -> Path.T -> (unit -> theory) -> |
72747
5f9d66155081
clarified theory keywords: loaded_files are determined statically in Scala, but ML needs to do it semantically;
wenzelm
parents:
71675
diff
changeset
|
23 |
blob Exn.result list * int -> Document_ID.command -> Token.T list -> eval -> eval |
52600 | 24 |
type print |
68344 | 25 |
type print_fn = Toplevel.transition -> Toplevel.state -> unit |
26 |
val print0: {pri: int, print_fn: print_fn} -> eval -> print |
|
58923 | 27 |
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
|
28 |
eval -> print list -> print list option |
68366
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
29 |
val parallel_print: print -> bool |
52953
2c927b7501c5
explicit "strict" flag for print functions (flipped internal meaning);
wenzelm
parents:
52853
diff
changeset
|
30 |
type print_function = |
58923 | 31 |
{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
|
32 |
{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
|
33 |
val print_function: string -> print_function -> unit |
52571 | 34 |
val no_print_function: string -> unit |
52600 | 35 |
type exec = eval * print list |
62895
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
wenzelm
parents:
62826
diff
changeset
|
36 |
val init_exec: theory option -> exec |
52600 | 37 |
val no_exec: exec |
38 |
val exec_ids: exec option -> Document_ID.exec list |
|
52606 | 39 |
val exec: Document_ID.execution -> exec -> unit |
68366
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
40 |
val exec_parallel_prints: Document_ID.execution -> Future.task list -> exec -> exec option |
47336 | 41 |
end; |
42 |
||
43 |
structure Command: COMMAND = |
|
44 |
struct |
|
45 |
||
52536 | 46 |
(** main phases of execution **) |
47 |
||
59466
6fab87db556c
ensure that running into older execution is interruptible (see also b91dc7ab3464);
wenzelm
parents:
59348
diff
changeset
|
48 |
fun task_context group f = |
6fab87db556c
ensure that running into older execution is interruptible (see also b91dc7ab3464);
wenzelm
parents:
59348
diff
changeset
|
49 |
f |
6fab87db556c
ensure that running into older execution is interruptible (see also b91dc7ab3464);
wenzelm
parents:
59348
diff
changeset
|
50 |
|> Future.interruptible_task |
6fab87db556c
ensure that running into older execution is interruptible (see also b91dc7ab3464);
wenzelm
parents:
59348
diff
changeset
|
51 |
|> Future.task_context "Command.run_process" group; |
6fab87db556c
ensure that running into older execution is interruptible (see also b91dc7ab3464);
wenzelm
parents:
59348
diff
changeset
|
52 |
|
6fab87db556c
ensure that running into older execution is interruptible (see also b91dc7ab3464);
wenzelm
parents:
59348
diff
changeset
|
53 |
|
52510 | 54 |
(* read *) |
52509 | 55 |
|
72747
5f9d66155081
clarified theory keywords: loaded_files are determined statically in Scala, but ML needs to do it semantically;
wenzelm
parents:
71675
diff
changeset
|
56 |
type blob = {file_node: string, src_path: Path.T, content: (SHA1.digest * string list) option}; |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
53976
diff
changeset
|
57 |
|
72841 | 58 |
fun read_file_node file_node master_dir pos delimited src_path = |
54526 | 59 |
let |
71675 | 60 |
val _ = |
61 |
if Context_Position.pide_reports () |
|
72841 | 62 |
then Position.report pos (Markup.language_path delimited) else (); |
56504
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
63 |
val _ = |
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
64 |
(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
|
65 |
NONE => () |
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
66 |
| SOME (Url.File _) => () |
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
67 |
| _ => |
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
68 |
error ("Prover cannot load remote file " ^ |
72945 | 69 |
Markup.markup (Markup.url file_node) (quote file_node))); |
54526 | 70 |
val full_path = File.check_file (File.full_path master_dir src_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
|
71 |
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
|
72 |
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
|
73 |
val digest = SHA1.digest text; |
68858 | 74 |
val file_pos = Position.copy_id pos (Path.position full_path); |
75 |
in {src_path = src_path, lines = lines, digest = digest, pos = file_pos} end |
|
59685
c043306d2598
clarified markup for embedded files, early before execution;
wenzelm
parents:
59472
diff
changeset
|
76 |
handle ERROR msg => error (msg ^ Position.here pos); |
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
|
77 |
|
56504
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
78 |
val read_file = read_file_node ""; |
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
wenzelm
parents:
56458
diff
changeset
|
79 |
|
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
|
80 |
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
|
81 |
|
56447
1e77ed11f2f7
separate file_node vs. file_path, e.g. relevant on Windows for hyperlink to the latter;
wenzelm
parents:
56333
diff
changeset
|
82 |
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
|
83 |
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
|
84 |
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
|
85 |
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
|
86 |
(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
|
87 |
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
|
88 |
| 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
|
89 |
in {src_path = src_path, lines = lines, digest = digest, pos = file_pos} end |
54526 | 90 |
|
72747
5f9d66155081
clarified theory keywords: loaded_files are determined statically in Scala, but ML needs to do it semantically;
wenzelm
parents:
71675
diff
changeset
|
91 |
fun resolve_files master_dir (blobs, blobs_index) toks = |
57905
c0c5652e796e
separate module Command_Span: mostly syntactic representation;
wenzelm
parents:
57844
diff
changeset
|
92 |
(case Outer_Syntax.parse_spans toks of |
72841 | 93 |
[Command_Span.Span (Command_Span.Command_Span _, _)] => |
59689
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59685
diff
changeset
|
94 |
(case try (nth toks) blobs_index of |
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59685
diff
changeset
|
95 |
SOME tok => |
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59685
diff
changeset
|
96 |
let |
72841 | 97 |
val source = Token.input_of tok; |
98 |
val pos = Input.pos_of source; |
|
99 |
val delimited = Input.is_delimited source; |
|
100 |
||
72747
5f9d66155081
clarified theory keywords: loaded_files are determined statically in Scala, but ML needs to do it semantically;
wenzelm
parents:
71675
diff
changeset
|
101 |
fun make_file (Exn.Res {file_node, src_path, content = NONE}) = |
59689
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59685
diff
changeset
|
102 |
Exn.interruptible_capture (fn () => |
72841 | 103 |
read_file_node file_node master_dir pos delimited src_path) () |
72747
5f9d66155081
clarified theory keywords: loaded_files are determined statically in Scala, but ML needs to do it semantically;
wenzelm
parents:
71675
diff
changeset
|
104 |
| make_file (Exn.Res {file_node, src_path, content = SOME (digest, lines)}) = |
72841 | 105 |
(Position.report pos (Markup.language_path delimited); |
60027
c42d65e11b6e
clarified language_path markup (again): exactly once *after* static phase, see also 83071f4c8ae6 and c043306d2598;
wenzelm
parents:
59944
diff
changeset
|
106 |
Exn.Res (blob_file src_path lines digest file_node)) |
72747
5f9d66155081
clarified theory keywords: loaded_files are determined statically in Scala, but ML needs to do it semantically;
wenzelm
parents:
71675
diff
changeset
|
107 |
| make_file (Exn.Exn e) = Exn.Exn e; |
5f9d66155081
clarified theory keywords: loaded_files are determined statically in Scala, but ML needs to do it semantically;
wenzelm
parents:
71675
diff
changeset
|
108 |
val files = map make_file blobs; |
59689
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59685
diff
changeset
|
109 |
in |
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59685
diff
changeset
|
110 |
toks |> map_index (fn (i, tok) => |
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59685
diff
changeset
|
111 |
if i = blobs_index then Token.put_files files tok else tok) |
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59685
diff
changeset
|
112 |
end |
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59685
diff
changeset
|
113 |
| NONE => toks) |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
53976
diff
changeset
|
114 |
| _ => toks); |
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
53976
diff
changeset
|
115 |
|
61379
c57820ceead3
more direct HTML presentation, without print mode;
wenzelm
parents:
61213
diff
changeset
|
116 |
fun reports_of_token keywords tok = |
c57820ceead3
more direct HTML presentation, without print mode;
wenzelm
parents:
61213
diff
changeset
|
117 |
let |
c57820ceead3
more direct HTML presentation, without print mode;
wenzelm
parents:
61213
diff
changeset
|
118 |
val malformed_symbols = |
c57820ceead3
more direct HTML presentation, without print mode;
wenzelm
parents:
61213
diff
changeset
|
119 |
Input.source_explode (Token.input_of tok) |
c57820ceead3
more direct HTML presentation, without print mode;
wenzelm
parents:
61213
diff
changeset
|
120 |
|> map_filter (fn (sym, pos) => |
c57820ceead3
more direct HTML presentation, without print mode;
wenzelm
parents:
61213
diff
changeset
|
121 |
if Symbol.is_malformed sym |
64677
8dc24130e8fe
more uniform treatment of "bad" like other messages (with serial number);
wenzelm
parents:
63475
diff
changeset
|
122 |
then SOME ((pos, Markup.bad ()), "Malformed symbolic character") else NONE); |
61379
c57820ceead3
more direct HTML presentation, without print mode;
wenzelm
parents:
61213
diff
changeset
|
123 |
val is_malformed = Token.is_error tok orelse not (null malformed_symbols); |
c57820ceead3
more direct HTML presentation, without print mode;
wenzelm
parents:
61213
diff
changeset
|
124 |
val reports = Token.reports keywords tok @ Token.completion_report tok @ malformed_symbols; |
c57820ceead3
more direct HTML presentation, without print mode;
wenzelm
parents:
61213
diff
changeset
|
125 |
in (is_malformed, reports) end; |
c57820ceead3
more direct HTML presentation, without print mode;
wenzelm
parents:
61213
diff
changeset
|
126 |
|
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
|
127 |
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
|
128 |
|
60095 | 129 |
fun read_thy st = Toplevel.theory_of st |
130 |
handle Toplevel.UNDEF => Pure_Syn.bootstrap_thy; |
|
58928
23d0ffd48006
plain value Keywords.keywords, which might be used outside theory for bootstrap purposes;
wenzelm
parents:
58923
diff
changeset
|
131 |
|
59689
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59685
diff
changeset
|
132 |
fun read keywords thy master_dir init blobs_info span = |
52510 | 133 |
let |
58928
23d0ffd48006
plain value Keywords.keywords, which might be used outside theory for bootstrap purposes;
wenzelm
parents:
58923
diff
changeset
|
134 |
val command_reports = Outer_Syntax.command_reports thy; |
52509 | 135 |
|
68729
3a02b424d5fb
clarified ignored span / core range: include formal comments, e.g. relevant for error messages from antiquotations;
wenzelm
parents:
68728
diff
changeset
|
136 |
val core_range = Token.range_of (drop_suffix Token.is_ignored span); |
52510 | 137 |
val pos = |
138 |
(case find_first Token.is_command span of |
|
55708 | 139 |
SOME tok => Token.pos_of tok |
68728 | 140 |
| NONE => #1 core_range); |
52509 | 141 |
|
61379
c57820ceead3
more direct HTML presentation, without print mode;
wenzelm
parents:
61213
diff
changeset
|
142 |
val token_reports = map (reports_of_token keywords) span; |
c57820ceead3
more direct HTML presentation, without print mode;
wenzelm
parents:
61213
diff
changeset
|
143 |
val _ = Position.reports_text (maps #2 token_reports @ maps command_reports span); |
69506 | 144 |
|
145 |
val verbatim = |
|
146 |
span |> map_filter (fn tok => |
|
147 |
if Token.kind_of tok = Token.Verbatim then SOME (Token.pos_of tok) else NONE); |
|
148 |
val _ = |
|
149 |
if null verbatim then () |
|
150 |
else legacy_feature ("Old-style {* verbatim *} token -- use \<open>cartouche\<close> instead" ^ |
|
151 |
Position.here_list verbatim); |
|
52510 | 152 |
in |
61379
c57820ceead3
more direct HTML presentation, without print mode;
wenzelm
parents:
61213
diff
changeset
|
153 |
if exists #1 token_reports then Toplevel.malformed pos "Malformed command syntax" |
72747
5f9d66155081
clarified theory keywords: loaded_files are determined statically in Scala, but ML needs to do it semantically;
wenzelm
parents:
71675
diff
changeset
|
154 |
else Outer_Syntax.parse_span thy init (resolve_files master_dir blobs_info span) |
52510 | 155 |
end; |
52509 | 156 |
|
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
|
157 |
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
|
158 |
|
52509 | 159 |
|
160 |
(* eval *) |
|
47336 | 161 |
|
59472
513300fa2d09
discontinued special treatment of malformed commands (reverting e46cd0d26481), i.e. errors in outer syntax failure are treated like errors in inner syntax, name space lookup etc.;
wenzelm
parents:
59466
diff
changeset
|
162 |
type eval_state = {failed: bool, command: Toplevel.transition, state: Toplevel.state}; |
62895
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
wenzelm
parents:
62826
diff
changeset
|
163 |
|
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
wenzelm
parents:
62826
diff
changeset
|
164 |
fun init_eval_state opt_thy = |
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
wenzelm
parents:
62826
diff
changeset
|
165 |
{failed = false, |
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
wenzelm
parents:
62826
diff
changeset
|
166 |
command = Toplevel.empty, |
69883 | 167 |
state = |
168 |
(case opt_thy of |
|
69886 | 169 |
NONE => Toplevel.init_toplevel () |
69883 | 170 |
| SOME thy => Toplevel.theory_toplevel thy)}; |
52600 | 171 |
|
68184
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
172 |
datatype eval = |
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
173 |
Eval of |
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
174 |
{command_id: Document_ID.command, exec_id: Document_ID.exec, eval_process: eval_state lazy}; |
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
175 |
|
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
176 |
fun eval_command_id (Eval {command_id, ...}) = command_id; |
52600 | 177 |
|
56291
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
178 |
fun eval_exec_id (Eval {exec_id, ...}) = exec_id; |
59058
a78612c67ec0
renamed "pairself" to "apply2", in accordance to @{apply 2};
wenzelm
parents:
58934
diff
changeset
|
179 |
val eval_eq = op = o apply2 eval_exec_id; |
52607
33a133d50616
clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents:
52606
diff
changeset
|
180 |
|
56291
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
181 |
val eval_running = Execution.is_running_exec o eval_exec_id; |
59193
59f1591a11cb
eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents:
59188
diff
changeset
|
182 |
fun eval_finished (Eval {eval_process, ...}) = Lazy.is_finished eval_process; |
52772 | 183 |
|
59466
6fab87db556c
ensure that running into older execution is interruptible (see also b91dc7ab3464);
wenzelm
parents:
59348
diff
changeset
|
184 |
fun eval_result (Eval {eval_process, ...}) = |
68867
a8728e3f9822
more robust eval_result: enforce finished result stemming from previous run_process, fail if that was interrupted (e.g. due to resource problems);
wenzelm
parents:
68858
diff
changeset
|
185 |
Exn.release (Lazy.finished_result eval_process); |
59466
6fab87db556c
ensure that running into older execution is interruptible (see also b91dc7ab3464);
wenzelm
parents:
59348
diff
changeset
|
186 |
|
68184
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
187 |
val eval_result_command = #command o eval_result; |
52600 | 188 |
val eval_result_state = #state o eval_result; |
189 |
||
47336 | 190 |
local |
191 |
||
58923 | 192 |
fun reset_state keywords tr st0 = Toplevel.setmp_thread_position tr (fn () => |
56937 | 193 |
let |
194 |
val name = Toplevel.name_of tr; |
|
195 |
val res = |
|
58923 | 196 |
if Keyword.is_theory_body keywords name then Toplevel.reset_theory st0 |
197 |
else if Keyword.is_proof keywords name then Toplevel.reset_proof st0 |
|
68877
33d78e5e0a00
more robust reset_state: begin/end structure takes precedence over goal/proof structure;
wenzelm
parents:
68874
diff
changeset
|
198 |
else if Keyword.is_theory_end keywords name then |
33d78e5e0a00
more robust reset_state: begin/end structure takes precedence over goal/proof structure;
wenzelm
parents:
68874
diff
changeset
|
199 |
(case Toplevel.reset_notepad st0 of |
33d78e5e0a00
more robust reset_state: begin/end structure takes precedence over goal/proof structure;
wenzelm
parents:
68874
diff
changeset
|
200 |
NONE => Toplevel.reset_theory st0 |
33d78e5e0a00
more robust reset_state: begin/end structure takes precedence over goal/proof structure;
wenzelm
parents:
68874
diff
changeset
|
201 |
| some => some) |
56937 | 202 |
else NONE; |
203 |
in |
|
204 |
(case res of |
|
205 |
NONE => st0 |
|
60076 | 206 |
| SOME st => (Output.error_message (Toplevel.type_error tr ^ " -- using reset state"); st)) |
56937 | 207 |
end) (); |
208 |
||
58923 | 209 |
fun run keywords int tr st = |
68130
6fb85346cb79
clarified future scheduling parameters, with support for parallel_limit;
wenzelm
parents:
67570
diff
changeset
|
210 |
if Future.proofs_enabled 1 andalso Keyword.is_diag keywords (Toplevel.name_of tr) then |
69887 | 211 |
let |
212 |
val (tr1, tr2) = Toplevel.fork_presentation tr; |
|
213 |
val _ = |
|
214 |
Execution.fork {name = "Toplevel.diag", pos = Toplevel.pos_of tr, pri = ~1} |
|
215 |
(fn () => Toplevel.command_exception int tr1 st); |
|
216 |
in Toplevel.command_errors int tr2 st end |
|
51284
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51266
diff
changeset
|
217 |
else Toplevel.command_errors int tr st; |
47336 | 218 |
|
67570 | 219 |
fun check_token_comments ctxt tok = |
220 |
(Thy_Output.check_comments ctxt (Input.source_explode (Token.input_of tok)); []) |
|
221 |
handle exn => |
|
222 |
if Exn.is_interrupt exn then Exn.reraise exn |
|
223 |
else Runtime.exn_messages exn; |
|
67377
143665524d8e
check formal comments recursively, within arbitrary cartouches (unknown sublanguages);
wenzelm
parents:
67194
diff
changeset
|
224 |
|
67570 | 225 |
fun check_span_comments ctxt span tr = |
226 |
Toplevel.setmp_thread_position tr (fn () => maps (check_token_comments ctxt) span) (); |
|
52510 | 227 |
|
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
|
228 |
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
|
229 |
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
|
230 |
|
87910da843d5
more uniform status -- accommodate spurious Exn.Interrupt from user code, allow ML_Compiler.exn_messages_id to crash;
wenzelm
parents:
54671
diff
changeset
|
231 |
fun status tr m = |
70662 | 232 |
Toplevel.setmp_thread_position tr (fn () => Output.status [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
|
233 |
|
63474
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
wenzelm
parents:
62924
diff
changeset
|
234 |
fun command_indent tr st = |
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
wenzelm
parents:
62924
diff
changeset
|
235 |
(case try Toplevel.proof_of st of |
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
wenzelm
parents:
62924
diff
changeset
|
236 |
SOME prf => |
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
wenzelm
parents:
62924
diff
changeset
|
237 |
let val keywords = Thy_Header.get_keywords (Proof.theory_of prf) in |
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
wenzelm
parents:
62924
diff
changeset
|
238 |
if Keyword.command_kind keywords (Toplevel.name_of tr) = SOME Keyword.prf_script then |
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
wenzelm
parents:
62924
diff
changeset
|
239 |
(case try Proof.goal prf of |
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
wenzelm
parents:
62924
diff
changeset
|
240 |
SOME {goal, ...} => |
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
wenzelm
parents:
62924
diff
changeset
|
241 |
let val n = Thm.nprems_of goal |
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
wenzelm
parents:
62924
diff
changeset
|
242 |
in if n > 1 then report tr (Markup.command_indent (n - 1)) else () end |
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
wenzelm
parents:
62924
diff
changeset
|
243 |
| NONE => ()) |
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
wenzelm
parents:
62924
diff
changeset
|
244 |
else () |
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
wenzelm
parents:
62924
diff
changeset
|
245 |
end |
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
wenzelm
parents:
62924
diff
changeset
|
246 |
| NONE => ()); |
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
wenzelm
parents:
62924
diff
changeset
|
247 |
|
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
wenzelm
parents:
62924
diff
changeset
|
248 |
|
59472
513300fa2d09
discontinued special treatment of malformed commands (reverting e46cd0d26481), i.e. errors in outer syntax failure are treated like errors in inner syntax, name space lookup etc.;
wenzelm
parents:
59466
diff
changeset
|
249 |
fun eval_state keywords span tr ({state, ...}: eval_state) = |
513300fa2d09
discontinued special treatment of malformed commands (reverting e46cd0d26481), i.e. errors in outer syntax failure are treated like errors in inner syntax, name space lookup etc.;
wenzelm
parents:
59466
diff
changeset
|
250 |
let |
62924
ce47945ce4fb
tuned signature -- closer to Exn.Interrupt.expose in Scala;
wenzelm
parents:
62895
diff
changeset
|
251 |
val _ = Thread_Attributes.expose_interrupt (); |
47336 | 252 |
|
59472
513300fa2d09
discontinued special treatment of malformed commands (reverting e46cd0d26481), i.e. errors in outer syntax failure are treated like errors in inner syntax, name space lookup etc.;
wenzelm
parents:
59466
diff
changeset
|
253 |
val st = reset_state keywords tr state; |
56937 | 254 |
|
63474
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
wenzelm
parents:
62924
diff
changeset
|
255 |
val _ = command_indent tr st; |
59472
513300fa2d09
discontinued special treatment of malformed commands (reverting e46cd0d26481), i.e. errors in outer syntax failure are treated like errors in inner syntax, name space lookup etc.;
wenzelm
parents:
59466
diff
changeset
|
256 |
val _ = status tr Markup.running; |
513300fa2d09
discontinued special treatment of malformed commands (reverting e46cd0d26481), i.e. errors in outer syntax failure are treated like errors in inner syntax, name space lookup etc.;
wenzelm
parents:
59466
diff
changeset
|
257 |
val (errs1, result) = run keywords true tr st; |
67381 | 258 |
val errs2 = |
259 |
(case result of |
|
260 |
NONE => [] |
|
69892 | 261 |
| SOME st' => check_span_comments (Toplevel.presentation_context st') span tr); |
59472
513300fa2d09
discontinued special treatment of malformed commands (reverting e46cd0d26481), i.e. errors in outer syntax failure are treated like errors in inner syntax, name space lookup etc.;
wenzelm
parents:
59466
diff
changeset
|
262 |
val errs = errs1 @ errs2; |
513300fa2d09
discontinued special treatment of malformed commands (reverting e46cd0d26481), i.e. errors in outer syntax failure are treated like errors in inner syntax, name space lookup etc.;
wenzelm
parents:
59466
diff
changeset
|
263 |
val _ = List.app (Future.error_message (Toplevel.pos_of tr)) errs; |
513300fa2d09
discontinued special treatment of malformed commands (reverting e46cd0d26481), i.e. errors in outer syntax failure are treated like errors in inner syntax, name space lookup etc.;
wenzelm
parents:
59466
diff
changeset
|
264 |
in |
513300fa2d09
discontinued special treatment of malformed commands (reverting e46cd0d26481), i.e. errors in outer syntax failure are treated like errors in inner syntax, name space lookup etc.;
wenzelm
parents:
59466
diff
changeset
|
265 |
(case result of |
513300fa2d09
discontinued special treatment of malformed commands (reverting e46cd0d26481), i.e. errors in outer syntax failure are treated like errors in inner syntax, name space lookup etc.;
wenzelm
parents:
59466
diff
changeset
|
266 |
NONE => |
513300fa2d09
discontinued special treatment of malformed commands (reverting e46cd0d26481), i.e. errors in outer syntax failure are treated like errors in inner syntax, name space lookup etc.;
wenzelm
parents:
59466
diff
changeset
|
267 |
let |
513300fa2d09
discontinued special treatment of malformed commands (reverting e46cd0d26481), i.e. errors in outer syntax failure are treated like errors in inner syntax, name space lookup etc.;
wenzelm
parents:
59466
diff
changeset
|
268 |
val _ = status tr Markup.failed; |
513300fa2d09
discontinued special treatment of malformed commands (reverting e46cd0d26481), i.e. errors in outer syntax failure are treated like errors in inner syntax, name space lookup etc.;
wenzelm
parents:
59466
diff
changeset
|
269 |
val _ = status tr Markup.finished; |
68871
f5c76072db55
more explicit status for "canceled" command within theory node;
wenzelm
parents:
68868
diff
changeset
|
270 |
val _ = if null errs then (status tr Markup.canceled; Exn.interrupt ()) else (); |
59472
513300fa2d09
discontinued special treatment of malformed commands (reverting e46cd0d26481), i.e. errors in outer syntax failure are treated like errors in inner syntax, name space lookup etc.;
wenzelm
parents:
59466
diff
changeset
|
271 |
in {failed = true, command = tr, state = st} end |
513300fa2d09
discontinued special treatment of malformed commands (reverting e46cd0d26481), i.e. errors in outer syntax failure are treated like errors in inner syntax, name space lookup etc.;
wenzelm
parents:
59466
diff
changeset
|
272 |
| SOME st' => |
513300fa2d09
discontinued special treatment of malformed commands (reverting e46cd0d26481), i.e. errors in outer syntax failure are treated like errors in inner syntax, name space lookup etc.;
wenzelm
parents:
59466
diff
changeset
|
273 |
let |
68884
9b97d0b20d95
clarified quasi_consolidated state: ensure that exports are present for ok nodes;
wenzelm
parents:
68877
diff
changeset
|
274 |
val _ = |
9b97d0b20d95
clarified quasi_consolidated state: ensure that exports are present for ok nodes;
wenzelm
parents:
68877
diff
changeset
|
275 |
if Keyword.is_theory_end keywords (Toplevel.name_of tr) andalso |
9b97d0b20d95
clarified quasi_consolidated state: ensure that exports are present for ok nodes;
wenzelm
parents:
68877
diff
changeset
|
276 |
can (Toplevel.end_theory Position.none) st' |
9b97d0b20d95
clarified quasi_consolidated state: ensure that exports are present for ok nodes;
wenzelm
parents:
68877
diff
changeset
|
277 |
then status tr Markup.finalized else (); |
68886
1167f2d8a167
more robust: avoid race-condition of terminated vs. consolidated;
wenzelm
parents:
68884
diff
changeset
|
278 |
val _ = status tr Markup.finished; |
59472
513300fa2d09
discontinued special treatment of malformed commands (reverting e46cd0d26481), i.e. errors in outer syntax failure are treated like errors in inner syntax, name space lookup etc.;
wenzelm
parents:
59466
diff
changeset
|
279 |
in {failed = false, command = tr, state = st'} end) |
513300fa2d09
discontinued special treatment of malformed commands (reverting e46cd0d26481), i.e. errors in outer syntax failure are treated like errors in inner syntax, name space lookup etc.;
wenzelm
parents:
59466
diff
changeset
|
280 |
end; |
47336 | 281 |
|
52534 | 282 |
in |
283 |
||
68184
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
284 |
fun eval keywords master_dir init blobs_info command_id span eval0 = |
52534 | 285 |
let |
286 |
val exec_id = Document_ID.make (); |
|
287 |
fun process () = |
|
288 |
let |
|
58928
23d0ffd48006
plain value Keywords.keywords, which might be used outside theory for bootstrap purposes;
wenzelm
parents:
58923
diff
changeset
|
289 |
val eval_state0 = eval_result eval0; |
23d0ffd48006
plain value Keywords.keywords, which might be used outside theory for bootstrap purposes;
wenzelm
parents:
58923
diff
changeset
|
290 |
val thy = read_thy (#state eval_state0); |
52534 | 291 |
val tr = |
292 |
Position.setmp_thread_data (Position.id_only (Document_ID.print exec_id)) |
|
59689
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59685
diff
changeset
|
293 |
(fn () => |
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59685
diff
changeset
|
294 |
read keywords thy master_dir init blobs_info span |> Toplevel.exec_id exec_id) (); |
58934
385a4cc7426f
prefer externally provided keywords -- Command.read_thy may degenerate to bootstrap_thy in case of errors;
wenzelm
parents:
58928
diff
changeset
|
295 |
in eval_state keywords span tr eval_state0 end; |
68184
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
296 |
in |
68874 | 297 |
Eval {command_id = command_id, exec_id = exec_id, |
298 |
eval_process = Lazy.lazy_name "Command.eval" process} |
|
68184
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
299 |
end; |
52534 | 300 |
|
47336 | 301 |
end; |
302 |
||
52509 | 303 |
|
304 |
(* print *) |
|
305 |
||
52600 | 306 |
datatype print = Print of |
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
307 |
{name: string, args: string list, delay: Time.time option, pri: int, persistent: bool, |
59193
59f1591a11cb
eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents:
59188
diff
changeset
|
308 |
exec_id: Document_ID.exec, print_process: unit lazy}; |
52600 | 309 |
|
56291
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
310 |
fun print_exec_id (Print {exec_id, ...}) = exec_id; |
59058
a78612c67ec0
renamed "pairself" to "apply2", in accordance to @{apply 2};
wenzelm
parents:
58934
diff
changeset
|
311 |
val print_eq = op = o apply2 print_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
|
312 |
|
52526 | 313 |
type print_fn = Toplevel.transition -> Toplevel.state -> unit; |
52515 | 314 |
|
52647
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
315 |
type print_function = |
58923 | 316 |
{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
|
317 |
{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
|
318 |
|
52511 | 319 |
local |
320 |
||
52647
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
321 |
val print_functions = |
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
322 |
Synchronized.var "Command.print_functions" ([]: (string * print_function) list); |
52511 | 323 |
|
56265
785569927666
discontinued Toplevel.debug in favour of system option "exception_trace";
wenzelm
parents:
56034
diff
changeset
|
324 |
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
|
325 |
(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
|
326 |
handle exn => |
62505 | 327 |
if Exn.is_interrupt exn then Exn.reraise exn |
65948 | 328 |
else List.app (Future.error_message (Toplevel.pos_of tr)) (Runtime.exn_messages exn); |
52516
b5b3c888df9f
more exception handling -- make print functions total;
wenzelm
parents:
52515
diff
changeset
|
329 |
|
59193
59f1591a11cb
eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents:
59188
diff
changeset
|
330 |
fun print_finished (Print {print_process, ...}) = Lazy.is_finished print_process; |
52656
9437f440ef3f
keep persistent prints only if actually finished;
wenzelm
parents:
52651
diff
changeset
|
331 |
|
52600 | 332 |
fun print_persistent (Print {persistent, ...}) = persistent; |
52596
40298d383463
global management of command execution fragments;
wenzelm
parents:
52586
diff
changeset
|
333 |
|
52853
4ab66773a41f
prefer canonical order, to avoid potential fluctuation due to front-end edits;
wenzelm
parents:
52850
diff
changeset
|
334 |
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
|
335 |
|
68333 | 336 |
fun make_print (name, args) {delay, pri, persistent, strict, print_fn} eval = |
337 |
let |
|
338 |
val exec_id = Document_ID.make (); |
|
339 |
fun process () = |
|
340 |
let |
|
341 |
val {failed, command, state = st', ...} = eval_result eval; |
|
342 |
val tr = Toplevel.exec_id exec_id command; |
|
343 |
val opt_context = try Toplevel.generic_theory_of st'; |
|
344 |
in |
|
345 |
if failed andalso strict then () |
|
346 |
else print_error tr opt_context (fn () => print_fn tr st') |
|
347 |
end; |
|
348 |
in |
|
349 |
Print { |
|
350 |
name = name, args = args, delay = delay, pri = pri, persistent = persistent, |
|
351 |
exec_id = exec_id, print_process = Lazy.lazy_name "Command.print" process} |
|
352 |
end; |
|
353 |
||
354 |
fun bad_print name_args exn = |
|
355 |
make_print name_args {delay = NONE, pri = 0, persistent = false, |
|
356 |
strict = false, print_fn = fn _ => fn _ => Exn.reraise exn}; |
|
357 |
||
52511 | 358 |
in |
52509 | 359 |
|
68344 | 360 |
fun print0 {pri, print_fn} = |
68334 | 361 |
make_print ("", [serial_string ()]) |
68344 | 362 |
{delay = NONE, pri = pri, persistent = true, strict = true, print_fn = print_fn}; |
68334 | 363 |
|
58923 | 364 |
fun print command_visible command_overlays keywords command_name eval old_prints = |
52570 | 365 |
let |
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
366 |
val print_functions = Synchronized.value print_functions; |
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
367 |
|
68333 | 368 |
fun new_print (name, args) get_pr = |
52570 | 369 |
let |
58923 | 370 |
val params = |
371 |
{keywords = keywords, |
|
372 |
command_name = command_name, |
|
373 |
args = args, |
|
374 |
exec_id = eval_exec_id eval}; |
|
52570 | 375 |
in |
56303
4cc3f4db3447
clarified Isabelle/ML bootstrap, such that Execution does not require ML_Compiler;
wenzelm
parents:
56292
diff
changeset
|
376 |
(case Exn.capture (Runtime.controlled_execution NONE get_pr) params of |
52570 | 377 |
Exn.Res NONE => NONE |
68333 | 378 |
| Exn.Res (SOME pr) => SOME (make_print (name, args) pr eval) |
379 |
| Exn.Exn exn => SOME (bad_print (name, args) exn eval)) |
|
52570 | 380 |
end; |
381 |
||
68333 | 382 |
fun get_print (name, args) = |
383 |
(case find_first (fn Print print => (#name print, #args print) = (name, args)) old_prints of |
|
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
384 |
NONE => |
68333 | 385 |
(case AList.lookup (op =) print_functions name of |
386 |
NONE => |
|
387 |
SOME (bad_print (name, args) (ERROR ("Missing print function " ^ quote name)) eval) |
|
388 |
| SOME get_pr => new_print (name, args) get_pr) |
|
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
389 |
| some => some); |
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
390 |
|
68334 | 391 |
val retained_prints = |
392 |
filter (fn print => print_finished print andalso print_persistent print) old_prints; |
|
393 |
val visible_prints = |
|
52570 | 394 |
if command_visible then |
68333 | 395 |
fold (fn (name, _) => cons (name, [])) print_functions command_overlays |
52853
4ab66773a41f
prefer canonical order, to avoid potential fluctuation due to front-end edits;
wenzelm
parents:
52850
diff
changeset
|
396 |
|> sort_distinct overlay_ord |
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
397 |
|> map_filter get_print |
68334 | 398 |
else []; |
399 |
val new_prints = visible_prints @ retained_prints; |
|
52570 | 400 |
in |
52600 | 401 |
if eq_list print_eq (old_prints, new_prints) then NONE else SOME new_prints |
52570 | 402 |
end; |
52511 | 403 |
|
68366
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
404 |
fun parallel_print (Print {pri, ...}) = |
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
405 |
pri <= 0 orelse (Future.enabled () andalso Options.default_bool "parallel_print"); |
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
406 |
|
52647
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
407 |
fun print_function name f = |
52511 | 408 |
Synchronized.change print_functions (fn funs => |
68334 | 409 |
(if name = "" then error "Unnamed print function" else (); |
410 |
if not (AList.defined (op =) funs name) then () |
|
52511 | 411 |
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
|
412 |
AList.update (op =) (name, f) funs)); |
52511 | 413 |
|
52571 | 414 |
fun no_print_function name = |
415 |
Synchronized.change print_functions (filter_out (equal name o #1)); |
|
416 |
||
52511 | 417 |
end; |
418 |
||
52526 | 419 |
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
|
420 |
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
|
421 |
(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
|
422 |
if null args then |
60610
f52b4b0c10c4
improved scheduling for urgent tasks, using farm of replacement threads (may lead to factor 2 overloading, but CPUs are usually hyperthreaded);
wenzelm
parents:
60095
diff
changeset
|
423 |
SOME {delay = NONE, pri = Task_Queue.urgent_pri + 2, persistent = false, strict = false, |
56292 | 424 |
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
|
425 |
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
|
426 |
|
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
427 |
val _ = |
52647
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
428 |
print_function "print_state" |
58923 | 429 |
(fn {keywords, command_name, ...} => |
61213 | 430 |
if Options.default_bool "editor_output_state" andalso Keyword.is_printed keywords command_name |
431 |
then |
|
60610
f52b4b0c10c4
improved scheduling for urgent tasks, using farm of replacement threads (may lead to factor 2 overloading, but CPUs are usually hyperthreaded);
wenzelm
parents:
60095
diff
changeset
|
432 |
SOME {delay = NONE, pri = Task_Queue.urgent_pri + 1, persistent = false, strict = false, |
61208 | 433 |
print_fn = fn _ => fn st => |
434 |
if Toplevel.is_proof st then Output.state (Toplevel.string_of_state st) |
|
435 |
else ()} |
|
56895
f058120aaad4
discontinued Toplevel.print flag -- print uniformly according to Keyword.is_printed;
wenzelm
parents:
56887
diff
changeset
|
436 |
else NONE); |
52509 | 437 |
|
52532 | 438 |
|
52600 | 439 |
(* combined execution *) |
440 |
||
441 |
type exec = eval * print list; |
|
62895
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
wenzelm
parents:
62826
diff
changeset
|
442 |
|
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
wenzelm
parents:
62826
diff
changeset
|
443 |
fun init_exec opt_thy : exec = |
68184
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
444 |
(Eval |
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
445 |
{command_id = Document_ID.none, exec_id = Document_ID.none, |
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
446 |
eval_process = Lazy.value (init_eval_state opt_thy)}, []); |
62895
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
wenzelm
parents:
62826
diff
changeset
|
447 |
|
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
wenzelm
parents:
62826
diff
changeset
|
448 |
val no_exec = init_exec NONE; |
52532 | 449 |
|
52600 | 450 |
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
|
451 |
| exec_ids (SOME (eval, prints)) = eval_exec_id eval :: map print_exec_id prints; |
52600 | 452 |
|
453 |
local |
|
454 |
||
59193
59f1591a11cb
eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents:
59188
diff
changeset
|
455 |
fun run_process execution_id exec_id process = |
59f1591a11cb
eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents:
59188
diff
changeset
|
456 |
let val group = Future.worker_subgroup () in |
59f1591a11cb
eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents:
59188
diff
changeset
|
457 |
if Execution.running execution_id exec_id [group] then |
68931 | 458 |
ignore (task_context group (fn () => Lazy.force_result {strict = true} process) ()) |
59193
59f1591a11cb
eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents:
59188
diff
changeset
|
459 |
else () |
59f1591a11cb
eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents:
59188
diff
changeset
|
460 |
end; |
59f1591a11cb
eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents:
59188
diff
changeset
|
461 |
|
59328
b83d6c3c439a
ignore print process even after fork, to avoid loosing active worker threads;
wenzelm
parents:
59193
diff
changeset
|
462 |
fun ignore_process process = |
b83d6c3c439a
ignore print process even after fork, to avoid loosing active worker threads;
wenzelm
parents:
59193
diff
changeset
|
463 |
Lazy.is_running process orelse Lazy.is_finished process; |
b83d6c3c439a
ignore print process even after fork, to avoid loosing active worker threads;
wenzelm
parents:
59193
diff
changeset
|
464 |
|
68184
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
465 |
fun run_eval execution_id (Eval {exec_id, eval_process, ...}) = |
59193
59f1591a11cb
eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents:
59188
diff
changeset
|
466 |
if Lazy.is_finished eval_process then () |
59f1591a11cb
eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents:
59188
diff
changeset
|
467 |
else run_process execution_id exec_id eval_process; |
59f1591a11cb
eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents:
59188
diff
changeset
|
468 |
|
68366
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
469 |
fun fork_print execution_id deps (Print {name, delay, pri, exec_id, print_process, ...}) = |
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
470 |
let |
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
471 |
val group = Future.worker_subgroup (); |
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
472 |
fun fork () = |
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
473 |
ignore ((singleton o Future.forks) |
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
474 |
{name = name, group = SOME group, deps = deps, pri = pri, interrupts = true} |
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
475 |
(fn () => |
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
476 |
if ignore_process print_process then () |
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
477 |
else run_process execution_id exec_id print_process)); |
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
478 |
in |
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
479 |
(case delay of |
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
480 |
NONE => fork () |
69826
1bea05713dde
physical vs. logical events, the latter takes GC time into account;
wenzelm
parents:
69506
diff
changeset
|
481 |
| SOME d => ignore (Event_Timer.request {physical = true} (Time.now () + d) fork)) |
68366
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
482 |
end; |
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
483 |
|
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
484 |
fun run_print execution_id (print as Print {exec_id, print_process, ...}) = |
59328
b83d6c3c439a
ignore print process even after fork, to avoid loosing active worker threads;
wenzelm
parents:
59193
diff
changeset
|
485 |
if ignore_process print_process then () |
68366
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
486 |
else if parallel_print print then fork_print execution_id [] print |
59193
59f1591a11cb
eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents:
59188
diff
changeset
|
487 |
else run_process execution_id exec_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
|
488 |
|
52600 | 489 |
in |
490 |
||
59193
59f1591a11cb
eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents:
59188
diff
changeset
|
491 |
fun exec execution_id (eval, prints) = |
59f1591a11cb
eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents:
59188
diff
changeset
|
492 |
(run_eval execution_id eval; List.app (run_print execution_id) prints); |
52532 | 493 |
|
68366
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
494 |
fun exec_parallel_prints execution_id deps (exec as (Eval {eval_process, ...}, prints)) = |
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
495 |
if Lazy.is_finished eval_process |
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
496 |
then (List.app (fork_print execution_id deps) prints; NONE) |
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
497 |
else SOME exec; |
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
498 |
|
47336 | 499 |
end; |
500 |
||
52600 | 501 |
end; |