author | wenzelm |
Mon, 11 Dec 2023 14:05:19 +0100 | |
changeset 79244 | 197b155f8818 |
parent 78787 | a7e4b412cc7c |
child 80826 | 7feaa04d332b |
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} |
58928
23d0ffd48006
plain value Keywords.keywords, which might be used outside theory for bootstrap purposes;
wenzelm
parents:
58923
diff
changeset
|
10 |
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
|
11 |
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
|
12 |
blob Exn.result list * int -> Token.T list -> Toplevel.transition |
73044 | 13 |
val read_span: Keyword.keywords -> Toplevel.state -> Path.T -> (unit -> theory) -> |
14 |
Command_Span.span -> Toplevel.transition |
|
52600 | 15 |
type eval |
68184
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
16 |
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
|
17 |
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
|
18 |
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
|
19 |
val eval_running: eval -> bool |
52772 | 20 |
val eval_finished: eval -> bool |
68184
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
21 |
val eval_result_command: eval -> Toplevel.transition |
52536 | 22 |
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
|
23 |
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
|
24 |
blob Exn.result list * int -> Document_ID.command -> Token.T list -> eval -> eval |
52600 | 25 |
type print |
68344 | 26 |
type print_fn = Toplevel.transition -> Toplevel.state -> unit |
27 |
val print0: {pri: int, print_fn: print_fn} -> eval -> print |
|
76430 | 28 |
val print: Keyword.keywords -> bool -> (string * string list) list -> string -> |
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
29 |
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
|
30 |
val parallel_print: print -> bool |
52953
2c927b7501c5
explicit "strict" flag for print functions (flipped internal meaning);
wenzelm
parents:
52853
diff
changeset
|
31 |
type print_function = |
58923 | 32 |
{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
|
33 |
{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
|
34 |
val print_function: string -> print_function -> unit |
52571 | 35 |
val no_print_function: string -> unit |
52600 | 36 |
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
|
37 |
val init_exec: theory option -> exec |
52600 | 38 |
val no_exec: exec |
39 |
val exec_ids: exec option -> Document_ID.exec list |
|
52606 | 40 |
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
|
41 |
val exec_parallel_prints: Document_ID.execution -> Future.task list -> exec -> exec option |
47336 | 42 |
end; |
43 |
||
44 |
structure Command: COMMAND = |
|
45 |
struct |
|
46 |
||
52536 | 47 |
(** main phases of execution **) |
48 |
||
59466
6fab87db556c
ensure that running into older execution is interruptible (see also b91dc7ab3464);
wenzelm
parents:
59348
diff
changeset
|
49 |
fun task_context group f = |
6fab87db556c
ensure that running into older execution is interruptible (see also b91dc7ab3464);
wenzelm
parents:
59348
diff
changeset
|
50 |
f |
6fab87db556c
ensure that running into older execution is interruptible (see also b91dc7ab3464);
wenzelm
parents:
59348
diff
changeset
|
51 |
|> Future.interruptible_task |
6fab87db556c
ensure that running into older execution is interruptible (see also b91dc7ab3464);
wenzelm
parents:
59348
diff
changeset
|
52 |
|> Future.task_context "Command.run_process" group; |
6fab87db556c
ensure that running into older execution is interruptible (see also b91dc7ab3464);
wenzelm
parents:
59348
diff
changeset
|
53 |
|
6fab87db556c
ensure that running into older execution is interruptible (see also b91dc7ab3464);
wenzelm
parents:
59348
diff
changeset
|
54 |
|
52510 | 55 |
(* read *) |
52509 | 56 |
|
72747
5f9d66155081
clarified theory keywords: loaded_files are determined statically in Scala, but ML needs to do it semantically;
wenzelm
parents:
71675
diff
changeset
|
57 |
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
|
58 |
|
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
|
59 |
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
|
60 |
|
56447
1e77ed11f2f7
separate file_node vs. file_path, e.g. relevant on Windows for hyperlink to the latter;
wenzelm
parents:
56333
diff
changeset
|
61 |
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
|
62 |
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
|
63 |
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
|
64 |
Position.file file_node |> |
74166 | 65 |
(case Position.id_of (Position.thread_data ()) of |
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
|
66 |
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
|
67 |
| 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
|
68 |
in {src_path = src_path, lines = lines, digest = digest, pos = file_pos} end |
54526 | 69 |
|
72747
5f9d66155081
clarified theory keywords: loaded_files are determined statically in Scala, but ML needs to do it semantically;
wenzelm
parents:
71675
diff
changeset
|
70 |
fun resolve_files master_dir (blobs, blobs_index) toks = |
57905
c0c5652e796e
separate module Command_Span: mostly syntactic representation;
wenzelm
parents:
57844
diff
changeset
|
71 |
(case Outer_Syntax.parse_spans toks of |
72841 | 72 |
[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
|
73 |
(case try (nth toks) blobs_index of |
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59685
diff
changeset
|
74 |
SOME tok => |
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59685
diff
changeset
|
75 |
let |
72841 | 76 |
val source = Token.input_of tok; |
77 |
val pos = Input.pos_of source; |
|
78 |
val delimited = Input.is_delimited source; |
|
79 |
||
76806 | 80 |
fun make_file (Exn.Res {file_node, src_path, content}) = |
81 |
let val _ = Position.report pos (Markup.language_path delimited) in |
|
82 |
case content of |
|
83 |
NONE => |
|
78705
fde0b195cb7d
clarified signature: avoid association with potentially dangerous Exn.capture;
wenzelm
parents:
78681
diff
changeset
|
84 |
Exn.result (fn () => |
76806 | 85 |
Resources.read_file_node file_node master_dir (src_path, pos)) () |
86 |
| SOME (digest, lines) => Exn.Res (blob_file src_path lines digest file_node) |
|
87 |
end |
|
72747
5f9d66155081
clarified theory keywords: loaded_files are determined statically in Scala, but ML needs to do it semantically;
wenzelm
parents:
71675
diff
changeset
|
88 |
| 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
|
89 |
val files = map make_file blobs; |
59689
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59685
diff
changeset
|
90 |
in |
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59685
diff
changeset
|
91 |
toks |> map_index (fn (i, tok) => |
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59685
diff
changeset
|
92 |
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
|
93 |
end |
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59685
diff
changeset
|
94 |
| NONE => toks) |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
53976
diff
changeset
|
95 |
| _ => toks); |
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
53976
diff
changeset
|
96 |
|
61379
c57820ceead3
more direct HTML presentation, without print mode;
wenzelm
parents:
61213
diff
changeset
|
97 |
fun reports_of_token keywords tok = |
c57820ceead3
more direct HTML presentation, without print mode;
wenzelm
parents:
61213
diff
changeset
|
98 |
let |
c57820ceead3
more direct HTML presentation, without print mode;
wenzelm
parents:
61213
diff
changeset
|
99 |
val malformed_symbols = |
c57820ceead3
more direct HTML presentation, without print mode;
wenzelm
parents:
61213
diff
changeset
|
100 |
Input.source_explode (Token.input_of tok) |
c57820ceead3
more direct HTML presentation, without print mode;
wenzelm
parents:
61213
diff
changeset
|
101 |
|> map_filter (fn (sym, pos) => |
c57820ceead3
more direct HTML presentation, without print mode;
wenzelm
parents:
61213
diff
changeset
|
102 |
if Symbol.is_malformed sym |
64677
8dc24130e8fe
more uniform treatment of "bad" like other messages (with serial number);
wenzelm
parents:
63475
diff
changeset
|
103 |
then SOME ((pos, Markup.bad ()), "Malformed symbolic character") else NONE); |
61379
c57820ceead3
more direct HTML presentation, without print mode;
wenzelm
parents:
61213
diff
changeset
|
104 |
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
|
105 |
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
|
106 |
in (is_malformed, reports) end; |
c57820ceead3
more direct HTML presentation, without print mode;
wenzelm
parents:
61213
diff
changeset
|
107 |
|
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
|
108 |
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
|
109 |
|
60095 | 110 |
fun read_thy st = Toplevel.theory_of st |
111 |
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
|
112 |
|
59689
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59685
diff
changeset
|
113 |
fun read keywords thy master_dir init blobs_info span = |
52510 | 114 |
let |
58928
23d0ffd48006
plain value Keywords.keywords, which might be used outside theory for bootstrap purposes;
wenzelm
parents:
58923
diff
changeset
|
115 |
val command_reports = Outer_Syntax.command_reports thy; |
61379
c57820ceead3
more direct HTML presentation, without print mode;
wenzelm
parents:
61213
diff
changeset
|
116 |
val token_reports = map (reports_of_token keywords) span; |
c57820ceead3
more direct HTML presentation, without print mode;
wenzelm
parents:
61213
diff
changeset
|
117 |
val _ = Position.reports_text (maps #2 token_reports @ maps command_reports span); |
69506 | 118 |
|
74673 | 119 |
val core_range = Token.core_range_of span; |
120 |
val tr = |
|
121 |
if exists #1 token_reports |
|
122 |
then Toplevel.malformed (#1 core_range) "Malformed command syntax" |
|
123 |
else Outer_Syntax.parse_span thy init (resolve_files master_dir blobs_info span); |
|
124 |
val _ = |
|
125 |
if Toplevel.is_ignored tr orelse Toplevel.is_malformed tr then () |
|
78279
dab089b25eb6
more markup for command_span: this allows to reconstruct Thy_Element structure without knowing the outer syntax;
wenzelm
parents:
76806
diff
changeset
|
126 |
else |
dab089b25eb6
more markup for command_span: this allows to reconstruct Thy_Element structure without knowing the outer syntax;
wenzelm
parents:
76806
diff
changeset
|
127 |
let |
dab089b25eb6
more markup for command_span: this allows to reconstruct Thy_Element structure without knowing the outer syntax;
wenzelm
parents:
76806
diff
changeset
|
128 |
val name = Toplevel.name_of tr; |
dab089b25eb6
more markup for command_span: this allows to reconstruct Thy_Element structure without knowing the outer syntax;
wenzelm
parents:
76806
diff
changeset
|
129 |
val kind = the_default "" (Keyword.command_kind (Thy_Header.get_keywords thy) name); |
dab089b25eb6
more markup for command_span: this allows to reconstruct Thy_Element structure without knowing the outer syntax;
wenzelm
parents:
76806
diff
changeset
|
130 |
val markup = Markup.command_span {name = name, kind = kind}; |
dab089b25eb6
more markup for command_span: this allows to reconstruct Thy_Element structure without knowing the outer syntax;
wenzelm
parents:
76806
diff
changeset
|
131 |
in Position.report (#1 core_range) markup end; |
74673 | 132 |
in tr end; |
52509 | 133 |
|
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
|
134 |
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
|
135 |
|
73044 | 136 |
fun read_span keywords st master_dir init = |
137 |
Command_Span.content #> read keywords (read_thy st) master_dir init ([], ~1); |
|
138 |
||
52509 | 139 |
|
140 |
(* eval *) |
|
47336 | 141 |
|
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
|
142 |
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
|
143 |
|
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
wenzelm
parents:
62826
diff
changeset
|
144 |
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
|
145 |
{failed = false, |
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
wenzelm
parents:
62826
diff
changeset
|
146 |
command = Toplevel.empty, |
76415 | 147 |
state = Toplevel.make_state opt_thy}; |
52600 | 148 |
|
68184
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
149 |
datatype eval = |
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
150 |
Eval of |
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
151 |
{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
|
152 |
|
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
153 |
fun eval_command_id (Eval {command_id, ...}) = command_id; |
52600 | 154 |
|
56291
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
155 |
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
|
156 |
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
|
157 |
|
56291
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
158 |
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
|
159 |
fun eval_finished (Eval {eval_process, ...}) = Lazy.is_finished eval_process; |
52772 | 160 |
|
59466
6fab87db556c
ensure that running into older execution is interruptible (see also b91dc7ab3464);
wenzelm
parents:
59348
diff
changeset
|
161 |
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
|
162 |
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
|
163 |
|
68184
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
164 |
val eval_result_command = #command o eval_result; |
52600 | 165 |
val eval_result_state = #state o eval_result; |
166 |
||
47336 | 167 |
local |
168 |
||
58923 | 169 |
fun reset_state keywords tr st0 = Toplevel.setmp_thread_position tr (fn () => |
56937 | 170 |
let |
171 |
val name = Toplevel.name_of tr; |
|
172 |
val res = |
|
58923 | 173 |
if Keyword.is_theory_body keywords name then Toplevel.reset_theory st0 |
174 |
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
|
175 |
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
|
176 |
(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
|
177 |
NONE => Toplevel.reset_theory st0 |
33d78e5e0a00
more robust reset_state: begin/end structure takes precedence over goal/proof structure;
wenzelm
parents:
68874
diff
changeset
|
178 |
| some => some) |
56937 | 179 |
else NONE; |
180 |
in |
|
181 |
(case res of |
|
182 |
NONE => st0 |
|
60076 | 183 |
| SOME st => (Output.error_message (Toplevel.type_error tr ^ " -- using reset state"); st)) |
56937 | 184 |
end) (); |
185 |
||
58923 | 186 |
fun run keywords int tr st = |
68130
6fb85346cb79
clarified future scheduling parameters, with support for parallel_limit;
wenzelm
parents:
67570
diff
changeset
|
187 |
if Future.proofs_enabled 1 andalso Keyword.is_diag keywords (Toplevel.name_of tr) then |
69887 | 188 |
let |
189 |
val (tr1, tr2) = Toplevel.fork_presentation tr; |
|
190 |
val _ = |
|
191 |
Execution.fork {name = "Toplevel.diag", pos = Toplevel.pos_of tr, pri = ~1} |
|
192 |
(fn () => Toplevel.command_exception int tr1 st); |
|
193 |
in Toplevel.command_errors int tr2 st end |
|
51284
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51266
diff
changeset
|
194 |
else Toplevel.command_errors int tr st; |
47336 | 195 |
|
78725
3c02ad5a1586
clarified treatment of exceptions: avoid catch-all handlers;
wenzelm
parents:
78713
diff
changeset
|
196 |
fun check_comments ctxt = |
3c02ad5a1586
clarified treatment of exceptions: avoid catch-all handlers;
wenzelm
parents:
78713
diff
changeset
|
197 |
Document_Output.check_comments ctxt o Input.source_explode o Token.input_of; |
3c02ad5a1586
clarified treatment of exceptions: avoid catch-all handlers;
wenzelm
parents:
78713
diff
changeset
|
198 |
|
67570 | 199 |
fun check_token_comments ctxt tok = |
78725
3c02ad5a1586
clarified treatment of exceptions: avoid catch-all handlers;
wenzelm
parents:
78713
diff
changeset
|
200 |
(case Exn.result (fn () => check_comments ctxt tok) () of |
3c02ad5a1586
clarified treatment of exceptions: avoid catch-all handlers;
wenzelm
parents:
78713
diff
changeset
|
201 |
Exn.Res () => [] |
3c02ad5a1586
clarified treatment of exceptions: avoid catch-all handlers;
wenzelm
parents:
78713
diff
changeset
|
202 |
| Exn.Exn exn => Runtime.exn_messages exn); |
67377
143665524d8e
check formal comments recursively, within arbitrary cartouches (unknown sublanguages);
wenzelm
parents:
67194
diff
changeset
|
203 |
|
67570 | 204 |
fun check_span_comments ctxt span tr = |
205 |
Toplevel.setmp_thread_position tr (fn () => maps (check_token_comments ctxt) span) (); |
|
52510 | 206 |
|
73099 | 207 |
fun report_indent tr st = |
63474
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
wenzelm
parents:
62924
diff
changeset
|
208 |
(case try Toplevel.proof_of st of |
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
wenzelm
parents:
62924
diff
changeset
|
209 |
SOME prf => |
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
wenzelm
parents:
62924
diff
changeset
|
210 |
let val keywords = Thy_Header.get_keywords (Proof.theory_of prf) in |
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
wenzelm
parents:
62924
diff
changeset
|
211 |
if Keyword.command_kind keywords (Toplevel.name_of tr) = SOME Keyword.prf_script then |
73097 | 212 |
(case try (Thm.nprems_of o #goal o Proof.goal) prf of |
213 |
NONE => () |
|
214 |
| SOME 0 => () |
|
215 |
| SOME n => |
|
73105
578a33042aa6
clarified: command keyword position is sufficient (amending 693a39f2cddc);
wenzelm
parents:
73100
diff
changeset
|
216 |
let val report = Markup.markup_only (Markup.command_indent (n - 1)); |
578a33042aa6
clarified: command keyword position is sufficient (amending 693a39f2cddc);
wenzelm
parents:
73100
diff
changeset
|
217 |
in Toplevel.setmp_thread_position tr (fn () => Output.report [report]) () end) |
63474
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
wenzelm
parents:
62924
diff
changeset
|
218 |
else () |
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
wenzelm
parents:
62924
diff
changeset
|
219 |
end |
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
wenzelm
parents:
62924
diff
changeset
|
220 |
| NONE => ()); |
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
wenzelm
parents:
62924
diff
changeset
|
221 |
|
73097 | 222 |
fun status tr m = |
223 |
Toplevel.setmp_thread_position tr (fn () => Output.status [Markup.markup_only m]) (); |
|
224 |
||
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
|
225 |
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
|
226 |
let |
78713 | 227 |
val _ = Isabelle_Thread.expose_interrupt (); |
47336 | 228 |
|
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
|
229 |
val st = reset_state keywords tr state; |
56937 | 230 |
|
73099 | 231 |
val _ = report_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
|
232 |
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
|
233 |
val (errs1, result) = run keywords true tr st; |
67381 | 234 |
val errs2 = |
235 |
(case result of |
|
236 |
NONE => [] |
|
69892 | 237 |
| 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
|
238 |
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
|
239 |
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
|
240 |
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
|
241 |
(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
|
242 |
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
|
243 |
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
|
244 |
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
|
245 |
val _ = status tr Markup.finished; |
78681 | 246 |
val _ = |
78787 | 247 |
if null errs then (status tr Markup.canceled; Isabelle_Thread.raise_interrupt ()) |
78681 | 248 |
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
|
249 |
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
|
250 |
| 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
|
251 |
let |
68884
9b97d0b20d95
clarified quasi_consolidated state: ensure that exports are present for ok nodes;
wenzelm
parents:
68877
diff
changeset
|
252 |
val _ = |
9b97d0b20d95
clarified quasi_consolidated state: ensure that exports are present for ok nodes;
wenzelm
parents:
68877
diff
changeset
|
253 |
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
|
254 |
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
|
255 |
then status tr Markup.finalized else (); |
68886
1167f2d8a167
more robust: avoid race-condition of terminated vs. consolidated;
wenzelm
parents:
68884
diff
changeset
|
256 |
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
|
257 |
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
|
258 |
end; |
47336 | 259 |
|
52534 | 260 |
in |
261 |
||
68184
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
262 |
fun eval keywords master_dir init blobs_info command_id span eval0 = |
52534 | 263 |
let |
264 |
val exec_id = Document_ID.make (); |
|
265 |
fun process () = |
|
266 |
let |
|
58928
23d0ffd48006
plain value Keywords.keywords, which might be used outside theory for bootstrap purposes;
wenzelm
parents:
58923
diff
changeset
|
267 |
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
|
268 |
val thy = read_thy (#state eval_state0); |
52534 | 269 |
val tr = |
270 |
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
|
271 |
(fn () => |
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents:
59685
diff
changeset
|
272 |
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
|
273 |
in eval_state keywords span tr eval_state0 end; |
68184
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
274 |
in |
68874 | 275 |
Eval {command_id = command_id, exec_id = exec_id, |
276 |
eval_process = Lazy.lazy_name "Command.eval" process} |
|
68184
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
277 |
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, |
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
|
286 |
exec_id: Document_ID.exec, print_process: unit lazy}; |
52600 | 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; |
59058
a78612c67ec0
renamed "pairself" to "apply2", in accordance to @{apply 2};
wenzelm
parents:
58934
diff
changeset
|
289 |
val print_eq = op = o apply2 print_exec_id; |
76418 | 290 |
fun print_equiv (name', args') (Print {name, args, ...}) = name' = name andalso args' = args; |
56291
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
wenzelm
parents:
56265
diff
changeset
|
291 |
|
52526 | 292 |
type print_fn = Toplevel.transition -> Toplevel.state -> unit; |
52515 | 293 |
|
52647
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
294 |
type print_function = |
58923 | 295 |
{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
|
296 |
{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
|
297 |
|
52511 | 298 |
local |
299 |
||
52647
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
300 |
val print_functions = |
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
301 |
Synchronized.var "Command.print_functions" ([]: (string * print_function) list); |
52511 | 302 |
|
78725
3c02ad5a1586
clarified treatment of exceptions: avoid catch-all handlers;
wenzelm
parents:
78713
diff
changeset
|
303 |
fun print_wrapper tr opt_context = |
3c02ad5a1586
clarified treatment of exceptions: avoid catch-all handlers;
wenzelm
parents:
78713
diff
changeset
|
304 |
Toplevel.setmp_thread_position tr o Runtime.controlled_execution opt_context; |
3c02ad5a1586
clarified treatment of exceptions: avoid catch-all handlers;
wenzelm
parents:
78713
diff
changeset
|
305 |
|
56265
785569927666
discontinued Toplevel.debug in favour of system option "exception_trace";
wenzelm
parents:
56034
diff
changeset
|
306 |
fun print_error tr opt_context e = |
78725
3c02ad5a1586
clarified treatment of exceptions: avoid catch-all handlers;
wenzelm
parents:
78713
diff
changeset
|
307 |
(case Exn.result (fn () => print_wrapper tr opt_context e ()) () of |
3c02ad5a1586
clarified treatment of exceptions: avoid catch-all handlers;
wenzelm
parents:
78713
diff
changeset
|
308 |
Exn.Res res => res |
3c02ad5a1586
clarified treatment of exceptions: avoid catch-all handlers;
wenzelm
parents:
78713
diff
changeset
|
309 |
| Exn.Exn exn => 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
|
310 |
|
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
|
311 |
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
|
312 |
|
52600 | 313 |
fun print_persistent (Print {persistent, ...}) = persistent; |
52596
40298d383463
global management of command execution fragments;
wenzelm
parents:
52586
diff
changeset
|
314 |
|
52853
4ab66773a41f
prefer canonical order, to avoid potential fluctuation due to front-end edits;
wenzelm
parents:
52850
diff
changeset
|
315 |
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
|
316 |
|
68333 | 317 |
fun make_print (name, args) {delay, pri, persistent, strict, print_fn} eval = |
318 |
let |
|
319 |
val exec_id = Document_ID.make (); |
|
320 |
fun process () = |
|
321 |
let |
|
322 |
val {failed, command, state = st', ...} = eval_result eval; |
|
323 |
val tr = Toplevel.exec_id exec_id command; |
|
324 |
val opt_context = try Toplevel.generic_theory_of st'; |
|
325 |
in |
|
326 |
if failed andalso strict then () |
|
327 |
else print_error tr opt_context (fn () => print_fn tr st') |
|
328 |
end; |
|
329 |
in |
|
330 |
Print { |
|
331 |
name = name, args = args, delay = delay, pri = pri, persistent = persistent, |
|
332 |
exec_id = exec_id, print_process = Lazy.lazy_name "Command.print" process} |
|
333 |
end; |
|
334 |
||
335 |
fun bad_print name_args exn = |
|
336 |
make_print name_args {delay = NONE, pri = 0, persistent = false, |
|
337 |
strict = false, print_fn = fn _ => fn _ => Exn.reraise exn}; |
|
338 |
||
52511 | 339 |
in |
52509 | 340 |
|
68344 | 341 |
fun print0 {pri, print_fn} = |
68334 | 342 |
make_print ("", [serial_string ()]) |
68344 | 343 |
{delay = NONE, pri = pri, persistent = true, strict = true, print_fn = print_fn}; |
68334 | 344 |
|
76430 | 345 |
fun print keywords visible overlays command_name eval old_prints = |
52570 | 346 |
let |
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
347 |
val print_functions = Synchronized.value print_functions; |
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
348 |
|
68333 | 349 |
fun new_print (name, args) get_pr = |
52570 | 350 |
let |
58923 | 351 |
val params = |
352 |
{keywords = keywords, |
|
353 |
command_name = command_name, |
|
354 |
args = args, |
|
355 |
exec_id = eval_exec_id eval}; |
|
52570 | 356 |
in |
56303
4cc3f4db3447
clarified Isabelle/ML bootstrap, such that Execution does not require ML_Compiler;
wenzelm
parents:
56292
diff
changeset
|
357 |
(case Exn.capture (Runtime.controlled_execution NONE get_pr) params of |
52570 | 358 |
Exn.Res NONE => NONE |
68333 | 359 |
| Exn.Res (SOME pr) => SOME (make_print (name, args) pr eval) |
360 |
| Exn.Exn exn => SOME (bad_print (name, args) exn eval)) |
|
52570 | 361 |
end; |
362 |
||
68333 | 363 |
fun get_print (name, args) = |
76418 | 364 |
(case find_first (print_equiv (name, args)) old_prints of |
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
365 |
NONE => |
68333 | 366 |
(case AList.lookup (op =) print_functions name of |
367 |
NONE => |
|
368 |
SOME (bad_print (name, args) (ERROR ("Missing print function " ^ quote name)) eval) |
|
369 |
| 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
|
370 |
| some => some); |
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
371 |
|
68334 | 372 |
val retained_prints = |
373 |
filter (fn print => print_finished print andalso print_persistent print) old_prints; |
|
374 |
val visible_prints = |
|
76424 | 375 |
if visible then |
376 |
fold (fn (name, _) => cons (name, [])) print_functions overlays |
|
52853
4ab66773a41f
prefer canonical order, to avoid potential fluctuation due to front-end edits;
wenzelm
parents:
52850
diff
changeset
|
377 |
|> sort_distinct overlay_ord |
52850
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
wenzelm
parents:
52785
diff
changeset
|
378 |
|> map_filter get_print |
68334 | 379 |
else []; |
380 |
val new_prints = visible_prints @ retained_prints; |
|
52570 | 381 |
in |
52600 | 382 |
if eq_list print_eq (old_prints, new_prints) then NONE else SOME new_prints |
52570 | 383 |
end; |
52511 | 384 |
|
68366
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
385 |
fun parallel_print (Print {pri, ...}) = |
76436 | 386 |
pri <= 0 orelse (Future.enabled () andalso Options.default_bool \<^system_option>\<open>parallel_print\<close>); |
68366
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
387 |
|
52647
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
388 |
fun print_function name f = |
52511 | 389 |
Synchronized.change print_functions (fn funs => |
76416 | 390 |
(if name = "" then error "Unnamed print function" |
391 |
else if AList.defined (op =) funs name then |
|
392 |
warning ("Redefining command print function: " ^ quote name) |
|
393 |
else (); |
|
52647
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents:
52619
diff
changeset
|
394 |
AList.update (op =) (name, f) funs)); |
52511 | 395 |
|
52571 | 396 |
fun no_print_function name = |
397 |
Synchronized.change print_functions (filter_out (equal name o #1)); |
|
398 |
||
52511 | 399 |
end; |
400 |
||
52532 | 401 |
|
52600 | 402 |
(* combined execution *) |
403 |
||
404 |
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
|
405 |
|
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
wenzelm
parents:
62826
diff
changeset
|
406 |
fun init_exec opt_thy : exec = |
68184
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
407 |
(Eval |
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
408 |
{command_id = Document_ID.none, exec_id = Document_ID.none, |
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
409 |
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
|
410 |
|
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
wenzelm
parents:
62826
diff
changeset
|
411 |
val no_exec = init_exec NONE; |
52532 | 412 |
|
52600 | 413 |
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
|
414 |
| exec_ids (SOME (eval, prints)) = eval_exec_id eval :: map print_exec_id prints; |
52600 | 415 |
|
416 |
local |
|
417 |
||
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
|
418 |
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
|
419 |
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
|
420 |
if Execution.running execution_id exec_id [group] then |
68931 | 421 |
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
|
422 |
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
|
423 |
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
|
424 |
|
59328
b83d6c3c439a
ignore print process even after fork, to avoid loosing active worker threads;
wenzelm
parents:
59193
diff
changeset
|
425 |
fun ignore_process process = |
b83d6c3c439a
ignore print process even after fork, to avoid loosing active worker threads;
wenzelm
parents:
59193
diff
changeset
|
426 |
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
|
427 |
|
68184
6c693b2700b3
support for dynamic document output while editing;
wenzelm
parents:
68130
diff
changeset
|
428 |
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
|
429 |
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
|
430 |
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
|
431 |
|
68366
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
432 |
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
|
433 |
let |
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
434 |
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
|
435 |
fun fork () = |
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
436 |
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
|
437 |
{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
|
438 |
(fn () => |
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
439 |
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
|
440 |
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
|
441 |
in |
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
442 |
(case delay of |
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
443 |
NONE => fork () |
69826
1bea05713dde
physical vs. logical events, the latter takes GC time into account;
wenzelm
parents:
69506
diff
changeset
|
444 |
| 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
|
445 |
end; |
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
446 |
|
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
447 |
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
|
448 |
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
|
449 |
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
|
450 |
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
|
451 |
|
52600 | 452 |
in |
453 |
||
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
|
454 |
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
|
455 |
(run_eval execution_id eval; List.app (run_print execution_id) prints); |
52532 | 456 |
|
68366
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
457 |
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
|
458 |
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
|
459 |
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
|
460 |
else SOME exec; |
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
wenzelm
parents:
68344
diff
changeset
|
461 |
|
47336 | 462 |
end; |
463 |
||
52600 | 464 |
end; |
76403 | 465 |
|
466 |
||
467 |
(* common print functions *) |
|
468 |
||
469 |
val _ = |
|
470 |
Command.print_function "Execution.print" |
|
471 |
(fn {args, exec_id, ...} => |
|
472 |
if null args then |
|
473 |
SOME {delay = NONE, pri = Task_Queue.urgent_pri + 2, persistent = false, strict = false, |
|
474 |
print_fn = fn _ => fn _ => Execution.fork_prints exec_id} |
|
475 |
else NONE); |
|
476 |
||
477 |
val _ = |
|
478 |
Command.print_function "print_state" |
|
479 |
(fn {keywords, command_name, ...} => |
|
76436 | 480 |
if Options.default_bool \<^system_option>\<open>editor_output_state\<close> |
481 |
andalso Keyword.is_printed keywords command_name |
|
76403 | 482 |
then |
483 |
SOME {delay = NONE, pri = Task_Queue.urgent_pri + 1, persistent = false, strict = false, |
|
484 |
print_fn = fn _ => fn st => |
|
485 |
if Toplevel.is_proof st then Output.state (Toplevel.string_of_state st) |
|
486 |
else ()} |
|
487 |
else NONE); |