author | wenzelm |
Mon, 06 Mar 2023 15:48:04 +0100 | |
changeset 77542 | 2da5562114c5 |
parent 77541 | 9d9b30741fc4 |
child 77543 | 97b5547f2b17 |
permissions | -rw-r--r-- |
62631 | 1 |
/* Title: Pure/Thy/sessions.scala |
2 |
Author: Makarius |
|
3 |
||
65430 | 4 |
Cumulative session information. |
62631 | 5 |
*/ |
6 |
||
7 |
package isabelle |
|
8 |
||
65461
b6c2e30dc018
support for known theories files (according to multiple uses);
wenzelm
parents:
65457
diff
changeset
|
9 |
import java.io.{File => JFile} |
75967
ff164add75cd
maintain "uuid" column in session build database, to identity the original build process uniquely;
wenzelm
parents:
75923
diff
changeset
|
10 |
import java.sql.SQLException |
62631 | 11 |
|
73364 | 12 |
import scala.collection.immutable.{SortedSet, SortedMap} |
62631 | 13 |
import scala.collection.mutable |
14 |
||
15 |
||
75393 | 16 |
object Sessions { |
67284 | 17 |
/* session and theory names */ |
62883 | 18 |
|
72837 | 19 |
val ROOTS: Path = Path.explode("ROOTS") |
72832 | 20 |
val ROOT: Path = Path.explode("ROOT") |
21 |
||
72837 | 22 |
val roots_name: String = "ROOTS" |
67215 | 23 |
val root_name: String = "ROOT" |
75406 | 24 |
val theory_import: String = "Pure.Sessions" |
67215 | 25 |
|
69762
58fb0d779583
support for session information via virtual file-system;
wenzelm
parents:
69671
diff
changeset
|
26 |
val UNSORTED = "Unsorted" |
65445
e9e7f5f5794c
more qualifier treatment, but in the end it is still ignored;
wenzelm
parents:
65441
diff
changeset
|
27 |
val DRAFT = "Draft" |
e9e7f5f5794c
more qualifier treatment, but in the end it is still ignored;
wenzelm
parents:
65441
diff
changeset
|
28 |
|
65360 | 29 |
def is_pure(name: String): Boolean = name == Thy_Header.PURE |
64856 | 30 |
|
75922 | 31 |
def illegal_session(name: String): Boolean = name == "" || name == DRAFT |
76849
d431a9340163
more systematic Sessions.illegal_theory, based on File_Format.theory_excluded;
wenzelm
parents:
76829
diff
changeset
|
32 |
def illegal_theory(name: String): Boolean = |
76850 | 33 |
name == root_name || File_Format.registry.theory_excluded(name) |
67284 | 34 |
|
35 |
||
72837 | 36 |
/* ROOTS file format */ |
37 |
||
76850 | 38 |
class ROOTS_File_Format extends File_Format { |
72837 | 39 |
val format_name: String = roots_name |
40 |
val file_ext = "" |
|
72839
a597300290de
clarified File_Format.detect: needs to operate on full node name;
wenzelm
parents:
72837
diff
changeset
|
41 |
|
a597300290de
clarified File_Format.detect: needs to operate on full node name;
wenzelm
parents:
72837
diff
changeset
|
42 |
override def detect(name: String): Boolean = |
76828 | 43 |
Url.get_base_name(name) match { |
44 |
case Some(base_name) => base_name == roots_name |
|
72839
a597300290de
clarified File_Format.detect: needs to operate on full node name;
wenzelm
parents:
72837
diff
changeset
|
45 |
case None => false |
a597300290de
clarified File_Format.detect: needs to operate on full node name;
wenzelm
parents:
72837
diff
changeset
|
46 |
} |
72837 | 47 |
|
48 |
override def theory_suffix: String = "ROOTS_file" |
|
49 |
override def theory_content(name: String): String = |
|
76859 | 50 |
"""theory "ROOTS" imports Pure begin ROOTS_file "." end""" |
76849
d431a9340163
more systematic Sessions.illegal_theory, based on File_Format.theory_excluded;
wenzelm
parents:
76829
diff
changeset
|
51 |
override def theory_excluded(name: String): Boolean = name == "ROOTS" |
72837 | 52 |
} |
53 |
||
54 |
||
76866
19bfc64a7310
clarified signature: more explicit types (see also 90c552d28d36);
wenzelm
parents:
76865
diff
changeset
|
55 |
/* source files */ |
19bfc64a7310
clarified signature: more explicit types (see also 90c552d28d36);
wenzelm
parents:
76865
diff
changeset
|
56 |
|
76867 | 57 |
sealed case class Source_File( |
58 |
name: String, |
|
59 |
digest: SHA1.Digest, |
|
60 |
compressed: Boolean, |
|
61 |
body: Bytes, |
|
62 |
cache: Compress.Cache |
|
63 |
) { |
|
76869 | 64 |
override def toString: String = name |
65 |
||
76867 | 66 |
def bytes: Bytes = if (compressed) body.uncompress(cache = cache) else body |
67 |
} |
|
76866
19bfc64a7310
clarified signature: more explicit types (see also 90c552d28d36);
wenzelm
parents:
76865
diff
changeset
|
68 |
|
19bfc64a7310
clarified signature: more explicit types (see also 90c552d28d36);
wenzelm
parents:
76865
diff
changeset
|
69 |
object Sources { |
19bfc64a7310
clarified signature: more explicit types (see also 90c552d28d36);
wenzelm
parents:
76865
diff
changeset
|
70 |
val session_name = SQL.Column.string("session_name").make_primary_key |
19bfc64a7310
clarified signature: more explicit types (see also 90c552d28d36);
wenzelm
parents:
76865
diff
changeset
|
71 |
val name = SQL.Column.string("name").make_primary_key |
19bfc64a7310
clarified signature: more explicit types (see also 90c552d28d36);
wenzelm
parents:
76865
diff
changeset
|
72 |
val digest = SQL.Column.string("digest") |
19bfc64a7310
clarified signature: more explicit types (see also 90c552d28d36);
wenzelm
parents:
76865
diff
changeset
|
73 |
val compressed = SQL.Column.bool("compressed") |
19bfc64a7310
clarified signature: more explicit types (see also 90c552d28d36);
wenzelm
parents:
76865
diff
changeset
|
74 |
val body = SQL.Column.bytes("body") |
19bfc64a7310
clarified signature: more explicit types (see also 90c552d28d36);
wenzelm
parents:
76865
diff
changeset
|
75 |
|
19bfc64a7310
clarified signature: more explicit types (see also 90c552d28d36);
wenzelm
parents:
76865
diff
changeset
|
76 |
val table = |
19bfc64a7310
clarified signature: more explicit types (see also 90c552d28d36);
wenzelm
parents:
76865
diff
changeset
|
77 |
SQL.Table("isabelle_sources", List(session_name, name, digest, compressed, body)) |
19bfc64a7310
clarified signature: more explicit types (see also 90c552d28d36);
wenzelm
parents:
76865
diff
changeset
|
78 |
|
19bfc64a7310
clarified signature: more explicit types (see also 90c552d28d36);
wenzelm
parents:
76865
diff
changeset
|
79 |
def where_equal(session_name: String, name: String = ""): SQL.Source = |
77370 | 80 |
SQL.where( |
81 |
SQL.and( |
|
82 |
Sources.session_name.equal(session_name), |
|
83 |
if_proper(name, Sources.name.equal(name)))) |
|
76866
19bfc64a7310
clarified signature: more explicit types (see also 90c552d28d36);
wenzelm
parents:
76865
diff
changeset
|
84 |
|
76873 | 85 |
def load(session_base: Base, cache: Compress.Cache = Compress.Cache.none): Sources = |
86 |
new Sources( |
|
87 |
session_base.session_sources.foldLeft(Map.empty) { |
|
88 |
case (sources, (path, digest)) => |
|
89 |
def err(): Nothing = error("Incoherent digest for source file: " + path) |
|
76884 | 90 |
val name = File.symbolic_path(path) |
76873 | 91 |
sources.get(name) match { |
92 |
case Some(source_file) => |
|
93 |
if (source_file.digest == digest) sources else err() |
|
94 |
case None => |
|
95 |
val bytes = Bytes.read(path) |
|
96 |
if (bytes.sha1_digest == digest) { |
|
97 |
val (compressed, body) = |
|
98 |
bytes.maybe_compress(Compress.Options_Zstd(), cache = cache) |
|
99 |
val file = Source_File(name, digest, compressed, body, cache) |
|
100 |
sources + (name -> file) |
|
101 |
} |
|
102 |
else err() |
|
103 |
} |
|
104 |
}) |
|
105 |
} |
|
76866
19bfc64a7310
clarified signature: more explicit types (see also 90c552d28d36);
wenzelm
parents:
76865
diff
changeset
|
106 |
|
76873 | 107 |
class Sources private(rep: Map[String, Source_File]) extends Iterable[Source_File] { |
108 |
override def toString: String = rep.values.toList.sortBy(_.name).mkString("Sources(", ", ", ")") |
|
109 |
override def iterator: Iterator[Source_File] = rep.valuesIterator |
|
76907
c84d2b259125
more direct access to session_sources, without somewhat fragile file-system operations;
wenzelm
parents:
76888
diff
changeset
|
110 |
|
c84d2b259125
more direct access to session_sources, without somewhat fragile file-system operations;
wenzelm
parents:
76888
diff
changeset
|
111 |
def get(name: String): Option[Source_File] = rep.get(name) |
c84d2b259125
more direct access to session_sources, without somewhat fragile file-system operations;
wenzelm
parents:
76888
diff
changeset
|
112 |
def apply(name: String): Source_File = |
c84d2b259125
more direct access to session_sources, without somewhat fragile file-system operations;
wenzelm
parents:
76888
diff
changeset
|
113 |
get(name).getOrElse(error("Missing session sources entry " + quote(name))) |
76866
19bfc64a7310
clarified signature: more explicit types (see also 90c552d28d36);
wenzelm
parents:
76865
diff
changeset
|
114 |
} |
19bfc64a7310
clarified signature: more explicit types (see also 90c552d28d36);
wenzelm
parents:
76865
diff
changeset
|
115 |
|
19bfc64a7310
clarified signature: more explicit types (see also 90c552d28d36);
wenzelm
parents:
76865
diff
changeset
|
116 |
|
76597 | 117 |
/* base info */ |
67284 | 118 |
|
76654 | 119 |
object Base { |
120 |
val bootstrap: Base = Base(overall_syntax = Thy_Header.bootstrap_syntax) |
|
121 |
} |
|
122 |
||
65495 | 123 |
sealed case class Base( |
75750
2eee2fdfb6e2
clarified signature: proper session_name for Sessions.Base (like Sessions.Info);
wenzelm
parents:
75749
diff
changeset
|
124 |
session_name: String = "", |
75749 | 125 |
session_pos: Position.T = Position.none, |
75748 | 126 |
proper_session_theories: List[Document.Node.Name] = Nil, |
72600
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
127 |
document_theories: List[Document.Node.Name] = Nil, |
75740 | 128 |
loaded_theories: Graph[String, Outer_Syntax] = Graph.string, // cumulative imports |
129 |
used_theories: List[(Document.Node.Name, Options)] = Nil, // new imports |
|
76872 | 130 |
theory_load_commands: Map[String, List[Command_Span.Span]] = Map.empty, |
70740 | 131 |
known_theories: Map[String, Document.Node.Entry] = Map.empty, |
132 |
known_loaded_files: Map[String, List[Path]] = Map.empty, |
|
66720 | 133 |
overall_syntax: Outer_Syntax = Outer_Syntax.empty, |
66744 | 134 |
imported_sources: List[(Path, SHA1.Digest)] = Nil, |
75741 | 135 |
session_sources: List[(Path, SHA1.Digest)] = Nil, |
66822 | 136 |
session_graph_display: Graph_Display.Graph = Graph_Display.empty_graph, |
75393 | 137 |
errors: List[String] = Nil |
138 |
) { |
|
75885
8342cba8eae8
clarified signature: avoid constants from Sessions.Structure within Session.Base;
wenzelm
parents:
75884
diff
changeset
|
139 |
def session_entry: (String, Base) = session_name -> this |
8342cba8eae8
clarified signature: avoid constants from Sessions.Structure within Session.Base;
wenzelm
parents:
75884
diff
changeset
|
140 |
|
76661 | 141 |
override def toString: String = "Sessions.Base(" + print_body + ")" |
142 |
def print_body: String = |
|
143 |
"session_name = " + quote(session_name) + |
|
144 |
", loaded_theories = " + loaded_theories.size + |
|
145 |
", used_theories = " + used_theories.length |
|
69102
4b06a20b13b5
tuned output -- avoid bombing of Scala toplevel, e.g. for AFP deps;
wenzelm
parents:
69080
diff
changeset
|
146 |
|
77204 | 147 |
def all_sources: List[(Path, SHA1.Digest)] = imported_sources ::: session_sources |
148 |
||
76628 | 149 |
def all_document_theories: List[Document.Node.Name] = |
150 |
proper_session_theories ::: document_theories |
|
151 |
||
66717
67dbf5cdc056
more informative loaded_theories: dependencies and syntax;
wenzelm
parents:
66716
diff
changeset
|
152 |
def loaded_theory(name: String): Boolean = loaded_theories.defined(name) |
66712 | 153 |
def loaded_theory(name: Document.Node.Name): Boolean = loaded_theory(name.theory) |
65432 | 154 |
|
66717
67dbf5cdc056
more informative loaded_theories: dependencies and syntax;
wenzelm
parents:
66716
diff
changeset
|
155 |
def loaded_theory_syntax(name: String): Option[Outer_Syntax] = |
67dbf5cdc056
more informative loaded_theories: dependencies and syntax;
wenzelm
parents:
66716
diff
changeset
|
156 |
if (loaded_theory(name)) Some(loaded_theories.get_node(name)) else None |
67dbf5cdc056
more informative loaded_theories: dependencies and syntax;
wenzelm
parents:
66716
diff
changeset
|
157 |
def loaded_theory_syntax(name: Document.Node.Name): Option[Outer_Syntax] = |
67dbf5cdc056
more informative loaded_theories: dependencies and syntax;
wenzelm
parents:
66716
diff
changeset
|
158 |
loaded_theory_syntax(name.theory) |
67dbf5cdc056
more informative loaded_theories: dependencies and syntax;
wenzelm
parents:
66716
diff
changeset
|
159 |
|
72669 | 160 |
def theory_syntax(name: Document.Node.Name): Outer_Syntax = |
161 |
loaded_theory_syntax(name) getOrElse overall_syntax |
|
162 |
||
66770
122df1fde073
clarified node_syntax (amending ae38b8c0fdd9): default to overall_syntax, e.g. relevant for command spans wrt. bad header;
wenzelm
parents:
66764
diff
changeset
|
163 |
def node_syntax(nodes: Document.Nodes, name: Document.Node.Name): Outer_Syntax = |
122df1fde073
clarified node_syntax (amending ae38b8c0fdd9): default to overall_syntax, e.g. relevant for command spans wrt. bad header;
wenzelm
parents:
66764
diff
changeset
|
164 |
nodes(name).syntax orElse loaded_theory_syntax(name) getOrElse overall_syntax |
65355 | 165 |
} |
64856 | 166 |
|
76677 | 167 |
|
168 |
/* background context */ |
|
169 |
||
76656 | 170 |
sealed case class Background( |
76597 | 171 |
base: Base, |
172 |
sessions_structure: Structure = Structure.empty, |
|
173 |
errors: List[String] = Nil, |
|
174 |
infos: List[Info] = Nil |
|
175 |
) { |
|
176 |
def session_name: String = base.session_name |
|
76732 | 177 |
def info: Info = sessions_structure(session_name) |
76597 | 178 |
|
76656 | 179 |
def check_errors: Background = |
76597 | 180 |
if (errors.isEmpty) this |
181 |
else error(cat_lines(errors)) |
|
182 |
} |
|
183 |
||
76656 | 184 |
def background0(session: String): Background = |
185 |
Background(Base(session_name = session)) |
|
76597 | 186 |
|
76656 | 187 |
def background(options: Options, |
76597 | 188 |
session: String, |
189 |
progress: Progress = new Progress, |
|
190 |
dirs: List[Path] = Nil, |
|
191 |
include_sessions: List[String] = Nil, |
|
192 |
session_ancestor: Option[String] = None, |
|
193 |
session_requirements: Boolean = false |
|
76656 | 194 |
): Background = { |
76597 | 195 |
val full_sessions = load_structure(options, dirs = dirs) |
196 |
||
197 |
val selected_sessions = |
|
198 |
full_sessions.selection(Selection(sessions = session :: session_ancestor.toList)) |
|
199 |
val info = selected_sessions(session) |
|
200 |
val ancestor = session_ancestor orElse info.parent |
|
201 |
||
202 |
val (session1, infos1) = |
|
203 |
if (session_requirements && ancestor.isDefined) { |
|
204 |
val deps = Sessions.deps(selected_sessions, progress = progress) |
|
205 |
val base = deps(session) |
|
206 |
||
207 |
val ancestor_loaded = |
|
208 |
deps.get(ancestor.get) match { |
|
209 |
case Some(ancestor_base) |
|
210 |
if !selected_sessions.imports_requirements(List(ancestor.get)).contains(session) => |
|
211 |
ancestor_base.loaded_theories.defined _ |
|
212 |
case _ => |
|
213 |
error("Bad ancestor " + quote(ancestor.get) + " for session " + quote(session)) |
|
214 |
} |
|
215 |
||
216 |
val required_theories = |
|
217 |
for { |
|
218 |
thy <- base.loaded_theories.keys |
|
219 |
if !ancestor_loaded(thy) && selected_sessions.theory_qualifier(thy) != session |
|
220 |
} |
|
221 |
yield thy |
|
222 |
||
223 |
if (required_theories.isEmpty) (ancestor.get, Nil) |
|
224 |
else { |
|
225 |
val other_name = info.name + "_requirements(" + ancestor.get + ")" |
|
226 |
Isabelle_System.isabelle_tmp_prefix() |
|
227 |
||
228 |
(other_name, |
|
229 |
List( |
|
76632 | 230 |
Info.make( |
76597 | 231 |
Chapter_Defs.empty, |
232 |
info.options, |
|
76927
da13da82f6f9
treat update_options as part of Sessions.Info meta_digest, for proper re-build of updated sessions;
wenzelm
parents:
76907
diff
changeset
|
233 |
augment_options = _ => Nil, |
76597 | 234 |
dir_selected = false, |
235 |
dir = Path.explode("$ISABELLE_TMP_PREFIX"), |
|
236 |
chapter = info.chapter, |
|
237 |
Session_Entry( |
|
238 |
pos = info.pos, |
|
239 |
name = other_name, |
|
240 |
groups = info.groups, |
|
241 |
path = ".", |
|
242 |
parent = ancestor, |
|
243 |
description = "Required theory imports from other sessions", |
|
244 |
options = Nil, |
|
245 |
imports = info.deps, |
|
246 |
directories = Nil, |
|
247 |
theories = List((Nil, required_theories.map(thy => ((thy, Position.none), false)))), |
|
248 |
document_theories = Nil, |
|
249 |
document_files = Nil, |
|
250 |
export_files = Nil, |
|
251 |
export_classpath = Nil)))) |
|
252 |
} |
|
253 |
} |
|
254 |
else (session, Nil) |
|
255 |
||
256 |
val full_sessions1 = |
|
257 |
if (infos1.isEmpty) full_sessions |
|
258 |
else load_structure(options, dirs = dirs, infos = infos1) |
|
259 |
||
260 |
val selected_sessions1 = |
|
261 |
full_sessions1.selection(Selection(sessions = session1 :: session :: include_sessions)) |
|
262 |
||
263 |
val deps1 = Sessions.deps(selected_sessions1, progress = progress) |
|
264 |
||
76656 | 265 |
Background(deps1(session1), sessions_structure = full_sessions1, |
76597 | 266 |
errors = deps1.errors, infos = infos1) |
267 |
} |
|
268 |
||
269 |
||
270 |
/* source dependencies */ |
|
271 |
||
75393 | 272 |
sealed case class Deps(sessions_structure: Structure, session_bases: Map[String, Base]) { |
76656 | 273 |
def background(session: String): Background = |
274 |
Background(base = apply(session), sessions_structure = sessions_structure, errors = errors) |
|
69102
4b06a20b13b5
tuned output -- avoid bombing of Scala toplevel, e.g. for AFP deps;
wenzelm
parents:
69080
diff
changeset
|
275 |
|
76279
2d4ff8c166d2
proper Deps.is_empty (amending 77327455b00d), e.g. relevant for warning "Nothing to build";
wenzelm
parents:
76107
diff
changeset
|
276 |
def is_empty: Boolean = session_bases.keysIterator.forall(_.isEmpty) |
65463
104502de757c
more informative known_files: known_theories within the local session directory come first;
wenzelm
parents:
65461
diff
changeset
|
277 |
def apply(name: String): Base = session_bases(name) |
66988 | 278 |
def get(name: String): Option[Base] = session_bases.get(name) |
66744 | 279 |
|
77207
d98a99e4eea9
proper Shasum.digest, to emulate old form from build_history database;
wenzelm
parents:
77206
diff
changeset
|
280 |
def sources_shasum(name: String): SHA1.Shasum = { |
77204 | 281 |
val meta_info = SHA1.shasum_meta_info(sessions_structure(name).meta_digest) |
282 |
val sources = |
|
77211 | 283 |
SHA1.shasum_sorted( |
284 |
for ((path, digest) <- apply(name).all_sources) |
|
285 |
yield digest -> File.symbolic_path(path)) |
|
77214
df8d71edbc79
clarified signature, using right-associative operation;
wenzelm
parents:
77211
diff
changeset
|
286 |
meta_info ::: sources |
77204 | 287 |
} |
66571 | 288 |
|
289 |
def errors: List[String] = |
|
290 |
(for { |
|
291 |
(name, base) <- session_bases.iterator |
|
292 |
if base.errors.nonEmpty |
|
293 |
} yield cat_lines(base.errors) + |
|
75749 | 294 |
"\nThe error(s) above occurred in session " + quote(name) + Position.here(base.session_pos) |
66571 | 295 |
).toList |
296 |
||
297 |
def check_errors: Deps = |
|
298 |
errors match { |
|
299 |
case Nil => this |
|
300 |
case errs => error(cat_lines(errs)) |
|
301 |
} |
|
75774
efc25bf4b795
discontinued Export.Provider in favour of Export.Context and its derivatives;
wenzelm
parents:
75773
diff
changeset
|
302 |
|
76597 | 303 |
override def toString: String = "Sessions.Deps(" + sessions_structure + ")" |
65251 | 304 |
} |
64856 | 305 |
|
67052 | 306 |
def deps(sessions_structure: Structure, |
75393 | 307 |
progress: Progress = new Progress, |
308 |
inlined_files: Boolean = false, |
|
309 |
list_files: Boolean = false, |
|
310 |
check_keywords: Set[String] = Set.empty |
|
311 |
): Deps = { |
|
66743 | 312 |
var cache_sources = Map.empty[JFile, SHA1.Digest] |
75393 | 313 |
def check_sources(paths: List[Path]): List[(Path, SHA1.Digest)] = { |
66743 | 314 |
for { |
76866
19bfc64a7310
clarified signature: more explicit types (see also 90c552d28d36);
wenzelm
parents:
76865
diff
changeset
|
315 |
path <- paths |
66743 | 316 |
file = path.file |
317 |
if cache_sources.isDefinedAt(file) || file.isFile |
|
318 |
} |
|
319 |
yield { |
|
320 |
cache_sources.get(file) match { |
|
321 |
case Some(digest) => (path, digest) |
|
322 |
case None => |
|
323 |
val digest = SHA1.digest(file) |
|
324 |
cache_sources = cache_sources + (file -> digest) |
|
325 |
(path, digest) |
|
326 |
} |
|
327 |
} |
|
328 |
} |
|
329 |
||
65463
104502de757c
more informative known_files: known_theories within the local session directory come first;
wenzelm
parents:
65461
diff
changeset
|
330 |
val session_bases = |
77021 | 331 |
sessions_structure.imports_topological_order.foldLeft(Map(Base.bootstrap.session_entry)) { |
67023 | 332 |
case (session_bases, session_name) => |
67880 | 333 |
progress.expose_interrupt() |
65251 | 334 |
|
67024 | 335 |
val info = sessions_structure(session_name) |
65463
104502de757c
more informative known_files: known_theories within the local session directory come first;
wenzelm
parents:
65461
diff
changeset
|
336 |
try { |
72066 | 337 |
val deps_base = info.deps_base(session_bases) |
76657 | 338 |
val session_background = |
77021 | 339 |
Background(base = deps_base, sessions_structure = sessions_structure) |
76657 | 340 |
val resources = new Resources(session_background) |
65251 | 341 |
|
77521
5642de4d225d
clarified signature: manage "verbose" flag via "progress";
wenzelm
parents:
77516
diff
changeset
|
342 |
progress.echo( |
5642de4d225d
clarified signature: manage "verbose" flag via "progress";
wenzelm
parents:
77516
diff
changeset
|
343 |
"Session " + info.chapter + "/" + session_name + |
5642de4d225d
clarified signature: manage "verbose" flag via "progress";
wenzelm
parents:
77516
diff
changeset
|
344 |
if_proper(info.groups, info.groups.mkString(" (", " ", ")")), |
5642de4d225d
clarified signature: manage "verbose" flag via "progress";
wenzelm
parents:
77516
diff
changeset
|
345 |
verbose = !list_files) |
65251 | 346 |
|
69008
d55783ea6cf6
more detailed session dependencies, with conditions for theories;
wenzelm
parents:
68841
diff
changeset
|
347 |
val dependencies = resources.session_dependencies(info) |
65251 | 348 |
|
67053 | 349 |
val overall_syntax = dependencies.overall_syntax |
65251 | 350 |
|
75748 | 351 |
val proper_session_theories = |
75884
3d8b37b1d798
clarified signature: avoid object-oriented HTML_Context;
wenzelm
parents:
75791
diff
changeset
|
352 |
dependencies.theories.filter(name => |
3d8b37b1d798
clarified signature: avoid object-oriented HTML_Context;
wenzelm
parents:
75791
diff
changeset
|
353 |
sessions_structure.theory_qualifier(name) == session_name) |
72323
e36f94e2eb6b
some support for document preparation in Isabelle/Scala;
wenzelm
parents:
72068
diff
changeset
|
354 |
|
67059 | 355 |
val theory_files = dependencies.theories.map(_.path) |
72068
4768b1facec2
clarified errors: avoid hiding of import_errors/dir_errors by their consequences (file-access problems);
wenzelm
parents:
72067
diff
changeset
|
356 |
|
72816
ea4f86914cb2
support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents:
72799
diff
changeset
|
357 |
val (load_commands, load_commands_errors) = |
ea4f86914cb2
support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents:
72799
diff
changeset
|
358 |
try { if (inlined_files) (dependencies.load_commands, Nil) else (Nil, Nil) } |
72068
4768b1facec2
clarified errors: avoid hiding of import_errors/dir_errors by their consequences (file-access problems);
wenzelm
parents:
72067
diff
changeset
|
359 |
catch { case ERROR(msg) => (Nil, List(msg)) } |
65251 | 360 |
|
76872 | 361 |
val theory_load_commands = |
362 |
(for ((name, span) <- load_commands.iterator) yield name.theory -> span).toMap |
|
363 |
||
76886
f405fcc3db33
clarified signature: avoid somewhat fragile Document.Node.Name.master_dir_path;
wenzelm
parents:
76884
diff
changeset
|
364 |
val loaded_files: List[(String, List[Path])] = |
f405fcc3db33
clarified signature: avoid somewhat fragile Document.Node.Name.master_dir_path;
wenzelm
parents:
76884
diff
changeset
|
365 |
for ((name, spans) <- load_commands) yield { |
f405fcc3db33
clarified signature: avoid somewhat fragile Document.Node.Name.master_dir_path;
wenzelm
parents:
76884
diff
changeset
|
366 |
val (theory, files) = dependencies.loaded_files(name, spans) |
f405fcc3db33
clarified signature: avoid somewhat fragile Document.Node.Name.master_dir_path;
wenzelm
parents:
76884
diff
changeset
|
367 |
theory -> files.map(file => Path.explode(file.node)) |
f405fcc3db33
clarified signature: avoid somewhat fragile Document.Node.Name.master_dir_path;
wenzelm
parents:
76884
diff
changeset
|
368 |
} |
72816
ea4f86914cb2
support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents:
72799
diff
changeset
|
369 |
|
76888 | 370 |
val document_files = |
371 |
for ((path1, path2) <- info.document_files) |
|
372 |
yield info.dir + path1 + path2 |
|
373 |
||
66742 | 374 |
val session_files = |
76888 | 375 |
(theory_files ::: loaded_files.flatMap(_._2) ::: document_files).map(_.expand) |
65463
104502de757c
more informative known_files: known_theories within the local session directory come first;
wenzelm
parents:
65461
diff
changeset
|
376 |
|
67053 | 377 |
val imported_files = if (inlined_files) dependencies.imported_files else Nil |
66743 | 378 |
|
76048 | 379 |
if (list_files) { |
66742 | 380 |
progress.echo(cat_lines(session_files.map(_.implode).sorted.map(" " + _))) |
76048 | 381 |
} |
65463
104502de757c
more informative known_files: known_theories within the local session directory come first;
wenzelm
parents:
65461
diff
changeset
|
382 |
|
66719
d37efafd55b5
clarified theory syntax vs. overall session syntax;
wenzelm
parents:
66718
diff
changeset
|
383 |
if (check_keywords.nonEmpty) { |
d37efafd55b5
clarified theory syntax vs. overall session syntax;
wenzelm
parents:
66718
diff
changeset
|
384 |
Check_Keywords.check_keywords( |
66720 | 385 |
progress, overall_syntax.keywords, check_keywords, theory_files) |
66719
d37efafd55b5
clarified theory syntax vs. overall session syntax;
wenzelm
parents:
66718
diff
changeset
|
386 |
} |
65251 | 387 |
|
75393 | 388 |
val session_graph_display: Graph_Display.Graph = { |
65507
decdb95bd007
clarified session graph: collapse theories from other sessions;
wenzelm
parents:
65500
diff
changeset
|
389 |
def session_node(name: String): Graph_Display.Node = |
decdb95bd007
clarified session graph: collapse theories from other sessions;
wenzelm
parents:
65500
diff
changeset
|
390 |
Graph_Display.Node("[" + name + "]", "session." + name) |
decdb95bd007
clarified session graph: collapse theories from other sessions;
wenzelm
parents:
65500
diff
changeset
|
391 |
|
75393 | 392 |
def node(name: Document.Node.Name): Graph_Display.Node = { |
75884
3d8b37b1d798
clarified signature: avoid object-oriented HTML_Context;
wenzelm
parents:
75791
diff
changeset
|
393 |
val qualifier = sessions_structure.theory_qualifier(name) |
76048 | 394 |
if (qualifier == info.name) { |
65507
decdb95bd007
clarified session graph: collapse theories from other sessions;
wenzelm
parents:
65500
diff
changeset
|
395 |
Graph_Display.Node(name.theory_base_name, "theory." + name.theory) |
76048 | 396 |
} |
65528 | 397 |
else session_node(qualifier) |
65507
decdb95bd007
clarified session graph: collapse theories from other sessions;
wenzelm
parents:
65500
diff
changeset
|
398 |
} |
decdb95bd007
clarified session graph: collapse theories from other sessions;
wenzelm
parents:
65500
diff
changeset
|
399 |
|
70946
79d23e6436d0
clarified session_graph_display: restrict sessions to actually required theories;
wenzelm
parents:
70869
diff
changeset
|
400 |
val required_sessions = |
79d23e6436d0
clarified session_graph_display: restrict sessions to actually required theories;
wenzelm
parents:
70869
diff
changeset
|
401 |
dependencies.loaded_theories.all_preds(dependencies.theories.map(_.theory)) |
75884
3d8b37b1d798
clarified signature: avoid object-oriented HTML_Context;
wenzelm
parents:
75791
diff
changeset
|
402 |
.map(theory => sessions_structure.theory_qualifier(theory)) |
71574
95460356d633
avoid premature crash due to missing session parents/imports;
wenzelm
parents:
71569
diff
changeset
|
403 |
.filter(name => name != info.name && sessions_structure.defined(name)) |
70946
79d23e6436d0
clarified session_graph_display: restrict sessions to actually required theories;
wenzelm
parents:
70869
diff
changeset
|
404 |
|
79d23e6436d0
clarified session_graph_display: restrict sessions to actually required theories;
wenzelm
parents:
70869
diff
changeset
|
405 |
val required_subgraph = |
79d23e6436d0
clarified session_graph_display: restrict sessions to actually required theories;
wenzelm
parents:
70869
diff
changeset
|
406 |
sessions_structure.imports_graph |
79d23e6436d0
clarified session_graph_display: restrict sessions to actually required theories;
wenzelm
parents:
70869
diff
changeset
|
407 |
.restrict(sessions_structure.imports_graph.all_preds(required_sessions).toSet) |
79d23e6436d0
clarified session_graph_display: restrict sessions to actually required theories;
wenzelm
parents:
70869
diff
changeset
|
408 |
.transitive_closure |
79d23e6436d0
clarified session_graph_display: restrict sessions to actually required theories;
wenzelm
parents:
70869
diff
changeset
|
409 |
.restrict(required_sessions.toSet) |
79d23e6436d0
clarified session_graph_display: restrict sessions to actually required theories;
wenzelm
parents:
70869
diff
changeset
|
410 |
.transitive_reduction_acyclic |
65507
decdb95bd007
clarified session graph: collapse theories from other sessions;
wenzelm
parents:
65500
diff
changeset
|
411 |
|
decdb95bd007
clarified session graph: collapse theories from other sessions;
wenzelm
parents:
65500
diff
changeset
|
412 |
val graph0 = |
73359 | 413 |
required_subgraph.topological_order.foldLeft(Graph_Display.empty_graph) { |
414 |
case (g, session) => |
|
415 |
val a = session_node(session) |
|
416 |
val bs = required_subgraph.imm_preds(session).toList.map(session_node) |
|
417 |
bs.foldLeft((a :: bs).foldLeft(g)(_.default_node(_, Nil)))(_.add_edge(_, a)) |
|
418 |
} |
|
65507
decdb95bd007
clarified session graph: collapse theories from other sessions;
wenzelm
parents:
65500
diff
changeset
|
419 |
|
73359 | 420 |
dependencies.entries.foldLeft(graph0) { |
421 |
case (g, entry) => |
|
422 |
val a = node(entry.name) |
|
423 |
val bs = entry.header.imports.map(node).filterNot(_ == a) |
|
424 |
bs.foldLeft((a :: bs).foldLeft(g)(_.default_node(_, Nil)))(_.add_edge(_, a)) |
|
425 |
} |
|
65507
decdb95bd007
clarified session graph: collapse theories from other sessions;
wenzelm
parents:
65500
diff
changeset
|
426 |
} |
decdb95bd007
clarified session graph: collapse theories from other sessions;
wenzelm
parents:
65500
diff
changeset
|
427 |
|
70740 | 428 |
val known_theories = |
73359 | 429 |
dependencies.entries.iterator.map(entry => entry.name.theory -> entry). |
430 |
foldLeft(deps_base.known_theories)(_ + _) |
|
70740 | 431 |
|
72066 | 432 |
val known_loaded_files = deps_base.known_loaded_files ++ loaded_files |
66701 | 433 |
|
75393 | 434 |
val import_errors = { |
72067
17507b48b6f5
clarified errors: avoid accidental import from other session that happens to be within overall selection (notably "isabelle build -a");
wenzelm
parents:
72066
diff
changeset
|
435 |
val known_sessions = |
17507b48b6f5
clarified errors: avoid accidental import from other session that happens to be within overall selection (notably "isabelle build -a");
wenzelm
parents:
72066
diff
changeset
|
436 |
sessions_structure.imports_requirements(List(session_name)).toSet |
17507b48b6f5
clarified errors: avoid accidental import from other session that happens to be within overall selection (notably "isabelle build -a");
wenzelm
parents:
72066
diff
changeset
|
437 |
for { |
17507b48b6f5
clarified errors: avoid accidental import from other session that happens to be within overall selection (notably "isabelle build -a");
wenzelm
parents:
72066
diff
changeset
|
438 |
name <- dependencies.theories |
75884
3d8b37b1d798
clarified signature: avoid object-oriented HTML_Context;
wenzelm
parents:
75791
diff
changeset
|
439 |
qualifier = sessions_structure.theory_qualifier(name) |
72067
17507b48b6f5
clarified errors: avoid accidental import from other session that happens to be within overall selection (notably "isabelle build -a");
wenzelm
parents:
72066
diff
changeset
|
440 |
if !known_sessions(qualifier) |
17507b48b6f5
clarified errors: avoid accidental import from other session that happens to be within overall selection (notably "isabelle build -a");
wenzelm
parents:
72066
diff
changeset
|
441 |
} yield "Bad import of theory " + quote(name.toString) + |
17507b48b6f5
clarified errors: avoid accidental import from other session that happens to be within overall selection (notably "isabelle build -a");
wenzelm
parents:
72066
diff
changeset
|
442 |
": need to include sessions " + quote(qualifier) + " in ROOT" |
17507b48b6f5
clarified errors: avoid accidental import from other session that happens to be within overall selection (notably "isabelle build -a");
wenzelm
parents:
72066
diff
changeset
|
443 |
} |
17507b48b6f5
clarified errors: avoid accidental import from other session that happens to be within overall selection (notably "isabelle build -a");
wenzelm
parents:
72066
diff
changeset
|
444 |
|
72600
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
445 |
val document_errors = |
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
446 |
info.document_theories.flatMap( |
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
447 |
{ |
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
448 |
case (thy, pos) => |
74812 | 449 |
val build_hierarchy = |
72647
fd6dc1a4b9ca
more robust, e.g. for "isabelle build_doc system";
wenzelm
parents:
72634
diff
changeset
|
450 |
if (sessions_structure.build_graph.defined(session_name)) { |
74812 | 451 |
sessions_structure.build_hierarchy(session_name) |
72647
fd6dc1a4b9ca
more robust, e.g. for "isabelle build_doc system";
wenzelm
parents:
72634
diff
changeset
|
452 |
} |
fd6dc1a4b9ca
more robust, e.g. for "isabelle build_doc system";
wenzelm
parents:
72634
diff
changeset
|
453 |
else Nil |
72600
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
454 |
|
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
455 |
def err(msg: String): Option[String] = |
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
456 |
Some(msg + " " + quote(thy) + Position.here(pos)) |
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
457 |
|
72604 | 458 |
known_theories.get(thy).map(_.name) match { |
72600
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
459 |
case None => err("Unknown document theory") |
72604 | 460 |
case Some(name) => |
75884
3d8b37b1d798
clarified signature: avoid object-oriented HTML_Context;
wenzelm
parents:
75791
diff
changeset
|
461 |
val qualifier = sessions_structure.theory_qualifier(name) |
75748 | 462 |
if (proper_session_theories.contains(name)) { |
72600
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
463 |
err("Redundant document theory from this session:") |
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
464 |
} |
76627 | 465 |
else if ( |
466 |
!build_hierarchy.contains(qualifier) && |
|
467 |
!dependencies.theories.contains(name) |
|
468 |
) { |
|
469 |
err("Document theory from other session not imported properly:") |
|
470 |
} |
|
471 |
else None |
|
72600
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
472 |
} |
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
473 |
}) |
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
474 |
val document_theories = |
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
475 |
info.document_theories.map({ case (thy, _) => known_theories(thy).name }) |
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
476 |
|
75393 | 477 |
val dir_errors = { |
70681 | 478 |
val ok = info.dirs.map(_.canonical_file).toSet |
70679 | 479 |
val bad = |
480 |
(for { |
|
75748 | 481 |
name <- proper_session_theories.iterator |
76887
d8cdddf7b9a5
avoid somewhat fragile Document.Node.Name.master_dir_path;
wenzelm
parents:
76886
diff
changeset
|
482 |
path = Path.explode(name.master_dir) |
70676 | 483 |
if !ok(path.canonical_file) |
70679 | 484 |
path1 = File.relative_path(info.dir.canonical, path).getOrElse(path) |
485 |
} yield (path1, name)).toList |
|
71602 | 486 |
val bad_dirs = (for { (path1, _) <- bad } yield path1.toString).distinct.sorted |
70679 | 487 |
|
488 |
val errs1 = |
|
489 |
for { (path1, name) <- bad } |
|
490 |
yield "Implicit use of directory " + path1 + " for theory " + quote(name.toString) |
|
491 |
val errs2 = |
|
492 |
if (bad_dirs.isEmpty) Nil |
|
493 |
else List("Implicit use of session directories: " + commas(bad_dirs)) |
|
70693 | 494 |
val errs3 = for (p <- info.dirs if !p.is_dir) yield "No such directory: " + p |
70719 | 495 |
val errs4 = |
496 |
(for { |
|
75748 | 497 |
name <- proper_session_theories.iterator |
70719 | 498 |
name1 <- resources.find_theory_node(name.theory) |
499 |
if name.node != name1.node |
|
76829
f2a8ba0b8c96
more robust: avoid detour via somewhat fragile Node.Name.path;
wenzelm
parents:
76828
diff
changeset
|
500 |
} yield { |
f2a8ba0b8c96
more robust: avoid detour via somewhat fragile Node.Name.path;
wenzelm
parents:
76828
diff
changeset
|
501 |
"Incoherent theory file import:\n " + quote(name.node) + |
f2a8ba0b8c96
more robust: avoid detour via somewhat fragile Node.Name.path;
wenzelm
parents:
76828
diff
changeset
|
502 |
" vs. \n " + quote(name1.node) |
f2a8ba0b8c96
more robust: avoid detour via somewhat fragile Node.Name.path;
wenzelm
parents:
76828
diff
changeset
|
503 |
}).toList |
70693 | 504 |
|
70719 | 505 |
errs1 ::: errs2 ::: errs3 ::: errs4 |
70676 | 506 |
} |
507 |
||
66743 | 508 |
val sources_errors = |
509 |
for (p <- session_files if !p.is_file) yield "No such file: " + p |
|
66604 | 510 |
|
69904 | 511 |
val path_errors = |
512 |
try { Path.check_case_insensitive(session_files ::: imported_files); Nil } |
|
513 |
catch { case ERROR(msg) => List(msg) } |
|
514 |
||
76778
4086a0e4723b
clarified signature: internalize errors (but: the parser rarely fails);
wenzelm
parents:
76776
diff
changeset
|
515 |
val bibtex_errors = info.bibtex_entries.errors |
67297
86a099f896fc
formal check of @{cite} bibtex entries -- only in batch-mode session builds;
wenzelm
parents:
67290
diff
changeset
|
516 |
|
65463
104502de757c
more informative known_files: known_theories within the local session directory come first;
wenzelm
parents:
65461
diff
changeset
|
517 |
val base = |
66571 | 518 |
Base( |
75750
2eee2fdfb6e2
clarified signature: proper session_name for Sessions.Base (like Sessions.Info);
wenzelm
parents:
75749
diff
changeset
|
519 |
session_name = info.name, |
75749 | 520 |
session_pos = info.pos, |
75748 | 521 |
proper_session_theories = proper_session_theories, |
72600
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
522 |
document_theories = document_theories, |
67053 | 523 |
loaded_theories = dependencies.loaded_theories, |
72062 | 524 |
used_theories = dependencies.theories_adjunct, |
76872 | 525 |
theory_load_commands = theory_load_commands, |
70740 | 526 |
known_theories = known_theories, |
527 |
known_loaded_files = known_loaded_files, |
|
66720 | 528 |
overall_syntax = overall_syntax, |
66744 | 529 |
imported_sources = check_sources(imported_files), |
75741 | 530 |
session_sources = check_sources(session_files), |
66822 | 531 |
session_graph_display = session_graph_display, |
72816
ea4f86914cb2
support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents:
72799
diff
changeset
|
532 |
errors = dependencies.errors ::: load_commands_errors ::: import_errors ::: |
72600
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
533 |
document_errors ::: dir_errors ::: sources_errors ::: path_errors ::: |
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
534 |
bibtex_errors) |
65251 | 535 |
|
75885
8342cba8eae8
clarified signature: avoid constants from Sessions.Structure within Session.Base;
wenzelm
parents:
75884
diff
changeset
|
536 |
session_bases + base.session_entry |
65463
104502de757c
more informative known_files: known_theories within the local session directory come first;
wenzelm
parents:
65461
diff
changeset
|
537 |
} |
104502de757c
more informative known_files: known_theories within the local session directory come first;
wenzelm
parents:
65461
diff
changeset
|
538 |
catch { |
104502de757c
more informative known_files: known_theories within the local session directory come first;
wenzelm
parents:
65461
diff
changeset
|
539 |
case ERROR(msg) => |
104502de757c
more informative known_files: known_theories within the local session directory come first;
wenzelm
parents:
65461
diff
changeset
|
540 |
cat_error(msg, "The error(s) above occurred in session " + |
65519 | 541 |
quote(info.name) + Position.here(info.pos)) |
65463
104502de757c
more informative known_files: known_theories within the local session directory come first;
wenzelm
parents:
65461
diff
changeset
|
542 |
} |
73359 | 543 |
} |
65251 | 544 |
|
70686
9cde8c4ea5a5
discontinued obsolete "isabelle imports" and all_known data;
wenzelm
parents:
70685
diff
changeset
|
545 |
Deps(sessions_structure, session_bases) |
65372
b722ee40c26c
refer to global_theories from all sessions, before selection;
wenzelm
parents:
65371
diff
changeset
|
546 |
} |
65251 | 547 |
|
66963 | 548 |
|
65415
8cd54b18b68b
clarified signature: tree structure is not essential;
wenzelm
parents:
65410
diff
changeset
|
549 |
/* cumulative session info */ |
62631 | 550 |
|
75999
b831a0bdd751
clarified signature of Sessions.Session: chapter_defs: vs. known_chapters (in declaration order) vs. chapters (covered by visible sessions);
wenzelm
parents:
75998
diff
changeset
|
551 |
sealed case class Chapter_Info( |
b831a0bdd751
clarified signature of Sessions.Session: chapter_defs: vs. known_chapters (in declaration order) vs. chapters (covered by visible sessions);
wenzelm
parents:
75998
diff
changeset
|
552 |
name: String, |
b831a0bdd751
clarified signature of Sessions.Session: chapter_defs: vs. known_chapters (in declaration order) vs. chapters (covered by visible sessions);
wenzelm
parents:
75998
diff
changeset
|
553 |
pos: Position.T, |
76005
a9bbf075f431
include groups from 'chapter_definition' in session info, based on the state of chapter_defs after processing all ROOT files (thus the declaration order does not matter);
wenzelm
parents:
76002
diff
changeset
|
554 |
groups: List[String], |
75999
b831a0bdd751
clarified signature of Sessions.Session: chapter_defs: vs. known_chapters (in declaration order) vs. chapters (covered by visible sessions);
wenzelm
parents:
75998
diff
changeset
|
555 |
description: String, |
b831a0bdd751
clarified signature of Sessions.Session: chapter_defs: vs. known_chapters (in declaration order) vs. chapters (covered by visible sessions);
wenzelm
parents:
75998
diff
changeset
|
556 |
sessions: List[String] |
b831a0bdd751
clarified signature of Sessions.Session: chapter_defs: vs. known_chapters (in declaration order) vs. chapters (covered by visible sessions);
wenzelm
parents:
75998
diff
changeset
|
557 |
) |
b831a0bdd751
clarified signature of Sessions.Session: chapter_defs: vs. known_chapters (in declaration order) vs. chapters (covered by visible sessions);
wenzelm
parents:
75998
diff
changeset
|
558 |
|
76632 | 559 |
object Info { |
560 |
def make( |
|
561 |
chapter_defs: Chapter_Defs, |
|
562 |
options: Options, |
|
76927
da13da82f6f9
treat update_options as part of Sessions.Info meta_digest, for proper re-build of updated sessions;
wenzelm
parents:
76907
diff
changeset
|
563 |
augment_options: String => List[Options.Spec], |
76632 | 564 |
dir_selected: Boolean, |
565 |
dir: Path, |
|
566 |
chapter: String, |
|
567 |
entry: Session_Entry |
|
568 |
): Info = { |
|
569 |
try { |
|
570 |
val name = entry.name |
|
571 |
||
572 |
if (illegal_session(name)) error("Illegal session name " + quote(name)) |
|
573 |
if (is_pure(name) && entry.parent.isDefined) error("Illegal parent session") |
|
574 |
if (!is_pure(name) && !entry.parent.isDefined) error("Missing parent session") |
|
575 |
||
576 |
val session_path = dir + Path.explode(entry.path) |
|
577 |
val directories = entry.directories.map(dir => session_path + Path.explode(dir)) |
|
578 |
||
76927
da13da82f6f9
treat update_options as part of Sessions.Info meta_digest, for proper re-build of updated sessions;
wenzelm
parents:
76907
diff
changeset
|
579 |
val entry_options = entry.options ::: augment_options(name) |
da13da82f6f9
treat update_options as part of Sessions.Info meta_digest, for proper re-build of updated sessions;
wenzelm
parents:
76907
diff
changeset
|
580 |
val session_options = options ++ entry_options |
76632 | 581 |
|
582 |
val theories = |
|
583 |
entry.theories.map({ case (opts, thys) => |
|
584 |
(session_options ++ opts, |
|
585 |
thys.map({ case ((thy, pos), _) => |
|
586 |
val thy_name = Thy_Header.import_name(thy) |
|
587 |
if (illegal_theory(thy_name)) { |
|
588 |
error("Illegal theory name " + quote(thy_name) + Position.here(pos)) |
|
589 |
} |
|
590 |
else (thy, pos) })) }) |
|
591 |
||
592 |
val global_theories = |
|
593 |
for { (_, thys) <- entry.theories; ((thy, pos), global) <- thys if global } |
|
594 |
yield { |
|
595 |
val thy_name = Path.explode(thy).file_name |
|
596 |
if (Long_Name.is_qualified(thy_name)) { |
|
597 |
error("Bad qualified name for global theory " + |
|
598 |
quote(thy_name) + Position.here(pos)) |
|
599 |
} |
|
600 |
else thy_name |
|
601 |
} |
|
602 |
||
603 |
val conditions = |
|
604 |
theories.flatMap(thys => space_explode(',', thys._1.string("condition"))).distinct.sorted. |
|
605 |
map(x => (x, Isabelle_System.getenv(x) != "")) |
|
606 |
||
607 |
val document_files = |
|
608 |
entry.document_files.map({ case (s1, s2) => (Path.explode(s1), Path.explode(s2)) }) |
|
609 |
||
610 |
val export_files = |
|
611 |
entry.export_files.map({ case (dir, prune, pats) => (Path.explode(dir), prune, pats) }) |
|
612 |
||
613 |
val meta_digest = |
|
614 |
SHA1.digest( |
|
76927
da13da82f6f9
treat update_options as part of Sessions.Info meta_digest, for proper re-build of updated sessions;
wenzelm
parents:
76907
diff
changeset
|
615 |
(name, chapter, entry.parent, entry.directories, entry_options, entry.imports, |
76632 | 616 |
entry.theories_no_position, conditions, entry.document_theories_no_position, |
617 |
entry.document_files) |
|
618 |
.toString) |
|
619 |
||
620 |
val chapter_groups = chapter_defs(chapter).groups |
|
621 |
val groups = chapter_groups ::: entry.groups.filterNot(chapter_groups.contains) |
|
622 |
||
623 |
Info(name, chapter, dir_selected, entry.pos, groups, session_path, |
|
624 |
entry.parent, entry.description, directories, session_options, |
|
625 |
entry.imports, theories, global_theories, entry.document_theories, document_files, |
|
626 |
export_files, entry.export_classpath, meta_digest) |
|
627 |
} |
|
628 |
catch { |
|
629 |
case ERROR(msg) => |
|
630 |
error(msg + "\nThe error(s) above occurred in session entry " + |
|
631 |
quote(entry.name) + Position.here(entry.pos)) |
|
632 |
} |
|
633 |
} |
|
634 |
} |
|
635 |
||
62631 | 636 |
sealed case class Info( |
65519 | 637 |
name: String, |
62631 | 638 |
chapter: String, |
66829 | 639 |
dir_selected: Boolean, |
62631 | 640 |
pos: Position.T, |
641 |
groups: List[String], |
|
642 |
dir: Path, |
|
643 |
parent: Option[String], |
|
644 |
description: String, |
|
70681 | 645 |
directories: List[Path], |
62631 | 646 |
options: Options, |
65420
695d4e22345a
support for static session imports, without affect build hierarchy;
wenzelm
parents:
65419
diff
changeset
|
647 |
imports: List[String], |
65517 | 648 |
theories: List[(Options, List[(String, Position.T)])], |
65374 | 649 |
global_theories: List[String], |
72600
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
650 |
document_theories: List[(String, Position.T)], |
62631 | 651 |
document_files: List[(Path, Path)], |
69671 | 652 |
export_files: List[(Path, Int, List[String])], |
75679
aa89255b704c
support for classpath artifacts within session structure:
wenzelm
parents:
75672
diff
changeset
|
653 |
export_classpath: List[String], |
75393 | 654 |
meta_digest: SHA1.Digest |
655 |
) { |
|
66828 | 656 |
def deps: List[String] = parent.toList ::: imports |
657 |
||
75393 | 658 |
def deps_base(session_bases: String => Base): Base = { |
72066 | 659 |
val parent_base = session_bases(parent.getOrElse("")) |
660 |
val imports_bases = imports.map(session_bases) |
|
661 |
parent_base.copy( |
|
662 |
known_theories = |
|
73359 | 663 |
(for { |
664 |
base <- imports_bases.iterator |
|
665 |
(_, entry) <- base.known_theories.iterator |
|
666 |
} yield (entry.name.theory -> entry)).foldLeft(parent_base.known_theories)(_ + _), |
|
72066 | 667 |
known_loaded_files = |
73359 | 668 |
imports_bases.iterator.map(_.known_loaded_files). |
669 |
foldLeft(parent_base.known_loaded_files)(_ ++ _)) |
|
72066 | 670 |
} |
671 |
||
70681 | 672 |
def dirs: List[Path] = dir :: directories |
70668 | 673 |
|
76492
e228be7cd375
clarified GUI.Selector, with support for separator as pseudo-entry;
wenzelm
parents:
76351
diff
changeset
|
674 |
def main_group: Boolean = groups.contains("main") |
e228be7cd375
clarified GUI.Selector, with support for separator as pseudo-entry;
wenzelm
parents:
76351
diff
changeset
|
675 |
def doc_group: Boolean = groups.contains("doc") |
e228be7cd375
clarified GUI.Selector, with support for separator as pseudo-entry;
wenzelm
parents:
76351
diff
changeset
|
676 |
|
73701 | 677 |
def timeout_ignored: Boolean = |
678 |
!options.bool("timeout_build") || Time.seconds(options.real("timeout")) < Time.ms(1) |
|
679 |
||
62631 | 680 |
def timeout: Time = Time.seconds(options.real("timeout") * options.real("timeout_scale")) |
67297
86a099f896fc
formal check of @{cite} bibtex entries -- only in batch-mode session builds;
wenzelm
parents:
67290
diff
changeset
|
681 |
|
72574
d892f6d66402
build documents in Isabelle/Scala, based on generated tex files as session exports;
wenzelm
parents:
72571
diff
changeset
|
682 |
def document_enabled: Boolean = |
d892f6d66402
build documents in Isabelle/Scala, based on generated tex files as session exports;
wenzelm
parents:
72571
diff
changeset
|
683 |
options.string("document") match { |
d892f6d66402
build documents in Isabelle/Scala, based on generated tex files as session exports;
wenzelm
parents:
72571
diff
changeset
|
684 |
case "" | "false" => false |
73826
72900f34dbb3
allow system option short form NAME for NAME=true for type string, not just bool;
wenzelm
parents:
73815
diff
changeset
|
685 |
case "pdf" | "true" => true |
72574
d892f6d66402
build documents in Isabelle/Scala, based on generated tex files as session exports;
wenzelm
parents:
72571
diff
changeset
|
686 |
case doc => error("Bad document specification " + quote(doc)) |
d892f6d66402
build documents in Isabelle/Scala, based on generated tex files as session exports;
wenzelm
parents:
72571
diff
changeset
|
687 |
} |
d892f6d66402
build documents in Isabelle/Scala, based on generated tex files as session exports;
wenzelm
parents:
72571
diff
changeset
|
688 |
|
75393 | 689 |
def document_variants: List[Document_Build.Document_Variant] = { |
72574
d892f6d66402
build documents in Isabelle/Scala, based on generated tex files as session exports;
wenzelm
parents:
72571
diff
changeset
|
690 |
val variants = |
77218 | 691 |
space_explode(':', options.string("document_variants")). |
73718 | 692 |
map(Document_Build.Document_Variant.parse) |
72649 | 693 |
|
694 |
val dups = Library.duplicates(variants.map(_.name)) |
|
72574
d892f6d66402
build documents in Isabelle/Scala, based on generated tex files as session exports;
wenzelm
parents:
72571
diff
changeset
|
695 |
if (dups.nonEmpty) error("Duplicate document variants: " + commas_quote(dups)) |
d892f6d66402
build documents in Isabelle/Scala, based on generated tex files as session exports;
wenzelm
parents:
72571
diff
changeset
|
696 |
|
72649 | 697 |
variants |
698 |
} |
|
699 |
||
75902 | 700 |
def document_echo: Boolean = options.bool("document_echo") |
701 |
||
75393 | 702 |
def documents: List[Document_Build.Document_Variant] = { |
72672 | 703 |
val variants = document_variants |
72574
d892f6d66402
build documents in Isabelle/Scala, based on generated tex files as session exports;
wenzelm
parents:
72571
diff
changeset
|
704 |
if (!document_enabled || document_files.isEmpty) Nil else variants |
d892f6d66402
build documents in Isabelle/Scala, based on generated tex files as session exports;
wenzelm
parents:
72571
diff
changeset
|
705 |
} |
d892f6d66402
build documents in Isabelle/Scala, based on generated tex files as session exports;
wenzelm
parents:
72571
diff
changeset
|
706 |
|
d892f6d66402
build documents in Isabelle/Scala, based on generated tex files as session exports;
wenzelm
parents:
72571
diff
changeset
|
707 |
def document_output: Option[Path] = |
d892f6d66402
build documents in Isabelle/Scala, based on generated tex files as session exports;
wenzelm
parents:
72571
diff
changeset
|
708 |
options.string("document_output") match { |
d892f6d66402
build documents in Isabelle/Scala, based on generated tex files as session exports;
wenzelm
parents:
72571
diff
changeset
|
709 |
case "" => None |
d892f6d66402
build documents in Isabelle/Scala, based on generated tex files as session exports;
wenzelm
parents:
72571
diff
changeset
|
710 |
case s => Some(dir + Path.explode(s)) |
d892f6d66402
build documents in Isabelle/Scala, based on generated tex files as session exports;
wenzelm
parents:
72571
diff
changeset
|
711 |
} |
d892f6d66402
build documents in Isabelle/Scala, based on generated tex files as session exports;
wenzelm
parents:
72571
diff
changeset
|
712 |
|
72648 | 713 |
def browser_info: Boolean = options.bool("browser_info") |
714 |
||
76776 | 715 |
lazy val bibtex_entries: Bibtex.Entries = |
76778
4086a0e4723b
clarified signature: internalize errors (but: the parser rarely fails);
wenzelm
parents:
76776
diff
changeset
|
716 |
(for { |
4086a0e4723b
clarified signature: internalize errors (but: the parser rarely fails);
wenzelm
parents:
76776
diff
changeset
|
717 |
(document_dir, file) <- document_files.iterator |
4086a0e4723b
clarified signature: internalize errors (but: the parser rarely fails);
wenzelm
parents:
76776
diff
changeset
|
718 |
if File.is_bib(file.file_name) |
4086a0e4723b
clarified signature: internalize errors (but: the parser rarely fails);
wenzelm
parents:
76776
diff
changeset
|
719 |
} yield { |
4086a0e4723b
clarified signature: internalize errors (but: the parser rarely fails);
wenzelm
parents:
76776
diff
changeset
|
720 |
val path = dir + document_dir + file |
77030
d7dc5b1e4381
proper positions for Isabelle/ML, instead of Isabelle/Scala;
wenzelm
parents:
77029
diff
changeset
|
721 |
Bibtex.Entries.parse(File.read(path), start = Token.Pos.file(File.standard_path(path))) |
76778
4086a0e4723b
clarified signature: internalize errors (but: the parser rarely fails);
wenzelm
parents:
76776
diff
changeset
|
722 |
}).foldRight(Bibtex.Entries.empty)(_ ::: _) |
70859
6e6254bbce1f
split into standard partitions, for improved scalability;
wenzelm
parents:
70796
diff
changeset
|
723 |
|
70869 | 724 |
def record_proofs: Boolean = options.int("record_proofs") >= 2 |
725 |
||
70859
6e6254bbce1f
split into standard partitions, for improved scalability;
wenzelm
parents:
70796
diff
changeset
|
726 |
def is_afp: Boolean = chapter == AFP.chapter |
6e6254bbce1f
split into standard partitions, for improved scalability;
wenzelm
parents:
70796
diff
changeset
|
727 |
def is_afp_bulky: Boolean = is_afp && groups.exists(AFP.groups_bulky.contains) |
62631 | 728 |
} |
729 |
||
75393 | 730 |
object Selection { |
65422 | 731 |
val empty: Selection = Selection() |
65525 | 732 |
val all: Selection = Selection(all_sessions = true) |
70788 | 733 |
def session(session: String): Selection = Selection(sessions = List(session)) |
65419 | 734 |
} |
735 |
||
736 |
sealed case class Selection( |
|
737 |
requirements: Boolean = false, |
|
738 |
all_sessions: Boolean = false, |
|
66737
2edc0c42c883
option -B for "isabelle build" and "isabelle imports";
wenzelm
parents:
66736
diff
changeset
|
739 |
base_sessions: List[String] = Nil, |
65419 | 740 |
exclude_session_groups: List[String] = Nil, |
741 |
exclude_sessions: List[String] = Nil, |
|
742 |
session_groups: List[String] = Nil, |
|
75393 | 743 |
sessions: List[String] = Nil |
744 |
) { |
|
66736 | 745 |
def ++ (other: Selection): Selection = |
65422 | 746 |
Selection( |
747 |
requirements = requirements || other.requirements, |
|
748 |
all_sessions = all_sessions || other.all_sessions, |
|
66737
2edc0c42c883
option -B for "isabelle build" and "isabelle imports";
wenzelm
parents:
66736
diff
changeset
|
749 |
base_sessions = Library.merge(base_sessions, other.base_sessions), |
66736 | 750 |
exclude_session_groups = Library.merge(exclude_session_groups, other.exclude_session_groups), |
751 |
exclude_sessions = Library.merge(exclude_sessions, other.exclude_sessions), |
|
752 |
session_groups = Library.merge(session_groups, other.session_groups), |
|
753 |
sessions = Library.merge(sessions, other.sessions)) |
|
65419 | 754 |
} |
755 |
||
75393 | 756 |
object Structure { |
76631 | 757 |
val empty: Structure = make(Options.empty) |
758 |
||
759 |
def make( |
|
760 |
options: Options, |
|
76927
da13da82f6f9
treat update_options as part of Sessions.Info meta_digest, for proper re-build of updated sessions;
wenzelm
parents:
76907
diff
changeset
|
761 |
augment_options: String => List[Options.Spec] = _ => Nil, |
76631 | 762 |
roots: List[Root_File] = Nil, |
763 |
infos: List[Info] = Nil |
|
764 |
): Structure = { |
|
765 |
val chapter_defs: Chapter_Defs = |
|
766 |
roots.foldLeft(Chapter_Defs.empty) { |
|
767 |
case (defs1, root) => |
|
768 |
root.entries.foldLeft(defs1) { |
|
769 |
case (defs2, entry: Chapter_Def) => defs2 + entry |
|
770 |
case (defs2, _) => defs2 |
|
771 |
} |
|
772 |
} |
|
72858
cb0c407fbc6e
added "isabelle log": print messages from build database;
wenzelm
parents:
72855
diff
changeset
|
773 |
|
76631 | 774 |
val root_infos = { |
775 |
var chapter = UNSORTED |
|
76635 | 776 |
val root_infos = new mutable.ListBuffer[Info] |
76631 | 777 |
for (root <- roots) { |
778 |
root.entries.foreach { |
|
779 |
case entry: Chapter_Entry => chapter = entry.name |
|
780 |
case entry: Session_Entry => |
|
76927
da13da82f6f9
treat update_options as part of Sessions.Info meta_digest, for proper re-build of updated sessions;
wenzelm
parents:
76907
diff
changeset
|
781 |
root_infos += |
da13da82f6f9
treat update_options as part of Sessions.Info meta_digest, for proper re-build of updated sessions;
wenzelm
parents:
76907
diff
changeset
|
782 |
Info.make(chapter_defs, options, augment_options, |
da13da82f6f9
treat update_options as part of Sessions.Info meta_digest, for proper re-build of updated sessions;
wenzelm
parents:
76907
diff
changeset
|
783 |
root.select, root.dir, chapter, entry) |
76631 | 784 |
case _ => |
785 |
} |
|
786 |
chapter = UNSORTED |
|
787 |
} |
|
76635 | 788 |
root_infos.toList |
76631 | 789 |
} |
790 |
||
791 |
val info_graph = |
|
792 |
(root_infos ::: infos).foldLeft(Graph.string[Info]) { |
|
793 |
case (graph, info) => |
|
794 |
if (graph.defined(info.name)) { |
|
795 |
error("Duplicate session " + quote(info.name) + Position.here(info.pos) + |
|
796 |
Position.here(graph.get_node(info.name).pos)) |
|
797 |
} |
|
798 |
else graph.new_node(info.name, info) |
|
799 |
} |
|
800 |
||
76630 | 801 |
def augment_graph( |
75393 | 802 |
graph: Graph[String, Info], |
803 |
kind: String, |
|
804 |
edges: Info => Iterable[String] |
|
805 |
) : Graph[String, Info] = { |
|
806 |
def add_edge(pos: Position.T, name: String, g: Graph[String, Info], parent: String) = { |
|
76048 | 807 |
if (!g.defined(parent)) { |
72855 | 808 |
error("Bad " + kind + " session " + quote(parent) + " for " + |
809 |
quote(name) + Position.here(pos)) |
|
76048 | 810 |
} |
65420
695d4e22345a
support for static session imports, without affect build hierarchy;
wenzelm
parents:
65419
diff
changeset
|
811 |
|
72855 | 812 |
try { g.add_edge_acyclic(parent, name) } |
813 |
catch { |
|
814 |
case exn: Graph.Cycles[_] => |
|
815 |
error(cat_lines(exn.cycles.map(cycle => |
|
816 |
"Cyclic session dependency of " + |
|
817 |
cycle.map(c => quote(c.toString)).mkString(" via "))) + Position.here(pos)) |
|
818 |
} |
|
819 |
} |
|
73359 | 820 |
graph.iterator.foldLeft(graph) { |
821 |
case (g, (name, (info, _))) => |
|
822 |
edges(info).foldLeft(g)(add_edge(info.pos, name, _, _)) |
|
65420
695d4e22345a
support for static session imports, without affect build hierarchy;
wenzelm
parents:
65419
diff
changeset
|
823 |
} |
695d4e22345a
support for static session imports, without affect build hierarchy;
wenzelm
parents:
65419
diff
changeset
|
824 |
} |
695d4e22345a
support for static session imports, without affect build hierarchy;
wenzelm
parents:
65419
diff
changeset
|
825 |
|
76630 | 826 |
val build_graph = augment_graph(info_graph, "parent", _.parent) |
827 |
val imports_graph = augment_graph(build_graph, "imports", _.imports) |
|
62631 | 828 |
|
72855 | 829 |
val session_positions: List[(String, Position.T)] = |
830 |
(for ((name, (info, _)) <- info_graph.iterator) yield (name, info.pos)).toList |
|
70683
8c7706b053c7
find theory files via session structure: much faster Prover IDE startup;
wenzelm
parents:
70681
diff
changeset
|
831 |
|
72855 | 832 |
val session_directories: Map[JFile, String] = |
73359 | 833 |
(for { |
834 |
session <- imports_graph.topological_order.iterator |
|
835 |
info = info_graph.get_node(session) |
|
836 |
dir <- info.dirs.iterator |
|
837 |
} yield (info, dir)).foldLeft(Map.empty[JFile, String]) { |
|
838 |
case (dirs, (info, dir)) => |
|
72855 | 839 |
val session = info.name |
840 |
val canonical_dir = dir.canonical_file |
|
841 |
dirs.get(canonical_dir) match { |
|
842 |
case Some(session1) => |
|
843 |
val info1 = info_graph.get_node(session1) |
|
844 |
error("Duplicate use of directory " + dir + |
|
845 |
"\n for session " + quote(session1) + Position.here(info1.pos) + |
|
846 |
"\n vs. session " + quote(session) + Position.here(info.pos)) |
|
847 |
case None => dirs + (canonical_dir -> session) |
|
848 |
} |
|
73359 | 849 |
} |
70671
cb1776c8e216
clarified signature: retain global session information, unaffected by later restriction;
wenzelm
parents:
70668
diff
changeset
|
850 |
|
72855 | 851 |
val global_theories: Map[String, String] = |
73359 | 852 |
(for { |
853 |
session <- imports_graph.topological_order.iterator |
|
854 |
info = info_graph.get_node(session) |
|
855 |
thy <- info.global_theories.iterator } |
|
76630 | 856 |
yield (info, thy) |
857 |
).foldLeft(Thy_Header.bootstrap_global_theories.toMap) { |
|
73359 | 858 |
case (global, (info, thy)) => |
72855 | 859 |
val qualifier = info.name |
860 |
global.get(thy) match { |
|
861 |
case Some(qualifier1) if qualifier != qualifier1 => |
|
862 |
error("Duplicate global theory " + quote(thy) + Position.here(info.pos)) |
|
863 |
case _ => global + (thy -> qualifier) |
|
864 |
} |
|
73359 | 865 |
} |
70671
cb1776c8e216
clarified signature: retain global session information, unaffected by later restriction;
wenzelm
parents:
70668
diff
changeset
|
866 |
|
75986
27d98da31985
support 'chapter_definition' with description for presentation purposes;
wenzelm
parents:
75984
diff
changeset
|
867 |
new Structure(chapter_defs, session_positions, session_directories, |
27d98da31985
support 'chapter_definition' with description for presentation purposes;
wenzelm
parents:
75984
diff
changeset
|
868 |
global_theories, build_graph, imports_graph) |
72855 | 869 |
} |
62631 | 870 |
} |
871 |
||
67052 | 872 |
final class Structure private[Sessions]( |
75999
b831a0bdd751
clarified signature of Sessions.Session: chapter_defs: vs. known_chapters (in declaration order) vs. chapters (covered by visible sessions);
wenzelm
parents:
75998
diff
changeset
|
873 |
chapter_defs: Chapter_Defs, |
75393 | 874 |
val session_positions: List[(String, Position.T)], |
875 |
val session_directories: Map[JFile, String], |
|
876 |
val global_theories: Map[String, String], |
|
877 |
val build_graph: Graph[String, Info], |
|
878 |
val imports_graph: Graph[String, Info] |
|
879 |
) { |
|
69524
fa94f2b2a877
clarified sessions_deps, according to Isabelle/MMT usage;
wenzelm
parents:
69393
diff
changeset
|
880 |
sessions_structure => |
fa94f2b2a877
clarified sessions_deps, according to Isabelle/MMT usage;
wenzelm
parents:
69393
diff
changeset
|
881 |
|
70683
8c7706b053c7
find theory files via session structure: much faster Prover IDE startup;
wenzelm
parents:
70681
diff
changeset
|
882 |
def dest_session_directories: List[(String, String)] = |
8c7706b053c7
find theory files via session structure: much faster Prover IDE startup;
wenzelm
parents:
70681
diff
changeset
|
883 |
for ((file, session) <- session_directories.toList) |
8c7706b053c7
find theory files via session structure: much faster Prover IDE startup;
wenzelm
parents:
70681
diff
changeset
|
884 |
yield (File.standard_path(file), session) |
8c7706b053c7
find theory files via session structure: much faster Prover IDE startup;
wenzelm
parents:
70681
diff
changeset
|
885 |
|
75999
b831a0bdd751
clarified signature of Sessions.Session: chapter_defs: vs. known_chapters (in declaration order) vs. chapters (covered by visible sessions);
wenzelm
parents:
75998
diff
changeset
|
886 |
lazy val known_chapters: List[Chapter_Info] = { |
b831a0bdd751
clarified signature of Sessions.Session: chapter_defs: vs. known_chapters (in declaration order) vs. chapters (covered by visible sessions);
wenzelm
parents:
75998
diff
changeset
|
887 |
val chapter_sessions = |
b831a0bdd751
clarified signature of Sessions.Session: chapter_defs: vs. known_chapters (in declaration order) vs. chapters (covered by visible sessions);
wenzelm
parents:
75998
diff
changeset
|
888 |
Multi_Map.from( |
b831a0bdd751
clarified signature of Sessions.Session: chapter_defs: vs. known_chapters (in declaration order) vs. chapters (covered by visible sessions);
wenzelm
parents:
75998
diff
changeset
|
889 |
for ((_, (info, _)) <- build_graph.iterator) |
b831a0bdd751
clarified signature of Sessions.Session: chapter_defs: vs. known_chapters (in declaration order) vs. chapters (covered by visible sessions);
wenzelm
parents:
75998
diff
changeset
|
890 |
yield info.chapter -> info.name) |
b831a0bdd751
clarified signature of Sessions.Session: chapter_defs: vs. known_chapters (in declaration order) vs. chapters (covered by visible sessions);
wenzelm
parents:
75998
diff
changeset
|
891 |
val chapters1 = |
b831a0bdd751
clarified signature of Sessions.Session: chapter_defs: vs. known_chapters (in declaration order) vs. chapters (covered by visible sessions);
wenzelm
parents:
75998
diff
changeset
|
892 |
(for (entry <- chapter_defs.list.iterator) yield { |
b831a0bdd751
clarified signature of Sessions.Session: chapter_defs: vs. known_chapters (in declaration order) vs. chapters (covered by visible sessions);
wenzelm
parents:
75998
diff
changeset
|
893 |
val sessions = chapter_sessions.get_list(entry.name) |
76005
a9bbf075f431
include groups from 'chapter_definition' in session info, based on the state of chapter_defs after processing all ROOT files (thus the declaration order does not matter);
wenzelm
parents:
76002
diff
changeset
|
894 |
Chapter_Info(entry.name, entry.pos, entry.groups, entry.description, sessions.sorted) |
75999
b831a0bdd751
clarified signature of Sessions.Session: chapter_defs: vs. known_chapters (in declaration order) vs. chapters (covered by visible sessions);
wenzelm
parents:
75998
diff
changeset
|
895 |
}).toList |
b831a0bdd751
clarified signature of Sessions.Session: chapter_defs: vs. known_chapters (in declaration order) vs. chapters (covered by visible sessions);
wenzelm
parents:
75998
diff
changeset
|
896 |
val chapters2 = |
b831a0bdd751
clarified signature of Sessions.Session: chapter_defs: vs. known_chapters (in declaration order) vs. chapters (covered by visible sessions);
wenzelm
parents:
75998
diff
changeset
|
897 |
(for { |
b831a0bdd751
clarified signature of Sessions.Session: chapter_defs: vs. known_chapters (in declaration order) vs. chapters (covered by visible sessions);
wenzelm
parents:
75998
diff
changeset
|
898 |
(name, sessions) <- chapter_sessions.iterator_list |
b831a0bdd751
clarified signature of Sessions.Session: chapter_defs: vs. known_chapters (in declaration order) vs. chapters (covered by visible sessions);
wenzelm
parents:
75998
diff
changeset
|
899 |
if !chapters1.exists(_.name == name) |
76005
a9bbf075f431
include groups from 'chapter_definition' in session info, based on the state of chapter_defs after processing all ROOT files (thus the declaration order does not matter);
wenzelm
parents:
76002
diff
changeset
|
900 |
} yield Chapter_Info(name, Position.none, Nil, "", sessions.sorted)).toList.sortBy(_.name) |
75999
b831a0bdd751
clarified signature of Sessions.Session: chapter_defs: vs. known_chapters (in declaration order) vs. chapters (covered by visible sessions);
wenzelm
parents:
75998
diff
changeset
|
901 |
chapters1 ::: chapters2 |
b831a0bdd751
clarified signature of Sessions.Session: chapter_defs: vs. known_chapters (in declaration order) vs. chapters (covered by visible sessions);
wenzelm
parents:
75998
diff
changeset
|
902 |
} |
b831a0bdd751
clarified signature of Sessions.Session: chapter_defs: vs. known_chapters (in declaration order) vs. chapters (covered by visible sessions);
wenzelm
parents:
75998
diff
changeset
|
903 |
|
76002 | 904 |
def relevant_chapters: List[Chapter_Info] = known_chapters.filter(_.sessions.nonEmpty) |
69762
58fb0d779583
support for session information via virtual file-system;
wenzelm
parents:
69671
diff
changeset
|
905 |
|
66823 | 906 |
def build_graph_display: Graph_Display.Graph = Graph_Display.make_graph(build_graph) |
907 |
def imports_graph_display: Graph_Display.Graph = Graph_Display.make_graph(imports_graph) |
|
908 |
||
67025
961285f581e6
clarifified selection: always wrt. build_graph structure;
wenzelm
parents:
67024
diff
changeset
|
909 |
def defined(name: String): Boolean = imports_graph.defined(name) |
65420
695d4e22345a
support for static session imports, without affect build hierarchy;
wenzelm
parents:
65419
diff
changeset
|
910 |
def apply(name: String): Info = imports_graph.get_node(name) |
67025
961285f581e6
clarifified selection: always wrt. build_graph structure;
wenzelm
parents:
67024
diff
changeset
|
911 |
def get(name: String): Option[Info] = if (defined(name)) Some(apply(name)) else None |
62631 | 912 |
|
70859
6e6254bbce1f
split into standard partitions, for improved scalability;
wenzelm
parents:
70796
diff
changeset
|
913 |
def theory_qualifier(name: String): String = |
6e6254bbce1f
split into standard partitions, for improved scalability;
wenzelm
parents:
70796
diff
changeset
|
914 |
global_theories.getOrElse(name, Long_Name.qualifier(name)) |
75884
3d8b37b1d798
clarified signature: avoid object-oriented HTML_Context;
wenzelm
parents:
75791
diff
changeset
|
915 |
def theory_qualifier(name: Document.Node.Name): String = theory_qualifier(name.theory) |
70859
6e6254bbce1f
split into standard partitions, for improved scalability;
wenzelm
parents:
70796
diff
changeset
|
916 |
|
75393 | 917 |
def check_sessions(names: List[String]): Unit = { |
71601 | 918 |
val bad_sessions = SortedSet(names.filterNot(defined): _*).toList |
76048 | 919 |
if (bad_sessions.nonEmpty) { |
68542 | 920 |
error("Undefined session(s): " + commas_quote(bad_sessions)) |
76048 | 921 |
} |
68542 | 922 |
} |
923 |
||
68733 | 924 |
def check_sessions(sel: Selection): Unit = |
925 |
check_sessions(sel.base_sessions ::: sel.exclude_sessions ::: sel.sessions) |
|
926 |
||
75393 | 927 |
private def selected(graph: Graph[String, Info], sel: Selection): List[String] = { |
68733 | 928 |
check_sessions(sel) |
929 |
||
68732 | 930 |
val select_group = sel.session_groups.toSet |
68734
c14a2cc9b5ef
isabelle build options -c -x -B refer to imports_graph;
wenzelm
parents:
68733
diff
changeset
|
931 |
val select_session = sel.sessions.toSet ++ imports_graph.all_succs(sel.base_sessions) |
68732 | 932 |
|
933 |
val selected0 = |
|
934 |
if (sel.all_sessions) graph.keys |
|
935 |
else { |
|
936 |
(for { |
|
937 |
(name, (info, _)) <- graph.iterator |
|
74810 | 938 |
if info.dir_selected || select_session(name) || info.groups.exists(select_group) |
68732 | 939 |
} yield name).toList |
940 |
} |
|
941 |
||
942 |
if (sel.requirements) (graph.all_preds(selected0).toSet -- selected0).toList |
|
943 |
else selected0 |
|
944 |
} |
|
945 |
||
75393 | 946 |
def selection(sel: Selection): Structure = { |
68733 | 947 |
check_sessions(sel) |
67025
961285f581e6
clarifified selection: always wrt. build_graph structure;
wenzelm
parents:
67024
diff
changeset
|
948 |
|
75393 | 949 |
val excluded = { |
68732 | 950 |
val exclude_group = sel.exclude_session_groups.toSet |
951 |
val exclude_group_sessions = |
|
952 |
(for { |
|
68734
c14a2cc9b5ef
isabelle build options -c -x -B refer to imports_graph;
wenzelm
parents:
68733
diff
changeset
|
953 |
(name, (info, _)) <- imports_graph.iterator |
76599 | 954 |
if info.groups.exists(exclude_group) |
68732 | 955 |
} yield name).toList |
68734
c14a2cc9b5ef
isabelle build options -c -x -B refer to imports_graph;
wenzelm
parents:
68733
diff
changeset
|
956 |
imports_graph.all_succs(exclude_group_sessions ::: sel.exclude_sessions).toSet |
68732 | 957 |
} |
67027 | 958 |
|
75393 | 959 |
def restrict(graph: Graph[String, Info]): Graph[String, Info] = { |
68732 | 960 |
val sessions = graph.all_preds(selected(graph, sel)).filterNot(excluded) |
67029 | 961 |
graph.restrict(graph.all_preds(sessions).toSet) |
67025
961285f581e6
clarifified selection: always wrt. build_graph structure;
wenzelm
parents:
67024
diff
changeset
|
962 |
} |
961285f581e6
clarifified selection: always wrt. build_graph structure;
wenzelm
parents:
67024
diff
changeset
|
963 |
|
75986
27d98da31985
support 'chapter_definition' with description for presentation purposes;
wenzelm
parents:
75984
diff
changeset
|
964 |
new Structure(chapter_defs, session_positions, session_directories, global_theories, |
70683
8c7706b053c7
find theory files via session structure: much faster Prover IDE startup;
wenzelm
parents:
70681
diff
changeset
|
965 |
restrict(build_graph), restrict(imports_graph)) |
62631 | 966 |
} |
967 |
||
72571 | 968 |
def selection(session: String): Structure = selection(Selection.session(session)) |
969 |
||
69524
fa94f2b2a877
clarified sessions_deps, according to Isabelle/MMT usage;
wenzelm
parents:
69393
diff
changeset
|
970 |
def selection_deps( |
fa94f2b2a877
clarified sessions_deps, according to Isabelle/MMT usage;
wenzelm
parents:
69393
diff
changeset
|
971 |
selection: Selection, |
71726
a5fda30edae2
clarified signature: more uniform treatment of stopped/interrupted state;
wenzelm
parents:
71642
diff
changeset
|
972 |
progress: Progress = new Progress, |
69524
fa94f2b2a877
clarified sessions_deps, according to Isabelle/MMT usage;
wenzelm
parents:
69393
diff
changeset
|
973 |
loading_sessions: Boolean = false, |
77521
5642de4d225d
clarified signature: manage "verbose" flag via "progress";
wenzelm
parents:
77516
diff
changeset
|
974 |
inlined_files: Boolean = false |
75393 | 975 |
): Deps = { |
69524
fa94f2b2a877
clarified sessions_deps, according to Isabelle/MMT usage;
wenzelm
parents:
69393
diff
changeset
|
976 |
val deps = |
70869 | 977 |
Sessions.deps(sessions_structure.selection(selection), |
77521
5642de4d225d
clarified signature: manage "verbose" flag via "progress";
wenzelm
parents:
77516
diff
changeset
|
978 |
progress = progress, inlined_files = inlined_files) |
69524
fa94f2b2a877
clarified sessions_deps, according to Isabelle/MMT usage;
wenzelm
parents:
69393
diff
changeset
|
979 |
|
fa94f2b2a877
clarified sessions_deps, according to Isabelle/MMT usage;
wenzelm
parents:
69393
diff
changeset
|
980 |
if (loading_sessions) { |
fa94f2b2a877
clarified sessions_deps, according to Isabelle/MMT usage;
wenzelm
parents:
69393
diff
changeset
|
981 |
val selection_size = deps.sessions_structure.build_graph.size |
fa94f2b2a877
clarified sessions_deps, according to Isabelle/MMT usage;
wenzelm
parents:
69393
diff
changeset
|
982 |
if (selection_size > 1) progress.echo("Loading " + selection_size + " sessions ...") |
fa94f2b2a877
clarified sessions_deps, according to Isabelle/MMT usage;
wenzelm
parents:
69393
diff
changeset
|
983 |
} |
fa94f2b2a877
clarified sessions_deps, according to Isabelle/MMT usage;
wenzelm
parents:
69393
diff
changeset
|
984 |
|
fa94f2b2a877
clarified sessions_deps, according to Isabelle/MMT usage;
wenzelm
parents:
69393
diff
changeset
|
985 |
deps |
68304 | 986 |
} |
987 |
||
75760
f8be63d2ec6f
more robust build_hierarchy: support Resources.empty / Sessions.Structure.empty (required for Build_Job.print_log);
wenzelm
parents:
75759
diff
changeset
|
988 |
def build_hierarchy(session: String): List[String] = |
f8be63d2ec6f
more robust build_hierarchy: support Resources.empty / Sessions.Structure.empty (required for Build_Job.print_log);
wenzelm
parents:
75759
diff
changeset
|
989 |
if (build_graph.defined(session)) build_graph.all_preds(List(session)) |
f8be63d2ec6f
more robust build_hierarchy: support Resources.empty / Sessions.Structure.empty (required for Build_Job.print_log);
wenzelm
parents:
75759
diff
changeset
|
990 |
else List(session) |
f8be63d2ec6f
more robust build_hierarchy: support Resources.empty / Sessions.Structure.empty (required for Build_Job.print_log);
wenzelm
parents:
75759
diff
changeset
|
991 |
|
68732 | 992 |
def build_selection(sel: Selection): List[String] = selected(build_graph, sel) |
67029 | 993 |
def build_descendants(ss: List[String]): List[String] = build_graph.all_succs(ss) |
72065
11dc8929832d
clarified order --- proper sorting of requirements;
wenzelm
parents:
72064
diff
changeset
|
994 |
def build_requirements(ss: List[String]): List[String] = build_graph.all_preds_rev(ss) |
67029 | 995 |
def build_topological_order: List[String] = build_graph.topological_order |
62631 | 996 |
|
68732 | 997 |
def imports_selection(sel: Selection): List[String] = selected(imports_graph, sel) |
67029 | 998 |
def imports_descendants(ss: List[String]): List[String] = imports_graph.all_succs(ss) |
72065
11dc8929832d
clarified order --- proper sorting of requirements;
wenzelm
parents:
72064
diff
changeset
|
999 |
def imports_requirements(ss: List[String]): List[String] = imports_graph.all_preds_rev(ss) |
67029 | 1000 |
def imports_topological_order: List[String] = imports_graph.topological_order |
65420
695d4e22345a
support for static session imports, without affect build hierarchy;
wenzelm
parents:
65419
diff
changeset
|
1001 |
|
695d4e22345a
support for static session imports, without affect build hierarchy;
wenzelm
parents:
65419
diff
changeset
|
1002 |
override def toString: String = |
67052 | 1003 |
imports_graph.keys_iterator.mkString("Sessions.Structure(", ", ", ")") |
62631 | 1004 |
} |
1005 |
||
1006 |
||
1007 |
/* parser */ |
|
1008 |
||
75986
27d98da31985
support 'chapter_definition' with description for presentation purposes;
wenzelm
parents:
75984
diff
changeset
|
1009 |
private val CHAPTER_DEFINITION = "chapter_definition" |
62631 | 1010 |
private val CHAPTER = "chapter" |
1011 |
private val SESSION = "session" |
|
1012 |
private val DESCRIPTION = "description" |
|
70668 | 1013 |
private val DIRECTORIES = "directories" |
62631 | 1014 |
private val OPTIONS = "options" |
65420
695d4e22345a
support for static session imports, without affect build hierarchy;
wenzelm
parents:
65419
diff
changeset
|
1015 |
private val SESSIONS = "sessions" |
62631 | 1016 |
private val THEORIES = "theories" |
65374 | 1017 |
private val GLOBAL = "global" |
72600
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
1018 |
private val DOCUMENT_THEORIES = "document_theories" |
62631 | 1019 |
private val DOCUMENT_FILES = "document_files" |
68292 | 1020 |
private val EXPORT_FILES = "export_files" |
75679
aa89255b704c
support for classpath artifacts within session structure:
wenzelm
parents:
75672
diff
changeset
|
1021 |
private val EXPORT_CLASSPATH = "export_classpath" |
62631 | 1022 |
|
71601 | 1023 |
val root_syntax: Outer_Syntax = |
76614 | 1024 |
Outer_Syntax.empty + "(" + ")" + "+" + "," + "=" + "[" + "]" + "in" + |
1025 |
GLOBAL + |
|
75986
27d98da31985
support 'chapter_definition' with description for presentation purposes;
wenzelm
parents:
75984
diff
changeset
|
1026 |
(CHAPTER_DEFINITION, Keyword.THY_DECL) + |
63443 | 1027 |
(CHAPTER, Keyword.THY_DECL) + |
1028 |
(SESSION, Keyword.THY_DECL) + |
|
1029 |
(DESCRIPTION, Keyword.QUASI_COMMAND) + |
|
70668 | 1030 |
(DIRECTORIES, Keyword.QUASI_COMMAND) + |
63443 | 1031 |
(OPTIONS, Keyword.QUASI_COMMAND) + |
65420
695d4e22345a
support for static session imports, without affect build hierarchy;
wenzelm
parents:
65419
diff
changeset
|
1032 |
(SESSIONS, Keyword.QUASI_COMMAND) + |
63443 | 1033 |
(THEORIES, Keyword.QUASI_COMMAND) + |
72600
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
1034 |
(DOCUMENT_THEORIES, Keyword.QUASI_COMMAND) + |
68292 | 1035 |
(DOCUMENT_FILES, Keyword.QUASI_COMMAND) + |
75679
aa89255b704c
support for classpath artifacts within session structure:
wenzelm
parents:
75672
diff
changeset
|
1036 |
(EXPORT_FILES, Keyword.QUASI_COMMAND) + |
aa89255b704c
support for classpath artifacts within session structure:
wenzelm
parents:
75672
diff
changeset
|
1037 |
(EXPORT_CLASSPATH, Keyword.QUASI_COMMAND) |
62631 | 1038 |
|
66818
5bc903a60932
clarified signature: public access to ROOT file syntax;
wenzelm
parents:
66780
diff
changeset
|
1039 |
abstract class Entry |
76005
a9bbf075f431
include groups from 'chapter_definition' in session info, based on the state of chapter_defs after processing all ROOT files (thus the declaration order does not matter);
wenzelm
parents:
76002
diff
changeset
|
1040 |
object Chapter_Def { |
a9bbf075f431
include groups from 'chapter_definition' in session info, based on the state of chapter_defs after processing all ROOT files (thus the declaration order does not matter);
wenzelm
parents:
76002
diff
changeset
|
1041 |
def empty(chapter: String): Chapter_Def = Chapter_Def(Position.none, chapter, Nil, "") |
a9bbf075f431
include groups from 'chapter_definition' in session info, based on the state of chapter_defs after processing all ROOT files (thus the declaration order does not matter);
wenzelm
parents:
76002
diff
changeset
|
1042 |
} |
a9bbf075f431
include groups from 'chapter_definition' in session info, based on the state of chapter_defs after processing all ROOT files (thus the declaration order does not matter);
wenzelm
parents:
76002
diff
changeset
|
1043 |
sealed case class Chapter_Def( |
a9bbf075f431
include groups from 'chapter_definition' in session info, based on the state of chapter_defs after processing all ROOT files (thus the declaration order does not matter);
wenzelm
parents:
76002
diff
changeset
|
1044 |
pos: Position.T, |
a9bbf075f431
include groups from 'chapter_definition' in session info, based on the state of chapter_defs after processing all ROOT files (thus the declaration order does not matter);
wenzelm
parents:
76002
diff
changeset
|
1045 |
name: String, |
a9bbf075f431
include groups from 'chapter_definition' in session info, based on the state of chapter_defs after processing all ROOT files (thus the declaration order does not matter);
wenzelm
parents:
76002
diff
changeset
|
1046 |
groups: List[String], |
a9bbf075f431
include groups from 'chapter_definition' in session info, based on the state of chapter_defs after processing all ROOT files (thus the declaration order does not matter);
wenzelm
parents:
76002
diff
changeset
|
1047 |
description: String |
a9bbf075f431
include groups from 'chapter_definition' in session info, based on the state of chapter_defs after processing all ROOT files (thus the declaration order does not matter);
wenzelm
parents:
76002
diff
changeset
|
1048 |
) extends Entry |
75984 | 1049 |
sealed case class Chapter_Entry(name: String) extends Entry |
66818
5bc903a60932
clarified signature: public access to ROOT file syntax;
wenzelm
parents:
66780
diff
changeset
|
1050 |
sealed case class Session_Entry( |
5bc903a60932
clarified signature: public access to ROOT file syntax;
wenzelm
parents:
66780
diff
changeset
|
1051 |
pos: Position.T, |
5bc903a60932
clarified signature: public access to ROOT file syntax;
wenzelm
parents:
66780
diff
changeset
|
1052 |
name: String, |
5bc903a60932
clarified signature: public access to ROOT file syntax;
wenzelm
parents:
66780
diff
changeset
|
1053 |
groups: List[String], |
5bc903a60932
clarified signature: public access to ROOT file syntax;
wenzelm
parents:
66780
diff
changeset
|
1054 |
path: String, |
5bc903a60932
clarified signature: public access to ROOT file syntax;
wenzelm
parents:
66780
diff
changeset
|
1055 |
parent: Option[String], |
5bc903a60932
clarified signature: public access to ROOT file syntax;
wenzelm
parents:
66780
diff
changeset
|
1056 |
description: String, |
5bc903a60932
clarified signature: public access to ROOT file syntax;
wenzelm
parents:
66780
diff
changeset
|
1057 |
options: List[Options.Spec], |
5bc903a60932
clarified signature: public access to ROOT file syntax;
wenzelm
parents:
66780
diff
changeset
|
1058 |
imports: List[String], |
70681 | 1059 |
directories: List[String], |
66818
5bc903a60932
clarified signature: public access to ROOT file syntax;
wenzelm
parents:
66780
diff
changeset
|
1060 |
theories: List[(List[Options.Spec], List[((String, Position.T), Boolean)])], |
72600
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
1061 |
document_theories: List[(String, Position.T)], |
68292 | 1062 |
document_files: List[(String, String)], |
75679
aa89255b704c
support for classpath artifacts within session structure:
wenzelm
parents:
75672
diff
changeset
|
1063 |
export_files: List[(String, Int, List[String])], |
aa89255b704c
support for classpath artifacts within session structure:
wenzelm
parents:
75672
diff
changeset
|
1064 |
export_classpath: List[String] |
75393 | 1065 |
) extends Entry { |
66818
5bc903a60932
clarified signature: public access to ROOT file syntax;
wenzelm
parents:
66780
diff
changeset
|
1066 |
def theories_no_position: List[(List[Options.Spec], List[(String, Boolean)])] = |
5bc903a60932
clarified signature: public access to ROOT file syntax;
wenzelm
parents:
66780
diff
changeset
|
1067 |
theories.map({ case (a, b) => (a, b.map({ case ((c, _), d) => (c, d) })) }) |
72666
945cee776e79
proper meta_digest: avoid non-portable position information;
wenzelm
parents:
72653
diff
changeset
|
1068 |
def document_theories_no_position: List[String] = |
945cee776e79
proper meta_digest: avoid non-portable position information;
wenzelm
parents:
72653
diff
changeset
|
1069 |
document_theories.map(_._1) |
66818
5bc903a60932
clarified signature: public access to ROOT file syntax;
wenzelm
parents:
66780
diff
changeset
|
1070 |
} |
5bc903a60932
clarified signature: public access to ROOT file syntax;
wenzelm
parents:
66780
diff
changeset
|
1071 |
|
75986
27d98da31985
support 'chapter_definition' with description for presentation purposes;
wenzelm
parents:
75984
diff
changeset
|
1072 |
object Chapter_Defs { |
27d98da31985
support 'chapter_definition' with description for presentation purposes;
wenzelm
parents:
75984
diff
changeset
|
1073 |
val empty: Chapter_Defs = new Chapter_Defs(Nil) |
27d98da31985
support 'chapter_definition' with description for presentation purposes;
wenzelm
parents:
75984
diff
changeset
|
1074 |
} |
27d98da31985
support 'chapter_definition' with description for presentation purposes;
wenzelm
parents:
75984
diff
changeset
|
1075 |
|
27d98da31985
support 'chapter_definition' with description for presentation purposes;
wenzelm
parents:
75984
diff
changeset
|
1076 |
class Chapter_Defs private(rev_list: List[Chapter_Def]) { |
27d98da31985
support 'chapter_definition' with description for presentation purposes;
wenzelm
parents:
75984
diff
changeset
|
1077 |
def list: List[Chapter_Def] = rev_list.reverse |
27d98da31985
support 'chapter_definition' with description for presentation purposes;
wenzelm
parents:
75984
diff
changeset
|
1078 |
|
27d98da31985
support 'chapter_definition' with description for presentation purposes;
wenzelm
parents:
75984
diff
changeset
|
1079 |
override def toString: String = |
27d98da31985
support 'chapter_definition' with description for presentation purposes;
wenzelm
parents:
75984
diff
changeset
|
1080 |
list.map(_.name).mkString("Chapter_Defs(", ", ", ")") |
27d98da31985
support 'chapter_definition' with description for presentation purposes;
wenzelm
parents:
75984
diff
changeset
|
1081 |
|
75996 | 1082 |
def get(chapter: String): Option[Chapter_Def] = |
75986
27d98da31985
support 'chapter_definition' with description for presentation purposes;
wenzelm
parents:
75984
diff
changeset
|
1083 |
rev_list.find(_.name == chapter) |
27d98da31985
support 'chapter_definition' with description for presentation purposes;
wenzelm
parents:
75984
diff
changeset
|
1084 |
|
76005
a9bbf075f431
include groups from 'chapter_definition' in session info, based on the state of chapter_defs after processing all ROOT files (thus the declaration order does not matter);
wenzelm
parents:
76002
diff
changeset
|
1085 |
def apply(chapter: String): Chapter_Def = |
a9bbf075f431
include groups from 'chapter_definition' in session info, based on the state of chapter_defs after processing all ROOT files (thus the declaration order does not matter);
wenzelm
parents:
76002
diff
changeset
|
1086 |
get(chapter) getOrElse Chapter_Def.empty(chapter) |
a9bbf075f431
include groups from 'chapter_definition' in session info, based on the state of chapter_defs after processing all ROOT files (thus the declaration order does not matter);
wenzelm
parents:
76002
diff
changeset
|
1087 |
|
75996 | 1088 |
def + (entry: Chapter_Def): Chapter_Defs = |
75997 | 1089 |
get(entry.name) match { |
1090 |
case None => new Chapter_Defs(entry :: rev_list) |
|
1091 |
case Some(old_entry) => |
|
1092 |
error("Duplicate chapter definition " + quote(entry.name) + |
|
1093 |
Position.here(old_entry.pos) + Position.here(entry.pos)) |
|
75986
27d98da31985
support 'chapter_definition' with description for presentation purposes;
wenzelm
parents:
75984
diff
changeset
|
1094 |
} |
27d98da31985
support 'chapter_definition' with description for presentation purposes;
wenzelm
parents:
75984
diff
changeset
|
1095 |
} |
27d98da31985
support 'chapter_definition' with description for presentation purposes;
wenzelm
parents:
75984
diff
changeset
|
1096 |
|
75405 | 1097 |
private object Parsers extends Options.Parsers { |
76005
a9bbf075f431
include groups from 'chapter_definition' in session info, based on the state of chapter_defs after processing all ROOT files (thus the declaration order does not matter);
wenzelm
parents:
76002
diff
changeset
|
1098 |
private val groups: Parser[List[String]] = |
a9bbf075f431
include groups from 'chapter_definition' in session info, based on the state of chapter_defs after processing all ROOT files (thus the declaration order does not matter);
wenzelm
parents:
76002
diff
changeset
|
1099 |
($$$("(") ~! (rep1(name) <~ $$$(")")) ^^ { case _ ~ x => x }) | success(Nil) |
a9bbf075f431
include groups from 'chapter_definition' in session info, based on the state of chapter_defs after processing all ROOT files (thus the declaration order does not matter);
wenzelm
parents:
76002
diff
changeset
|
1100 |
|
75998 | 1101 |
private val description: Parser[String] = |
1102 |
($$$(DESCRIPTION) ~! text ^^ { case _ ~ x => x }) | success("") |
|
1103 |
||
75986
27d98da31985
support 'chapter_definition' with description for presentation purposes;
wenzelm
parents:
75984
diff
changeset
|
1104 |
private val chapter_def: Parser[Chapter_Def] = |
76005
a9bbf075f431
include groups from 'chapter_definition' in session info, based on the state of chapter_defs after processing all ROOT files (thus the declaration order does not matter);
wenzelm
parents:
76002
diff
changeset
|
1105 |
command(CHAPTER_DEFINITION) ~! (position(chapter_name) ~ groups ~ description) ^^ |
a9bbf075f431
include groups from 'chapter_definition' in session info, based on the state of chapter_defs after processing all ROOT files (thus the declaration order does not matter);
wenzelm
parents:
76002
diff
changeset
|
1106 |
{ case _ ~ ((a, pos) ~ b ~ c) => Chapter_Def(pos, a, b, c) } |
75986
27d98da31985
support 'chapter_definition' with description for presentation purposes;
wenzelm
parents:
75984
diff
changeset
|
1107 |
|
27d98da31985
support 'chapter_definition' with description for presentation purposes;
wenzelm
parents:
75984
diff
changeset
|
1108 |
private val chapter_entry: Parser[Chapter_Entry] = |
75984 | 1109 |
command(CHAPTER) ~! chapter_name ^^ { case _ ~ a => Chapter_Entry(a) } |
62631 | 1110 |
|
75393 | 1111 |
private val session_entry: Parser[Session_Entry] = { |
62631 | 1112 |
val option = |
67210 | 1113 |
option_name ~ opt($$$("=") ~! option_value ^^ { case _ ~ x => x }) ^^ |
1114 |
{ case x ~ y => (x, y) } |
|
62631 | 1115 |
val options = $$$("[") ~> rep1sep(option, $$$(",")) <~ $$$("]") |
1116 |
||
65374 | 1117 |
val theory_entry = |
70668 | 1118 |
position(theory_name) ~ opt_keyword(GLOBAL) ^^ { case x ~ y => (x, y) } |
65374 | 1119 |
|
62631 | 1120 |
val theories = |
65374 | 1121 |
$$$(THEORIES) ~! |
66970
13857f49d215
clarified ROOT syntax: 'sessions' and 'theories' are optional, but need to be non-empty;
wenzelm
parents:
66969
diff
changeset
|
1122 |
((options | success(Nil)) ~ rep1(theory_entry)) ^^ |
65374 | 1123 |
{ case _ ~ (x ~ y) => (x, y) } |
62631 | 1124 |
|
72600
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
1125 |
val document_theories = |
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
1126 |
$$$(DOCUMENT_THEORIES) ~! rep1(position(name)) ^^ { case _ ~ x => x } |
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
1127 |
|
62631 | 1128 |
val document_files = |
76614 | 1129 |
$$$(DOCUMENT_FILES) ~! (in_path_parens("document") ~ rep1(path)) ^^ |
1130 |
{ case _ ~ (x ~ y) => y.map((x, _)) } |
|
68292 | 1131 |
|
69671 | 1132 |
val prune = $$$("[") ~! (nat ~ $$$("]")) ^^ { case _ ~ (x ~ _) => x } | success(0) |
1133 |
||
68292 | 1134 |
val export_files = |
76614 | 1135 |
$$$(EXPORT_FILES) ~! (in_path_parens("export") ~ prune ~ rep1(embedded)) ^^ |
69671 | 1136 |
{ case _ ~ (x ~ y ~ z) => (x, y, z) } |
62631 | 1137 |
|
75679
aa89255b704c
support for classpath artifacts within session structure:
wenzelm
parents:
75672
diff
changeset
|
1138 |
val export_classpath = |
aa89255b704c
support for classpath artifacts within session structure:
wenzelm
parents:
75672
diff
changeset
|
1139 |
$$$(EXPORT_CLASSPATH) ~! (rep1(embedded) | success(List("*:classpath/*.jar"))) ^^ |
aa89255b704c
support for classpath artifacts within session structure:
wenzelm
parents:
75672
diff
changeset
|
1140 |
{ case _ ~ x => x } |
aa89255b704c
support for classpath artifacts within session structure:
wenzelm
parents:
75672
diff
changeset
|
1141 |
|
62631 | 1142 |
command(SESSION) ~! |
76614 | 1143 |
(position(session_name) ~ groups ~ in_path(".") ~ |
62631 | 1144 |
($$$("=") ~! |
75998 | 1145 |
(opt(session_name ~! $$$("+") ^^ { case x ~ _ => x }) ~ description ~ |
62631 | 1146 |
(($$$(OPTIONS) ~! options ^^ { case _ ~ x => x }) | success(Nil)) ~ |
66970
13857f49d215
clarified ROOT syntax: 'sessions' and 'theories' are optional, but need to be non-empty;
wenzelm
parents:
66969
diff
changeset
|
1147 |
(($$$(SESSIONS) ~! rep1(session_name) ^^ { case _ ~ x => x }) | success(Nil)) ~ |
70681 | 1148 |
(($$$(DIRECTORIES) ~! rep1(path) ^^ { case _ ~ x => x }) | success(Nil)) ~ |
66970
13857f49d215
clarified ROOT syntax: 'sessions' and 'theories' are optional, but need to be non-empty;
wenzelm
parents:
66969
diff
changeset
|
1149 |
rep(theories) ~ |
72600
2fa4f25d9d07
official support for document theories from other sessions;
wenzelm
parents:
72574
diff
changeset
|
1150 |
(opt(document_theories) ^^ (x => x.getOrElse(Nil))) ~ |
68292 | 1151 |
(rep(document_files) ^^ (x => x.flatten)) ~ |
75679
aa89255b704c
support for classpath artifacts within session structure:
wenzelm
parents:
75672
diff
changeset
|
1152 |
rep(export_files) ~ |
aa89255b704c
support for classpath artifacts within session structure:
wenzelm
parents:
75672
diff
changeset
|
1153 |
opt(export_classpath)))) ^^ |
aa89255b704c
support for classpath artifacts within session structure:
wenzelm
parents:
75672
diff
changeset
|
1154 |
{ case _ ~ ((a, pos) ~ b ~ c ~ (_ ~ (d ~ e ~ f ~ g ~ h ~ i ~ j ~ k ~ l ~ m))) => |
aa89255b704c
support for classpath artifacts within session structure:
wenzelm
parents:
75672
diff
changeset
|
1155 |
Session_Entry(pos, a, b, c, d, e, f, g, h, i, j, k, l, m.getOrElse(Nil)) } |
62631 | 1156 |
} |
1157 |
||
75393 | 1158 |
def parse_root(path: Path): List[Entry] = { |
66764
006deaf5c3dc
process ROOT files only once, which allows duplicate (or overlapping) session root directories;
wenzelm
parents:
66759
diff
changeset
|
1159 |
val toks = Token.explode(root_syntax.keywords, File.read(path)) |
006deaf5c3dc
process ROOT files only once, which allows duplicate (or overlapping) session root directories;
wenzelm
parents:
66759
diff
changeset
|
1160 |
val start = Token.Pos.file(path.implode) |
75986
27d98da31985
support 'chapter_definition' with description for presentation purposes;
wenzelm
parents:
75984
diff
changeset
|
1161 |
val parser: Parser[Entry] = chapter_def | chapter_entry | session_entry |
27d98da31985
support 'chapter_definition' with description for presentation purposes;
wenzelm
parents:
75984
diff
changeset
|
1162 |
parse_all(rep(parser), Token.reader(toks, start)) match { |
66818
5bc903a60932
clarified signature: public access to ROOT file syntax;
wenzelm
parents:
66780
diff
changeset
|
1163 |
case Success(result, _) => result |
66764
006deaf5c3dc
process ROOT files only once, which allows duplicate (or overlapping) session root directories;
wenzelm
parents:
66759
diff
changeset
|
1164 |
case bad => error(bad.toString) |
62631 | 1165 |
} |
1166 |
} |
|
1167 |
} |
|
1168 |
||
75405 | 1169 |
def parse_root(path: Path): List[Entry] = Parsers.parse_root(path) |
66819 | 1170 |
|
1171 |
def parse_root_entries(path: Path): List[Session_Entry] = |
|
76789 | 1172 |
Parsers.parse_root(path).flatMap(Library.as_subclass(classOf[Session_Entry])) |
66818
5bc903a60932
clarified signature: public access to ROOT file syntax;
wenzelm
parents:
66780
diff
changeset
|
1173 |
|
75393 | 1174 |
def parse_roots(roots: Path): List[String] = { |
66818
5bc903a60932
clarified signature: public access to ROOT file syntax;
wenzelm
parents:
66780
diff
changeset
|
1175 |
for { |
5bc903a60932
clarified signature: public access to ROOT file syntax;
wenzelm
parents:
66780
diff
changeset
|
1176 |
line <- split_lines(File.read(roots)) |
5bc903a60932
clarified signature: public access to ROOT file syntax;
wenzelm
parents:
66780
diff
changeset
|
1177 |
if !(line == "" || line.startsWith("#")) |
5bc903a60932
clarified signature: public access to ROOT file syntax;
wenzelm
parents:
66780
diff
changeset
|
1178 |
} yield line |
5bc903a60932
clarified signature: public access to ROOT file syntax;
wenzelm
parents:
66780
diff
changeset
|
1179 |
} |
5bc903a60932
clarified signature: public access to ROOT file syntax;
wenzelm
parents:
66780
diff
changeset
|
1180 |
|
62631 | 1181 |
|
62635 | 1182 |
/* load sessions from certain directories */ |
62631 | 1183 |
|
73814
c8b4a4f69068
clarified check (refining fc828f64da5b): etc/settings or etc/components is not strictly required according to "init_component", and notable components only have session ROOTS (e.g. AFP/thys);
wenzelm
parents:
73718
diff
changeset
|
1184 |
def is_session_dir(dir: Path): Boolean = |
62631 | 1185 |
(dir + ROOT).is_file || (dir + ROOTS).is_file |
1186 |
||
75297
fc4d07587695
more robust errors -- on foreground process instead of background server;
wenzelm
parents:
74812
diff
changeset
|
1187 |
def check_session_dir(dir: Path): Path = |
65468
c41791ad75c3
early check and normalization of session directory, e.g. relevant for path information passed to ML process, which may have a different CWD;
wenzelm
parents:
65463
diff
changeset
|
1188 |
if (is_session_dir(dir)) File.pwd() + dir.expand |
76549 | 1189 |
else { |
1190 |
error("Bad session root directory: " + dir.expand.toString + |
|
1191 |
"\n (missing \"ROOT\" or \"ROOTS\")") |
|
1192 |
} |
|
62631 | 1193 |
|
75393 | 1194 |
def directories(dirs: List[Path], select_dirs: List[Path]): List[(Boolean, Path)] = { |
73815 | 1195 |
val default_dirs = Components.directories().filter(is_session_dir) |
68746
f95e2f145ea5
canonical session directories in correspondence to Known.files;
wenzelm
parents:
68734
diff
changeset
|
1196 |
for { (select, dir) <- (default_dirs ::: dirs).map((false, _)) ::: select_dirs.map((true, _)) } |
f95e2f145ea5
canonical session directories in correspondence to Known.files;
wenzelm
parents:
68734
diff
changeset
|
1197 |
yield (select, dir.canonical) |
65561 | 1198 |
} |
1199 |
||
76629 | 1200 |
sealed case class Root_File(path: Path, select: Boolean) { |
1201 |
val key: JFile = path.canonical_file |
|
1202 |
def dir: Path = path.dir |
|
1203 |
||
1204 |
lazy val entries: List[Entry] = Parsers.parse_root(path) |
|
1205 |
} |
|
1206 |
||
1207 |
def load_root_files( |
|
66968
9991671c98aa
allow to augment session context via explicit session infos;
wenzelm
parents:
66967
diff
changeset
|
1208 |
dirs: List[Path] = Nil, |
76629 | 1209 |
select_dirs: List[Path] = Nil |
1210 |
): List[Root_File] = { |
|
1211 |
def load_dir(select: Boolean, dir: Path): List[Root_File] = |
|
62635 | 1212 |
load_root(select, dir) ::: load_roots(select, dir) |
62631 | 1213 |
|
76629 | 1214 |
def load_root(select: Boolean, dir: Path): List[Root_File] = { |
66764
006deaf5c3dc
process ROOT files only once, which allows duplicate (or overlapping) session root directories;
wenzelm
parents:
66759
diff
changeset
|
1215 |
val root = dir + ROOT |
76629 | 1216 |
if (root.is_file) List(Root_File(root, select)) else Nil |
66764
006deaf5c3dc
process ROOT files only once, which allows duplicate (or overlapping) session root directories;
wenzelm
parents:
66759
diff
changeset
|
1217 |
} |
62631 | 1218 |
|
76629 | 1219 |
def load_roots(select: Boolean, dir: Path): List[Root_File] = { |
62631 | 1220 |
val roots = dir + ROOTS |
1221 |
if (roots.is_file) { |
|
1222 |
for { |
|
66818
5bc903a60932
clarified signature: public access to ROOT file syntax;
wenzelm
parents:
66780
diff
changeset
|
1223 |
entry <- parse_roots(roots) |
62631 | 1224 |
dir1 = |
66818
5bc903a60932
clarified signature: public access to ROOT file syntax;
wenzelm
parents:
66780
diff
changeset
|
1225 |
try { check_session_dir(dir + Path.explode(entry)) } |
62631 | 1226 |
catch { |
1227 |
case ERROR(msg) => |
|
1228 |
error(msg + "\nThe error(s) above occurred in session catalog " + roots.toString) |
|
1229 |
} |
|
66764
006deaf5c3dc
process ROOT files only once, which allows duplicate (or overlapping) session root directories;
wenzelm
parents:
66759
diff
changeset
|
1230 |
res <- load_dir(select, dir1) |
006deaf5c3dc
process ROOT files only once, which allows duplicate (or overlapping) session root directories;
wenzelm
parents:
66759
diff
changeset
|
1231 |
} yield res |
62631 | 1232 |
} |
1233 |
else Nil |
|
1234 |
} |
|
1235 |
||
76629 | 1236 |
val raw_roots: List[Root_File] = |
62631 | 1237 |
for { |
65561 | 1238 |
(select, dir) <- directories(dirs, select_dirs) |
76629 | 1239 |
root <- load_dir(select, check_session_dir(dir)) |
1240 |
} yield root |
|
66764
006deaf5c3dc
process ROOT files only once, which allows duplicate (or overlapping) session root directories;
wenzelm
parents:
66759
diff
changeset
|
1241 |
|
76629 | 1242 |
var next_root = 0 |
1243 |
var seen_roots = Map.empty[JFile, (Root_File, Int)] |
|
1244 |
for (root <- raw_roots) { |
|
1245 |
seen_roots.get(root.key) match { |
|
1246 |
case None => |
|
1247 |
seen_roots += (root.key -> (root, next_root)) |
|
1248 |
next_root += 1 |
|
76633
95c258c0753c
clarified order: accumulate strictly from left to right;
wenzelm
parents:
76632
diff
changeset
|
1249 |
case Some((root0, next0)) => |
76634 | 1250 |
val root1 = root0.copy(select = root0.select || root.select) |
1251 |
seen_roots += (root0.key -> (root1, next0)) |
|
76629 | 1252 |
} |
1253 |
} |
|
1254 |
seen_roots.valuesIterator.toList.sortBy(_._2).map(_._1) |
|
1255 |
} |
|
75995 | 1256 |
|
76629 | 1257 |
def load_structure( |
1258 |
options: Options, |
|
1259 |
dirs: List[Path] = Nil, |
|
1260 |
select_dirs: List[Path] = Nil, |
|
76927
da13da82f6f9
treat update_options as part of Sessions.Info meta_digest, for proper re-build of updated sessions;
wenzelm
parents:
76907
diff
changeset
|
1261 |
infos: List[Info] = Nil, |
da13da82f6f9
treat update_options as part of Sessions.Info meta_digest, for proper re-build of updated sessions;
wenzelm
parents:
76907
diff
changeset
|
1262 |
augment_options: String => List[Options.Spec] = _ => Nil |
76629 | 1263 |
): Structure = { |
1264 |
val roots = load_root_files(dirs = dirs, select_dirs = select_dirs) |
|
76927
da13da82f6f9
treat update_options as part of Sessions.Info meta_digest, for proper re-build of updated sessions;
wenzelm
parents:
76907
diff
changeset
|
1265 |
Structure.make(options, augment_options, roots = roots, infos = infos) |
76629 | 1266 |
} |
1267 |
||
62632 | 1268 |
|
71808 | 1269 |
/* Isabelle tool wrapper */ |
1270 |
||
72763 | 1271 |
val isabelle_tool = Isabelle_Tool("sessions", "explore structure of Isabelle sessions", |
75394 | 1272 |
Scala_Project.here, |
1273 |
{ args => |
|
1274 |
var base_sessions: List[String] = Nil |
|
1275 |
var select_dirs: List[Path] = Nil |
|
1276 |
var requirements = false |
|
1277 |
var exclude_session_groups: List[String] = Nil |
|
1278 |
var all_sessions = false |
|
76107 | 1279 |
var build_graph = false |
75394 | 1280 |
var dirs: List[Path] = Nil |
1281 |
var session_groups: List[String] = Nil |
|
1282 |
var exclude_sessions: List[String] = Nil |
|
71808 | 1283 |
|
75394 | 1284 |
val getopts = Getopts(""" |
71808 | 1285 |
Usage: isabelle sessions [OPTIONS] [SESSIONS ...] |
1286 |
||
1287 |
Options are: |
|
1288 |
-B NAME include session NAME and all descendants |
|
1289 |
-D DIR include session directory and select its sessions |
|
1290 |
-R refer to requirements of selected sessions |
|
1291 |
-X NAME exclude sessions from group NAME and all descendants |
|
1292 |
-a select all sessions |
|
76107 | 1293 |
-b follow session build dependencies (default: source imports) |
71808 | 1294 |
-d DIR include session directory |
1295 |
-g NAME select session group NAME |
|
1296 |
-x NAME exclude session NAME and all descendants |
|
1297 |
||
1298 |
Explore the structure of Isabelle sessions and print result names in |
|
1299 |
topological order (on stdout). |
|
1300 |
""", |
|
75394 | 1301 |
"B:" -> (arg => base_sessions = base_sessions ::: List(arg)), |
1302 |
"D:" -> (arg => select_dirs = select_dirs ::: List(Path.explode(arg))), |
|
1303 |
"R" -> (_ => requirements = true), |
|
1304 |
"X:" -> (arg => exclude_session_groups = exclude_session_groups ::: List(arg)), |
|
1305 |
"a" -> (_ => all_sessions = true), |
|
76107 | 1306 |
"b" -> (_ => build_graph = true), |
75394 | 1307 |
"d:" -> (arg => dirs = dirs ::: List(Path.explode(arg))), |
1308 |
"g:" -> (arg => session_groups = session_groups ::: List(arg)), |
|
1309 |
"x:" -> (arg => exclude_sessions = exclude_sessions ::: List(arg))) |
|
71808 | 1310 |
|
75394 | 1311 |
val sessions = getopts(args) |
71808 | 1312 |
|
75394 | 1313 |
val options = Options.init() |
71808 | 1314 |
|
75394 | 1315 |
val selection = |
1316 |
Selection(requirements = requirements, all_sessions = all_sessions, base_sessions = base_sessions, |
|
1317 |
exclude_session_groups = exclude_session_groups, exclude_sessions = exclude_sessions, |
|
1318 |
session_groups = session_groups, sessions = sessions) |
|
1319 |
val sessions_structure = |
|
1320 |
load_structure(options, dirs = dirs, select_dirs = select_dirs).selection(selection) |
|
71808 | 1321 |
|
76107 | 1322 |
val order = |
1323 |
if (build_graph) sessions_structure.build_topological_order |
|
1324 |
else sessions_structure.imports_topological_order |
|
1325 |
for (name <- order) Output.writeln(name, stdout = true) |
|
75394 | 1326 |
}) |
71808 | 1327 |
|
1328 |
||
62637
0189fe0f6452
support for Poly/ML heap hierarchy, which saves a lot of disk space;
wenzelm
parents:
62636
diff
changeset
|
1329 |
|
0189fe0f6452
support for Poly/ML heap hierarchy, which saves a lot of disk space;
wenzelm
parents:
62636
diff
changeset
|
1330 |
/** persistent store **/ |
62632 | 1331 |
|
77284 | 1332 |
/** auxiliary **/ |
1333 |
||
1334 |
sealed case class Build_Info( |
|
1335 |
sources: SHA1.Shasum, |
|
1336 |
input_heaps: SHA1.Shasum, |
|
1337 |
output_heap: SHA1.Shasum, |
|
1338 |
return_code: Int, |
|
1339 |
uuid: String |
|
1340 |
) { |
|
1341 |
def ok: Boolean = return_code == 0 |
|
1342 |
} |
|
1343 |
||
75393 | 1344 |
object Session_Info { |
66857 | 1345 |
val session_name = SQL.Column.string("session_name").make_primary_key |
65326 | 1346 |
|
65296 | 1347 |
// Build_Log.Session_Info |
1348 |
val session_timing = SQL.Column.bytes("session_timing") |
|
1349 |
val command_timings = SQL.Column.bytes("command_timings") |
|
66873
9953ae603a23
provide theory timing information, similar to command timing but always considered relevant;
wenzelm
parents:
66857
diff
changeset
|
1350 |
val theory_timings = SQL.Column.bytes("theory_timings") |
65296 | 1351 |
val ml_statistics = SQL.Column.bytes("ml_statistics") |
1352 |
val task_statistics = SQL.Column.bytes("task_statistics") |
|
65934 | 1353 |
val errors = SQL.Column.bytes("errors") |
65296 | 1354 |
val build_log_columns = |
66873
9953ae603a23
provide theory timing information, similar to command timing but always considered relevant;
wenzelm
parents:
66857
diff
changeset
|
1355 |
List(session_name, session_timing, command_timings, theory_timings, |
9953ae603a23
provide theory timing information, similar to command timing but always considered relevant;
wenzelm
parents:
66857
diff
changeset
|
1356 |
ml_statistics, task_statistics, errors) |
65296 | 1357 |
|
77284 | 1358 |
// Build_Info |
65296 | 1359 |
val sources = SQL.Column.string("sources") |
1360 |
val input_heaps = SQL.Column.string("input_heaps") |
|
1361 |
val output_heap = SQL.Column.string("output_heap") |
|
1362 |
val return_code = SQL.Column.int("return_code") |
|
75967
ff164add75cd
maintain "uuid" column in session build database, to identity the original build process uniquely;
wenzelm
parents:
75923
diff
changeset
|
1363 |
val uuid = SQL.Column.string("uuid") |
ff164add75cd
maintain "uuid" column in session build database, to identity the original build process uniquely;
wenzelm
parents:
75923
diff
changeset
|
1364 |
val build_columns = List(sources, input_heaps, output_heap, return_code, uuid) |
65296 | 1365 |
|
1366 |
val table = SQL.Table("isabelle_session_info", build_log_columns ::: build_columns) |
|
75967
ff164add75cd
maintain "uuid" column in session build database, to identity the original build process uniquely;
wenzelm
parents:
75923
diff
changeset
|
1367 |
|
ff164add75cd
maintain "uuid" column in session build database, to identity the original build process uniquely;
wenzelm
parents:
75923
diff
changeset
|
1368 |
val augment_table: PostgreSQL.Source = |
ff164add75cd
maintain "uuid" column in session build database, to identity the original build process uniquely;
wenzelm
parents:
75923
diff
changeset
|
1369 |
"ALTER TABLE IF EXISTS " + table.ident + |
75978 | 1370 |
" ADD COLUMN IF NOT EXISTS " + uuid.decl(SQL.sql_type_postgresql) |
65296 | 1371 |
} |
1372 |
||
74731
161e84e6b40a
just one cache, via HTML_Context, via Sessions.Store or Session;
wenzelm
parents:
74696
diff
changeset
|
1373 |
def store(options: Options, cache: Term.Cache = Term.Cache.make()): Store = |
73031
f93f0597f4fb
clarified signature: absorb XZ.Cache into XML.Cache;
wenzelm
parents:
73024
diff
changeset
|
1374 |
new Store(options, cache) |
62632 | 1375 |
|
75393 | 1376 |
class Store private[Sessions](val options: Options, val cache: Term.Cache) { |
72634
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1377 |
store => |
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1378 |
|
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1379 |
override def toString: String = "Store(output_dir = " + output_dir.absolute + ")" |
68219 | 1380 |
|
1381 |
||
1382 |
/* directories */ |
|
1383 |
||
68523
ccacc84e0251
clarified settings -- avoid hard-wired directories;
wenzelm
parents:
68483
diff
changeset
|
1384 |
val system_output_dir: Path = Path.explode("$ISABELLE_HEAPS_SYSTEM/$ML_IDENTIFIER") |
ccacc84e0251
clarified settings -- avoid hard-wired directories;
wenzelm
parents:
68483
diff
changeset
|
1385 |
val user_output_dir: Path = Path.explode("$ISABELLE_HEAPS/$ML_IDENTIFIER") |
68219 | 1386 |
|
69854
cc0b3e177b49
system option "system_heaps" supersedes various command-line options for "system build mode";
wenzelm
parents:
69812
diff
changeset
|
1387 |
def system_heaps: Boolean = options.bool("system_heaps") |
cc0b3e177b49
system option "system_heaps" supersedes various command-line options for "system build mode";
wenzelm
parents:
69812
diff
changeset
|
1388 |
|
68221 | 1389 |
val output_dir: Path = |
69854
cc0b3e177b49
system option "system_heaps" supersedes various command-line options for "system build mode";
wenzelm
parents:
69812
diff
changeset
|
1390 |
if (system_heaps) system_output_dir else user_output_dir |
68219 | 1391 |
|
68221 | 1392 |
val input_dirs: List[Path] = |
69854
cc0b3e177b49
system option "system_heaps" supersedes various command-line options for "system build mode";
wenzelm
parents:
69812
diff
changeset
|
1393 |
if (system_heaps) List(system_output_dir) |
68219 | 1394 |
else List(user_output_dir, system_output_dir) |
62632 | 1395 |
|
72648 | 1396 |
def presentation_dir: Path = |
69854
cc0b3e177b49
system option "system_heaps" supersedes various command-line options for "system build mode";
wenzelm
parents:
69812
diff
changeset
|
1397 |
if (system_heaps) Path.explode("$ISABELLE_BROWSER_INFO_SYSTEM") |
62632 | 1398 |
else Path.explode("$ISABELLE_BROWSER_INFO") |
1399 |
||
62637
0189fe0f6452
support for Poly/ML heap hierarchy, which saves a lot of disk space;
wenzelm
parents:
62636
diff
changeset
|
1400 |
|
68221 | 1401 |
/* file names */ |
65298 | 1402 |
|
68221 | 1403 |
def heap(name: String): Path = Path.basic(name) |
77035 | 1404 |
def database(name: String): Path = Path.basic("log") + Path.basic(name).db |
68221 | 1405 |
def log(name: String): Path = Path.basic("log") + Path.basic(name) |
77035 | 1406 |
def log_gz(name: String): Path = log(name).gz |
62637
0189fe0f6452
support for Poly/ML heap hierarchy, which saves a lot of disk space;
wenzelm
parents:
62636
diff
changeset
|
1407 |
|
68221 | 1408 |
def output_heap(name: String): Path = output_dir + heap(name) |
1409 |
def output_database(name: String): Path = output_dir + database(name) |
|
68086
9e1c670301b8
cleanup session output before starting build job;
wenzelm
parents:
68018
diff
changeset
|
1410 |
def output_log(name: String): Path = output_dir + log(name) |
9e1c670301b8
cleanup session output before starting build job;
wenzelm
parents:
68018
diff
changeset
|
1411 |
def output_log_gz(name: String): Path = output_dir + log_gz(name) |
9e1c670301b8
cleanup session output before starting build job;
wenzelm
parents:
68018
diff
changeset
|
1412 |
|
62637
0189fe0f6452
support for Poly/ML heap hierarchy, which saves a lot of disk space;
wenzelm
parents:
62636
diff
changeset
|
1413 |
|
68221 | 1414 |
/* heap */ |
62637
0189fe0f6452
support for Poly/ML heap hierarchy, which saves a lot of disk space;
wenzelm
parents:
62636
diff
changeset
|
1415 |
|
68212
5a59fded83c7
clarified heap vs. database operations: discontinued correlation of directory;
wenzelm
parents:
68210
diff
changeset
|
1416 |
def find_heap(name: String): Option[Path] = |
68221 | 1417 |
input_dirs.map(_ + heap(name)).find(_.is_file) |
68212
5a59fded83c7
clarified heap vs. database operations: discontinued correlation of directory;
wenzelm
parents:
68210
diff
changeset
|
1418 |
|
77207
d98a99e4eea9
proper Shasum.digest, to emulate old form from build_history database;
wenzelm
parents:
77206
diff
changeset
|
1419 |
def find_heap_shasum(name: String): SHA1.Shasum = |
77206 | 1420 |
(for { |
1421 |
path <- find_heap(name) |
|
1422 |
digest <- ML_Heap.read_digest(path) |
|
77207
d98a99e4eea9
proper Shasum.digest, to emulate old form from build_history database;
wenzelm
parents:
77206
diff
changeset
|
1423 |
} yield SHA1.shasum(digest, name)).getOrElse(SHA1.no_shasum) |
62632 | 1424 |
|
68221 | 1425 |
def the_heap(name: String): Path = |
1426 |
find_heap(name) getOrElse |
|
1427 |
error("Missing heap image for session " + quote(name) + " -- expected in:\n" + |
|
76883 | 1428 |
cat_lines(input_dirs.map(dir => " " + File.standard_path(dir)))) |
68221 | 1429 |
|
1430 |
||
1431 |
/* database */ |
|
1432 |
||
75552
4aa3da02fd4d
sync session images, based on accidental local state;
wenzelm
parents:
75406
diff
changeset
|
1433 |
def find_database(name: String): Option[Path] = |
4aa3da02fd4d
sync session images, based on accidental local state;
wenzelm
parents:
75406
diff
changeset
|
1434 |
input_dirs.map(_ + database(name)).find(_.is_file) |
4aa3da02fd4d
sync session images, based on accidental local state;
wenzelm
parents:
75406
diff
changeset
|
1435 |
|
72634
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1436 |
def database_server: Boolean = options.bool("build_database_server") |
65281
c70e7d24a16d
SQL database operations for combined session info;
wenzelm
parents:
65278
diff
changeset
|
1437 |
|
77038 | 1438 |
def open_database_server(): PostgreSQL.Database = |
72634
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1439 |
PostgreSQL.open_database( |
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1440 |
user = options.string("build_database_user"), |
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1441 |
password = options.string("build_database_password"), |
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1442 |
database = options.string("build_database_name"), |
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1443 |
host = options.string("build_database_host"), |
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1444 |
port = options.int("build_database_port"), |
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1445 |
ssh = |
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1446 |
options.proper_string("build_database_ssh_host").map(ssh_host => |
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1447 |
SSH.open_session(options, |
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1448 |
host = ssh_host, |
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1449 |
user = options.string("build_database_ssh_user"), |
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1450 |
port = options.int("build_database_ssh_port"))), |
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1451 |
ssh_close = true) |
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1452 |
|
75775
70a65ee4a738
clarified signature: more robust treatment of server;
wenzelm
parents:
75774
diff
changeset
|
1453 |
def try_open_database( |
70a65ee4a738
clarified signature: more robust treatment of server;
wenzelm
parents:
75774
diff
changeset
|
1454 |
name: String, |
70a65ee4a738
clarified signature: more robust treatment of server;
wenzelm
parents:
75774
diff
changeset
|
1455 |
output: Boolean = false, |
70a65ee4a738
clarified signature: more robust treatment of server;
wenzelm
parents:
75774
diff
changeset
|
1456 |
server: Boolean = database_server |
70a65ee4a738
clarified signature: more robust treatment of server;
wenzelm
parents:
75774
diff
changeset
|
1457 |
): Option[SQL.Database] = { |
72634
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1458 |
def check(db: SQL.Database): Option[SQL.Database] = |
73367 | 1459 |
if (output || session_info_exists(db)) Some(db) else { db.close(); None } |
72634
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1460 |
|
75775
70a65ee4a738
clarified signature: more robust treatment of server;
wenzelm
parents:
75774
diff
changeset
|
1461 |
if (server) check(open_database_server()) |
72634
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1462 |
else if (output) Some(SQLite.open_database(output_database(name))) |
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1463 |
else { |
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1464 |
(for { |
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1465 |
dir <- input_dirs.view |
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1466 |
path = dir + database(name) if path.is_file |
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1467 |
db <- check(SQLite.open_database(path)) |
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1468 |
} yield db).headOption |
68221 | 1469 |
} |
1470 |
} |
|
68212
5a59fded83c7
clarified heap vs. database operations: discontinued correlation of directory;
wenzelm
parents:
68210
diff
changeset
|
1471 |
|
75791 | 1472 |
def error_database(name: String): Nothing = |
75759
0cdccd0d1699
clarified context for retrieval: more explicit types, with optional close() operation;
wenzelm
parents:
75750
diff
changeset
|
1473 |
error("Missing build database for session " + quote(name)) |
0cdccd0d1699
clarified context for retrieval: more explicit types, with optional close() operation;
wenzelm
parents:
75750
diff
changeset
|
1474 |
|
68221 | 1475 |
def open_database(name: String, output: Boolean = false): SQL.Database = |
75791 | 1476 |
try_open_database(name, output = output) getOrElse error_database(name) |
75759
0cdccd0d1699
clarified context for retrieval: more explicit types, with optional close() operation;
wenzelm
parents:
75750
diff
changeset
|
1477 |
|
77535 | 1478 |
def prepare_output(): Unit = Isabelle_System.make_directory(output_dir + Path.basic("log")) |
1479 |
||
75393 | 1480 |
def clean_output(name: String): (Boolean, Boolean) = { |
68221 | 1481 |
val relevant_db = |
77516 | 1482 |
database_server && |
1483 |
using_option(try_open_database(name))(db => |
|
1484 |
db.transaction { |
|
1485 |
val relevant_db = session_info_defined(db, name) |
|
1486 |
init_session_info(db, name) |
|
1487 |
relevant_db |
|
1488 |
} |
|
1489 |
).getOrElse(false) |
|
68212
5a59fded83c7
clarified heap vs. database operations: discontinued correlation of directory;
wenzelm
parents:
68210
diff
changeset
|
1490 |
|
68221 | 1491 |
val del = |
1492 |
for { |
|
69854
cc0b3e177b49
system option "system_heaps" supersedes various command-line options for "system build mode";
wenzelm
parents:
69812
diff
changeset
|
1493 |
dir <- |
cc0b3e177b49
system option "system_heaps" supersedes various command-line options for "system build mode";
wenzelm
parents:
69812
diff
changeset
|
1494 |
(if (system_heaps) List(user_output_dir, system_output_dir) else List(user_output_dir)) |
68221 | 1495 |
file <- List(heap(name), database(name), log(name), log_gz(name)) |
1496 |
path = dir + file if path.is_file |
|
1497 |
} yield path.file.delete |
|
1498 |
||
1499 |
val relevant = relevant_db || del.nonEmpty |
|
1500 |
val ok = del.forall(b => b) |
|
1501 |
(relevant, ok) |
|
1502 |
} |
|
65287 | 1503 |
|
77472 | 1504 |
def init_output(name: String): Unit = { |
1505 |
clean_output(name) |
|
1506 |
using(open_database(name, output = true))(init_session_info(_, name)) |
|
1507 |
} |
|
1508 |
||
77469 | 1509 |
def check_output( |
1510 |
name: String, |
|
1511 |
sources_shasum: SHA1.Shasum, |
|
1512 |
input_shasum: SHA1.Shasum, |
|
1513 |
fresh_build: Boolean, |
|
1514 |
store_heap: Boolean |
|
1515 |
): (Boolean, SHA1.Shasum) = { |
|
1516 |
try_open_database(name) match { |
|
1517 |
case Some(db) => |
|
1518 |
using(db)(read_build(_, name)) match { |
|
1519 |
case Some(build) => |
|
1520 |
val output_shasum = find_heap_shasum(name) |
|
1521 |
val current = |
|
1522 |
!fresh_build && |
|
1523 |
build.ok && |
|
1524 |
build.sources == sources_shasum && |
|
1525 |
build.input_heaps == input_shasum && |
|
1526 |
build.output_heap == output_shasum && |
|
1527 |
!(store_heap && output_shasum.is_empty) |
|
1528 |
(current, output_shasum) |
|
1529 |
case None => (false, SHA1.no_shasum) |
|
1530 |
} |
|
1531 |
case None => (false, SHA1.no_shasum) |
|
1532 |
} |
|
1533 |
} |
|
1534 |
||
65287 | 1535 |
|
68218 | 1536 |
/* SQL database content */ |
1537 |
||
1538 |
def read_bytes(db: SQL.Database, name: String, column: SQL.Column): Bytes = |
|
77381
a86e346b20d8
misc tuning and clarification: more uniform use of optional "sql" in SQL.Table.delete/select;
wenzelm
parents:
77370
diff
changeset
|
1539 |
db.using_statement( |
a86e346b20d8
misc tuning and clarification: more uniform use of optional "sql" in SQL.Table.delete/select;
wenzelm
parents:
77370
diff
changeset
|
1540 |
Session_Info.table.select(List(column), |
a86e346b20d8
misc tuning and clarification: more uniform use of optional "sql" in SQL.Table.delete/select;
wenzelm
parents:
77370
diff
changeset
|
1541 |
sql = Session_Info.session_name.where_equal(name))) { stmt => |
68218 | 1542 |
val res = stmt.execute_query() |
1543 |
if (!res.next()) Bytes.empty else res.bytes(column) |
|
75394 | 1544 |
} |
68218 | 1545 |
|
1546 |
def read_properties(db: SQL.Database, name: String, column: SQL.Column): List[Properties.T] = |
|
73031
f93f0597f4fb
clarified signature: absorb XZ.Cache into XML.Cache;
wenzelm
parents:
73024
diff
changeset
|
1547 |
Properties.uncompress(read_bytes(db, name, column), cache = cache) |
68218 | 1548 |
|
1549 |
||
65296 | 1550 |
/* session info */ |
65281
c70e7d24a16d
SQL database operations for combined session info;
wenzelm
parents:
65278
diff
changeset
|
1551 |
|
75393 | 1552 |
def init_session_info(db: SQL.Database, name: String): Unit = { |
68086
9e1c670301b8
cleanup session output before starting build job;
wenzelm
parents:
68018
diff
changeset
|
1553 |
db.transaction { |
9e1c670301b8
cleanup session output before starting build job;
wenzelm
parents:
68018
diff
changeset
|
1554 |
db.create_table(Session_Info.table) |
77540 | 1555 |
db.execute_statement( |
1556 |
Session_Info.table.delete(sql = Session_Info.session_name.where_equal(name))) |
|
77542 | 1557 |
if (db.is_postgresql) db.execute_statement(Session_Info.augment_table) |
68221 | 1558 |
|
76855
5efc770dd727
store session sources within build database: timing e.g. 150ms for HOL and < 50ms for common sessions;
wenzelm
parents:
76850
diff
changeset
|
1559 |
db.create_table(Sources.table) |
77540 | 1560 |
db.execute_statement(Sources.table.delete(sql = Sources.where_equal(name))) |
76855
5efc770dd727
store session sources within build database: timing e.g. 150ms for HOL and < 50ms for common sessions;
wenzelm
parents:
76850
diff
changeset
|
1561 |
|
68221 | 1562 |
db.create_table(Export.Data.table) |
77540 | 1563 |
db.execute_statement( |
1564 |
Export.Data.table.delete(sql = Export.Data.session_name.where_equal(name))) |
|
72653
ea35afdb1366
store documents within session database, instead of browser_info directory;
wenzelm
parents:
72652
diff
changeset
|
1565 |
|
73718 | 1566 |
db.create_table(Document_Build.Data.table) |
77540 | 1567 |
db.execute_statement( |
73718 | 1568 |
Document_Build.Data.table.delete( |
77540 | 1569 |
sql = Document_Build.Data.session_name.where_equal(name))) |
68221 | 1570 |
} |
1571 |
} |
|
1572 |
||
75393 | 1573 |
def session_info_exists(db: SQL.Database): Boolean = { |
72634
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1574 |
val tables = db.tables |
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1575 |
tables.contains(Session_Info.table.name) && |
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1576 |
tables.contains(Export.Data.table.name) |
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1577 |
} |
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1578 |
|
5cea0993ee4f
clarified access to single database server vs. collection of database files;
wenzelm
parents:
72627
diff
changeset
|
1579 |
def session_info_defined(db: SQL.Database, name: String): Boolean = |
75739
5b37466c1463
removed somewhat pointless transaction: db is meant to be finished (or updated monotonically);
wenzelm
parents:
75738
diff
changeset
|
1580 |
session_info_exists(db) && { |
5b37466c1463
removed somewhat pointless transaction: db is meant to be finished (or updated monotonically);
wenzelm
parents:
75738
diff
changeset
|
1581 |
db.using_statement( |
5b37466c1463
removed somewhat pointless transaction: db is meant to be finished (or updated monotonically);
wenzelm
parents:
75738
diff
changeset
|
1582 |
Session_Info.table.select(List(Session_Info.session_name), |
77381
a86e346b20d8
misc tuning and clarification: more uniform use of optional "sql" in SQL.Table.delete/select;
wenzelm
parents:
77370
diff
changeset
|
1583 |
sql = Session_Info.session_name.where_equal(name)))(_.execute_query().next()) |
68086
9e1c670301b8
cleanup session output before starting build job;
wenzelm
parents:
68018
diff
changeset
|
1584 |
} |
9e1c670301b8
cleanup session output before starting build job;
wenzelm
parents:
68018
diff
changeset
|
1585 |
|
76865
9d0e6ea7aa68
do write_session_sources early, to have information available in build job;
wenzelm
parents:
76859
diff
changeset
|
1586 |
def write_session_info( |
9d0e6ea7aa68
do write_session_sources early, to have information available in build job;
wenzelm
parents:
76859
diff
changeset
|
1587 |
db: SQL.Database, |
9d0e6ea7aa68
do write_session_sources early, to have information available in build job;
wenzelm
parents:
76859
diff
changeset
|
1588 |
session_name: String, |
76873 | 1589 |
sources: Sources, |
76865
9d0e6ea7aa68
do write_session_sources early, to have information available in build job;
wenzelm
parents:
76859
diff
changeset
|
1590 |
build_log: Build_Log.Session_Info, |
77284 | 1591 |
build: Build_Info |
76865
9d0e6ea7aa68
do write_session_sources early, to have information available in build job;
wenzelm
parents:
76859
diff
changeset
|
1592 |
): Unit = { |
9d0e6ea7aa68
do write_session_sources early, to have information available in build job;
wenzelm
parents:
76859
diff
changeset
|
1593 |
db.transaction { |
76871
a17f9ff37558
clarified session_sources (again, see also 9d0e6ea7aa68);
wenzelm
parents:
76870
diff
changeset
|
1594 |
write_sources(db, session_name, sources) |
77541 | 1595 |
db.execute_statement(Session_Info.table.insert(), body = |
1596 |
{ stmt => |
|
1597 |
stmt.string(1) = session_name |
|
1598 |
stmt.bytes(2) = Properties.encode(build_log.session_timing) |
|
1599 |
stmt.bytes(3) = Properties.compress(build_log.command_timings, cache = cache.compress) |
|
1600 |
stmt.bytes(4) = Properties.compress(build_log.theory_timings, cache = cache.compress) |
|
1601 |
stmt.bytes(5) = Properties.compress(build_log.ml_statistics, cache = cache.compress) |
|
1602 |
stmt.bytes(6) = Properties.compress(build_log.task_statistics, cache = cache.compress) |
|
1603 |
stmt.bytes(7) = Build_Log.compress_errors(build_log.errors, cache = cache.compress) |
|
1604 |
stmt.string(8) = build.sources.toString |
|
1605 |
stmt.string(9) = build.input_heaps.toString |
|
1606 |
stmt.string(10) = build.output_heap.toString |
|
1607 |
stmt.int(11) = build.return_code |
|
1608 |
stmt.string(12) = build.uuid |
|
1609 |
}) |
|
65281
c70e7d24a16d
SQL database operations for combined session info;
wenzelm
parents:
65278
diff
changeset
|
1610 |
} |
c70e7d24a16d
SQL database operations for combined session info;
wenzelm
parents:
65278
diff
changeset
|
1611 |
} |
c70e7d24a16d
SQL database operations for combined session info;
wenzelm
parents:
65278
diff
changeset
|
1612 |
|
65320
52861eebf58d
access table via session_name: db may in principle contain multiple entries;
wenzelm
parents:
65318
diff
changeset
|
1613 |
def read_session_timing(db: SQL.Database, name: String): Properties.T = |
73031
f93f0597f4fb
clarified signature: absorb XZ.Cache into XML.Cache;
wenzelm
parents:
73024
diff
changeset
|
1614 |
Properties.decode(read_bytes(db, name, Session_Info.session_timing), cache = cache) |
65286 | 1615 |
|
77439
d6bf9ec39d12
avoid premature Properties.uncompress: allow blob to be stored in another database;
wenzelm
parents:
77381
diff
changeset
|
1616 |
def read_command_timings(db: SQL.Database, name: String): Bytes = |
d6bf9ec39d12
avoid premature Properties.uncompress: allow blob to be stored in another database;
wenzelm
parents:
77381
diff
changeset
|
1617 |
read_bytes(db, name, Session_Info.command_timings) |
65286 | 1618 |
|
66873
9953ae603a23
provide theory timing information, similar to command timing but always considered relevant;
wenzelm
parents:
66857
diff
changeset
|
1619 |
def read_theory_timings(db: SQL.Database, name: String): List[Properties.T] = |
9953ae603a23
provide theory timing information, similar to command timing but always considered relevant;
wenzelm
parents:
66857
diff
changeset
|
1620 |
read_properties(db, name, Session_Info.theory_timings) |
9953ae603a23
provide theory timing information, similar to command timing but always considered relevant;
wenzelm
parents:
66857
diff
changeset
|
1621 |
|
65320
52861eebf58d
access table via session_name: db may in principle contain multiple entries;
wenzelm
parents:
65318
diff
changeset
|
1622 |
def read_ml_statistics(db: SQL.Database, name: String): List[Properties.T] = |
52861eebf58d
access table via session_name: db may in principle contain multiple entries;
wenzelm
parents:
65318
diff
changeset
|
1623 |
read_properties(db, name, Session_Info.ml_statistics) |
65286 | 1624 |
|
65320
52861eebf58d
access table via session_name: db may in principle contain multiple entries;
wenzelm
parents:
65318
diff
changeset
|
1625 |
def read_task_statistics(db: SQL.Database, name: String): List[Properties.T] = |
52861eebf58d
access table via session_name: db may in principle contain multiple entries;
wenzelm
parents:
65318
diff
changeset
|
1626 |
read_properties(db, name, Session_Info.task_statistics) |
65286 | 1627 |
|
72738
a4d7da18ac5c
store timings for used_theories in canonical order, with reconstructed store.read_theories;
wenzelm
parents:
72716
diff
changeset
|
1628 |
def read_theories(db: SQL.Database, name: String): List[String] = |
a4d7da18ac5c
store timings for used_theories in canonical order, with reconstructed store.read_theories;
wenzelm
parents:
72716
diff
changeset
|
1629 |
read_theory_timings(db, name).flatMap(Markup.Name.unapply) |
a4d7da18ac5c
store timings for used_theories in canonical order, with reconstructed store.read_theories;
wenzelm
parents:
72716
diff
changeset
|
1630 |
|
65937 | 1631 |
def read_errors(db: SQL.Database, name: String): List[String] = |
73033 | 1632 |
Build_Log.uncompress_errors(read_bytes(db, name, Session_Info.errors), cache = cache) |
65937 | 1633 |
|
77284 | 1634 |
def read_build(db: SQL.Database, name: String): Option[Build_Info] = { |
66957
82d13ba817b2
more permissive: db could be empty after hard crash;
wenzelm
parents:
66914
diff
changeset
|
1635 |
if (db.tables.contains(Session_Info.table.name)) { |
77381
a86e346b20d8
misc tuning and clarification: more uniform use of optional "sql" in SQL.Table.delete/select;
wenzelm
parents:
77370
diff
changeset
|
1636 |
db.using_statement( |
a86e346b20d8
misc tuning and clarification: more uniform use of optional "sql" in SQL.Table.delete/select;
wenzelm
parents:
77370
diff
changeset
|
1637 |
Session_Info.table.select(sql = Session_Info.session_name.where_equal(name))) { stmt => |
66957
82d13ba817b2
more permissive: db could be empty after hard crash;
wenzelm
parents:
66914
diff
changeset
|
1638 |
val res = stmt.execute_query() |
82d13ba817b2
more permissive: db could be empty after hard crash;
wenzelm
parents:
66914
diff
changeset
|
1639 |
if (!res.next()) None |
82d13ba817b2
more permissive: db could be empty after hard crash;
wenzelm
parents:
66914
diff
changeset
|
1640 |
else { |
75967
ff164add75cd
maintain "uuid" column in session build database, to identity the original build process uniquely;
wenzelm
parents:
75923
diff
changeset
|
1641 |
val uuid = |
ff164add75cd
maintain "uuid" column in session build database, to identity the original build process uniquely;
wenzelm
parents:
75923
diff
changeset
|
1642 |
try { Option(res.string(Session_Info.uuid)).getOrElse("") } |
ff164add75cd
maintain "uuid" column in session build database, to identity the original build process uniquely;
wenzelm
parents:
75923
diff
changeset
|
1643 |
catch { case _: SQLException => "" } |
66957
82d13ba817b2
more permissive: db could be empty after hard crash;
wenzelm
parents:
66914
diff
changeset
|
1644 |
Some( |
77284 | 1645 |
Build_Info( |
77207
d98a99e4eea9
proper Shasum.digest, to emulate old form from build_history database;
wenzelm
parents:
77206
diff
changeset
|
1646 |
SHA1.fake_shasum(res.string(Session_Info.sources)), |
d98a99e4eea9
proper Shasum.digest, to emulate old form from build_history database;
wenzelm
parents:
77206
diff
changeset
|
1647 |
SHA1.fake_shasum(res.string(Session_Info.input_heaps)), |
d98a99e4eea9
proper Shasum.digest, to emulate old form from build_history database;
wenzelm
parents:
77206
diff
changeset
|
1648 |
SHA1.fake_shasum(res.string(Session_Info.output_heap)), |
75967
ff164add75cd
maintain "uuid" column in session build database, to identity the original build process uniquely;
wenzelm
parents:
75923
diff
changeset
|
1649 |
res.int(Session_Info.return_code), |
ff164add75cd
maintain "uuid" column in session build database, to identity the original build process uniquely;
wenzelm
parents:
75923
diff
changeset
|
1650 |
uuid)) |
66957
82d13ba817b2
more permissive: db could be empty after hard crash;
wenzelm
parents:
66914
diff
changeset
|
1651 |
} |
75394 | 1652 |
} |
66957
82d13ba817b2
more permissive: db could be empty after hard crash;
wenzelm
parents:
66914
diff
changeset
|
1653 |
} |
82d13ba817b2
more permissive: db could be empty after hard crash;
wenzelm
parents:
66914
diff
changeset
|
1654 |
else None |
66744 | 1655 |
} |
76855
5efc770dd727
store session sources within build database: timing e.g. 150ms for HOL and < 50ms for common sessions;
wenzelm
parents:
76850
diff
changeset
|
1656 |
|
76866
19bfc64a7310
clarified signature: more explicit types (see also 90c552d28d36);
wenzelm
parents:
76865
diff
changeset
|
1657 |
|
19bfc64a7310
clarified signature: more explicit types (see also 90c552d28d36);
wenzelm
parents:
76865
diff
changeset
|
1658 |
/* session sources */ |
19bfc64a7310
clarified signature: more explicit types (see also 90c552d28d36);
wenzelm
parents:
76865
diff
changeset
|
1659 |
|
76873 | 1660 |
def write_sources(db: SQL.Database, session_name: String, sources: Sources): Unit = { |
1661 |
for (source_file <- sources) { |
|
77541 | 1662 |
db.execute_statement(Sources.table.insert(), body = |
1663 |
{ stmt => |
|
1664 |
stmt.string(1) = session_name |
|
1665 |
stmt.string(2) = source_file.name |
|
1666 |
stmt.string(3) = source_file.digest.toString |
|
1667 |
stmt.bool(4) = source_file.compressed |
|
1668 |
stmt.bytes(5) = source_file.body |
|
1669 |
}) |
|
76866
19bfc64a7310
clarified signature: more explicit types (see also 90c552d28d36);
wenzelm
parents:
76865
diff
changeset
|
1670 |
} |
19bfc64a7310
clarified signature: more explicit types (see also 90c552d28d36);
wenzelm
parents:
76865
diff
changeset
|
1671 |
} |
19bfc64a7310
clarified signature: more explicit types (see also 90c552d28d36);
wenzelm
parents:
76865
diff
changeset
|
1672 |
|
76868 | 1673 |
def read_sources( |
1674 |
db: SQL.Database, |
|
1675 |
session_name: String, |
|
1676 |
name: String = "" |
|
1677 |
): List[Source_File] = { |
|
77381
a86e346b20d8
misc tuning and clarification: more uniform use of optional "sql" in SQL.Table.delete/select;
wenzelm
parents:
77370
diff
changeset
|
1678 |
db.using_statement( |
a86e346b20d8
misc tuning and clarification: more uniform use of optional "sql" in SQL.Table.delete/select;
wenzelm
parents:
77370
diff
changeset
|
1679 |
Sources.table.select(sql = |
76870 | 1680 |
Sources.where_equal(session_name, name = name) + SQL.order_by(List(Sources.name))) |
77381
a86e346b20d8
misc tuning and clarification: more uniform use of optional "sql" in SQL.Table.delete/select;
wenzelm
parents:
77370
diff
changeset
|
1681 |
) { stmt => |
a86e346b20d8
misc tuning and clarification: more uniform use of optional "sql" in SQL.Table.delete/select;
wenzelm
parents:
77370
diff
changeset
|
1682 |
(stmt.execute_query().iterator { res => |
a86e346b20d8
misc tuning and clarification: more uniform use of optional "sql" in SQL.Table.delete/select;
wenzelm
parents:
77370
diff
changeset
|
1683 |
val res_name = res.string(Sources.name) |
a86e346b20d8
misc tuning and clarification: more uniform use of optional "sql" in SQL.Table.delete/select;
wenzelm
parents:
77370
diff
changeset
|
1684 |
val digest = SHA1.fake_digest(res.string(Sources.digest)) |
a86e346b20d8
misc tuning and clarification: more uniform use of optional "sql" in SQL.Table.delete/select;
wenzelm
parents:
77370
diff
changeset
|
1685 |
val compressed = res.bool(Sources.compressed) |
a86e346b20d8
misc tuning and clarification: more uniform use of optional "sql" in SQL.Table.delete/select;
wenzelm
parents:
77370
diff
changeset
|
1686 |
val body = res.bytes(Sources.body) |
a86e346b20d8
misc tuning and clarification: more uniform use of optional "sql" in SQL.Table.delete/select;
wenzelm
parents:
77370
diff
changeset
|
1687 |
Source_File(res_name, digest, compressed, body, cache.compress) |
a86e346b20d8
misc tuning and clarification: more uniform use of optional "sql" in SQL.Table.delete/select;
wenzelm
parents:
77370
diff
changeset
|
1688 |
}).toList |
a86e346b20d8
misc tuning and clarification: more uniform use of optional "sql" in SQL.Table.delete/select;
wenzelm
parents:
77370
diff
changeset
|
1689 |
} |
76855
5efc770dd727
store session sources within build database: timing e.g. 150ms for HOL and < 50ms for common sessions;
wenzelm
parents:
76850
diff
changeset
|
1690 |
} |
65281
c70e7d24a16d
SQL database operations for combined session info;
wenzelm
parents:
65278
diff
changeset
|
1691 |
} |
62631 | 1692 |
} |