| author | wenzelm |
| Wed, 04 Nov 2009 21:21:05 +0100 | |
| changeset 33412 | 4b403f72a511 |
| parent 32814 | 81897d30b97f |
| child 33522 | 737589bb9bb8 |
| 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 |
|
| 15801 | 4 |
Main part of theory loader database, including handling of theory and |
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 |
| 7099 | 10 |
datatype action = Update | Outdate | Remove |
11 |
val str_of_action: action -> string |
|
12 |
val add_hook: (action -> string -> unit) -> unit |
|
| 26614 | 13 |
val get_names: unit -> string list |
| 7910 | 14 |
val known_thy: string -> bool |
| 7935 | 15 |
val check_known_thy: string -> bool |
16 |
val if_known_thy: (string -> unit) -> string -> unit |
|
| 7288 | 17 |
val lookup_theory: string -> theory option |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
18 |
val get_theory: string -> theory |
| 19547 | 19 |
val the_theory: string -> theory -> theory |
| 24563 | 20 |
val is_finished: string -> bool |
| 26983 | 21 |
val master_directory: string -> Path.T |
|
24080
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
22 |
val loaded_files: string -> Path.T list |
| 23871 | 23 |
val get_parents: string -> string list |
|
27495
d2bb5d61b392
moved and renamed IsarCmd.kill_theory to ThyInfo.kill_thy;
wenzelm
parents:
27345
diff
changeset
|
24 |
val touch_thy: string -> unit |
| 7910 | 25 |
val touch_child_thys: string -> unit |
| 32106 | 26 |
val thy_ord: theory * theory -> order |
|
29421
db532e37cda2
use_thys: perform consolidate_thy on loaded theories, which removes failed nodes in post-hoc fashion;
wenzelm
parents:
29118
diff
changeset
|
27 |
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
|
28 |
val kill_thy: string -> unit |
| 25013 | 29 |
val provide_file: Path.T -> string -> unit |
| 7941 | 30 |
val load_file: bool -> Path.T -> unit |
| 26494 | 31 |
val exec_file: bool -> Path.T -> Context.generic -> Context.generic |
| 6241 | 32 |
val use: string -> unit |
|
24057
f42665561801
removed obsolete Output.ML_errors/toplevel_errors;
wenzelm
parents:
23982
diff
changeset
|
33 |
val time_use: string -> unit |
|
f42665561801
removed obsolete Output.ML_errors/toplevel_errors;
wenzelm
parents:
23982
diff
changeset
|
34 |
val use_thys: string list -> unit |
|
f42665561801
removed obsolete Output.ML_errors/toplevel_errors;
wenzelm
parents:
23982
diff
changeset
|
35 |
val use_thy: string -> unit |
|
f42665561801
removed obsolete Output.ML_errors/toplevel_errors;
wenzelm
parents:
23982
diff
changeset
|
36 |
val time_use_thy: string -> unit |
|
23900
b25b1444a246
begin_theory: simplified interface, keep thy info empty until end_theory;
wenzelm
parents:
23893
diff
changeset
|
37 |
val begin_theory: string -> string list -> (Path.T * bool) list -> bool -> theory |
| 27579 | 38 |
val end_theory: theory -> unit |
|
24080
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
39 |
val register_thy: string -> unit |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
40 |
val register_theory: theory -> unit |
|
24080
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
41 |
val finish: unit -> unit |
|
3604
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
42 |
end; |
|
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
43 |
|
| 6362 | 44 |
structure ThyInfo: THY_INFO = |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
45 |
struct |
|
3604
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
46 |
|
| 7099 | 47 |
(** theory loader actions and hooks **) |
48 |
||
49 |
datatype action = Update | Outdate | Remove; |
|
50 |
val str_of_action = fn Update => "Update" | Outdate => "Outdate" | Remove => "Remove"; |
|
51 |
||
52 |
local |
|
| 32738 | 53 |
val hooks = Unsynchronized.ref ([]: (action -> string -> unit) list); |
| 7099 | 54 |
in |
| 32738 | 55 |
fun add_hook f = CRITICAL (fn () => Unsynchronized.change hooks (cons f)); |
| 15570 | 56 |
fun perform action name = List.app (fn f => (try (fn () => f action name) (); ())) (! hooks); |
| 7099 | 57 |
end; |
58 |
||
59 |
||
60 |
||
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
61 |
(** thy database **) |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
62 |
|
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
63 |
(* messages *) |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
64 |
|
| 23871 | 65 |
fun loader_msg txt [] = "Theory loader: " ^ txt |
66 |
| 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
|
67 |
|
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
68 |
val show_path = space_implode " via " o map quote; |
| 9332 | 69 |
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
|
70 |
|
|
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
71 |
|
| 6666 | 72 |
(* derived graph operations *) |
|
3604
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
73 |
|
| 9327 | 74 |
fun add_deps name parents G = Graph.add_deps_acyclic (name, parents) G |
| 9332 | 75 |
handle Graph.CYCLES namess => error (cat_lines (map cycle_msg namess)); |
|
3604
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
76 |
|
| 7952 | 77 |
fun upd_deps name entry G = |
| 19473 | 78 |
fold (fn parent => Graph.del_edge (parent, name)) (Graph.imm_preds G name) G |
| 7952 | 79 |
|> Graph.map_node name (K entry); |
| 3976 | 80 |
|
| 23967 | 81 |
fun new_deps name parents entry G = |
| 7952 | 82 |
(if can (Graph.get_node G) name then upd_deps name entry G else Graph.new_node (name, entry) G) |
83 |
|> add_deps name parents; |
|
|
3604
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
84 |
|
|
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
85 |
|
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
86 |
(* thy database *) |
|
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 |
type deps = |
| 24190 | 89 |
{update_time: int, (*symbolic time of update; negative value means outdated*)
|
90 |
master: (Path.T * File.ident) option, (*master dependencies for thy file*) |
|
91 |
text: string list, (*source text for thy*) |
|
92 |
parents: string list, (*source specification of parents (partially qualified)*) |
|
93 |
(*auxiliary files: source path, physical path + identifier*) |
|
94 |
files: (Path.T * (Path.T * File.ident) option) list}; |
|
|
23886
f40fba467384
simplified ThyLoad interfaces: only one additional directory;
wenzelm
parents:
23871
diff
changeset
|
95 |
|
|
24151
255f76dcc16b
replaced outdated flag by update_time (multithreading-safe presentation order);
wenzelm
parents:
24133
diff
changeset
|
96 |
fun make_deps update_time master text parents files : deps = |
|
255f76dcc16b
replaced outdated flag by update_time (multithreading-safe presentation order);
wenzelm
parents:
24133
diff
changeset
|
97 |
{update_time = update_time, master = master, text = text, parents = parents, files = files};
|
|
23886
f40fba467384
simplified ThyLoad interfaces: only one additional directory;
wenzelm
parents:
23871
diff
changeset
|
98 |
|
| 24068 | 99 |
fun init_deps master text parents files = |
|
24151
255f76dcc16b
replaced outdated flag by update_time (multithreading-safe presentation order);
wenzelm
parents:
24133
diff
changeset
|
100 |
SOME (make_deps ~1 master text parents (map (rpair NONE) files)); |
| 23871 | 101 |
|
| 24190 | 102 |
fun master_dir NONE = Path.current |
103 |
| master_dir (SOME (path, _)) = Path.dir path; |
|
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
104 |
|
|
23886
f40fba467384
simplified ThyLoad interfaces: only one additional directory;
wenzelm
parents:
23871
diff
changeset
|
105 |
fun master_dir' (d: deps option) = the_default Path.current (Option.map (master_dir o #master) d); |
|
f40fba467384
simplified ThyLoad interfaces: only one additional directory;
wenzelm
parents:
23871
diff
changeset
|
106 |
fun master_dir'' d = the_default Path.current (Option.map master_dir' d); |
|
3604
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
107 |
|
| 23967 | 108 |
fun base_name s = Path.implode (Path.base (Path.explode s)); |
109 |
||
| 7211 | 110 |
|
| 6362 | 111 |
type thy = deps option * theory option; |
|
3604
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
112 |
|
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
113 |
local |
| 32738 | 114 |
val database = Unsynchronized.ref (Graph.empty: thy Graph.T); |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
115 |
in |
| 6362 | 116 |
fun get_thys () = ! database; |
| 32738 | 117 |
fun change_thys f = CRITICAL (fn () => Unsynchronized.change database f); |
|
3604
6bf9f09f3d61
Moved functions for theory information storage / retrieval
berghofe
parents:
diff
changeset
|
118 |
end; |
| 5209 | 119 |
|
120 |
||
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
121 |
(* access thy graph *) |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
122 |
|
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
123 |
fun thy_graph f x = f (get_thys ()) x; |
| 9417 | 124 |
|
| 23967 | 125 |
fun get_names () = Graph.topological_order (get_thys ()); |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
126 |
|
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
127 |
|
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
128 |
(* access thy *) |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
129 |
|
| 7935 | 130 |
fun lookup_thy name = |
| 15531 | 131 |
SOME (thy_graph Graph.get_node name) handle Graph.UNDEF _ => NONE; |
| 7935 | 132 |
|
| 16047 | 133 |
val known_thy = is_some o lookup_thy; |
| 7935 | 134 |
fun check_known_thy name = known_thy name orelse (warning ("Unknown theory " ^ quote name); false);
|
135 |
fun if_known_thy f name = if check_known_thy name then f name else (); |
|
|
6211
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 |
fun get_thy name = |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
138 |
(case lookup_thy name of |
| 15531 | 139 |
SOME thy => thy |
140 |
| 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
|
141 |
|
| 23939 | 142 |
fun change_thy name f = CRITICAL (fn () => |
143 |
(get_thy name; change_thys (Graph.map_node name f))); |
|
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
144 |
|
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
145 |
|
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
146 |
(* access deps *) |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
147 |
|
| 15570 | 148 |
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
|
149 |
val get_deps = #1 o get_thy; |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
150 |
fun change_deps name f = change_thy name (fn (deps, x) => (f deps, x)); |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
151 |
|
| 26983 | 152 |
val is_finished = is_none o get_deps; |
153 |
val master_directory = master_dir' o get_deps; |
|
| 7191 | 154 |
|
155 |
fun loaded_files name = |
|
156 |
(case get_deps name of |
|
| 15531 | 157 |
NONE => [] |
158 |
| SOME {master, files, ...} =>
|
|
| 24190 | 159 |
(case master of SOME (thy_path, _) => [thy_path] | NONE => []) @ |
|
19482
9f11af8f7ef9
tuned basic list operators (flat, maps, map_filter);
wenzelm
parents:
19473
diff
changeset
|
160 |
(map_filter (Option.map #1 o #2) files)); |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
161 |
|
| 23871 | 162 |
fun get_parents name = |
| 23967 | 163 |
thy_graph Graph.imm_preds name handle Graph.UNDEF _ => |
| 6654 | 164 |
error (loader_msg "nothing known about theory" [name]); |
165 |
||
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
166 |
|
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
167 |
(* access theory *) |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
168 |
|
| 7687 | 169 |
fun lookup_theory name = |
170 |
(case lookup_thy name of |
|
| 15531 | 171 |
SOME (_, SOME thy) => SOME thy |
172 |
| _ => NONE); |
|
| 7288 | 173 |
|
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
174 |
fun get_theory name = |
| 7288 | 175 |
(case lookup_theory name of |
| 23871 | 176 |
SOME theory => theory |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
177 |
| _ => error (loader_msg "undefined theory entry for" [name])); |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
178 |
|
| 19547 | 179 |
fun the_theory name thy = |
180 |
if Context.theory_name thy = name then thy |
|
181 |
else get_theory name; |
|
182 |
||
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
183 |
|
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
184 |
|
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
185 |
(** thy operations **) |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
186 |
|
|
24080
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
187 |
(* check state *) |
|
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
188 |
|
|
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
189 |
fun check_unfinished fail name = |
|
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
190 |
if known_thy name andalso is_finished name then |
|
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
191 |
fail (loader_msg "cannot update finished theory" [name]) |
|
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
192 |
else (); |
|
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
193 |
|
|
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
194 |
fun check_files name = |
|
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
195 |
let |
|
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
196 |
val files = (case get_deps name of SOME {files, ...} => files | NONE => []);
|
|
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
197 |
val missing_files = map_filter (fn (path, NONE) => SOME (Path.implode path) | _ => NONE) files; |
| 24190 | 198 |
val _ = null missing_files orelse |
199 |
error (loader_msg "unresolved dependencies of theory" [name] ^ |
|
|
24080
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
200 |
" on file(s): " ^ commas_quote missing_files); |
| 24190 | 201 |
in () end; |
|
24080
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
202 |
|
|
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
203 |
|
|
24151
255f76dcc16b
replaced outdated flag by update_time (multithreading-safe presentation order);
wenzelm
parents:
24133
diff
changeset
|
204 |
(* maintain update_time *) |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
205 |
|
| 7099 | 206 |
local |
207 |
||
| 6241 | 208 |
fun is_outdated name = |
209 |
(case lookup_deps name of |
|
|
24151
255f76dcc16b
replaced outdated flag by update_time (multithreading-safe presentation order);
wenzelm
parents:
24133
diff
changeset
|
210 |
SOME (SOME {update_time, ...}) => update_time < 0
|
| 6241 | 211 |
| _ => false); |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
212 |
|
| 25013 | 213 |
fun unfinished name = |
|
24186
d7f267b806c9
check_deps: really do reload the master text if required;
wenzelm
parents:
24175
diff
changeset
|
214 |
if is_finished name then (warning (loader_msg "tried to touch finished theory" [name]); NONE) |
|
d7f267b806c9
check_deps: really do reload the master text if required;
wenzelm
parents:
24175
diff
changeset
|
215 |
else SOME name; |
|
d7f267b806c9
check_deps: really do reload the master text if required;
wenzelm
parents:
24175
diff
changeset
|
216 |
|
|
d7f267b806c9
check_deps: really do reload the master text if required;
wenzelm
parents:
24175
diff
changeset
|
217 |
in |
|
d7f267b806c9
check_deps: really do reload the master text if required;
wenzelm
parents:
24175
diff
changeset
|
218 |
|
| 6241 | 219 |
fun outdate_thy name = |
| 7099 | 220 |
if is_finished name orelse is_outdated name then () |
| 23939 | 221 |
else CRITICAL (fn () => |
|
24151
255f76dcc16b
replaced outdated flag by update_time (multithreading-safe presentation order);
wenzelm
parents:
24133
diff
changeset
|
222 |
(change_deps name (Option.map (fn {master, text, parents, files, ...} =>
|
|
255f76dcc16b
replaced outdated flag by update_time (multithreading-safe presentation order);
wenzelm
parents:
24133
diff
changeset
|
223 |
make_deps ~1 master text parents files)); perform Outdate name)); |
| 7099 | 224 |
|
| 7910 | 225 |
fun touch_thys names = |
| 25013 | 226 |
List.app outdate_thy (thy_graph Graph.all_succs (map_filter unfinished names)); |
| 7910 | 227 |
|
228 |
fun touch_thy name = touch_thys [name]; |
|
229 |
fun touch_child_thys name = touch_thys (thy_graph Graph.imm_succs name); |
|
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
230 |
|
| 7099 | 231 |
end; |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
232 |
|
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
233 |
|
| 32106 | 234 |
(* management data *) |
235 |
||
236 |
structure Management_Data = TheoryDataFun |
|
237 |
( |
|
238 |
type T = |
|
239 |
Task_Queue.group option * (*worker thread group*) |
|
240 |
int; (*abstract update time*) |
|
241 |
val empty = (NONE, 0); |
|
242 |
val copy = I; |
|
243 |
fun extend _ = empty; |
|
244 |
fun merge _ _ = empty; |
|
245 |
); |
|
246 |
||
247 |
val thy_ord = int_ord o pairself (#2 o Management_Data.get); |
|
248 |
||
249 |
||
250 |
(* pending proofs *) |
|
| 29434 | 251 |
|
252 |
fun join_thy name = |
|
253 |
(case lookup_theory name of |
|
| 32106 | 254 |
NONE => () |
| 29434 | 255 |
| SOME thy => PureThy.join_proofs thy); |
256 |
||
257 |
fun cancel_thy name = |
|
258 |
(case lookup_theory name of |
|
259 |
NONE => () |
|
| 32106 | 260 |
| SOME thy => |
261 |
(case #1 (Management_Data.get thy) of |
|
262 |
NONE => () |
|
263 |
| SOME group => Future.cancel_group group)); |
|
| 29434 | 264 |
|
265 |
||
|
29421
db532e37cda2
use_thys: perform consolidate_thy on loaded theories, which removes failed nodes in post-hoc fashion;
wenzelm
parents:
29118
diff
changeset
|
266 |
(* remove theory *) |
|
db532e37cda2
use_thys: perform consolidate_thy on loaded theories, which removes failed nodes in post-hoc fashion;
wenzelm
parents:
29118
diff
changeset
|
267 |
|
|
db532e37cda2
use_thys: perform consolidate_thy on loaded theories, which removes failed nodes in post-hoc fashion;
wenzelm
parents:
29118
diff
changeset
|
268 |
fun remove_thy name = |
|
db532e37cda2
use_thys: perform consolidate_thy on loaded theories, which removes failed nodes in post-hoc fashion;
wenzelm
parents:
29118
diff
changeset
|
269 |
if is_finished name then error (loader_msg "cannot remove finished theory" [name]) |
|
db532e37cda2
use_thys: perform consolidate_thy on loaded theories, which removes failed nodes in post-hoc fashion;
wenzelm
parents:
29118
diff
changeset
|
270 |
else |
| 29434 | 271 |
let |
272 |
val succs = thy_graph Graph.all_succs [name]; |
|
273 |
val _ = List.app cancel_thy succs; |
|
274 |
val _ = priority (loader_msg "removing" succs); |
|
275 |
val _ = CRITICAL (fn () => |
|
276 |
(List.app (perform Remove) succs; change_thys (Graph.del_nodes succs))); |
|
277 |
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
|
278 |
|
|
db532e37cda2
use_thys: perform consolidate_thy on loaded theories, which removes failed nodes in post-hoc fashion;
wenzelm
parents:
29118
diff
changeset
|
279 |
val kill_thy = if_known_thy remove_thy; |
|
db532e37cda2
use_thys: perform consolidate_thy on loaded theories, which removes failed nodes in post-hoc fashion;
wenzelm
parents:
29118
diff
changeset
|
280 |
|
|
db532e37cda2
use_thys: perform consolidate_thy on loaded theories, which removes failed nodes in post-hoc fashion;
wenzelm
parents:
29118
diff
changeset
|
281 |
|
| 7941 | 282 |
(* load_file *) |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
283 |
|
| 7191 | 284 |
local |
285 |
||
| 32794 | 286 |
fun provide path name info (SOME {update_time, master, text, parents, files}) =
|
| 23871 | 287 |
(if AList.defined (op =) files path then () |
| 7941 | 288 |
else warning (loader_msg "undeclared dependency of theory" [name] ^ |
|
21858
05f57309170c
avoid conflict with Alice keywords: renamed pack -> implode, unpack -> explode, any -> many, avoided assert;
wenzelm
parents:
20664
diff
changeset
|
289 |
" on file: " ^ quote (Path.implode path)); |
|
24151
255f76dcc16b
replaced outdated flag by update_time (multithreading-safe presentation order);
wenzelm
parents:
24133
diff
changeset
|
290 |
SOME (make_deps update_time master text parents |
|
255f76dcc16b
replaced outdated flag by update_time (multithreading-safe presentation order);
wenzelm
parents:
24133
diff
changeset
|
291 |
(AList.update (op =) (path, SOME info) files))) |
| 15531 | 292 |
| provide _ _ _ NONE = NONE; |
| 7941 | 293 |
|
294 |
fun run_file path = |
|
| 26415 | 295 |
(case Option.map (Context.theory_name o Context.the_theory) (Context.thread_data ()) of |
|
23886
f40fba467384
simplified ThyLoad interfaces: only one additional directory;
wenzelm
parents:
23871
diff
changeset
|
296 |
NONE => (ThyLoad.load_ml Path.current path; ()) |
| 23871 | 297 |
| SOME name => |
298 |
(case lookup_deps name of |
|
299 |
SOME deps => |
|
|
23886
f40fba467384
simplified ThyLoad interfaces: only one additional directory;
wenzelm
parents:
23871
diff
changeset
|
300 |
change_deps name (provide path name (ThyLoad.load_ml (master_dir' deps) path)) |
|
f40fba467384
simplified ThyLoad interfaces: only one additional directory;
wenzelm
parents:
23871
diff
changeset
|
301 |
| NONE => (ThyLoad.load_ml Path.current path; ()))); |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
302 |
|
| 7191 | 303 |
in |
304 |
||
| 25013 | 305 |
fun provide_file path name = |
306 |
let |
|
| 26983 | 307 |
val dir = master_directory name; |
| 25013 | 308 |
val _ = check_unfinished error name; |
309 |
in |
|
| 26983 | 310 |
(case ThyLoad.check_file dir path of |
| 25013 | 311 |
SOME path_info => change_deps name (provide path name path_info) |
312 |
| NONE => error ("Could not find file " ^ quote (Path.implode path)))
|
|
313 |
end; |
|
314 |
||
|
24057
f42665561801
removed obsolete Output.ML_errors/toplevel_errors;
wenzelm
parents:
23982
diff
changeset
|
315 |
fun load_file time path = |
| 7941 | 316 |
if time then |
|
21858
05f57309170c
avoid conflict with Alice keywords: renamed pack -> implode, unpack -> explode, any -> many, avoided assert;
wenzelm
parents:
20664
diff
changeset
|
317 |
let val name = Path.implode path in |
| 7244 | 318 |
timeit (fn () => |
| 9778 | 319 |
(priority ("\n**** Starting file " ^ quote name ^ " ****");
|
| 9036 | 320 |
run_file path; |
| 9778 | 321 |
priority ("**** Finished file " ^ quote name ^ " ****\n")))
|
| 7244 | 322 |
end |
|
24057
f42665561801
removed obsolete Output.ML_errors/toplevel_errors;
wenzelm
parents:
23982
diff
changeset
|
323 |
else run_file path; |
| 7941 | 324 |
|
| 26494 | 325 |
fun exec_file time path = ML_Context.exec (fn () => load_file time path); |
326 |
||
|
21858
05f57309170c
avoid conflict with Alice keywords: renamed pack -> implode, unpack -> explode, any -> many, avoided assert;
wenzelm
parents:
20664
diff
changeset
|
327 |
val use = load_file false o Path.explode; |
|
05f57309170c
avoid conflict with Alice keywords: renamed pack -> implode, unpack -> explode, any -> many, avoided assert;
wenzelm
parents:
20664
diff
changeset
|
328 |
val time_use = load_file true o Path.explode; |
| 7191 | 329 |
|
330 |
end; |
|
| 6233 | 331 |
|
332 |
||
| 7099 | 333 |
(* load_thy *) |
334 |
||
| 9490 | 335 |
fun required_by _ [] = "" |
336 |
| required_by s initiators = s ^ "(required by " ^ show_path (rev initiators) ^ ")"; |
|
| 7099 | 337 |
|
| 27843 | 338 |
fun load_thy time upd_time initiators name = |
| 7099 | 339 |
let |
|
24080
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
340 |
val _ = priority ("Loading theory " ^ quote name ^ required_by " " initiators);
|
| 32794 | 341 |
val (pos, text, _) = |
| 24068 | 342 |
(case get_deps name of |
| 24190 | 343 |
SOME {master = SOME (master_path, _), text as _ :: _, files, ...} =>
|
| 26881 | 344 |
(Path.position master_path, text, files) |
| 24068 | 345 |
| _ => error (loader_msg "corrupted dependency information" [name])); |
346 |
val _ = touch_thy name; |
|
|
24151
255f76dcc16b
replaced outdated flag by update_time (multithreading-safe presentation order);
wenzelm
parents:
24133
diff
changeset
|
347 |
val _ = CRITICAL (fn () => |
|
255f76dcc16b
replaced outdated flag by update_time (multithreading-safe presentation order);
wenzelm
parents:
24133
diff
changeset
|
348 |
change_deps name (Option.map (fn {master, text, parents, files, ...} =>
|
|
255f76dcc16b
replaced outdated flag by update_time (multithreading-safe presentation order);
wenzelm
parents:
24133
diff
changeset
|
349 |
make_deps upd_time master text parents files))); |
|
29429
a6c641f08af7
schedule_futures: tuned final consolidation, explicit after_load phase;
wenzelm
parents:
29421
diff
changeset
|
350 |
val after_load = OuterSyntax.load_thy name pos text (time orelse ! Output.timing); |
|
a6c641f08af7
schedule_futures: tuned final consolidation, explicit after_load phase;
wenzelm
parents:
29421
diff
changeset
|
351 |
val _ = |
|
a6c641f08af7
schedule_futures: tuned final consolidation, explicit after_load phase;
wenzelm
parents:
29421
diff
changeset
|
352 |
CRITICAL (fn () => |
|
a6c641f08af7
schedule_futures: tuned final consolidation, explicit after_load phase;
wenzelm
parents:
29421
diff
changeset
|
353 |
(change_deps name |
|
a6c641f08af7
schedule_futures: tuned final consolidation, explicit after_load phase;
wenzelm
parents:
29421
diff
changeset
|
354 |
(Option.map (fn {update_time, master, parents, files, ...} =>
|
|
a6c641f08af7
schedule_futures: tuned final consolidation, explicit after_load phase;
wenzelm
parents:
29421
diff
changeset
|
355 |
make_deps update_time master [] parents files)); |
|
a6c641f08af7
schedule_futures: tuned final consolidation, explicit after_load phase;
wenzelm
parents:
29421
diff
changeset
|
356 |
perform Update name)); |
|
a6c641f08af7
schedule_futures: tuned final consolidation, explicit after_load phase;
wenzelm
parents:
29421
diff
changeset
|
357 |
in after_load end; |
| 7099 | 358 |
|
359 |
||
| 24209 | 360 |
(* scheduling loader tasks *) |
361 |
||
|
29429
a6c641f08af7
schedule_futures: tuned final consolidation, explicit after_load phase;
wenzelm
parents:
29421
diff
changeset
|
362 |
datatype task = Task of (unit -> unit -> unit) | Finished | Running; |
| 24209 | 363 |
fun task_finished Finished = true | task_finished _ = false; |
364 |
||
| 29118 | 365 |
local |
366 |
||
|
32814
81897d30b97f
added Task_Queue.depend (again) -- light-weight version for transitive graph;
wenzelm
parents:
32794
diff
changeset
|
367 |
fun schedule_futures task_graph = uninterruptible (fn _ => fn () => |
| 28194 | 368 |
let |
369 |
val tasks = Graph.topological_order task_graph |> map_filter (fn name => |
|
370 |
(case Graph.get_node task_graph name of Task body => SOME (name, body) | _ => NONE)); |
|
371 |
||
|
32061
11f8ee55662d
parallel_proofs: more fine-grained control with optional parallel checking of nested Isar proofs;
wenzelm
parents:
31542
diff
changeset
|
372 |
val par_proofs = ! parallel_proofs >= 1; |
|
29437
a96236886804
schedule_futures: save memory for non-parallel proofs, by applying after_load as soon as possible here;
wenzelm
parents:
29434
diff
changeset
|
373 |
|
|
29429
a6c641f08af7
schedule_futures: tuned final consolidation, explicit after_load phase;
wenzelm
parents:
29421
diff
changeset
|
374 |
fun fork (name, body) tab = |
| 28194 | 375 |
let |
|
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
|
376 |
val deps = Graph.imm_preds task_graph name |
|
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
|
377 |
|> map_filter (fn parent => |
|
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
|
378 |
(case Symtab.lookup tab parent of SOME future => SOME (parent, future) | NONE => NONE)); |
|
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
|
379 |
fun failed (parent, future) = if can Future.join future then NONE else SOME parent; |
|
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
|
380 |
|
|
29437
a96236886804
schedule_futures: save memory for non-parallel proofs, by applying after_load as soon as possible here;
wenzelm
parents:
29434
diff
changeset
|
381 |
val future = Future.fork_deps (map #2 deps) (fn () => |
|
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
|
382 |
(case map_filter failed deps of |
|
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
|
383 |
[] => body () |
|
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
|
384 |
| bad => error (loader_msg |
|
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
|
385 |
("failed to load " ^ quote name ^ " (unresolved " ^ commas_quote bad ^ ")") [])));
|
|
29437
a96236886804
schedule_futures: save memory for non-parallel proofs, by applying after_load as soon as possible here;
wenzelm
parents:
29434
diff
changeset
|
386 |
val future' = |
|
a96236886804
schedule_futures: save memory for non-parallel proofs, by applying after_load as soon as possible here;
wenzelm
parents:
29434
diff
changeset
|
387 |
if par_proofs then future |
|
a96236886804
schedule_futures: save memory for non-parallel proofs, by applying after_load as soon as possible here;
wenzelm
parents:
29434
diff
changeset
|
388 |
else Future.map (fn after_load => (after_load (); fn () => ())) future; |
|
a96236886804
schedule_futures: save memory for non-parallel proofs, by applying after_load as soon as possible here;
wenzelm
parents:
29434
diff
changeset
|
389 |
in Symtab.update (name, future') tab end; |
|
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
|
390 |
|
|
29429
a6c641f08af7
schedule_futures: tuned final consolidation, explicit after_load phase;
wenzelm
parents:
29421
diff
changeset
|
391 |
val futures = fold fork tasks Symtab.empty; |
|
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
|
392 |
|
|
30819
17bd1cf53d8e
schedule_futures: join tasks in regular bottom-up order, which potentially improves resource usage;
wenzelm
parents:
30319
diff
changeset
|
393 |
val exns = tasks |> maps (fn (name, _) => |
|
29429
a6c641f08af7
schedule_futures: tuned final consolidation, explicit after_load phase;
wenzelm
parents:
29421
diff
changeset
|
394 |
let |
|
a6c641f08af7
schedule_futures: tuned final consolidation, explicit after_load phase;
wenzelm
parents:
29421
diff
changeset
|
395 |
val after_load = Future.join (the (Symtab.lookup futures name)); |
| 32106 | 396 |
val _ = join_thy name; |
|
29429
a6c641f08af7
schedule_futures: tuned final consolidation, explicit after_load phase;
wenzelm
parents:
29421
diff
changeset
|
397 |
val _ = after_load (); |
|
a6c641f08af7
schedule_futures: tuned final consolidation, explicit after_load phase;
wenzelm
parents:
29421
diff
changeset
|
398 |
in [] end handle exn => (kill_thy name; [exn])); |
|
a6c641f08af7
schedule_futures: tuned final consolidation, explicit after_load phase;
wenzelm
parents:
29421
diff
changeset
|
399 |
|
|
32814
81897d30b97f
added Task_Queue.depend (again) -- light-weight version for transitive graph;
wenzelm
parents:
32794
diff
changeset
|
400 |
in ignore (Exn.release_all (map Exn.Exn (rev exns))) end) (); |
|
29429
a6c641f08af7
schedule_futures: tuned final consolidation, explicit after_load phase;
wenzelm
parents:
29421
diff
changeset
|
401 |
|
|
a6c641f08af7
schedule_futures: tuned final consolidation, explicit after_load phase;
wenzelm
parents:
29421
diff
changeset
|
402 |
fun schedule_seq tasks = |
|
a6c641f08af7
schedule_futures: tuned final consolidation, explicit after_load phase;
wenzelm
parents:
29421
diff
changeset
|
403 |
Graph.topological_order tasks |
|
30319
a549dc15c037
schedule_seq: handle after_load errors as in schedule_futures;
wenzelm
parents:
29437
diff
changeset
|
404 |
|> List.app (fn name => |
|
a549dc15c037
schedule_seq: handle after_load errors as in schedule_futures;
wenzelm
parents:
29437
diff
changeset
|
405 |
(case Graph.get_node tasks name of |
|
a549dc15c037
schedule_seq: handle after_load errors as in schedule_futures;
wenzelm
parents:
29437
diff
changeset
|
406 |
Task body => |
|
a549dc15c037
schedule_seq: handle after_load errors as in schedule_futures;
wenzelm
parents:
29437
diff
changeset
|
407 |
let val after_load = body () |
|
31542
3371a3c19bb1
reraise exceptions to preserve position information;
wenzelm
parents:
30819
diff
changeset
|
408 |
in after_load () handle exn => (kill_thy name; reraise exn) end |
|
30319
a549dc15c037
schedule_seq: handle after_load errors as in schedule_futures;
wenzelm
parents:
29437
diff
changeset
|
409 |
| _ => ())); |
| 28194 | 410 |
|
| 24209 | 411 |
in |
412 |
||
| 32794 | 413 |
fun schedule_tasks tasks = |
| 29118 | 414 |
if not (Multithreading.enabled ()) then schedule_seq tasks |
415 |
else if Multithreading.self_critical () then |
|
| 24209 | 416 |
(warning (loader_msg "no multithreading within critical section" []); |
417 |
schedule_seq tasks) |
|
| 29118 | 418 |
else schedule_futures tasks; |
| 24209 | 419 |
|
420 |
end; |
|
421 |
||
422 |
||
| 23967 | 423 |
(* require_thy -- checking database entries wrt. the file-system *) |
| 15065 | 424 |
|
| 7211 | 425 |
local |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
426 |
|
|
23886
f40fba467384
simplified ThyLoad interfaces: only one additional directory;
wenzelm
parents:
23871
diff
changeset
|
427 |
fun check_ml master (src_path, info) = |
| 23871 | 428 |
let val info' = |
429 |
(case info of NONE => NONE |
|
430 |
| SOME (_, id) => |
|
|
23886
f40fba467384
simplified ThyLoad interfaces: only one additional directory;
wenzelm
parents:
23871
diff
changeset
|
431 |
(case ThyLoad.check_ml (master_dir master) src_path of NONE => NONE |
| 23871 | 432 |
| SOME (path', id') => if id <> id' then NONE else SOME (path', id'))) |
|
23886
f40fba467384
simplified ThyLoad interfaces: only one additional directory;
wenzelm
parents:
23871
diff
changeset
|
433 |
in (src_path, info') end; |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
434 |
|
|
24175
38a15a3a1aad
theory loader: removed obsolete update_thy (coincides with use_thy);
wenzelm
parents:
24151
diff
changeset
|
435 |
fun check_deps dir name = |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
436 |
(case lookup_deps name of |
|
23893
8babfcaaf129
deps: maintain source specification of parents (prevents repeated ThyLoad.deps_thy);
wenzelm
parents:
23886
diff
changeset
|
437 |
SOME NONE => (true, NONE, get_parents name) |
|
8babfcaaf129
deps: maintain source specification of parents (prevents repeated ThyLoad.deps_thy);
wenzelm
parents:
23886
diff
changeset
|
438 |
| NONE => |
| 24190 | 439 |
let val {master, text, imports = parents, uses = files} = ThyLoad.deps_thy dir name
|
| 24068 | 440 |
in (false, init_deps (SOME master) text parents files, parents) end |
| 32794 | 441 |
| SOME (SOME {update_time, master, text, parents, files}) =>
|
| 24190 | 442 |
let |
443 |
val (thy_path, thy_id) = ThyLoad.check_thy dir name; |
|
444 |
val master' = SOME (thy_path, thy_id); |
|
445 |
in |
|
446 |
if Option.map #2 master <> SOME thy_id then |
|
|
24175
38a15a3a1aad
theory loader: removed obsolete update_thy (coincides with use_thy);
wenzelm
parents:
24151
diff
changeset
|
447 |
let val {text = text', imports = parents', uses = files', ...} =
|
| 24190 | 448 |
ThyLoad.deps_thy dir name; |
|
24175
38a15a3a1aad
theory loader: removed obsolete update_thy (coincides with use_thy);
wenzelm
parents:
24151
diff
changeset
|
449 |
in (false, init_deps master' text' parents' files', parents') end |
|
38a15a3a1aad
theory loader: removed obsolete update_thy (coincides with use_thy);
wenzelm
parents:
24151
diff
changeset
|
450 |
else |
|
38a15a3a1aad
theory loader: removed obsolete update_thy (coincides with use_thy);
wenzelm
parents:
24151
diff
changeset
|
451 |
let |
|
24186
d7f267b806c9
check_deps: really do reload the master text if required;
wenzelm
parents:
24175
diff
changeset
|
452 |
val files' = map (check_ml master') files; |
|
24307
434c9fbc1787
check_deps: ensure that theory is actually present, not just update_time > 1;
wenzelm
parents:
24230
diff
changeset
|
453 |
val current = update_time >= 0 andalso can get_theory name |
|
434c9fbc1787
check_deps: ensure that theory is actually present, not just update_time > 1;
wenzelm
parents:
24230
diff
changeset
|
454 |
andalso forall (is_some o snd) files'; |
|
24175
38a15a3a1aad
theory loader: removed obsolete update_thy (coincides with use_thy);
wenzelm
parents:
24151
diff
changeset
|
455 |
val update_time' = if current then update_time else ~1; |
| 25030 | 456 |
val deps' = SOME (make_deps update_time' master' text parents files'); |
|
24175
38a15a3a1aad
theory loader: removed obsolete update_thy (coincides with use_thy);
wenzelm
parents:
24151
diff
changeset
|
457 |
in (current, deps', parents) end |
|
38a15a3a1aad
theory loader: removed obsolete update_thy (coincides with use_thy);
wenzelm
parents:
24151
diff
changeset
|
458 |
end); |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
459 |
|
| 25030 | 460 |
fun read_text (SOME {update_time, master = master as SOME (path, _), text = _, parents, files}) =
|
461 |
SOME (make_deps update_time master (explode (File.read path)) parents files); |
|
462 |
||
| 23967 | 463 |
in |
464 |
||
|
24175
38a15a3a1aad
theory loader: removed obsolete update_thy (coincides with use_thy);
wenzelm
parents:
24151
diff
changeset
|
465 |
fun require_thys time initiators dir strs tasks = |
|
24186
d7f267b806c9
check_deps: really do reload the master text if required;
wenzelm
parents:
24175
diff
changeset
|
466 |
fold_map (require_thy time initiators dir) strs tasks |>> forall I |
|
24175
38a15a3a1aad
theory loader: removed obsolete update_thy (coincides with use_thy);
wenzelm
parents:
24151
diff
changeset
|
467 |
and require_thy time initiators dir str tasks = |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
468 |
let |
|
21858
05f57309170c
avoid conflict with Alice keywords: renamed pack -> implode, unpack -> explode, any -> many, avoided assert;
wenzelm
parents:
20664
diff
changeset
|
469 |
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
|
470 |
val name = Path.implode (Path.base path); |
|
23893
8babfcaaf129
deps: maintain source specification of parents (prevents repeated ThyLoad.deps_thy);
wenzelm
parents:
23886
diff
changeset
|
471 |
val dir' = Path.append dir (Path.dir path); |
| 23871 | 472 |
val _ = member (op =) initiators name andalso error (cycle_msg initiators); |
| 7066 | 473 |
in |
| 32794 | 474 |
(case try (Graph.get_node tasks) name of |
| 24209 | 475 |
SOME task => (task_finished task, tasks) |
| 23967 | 476 |
| NONE => |
477 |
let |
|
|
24175
38a15a3a1aad
theory loader: removed obsolete update_thy (coincides with use_thy);
wenzelm
parents:
24151
diff
changeset
|
478 |
val (current, deps, parents) = check_deps dir' name |
| 23967 | 479 |
handle ERROR msg => cat_error msg |
480 |
(loader_msg "the error(s) above occurred while examining theory" [name] ^ |
|
481 |
required_by "\n" initiators); |
|
482 |
val parent_names = map base_name parents; |
|
| 23871 | 483 |
|
| 32794 | 484 |
val (parents_current, tasks_graph') = |
|
24175
38a15a3a1aad
theory loader: removed obsolete update_thy (coincides with use_thy);
wenzelm
parents:
24151
diff
changeset
|
485 |
require_thys time (name :: initiators) |
|
38a15a3a1aad
theory loader: removed obsolete update_thy (coincides with use_thy);
wenzelm
parents:
24151
diff
changeset
|
486 |
(Path.append dir (master_dir' deps)) parents tasks; |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
487 |
|
| 23967 | 488 |
val all_current = current andalso parents_current; |
|
24186
d7f267b806c9
check_deps: really do reload the master text if required;
wenzelm
parents:
24175
diff
changeset
|
489 |
val _ = if not all_current andalso known_thy name then outdate_thy name else (); |
| 25030 | 490 |
val entry = |
491 |
if all_current then (deps, SOME (get_theory name)) |
|
492 |
else (read_text deps, NONE); |
|
493 |
val _ = change_thys (new_deps name parent_names entry); |
|
| 23967 | 494 |
|
|
24151
255f76dcc16b
replaced outdated flag by update_time (multithreading-safe presentation order);
wenzelm
parents:
24133
diff
changeset
|
495 |
val upd_time = serial (); |
| 23974 | 496 |
val tasks_graph'' = tasks_graph' |> new_deps name parent_names |
| 24209 | 497 |
(if all_current then Finished |
| 27843 | 498 |
else Task (fn () => load_thy time upd_time initiators name)); |
| 32794 | 499 |
in (all_current, tasks_graph'') end) |
| 7066 | 500 |
end; |
|
6484
3f098b0ec683
use_thy etc.: may specify path prefix, which is temporarily used as load path;
wenzelm
parents:
6389
diff
changeset
|
501 |
|
| 23967 | 502 |
end; |
503 |
||
504 |
||
| 24209 | 505 |
(* use_thy etc. *) |
| 23967 | 506 |
|
507 |
local |
|
508 |
||
|
24057
f42665561801
removed obsolete Output.ML_errors/toplevel_errors;
wenzelm
parents:
23982
diff
changeset
|
509 |
fun gen_use_thy' req dir arg = |
| 32794 | 510 |
schedule_tasks (snd (req [] dir arg Graph.empty)); |
| 6241 | 511 |
|
|
23893
8babfcaaf129
deps: maintain source specification of parents (prevents repeated ThyLoad.deps_thy);
wenzelm
parents:
23886
diff
changeset
|
512 |
fun gen_use_thy req str = |
|
8babfcaaf129
deps: maintain source specification of parents (prevents repeated ThyLoad.deps_thy);
wenzelm
parents:
23886
diff
changeset
|
513 |
let val name = base_name str in |
|
8babfcaaf129
deps: maintain source specification of parents (prevents repeated ThyLoad.deps_thy);
wenzelm
parents:
23886
diff
changeset
|
514 |
check_unfinished warning name; |
| 25994 | 515 |
gen_use_thy' req Path.current str |
|
23893
8babfcaaf129
deps: maintain source specification of parents (prevents repeated ThyLoad.deps_thy);
wenzelm
parents:
23886
diff
changeset
|
516 |
end; |
| 7244 | 517 |
|
| 7211 | 518 |
in |
519 |
||
|
24186
d7f267b806c9
check_deps: really do reload the master text if required;
wenzelm
parents:
24175
diff
changeset
|
520 |
val use_thys_dir = gen_use_thy' (require_thys false); |
|
d7f267b806c9
check_deps: really do reload the master text if required;
wenzelm
parents:
24175
diff
changeset
|
521 |
val use_thys = use_thys_dir Path.current; |
|
d7f267b806c9
check_deps: really do reload the master text if required;
wenzelm
parents:
24175
diff
changeset
|
522 |
val use_thy = gen_use_thy (require_thy false); |
|
d7f267b806c9
check_deps: really do reload the master text if required;
wenzelm
parents:
24175
diff
changeset
|
523 |
val time_use_thy = gen_use_thy (require_thy true); |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
524 |
|
| 7211 | 525 |
end; |
526 |
||
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
527 |
|
| 7066 | 528 |
(* begin / end theory *) |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
529 |
|
|
23900
b25b1444a246
begin_theory: simplified interface, keep thy info empty until end_theory;
wenzelm
parents:
23893
diff
changeset
|
530 |
fun begin_theory name parents uses int = |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
531 |
let |
|
23893
8babfcaaf129
deps: maintain source specification of parents (prevents repeated ThyLoad.deps_thy);
wenzelm
parents:
23886
diff
changeset
|
532 |
val parent_names = map base_name parents; |
|
23886
f40fba467384
simplified ThyLoad interfaces: only one additional directory;
wenzelm
parents:
23871
diff
changeset
|
533 |
val dir = master_dir'' (lookup_deps name); |
| 7244 | 534 |
val _ = check_unfinished error name; |
|
24186
d7f267b806c9
check_deps: really do reload the master text if required;
wenzelm
parents:
24175
diff
changeset
|
535 |
val _ = if int then use_thys_dir dir parents else (); |
| 17365 | 536 |
|
|
24151
255f76dcc16b
replaced outdated flag by update_time (multithreading-safe presentation order);
wenzelm
parents:
24133
diff
changeset
|
537 |
val theory = Theory.begin_theory name (map get_theory parent_names); |
|
23900
b25b1444a246
begin_theory: simplified interface, keep thy info empty until end_theory;
wenzelm
parents:
23893
diff
changeset
|
538 |
|
| 7952 | 539 |
val deps = |
540 |
if known_thy name then get_deps name |
|
| 24068 | 541 |
else init_deps NONE [] parents (map #1 uses); |
| 23967 | 542 |
val _ = change_thys (new_deps name parent_names (deps, NONE)); |
| 9451 | 543 |
|
|
24151
255f76dcc16b
replaced outdated flag by update_time (multithreading-safe presentation order);
wenzelm
parents:
24133
diff
changeset
|
544 |
val update_time = (case deps of NONE => 0 | SOME {update_time, ...} => update_time);
|
| 24563 | 545 |
val update_time = if update_time > 0 then update_time else serial (); |
546 |
val theory' = theory |
|
| 32106 | 547 |
|> Management_Data.put (Future.worker_group (), update_time) |
| 24563 | 548 |
|> Present.begin_theory update_time dir uses; |
|
24151
255f76dcc16b
replaced outdated flag by update_time (multithreading-safe presentation order);
wenzelm
parents:
24133
diff
changeset
|
549 |
|
|
23900
b25b1444a246
begin_theory: simplified interface, keep thy info empty until end_theory;
wenzelm
parents:
23893
diff
changeset
|
550 |
val uses_now = map_filter (fn (x, true) => SOME x | _ => NONE) uses; |
|
28292
cad470c69935
begin_theory: Theory.checkpoint for immediate uses ensures that ML evaluation always starts with non-draft @{theory};
wenzelm
parents:
28195
diff
changeset
|
551 |
val theory'' = |
|
cad470c69935
begin_theory: Theory.checkpoint for immediate uses ensures that ML evaluation always starts with non-draft @{theory};
wenzelm
parents:
28195
diff
changeset
|
552 |
fold (fn x => Context.theory_map (exec_file false x) o Theory.checkpoint) uses_now theory'; |
|
24151
255f76dcc16b
replaced outdated flag by update_time (multithreading-safe presentation order);
wenzelm
parents:
24133
diff
changeset
|
553 |
in theory'' end; |
| 7244 | 554 |
|
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
555 |
fun end_theory theory = |
| 7099 | 556 |
let |
| 16454 | 557 |
val name = Context.theory_name theory; |
| 24190 | 558 |
val _ = check_files name; |
| 16504 | 559 |
val theory' = Theory.end_theory theory; |
|
23900
b25b1444a246
begin_theory: simplified interface, keep thy info empty until end_theory;
wenzelm
parents:
23893
diff
changeset
|
560 |
val _ = change_thy name (fn (deps, _) => (deps, SOME theory')); |
| 27579 | 561 |
in () end; |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
562 |
|
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
563 |
|
|
24080
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
564 |
(* register existing theories *) |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
565 |
|
|
24080
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
566 |
fun register_thy name = |
|
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
567 |
let |
|
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
568 |
val _ = priority ("Registering theory " ^ quote name);
|
| 24563 | 569 |
val thy = get_theory name; |
| 24096 | 570 |
val _ = map get_theory (get_parents name); |
571 |
val _ = check_unfinished error name; |
|
|
24080
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
572 |
val _ = touch_thy name; |
| 24190 | 573 |
val master = #master (ThyLoad.deps_thy Path.current name); |
| 32106 | 574 |
val upd_time = #2 (Management_Data.get thy); |
|
24080
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
575 |
in |
|
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
576 |
CRITICAL (fn () => |
| 24190 | 577 |
(change_deps name (Option.map |
578 |
(fn {parents, files, ...} => make_deps upd_time (SOME master) [] parents files));
|
|
|
24080
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
579 |
perform Update name)) |
|
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
580 |
end; |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
581 |
|
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
582 |
fun register_theory theory = |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
583 |
let |
| 16454 | 584 |
val name = Context.theory_name theory; |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
585 |
val parents = Theory.parents_of theory; |
| 16454 | 586 |
val parent_names = map Context.theory_name parents; |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
587 |
|
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
588 |
fun err txt bads = |
| 23871 | 589 |
error (loader_msg txt bads ^ "\ncannot register theory " ^ quote name); |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
590 |
|
| 6666 | 591 |
val nonfinished = filter_out is_finished parent_names; |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
592 |
fun get_variant (x, y_name) = |
| 15531 | 593 |
if Theory.eq_thy (x, get_theory y_name) then NONE |
594 |
else SOME y_name; |
|
|
19482
9f11af8f7ef9
tuned basic list operators (flat, maps, map_filter);
wenzelm
parents:
19473
diff
changeset
|
595 |
val variants = map_filter get_variant (parents ~~ parent_names); |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
596 |
|
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
597 |
fun register G = |
| 15531 | 598 |
(Graph.new_node (name, (NONE, SOME theory)) G |
| 9327 | 599 |
handle Graph.DUP _ => err "duplicate theory entry" []) |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
600 |
|> add_deps name parent_names; |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
601 |
in |
| 6666 | 602 |
if not (null nonfinished) then err "non-finished parent theories" nonfinished |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
603 |
else if not (null variants) then err "different versions of parent theories" variants |
| 23939 | 604 |
else CRITICAL (fn () => (change_thys register; perform Update name)) |
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
605 |
end; |
|
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
606 |
|
|
24080
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
607 |
|
|
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
608 |
(* finish all theories *) |
|
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
609 |
|
|
28976
53c96f58e38f
future_scheduler: no global task group, exceptions via collective join;
wenzelm
parents:
28844
diff
changeset
|
610 |
fun finish () = change_thys (Graph.map_nodes (fn (_, entry) => (NONE, entry))); |
|
24080
8c67d869531b
added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents:
24071
diff
changeset
|
611 |
|
|
6211
43d0efafa025
Theory loader database: theory and file dependencies, theory values
wenzelm
parents:
5211
diff
changeset
|
612 |
end; |