src/Pure/Thy/thy_info.ML
author wenzelm
Tue, 05 Jul 2011 22:39:15 +0200
changeset 43673 29eb1cd29961
parent 43651 511df47bcadc
child 43712 3c2c912af2ef
permissions -rw-r--r--
Thy_Info.dependencies: ignore already loaded theories, according to initial prover session status;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
d2f5ca3c048d superceded by Pure.thy and CPure.thy;
wenzelm
parents: 15633
diff changeset
     5
file dependencies.
3976
wenzelm
parents: 3604
diff changeset
     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
8142ccd13963 added update_thy_only;
wenzelm
parents: 7066
diff changeset
    11
  val add_hook: (action -> string -> unit) -> unit
26614
1f09a22a1027 export get_names (formerly names);
wenzelm
parents: 26494
diff changeset
    12
  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
    13
  val status: unit -> unit
7288
21ff5bb68a5c lookup_theory;
wenzelm
parents: 7267
diff changeset
    14
  val lookup_theory: string -> theory option
6211
43d0efafa025 Theory loader database: theory and file dependencies, theory values
wenzelm
parents: 5211
diff changeset
    15
  val get_theory: string -> theory
24563
f2edc70f8962 export is_finished;
wenzelm
parents: 24314
diff changeset
    16
  val is_finished: string -> bool
26983
e40f28cdd19b exported master_directory;
wenzelm
parents: 26881
diff changeset
    17
  val master_directory: string -> Path.T
24080
8c67d869531b added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents: 24071
diff changeset
    18
  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
    19
  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
    20
  val kill_thy: string -> unit
38146
a5916f2b6791 export use_thys_wrt;
wenzelm
parents: 38145
diff changeset
    21
  val use_thys_wrt: Path.T -> string list -> unit
24057
f42665561801 removed obsolete Output.ML_errors/toplevel_errors;
wenzelm
parents: 23982
diff changeset
    22
  val use_thys: string list -> unit
f42665561801 removed obsolete Output.ML_errors/toplevel_errors;
wenzelm
parents: 23982
diff changeset
    23
  val use_thy: string -> unit
41536
47fef6afe756 Toplevel.init_theory: maintain optional master directory, to allow bypassing global Thy_Load.master_path;
wenzelm
parents: 40741
diff changeset
    24
  val toplevel_begin_theory: Path.T option -> string ->
47fef6afe756 Toplevel.init_theory: maintain optional master directory, to allow bypassing global Thy_Load.master_path;
wenzelm
parents: 40741
diff changeset
    25
    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
8142ccd13963 added update_thy_only;
wenzelm
parents: 7066
diff changeset
    33
(** theory loader actions and hooks **)
8142ccd13963 added update_thy_only;
wenzelm
parents: 7066
diff changeset
    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
8142ccd13963 added update_thy_only;
wenzelm
parents: 7066
diff changeset
    36
8142ccd13963 added update_thy_only;
wenzelm
parents: 7066
diff changeset
    37
local
43640
f57bcfb54808 misc tuning;
wenzelm
parents: 42129
diff changeset
    38
  val hooks = Synchronized.var "Thy_Info.hooks" ([]: (action -> string -> unit) list);
7099
8142ccd13963 added update_thy_only;
wenzelm
parents: 7066
diff changeset
    39
in
43640
f57bcfb54808 misc tuning;
wenzelm
parents: 42129
diff changeset
    40
  fun add_hook f = Synchronized.change hooks (cons f);
f57bcfb54808 misc tuning;
wenzelm
parents: 42129
diff changeset
    41
  fun perform action name =
f57bcfb54808 misc tuning;
wenzelm
parents: 42129
diff changeset
    42
    List.app (fn f => (try (fn () => f action name) (); ())) (Synchronized.value hooks);
7099
8142ccd13963 added update_thy_only;
wenzelm
parents: 7066
diff changeset
    43
end;
8142ccd13963 added update_thy_only;
wenzelm
parents: 7066
diff changeset
    44
8142ccd13963 added update_thy_only;
wenzelm
parents: 7066
diff changeset
    45
8142ccd13963 added update_thy_only;
wenzelm
parents: 7066
diff changeset
    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
0dd5696f58b6 removed obsolete use/update_thy_only;
wenzelm
parents: 22215
diff changeset
    51
fun loader_msg txt [] = "Theory loader: " ^ txt
0dd5696f58b6 removed obsolete use/update_thy_only;
wenzelm
parents: 22215
diff changeset
    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
ff3a86a00ea5 tuned cycle_msg;
wenzelm
parents: 9327
diff changeset
    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
be06ed5d0b4c cleaned comments;
wenzelm
parents: 6654
diff changeset
    58
(* derived graph operations *)
3604
6bf9f09f3d61 Moved functions for theory information storage / retrieval
berghofe
parents:
diff changeset
    59
9327
wenzelm
parents: 9137
diff changeset
    60
fun add_deps name parents G = Graph.add_deps_acyclic (name, parents) G
9332
ff3a86a00ea5 tuned cycle_msg;
wenzelm
parents: 9327
diff changeset
    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
92130b24e87f require_thy: explicit tasks graph;
wenzelm
parents: 23939
diff changeset
    76
fun base_name s = Path.implode (Path.base (Path.explode s));
92130b24e87f require_thy: explicit tasks graph;
wenzelm
parents: 23939
diff changeset
    77
6211
43d0efafa025 Theory loader database: theory and file dependencies, theory values
wenzelm
parents: 5211
diff changeset
    78
local
37905
wenzelm
parents: 37902
diff changeset
    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
bbbea7fecb93 removed obsolete user data stuff;
wenzelm
parents: 6329
diff changeset
    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
a69fe5a61b6c theory_of renamed to theory (and made public);
wenzelm
parents: 4975
diff changeset
    84
a69fe5a61b6c theory_of renamed to theory (and made public);
wenzelm
parents: 4975
diff changeset
    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
c4f7c959eaee get_names: topologically sorted;
wenzelm
parents: 9332
diff changeset
    89
23967
92130b24e87f require_thy: explicit tasks graph;
wenzelm
parents: 23939
diff changeset
    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
ac62465ed06c added check_known_thy, if_known_thy;
wenzelm
parents: 7910
diff changeset
    98
fun lookup_thy name =
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 15158
diff changeset
    99
  SOME (thy_graph Graph.get_node name) handle Graph.UNDEF _ => NONE;
7935
ac62465ed06c added check_known_thy, if_known_thy;
wenzelm
parents: 7910
diff changeset
   100
16047
b2bf9a5cde37 tuned pretty_sg;
wenzelm
parents: 15801
diff changeset
   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
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 15158
diff changeset
   105
    SOME thy => thy
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 15158
diff changeset
   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
8d8c70b41bab Move towards standard functions.
skalberg
parents: 15531
diff changeset
   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
e40f28cdd19b exported master_directory;
wenzelm
parents: 26881
diff changeset
   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
fcce2387ad6d added pretend_use;
wenzelm
parents: 7099
diff changeset
   116
23871
0dd5696f58b6 removed obsolete use/update_thy_only;
wenzelm
parents: 22215
diff changeset
   117
fun get_parents name =
23967
92130b24e87f require_thy: explicit tasks graph;
wenzelm
parents: 23939
diff changeset
   118
  thy_graph Graph.imm_preds name handle Graph.UNDEF _ =>
6654
c3686d75e9d6 Added function get_preds.
berghofe
parents: 6527
diff changeset
   119
    error (loader_msg "nothing known about theory" [name]);
c3686d75e9d6 Added function get_preds.
berghofe
parents: 6527
diff changeset
   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
3383b8223e46 fixed lookup_theory;
wenzelm
parents: 7589
diff changeset
   124
fun lookup_theory name =
3383b8223e46 fixed lookup_theory;
wenzelm
parents: 7589
diff changeset
   125
  (case lookup_thy name of
38142
c202426474c3 more precise CRITICAL sections;
wenzelm
parents: 38141
diff changeset
   126
    SOME (_, SOME theory) => SOME theory
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 15158
diff changeset
   127
  | _ => NONE);
7288
21ff5bb68a5c lookup_theory;
wenzelm
parents: 7267
diff changeset
   128
6211
43d0efafa025 Theory loader database: theory and file dependencies, theory values
wenzelm
parents: 5211
diff changeset
   129
fun get_theory name =
7288
21ff5bb68a5c lookup_theory;
wenzelm
parents: 7267
diff changeset
   130
  (case lookup_theory name of
23871
0dd5696f58b6 removed obsolete use/update_thy_only;
wenzelm
parents: 22215
diff changeset
   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
f57bcfb54808 misc tuning;
wenzelm
parents: 42129
diff changeset
   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
0f21ebea4a73 tuned messages and comments;
wenzelm
parents: 37978
diff changeset
   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
3f49ae779bdd remove_thy: perform PureThy.cancel_proofs;
wenzelm
parents: 29429
diff changeset
   148
    let
3f49ae779bdd remove_thy: perform PureThy.cancel_proofs;
wenzelm
parents: 29429
diff changeset
   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
c202426474c3 more precise CRITICAL sections;
wenzelm
parents: 38141
diff changeset
   151
      val _ = List.app (perform Remove) succs;
c202426474c3 more precise CRITICAL sections;
wenzelm
parents: 38141
diff changeset
   152
      val _ = change_thys (Graph.del_nodes succs);
c202426474c3 more precise CRITICAL sections;
wenzelm
parents: 38141
diff changeset
   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
c202426474c3 more precise CRITICAL sections;
wenzelm
parents: 38141
diff changeset
   157
  else ());
7099
8142ccd13963 added update_thy_only;
wenzelm
parents: 7066
diff changeset
   158
43640
f57bcfb54808 misc tuning;
wenzelm
parents: 42129
diff changeset
   159
fun update_thy deps theory = NAMED_CRITICAL "Thy_Info" (fn () =>
f57bcfb54808 misc tuning;
wenzelm
parents: 42129
diff changeset
   160
  let
f57bcfb54808 misc tuning;
wenzelm
parents: 42129
diff changeset
   161
    val name = Context.theory_name theory;
f57bcfb54808 misc tuning;
wenzelm
parents: 42129
diff changeset
   162
    val parents = map Context.theory_name (Theory.parents_of theory);
f57bcfb54808 misc tuning;
wenzelm
parents: 42129
diff changeset
   163
    val _ = kill_thy name;
f57bcfb54808 misc tuning;
wenzelm
parents: 42129
diff changeset
   164
    val _ = map get_theory parents;
f57bcfb54808 misc tuning;
wenzelm
parents: 42129
diff changeset
   165
    val _ = change_thys (new_entry name parents (SOME deps, SOME theory));
f57bcfb54808 misc tuning;
wenzelm
parents: 42129
diff changeset
   166
    val _ = perform Update name;
f57bcfb54808 misc tuning;
wenzelm
parents: 42129
diff changeset
   167
  in () end);
f57bcfb54808 misc tuning;
wenzelm
parents: 42129
diff changeset
   168
7099
8142ccd13963 added update_thy_only;
wenzelm
parents: 7066
diff changeset
   169
24209
8a2c8d623e43 schedule: misc cleanup, more precise task model;
wenzelm
parents: 24190
diff changeset
   170
(* scheduling loader tasks *)
8a2c8d623e43 schedule: misc cleanup, more precise task model;
wenzelm
parents: 24190
diff changeset
   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
8a2c8d623e43 schedule: misc cleanup, more precise task model;
wenzelm
parents: 24190
diff changeset
   180
29118
8f2481aa363d removed old scheduler;
wenzelm
parents: 29088
diff changeset
   181
local
8f2481aa363d removed old scheduler;
wenzelm
parents: 29088
diff changeset
   182
43641
081e009549dc uniform finish_thy -- always Global_Theory.join_proofs, even with sequential scheduling;
wenzelm
parents: 43640
diff changeset
   183
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
   184
  (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
   185
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
   186
fun schedule_seq task_graph =
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
   187
  ((Graph.topological_order task_graph, Symtab.empty) |-> fold (fn name => fn tab =>
3ceccd415145 simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, non-optional master dependency, do not store text in deps;
wenzelm
parents: 37955
diff changeset
   188
    (case Graph.get_node task_graph name of
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
   189
      Task (parents, body) =>
43641
081e009549dc uniform finish_thy -- always Global_Theory.join_proofs, even with sequential scheduling;
wenzelm
parents: 43640
diff changeset
   190
        let val result = body (map (the o Symtab.lookup tab) parents)
081e009549dc uniform finish_thy -- always Global_Theory.join_proofs, even with sequential scheduling;
wenzelm
parents: 43640
diff changeset
   191
        in Symtab.update (name, finish_thy result) tab 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
   192
    | Finished thy => Symtab.update (name, thy) tab))) |> ignore;
3ceccd415145 simplified/clarified theory loader: more explicit task management, kill old versions at start, commit results only in the very end, non-optional master dependency, do not store text in deps;
wenzelm
parents: 37955
diff changeset
   193
32814
81897d30b97f added Task_Queue.depend (again) -- light-weight version for transitive graph;
wenzelm
parents: 32794
diff changeset
   194
fun schedule_futures task_graph = uninterruptible (fn _ => fn () =>
28194
c6dad24124f1 added future_scheduler (default false);
wenzelm
parents: 28126
diff changeset
   195
  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
   196
    val tasks = Graph.topological_order task_graph;
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
   197
    val futures = (tasks, Symtab.empty) |-> fold (fn name => fn tab =>
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
   198
      (case Graph.get_node task_graph name of
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
   199
        Task (parents, body) =>
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
   200
          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
   201
            val get = the o Symtab.lookup tab;
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
   202
            val deps = map (`get) (Graph.imm_preds task_graph name);
41673
1c191a39549f support named tasks, for improved tracing;
wenzelm
parents: 41672
diff changeset
   203
            val task_deps = map (Future.task_of o #1) deps;
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
   204
            fun failed (future, parent) = if can Future.join future then NONE else SOME parent;
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
   205
41672
2f70b1ddd09f more direct Future.bulk, which potentially reduces overhead for Par_List;
wenzelm
parents: 41548
diff changeset
   206
            val future =
41673
1c191a39549f support named tasks, for improved tracing;
wenzelm
parents: 41672
diff changeset
   207
              singleton
41678
2b80ee995f95 simplified trace;
wenzelm
parents: 41674
diff changeset
   208
                (Future.forks {name = "theory:" ^ name, group = NONE, deps = task_deps, pri = 0})
41673
1c191a39549f support named tasks, for improved tracing;
wenzelm
parents: 41672
diff changeset
   209
                (fn () =>
1c191a39549f support named tasks, for improved tracing;
wenzelm
parents: 41672
diff changeset
   210
                  (case map_filter failed deps of
1c191a39549f support named tasks, for improved tracing;
wenzelm
parents: 41672
diff changeset
   211
                    [] => body (map (#1 o Future.join o get) parents)
1c191a39549f support named tasks, for improved tracing;
wenzelm
parents: 41672
diff changeset
   212
                  | bad => error (loader_msg ("failed to load " ^ quote name ^
1c191a39549f support named tasks, for improved tracing;
wenzelm
parents: 41672
diff changeset
   213
                      " (unresolved " ^ commas_quote bad ^ ")") [])));
38143
3342c68d8782 schedule_futures: discontinued special treatment of non-parallel proofs, which might have affected memory usage at some point, but does not seem to make a difference with as little as 2GB RAM;
wenzelm
parents: 38142
diff changeset
   214
          in Symtab.update (name, future) tab 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
   215
      | Finished thy => Symtab.update (name, Future.value (thy, Future.value (), I)) tab));
37980
b8c3d4dc1e3e avoid repeated File.read for theory text (as before);
wenzelm
parents: 37979
diff changeset
   216
    val _ =
b8c3d4dc1e3e avoid repeated File.read for theory text (as before);
wenzelm
parents: 37979
diff changeset
   217
      tasks |> maps (fn name =>
b8c3d4dc1e3e avoid repeated File.read for theory text (as before);
wenzelm
parents: 37979
diff changeset
   218
        let
43641
081e009549dc uniform finish_thy -- always Global_Theory.join_proofs, even with sequential scheduling;
wenzelm
parents: 43640
diff changeset
   219
          val result = Future.join (the (Symtab.lookup futures name));
081e009549dc uniform finish_thy -- always Global_Theory.join_proofs, even with sequential scheduling;
wenzelm
parents: 43640
diff changeset
   220
          val _ = finish_thy result;
37980
b8c3d4dc1e3e avoid repeated File.read for theory text (as before);
wenzelm
parents: 37979
diff changeset
   221
        in [] end handle exn => [Exn.Exn exn])
b8c3d4dc1e3e avoid repeated File.read for theory text (as before);
wenzelm
parents: 37979
diff changeset
   222
      |> rev |> Exn.release_all;
34260
2524c1bbd087 kill failed theories in reverse order -- avoids cascaded warnings;
wenzelm
parents: 33522
diff changeset
   223
  in () end) ();
29429
a6c641f08af7 schedule_futures: tuned final consolidation, explicit after_load phase;
wenzelm
parents: 29421
diff changeset
   224
24209
8a2c8d623e43 schedule: misc cleanup, more precise task model;
wenzelm
parents: 24190
diff changeset
   225
in
8a2c8d623e43 schedule: misc cleanup, more precise task model;
wenzelm
parents: 24190
diff changeset
   226
32794
7b100d30eb32 eliminated redundant bindings;
wenzelm
parents: 32738
diff changeset
   227
fun schedule_tasks tasks =
29118
8f2481aa363d removed old scheduler;
wenzelm
parents: 29088
diff changeset
   228
  if not (Multithreading.enabled ()) then schedule_seq tasks
8f2481aa363d removed old scheduler;
wenzelm
parents: 29088
diff changeset
   229
  else if Multithreading.self_critical () then
24209
8a2c8d623e43 schedule: misc cleanup, more precise task model;
wenzelm
parents: 24190
diff changeset
   230
     (warning (loader_msg "no multithreading within critical section" []);
8a2c8d623e43 schedule: misc cleanup, more precise task model;
wenzelm
parents: 24190
diff changeset
   231
      schedule_seq tasks)
29118
8f2481aa363d removed old scheduler;
wenzelm
parents: 29088
diff changeset
   232
  else schedule_futures tasks;
24209
8a2c8d623e43 schedule: misc cleanup, more precise task model;
wenzelm
parents: 24190
diff changeset
   233
8a2c8d623e43 schedule: misc cleanup, more precise task model;
wenzelm
parents: 24190
diff changeset
   234
end;
8a2c8d623e43 schedule: misc cleanup, more precise task model;
wenzelm
parents: 24190
diff changeset
   235
8a2c8d623e43 schedule: misc cleanup, more precise task model;
wenzelm
parents: 24190
diff changeset
   236
23967
92130b24e87f require_thy: explicit tasks graph;
wenzelm
parents: 23939
diff changeset
   237
(* require_thy -- checking database entries wrt. the file-system *)
15065
9feac0b7f935 Some changes to allow qualified theory import.
berghofe
parents: 14981
diff changeset
   238
7211
8e4aa9044599 fixed thy_only;
wenzelm
parents: 7191
diff changeset
   239
local
6211
43d0efafa025 Theory loader database: theory and file dependencies, theory values
wenzelm
parents: 5211
diff changeset
   240
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
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
   242
  | 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
   243
43640
f57bcfb54808 misc tuning;
wenzelm
parents: 42129
diff changeset
   244
fun load_thy initiators update_time deps text name parent_thys =
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
  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
   246
    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
   247
    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
   248
41548
bd0bebf93fa6 Thy_Load.begin_theory: maintain source specification of imports;
wenzelm
parents: 41536
diff changeset
   249
    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
   250
    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
   251
    val pos = Path.position thy_path;
42003
6e45dc518ebb replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents: 41955
diff changeset
   252
    val (_, _, uses) = Thy_Header.read pos text;
41536
47fef6afe756 Toplevel.init_theory: maintain optional master directory, to allow bypassing global Thy_Load.master_path;
wenzelm
parents: 40741
diff changeset
   253
    fun init _ =
41548
bd0bebf93fa6 Thy_Load.begin_theory: maintain source specification of imports;
wenzelm
parents: 41536
diff changeset
   254
      Thy_Load.begin_theory dir name imports parent_thys uses
38141
8a2bacb8ad87 removed unused Update_Time data (cf. ac94ff28e9e1);
wenzelm
parents: 38139
diff changeset
   255
      |> Present.begin_theory update_time dir uses;
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
   256
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
   257
    val (theory, present) = Outer_Syntax.load_thy name init pos text;
43640
f57bcfb54808 misc tuning;
wenzelm
parents: 42129
diff changeset
   258
    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
   259
  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
   260
24175
38a15a3a1aad theory loader: removed obsolete update_thy (coincides with use_thy);
wenzelm
parents: 24151
diff changeset
   261
fun check_deps dir name =
6211
43d0efafa025 Theory loader database: theory and file dependencies, theory values
wenzelm
parents: 5211
diff changeset
   262
  (case lookup_deps name of
42003
6e45dc518ebb replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents: 41955
diff changeset
   263
    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
   264
  | NONE =>
42003
6e45dc518ebb replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents: 41955
diff changeset
   265
      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
   266
      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
   267
  | SOME (SOME {master, ...}) =>
42003
6e45dc518ebb replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents: 41955
diff changeset
   268
      let
6e45dc518ebb replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents: 41955
diff changeset
   269
        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
   270
        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
   271
        val current =
6e45dc518ebb replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents: 41955
diff changeset
   272
          #2 master = #2 master' andalso
6e45dc518ebb replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents: 41955
diff changeset
   273
            (case lookup_theory name of
6e45dc518ebb replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents: 41955
diff changeset
   274
              NONE => false
6e45dc518ebb replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents: 41955
diff changeset
   275
            | SOME theory => Thy_Load.all_current theory);
6e45dc518ebb replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents: 41955
diff changeset
   276
      in (current, deps', imports') end);
6211
43d0efafa025 Theory loader database: theory and file dependencies, theory values
wenzelm
parents: 5211
diff changeset
   277
23967
92130b24e87f require_thy: explicit tasks graph;
wenzelm
parents: 23939
diff changeset
   278
in
92130b24e87f require_thy: explicit tasks graph;
wenzelm
parents: 23939
diff changeset
   279
37873
66d90b2b87bc eliminated old time_use/time_use_thy variants -- timing is implicitly controlled via Output.timing;
wenzelm
parents: 37871
diff changeset
   280
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
   281
      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
   282
and require_thy initiators dir str tasks =
6211
43d0efafa025 Theory loader database: theory and file dependencies, theory values
wenzelm
parents: 5211
diff changeset
   283
  let
21858
05f57309170c avoid conflict with Alice keywords: renamed pack -> implode, unpack -> explode, any -> many, avoided assert;
wenzelm
parents: 20664
diff changeset
   284
    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
   285
    val name = Path.implode (Path.base path);
7066
febce8eee487 require_thy: fixed performance leak;
wenzelm
parents: 6900
diff changeset
   286
  in
32794
7b100d30eb32 eliminated redundant bindings;
wenzelm
parents: 32738
diff changeset
   287
    (case try (Graph.get_node tasks) name of
24209
8a2c8d623e43 schedule: misc cleanup, more precise task model;
wenzelm
parents: 24190
diff changeset
   288
      SOME task => (task_finished task, tasks)
23967
92130b24e87f require_thy: explicit tasks graph;
wenzelm
parents: 23939
diff changeset
   289
    | NONE =>
92130b24e87f require_thy: explicit tasks graph;
wenzelm
parents: 23939
diff changeset
   290
        let
43651
511df47bcadc some support for theory files within Isabelle/Scala session;
wenzelm
parents: 43641
diff changeset
   291
          val dir' = Path.append dir (Path.dir path);
511df47bcadc some support for theory files within Isabelle/Scala session;
wenzelm
parents: 43641
diff changeset
   292
          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
   293
42003
6e45dc518ebb replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents: 41955
diff changeset
   294
          val (current, deps, imports) = check_deps dir' name
23967
92130b24e87f require_thy: explicit tasks graph;
wenzelm
parents: 23939
diff changeset
   295
            handle ERROR msg => cat_error msg
92130b24e87f require_thy: explicit tasks graph;
wenzelm
parents: 23939
diff changeset
   296
              (loader_msg "the error(s) above occurred while examining theory" [name] ^
92130b24e87f require_thy: explicit tasks graph;
wenzelm
parents: 23939
diff changeset
   297
                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
   298
38148
d2f3c8d4a89f uniform naming of imports (source specification) vs. parents (thy node names) vs. parent_thys (theory values);
wenzelm
parents: 38147
diff changeset
   299
          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
   300
          val (parents_current, tasks') =
42003
6e45dc518ebb replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents: 41955
diff changeset
   301
            require_thys (name :: initiators)
6e45dc518ebb replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents: 41955
diff changeset
   302
              (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
   303
23967
92130b24e87f require_thy: explicit tasks graph;
wenzelm
parents: 23939
diff changeset
   304
          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
   305
          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
   306
            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
   307
            else
37980
b8c3d4dc1e3e avoid repeated File.read for theory text (as before);
wenzelm
parents: 37979
diff changeset
   308
              (case deps of
b8c3d4dc1e3e avoid repeated File.read for theory text (as before);
wenzelm
parents: 37979
diff changeset
   309
                NONE => raise Fail "Malformed deps"
42003
6e45dc518ebb replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents: 41955
diff changeset
   310
              | SOME (dep, text) =>
6e45dc518ebb replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents: 41955
diff changeset
   311
                  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
   312
                  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
   313
        in (all_current, new_entry name parents task tasks') end)
7066
febce8eee487 require_thy: fixed performance leak;
wenzelm
parents: 6900
diff changeset
   314
  end;
6484
3f098b0ec683 use_thy etc.: may specify path prefix, which is temporarily used as load path;
wenzelm
parents: 6389
diff changeset
   315
23967
92130b24e87f require_thy: explicit tasks graph;
wenzelm
parents: 23939
diff changeset
   316
end;
92130b24e87f require_thy: explicit tasks graph;
wenzelm
parents: 23939
diff changeset
   317
92130b24e87f require_thy: explicit tasks graph;
wenzelm
parents: 23939
diff changeset
   318
37979
0f21ebea4a73 tuned messages and comments;
wenzelm
parents: 37978
diff changeset
   319
(* use_thy *)
23967
92130b24e87f require_thy: explicit tasks graph;
wenzelm
parents: 23939
diff changeset
   320
38146
a5916f2b6791 export use_thys_wrt;
wenzelm
parents: 38145
diff changeset
   321
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
   322
  schedule_tasks (snd (require_thys [] dir arg Graph.empty));
23967
92130b24e87f require_thy: explicit tasks graph;
wenzelm
parents: 23939
diff changeset
   323
38146
a5916f2b6791 export use_thys_wrt;
wenzelm
parents: 38145
diff changeset
   324
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
   325
val use_thy = use_thys o single;
7211
8e4aa9044599 fixed thy_only;
wenzelm
parents: 7191
diff changeset
   326
6211
43d0efafa025 Theory loader database: theory and file dependencies, theory values
wenzelm
parents: 5211
diff changeset
   327
37979
0f21ebea4a73 tuned messages and comments;
wenzelm
parents: 37978
diff changeset
   328
(* toplevel begin theory -- without maintaining database *)
6211
43d0efafa025 Theory loader database: theory and file dependencies, theory values
wenzelm
parents: 5211
diff changeset
   329
41536
47fef6afe756 Toplevel.init_theory: maintain optional master directory, to allow bypassing global Thy_Load.master_path;
wenzelm
parents: 40741
diff changeset
   330
fun toplevel_begin_theory master name imports uses =
6211
43d0efafa025 Theory loader database: theory and file dependencies, theory values
wenzelm
parents: 5211
diff changeset
   331
  let
41536
47fef6afe756 Toplevel.init_theory: maintain optional master directory, to allow bypassing global Thy_Load.master_path;
wenzelm
parents: 40741
diff changeset
   332
    val dir = (case master of SOME dir => dir | NONE => Thy_Load.get_master_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
   333
    val _ = kill_thy name;
38146
a5916f2b6791 export use_thys_wrt;
wenzelm
parents: 38145
diff changeset
   334
    val _ = use_thys_wrt dir imports;
38148
d2f3c8d4a89f uniform naming of imports (source specification) vs. parents (thy node names) vs. parent_thys (theory values);
wenzelm
parents: 38147
diff changeset
   335
    val parent_thys = map (get_theory o base_name) imports;
41548
bd0bebf93fa6 Thy_Load.begin_theory: maintain source specification of imports;
wenzelm
parents: 41536
diff changeset
   336
  in Thy_Load.begin_theory dir name imports parent_thys uses end;
7244
ad714526c23e may_load_file;
wenzelm
parents: 7223
diff changeset
   337
6211
43d0efafa025 Theory loader database: theory and file dependencies, theory values
wenzelm
parents: 5211
diff changeset
   338
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
   339
(* register theory *)
6211
43d0efafa025 Theory loader database: theory and file dependencies, theory values
wenzelm
parents: 5211
diff changeset
   340
37954
a2e73df0b1e0 simplified/clarified register_thy: more precise treatment of new dependencies, remove descendants;
wenzelm
parents: 37953
diff changeset
   341
fun register_thy theory =
6211
43d0efafa025 Theory loader database: theory and file dependencies, theory values
wenzelm
parents: 5211
diff changeset
   342
  let
16454
af39c6510b86 removed obsolete theory_of_sign, theory_of_thm;
wenzelm
parents: 16047
diff changeset
   343
    val name = Context.theory_name theory;
42003
6e45dc518ebb replaced File.check by specific File.check_file, File.check_dir;
wenzelm
parents: 41955
diff changeset
   344
    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
   345
    val imports = Thy_Load.imports_of theory;
6211
43d0efafa025 Theory loader database: theory and file dependencies, theory values
wenzelm
parents: 5211
diff changeset
   346
  in
38145
675827e61eb9 more precise CRITICAL sections, using NAMED_CRITICAL uniformly;
wenzelm
parents: 38143
diff changeset
   347
    NAMED_CRITICAL "Thy_Info" (fn () =>
38142
c202426474c3 more precise CRITICAL sections;
wenzelm
parents: 38141
diff changeset
   348
     (kill_thy name;
40132
7ee65dbffa31 renamed Output.priority to Output.urgent_message to emphasize its special role more clearly;
wenzelm
parents: 39557
diff changeset
   349
      Output.urgent_message ("Registering theory " ^ quote name);
43640
f57bcfb54808 misc tuning;
wenzelm
parents: 42129
diff changeset
   350
      update_thy (make_deps master imports) theory))
6211
43d0efafa025 Theory loader database: theory and file dependencies, theory values
wenzelm
parents: 5211
diff changeset
   351
  end;
43d0efafa025 Theory loader database: theory and file dependencies, theory values
wenzelm
parents: 5211
diff changeset
   352
24080
8c67d869531b added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents: 24071
diff changeset
   353
8c67d869531b added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents: 24071
diff changeset
   354
(* finish all theories *)
8c67d869531b added register_thy (replaces pretend_use_thy_only and really flag);
wenzelm
parents: 24071
diff changeset
   355
39021
139aada5caf8 Graph.map, in analogy to Table.map
haftmann
parents: 38148
diff changeset
   356
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
   357
6211
43d0efafa025 Theory loader database: theory and file dependencies, theory values
wenzelm
parents: 5211
diff changeset
   358
end;