author | wenzelm |
Mon, 15 Aug 2011 20:19:41 +0200 | |
changeset 44199 | e38885e3ea60 |
parent 44186 | 806f0ec1a43d |
child 44222 | 9d5ef6cd4ee1 |
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 |
44199
e38885e3ea60
retrieve imports from document state, with fall-back on theory loader for preloaded theories;
wenzelm
parents:
44186
diff
changeset
|
12 |
val base_name: string -> string |
26614 | 13 |
val get_names: unit -> string list |
43673
29eb1cd29961
Thy_Info.dependencies: ignore already loaded theories, according to initial prover session status;
wenzelm
parents:
43651
diff
changeset
|
14 |
val status: unit -> unit |
7288 | 15 |
val lookup_theory: string -> theory option |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
16 |
val get_theory: string -> theory |
24563 | 17 |
val is_finished: string -> bool |
26983 | 18 |
val master_directory: string -> Path.T |
24080
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
19 |
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
|
20 |
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
|
21 |
val kill_thy: string -> unit |
38146 | 22 |
val use_thys_wrt: Path.T -> string list -> unit |
24057
f42665561801
removed obsolete Output.ML_errors/toplevel_errors;
wenzelm
parents:
23982
diff
changeset
|
23 |
val use_thys: string list -> unit |
f42665561801
removed obsolete Output.ML_errors/toplevel_errors;
wenzelm
parents:
23982
diff
changeset
|
24 |
val use_thy: string -> unit |
44186
806f0ec1a43d
simplified Toplevel.init_theory: discontinued special master argument;
wenzelm
parents:
44162
diff
changeset
|
25 |
val toplevel_begin_theory: Path.T -> string -> string list -> (Path.T * bool) list -> theory |
37954
a2e73df0b1e0
simplified/clarified register_thy: more precise treatment of new dependencies, remove descendants;
wenzelm
parents:
37953
diff
changeset
|
26 |
val register_thy: theory -> unit |
24080
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
27 |
val finish: unit -> unit |
3604
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
28 |
end; |
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
29 |
|
37216
3165bc303f66
modernized some structure names, keeping a few legacy aliases;
wenzelm
parents:
36953
diff
changeset
|
30 |
structure Thy_Info: THY_INFO = |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
31 |
struct |
3604
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
32 |
|
7099 | 33 |
(** theory loader actions and hooks **) |
34 |
||
37981
9a15982f41fe
theory loader: removed obsolete touch/outdate operations (require_thy no longer changes the database implicitly);
wenzelm
parents:
37980
diff
changeset
|
35 |
datatype action = Update | Remove; |
7099 | 36 |
|
37 |
local |
|
43640 | 38 |
val hooks = Synchronized.var "Thy_Info.hooks" ([]: (action -> string -> unit) list); |
7099 | 39 |
in |
43640 | 40 |
fun add_hook f = Synchronized.change hooks (cons f); |
41 |
fun perform action name = |
|
42 |
List.app (fn f => (try (fn () => f action name) (); ())) (Synchronized.value hooks); |
|
7099 | 43 |
end; |
44 |
||
45 |
||
46 |
||
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
47 |
(** thy database **) |
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
48 |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
49 |
(* messages *) |
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
50 |
|
23871 | 51 |
fun loader_msg txt [] = "Theory loader: " ^ txt |
52 |
| loader_msg txt names = "Theory loader: " ^ txt ^ " " ^ commas_quote names; |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
53 |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
54 |
val show_path = space_implode " via " o map quote; |
9332 | 55 |
fun cycle_msg names = loader_msg ("cyclic dependency of " ^ show_path names) []; |
3604
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
56 |
|
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
57 |
|
6666 | 58 |
(* derived graph operations *) |
3604
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
59 |
|
9327 | 60 |
fun add_deps name parents G = Graph.add_deps_acyclic (name, parents) G |
9332 | 61 |
handle Graph.CYCLES namess => error (cat_lines (map cycle_msg namess)); |
3604
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
62 |
|
37984
f26352bd82cf
clarified register_thy: clean slate via kill_thy, more precise CRITICAL section;
wenzelm
parents:
37981
diff
changeset
|
63 |
fun new_entry name parents entry = |
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 |
Graph.new_node (name, entry) #> add_deps name parents; |
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
|
65 |
|
3604
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
66 |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
67 |
(* thy database *) |
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
68 |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
69 |
type deps = |
41955
703ea96b13c6
files are identified via SHA1 digests -- discontinued ISABELLE_FILE_IDENT;
wenzelm
parents:
41678
diff
changeset
|
70 |
{master: (Path.T * SHA1.digest), (*master dependencies for thy file*) |
40741
17d6293a1e26
moved file identification to thy_load.ML (where it is actually used);
wenzelm
parents:
40132
diff
changeset
|
71 |
imports: string list}; (*source specification of imports (partially qualified)*) |
23886
f40fba467384
simplified ThyLoad interfaces: only one additional directory;
wenzelm
parents:
23871
diff
changeset
|
72 |
|
38148
d2f3c8d4a89f
uniform naming of imports (source specification) vs. parents (thy node names) vs. parent_thys (theory values);
wenzelm
parents:
38147
diff
changeset
|
73 |
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
|
74 |
|
37980
b8c3d4dc1e3e
avoid repeated File.read for theory text (as before);
wenzelm
parents:
37979
diff
changeset
|
75 |
fun master_dir (d: deps option) = the_default Path.current (Option.map (Path.dir o #1 o #master) d); |
23967 | 76 |
fun base_name s = Path.implode (Path.base (Path.explode s)); |
77 |
||
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
78 |
local |
37905 | 79 |
val database = Unsynchronized.ref (Graph.empty: (deps option * theory option) 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 |
|
23967 | 90 |
fun get_names () = Graph.topological_order (get_thys ()); |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
91 |
|
43673
29eb1cd29961
Thy_Info.dependencies: ignore already loaded theories, according to initial prover session status;
wenzelm
parents:
43651
diff
changeset
|
92 |
fun status () = |
29eb1cd29961
Thy_Info.dependencies: ignore already loaded theories, according to initial prover session status;
wenzelm
parents:
43651
diff
changeset
|
93 |
List.app (Output.status o Markup.markup_only o Markup.loaded_theory) (get_names ()); |
29eb1cd29961
Thy_Info.dependencies: ignore already loaded theories, according to initial prover session status;
wenzelm
parents:
43651
diff
changeset
|
94 |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
95 |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
96 |
(* access thy *) |
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
97 |
|
7935 | 98 |
fun lookup_thy name = |
15531 | 99 |
SOME (thy_graph Graph.get_node name) handle Graph.UNDEF _ => NONE; |
7935 | 100 |
|
16047 | 101 |
val known_thy = is_some o lookup_thy; |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
102 |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
103 |
fun get_thy name = |
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
104 |
(case lookup_thy name of |
15531 | 105 |
SOME thy => thy |
106 |
| NONE => error (loader_msg "nothing known about theory" [name])); |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
107 |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
108 |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
109 |
(* access deps *) |
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
110 |
|
15570 | 111 |
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
|
112 |
val get_deps = #1 o get_thy; |
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
113 |
|
26983 | 114 |
val is_finished = is_none o get_deps; |
37980
b8c3d4dc1e3e
avoid repeated File.read for theory text (as before);
wenzelm
parents:
37979
diff
changeset
|
115 |
val master_directory = master_dir o get_deps; |
7191 | 116 |
|
23871 | 117 |
fun get_parents name = |
23967 | 118 |
thy_graph Graph.imm_preds name handle Graph.UNDEF _ => |
6654 | 119 |
error (loader_msg "nothing known about theory" [name]); |
120 |
||
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
121 |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
122 |
(* access theory *) |
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
123 |
|
7687 | 124 |
fun lookup_theory name = |
125 |
(case lookup_thy name of |
|
38142 | 126 |
SOME (_, SOME theory) => SOME theory |
15531 | 127 |
| _ => NONE); |
7288 | 128 |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
129 |
fun get_theory name = |
7288 | 130 |
(case lookup_theory name of |
23871 | 131 |
SOME theory => theory |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
132 |
| _ => error (loader_msg "undefined theory entry for" [name])); |
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
133 |
|
38145
675827e61eb9
more precise CRITICAL sections, using NAMED_CRITICAL uniformly;
wenzelm
parents:
38143
diff
changeset
|
134 |
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
|
135 |
(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
|
136 |
NONE => [] |
38145
675827e61eb9
more precise CRITICAL sections, using NAMED_CRITICAL uniformly;
wenzelm
parents:
38143
diff
changeset
|
137 |
| SOME {master = (thy_path, _), ...} => thy_path :: Thy_Load.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
|
138 |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
139 |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
140 |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
141 |
(** thy operations **) |
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
142 |
|
43640 | 143 |
(* 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
|
144 |
|
38145
675827e61eb9
more precise CRITICAL sections, using NAMED_CRITICAL uniformly;
wenzelm
parents:
38143
diff
changeset
|
145 |
fun remove_thy name = NAMED_CRITICAL "Thy_Info" (fn () => |
37979 | 146 |
if is_finished name then error (loader_msg "attempt to change finished theory" [name]) |
29421
db532e37cda2
use_thys: perform consolidate_thy on loaded theories, which removes failed nodes in post-hoc fashion;
wenzelm
parents:
29118
diff
changeset
|
147 |
else |
29434 | 148 |
let |
149 |
val succs = thy_graph Graph.all_succs [name]; |
|
40132
7ee65dbffa31
renamed Output.priority to Output.urgent_message to emphasize its special role more clearly;
wenzelm
parents:
39557
diff
changeset
|
150 |
val _ = Output.urgent_message (loader_msg "removing" succs); |
38142 | 151 |
val _ = List.app (perform Remove) succs; |
152 |
val _ = change_thys (Graph.del_nodes succs); |
|
153 |
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
|
154 |
|
38145
675827e61eb9
more precise CRITICAL sections, using NAMED_CRITICAL uniformly;
wenzelm
parents:
38143
diff
changeset
|
155 |
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
|
156 |
if known_thy name then remove_thy name |
38142 | 157 |
else ()); |
7099 | 158 |
|
43640 | 159 |
fun update_thy deps theory = NAMED_CRITICAL "Thy_Info" (fn () => |
160 |
let |
|
161 |
val name = Context.theory_name theory; |
|
162 |
val parents = map Context.theory_name (Theory.parents_of theory); |
|
163 |
val _ = kill_thy name; |
|
164 |
val _ = map get_theory parents; |
|
165 |
val _ = change_thys (new_entry name parents (SOME deps, SOME theory)); |
|
166 |
val _ = perform Update name; |
|
167 |
in () end); |
|
168 |
||
7099 | 169 |
|
24209 | 170 |
(* scheduling loader tasks *) |
171 |
||
43641
081e009549dc
uniform finish_thy -- always Global_Theory.join_proofs, even with sequential scheduling;
wenzelm
parents:
43640
diff
changeset
|
172 |
type result = theory * unit future * (unit -> unit); |
081e009549dc
uniform finish_thy -- always Global_Theory.join_proofs, even with sequential scheduling;
wenzelm
parents:
43640
diff
changeset
|
173 |
|
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
|
174 |
datatype task = |
43641
081e009549dc
uniform finish_thy -- always Global_Theory.join_proofs, even with sequential scheduling;
wenzelm
parents:
43640
diff
changeset
|
175 |
Task of 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
|
176 |
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
|
177 |
|
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
|
178 |
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
|
179 |
| task_finished (Finished _) = true; |
24209 | 180 |
|
44162 | 181 |
fun task_parents deps (parents: string list) = map (the o AList.lookup (op =) deps) parents; |
182 |
||
29118 | 183 |
local |
184 |
||
43641
081e009549dc
uniform finish_thy -- always Global_Theory.join_proofs, even with sequential scheduling;
wenzelm
parents:
43640
diff
changeset
|
185 |
fun finish_thy ((thy, present, commit): result) = |
081e009549dc
uniform finish_thy -- always Global_Theory.join_proofs, even with sequential scheduling;
wenzelm
parents:
43640
diff
changeset
|
186 |
(Global_Theory.join_proofs thy; Future.join present; commit (); thy); |
081e009549dc
uniform finish_thy -- always Global_Theory.join_proofs, even with sequential scheduling;
wenzelm
parents:
43640
diff
changeset
|
187 |
|
44162 | 188 |
val schedule_seq = |
189 |
Graph.schedule (fn deps => fn (_, task) => |
|
190 |
(case task of |
|
191 |
Task (parents, body) => finish_thy (body (task_parents deps parents)) |
|
192 |
| 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
|
193 |
|
44162 | 194 |
val schedule_futures = uninterruptible (fn _ => |
195 |
Graph.schedule (fn deps => fn (name, task) => |
|
196 |
(case task of |
|
197 |
Task (parents, body) => |
|
198 |
singleton |
|
199 |
(Future.forks |
|
200 |
{name = "theory:" ^ name, group = NONE, |
|
201 |
deps = map (Future.task_of o #2) deps, |
|
202 |
pri = 0, interrupts = true}) |
|
203 |
(fn () => |
|
204 |
(case filter (not o can Future.join o #2) deps of |
|
205 |
[] => body (map (#1 o Future.join) (task_parents deps parents)) |
|
206 |
| bad => |
|
207 |
error (loader_msg ("failed to load " ^ quote name ^ |
|
208 |
" (unresolved " ^ commas_quote (map #1 bad) ^ ")") []))) |
|
209 |
| Finished thy => Future.value (thy, Future.value (), I))) |
|
210 |
#> maps (fn result => (finish_thy (Future.join result); []) handle exn => [Exn.Exn exn]) |
|
211 |
#> rev #> Exn.release_all) #> ignore; |
|
29429
a6c641f08af7
schedule_futures: tuned final consolidation, explicit after_load phase;
wenzelm
parents:
29421
diff
changeset
|
212 |
|
24209 | 213 |
in |
214 |
||
32794 | 215 |
fun schedule_tasks tasks = |
29118 | 216 |
if not (Multithreading.enabled ()) then schedule_seq tasks |
217 |
else if Multithreading.self_critical () then |
|
24209 | 218 |
(warning (loader_msg "no multithreading within critical section" []); |
219 |
schedule_seq tasks) |
|
29118 | 220 |
else schedule_futures tasks; |
24209 | 221 |
|
222 |
end; |
|
223 |
||
224 |
||
23967 | 225 |
(* require_thy -- checking database entries wrt. the file-system *) |
15065 | 226 |
|
7211 | 227 |
local |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
228 |
|
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
|
229 |
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
|
230 |
| 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
|
231 |
|
43712
3c2c912af2ef
moved Outer_Syntax.load_thy to Thy_Load.load_thy;
wenzelm
parents:
43673
diff
changeset
|
232 |
fun load_thy initiators update_time deps text 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
|
233 |
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
|
234 |
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
|
235 |
val _ = Output.urgent_message ("Loading theory " ^ quote name ^ required_by " " initiators); |
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
|
236 |
|
41548
bd0bebf93fa6
Thy_Load.begin_theory: maintain source specification of imports;
wenzelm
parents:
41536
diff
changeset
|
237 |
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
|
238 |
val dir = Path.dir thy_path; |
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
|
239 |
val pos = Path.position thy_path; |
42003
6e45dc518ebb
replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents:
41955
diff
changeset
|
240 |
val (_, _, uses) = Thy_Header.read pos text; |
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
|
241 |
|
43712
3c2c912af2ef
moved Outer_Syntax.load_thy to Thy_Load.load_thy;
wenzelm
parents:
43673
diff
changeset
|
242 |
val (theory, present) = Thy_Load.load_thy update_time dir name imports uses pos text parents; |
43640 | 243 |
fun commit () = update_thy deps theory; |
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
|
244 |
in (theory, present, commit) 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
|
245 |
|
24175
38a15a3a1aad
theory loader: removed obsolete update_thy (coincides with use_thy);
wenzelm
parents:
24151
diff
changeset
|
246 |
fun check_deps dir name = |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
247 |
(case lookup_deps name of |
42003
6e45dc518ebb
replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents:
41955
diff
changeset
|
248 |
SOME NONE => (true, NONE, get_parents name) |
23893
8babfcaaf129
deps: maintain source specification of parents (prevents repeated ThyLoad.deps_thy);
wenzelm
parents:
23886
diff
changeset
|
249 |
| NONE => |
42003
6e45dc518ebb
replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents:
41955
diff
changeset
|
250 |
let val {master, text, imports, ...} = Thy_Load.check_thy dir name |
6e45dc518ebb
replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents:
41955
diff
changeset
|
251 |
in (false, SOME (make_deps master imports, text), imports) 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
|
252 |
| SOME (SOME {master, ...}) => |
42003
6e45dc518ebb
replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents:
41955
diff
changeset
|
253 |
let |
6e45dc518ebb
replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents:
41955
diff
changeset
|
254 |
val {master = master', text = text', imports = imports', ...} = Thy_Load.check_thy dir name; |
6e45dc518ebb
replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents:
41955
diff
changeset
|
255 |
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
|
256 |
val current = |
6e45dc518ebb
replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents:
41955
diff
changeset
|
257 |
#2 master = #2 master' andalso |
6e45dc518ebb
replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents:
41955
diff
changeset
|
258 |
(case lookup_theory name of |
6e45dc518ebb
replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents:
41955
diff
changeset
|
259 |
NONE => false |
6e45dc518ebb
replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents:
41955
diff
changeset
|
260 |
| SOME theory => Thy_Load.all_current theory); |
6e45dc518ebb
replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents:
41955
diff
changeset
|
261 |
in (current, deps', imports') end); |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
262 |
|
23967 | 263 |
in |
264 |
||
37873
66d90b2b87bc
eliminated old time_use/time_use_thy variants -- timing is implicitly controlled via Output.timing;
wenzelm
parents:
37871
diff
changeset
|
265 |
fun require_thys initiators dir strs tasks = |
66d90b2b87bc
eliminated old time_use/time_use_thy variants -- timing is implicitly controlled via Output.timing;
wenzelm
parents:
37871
diff
changeset
|
266 |
fold_map (require_thy initiators dir) strs tasks |>> forall I |
66d90b2b87bc
eliminated old time_use/time_use_thy variants -- timing is implicitly controlled via Output.timing;
wenzelm
parents:
37871
diff
changeset
|
267 |
and require_thy initiators dir str tasks = |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
268 |
let |
21858
05f57309170c
avoid conflict with Alice keywords: renamed pack -> implode, unpack -> explode, any -> many, avoided assert;
wenzelm
parents:
20664
diff
changeset
|
269 |
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
|
270 |
val name = Path.implode (Path.base path); |
7066 | 271 |
in |
32794 | 272 |
(case try (Graph.get_node tasks) name of |
24209 | 273 |
SOME task => (task_finished task, tasks) |
23967 | 274 |
| NONE => |
275 |
let |
|
43651
511df47bcadc
some support for theory files within Isabelle/Scala session;
wenzelm
parents:
43641
diff
changeset
|
276 |
val dir' = Path.append dir (Path.dir path); |
511df47bcadc
some support for theory files within Isabelle/Scala session;
wenzelm
parents:
43641
diff
changeset
|
277 |
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
|
278 |
|
42003
6e45dc518ebb
replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents:
41955
diff
changeset
|
279 |
val (current, deps, imports) = check_deps dir' name |
23967 | 280 |
handle ERROR msg => cat_error msg |
281 |
(loader_msg "the error(s) above occurred while examining theory" [name] ^ |
|
282 |
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
|
283 |
|
38148
d2f3c8d4a89f
uniform naming of imports (source specification) vs. parents (thy node names) vs. parent_thys (theory values);
wenzelm
parents:
38147
diff
changeset
|
284 |
val parents = map base_name imports; |
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
|
285 |
val (parents_current, tasks') = |
42003
6e45dc518ebb
replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents:
41955
diff
changeset
|
286 |
require_thys (name :: initiators) |
6e45dc518ebb
replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents:
41955
diff
changeset
|
287 |
(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
|
288 |
|
23967 | 289 |
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
|
290 |
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
|
291 |
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
|
292 |
else |
37980
b8c3d4dc1e3e
avoid repeated File.read for theory text (as before);
wenzelm
parents:
37979
diff
changeset
|
293 |
(case deps of |
b8c3d4dc1e3e
avoid repeated File.read for theory text (as before);
wenzelm
parents:
37979
diff
changeset
|
294 |
NONE => raise Fail "Malformed deps" |
42003
6e45dc518ebb
replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents:
41955
diff
changeset
|
295 |
| SOME (dep, text) => |
6e45dc518ebb
replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents:
41955
diff
changeset
|
296 |
let val update_time = serial () |
38148
d2f3c8d4a89f
uniform naming of imports (source specification) vs. parents (thy node names) vs. parent_thys (theory values);
wenzelm
parents:
38147
diff
changeset
|
297 |
in Task (parents, load_thy initiators update_time dep text name) end); |
d2f3c8d4a89f
uniform naming of imports (source specification) vs. parents (thy node names) vs. parent_thys (theory values);
wenzelm
parents:
38147
diff
changeset
|
298 |
in (all_current, new_entry name parents task tasks') end) |
7066 | 299 |
end; |
6484
3f098b0ec683
use_thy etc.: may specify path prefix, which is temporarily used as load path;
wenzelm
parents:
6389
diff
changeset
|
300 |
|
23967 | 301 |
end; |
302 |
||
303 |
||
37979 | 304 |
(* use_thy *) |
23967 | 305 |
|
38146 | 306 |
fun use_thys_wrt dir arg = |
37873
66d90b2b87bc
eliminated old time_use/time_use_thy variants -- timing is implicitly controlled via Output.timing;
wenzelm
parents:
37871
diff
changeset
|
307 |
schedule_tasks (snd (require_thys [] dir arg Graph.empty)); |
23967 | 308 |
|
38146 | 309 |
val use_thys = use_thys_wrt 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
|
310 |
val use_thy = use_thys o single; |
7211 | 311 |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
312 |
|
37979 | 313 |
(* toplevel begin theory -- without maintaining database *) |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
314 |
|
44186
806f0ec1a43d
simplified Toplevel.init_theory: discontinued special master argument;
wenzelm
parents:
44162
diff
changeset
|
315 |
fun toplevel_begin_theory dir name imports uses = |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
316 |
let |
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
|
317 |
val _ = kill_thy name; |
38146 | 318 |
val _ = use_thys_wrt dir imports; |
43712
3c2c912af2ef
moved Outer_Syntax.load_thy to Thy_Load.load_thy;
wenzelm
parents:
43673
diff
changeset
|
319 |
val parents = map (get_theory o base_name) imports; |
3c2c912af2ef
moved Outer_Syntax.load_thy to Thy_Load.load_thy;
wenzelm
parents:
43673
diff
changeset
|
320 |
in Thy_Load.begin_theory dir name imports uses parents end; |
7244 | 321 |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
322 |
|
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
|
323 |
(* register theory *) |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
324 |
|
37954
a2e73df0b1e0
simplified/clarified register_thy: more precise treatment of new dependencies, remove descendants;
wenzelm
parents:
37953
diff
changeset
|
325 |
fun register_thy theory = |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
326 |
let |
16454 | 327 |
val name = Context.theory_name theory; |
42003
6e45dc518ebb
replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents:
41955
diff
changeset
|
328 |
val {master, ...} = Thy_Load.check_thy (Thy_Load.master_directory theory) name; |
41548
bd0bebf93fa6
Thy_Load.begin_theory: maintain source specification of imports;
wenzelm
parents:
41536
diff
changeset
|
329 |
val imports = Thy_Load.imports_of theory; |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
330 |
in |
38145
675827e61eb9
more precise CRITICAL sections, using NAMED_CRITICAL uniformly;
wenzelm
parents:
38143
diff
changeset
|
331 |
NAMED_CRITICAL "Thy_Info" (fn () => |
38142 | 332 |
(kill_thy name; |
40132
7ee65dbffa31
renamed Output.priority to Output.urgent_message to emphasize its special role more clearly;
wenzelm
parents:
39557
diff
changeset
|
333 |
Output.urgent_message ("Registering theory " ^ quote name); |
43640 | 334 |
update_thy (make_deps master imports) theory)) |
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
335 |
end; |
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
336 |
|
24080
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
337 |
|
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
338 |
(* finish all theories *) |
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
339 |
|
39021 | 340 |
fun finish () = change_thys (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
|
341 |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
342 |
end; |