author | wenzelm |
Tue, 12 Aug 2014 20:18:27 +0200 | |
changeset 57918 | f5d73caba4e5 |
parent 57626 | 2288a6f17930 |
child 58843 | 521cea5fa777 |
permissions | -rw-r--r-- |
3604
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
1 |
(* Title: Pure/Thy/thy_info.ML |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
2 |
Author: Markus Wenzel, TU Muenchen |
3604
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
3 |
|
37978
548f3f165d05
simplified Thy_Header.read -- include Source.of_string_limited here;
wenzelm
parents:
37977
diff
changeset
|
4 |
Global theory info database, with auto-loading according to theory and |
15801 | 5 |
file dependencies. |
3976 | 6 |
*) |
3604
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
7 |
|
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
8 |
signature THY_INFO = |
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
9 |
sig |
37981
9a15982f41fe
theory loader: removed obsolete touch/outdate operations (require_thy no longer changes the database implicitly);
wenzelm
parents:
37980
diff
changeset
|
10 |
datatype action = Update | Remove |
7099 | 11 |
val add_hook: (action -> string -> unit) -> unit |
26614 | 12 |
val get_names: unit -> string list |
7288 | 13 |
val lookup_theory: string -> theory option |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
14 |
val get_theory: string -> theory |
24563 | 15 |
val is_finished: string -> bool |
26983 | 16 |
val master_directory: string -> Path.T |
24080
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
17 |
val loaded_files: string -> Path.T list |
29421
db532e37cda2
use_thys: perform consolidate_thy on loaded theories, which removes failed nodes in post-hoc fashion;
wenzelm
parents:
29118
diff
changeset
|
18 |
val remove_thy: string -> unit |
db532e37cda2
use_thys: perform consolidate_thy on loaded theories, which removes failed nodes in post-hoc fashion;
wenzelm
parents:
29118
diff
changeset
|
19 |
val kill_thy: string -> unit |
54458
96ccc8972fc7
prefer explicit "document" flag -- eliminated stateful Present.no_document;
wenzelm
parents:
54446
diff
changeset
|
20 |
val use_theories: |
96ccc8972fc7
prefer explicit "document" flag -- eliminated stateful Present.no_document;
wenzelm
parents:
54446
diff
changeset
|
21 |
{document: bool, last_timing: Toplevel.transition -> Time.time option, master_dir: Path.T} -> |
51217
65ab2c4f4c32
support for prescient timing information within command transactions;
wenzelm
parents:
50862
diff
changeset
|
22 |
(string * Position.T) list -> unit |
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48898
diff
changeset
|
23 |
val use_thys: (string * Position.T) list -> unit |
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48898
diff
changeset
|
24 |
val use_thy: string * Position.T -> unit |
57626 | 25 |
val script_thy: Position.T -> string -> theory |
46938
cda018294515
some support for outer syntax keyword declarations within theory header;
wenzelm
parents:
46774
diff
changeset
|
26 |
val toplevel_begin_theory: Path.T -> Thy_Header.header -> theory |
37954
a2e73df0b1e0
simplified/clarified register_thy: more precise treatment of new dependencies, remove descendants;
wenzelm
parents:
37953
diff
changeset
|
27 |
val register_thy: theory -> unit |
24080
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
28 |
val finish: unit -> unit |
3604
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
29 |
end; |
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
30 |
|
37216
3165bc303f66
modernized some structure names, keeping a few legacy aliases;
wenzelm
parents:
36953
diff
changeset
|
31 |
structure Thy_Info: THY_INFO = |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
32 |
struct |
3604
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
33 |
|
7099 | 34 |
(** theory loader actions and hooks **) |
35 |
||
37981
9a15982f41fe
theory loader: removed obsolete touch/outdate operations (require_thy no longer changes the database implicitly);
wenzelm
parents:
37980
diff
changeset
|
36 |
datatype action = Update | Remove; |
7099 | 37 |
|
38 |
local |
|
43640 | 39 |
val hooks = Synchronized.var "Thy_Info.hooks" ([]: (action -> string -> unit) list); |
7099 | 40 |
in |
43640 | 41 |
fun add_hook f = Synchronized.change hooks (cons f); |
42 |
fun perform action name = |
|
43 |
List.app (fn f => (try (fn () => f action name) (); ())) (Synchronized.value hooks); |
|
7099 | 44 |
end; |
45 |
||
46 |
||
47 |
||
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
48 |
(** thy database **) |
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
49 |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
50 |
(* messages *) |
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
51 |
|
55797 | 52 |
val show_path = space_implode " via " o map quote; |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
53 |
|
55797 | 54 |
fun cycle_msg names = "Cyclic dependency of " ^ show_path names; |
3604
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
55 |
|
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
56 |
|
6666 | 57 |
(* derived graph operations *) |
3604
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
58 |
|
50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50845
diff
changeset
|
59 |
fun add_deps name parents G = String_Graph.add_deps_acyclic (name, parents) G |
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50845
diff
changeset
|
60 |
handle String_Graph.CYCLES namess => error (cat_lines (map cycle_msg namess)); |
3604
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
61 |
|
37984
f26352bd82cf
clarified register_thy: clean slate via kill_thy, more precise CRITICAL section;
wenzelm
parents:
37981
diff
changeset
|
62 |
fun new_entry name parents entry = |
50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50845
diff
changeset
|
63 |
String_Graph.new_node (name, entry) #> add_deps name parents; |
37977
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, non-optional master dependency, do not store text in deps;
wenzelm
parents:
37955
diff
changeset
|
64 |
|
3604
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
65 |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
66 |
(* thy database *) |
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
67 |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
68 |
type deps = |
41955
703ea96b13c6
files are identified via SHA1 digests -- discontinued ISABELLE_FILE_IDENT;
wenzelm
parents:
41678
diff
changeset
|
69 |
{master: (Path.T * SHA1.digest), (*master dependencies for thy file*) |
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48898
diff
changeset
|
70 |
imports: (string * Position.T) list}; (*source specification of imports (partially qualified)*) |
23886
f40fba467384
simplified ThyLoad interfaces: only one additional directory;
wenzelm
parents:
23871
diff
changeset
|
71 |
|
38148
d2f3c8d4a89f
uniform naming of imports (source specification) vs. parents (thy node names) vs. parent_thys (theory values);
wenzelm
parents:
38147
diff
changeset
|
72 |
fun make_deps master imports : deps = {master = master, imports = imports}; |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
73 |
|
37980
b8c3d4dc1e3e
avoid repeated File.read for theory text (as before);
wenzelm
parents:
37979
diff
changeset
|
74 |
fun master_dir (d: deps option) = the_default Path.current (Option.map (Path.dir o #1 o #master) d); |
44225
a8f921e6484f
more robust Thy_Header.base_name, with minimal assumptions about path syntax;
wenzelm
parents:
44222
diff
changeset
|
75 |
fun base_name s = Path.implode (Path.base (Path.explode s)); |
23967 | 76 |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
77 |
local |
50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50845
diff
changeset
|
78 |
val database = |
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50845
diff
changeset
|
79 |
Unsynchronized.ref (String_Graph.empty: (deps option * theory option) String_Graph.T); |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
80 |
in |
6362 | 81 |
fun get_thys () = ! database; |
38145
675827e61eb9
more precise CRITICAL sections, using NAMED_CRITICAL uniformly;
wenzelm
parents:
38143
diff
changeset
|
82 |
fun change_thys f = NAMED_CRITICAL "Thy_Info" (fn () => Unsynchronized.change database f); |
3604
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
83 |
end; |
5209 | 84 |
|
85 |
||
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
86 |
(* access thy graph *) |
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
87 |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
88 |
fun thy_graph f x = f (get_thys ()) x; |
9417 | 89 |
|
50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50845
diff
changeset
|
90 |
fun get_names () = String_Graph.topological_order (get_thys ()); |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
91 |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
92 |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
93 |
(* access thy *) |
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
94 |
|
7935 | 95 |
fun lookup_thy name = |
50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50845
diff
changeset
|
96 |
SOME (thy_graph String_Graph.get_node name) handle String_Graph.UNDEF _ => NONE; |
7935 | 97 |
|
16047 | 98 |
val known_thy = is_some o lookup_thy; |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
99 |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
100 |
fun get_thy name = |
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
101 |
(case lookup_thy name of |
15531 | 102 |
SOME thy => thy |
55797 | 103 |
| NONE => error ("Theory loader: nothing known about theory " ^ quote name)); |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
104 |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
105 |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
106 |
(* access deps *) |
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
107 |
|
15570 | 108 |
val lookup_deps = Option.map #1 o lookup_thy; |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
109 |
val get_deps = #1 o get_thy; |
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
110 |
|
26983 | 111 |
val is_finished = is_none o get_deps; |
37980
b8c3d4dc1e3e
avoid repeated File.read for theory text (as before);
wenzelm
parents:
37979
diff
changeset
|
112 |
val master_directory = master_dir o get_deps; |
7191 | 113 |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
114 |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
115 |
(* access theory *) |
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
116 |
|
7687 | 117 |
fun lookup_theory name = |
118 |
(case lookup_thy name of |
|
38142 | 119 |
SOME (_, SOME theory) => SOME theory |
15531 | 120 |
| _ => NONE); |
7288 | 121 |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
122 |
fun get_theory name = |
7288 | 123 |
(case lookup_theory name of |
23871 | 124 |
SOME theory => theory |
55797 | 125 |
| _ => error ("Theory loader: undefined entry for theory " ^ quote name)); |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
126 |
|
56208 | 127 |
val get_imports = Resources.imports_of o get_theory; |
44337
d453faed4815
clarified get_imports -- should not rely on accidental order within graph;
wenzelm
parents:
44302
diff
changeset
|
128 |
|
54446 | 129 |
(*Proof General legacy*) |
38145
675827e61eb9
more precise CRITICAL sections, using NAMED_CRITICAL uniformly;
wenzelm
parents:
38143
diff
changeset
|
130 |
fun loaded_files name = NAMED_CRITICAL "Thy_Info" (fn () => |
37949
48a874444164
moved management of auxiliary theory source files to Thy_Load -- as theory data instead of accidental loader state;
wenzelm
parents:
37942
diff
changeset
|
131 |
(case get_deps name of |
48a874444164
moved management of auxiliary theory source files to Thy_Load -- as theory data instead of accidental loader state;
wenzelm
parents:
37942
diff
changeset
|
132 |
NONE => [] |
56208 | 133 |
| SOME {master = (thy_path, _), ...} => thy_path :: Resources.loaded_files (get_theory name))); |
37949
48a874444164
moved management of auxiliary theory source files to Thy_Load -- as theory data instead of accidental loader state;
wenzelm
parents:
37942
diff
changeset
|
134 |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
135 |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
136 |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
137 |
(** thy operations **) |
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
138 |
|
43640 | 139 |
(* main loader actions *) |
29421
db532e37cda2
use_thys: perform consolidate_thy on loaded theories, which removes failed nodes in post-hoc fashion;
wenzelm
parents:
29118
diff
changeset
|
140 |
|
38145
675827e61eb9
more precise CRITICAL sections, using NAMED_CRITICAL uniformly;
wenzelm
parents:
38143
diff
changeset
|
141 |
fun remove_thy name = NAMED_CRITICAL "Thy_Info" (fn () => |
55797 | 142 |
if is_finished name then error ("Cannot update finished theory " ^ quote name) |
29421
db532e37cda2
use_thys: perform consolidate_thy on loaded theories, which removes failed nodes in post-hoc fashion;
wenzelm
parents:
29118
diff
changeset
|
143 |
else |
29434 | 144 |
let |
50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50845
diff
changeset
|
145 |
val succs = thy_graph String_Graph.all_succs [name]; |
55797 | 146 |
val _ = Output.urgent_message ("Theory loader: removing " ^ commas_quote succs); |
38142 | 147 |
val _ = List.app (perform Remove) succs; |
50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50845
diff
changeset
|
148 |
val _ = change_thys (fold String_Graph.del_node succs); |
38142 | 149 |
in () end); |
29421
db532e37cda2
use_thys: perform consolidate_thy on loaded theories, which removes failed nodes in post-hoc fashion;
wenzelm
parents:
29118
diff
changeset
|
150 |
|
38145
675827e61eb9
more precise CRITICAL sections, using NAMED_CRITICAL uniformly;
wenzelm
parents:
38143
diff
changeset
|
151 |
fun kill_thy name = NAMED_CRITICAL "Thy_Info" (fn () => |
37977
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, non-optional master dependency, do not store text in deps;
wenzelm
parents:
37955
diff
changeset
|
152 |
if known_thy name then remove_thy name |
38142 | 153 |
else ()); |
7099 | 154 |
|
43640 | 155 |
fun update_thy deps theory = NAMED_CRITICAL "Thy_Info" (fn () => |
156 |
let |
|
157 |
val name = Context.theory_name theory; |
|
158 |
val parents = map Context.theory_name (Theory.parents_of theory); |
|
159 |
val _ = kill_thy name; |
|
160 |
val _ = map get_theory parents; |
|
161 |
val _ = change_thys (new_entry name parents (SOME deps, SOME theory)); |
|
162 |
val _ = perform Update name; |
|
163 |
in () end); |
|
164 |
||
7099 | 165 |
|
24209 | 166 |
(* scheduling loader tasks *) |
167 |
||
51330 | 168 |
datatype result = |
53375
78693e46a237
Execution.fork formally requires registered Execution.running;
wenzelm
parents:
53192
diff
changeset
|
169 |
Result of {theory: theory, exec_id: Document_ID.exec, |
78693e46a237
Execution.fork formally requires registered Execution.running;
wenzelm
parents:
53192
diff
changeset
|
170 |
present: unit -> unit, commit: unit -> unit, weight: int}; |
51331
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
171 |
|
53375
78693e46a237
Execution.fork formally requires registered Execution.running;
wenzelm
parents:
53192
diff
changeset
|
172 |
fun theory_result theory = |
78693e46a237
Execution.fork formally requires registered Execution.running;
wenzelm
parents:
53192
diff
changeset
|
173 |
Result {theory = theory, exec_id = Document_ID.none, present = I, commit = I, weight = 0}; |
51330 | 174 |
|
175 |
fun result_theory (Result {theory, ...}) = theory; |
|
51331
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
176 |
fun result_present (Result {present, ...}) = present; |
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
177 |
fun result_commit (Result {commit, ...}) = commit; |
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
178 |
fun result_ord (Result {weight = i, ...}, Result {weight = j, ...}) = int_ord (j, i); |
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
179 |
|
53375
78693e46a237
Execution.fork formally requires registered Execution.running;
wenzelm
parents:
53192
diff
changeset
|
180 |
fun join_theory (Result {theory, exec_id, ...}) = |
54370
39ac1a02c60c
join all theory body forks, notably Toplevel.atom_result (diagnostic commands), before peeking at full status;
wenzelm
parents:
53375
diff
changeset
|
181 |
let |
39ac1a02c60c
join all theory body forks, notably Toplevel.atom_result (diagnostic commands), before peeking at full status;
wenzelm
parents:
53375
diff
changeset
|
182 |
(*toplevel proofs and diags*) |
39ac1a02c60c
join all theory body forks, notably Toplevel.atom_result (diagnostic commands), before peeking at full status;
wenzelm
parents:
53375
diff
changeset
|
183 |
val _ = Future.join_tasks (maps Future.group_snapshot (Execution.peek exec_id)); |
39ac1a02c60c
join all theory body forks, notably Toplevel.atom_result (diagnostic commands), before peeking at full status;
wenzelm
parents:
53375
diff
changeset
|
184 |
(*fully nested proofs*) |
39ac1a02c60c
join all theory body forks, notably Toplevel.atom_result (diagnostic commands), before peeking at full status;
wenzelm
parents:
53375
diff
changeset
|
185 |
val res = Exn.capture Thm.join_theory_proofs theory; |
39ac1a02c60c
join all theory body forks, notably Toplevel.atom_result (diagnostic commands), before peeking at full status;
wenzelm
parents:
53375
diff
changeset
|
186 |
in res :: map Exn.Exn (maps Task_Queue.group_status (Execution.peek exec_id)) end; |
43641
081e009549dc
uniform finish_thy -- always Global_Theory.join_proofs, even with sequential scheduling;
wenzelm
parents:
43640
diff
changeset
|
187 |
|
37977
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, non-optional master dependency, do not store text in deps;
wenzelm
parents:
37955
diff
changeset
|
188 |
datatype task = |
55461
ce676a750575
more integrity checks of theory names vs. full node names -- at least for the scope of a single use_thys (or "theories" section in ROOT);
wenzelm
parents:
54722
diff
changeset
|
189 |
Task of Path.T * string list * (theory list -> result) | |
37977
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, non-optional master dependency, do not store text in deps;
wenzelm
parents:
37955
diff
changeset
|
190 |
Finished of theory; |
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, non-optional master dependency, do not store text in deps;
wenzelm
parents:
37955
diff
changeset
|
191 |
|
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, non-optional master dependency, do not store text in deps;
wenzelm
parents:
37955
diff
changeset
|
192 |
fun task_finished (Task _) = false |
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, non-optional master dependency, do not store text in deps;
wenzelm
parents:
37955
diff
changeset
|
193 |
| task_finished (Finished _) = true; |
24209 | 194 |
|
44162 | 195 |
fun task_parents deps (parents: string list) = map (the o AList.lookup (op =) deps) parents; |
196 |
||
29118 | 197 |
local |
198 |
||
44162 | 199 |
val schedule_seq = |
50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50845
diff
changeset
|
200 |
String_Graph.schedule (fn deps => fn (_, task) => |
44162 | 201 |
(case task of |
55461
ce676a750575
more integrity checks of theory names vs. full node names -- at least for the scope of a single use_thys (or "theories" section in ROOT);
wenzelm
parents:
54722
diff
changeset
|
202 |
Task (_, parents, body) => |
51331
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
203 |
let |
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
204 |
val result = body (task_parents deps parents); |
53190
5d92649a310e
simplified Goal.forked_proofs: status is determined via group instead of dummy future (see also Pure/PIDE/execution.ML);
wenzelm
parents:
51661
diff
changeset
|
205 |
val _ = Par_Exn.release_all (join_theory result); |
51331
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
206 |
val _ = result_present result (); |
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
207 |
val _ = result_commit result (); |
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
208 |
in result_theory result end |
44162 | 209 |
| Finished thy => thy)) #> ignore; |
29000
5e03bc760355
improved future_schedule: more robust handling of failed parents (explicit join), final join of all futures, including Exn.release_all;
wenzelm
parents:
28980
diff
changeset
|
210 |
|
51284
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51228
diff
changeset
|
211 |
val schedule_futures = uninterruptible (fn _ => fn tasks => |
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51228
diff
changeset
|
212 |
let |
51331
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
213 |
val futures = tasks |
51284
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51228
diff
changeset
|
214 |
|> String_Graph.schedule (fn deps => fn (name, task) => |
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51228
diff
changeset
|
215 |
(case task of |
55461
ce676a750575
more integrity checks of theory names vs. full node names -- at least for the scope of a single use_thys (or "theories" section in ROOT);
wenzelm
parents:
54722
diff
changeset
|
216 |
Task (_, parents, body) => |
51284
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51228
diff
changeset
|
217 |
(singleton o Future.forks) |
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51228
diff
changeset
|
218 |
{name = "theory:" ^ name, group = NONE, |
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51228
diff
changeset
|
219 |
deps = map (Future.task_of o #2) deps, pri = 0, interrupts = true} |
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51228
diff
changeset
|
220 |
(fn () => |
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51228
diff
changeset
|
221 |
(case filter (not o can Future.join o #2) deps of |
51330 | 222 |
[] => body (map (result_theory o Future.join) (task_parents deps parents)) |
51284
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51228
diff
changeset
|
223 |
| bad => |
55797 | 224 |
error |
225 |
("Failed to load theory " ^ quote name ^ |
|
226 |
" (unresolved " ^ commas_quote (map #1 bad) ^ ")"))) |
|
51331
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
227 |
| Finished theory => Future.value (theory_result theory))); |
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
228 |
|
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
229 |
val results1 = futures |
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
230 |
|> maps (fn future => |
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
231 |
(case Future.join_result future of |
53190
5d92649a310e
simplified Goal.forked_proofs: status is determined via group instead of dummy future (see also Pure/PIDE/execution.ML);
wenzelm
parents:
51661
diff
changeset
|
232 |
Exn.Res result => join_theory result |
51331
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
233 |
| Exn.Exn exn => [Exn.Exn exn])); |
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
234 |
|
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
235 |
val results2 = futures |
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
236 |
|> map_filter (Exn.get_res o Future.join_result) |
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
237 |
|> sort result_ord |
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
238 |
|> Par_List.map (fn result => Exn.capture (result_present result) ()); |
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
239 |
|
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
240 |
(* FIXME more precise commit order (!?) *) |
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
241 |
val results3 = futures |
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
242 |
|> map (fn future => Exn.capture (fn () => result_commit (Future.join future) ()) ()); |
51284
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51228
diff
changeset
|
243 |
|
54370
39ac1a02c60c
join all theory body forks, notably Toplevel.atom_result (diagnostic commands), before peeking at full status;
wenzelm
parents:
53375
diff
changeset
|
244 |
(* FIXME avoid global Execution.reset (!??) *) |
53192 | 245 |
val results4 = map Exn.Exn (maps Task_Queue.group_status (Execution.reset ())); |
51284
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51228
diff
changeset
|
246 |
|
51331
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
247 |
val _ = Par_Exn.release_all (results1 @ results2 @ results3 @ results4); |
51284
59a03019f3bf
fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents:
51228
diff
changeset
|
248 |
in () end); |
29429
a6c641f08af7
schedule_futures: tuned final consolidation, explicit after_load phase;
wenzelm
parents:
29421
diff
changeset
|
249 |
|
24209 | 250 |
in |
251 |
||
32794 | 252 |
fun schedule_tasks tasks = |
29118 | 253 |
if not (Multithreading.enabled ()) then schedule_seq tasks |
254 |
else if Multithreading.self_critical () then |
|
55797 | 255 |
(warning "Theory loader: no multithreading within critical section"; |
24209 | 256 |
schedule_seq tasks) |
29118 | 257 |
else schedule_futures tasks; |
24209 | 258 |
|
259 |
end; |
|
260 |
||
261 |
||
23967 | 262 |
(* require_thy -- checking database entries wrt. the file-system *) |
15065 | 263 |
|
7211 | 264 |
local |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
265 |
|
37977
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, non-optional master dependency, do not store text in deps;
wenzelm
parents:
37955
diff
changeset
|
266 |
fun required_by _ [] = "" |
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, non-optional master dependency, do not store text in deps;
wenzelm
parents:
37955
diff
changeset
|
267 |
| required_by s initiators = s ^ "(required by " ^ show_path (rev initiators) ^ ")"; |
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, non-optional master dependency, do not store text in deps;
wenzelm
parents:
37955
diff
changeset
|
268 |
|
54458
96ccc8972fc7
prefer explicit "document" flag -- eliminated stateful Present.no_document;
wenzelm
parents:
54446
diff
changeset
|
269 |
fun load_thy document last_timing initiators update_time deps text (name, pos) keywords parents = |
37977
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, non-optional master dependency, do not store text in deps;
wenzelm
parents:
37955
diff
changeset
|
270 |
let |
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, non-optional master dependency, do not store text in deps;
wenzelm
parents:
37955
diff
changeset
|
271 |
val _ = kill_thy name; |
40132
7ee65dbffa31
renamed Output.priority to Output.urgent_message to emphasize its special role more clearly;
wenzelm
parents:
39557
diff
changeset
|
272 |
val _ = Output.urgent_message ("Loading theory " ^ quote name ^ required_by " " initiators); |
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:
56208
diff
changeset
|
273 |
val _ = Output.try_protocol_message (Markup.loading_theory name) []; |
37977
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, non-optional master dependency, do not store text in deps;
wenzelm
parents:
37955
diff
changeset
|
274 |
|
41548
bd0bebf93fa6
Thy_Load.begin_theory: maintain source specification of imports;
wenzelm
parents:
41536
diff
changeset
|
275 |
val {master = (thy_path, _), imports} = deps; |
38134
3de75ca6f166
load_thy: refer to physical master directory (not accumulated source import directory) and enable loading files relatively to that;
wenzelm
parents:
37985
diff
changeset
|
276 |
val dir = Path.dir thy_path; |
51294
0850d43cb355
discontinued obsolete header "files" -- these are loaded explicitly after exploring dependencies;
wenzelm
parents:
51293
diff
changeset
|
277 |
val header = Thy_Header.make (name, pos) imports keywords; |
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48898
diff
changeset
|
278 |
|
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48898
diff
changeset
|
279 |
val _ = Position.reports (map #2 imports ~~ map Theory.get_markup parents); |
37977
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, non-optional master dependency, do not store text in deps;
wenzelm
parents:
37955
diff
changeset
|
280 |
|
53375
78693e46a237
Execution.fork formally requires registered Execution.running;
wenzelm
parents:
53192
diff
changeset
|
281 |
val exec_id = Document_ID.make (); |
78693e46a237
Execution.fork formally requires registered Execution.running;
wenzelm
parents:
53192
diff
changeset
|
282 |
val _ = |
78693e46a237
Execution.fork formally requires registered Execution.running;
wenzelm
parents:
53192
diff
changeset
|
283 |
Execution.running Document_ID.none exec_id [] orelse |
78693e46a237
Execution.fork formally requires registered Execution.running;
wenzelm
parents:
53192
diff
changeset
|
284 |
raise Fail ("Failed to register execution: " ^ Document_ID.print exec_id); |
78693e46a237
Execution.fork formally requires registered Execution.running;
wenzelm
parents:
53192
diff
changeset
|
285 |
|
78693e46a237
Execution.fork formally requires registered Execution.running;
wenzelm
parents:
53192
diff
changeset
|
286 |
val text_pos = Position.put_id (Document_ID.print exec_id) (Path.position thy_path); |
51331
e7fab0b5dbe7
join all proofs before scheduling present phase (ordered according to weight);
wenzelm
parents:
51330
diff
changeset
|
287 |
val (theory, present, weight) = |
56208 | 288 |
Resources.load_thy document last_timing update_time dir header text_pos text |
48638 | 289 |
(if name = Context.PureN then [ML_Context.the_global_context ()] else parents); |
43640 | 290 |
fun commit () = update_thy deps theory; |
53375
78693e46a237
Execution.fork formally requires registered Execution.running;
wenzelm
parents:
53192
diff
changeset
|
291 |
in |
78693e46a237
Execution.fork formally requires registered Execution.running;
wenzelm
parents:
53192
diff
changeset
|
292 |
Result {theory = theory, exec_id = exec_id, present = present, commit = commit, weight = weight} |
78693e46a237
Execution.fork formally requires registered Execution.running;
wenzelm
parents:
53192
diff
changeset
|
293 |
end; |
37977
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, non-optional master dependency, do not store text in deps;
wenzelm
parents:
37955
diff
changeset
|
294 |
|
48898
9fc880720663
simplified Thy_Load.check_thy (again) -- no need to pass keywords nor find files in body text;
wenzelm
parents:
48888
diff
changeset
|
295 |
fun check_deps dir name = |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
296 |
(case lookup_deps name of |
51293
05b1bbae748d
discontinued obsolete 'uses' within theory header;
wenzelm
parents:
51284
diff
changeset
|
297 |
SOME NONE => (true, NONE, Position.none, get_imports name, []) |
23893
8babfcaaf129
deps: maintain source specification of parents (prevents repeated ThyLoad.deps_thy);
wenzelm
parents:
23886
diff
changeset
|
298 |
| NONE => |
56208 | 299 |
let val {master, text, theory_pos, imports, keywords} = Resources.check_thy dir name |
51293
05b1bbae748d
discontinued obsolete 'uses' within theory header;
wenzelm
parents:
51284
diff
changeset
|
300 |
in (false, SOME (make_deps master imports, text), theory_pos, imports, keywords) end |
42129
c17508a61f49
present theory content as future, depending on intermediate proof state futures -- potential to reduce memory requirements and improve parallelization;
wenzelm
parents:
42003
diff
changeset
|
301 |
| SOME (SOME {master, ...}) => |
42003
6e45dc518ebb
replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents:
41955
diff
changeset
|
302 |
let |
48928 | 303 |
val {master = master', text = text', theory_pos = theory_pos', imports = imports', |
56208 | 304 |
keywords = keywords'} = Resources.check_thy dir name; |
42003
6e45dc518ebb
replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents:
41955
diff
changeset
|
305 |
val deps' = SOME (make_deps master' imports', text'); |
6e45dc518ebb
replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents:
41955
diff
changeset
|
306 |
val current = |
6e45dc518ebb
replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents:
41955
diff
changeset
|
307 |
#2 master = #2 master' andalso |
6e45dc518ebb
replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents:
41955
diff
changeset
|
308 |
(case lookup_theory name of |
6e45dc518ebb
replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents:
41955
diff
changeset
|
309 |
NONE => false |
56208 | 310 |
| SOME theory => Resources.loaded_files_current theory); |
51293
05b1bbae748d
discontinued obsolete 'uses' within theory header;
wenzelm
parents:
51284
diff
changeset
|
311 |
in (current, deps', theory_pos', imports', keywords') end); |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
312 |
|
23967 | 313 |
in |
314 |
||
54458
96ccc8972fc7
prefer explicit "document" flag -- eliminated stateful Present.no_document;
wenzelm
parents:
54446
diff
changeset
|
315 |
fun require_thys document last_timing initiators dir strs tasks = |
96ccc8972fc7
prefer explicit "document" flag -- eliminated stateful Present.no_document;
wenzelm
parents:
54446
diff
changeset
|
316 |
fold_map (require_thy document last_timing initiators dir) strs tasks |>> forall I |
96ccc8972fc7
prefer explicit "document" flag -- eliminated stateful Present.no_document;
wenzelm
parents:
54446
diff
changeset
|
317 |
and require_thy document last_timing initiators dir (str, require_pos) tasks = |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
318 |
let |
21858
05f57309170c
avoid conflict with Alice keywords: renamed pack -> implode, unpack -> explode, any -> many, avoided assert;
wenzelm
parents:
20664
diff
changeset
|
319 |
val path = Path.expand (Path.explode str); |
05f57309170c
avoid conflict with Alice keywords: renamed pack -> implode, unpack -> explode, any -> many, avoided assert;
wenzelm
parents:
20664
diff
changeset
|
320 |
val name = Path.implode (Path.base path); |
56208 | 321 |
val node_name = File.full_path dir (Resources.thy_path path); |
55461
ce676a750575
more integrity checks of theory names vs. full node names -- at least for the scope of a single use_thys (or "theories" section in ROOT);
wenzelm
parents:
54722
diff
changeset
|
322 |
fun check_entry (Task (node_name', _, _)) = |
ce676a750575
more integrity checks of theory names vs. full node names -- at least for the scope of a single use_thys (or "theories" section in ROOT);
wenzelm
parents:
54722
diff
changeset
|
323 |
if node_name = node_name' then () |
ce676a750575
more integrity checks of theory names vs. full node names -- at least for the scope of a single use_thys (or "theories" section in ROOT);
wenzelm
parents:
54722
diff
changeset
|
324 |
else |
55797 | 325 |
error ("Incoherent imports for theory " ^ quote name ^ |
55461
ce676a750575
more integrity checks of theory names vs. full node names -- at least for the scope of a single use_thys (or "theories" section in ROOT);
wenzelm
parents:
54722
diff
changeset
|
326 |
Position.here require_pos ^ ":\n" ^ |
55488
60c159d490a2
more integrity checks of theory names vs. full node names;
wenzelm
parents:
55461
diff
changeset
|
327 |
" " ^ Path.print node_name ^ "\n" ^ |
60c159d490a2
more integrity checks of theory names vs. full node names;
wenzelm
parents:
55461
diff
changeset
|
328 |
" " ^ Path.print node_name') |
55461
ce676a750575
more integrity checks of theory names vs. full node names -- at least for the scope of a single use_thys (or "theories" section in ROOT);
wenzelm
parents:
54722
diff
changeset
|
329 |
| check_entry _ = (); |
7066 | 330 |
in |
50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50845
diff
changeset
|
331 |
(case try (String_Graph.get_node tasks) name of |
55461
ce676a750575
more integrity checks of theory names vs. full node names -- at least for the scope of a single use_thys (or "theories" section in ROOT);
wenzelm
parents:
54722
diff
changeset
|
332 |
SOME task => (check_entry task; (task_finished task, tasks)) |
23967 | 333 |
| NONE => |
334 |
let |
|
43651
511df47bcadc
some support for theory files within Isabelle/Scala session;
wenzelm
parents:
43641
diff
changeset
|
335 |
val dir' = Path.append dir (Path.dir path); |
511df47bcadc
some support for theory files within Isabelle/Scala session;
wenzelm
parents:
43641
diff
changeset
|
336 |
val _ = member (op =) initiators name andalso error (cycle_msg initiators); |
511df47bcadc
some support for theory files within Isabelle/Scala session;
wenzelm
parents:
43641
diff
changeset
|
337 |
|
51293
05b1bbae748d
discontinued obsolete 'uses' within theory header;
wenzelm
parents:
51284
diff
changeset
|
338 |
val (current, deps, theory_pos, imports, keywords) = check_deps dir' name |
55797 | 339 |
handle ERROR msg => |
340 |
cat_error msg |
|
341 |
("The error(s) above occurred for theory " ^ quote name ^ |
|
342 |
Position.here require_pos ^ required_by "\n" initiators); |
|
37981
9a15982f41fe
theory loader: removed obsolete touch/outdate operations (require_thy no longer changes the database implicitly);
wenzelm
parents:
37980
diff
changeset
|
343 |
|
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48898
diff
changeset
|
344 |
val parents = map (base_name o #1) imports; |
48898
9fc880720663
simplified Thy_Load.check_thy (again) -- no need to pass keywords nor find files in body text;
wenzelm
parents:
48888
diff
changeset
|
345 |
val (parents_current, tasks') = |
54458
96ccc8972fc7
prefer explicit "document" flag -- eliminated stateful Present.no_document;
wenzelm
parents:
54446
diff
changeset
|
346 |
require_thys document last_timing (name :: initiators) |
48898
9fc880720663
simplified Thy_Load.check_thy (again) -- no need to pass keywords nor find files in body text;
wenzelm
parents:
48888
diff
changeset
|
347 |
(Path.append dir (master_dir (Option.map #1 deps))) imports tasks; |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
348 |
|
23967 | 349 |
val all_current = current andalso parents_current; |
37977
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, non-optional master dependency, do not store text in deps;
wenzelm
parents:
37955
diff
changeset
|
350 |
val task = |
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, non-optional master dependency, do not store text in deps;
wenzelm
parents:
37955
diff
changeset
|
351 |
if all_current then Finished (get_theory name) |
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, non-optional master dependency, do not store text in deps;
wenzelm
parents:
37955
diff
changeset
|
352 |
else |
37980
b8c3d4dc1e3e
avoid repeated File.read for theory text (as before);
wenzelm
parents:
37979
diff
changeset
|
353 |
(case deps of |
b8c3d4dc1e3e
avoid repeated File.read for theory text (as before);
wenzelm
parents:
37979
diff
changeset
|
354 |
NONE => raise Fail "Malformed deps" |
42003
6e45dc518ebb
replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents:
41955
diff
changeset
|
355 |
| SOME (dep, text) => |
48876
157dd47032e0
more standard Thy_Load.check_thy for Pure.thy, relying on its header;
wenzelm
parents:
48874
diff
changeset
|
356 |
let |
157dd47032e0
more standard Thy_Load.check_thy for Pure.thy, relying on its header;
wenzelm
parents:
48874
diff
changeset
|
357 |
val update_time = serial (); |
48928 | 358 |
val load = |
54458
96ccc8972fc7
prefer explicit "document" flag -- eliminated stateful Present.no_document;
wenzelm
parents:
54446
diff
changeset
|
359 |
load_thy document last_timing initiators update_time dep |
51293
05b1bbae748d
discontinued obsolete 'uses' within theory header;
wenzelm
parents:
51284
diff
changeset
|
360 |
text (name, theory_pos) keywords; |
55461
ce676a750575
more integrity checks of theory names vs. full node names -- at least for the scope of a single use_thys (or "theories" section in ROOT);
wenzelm
parents:
54722
diff
changeset
|
361 |
in Task (node_name, parents, load) end); |
48874
ff9cd47be39b
refined Thy_Load.check_thy: find more uses in body text, based on keywords;
wenzelm
parents:
48710
diff
changeset
|
362 |
|
ff9cd47be39b
refined Thy_Load.check_thy: find more uses in body text, based on keywords;
wenzelm
parents:
48710
diff
changeset
|
363 |
val tasks'' = new_entry name parents task tasks'; |
48898
9fc880720663
simplified Thy_Load.check_thy (again) -- no need to pass keywords nor find files in body text;
wenzelm
parents:
48888
diff
changeset
|
364 |
in (all_current, tasks'') end) |
7066 | 365 |
end; |
6484
3f098b0ec683
use_thy etc.: may specify path prefix, which is temporarily used as load path;
wenzelm
parents:
6389
diff
changeset
|
366 |
|
23967 | 367 |
end; |
368 |
||
369 |
||
37979 | 370 |
(* use_thy *) |
23967 | 371 |
|
54458
96ccc8972fc7
prefer explicit "document" flag -- eliminated stateful Present.no_document;
wenzelm
parents:
54446
diff
changeset
|
372 |
fun use_theories {document, last_timing, master_dir} imports = |
96ccc8972fc7
prefer explicit "document" flag -- eliminated stateful Present.no_document;
wenzelm
parents:
54446
diff
changeset
|
373 |
schedule_tasks (snd (require_thys document last_timing [] master_dir imports String_Graph.empty)); |
23967 | 374 |
|
54458
96ccc8972fc7
prefer explicit "document" flag -- eliminated stateful Present.no_document;
wenzelm
parents:
54446
diff
changeset
|
375 |
val use_thys = use_theories {document = false, last_timing = K NONE, master_dir = Path.current}; |
37949
48a874444164
moved management of auxiliary theory source files to Thy_Load -- as theory data instead of accidental loader state;
wenzelm
parents:
37942
diff
changeset
|
376 |
val use_thy = use_thys o single; |
7211 | 377 |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
378 |
|
57626 | 379 |
(* toplevel scripting -- without maintaining database *) |
380 |
||
381 |
fun script_thy pos txt = |
|
382 |
let |
|
57918
f5d73caba4e5
tuned signature according to Scala version -- prefer explicit argument;
wenzelm
parents:
57626
diff
changeset
|
383 |
val trs = Outer_Syntax.parse (Outer_Syntax.get_syntax ()) pos txt; |
57626 | 384 |
val end_pos = if null trs then pos else Toplevel.pos_of (List.last trs); |
385 |
val end_state = fold (Toplevel.command_exception true) trs Toplevel.toplevel; |
|
386 |
in Toplevel.end_theory end_pos end_state end; |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
387 |
|
48888 | 388 |
fun toplevel_begin_theory master_dir (header: Thy_Header.header) = |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
389 |
let |
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48898
diff
changeset
|
390 |
val {name = (name, _), imports, ...} = header; |
37977
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, non-optional master dependency, do not store text in deps;
wenzelm
parents:
37955
diff
changeset
|
391 |
val _ = kill_thy name; |
54458
96ccc8972fc7
prefer explicit "document" flag -- eliminated stateful Present.no_document;
wenzelm
parents:
54446
diff
changeset
|
392 |
val _ = use_theories {document = false, last_timing = K NONE, master_dir = master_dir} imports; |
46958
0ec8f04e753a
define keywords early when processing the theory header, before running the body commands;
wenzelm
parents:
46938
diff
changeset
|
393 |
val _ = Thy_Header.define_keywords header; |
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48898
diff
changeset
|
394 |
val parents = map (get_theory o base_name o fst) imports; |
56208 | 395 |
in Resources.begin_theory master_dir header parents end; |
7244 | 396 |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
397 |
|
37977
3ceccd415145
simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, non-optional master dependency, do not store text in deps;
wenzelm
parents:
37955
diff
changeset
|
398 |
(* register theory *) |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
399 |
|
37954
a2e73df0b1e0
simplified/clarified register_thy: more precise treatment of new dependencies, remove descendants;
wenzelm
parents:
37953
diff
changeset
|
400 |
fun register_thy theory = |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
401 |
let |
16454 | 402 |
val name = Context.theory_name theory; |
56208 | 403 |
val {master, ...} = Resources.check_thy (Resources.master_directory theory) name; |
404 |
val imports = Resources.imports_of theory; |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
405 |
in |
38145
675827e61eb9
more precise CRITICAL sections, using NAMED_CRITICAL uniformly;
wenzelm
parents:
38143
diff
changeset
|
406 |
NAMED_CRITICAL "Thy_Info" (fn () => |
38142 | 407 |
(kill_thy name; |
40132
7ee65dbffa31
renamed Output.priority to Output.urgent_message to emphasize its special role more clearly;
wenzelm
parents:
39557
diff
changeset
|
408 |
Output.urgent_message ("Registering theory " ^ quote name); |
43640 | 409 |
update_thy (make_deps master imports) theory)) |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
410 |
end; |
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
411 |
|
24080
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
412 |
|
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
413 |
(* finish all theories *) |
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
414 |
|
50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50845
diff
changeset
|
415 |
fun finish () = change_thys (String_Graph.map (fn _ => fn (_, entry) => (NONE, entry))); |
24080
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
416 |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
417 |
end; |