| author | wenzelm | 
| Wed, 15 Mar 2017 10:31:42 +0100 | |
| changeset 65251 | 4b0a43afc3fb | 
| parent 64677 | 8dc24130e8fe | 
| child 65948 | de7888573ed7 | 
| permissions | -rw-r--r-- | 
| 47336 | 1 | (* Title: Pure/PIDE/command.ML | 
| 2 | Author: Makarius | |
| 3 | ||
| 52534 | 4 | Prover command execution: read -- eval -- print. | 
| 47336 | 5 | *) | 
| 6 | ||
| 7 | signature COMMAND = | |
| 8 | sig | |
| 56458 
a8d960baa5c2
simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
 wenzelm parents: 
56447diff
changeset | 9 | type blob = (string * (SHA1.digest * string list) option) Exn.result | 
| 54526 | 10 | val read_file: Path.T -> Position.T -> Path.T -> Token.file | 
| 58928 
23d0ffd48006
plain value Keywords.keywords, which might be used outside theory for bootstrap purposes;
 wenzelm parents: 
58923diff
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: 
58928diff
changeset | 12 | val read: Keyword.keywords -> theory -> Path.T-> (unit -> theory) -> | 
| 59689 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 13 | blob list * int -> Token.T list -> Toplevel.transition | 
| 52600 | 14 | type eval | 
| 52607 
33a133d50616
clarified execution: maintain running execs only, check "stable" separately via memo (again);
 wenzelm parents: 
52606diff
changeset | 15 | 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: 
52775diff
changeset | 16 | val eval_running: eval -> bool | 
| 52772 | 17 | val eval_finished: eval -> bool | 
| 52536 | 18 | 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: 
58928diff
changeset | 19 | val eval: Keyword.keywords -> Path.T -> (unit -> theory) -> | 
| 59689 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 20 | blob list * int -> Token.T list -> eval -> eval | 
| 52600 | 21 | type print | 
| 58923 | 22 | val print: bool -> (string * string list) list -> Keyword.keywords -> string -> | 
| 52850 
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
 wenzelm parents: 
52785diff
changeset | 23 | eval -> print list -> print list option | 
| 52526 | 24 | type print_fn = Toplevel.transition -> Toplevel.state -> unit | 
| 52953 
2c927b7501c5
explicit "strict" flag for print functions (flipped internal meaning);
 wenzelm parents: 
52853diff
changeset | 25 | type print_function = | 
| 58923 | 26 |     {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: 
52853diff
changeset | 27 |       {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: 
52853diff
changeset | 28 | val print_function: string -> print_function -> unit | 
| 52571 | 29 | val no_print_function: string -> unit | 
| 52600 | 30 | type exec = eval * print list | 
| 62895 
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
 wenzelm parents: 
62826diff
changeset | 31 | val init_exec: theory option -> exec | 
| 52600 | 32 | val no_exec: exec | 
| 33 | val exec_ids: exec option -> Document_ID.exec list | |
| 52606 | 34 | val exec: Document_ID.execution -> exec -> unit | 
| 47336 | 35 | end; | 
| 36 | ||
| 37 | structure Command: COMMAND = | |
| 38 | struct | |
| 39 | ||
| 52536 | 40 | (** main phases of execution **) | 
| 41 | ||
| 59466 
6fab87db556c
ensure that running into older execution is interruptible (see also b91dc7ab3464);
 wenzelm parents: 
59348diff
changeset | 42 | fun task_context group f = | 
| 
6fab87db556c
ensure that running into older execution is interruptible (see also b91dc7ab3464);
 wenzelm parents: 
59348diff
changeset | 43 | f | 
| 
6fab87db556c
ensure that running into older execution is interruptible (see also b91dc7ab3464);
 wenzelm parents: 
59348diff
changeset | 44 | |> Future.interruptible_task | 
| 
6fab87db556c
ensure that running into older execution is interruptible (see also b91dc7ab3464);
 wenzelm parents: 
59348diff
changeset | 45 | |> Future.task_context "Command.run_process" group; | 
| 
6fab87db556c
ensure that running into older execution is interruptible (see also b91dc7ab3464);
 wenzelm parents: 
59348diff
changeset | 46 | |
| 
6fab87db556c
ensure that running into older execution is interruptible (see also b91dc7ab3464);
 wenzelm parents: 
59348diff
changeset | 47 | |
| 52510 | 48 | (* read *) | 
| 52509 | 49 | |
| 55798 | 50 | type blob = | 
| 56458 
a8d960baa5c2
simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
 wenzelm parents: 
56447diff
changeset | 51 | (string * (SHA1.digest * string list) option) Exn.result; (*file node name, digest, lines*) | 
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
53976diff
changeset | 52 | |
| 56504 
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
 wenzelm parents: 
56458diff
changeset | 53 | fun read_file_node file_node master_dir pos src_path = | 
| 54526 | 54 | let | 
| 59944 
83071f4c8ae6
recovered additional Markup.language_path from c043306d2598, which is important to override Markup.string from Command.read phase, and thus ensure that symbol completion is disabled;
 wenzelm parents: 
59809diff
changeset | 55 | val _ = Position.report pos Markup.language_path; | 
| 56504 
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
 wenzelm parents: 
56458diff
changeset | 56 | val _ = | 
| 
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
 wenzelm parents: 
56458diff
changeset | 57 | (case try Url.explode file_node of | 
| 
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
 wenzelm parents: 
56458diff
changeset | 58 | NONE => () | 
| 
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
 wenzelm parents: 
56458diff
changeset | 59 | | SOME (Url.File _) => () | 
| 
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
 wenzelm parents: 
56458diff
changeset | 60 | | _ => | 
| 
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
 wenzelm parents: 
56458diff
changeset | 61 |           error ("Prover cannot load remote file " ^
 | 
| 59685 
c043306d2598
clarified markup for embedded files, early before execution;
 wenzelm parents: 
59472diff
changeset | 62 | Markup.markup (Markup.path file_node) (quote file_node))); | 
| 54526 | 63 | 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: 
55709diff
changeset | 64 | 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: 
55709diff
changeset | 65 | 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: 
55709diff
changeset | 66 | val digest = SHA1.digest text; | 
| 59685 
c043306d2598
clarified markup for embedded files, early before execution;
 wenzelm parents: 
59472diff
changeset | 67 |   in {src_path = src_path, lines = lines, digest = digest, pos = Path.position full_path} end
 | 
| 
c043306d2598
clarified markup for embedded files, early before execution;
 wenzelm parents: 
59472diff
changeset | 68 | 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: 
55709diff
changeset | 69 | |
| 56504 
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
 wenzelm parents: 
56458diff
changeset | 70 | val read_file = read_file_node ""; | 
| 
d71f4be7e287
tuned error -- allow user to click on hyperlink to open remote file;
 wenzelm parents: 
56458diff
changeset | 71 | |
| 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: 
55709diff
changeset | 72 | 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: 
55709diff
changeset | 73 | |
| 56447 
1e77ed11f2f7
separate file_node vs. file_path, e.g. relevant on Windows for hyperlink to the latter;
 wenzelm parents: 
56333diff
changeset | 74 | 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: 
55709diff
changeset | 75 | 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: 
55709diff
changeset | 76 | val file_pos = | 
| 56447 
1e77ed11f2f7
separate file_node vs. file_path, e.g. relevant on Windows for hyperlink to the latter;
 wenzelm parents: 
56333diff
changeset | 77 | 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: 
55709diff
changeset | 78 | (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: 
55709diff
changeset | 79 | 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: 
55709diff
changeset | 80 | | 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: 
55709diff
changeset | 81 |   in {src_path = src_path, lines = lines, digest = digest, pos = file_pos} end
 | 
| 54526 | 82 | |
| 59689 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 83 | fun resolve_files keywords master_dir (blobs, blobs_index) toks = | 
| 57905 
c0c5652e796e
separate module Command_Span: mostly syntactic representation;
 wenzelm parents: 
57844diff
changeset | 84 | (case Outer_Syntax.parse_spans toks of | 
| 59689 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 85 | [Command_Span.Span (Command_Span.Command_Span (cmd, _), _)] => | 
| 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 86 | (case try (nth toks) blobs_index of | 
| 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 87 | SOME tok => | 
| 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 88 | let | 
| 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 89 | val pos = Token.pos_of tok; | 
| 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 90 | val path = Path.explode (Token.content_of tok) | 
| 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 91 | handle ERROR msg => error (msg ^ Position.here pos); | 
| 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 92 | fun make_file src_path (Exn.Res (file_node, NONE)) = | 
| 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 93 | Exn.interruptible_capture (fn () => | 
| 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 94 | read_file_node file_node master_dir pos src_path) () | 
| 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 95 | | make_file src_path (Exn.Res (file_node, SOME (digest, lines))) = | 
| 60027 
c42d65e11b6e
clarified language_path markup (again): exactly once *after* static phase, see also 83071f4c8ae6 and c043306d2598;
 wenzelm parents: 
59944diff
changeset | 96 | (Position.report pos Markup.language_path; | 
| 
c42d65e11b6e
clarified language_path markup (again): exactly once *after* static phase, see also 83071f4c8ae6 and c043306d2598;
 wenzelm parents: 
59944diff
changeset | 97 | Exn.Res (blob_file src_path lines digest file_node)) | 
| 59689 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 98 | | make_file _ (Exn.Exn e) = Exn.Exn e; | 
| 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 99 | val src_paths = Keyword.command_files keywords cmd path; | 
| 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 100 | val files = | 
| 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 101 | if null blobs then | 
| 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 102 |                 map2 make_file src_paths (map (K (Exn.Res ("", NONE))) src_paths)
 | 
| 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 103 | else if length src_paths = length blobs then | 
| 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 104 | map2 make_file src_paths blobs | 
| 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 105 |               else error ("Misalignment of inlined files" ^ Position.here pos);
 | 
| 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 106 | in | 
| 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 107 | toks |> map_index (fn (i, tok) => | 
| 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 108 | 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: 
59685diff
changeset | 109 | end | 
| 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 110 | | NONE => toks) | 
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
53976diff
changeset | 111 | | _ => toks); | 
| 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
53976diff
changeset | 112 | |
| 61379 
c57820ceead3
more direct HTML presentation, without print mode;
 wenzelm parents: 
61213diff
changeset | 113 | fun reports_of_token keywords tok = | 
| 
c57820ceead3
more direct HTML presentation, without print mode;
 wenzelm parents: 
61213diff
changeset | 114 | let | 
| 
c57820ceead3
more direct HTML presentation, without print mode;
 wenzelm parents: 
61213diff
changeset | 115 | val malformed_symbols = | 
| 
c57820ceead3
more direct HTML presentation, without print mode;
 wenzelm parents: 
61213diff
changeset | 116 | Input.source_explode (Token.input_of tok) | 
| 
c57820ceead3
more direct HTML presentation, without print mode;
 wenzelm parents: 
61213diff
changeset | 117 | |> map_filter (fn (sym, pos) => | 
| 
c57820ceead3
more direct HTML presentation, without print mode;
 wenzelm parents: 
61213diff
changeset | 118 | if Symbol.is_malformed sym | 
| 64677 
8dc24130e8fe
more uniform treatment of "bad" like other messages (with serial number);
 wenzelm parents: 
63475diff
changeset | 119 | then SOME ((pos, Markup.bad ()), "Malformed symbolic character") else NONE); | 
| 61379 
c57820ceead3
more direct HTML presentation, without print mode;
 wenzelm parents: 
61213diff
changeset | 120 | val is_malformed = Token.is_error tok orelse not (null malformed_symbols); | 
| 
c57820ceead3
more direct HTML presentation, without print mode;
 wenzelm parents: 
61213diff
changeset | 121 | val reports = Token.reports keywords tok @ Token.completion_report tok @ malformed_symbols; | 
| 
c57820ceead3
more direct HTML presentation, without print mode;
 wenzelm parents: 
61213diff
changeset | 122 | in (is_malformed, reports) end; | 
| 
c57820ceead3
more direct HTML presentation, without print mode;
 wenzelm parents: 
61213diff
changeset | 123 | |
| 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: 
55709diff
changeset | 124 | 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: 
55709diff
changeset | 125 | |
| 60095 | 126 | fun read_thy st = Toplevel.theory_of st | 
| 127 | handle Toplevel.UNDEF => Pure_Syn.bootstrap_thy; | |
| 58928 
23d0ffd48006
plain value Keywords.keywords, which might be used outside theory for bootstrap purposes;
 wenzelm parents: 
58923diff
changeset | 128 | |
| 59689 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 129 | fun read keywords thy master_dir init blobs_info span = | 
| 52510 | 130 | let | 
| 58928 
23d0ffd48006
plain value Keywords.keywords, which might be used outside theory for bootstrap purposes;
 wenzelm parents: 
58923diff
changeset | 131 | val command_reports = Outer_Syntax.command_reports thy; | 
| 52509 | 132 | |
| 55709 
4e5a83a46ded
clarified Token.range_of in accordance to Symbol_Pos.range;
 wenzelm parents: 
55708diff
changeset | 133 | val proper_range = Token.range_of (#1 (take_suffix Token.is_improper span)); | 
| 52510 | 134 | val pos = | 
| 135 | (case find_first Token.is_command span of | |
| 55708 | 136 | SOME tok => Token.pos_of tok | 
| 55709 
4e5a83a46ded
clarified Token.range_of in accordance to Symbol_Pos.range;
 wenzelm parents: 
55708diff
changeset | 137 | | NONE => #1 proper_range); | 
| 52509 | 138 | |
| 61379 
c57820ceead3
more direct HTML presentation, without print mode;
 wenzelm parents: 
61213diff
changeset | 139 | val token_reports = map (reports_of_token keywords) span; | 
| 
c57820ceead3
more direct HTML presentation, without print mode;
 wenzelm parents: 
61213diff
changeset | 140 | val _ = Position.reports_text (maps #2 token_reports @ maps command_reports span); | 
| 52510 | 141 | in | 
| 61379 
c57820ceead3
more direct HTML presentation, without print mode;
 wenzelm parents: 
61213diff
changeset | 142 | if exists #1 token_reports then Toplevel.malformed pos "Malformed command syntax" | 
| 52510 | 143 | else | 
| 59689 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 144 | (case Outer_Syntax.parse_tokens thy (resolve_files keywords master_dir blobs_info span) of | 
| 58853 | 145 | [tr] => Toplevel.modify_init init tr | 
| 55709 
4e5a83a46ded
clarified Token.range_of in accordance to Symbol_Pos.range;
 wenzelm parents: 
55708diff
changeset | 146 | | [] => Toplevel.ignored (#1 (Token.range_of span)) | 
| 
4e5a83a46ded
clarified Token.range_of in accordance to Symbol_Pos.range;
 wenzelm parents: 
55708diff
changeset | 147 | | _ => Toplevel.malformed (#1 proper_range) "Exactly one command expected") | 
| 
4e5a83a46ded
clarified Token.range_of in accordance to Symbol_Pos.range;
 wenzelm parents: 
55708diff
changeset | 148 | handle ERROR msg => Toplevel.malformed (#1 proper_range) msg | 
| 52510 | 149 | end; | 
| 52509 | 150 | |
| 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: 
55709diff
changeset | 151 | 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: 
55709diff
changeset | 152 | |
| 52509 | 153 | |
| 154 | (* eval *) | |
| 47336 | 155 | |
| 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: 
59466diff
changeset | 156 | 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: 
62826diff
changeset | 157 | |
| 
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
 wenzelm parents: 
62826diff
changeset | 158 | fun init_eval_state opt_thy = | 
| 
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
 wenzelm parents: 
62826diff
changeset | 159 |  {failed = false,
 | 
| 
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
 wenzelm parents: 
62826diff
changeset | 160 | command = Toplevel.empty, | 
| 
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
 wenzelm parents: 
62826diff
changeset | 161 | state = (case opt_thy of NONE => Toplevel.toplevel | SOME thy => Toplevel.theory_toplevel thy)}; | 
| 52600 | 162 | |
| 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: 
59188diff
changeset | 163 | datatype eval = Eval of {exec_id: Document_ID.exec, eval_process: eval_state lazy};
 | 
| 52600 | 164 | |
| 56291 
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
 wenzelm parents: 
56265diff
changeset | 165 | fun eval_exec_id (Eval {exec_id, ...}) = exec_id;
 | 
| 59058 
a78612c67ec0
renamed "pairself" to "apply2", in accordance to @{apply 2};
 wenzelm parents: 
58934diff
changeset | 166 | 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: 
52606diff
changeset | 167 | |
| 56291 
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
 wenzelm parents: 
56265diff
changeset | 168 | 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: 
59188diff
changeset | 169 | fun eval_finished (Eval {eval_process, ...}) = Lazy.is_finished eval_process;
 | 
| 52772 | 170 | |
| 59466 
6fab87db556c
ensure that running into older execution is interruptible (see also b91dc7ab3464);
 wenzelm parents: 
59348diff
changeset | 171 | fun eval_result (Eval {eval_process, ...}) =
 | 
| 
6fab87db556c
ensure that running into older execution is interruptible (see also b91dc7ab3464);
 wenzelm parents: 
59348diff
changeset | 172 | task_context (Future.worker_subgroup ()) Lazy.force eval_process; | 
| 
6fab87db556c
ensure that running into older execution is interruptible (see also b91dc7ab3464);
 wenzelm parents: 
59348diff
changeset | 173 | |
| 52600 | 174 | val eval_result_state = #state o eval_result; | 
| 175 | ||
| 47336 | 176 | local | 
| 177 | ||
| 58923 | 178 | fun reset_state keywords tr st0 = Toplevel.setmp_thread_position tr (fn () => | 
| 56937 | 179 | let | 
| 180 | val name = Toplevel.name_of tr; | |
| 181 | val res = | |
| 58923 | 182 | if Keyword.is_theory_body keywords name then Toplevel.reset_theory st0 | 
| 183 | else if Keyword.is_proof keywords name then Toplevel.reset_proof st0 | |
| 56937 | 184 | else NONE; | 
| 185 | in | |
| 186 | (case res of | |
| 187 | NONE => st0 | |
| 60076 | 188 | | SOME st => (Output.error_message (Toplevel.type_error tr ^ " -- using reset state"); st)) | 
| 56937 | 189 | end) (); | 
| 190 | ||
| 58923 | 191 | fun run keywords int tr st = | 
| 192 | if Goal.future_enabled 1 andalso Keyword.is_diag keywords (Toplevel.name_of tr) then | |
| 53192 | 193 |     (Execution.fork {name = "Toplevel.diag", pos = Toplevel.pos_of tr, pri = ~1}
 | 
| 51605 
eca8acb42e4a
more explicit Goal.fork_params -- avoid implicit arguments via thread data;
 wenzelm parents: 
51603diff
changeset | 194 | (fn () => Toplevel.command_exception int tr st); ([], SOME st)) | 
| 51284 
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
 wenzelm parents: 
51266diff
changeset | 195 | else Toplevel.command_errors int tr st; | 
| 47336 | 196 | |
| 52510 | 197 | fun check_cmts span tr st' = | 
| 198 | Toplevel.setmp_thread_position tr | |
| 199 | (fn () => | |
| 200 | Outer_Syntax.side_comments span |> maps (fn cmt => | |
| 61457 | 201 |         (Thy_Output.output_text st' {markdown = false} (Token.input_of cmt); [])
 | 
| 52619 
70d5f2f7d27f
reraise interrupts outside command regular transactions -- relevant for memo_stable;
 wenzelm parents: 
52609diff
changeset | 202 | handle exn => | 
| 62505 | 203 | if Exn.is_interrupt exn then Exn.reraise exn | 
| 56303 
4cc3f4db3447
clarified Isabelle/ML bootstrap, such that Execution does not require ML_Compiler;
 wenzelm parents: 
56292diff
changeset | 204 | else Runtime.exn_messages_ids exn)) (); | 
| 52510 | 205 | |
| 54678 
87910da843d5
more uniform status -- accommodate spurious Exn.Interrupt from user code, allow ML_Compiler.exn_messages_id to crash;
 wenzelm parents: 
54671diff
changeset | 206 | 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: 
56303diff
changeset | 207 | 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: 
54671diff
changeset | 208 | |
| 
87910da843d5
more uniform status -- accommodate spurious Exn.Interrupt from user code, allow ML_Compiler.exn_messages_id to crash;
 wenzelm parents: 
54671diff
changeset | 209 | fun status tr m = | 
| 
87910da843d5
more uniform status -- accommodate spurious Exn.Interrupt from user code, allow ML_Compiler.exn_messages_id to crash;
 wenzelm parents: 
54671diff
changeset | 210 | Toplevel.setmp_thread_position tr (fn () => Output.status (Markup.markup_only m)) (); | 
| 
87910da843d5
more uniform status -- accommodate spurious Exn.Interrupt from user code, allow ML_Compiler.exn_messages_id to crash;
 wenzelm parents: 
54671diff
changeset | 211 | |
| 63474 
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
 wenzelm parents: 
62924diff
changeset | 212 | fun command_indent tr st = | 
| 
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
 wenzelm parents: 
62924diff
changeset | 213 | (case try Toplevel.proof_of st of | 
| 
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
 wenzelm parents: 
62924diff
changeset | 214 | SOME prf => | 
| 
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
 wenzelm parents: 
62924diff
changeset | 215 | let val keywords = Thy_Header.get_keywords (Proof.theory_of prf) in | 
| 
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
 wenzelm parents: 
62924diff
changeset | 216 | if Keyword.command_kind keywords (Toplevel.name_of tr) = SOME Keyword.prf_script then | 
| 
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
 wenzelm parents: 
62924diff
changeset | 217 | (case try Proof.goal prf of | 
| 
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
 wenzelm parents: 
62924diff
changeset | 218 |             SOME {goal, ...} =>
 | 
| 
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
 wenzelm parents: 
62924diff
changeset | 219 | let val n = Thm.nprems_of goal | 
| 
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
 wenzelm parents: 
62924diff
changeset | 220 | in if n > 1 then report tr (Markup.command_indent (n - 1)) else () end | 
| 
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
 wenzelm parents: 
62924diff
changeset | 221 | | NONE => ()) | 
| 
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
 wenzelm parents: 
62924diff
changeset | 222 | else () | 
| 
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
 wenzelm parents: 
62924diff
changeset | 223 | end | 
| 
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
 wenzelm parents: 
62924diff
changeset | 224 | | NONE => ()); | 
| 
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
 wenzelm parents: 
62924diff
changeset | 225 | |
| 
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
 wenzelm parents: 
62924diff
changeset | 226 | |
| 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: 
59466diff
changeset | 227 | 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: 
59466diff
changeset | 228 | let | 
| 62924 
ce47945ce4fb
tuned signature -- closer to Exn.Interrupt.expose in Scala;
 wenzelm parents: 
62895diff
changeset | 229 | val _ = Thread_Attributes.expose_interrupt (); | 
| 47336 | 230 | |
| 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: 
59466diff
changeset | 231 | val st = reset_state keywords tr state; | 
| 56937 | 232 | |
| 63474 
f66e3c3b0fb1
semantic indentation for unstructured proof scripts;
 wenzelm parents: 
62924diff
changeset | 233 | 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: 
59466diff
changeset | 234 | 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: 
59466diff
changeset | 235 | val (errs1, result) = run keywords true tr 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: 
59466diff
changeset | 236 | val errs2 = (case result of NONE => [] | SOME st' => check_cmts span tr 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: 
59466diff
changeset | 237 | 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: 
59466diff
changeset | 238 | 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: 
59466diff
changeset | 239 | 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: 
59466diff
changeset | 240 | (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: 
59466diff
changeset | 241 | 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: 
59466diff
changeset | 242 | 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: 
59466diff
changeset | 243 | 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: 
59466diff
changeset | 244 | val _ = status tr Markup.finished; | 
| 64677 
8dc24130e8fe
more uniform treatment of "bad" like other messages (with serial number);
 wenzelm parents: 
63475diff
changeset | 245 | val _ = if null errs then (report tr (Markup.bad ()); 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: 
59466diff
changeset | 246 |         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: 
59466diff
changeset | 247 | | 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: 
59466diff
changeset | 248 | 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: 
59466diff
changeset | 249 | val _ = status tr Markup.finished; | 
| 
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: 
59466diff
changeset | 250 |         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: 
59466diff
changeset | 251 | end; | 
| 47336 | 252 | |
| 52534 | 253 | in | 
| 254 | ||
| 59689 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 255 | fun eval keywords master_dir init blobs_info span eval0 = | 
| 52534 | 256 | let | 
| 257 | val exec_id = Document_ID.make (); | |
| 258 | fun process () = | |
| 259 | let | |
| 58928 
23d0ffd48006
plain value Keywords.keywords, which might be used outside theory for bootstrap purposes;
 wenzelm parents: 
58923diff
changeset | 260 | val eval_state0 = eval_result eval0; | 
| 
23d0ffd48006
plain value Keywords.keywords, which might be used outside theory for bootstrap purposes;
 wenzelm parents: 
58923diff
changeset | 261 | val thy = read_thy (#state eval_state0); | 
| 52534 | 262 | val tr = | 
| 263 | 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: 
59685diff
changeset | 264 | (fn () => | 
| 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59685diff
changeset | 265 | 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: 
58928diff
changeset | 266 | in eval_state keywords span tr eval_state0 end; | 
| 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: 
59188diff
changeset | 267 |   in Eval {exec_id = exec_id, eval_process = Lazy.lazy process} end;
 | 
| 52534 | 268 | |
| 47336 | 269 | end; | 
| 270 | ||
| 52509 | 271 | |
| 272 | (* print *) | |
| 273 | ||
| 52600 | 274 | datatype print = Print of | 
| 52850 
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
 wenzelm parents: 
52785diff
changeset | 275 |  {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: 
59188diff
changeset | 276 | exec_id: Document_ID.exec, print_process: unit lazy}; | 
| 52600 | 277 | |
| 56291 
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
 wenzelm parents: 
56265diff
changeset | 278 | fun print_exec_id (Print {exec_id, ...}) = exec_id;
 | 
| 59058 
a78612c67ec0
renamed "pairself" to "apply2", in accordance to @{apply 2};
 wenzelm parents: 
58934diff
changeset | 279 | 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: 
56265diff
changeset | 280 | |
| 52526 | 281 | type print_fn = Toplevel.transition -> Toplevel.state -> unit; | 
| 52515 | 282 | |
| 52647 
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
 wenzelm parents: 
52619diff
changeset | 283 | type print_function = | 
| 58923 | 284 |   {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: 
52853diff
changeset | 285 |     {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: 
52619diff
changeset | 286 | |
| 52511 | 287 | local | 
| 288 | ||
| 52647 
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
 wenzelm parents: 
52619diff
changeset | 289 | val print_functions = | 
| 
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
 wenzelm parents: 
52619diff
changeset | 290 | Synchronized.var "Command.print_functions" ([]: (string * print_function) list); | 
| 52511 | 291 | |
| 56265 
785569927666
discontinued Toplevel.debug in favour of system option "exception_trace";
 wenzelm parents: 
56034diff
changeset | 292 | fun print_error tr opt_context e = | 
| 56303 
4cc3f4db3447
clarified Isabelle/ML bootstrap, such that Execution does not require ML_Compiler;
 wenzelm parents: 
56292diff
changeset | 293 | (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: 
52609diff
changeset | 294 | handle exn => | 
| 62505 | 295 | if Exn.is_interrupt exn then Exn.reraise exn | 
| 56333 
38f1422ef473
support bulk messages consisting of small string segments, which are more healthy to the Poly/ML RTS and might prevent spurious GC crashes such as MTGCProcessMarkPointers::ScanAddressesInObject;
 wenzelm parents: 
56303diff
changeset | 296 | else List.app (Future.error_message (Toplevel.pos_of tr)) (Runtime.exn_messages_ids exn); | 
| 52516 
b5b3c888df9f
more exception handling -- make print functions total;
 wenzelm parents: 
52515diff
changeset | 297 | |
| 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: 
59188diff
changeset | 298 | fun print_finished (Print {print_process, ...}) = Lazy.is_finished print_process;
 | 
| 52656 
9437f440ef3f
keep persistent prints only if actually finished;
 wenzelm parents: 
52651diff
changeset | 299 | |
| 52600 | 300 | fun print_persistent (Print {persistent, ...}) = persistent;
 | 
| 52596 
40298d383463
global management of command execution fragments;
 wenzelm parents: 
52586diff
changeset | 301 | |
| 52853 
4ab66773a41f
prefer canonical order, to avoid potential fluctuation due to front-end edits;
 wenzelm parents: 
52850diff
changeset | 302 | 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: 
52850diff
changeset | 303 | |
| 52511 | 304 | in | 
| 52509 | 305 | |
| 58923 | 306 | fun print command_visible command_overlays keywords command_name eval old_prints = | 
| 52570 | 307 | let | 
| 52850 
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
 wenzelm parents: 
52785diff
changeset | 308 | val print_functions = Synchronized.value print_functions; | 
| 
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
 wenzelm parents: 
52785diff
changeset | 309 | |
| 52999 
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
 wenzelm parents: 
52953diff
changeset | 310 |     fun make_print name args {delay, pri, persistent, strict, print_fn} =
 | 
| 
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
 wenzelm parents: 
52953diff
changeset | 311 | let | 
| 
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
 wenzelm parents: 
52953diff
changeset | 312 | val exec_id = Document_ID.make (); | 
| 
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
 wenzelm parents: 
52953diff
changeset | 313 | fun process () = | 
| 
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
 wenzelm parents: 
52953diff
changeset | 314 | let | 
| 
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
 wenzelm parents: 
52953diff
changeset | 315 |             val {failed, command, state = st', ...} = eval_result eval;
 | 
| 
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
 wenzelm parents: 
52953diff
changeset | 316 | val tr = Toplevel.exec_id exec_id command; | 
| 56265 
785569927666
discontinued Toplevel.debug in favour of system option "exception_trace";
 wenzelm parents: 
56034diff
changeset | 317 | val opt_context = try Toplevel.generic_theory_of st'; | 
| 52999 
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
 wenzelm parents: 
52953diff
changeset | 318 | in | 
| 
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
 wenzelm parents: 
52953diff
changeset | 319 | if failed andalso strict then () | 
| 56265 
785569927666
discontinued Toplevel.debug in favour of system option "exception_trace";
 wenzelm parents: 
56034diff
changeset | 320 | else print_error tr opt_context (fn () => print_fn tr st') | 
| 52999 
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
 wenzelm parents: 
52953diff
changeset | 321 | end; | 
| 
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
 wenzelm parents: 
52953diff
changeset | 322 | in | 
| 
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
 wenzelm parents: 
52953diff
changeset | 323 |         Print {
 | 
| 
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
 wenzelm parents: 
52953diff
changeset | 324 | name = name, args = args, delay = delay, pri = pri, persistent = persistent, | 
| 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: 
59188diff
changeset | 325 | exec_id = exec_id, print_process = Lazy.lazy process} | 
| 52999 
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
 wenzelm parents: 
52953diff
changeset | 326 | end; | 
| 
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
 wenzelm parents: 
52953diff
changeset | 327 | |
| 
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
 wenzelm parents: 
52953diff
changeset | 328 | fun bad_print name args exn = | 
| 
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
 wenzelm parents: 
52953diff
changeset | 329 |       make_print name args {delay = NONE, pri = 0, persistent = false,
 | 
| 62505 | 330 | strict = false, print_fn = fn _ => fn _ => Exn.reraise exn}; | 
| 52999 
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
 wenzelm parents: 
52953diff
changeset | 331 | |
| 52850 
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
 wenzelm parents: 
52785diff
changeset | 332 | fun new_print name args get_pr = | 
| 52570 | 333 | let | 
| 58923 | 334 | val params = | 
| 335 |          {keywords = keywords,
 | |
| 336 | command_name = command_name, | |
| 337 | args = args, | |
| 338 | exec_id = eval_exec_id eval}; | |
| 52570 | 339 | in | 
| 56303 
4cc3f4db3447
clarified Isabelle/ML bootstrap, such that Execution does not require ML_Compiler;
 wenzelm parents: 
56292diff
changeset | 340 | (case Exn.capture (Runtime.controlled_execution NONE get_pr) params of | 
| 52570 | 341 | Exn.Res NONE => NONE | 
| 52999 
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
 wenzelm parents: 
52953diff
changeset | 342 | | Exn.Res (SOME pr) => SOME (make_print name args pr) | 
| 
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
 wenzelm parents: 
52953diff
changeset | 343 | | Exn.Exn exn => SOME (bad_print name args exn)) | 
| 52570 | 344 | end; | 
| 345 | ||
| 52850 
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
 wenzelm parents: 
52785diff
changeset | 346 | fun get_print (a, b) = | 
| 
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
 wenzelm parents: 
52785diff
changeset | 347 |       (case find_first (fn Print {name, args, ...} => name = a andalso args = b) old_prints of
 | 
| 
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
 wenzelm parents: 
52785diff
changeset | 348 | NONE => | 
| 
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
 wenzelm parents: 
52785diff
changeset | 349 | (case AList.lookup (op =) print_functions a of | 
| 52999 
1f09c98a3232
more explicit error, e.g. for sledgehammer query operation applied in non-HOL session;
 wenzelm parents: 
52953diff
changeset | 350 |             NONE => SOME (bad_print a b (ERROR ("Missing print function " ^ quote a)))
 | 
| 52850 
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
 wenzelm parents: 
52785diff
changeset | 351 | | SOME get_pr => new_print a b get_pr) | 
| 
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
 wenzelm parents: 
52785diff
changeset | 352 | | some => some); | 
| 
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
 wenzelm parents: 
52785diff
changeset | 353 | |
| 52570 | 354 | val new_prints = | 
| 355 | if command_visible then | |
| 52853 
4ab66773a41f
prefer canonical order, to avoid potential fluctuation due to front-end edits;
 wenzelm parents: 
52850diff
changeset | 356 | fold (fn (a, _) => cons (a, [])) print_functions command_overlays | 
| 
4ab66773a41f
prefer canonical order, to avoid potential fluctuation due to front-end edits;
 wenzelm parents: 
52850diff
changeset | 357 | |> sort_distinct overlay_ord | 
| 52850 
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
 wenzelm parents: 
52785diff
changeset | 358 | |> map_filter get_print | 
| 52656 
9437f440ef3f
keep persistent prints only if actually finished;
 wenzelm parents: 
52651diff
changeset | 359 | else filter (fn print => print_finished print andalso print_persistent print) old_prints; | 
| 52570 | 360 | in | 
| 52600 | 361 | if eq_list print_eq (old_prints, new_prints) then NONE else SOME new_prints | 
| 52570 | 362 | end; | 
| 52511 | 363 | |
| 52647 
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
 wenzelm parents: 
52619diff
changeset | 364 | fun print_function name f = | 
| 52511 | 365 | Synchronized.change print_functions (fn funs => | 
| 366 | (if not (AList.defined (op =) funs name) then () | |
| 367 |     else warning ("Redefining command print function: " ^ quote name);
 | |
| 52647 
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
 wenzelm parents: 
52619diff
changeset | 368 | AList.update (op =) (name, f) funs)); | 
| 52511 | 369 | |
| 52571 | 370 | fun no_print_function name = | 
| 371 | Synchronized.change print_functions (filter_out (equal name o #1)); | |
| 372 | ||
| 52511 | 373 | end; | 
| 374 | ||
| 52526 | 375 | val _ = | 
| 56291 
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
 wenzelm parents: 
56265diff
changeset | 376 | print_function "Execution.print" | 
| 
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
 wenzelm parents: 
56265diff
changeset | 377 |     (fn {args, exec_id, ...} =>
 | 
| 
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
 wenzelm parents: 
56265diff
changeset | 378 | 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: 
60095diff
changeset | 379 |         SOME {delay = NONE, pri = Task_Queue.urgent_pri + 2, persistent = false, strict = false,
 | 
| 56292 | 380 | 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: 
56265diff
changeset | 381 | else NONE); | 
| 
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
 wenzelm parents: 
56265diff
changeset | 382 | |
| 
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
 wenzelm parents: 
56265diff
changeset | 383 | val _ = | 
| 52647 
45ce95b8bf69
determine print function parameters dynamically, e.g. depending on runtime options;
 wenzelm parents: 
52619diff
changeset | 384 | print_function "print_state" | 
| 58923 | 385 |     (fn {keywords, command_name, ...} =>
 | 
| 61213 | 386 | if Options.default_bool "editor_output_state" andalso Keyword.is_printed keywords command_name | 
| 387 | 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: 
60095diff
changeset | 388 |         SOME {delay = NONE, pri = Task_Queue.urgent_pri + 1, persistent = false, strict = false,
 | 
| 61208 | 389 | print_fn = fn _ => fn st => | 
| 390 | if Toplevel.is_proof st then Output.state (Toplevel.string_of_state st) | |
| 391 | else ()} | |
| 56895 
f058120aaad4
discontinued Toplevel.print flag -- print uniformly according to Keyword.is_printed;
 wenzelm parents: 
56887diff
changeset | 392 | else NONE); | 
| 52509 | 393 | |
| 52532 | 394 | |
| 52600 | 395 | (* combined execution *) | 
| 396 | ||
| 397 | type exec = eval * print list; | |
| 62895 
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
 wenzelm parents: 
62826diff
changeset | 398 | |
| 
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
 wenzelm parents: 
62826diff
changeset | 399 | fun init_exec opt_thy : exec = | 
| 
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
 wenzelm parents: 
62826diff
changeset | 400 |   (Eval {exec_id = Document_ID.none, eval_process = Lazy.value (init_eval_state opt_thy)}, []);
 | 
| 
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
 wenzelm parents: 
62826diff
changeset | 401 | |
| 
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
 wenzelm parents: 
62826diff
changeset | 402 | val no_exec = init_exec NONE; | 
| 52532 | 403 | |
| 52600 | 404 | fun exec_ids NONE = [] | 
| 56291 
e79f76a48449
added Execution.print: accumulate print operations for some command execution, which are applied later and print time;
 wenzelm parents: 
56265diff
changeset | 405 | | exec_ids (SOME (eval, prints)) = eval_exec_id eval :: map print_exec_id prints; | 
| 52600 | 406 | |
| 407 | local | |
| 408 | ||
| 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: 
59188diff
changeset | 409 | 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: 
59188diff
changeset | 410 | 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: 
59188diff
changeset | 411 | if Execution.running execution_id exec_id [group] then | 
| 59466 
6fab87db556c
ensure that running into older execution is interruptible (see also b91dc7ab3464);
 wenzelm parents: 
59348diff
changeset | 412 | ignore (task_context group Lazy.force_result 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: 
59188diff
changeset | 413 | 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: 
59188diff
changeset | 414 | 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: 
59188diff
changeset | 415 | |
| 59328 
b83d6c3c439a
ignore print process even after fork, to avoid loosing active worker threads;
 wenzelm parents: 
59193diff
changeset | 416 | fun ignore_process process = | 
| 
b83d6c3c439a
ignore print process even after fork, to avoid loosing active worker threads;
 wenzelm parents: 
59193diff
changeset | 417 | Lazy.is_running process orelse Lazy.is_finished process; | 
| 
b83d6c3c439a
ignore print process even after fork, to avoid loosing active worker threads;
 wenzelm parents: 
59193diff
changeset | 418 | |
| 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: 
59188diff
changeset | 419 | fun run_eval execution_id (Eval {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: 
59188diff
changeset | 420 | 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: 
59188diff
changeset | 421 | 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: 
59188diff
changeset | 422 | |
| 
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: 
59188diff
changeset | 423 | fun run_print execution_id (Print {name, delay, pri, exec_id, print_process, ...}) =
 | 
| 59328 
b83d6c3c439a
ignore print process even after fork, to avoid loosing active worker threads;
 wenzelm parents: 
59193diff
changeset | 424 | if ignore_process print_process then () | 
| 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: 
59188diff
changeset | 425 | else if pri <= 0 orelse (Multithreading.enabled () andalso Options.default_bool "parallel_print") | 
| 56875 
f6259d6fb565
explicit option parallel_print to downgrade parallel scheduling, which might occasionally help for big and heavy "scripts";
 wenzelm parents: 
56504diff
changeset | 426 | then | 
| 52651 | 427 | let | 
| 428 | val group = Future.worker_subgroup (); | |
| 429 | fun fork () = | |
| 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: 
59188diff
changeset | 430 | ignore ((singleton o Future.forks) | 
| 
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: 
59188diff
changeset | 431 |           {name = name, group = SOME group, deps = [], pri = pri, interrupts = true}
 | 
| 59328 
b83d6c3c439a
ignore print process even after fork, to avoid loosing active worker threads;
 wenzelm parents: 
59193diff
changeset | 432 | (fn () => | 
| 
b83d6c3c439a
ignore print process even after fork, to avoid loosing active worker threads;
 wenzelm parents: 
59193diff
changeset | 433 | if ignore_process print_process then () | 
| 
b83d6c3c439a
ignore print process even after fork, to avoid loosing active worker threads;
 wenzelm parents: 
59193diff
changeset | 434 | else run_process execution_id exec_id print_process)); | 
| 52651 | 435 | in | 
| 52762 | 436 | (case delay of | 
| 437 | NONE => fork () | |
| 62826 | 438 | | SOME d => ignore (Event_Timer.request (Time.now () + d) fork)) | 
| 52651 | 439 | end | 
| 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: 
59188diff
changeset | 440 | 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: 
52536diff
changeset | 441 | |
| 52600 | 442 | in | 
| 443 | ||
| 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: 
59188diff
changeset | 444 | 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: 
59188diff
changeset | 445 | (run_eval execution_id eval; List.app (run_print execution_id) prints); | 
| 52532 | 446 | |
| 47336 | 447 | end; | 
| 448 | ||
| 52600 | 449 | end; | 
| 450 |