author | wenzelm |
Fri, 11 Mar 2016 11:49:21 +0100 | |
changeset 62595 | 092c63734cc6 |
parent 62590 | 0c837beeb5e7 |
child 62596 | cf79f8866bc3 |
permissions | -rw-r--r-- |
50686 | 1 |
/* Title: Pure/Tools/build.scala |
48276 | 2 |
Author: Makarius |
57923 | 3 |
Options: :folding=explicit: |
48276 | 4 |
|
5 |
Build and manage Isabelle sessions. |
|
6 |
*/ |
|
7 |
||
8 |
package isabelle |
|
9 |
||
10 |
||
48548 | 11 |
import java.io.{BufferedInputStream, FileInputStream, |
48494 | 12 |
BufferedReader, InputStreamReader, IOException} |
13 |
import java.util.zip.GZIPInputStream |
|
48335 | 14 |
|
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
15 |
import scala.collection.SortedSet |
51397
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
16 |
import scala.collection.mutable |
48340
6f4fc030882a
allow explicit specification of additional session directories;
wenzelm
parents:
48339
diff
changeset
|
17 |
import scala.annotation.tailrec |
48337
9c7f8e5805b4
cumulate semantic Session_Info, based on syntactic Session_Entry;
wenzelm
parents:
48336
diff
changeset
|
18 |
|
48335 | 19 |
|
48276 | 20 |
object Build |
21 |
{ |
|
48337
9c7f8e5805b4
cumulate semantic Session_Info, based on syntactic Session_Entry;
wenzelm
parents:
48336
diff
changeset
|
22 |
/** session information **/ |
48334 | 23 |
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
24 |
// external version |
51397
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
25 |
abstract class Entry |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
26 |
sealed case class Chapter(name: String) extends Entry |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
27 |
sealed case class Session_Entry( |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
28 |
pos: Position.T, |
48738
f8c1a5b9488f
simplified session specifications: names are taken verbatim and current directory is default;
wenzelm
parents:
48737
diff
changeset
|
29 |
name: String, |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
30 |
groups: List[String], |
48738
f8c1a5b9488f
simplified session specifications: names are taken verbatim and current directory is default;
wenzelm
parents:
48737
diff
changeset
|
31 |
path: String, |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
32 |
parent: Option[String], |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
33 |
description: String, |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
34 |
options: List[Options.Spec], |
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
35 |
theories: List[(Boolean, List[Options.Spec], List[String])], |
56533
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
36 |
files: List[String], |
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
37 |
document_files: List[(String, String)]) extends Entry |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
38 |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
39 |
// internal version |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
40 |
sealed case class Session_Info( |
51397
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
41 |
chapter: String, |
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
42 |
select: Boolean, |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
43 |
pos: Position.T, |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
44 |
groups: List[String], |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
45 |
dir: Path, |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
46 |
parent: Option[String], |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
47 |
description: String, |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
48 |
options: Options, |
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
49 |
theories: List[(Boolean, Options, List[Path])], |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
50 |
files: List[Path], |
56533
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
51 |
document_files: List[(Path, Path)], |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
52 |
entry_digest: SHA1.Digest) |
61602 | 53 |
{ |
54 |
def timeout: Time = Time.seconds(options.real("timeout") * options.real("timeout_scale")) |
|
55 |
} |
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
56 |
|
62508
d0b68218ea55
discontinued RAW session: bootstrap directly from isabelle_process RAW_ML_SYSTEM;
wenzelm
parents:
62490
diff
changeset
|
57 |
def is_pure(name: String): Boolean = name == "Pure" |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
58 |
|
51397
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
59 |
def session_info(options: Options, select: Boolean, dir: Path, |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
60 |
chapter: String, entry: Session_Entry): (String, Session_Info) = |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
61 |
try { |
48738
f8c1a5b9488f
simplified session specifications: names are taken verbatim and current directory is default;
wenzelm
parents:
48737
diff
changeset
|
62 |
val name = entry.name |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
63 |
|
48738
f8c1a5b9488f
simplified session specifications: names are taken verbatim and current directory is default;
wenzelm
parents:
48737
diff
changeset
|
64 |
if (name == "") error("Bad session name") |
f8c1a5b9488f
simplified session specifications: names are taken verbatim and current directory is default;
wenzelm
parents:
48737
diff
changeset
|
65 |
if (is_pure(name) && entry.parent.isDefined) error("Illegal parent session") |
f8c1a5b9488f
simplified session specifications: names are taken verbatim and current directory is default;
wenzelm
parents:
48737
diff
changeset
|
66 |
if (!is_pure(name) && !entry.parent.isDefined) error("Missing parent session") |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
67 |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
68 |
val session_options = options ++ entry.options |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
69 |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
70 |
val theories = |
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
71 |
entry.theories.map({ case (global, opts, thys) => |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
72 |
(global, session_options ++ opts, thys.map(Path.explode(_))) }) |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
73 |
val files = entry.files.map(Path.explode(_)) |
56533
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
74 |
val document_files = |
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
75 |
entry.document_files.map({ case (s1, s2) => (Path.explode(s1), Path.explode(s2)) }) |
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
76 |
|
51397
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
77 |
val entry_digest = |
56533
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
78 |
SHA1.digest((chapter, name, entry.parent, entry.options, |
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
79 |
entry.theories, entry.files, entry.document_files).toString) |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
80 |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
81 |
val info = |
51397
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
82 |
Session_Info(chapter, select, entry.pos, entry.groups, dir + Path.explode(entry.path), |
56533
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
83 |
entry.parent, entry.description, session_options, theories, files, |
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
84 |
document_files, entry_digest) |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
85 |
|
48738
f8c1a5b9488f
simplified session specifications: names are taken verbatim and current directory is default;
wenzelm
parents:
48737
diff
changeset
|
86 |
(name, info) |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
87 |
} |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
88 |
catch { |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
89 |
case ERROR(msg) => |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
90 |
error(msg + "\nThe error(s) above occurred in session entry " + |
48992 | 91 |
quote(entry.name) + Position.here(entry.pos)) |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
92 |
} |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
93 |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
94 |
|
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
95 |
/* session tree */ |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
96 |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
97 |
object Session_Tree |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
98 |
{ |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
99 |
def apply(infos: Seq[(String, Session_Info)]): Session_Tree = |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
100 |
{ |
48680 | 101 |
val graph1 = |
102 |
(Graph.string[Session_Info] /: infos) { |
|
48684
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
103 |
case (graph, (name, info)) => |
48680 | 104 |
if (graph.defined(name)) |
54939 | 105 |
error("Duplicate session " + quote(name) + Position.here(info.pos) + |
106 |
Position.here(graph.get_node(name).pos)) |
|
48680 | 107 |
else graph.new_node(name, info) |
108 |
} |
|
109 |
val graph2 = |
|
56372
fadb0fef09d7
more explicit iterator terminology, in accordance to Scala 2.8 library;
wenzelm
parents:
56208
diff
changeset
|
110 |
(graph1 /: graph1.iterator) { |
48680 | 111 |
case (graph, (name, (info, _))) => |
112 |
info.parent match { |
|
113 |
case None => graph |
|
114 |
case Some(parent) => |
|
115 |
if (!graph.defined(parent)) |
|
116 |
error("Bad parent session " + quote(parent) + " for " + |
|
48992 | 117 |
quote(name) + Position.here(info.pos)) |
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
118 |
|
48680 | 119 |
try { graph.add_edge_acyclic(parent, name) } |
120 |
catch { |
|
121 |
case exn: Graph.Cycles[_] => |
|
122 |
error(cat_lines(exn.cycles.map(cycle => |
|
123 |
"Cyclic session dependency of " + |
|
124 |
cycle.map(c => quote(c.toString)).mkString(" via "))) + |
|
48992 | 125 |
Position.here(info.pos)) |
48680 | 126 |
} |
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
127 |
} |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
128 |
} |
48680 | 129 |
new Session_Tree(graph2) |
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
130 |
} |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
131 |
} |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
132 |
|
48680 | 133 |
final class Session_Tree private(val graph: Graph[String, Session_Info]) |
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
134 |
extends PartialFunction[String, Session_Info] |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
135 |
{ |
48680 | 136 |
def apply(name: String): Session_Info = graph.get_node(name) |
137 |
def isDefinedAt(name: String): Boolean = graph.defined(name) |
|
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
138 |
|
59892
2a616319c171
added isabelle build option -x, to exclude sessions;
wenzelm
parents:
59891
diff
changeset
|
139 |
def selection( |
2a616319c171
added isabelle build option -x, to exclude sessions;
wenzelm
parents:
59891
diff
changeset
|
140 |
requirements: Boolean = false, |
2a616319c171
added isabelle build option -x, to exclude sessions;
wenzelm
parents:
59891
diff
changeset
|
141 |
all_sessions: Boolean = false, |
60106 | 142 |
exclude_session_groups: List[String] = Nil, |
143 |
exclude_sessions: List[String] = Nil, |
|
59892
2a616319c171
added isabelle build option -x, to exclude sessions;
wenzelm
parents:
59891
diff
changeset
|
144 |
session_groups: List[String] = Nil, |
2a616319c171
added isabelle build option -x, to exclude sessions;
wenzelm
parents:
59891
diff
changeset
|
145 |
sessions: List[String] = Nil): (List[String], Session_Tree) = |
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
146 |
{ |
59892
2a616319c171
added isabelle build option -x, to exclude sessions;
wenzelm
parents:
59891
diff
changeset
|
147 |
val bad_sessions = |
2a616319c171
added isabelle build option -x, to exclude sessions;
wenzelm
parents:
59891
diff
changeset
|
148 |
SortedSet((exclude_sessions ::: sessions).filterNot(isDefinedAt(_)): _*).toList |
59319 | 149 |
if (bad_sessions.nonEmpty) error("Undefined session(s): " + commas_quote(bad_sessions)) |
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
150 |
|
60106 | 151 |
val excluded = |
152 |
{ |
|
153 |
val exclude_group = exclude_session_groups.toSet |
|
154 |
val exclude_group_sessions = |
|
155 |
(for { |
|
156 |
(name, (info, _)) <- graph.iterator |
|
157 |
if apply(name).groups.exists(exclude_group) |
|
158 |
} yield name).toList |
|
159 |
graph.all_succs(exclude_group_sessions ::: exclude_sessions).toSet |
|
160 |
} |
|
161 |
||
49131 | 162 |
val pre_selected = |
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
163 |
{ |
56372
fadb0fef09d7
more explicit iterator terminology, in accordance to Scala 2.8 library;
wenzelm
parents:
56208
diff
changeset
|
164 |
if (all_sessions) graph.keys |
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
165 |
else { |
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
166 |
val select_group = session_groups.toSet |
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
167 |
val select = sessions.toSet |
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
168 |
(for { |
56372
fadb0fef09d7
more explicit iterator terminology, in accordance to Scala 2.8 library;
wenzelm
parents:
56208
diff
changeset
|
169 |
(name, (info, _)) <- graph.iterator |
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
170 |
if info.select || select(name) || apply(name).groups.exists(select_group) |
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
171 |
} yield name).toList |
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
172 |
} |
59892
2a616319c171
added isabelle build option -x, to exclude sessions;
wenzelm
parents:
59891
diff
changeset
|
173 |
}.filterNot(excluded) |
2a616319c171
added isabelle build option -x, to exclude sessions;
wenzelm
parents:
59891
diff
changeset
|
174 |
|
49131 | 175 |
val selected = |
176 |
if (requirements) (graph.all_preds(pre_selected).toSet -- pre_selected).toList |
|
177 |
else pre_selected |
|
178 |
||
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
179 |
val graph1 = graph.restrict(graph.all_preds(selected).toSet) |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
180 |
(selected, new Session_Tree(graph1)) |
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
181 |
} |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
182 |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
183 |
def topological_order: List[(String, Session_Info)] = |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
184 |
graph.topological_order.map(name => (name, apply(name))) |
48794 | 185 |
|
56372
fadb0fef09d7
more explicit iterator terminology, in accordance to Scala 2.8 library;
wenzelm
parents:
56208
diff
changeset
|
186 |
override def toString: String = graph.keys_iterator.mkString("Session_Tree(", ", ", ")") |
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
187 |
} |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
188 |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
189 |
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
190 |
/* parser */ |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
191 |
|
51397
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
192 |
val chapter_default = "Unsorted" |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
193 |
|
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
194 |
private val CHAPTER = "chapter" |
48713
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
195 |
private val SESSION = "session" |
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
196 |
private val IN = "in" |
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
197 |
private val DESCRIPTION = "description" |
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
198 |
private val OPTIONS = "options" |
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
199 |
private val GLOBAL_THEORIES = "global_theories" |
48713
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
200 |
private val THEORIES = "theories" |
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
201 |
private val FILES = "files" |
56533
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
202 |
private val DOCUMENT_FILES = "document_files" |
48713
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
203 |
|
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
204 |
lazy val root_syntax = |
48738
f8c1a5b9488f
simplified session specifications: names are taken verbatim and current directory is default;
wenzelm
parents:
48737
diff
changeset
|
205 |
Outer_Syntax.init() + "(" + ")" + "+" + "," + "=" + "[" + "]" + |
51397
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
206 |
(CHAPTER, Keyword.THY_DECL) + (SESSION, Keyword.THY_DECL) + |
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
207 |
IN + DESCRIPTION + OPTIONS + GLOBAL_THEORIES + THEORIES + FILES + DOCUMENT_FILES |
48713
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
208 |
|
56780
e76467fed375
tuned signature -- accomodate operations of ROOT files;
wenzelm
parents:
56779
diff
changeset
|
209 |
object Parser extends Parse.Parser |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
210 |
{ |
56780
e76467fed375
tuned signature -- accomodate operations of ROOT files;
wenzelm
parents:
56779
diff
changeset
|
211 |
private val chapter: Parser[Chapter] = |
51397
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
212 |
{ |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
213 |
val chapter_name = atom("chapter name", _.is_name) |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
214 |
|
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
215 |
command(CHAPTER) ~! chapter_name ^^ { case _ ~ a => Chapter(a) } |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
216 |
} |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
217 |
|
56780
e76467fed375
tuned signature -- accomodate operations of ROOT files;
wenzelm
parents:
56779
diff
changeset
|
218 |
private val session_entry: Parser[Session_Entry] = |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
219 |
{ |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
220 |
val session_name = atom("session name", _.is_name) |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
221 |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
222 |
val option = |
58908 | 223 |
name ~ opt($$$("=") ~! name ^^ { case _ ~ x => x }) ^^ { case x ~ y => (x, y) } |
224 |
val options = $$$("[") ~> rep1sep(option, $$$(",")) <~ $$$("]") |
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
225 |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
226 |
val theories = |
58908 | 227 |
($$$(GLOBAL_THEORIES) | $$$(THEORIES)) ~! |
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
228 |
((options | success(Nil)) ~ rep(theory_xname)) ^^ |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
229 |
{ case x ~ (y ~ z) => (x == GLOBAL_THEORIES, y, z) } |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
230 |
|
56533
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
231 |
val document_files = |
58908 | 232 |
$$$(DOCUMENT_FILES) ~! |
233 |
(($$$("(") ~! ($$$(IN) ~! (path ~ $$$(")"))) ^^ |
|
56533
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
234 |
{ case _ ~ (_ ~ (x ~ _)) => x } | success("document")) ~ |
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
235 |
rep1(path)) ^^ { case _ ~ (x ~ y) => y.map((x, _)) } |
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
236 |
|
59811 | 237 |
command(SESSION) ~! |
238 |
(position(session_name) ~ |
|
58908 | 239 |
(($$$("(") ~! (rep1(name) <~ $$$(")")) ^^ { case _ ~ x => x }) | success(Nil)) ~ |
240 |
(($$$(IN) ~! path ^^ { case _ ~ x => x }) | success(".")) ~ |
|
241 |
($$$("=") ~! |
|
242 |
(opt(session_name ~! $$$("+") ^^ { case x ~ _ => x }) ~ |
|
243 |
(($$$(DESCRIPTION) ~! text ^^ { case _ ~ x => x }) | success("")) ~ |
|
244 |
(($$$(OPTIONS) ~! options ^^ { case _ ~ x => x }) | success(Nil)) ~ |
|
48916 | 245 |
rep1(theories) ~ |
58908 | 246 |
(($$$(FILES) ~! rep1(path) ^^ { case _ ~ x => x }) | success(Nil)) ~ |
56533
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
247 |
(rep(document_files) ^^ (x => x.flatten))))) ^^ |
59811 | 248 |
{ case _ ~ ((a, pos) ~ b ~ c ~ (_ ~ (d ~ e ~ f ~ g ~ h ~ i))) => |
56533
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
249 |
Session_Entry(pos, a, b, c, d, e, f, g, h, i) } |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
250 |
} |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
251 |
|
51397
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
252 |
def parse_entries(root: Path): List[(String, Session_Entry)] = |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
253 |
{ |
59083 | 254 |
val toks = Token.explode(root_syntax.keywords, File.read(root)) |
59705 | 255 |
val start = Token.Pos.file(root.implode) |
51397
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
256 |
|
59705 | 257 |
parse_all(rep(chapter | session_entry), Token.reader(toks, start)) match { |
51397
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
258 |
case Success(result, _) => |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
259 |
var chapter = chapter_default |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
260 |
val entries = new mutable.ListBuffer[(String, Session_Entry)] |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
261 |
result.foreach { |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
262 |
case Chapter(name) => chapter = name |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
263 |
case session_entry: Session_Entry => entries += ((chapter, session_entry)) |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
264 |
} |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
265 |
entries.toList |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
266 |
case bad => error(bad.toString) |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
267 |
} |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
268 |
} |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
269 |
} |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
270 |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
271 |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
272 |
/* find sessions within certain directories */ |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
273 |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
274 |
private val ROOT = Path.explode("ROOT") |
48684
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
275 |
private val ROOTS = Path.explode("ROOTS") |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
276 |
|
48684
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
277 |
private def is_session_dir(dir: Path): Boolean = |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
278 |
(dir + ROOT).is_file || (dir + ROOTS).is_file |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
279 |
|
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
280 |
private def check_session_dir(dir: Path): Path = |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
281 |
if (is_session_dir(dir)) dir |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
282 |
else error("Bad session root directory: " + dir.toString) |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
283 |
|
56890 | 284 |
def find_sessions(options: Options, dirs: List[Path] = Nil, select_dirs: List[Path] = Nil) |
285 |
: Session_Tree = |
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
286 |
{ |
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
287 |
def find_dir(select: Boolean, dir: Path): List[(String, Session_Info)] = |
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
288 |
find_root(select, dir) ::: find_roots(select, dir) |
48684
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
289 |
|
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
290 |
def find_root(select: Boolean, dir: Path): List[(String, Session_Info)] = |
48684
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
291 |
{ |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
292 |
val root = dir + ROOT |
51397
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
293 |
if (root.is_file) |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
294 |
Parser.parse_entries(root).map(p => session_info(options, select, dir, p._1, p._2)) |
48684
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
295 |
else Nil |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
296 |
} |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
297 |
|
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
298 |
def find_roots(select: Boolean, dir: Path): List[(String, Session_Info)] = |
48684
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
299 |
{ |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
300 |
val roots = dir + ROOTS |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
301 |
if (roots.is_file) { |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
302 |
for { |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
303 |
line <- split_lines(File.read(roots)) |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
304 |
if !(line == "" || line.startsWith("#")) |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
305 |
dir1 = |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
306 |
try { check_session_dir(dir + Path.explode(line)) } |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
307 |
catch { |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
308 |
case ERROR(msg) => |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
309 |
error(msg + "\nThe error(s) above occurred in session catalog " + roots.toString) |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
310 |
} |
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
311 |
info <- find_dir(select, dir1) |
48684
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
312 |
} yield info |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
313 |
} |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
314 |
else Nil |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
315 |
} |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
316 |
|
56890 | 317 |
val default_dirs = Isabelle_System.components().filter(is_session_dir(_)) |
318 |
dirs.foreach(check_session_dir(_)) |
|
319 |
select_dirs.foreach(check_session_dir(_)) |
|
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
320 |
|
48684
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
321 |
Session_Tree( |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
322 |
for { |
56890 | 323 |
(select, dir) <- (default_dirs ::: dirs).map((false, _)) ::: select_dirs.map((true, _)) |
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
324 |
info <- find_dir(select, dir) |
48684
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
325 |
} yield info) |
48349
a78e5d399599
support Session.Queue with ordering and dependencies;
wenzelm
parents:
48347
diff
changeset
|
326 |
} |
48334 | 327 |
|
48337
9c7f8e5805b4
cumulate semantic Session_Info, based on syntactic Session_Entry;
wenzelm
parents:
48336
diff
changeset
|
328 |
|
48424 | 329 |
|
330 |
/** build **/ |
|
331 |
||
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
332 |
/* queue */ |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
333 |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
334 |
object Queue |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
335 |
{ |
51230
19192615911e
option parallel_proofs_reuse_timing controls reuse of log information -- since it is not always beneficial for performance;
wenzelm
parents:
51229
diff
changeset
|
336 |
def apply(tree: Session_Tree, load_timings: String => (List[Properties.T], Double)): Queue = |
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
337 |
{ |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
338 |
val graph = tree.graph |
56372
fadb0fef09d7
more explicit iterator terminology, in accordance to Scala 2.8 library;
wenzelm
parents:
56208
diff
changeset
|
339 |
val sessions = graph.keys |
51220 | 340 |
|
59136
c2b23cb8a677
added Par_List in Scala, in accordance to ML version;
wenzelm
parents:
59083
diff
changeset
|
341 |
val timings = Par_List.map((name: String) => (name, load_timings(name)), sessions) |
51220 | 342 |
val command_timings = |
343 |
Map(timings.map({ case (name, (ts, _)) => (name, ts) }): _*).withDefaultValue(Nil) |
|
344 |
val session_timing = |
|
345 |
Map(timings.map({ case (name, (_, t)) => (name, t) }): _*).withDefaultValue(0.0) |
|
48678
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
346 |
|
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
347 |
def outdegree(name: String): Int = graph.imm_succs(name).size |
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
348 |
|
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
349 |
object Ordering extends scala.math.Ordering[String] |
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
350 |
{ |
51227
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
351 |
def compare_timing(name1: String, name2: String): Int = |
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
352 |
{ |
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
353 |
val t1 = session_timing(name1) |
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
354 |
val t2 = session_timing(name2) |
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
355 |
if (t1 == 0.0 || t2 == 0.0) 0 |
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
356 |
else t1 compare t2 |
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
357 |
} |
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
358 |
|
48678
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
359 |
def compare(name1: String, name2: String): Int = |
51229
6e40d0bb89e3
prefer outdegree in comparison again (cf. 88c96e836ed6) -- NB: big jobs might hide behind small ones in this naive queuing scheme;
wenzelm
parents:
51227
diff
changeset
|
360 |
outdegree(name2) compare outdegree(name1) match { |
48678
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
361 |
case 0 => |
51229
6e40d0bb89e3
prefer outdegree in comparison again (cf. 88c96e836ed6) -- NB: big jobs might hide behind small ones in this naive queuing scheme;
wenzelm
parents:
51227
diff
changeset
|
362 |
compare_timing(name2, name1) match { |
51220 | 363 |
case 0 => |
61602 | 364 |
tree(name2).timeout compare tree(name1).timeout match { |
51220 | 365 |
case 0 => name1 compare name2 |
366 |
case ord => ord |
|
367 |
} |
|
48678
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
368 |
case ord => ord |
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
369 |
} |
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
370 |
case ord => ord |
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
371 |
} |
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
372 |
} |
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
373 |
|
51220 | 374 |
new Queue(graph, SortedSet(sessions: _*)(Ordering), command_timings) |
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
375 |
} |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
376 |
} |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
377 |
|
51220 | 378 |
final class Queue private( |
379 |
graph: Graph[String, Session_Info], |
|
380 |
order: SortedSet[String], |
|
381 |
val command_timings: String => List[Properties.T]) |
|
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
382 |
{ |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
383 |
def is_inner(name: String): Boolean = !graph.is_maximal(name) |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
384 |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
385 |
def is_empty: Boolean = graph.is_empty |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
386 |
|
51227
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
387 |
def - (name: String): Queue = |
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
388 |
new Queue(graph.del_node(name), |
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
389 |
order - name, // FIXME scala-2.10.0 TreeSet problem!? |
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
390 |
command_timings) |
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
391 |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
392 |
def dequeue(skip: String => Boolean): Option[(String, Session_Info)] = |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
393 |
{ |
51227
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
394 |
val it = order.iterator.dropWhile(name => |
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
395 |
skip(name) |
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
396 |
|| !graph.defined(name) // FIXME scala-2.10.0 TreeSet problem!? |
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
397 |
|| !graph.is_minimal(name)) |
48680 | 398 |
if (it.hasNext) { val name = it.next; Some((name, graph.get_node(name))) } |
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
399 |
else None |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
400 |
} |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
401 |
} |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
402 |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
403 |
|
48710
5b51ccdc8623
prefer static Build.session_content for loaded theories -- discontinued incremental protocol;
wenzelm
parents:
48708
diff
changeset
|
404 |
/* source dependencies and static content */ |
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
405 |
|
48710
5b51ccdc8623
prefer static Build.session_content for loaded theories -- discontinued incremental protocol;
wenzelm
parents:
48708
diff
changeset
|
406 |
sealed case class Session_Content( |
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
407 |
loaded_theories: Set[String], |
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
408 |
known_theories: Map[String, Document.Node.Name], |
52439
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
409 |
keywords: Thy_Header.Keywords, |
48660
730ca503e955
static outer syntax based on session specifications;
wenzelm
parents:
48650
diff
changeset
|
410 |
syntax: Outer_Syntax, |
59444 | 411 |
sources: List[(Path, SHA1.Digest)], |
412 |
session_graph: Graph_Display.Graph) |
|
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
413 |
|
48710
5b51ccdc8623
prefer static Build.session_content for loaded theories -- discontinued incremental protocol;
wenzelm
parents:
48708
diff
changeset
|
414 |
sealed case class Deps(deps: Map[String, Session_Content]) |
48423
0ccf143a2a69
maintain set of source digests, including relevant parts of session entry;
wenzelm
parents:
48422
diff
changeset
|
415 |
{ |
48583 | 416 |
def is_empty: Boolean = deps.isEmpty |
48710
5b51ccdc8623
prefer static Build.session_content for loaded theories -- discontinued incremental protocol;
wenzelm
parents:
48708
diff
changeset
|
417 |
def apply(name: String): Session_Content = deps(name) |
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
418 |
def sources(name: String): List[SHA1.Digest] = deps(name).sources.map(_._2) |
48423
0ccf143a2a69
maintain set of source digests, including relevant parts of session entry;
wenzelm
parents:
48422
diff
changeset
|
419 |
} |
0ccf143a2a69
maintain set of source digests, including relevant parts of session entry;
wenzelm
parents:
48422
diff
changeset
|
420 |
|
59891
9ce697050455
added isabelle build option -k, for fast off-line checking of theory sources;
wenzelm
parents:
59811
diff
changeset
|
421 |
def dependencies( |
9ce697050455
added isabelle build option -k, for fast off-line checking of theory sources;
wenzelm
parents:
59811
diff
changeset
|
422 |
progress: Progress = Ignore_Progress, |
9ce697050455
added isabelle build option -k, for fast off-line checking of theory sources;
wenzelm
parents:
59811
diff
changeset
|
423 |
inlined_files: Boolean = false, |
9ce697050455
added isabelle build option -k, for fast off-line checking of theory sources;
wenzelm
parents:
59811
diff
changeset
|
424 |
verbose: Boolean = false, |
9ce697050455
added isabelle build option -k, for fast off-line checking of theory sources;
wenzelm
parents:
59811
diff
changeset
|
425 |
list_files: Boolean = false, |
9ce697050455
added isabelle build option -k, for fast off-line checking of theory sources;
wenzelm
parents:
59811
diff
changeset
|
426 |
check_keywords: Set[String] = Set.empty, |
9ce697050455
added isabelle build option -k, for fast off-line checking of theory sources;
wenzelm
parents:
59811
diff
changeset
|
427 |
tree: Session_Tree): Deps = |
48710
5b51ccdc8623
prefer static Build.session_content for loaded theories -- discontinued incremental protocol;
wenzelm
parents:
48708
diff
changeset
|
428 |
Deps((Map.empty[String, Session_Content] /: tree.topological_order)( |
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
429 |
{ case (deps, (name, info)) => |
56668
56335a8e2e8b
interruptible dependencies, which can take a few seconds;
wenzelm
parents:
56667
diff
changeset
|
430 |
if (progress.stopped) throw Exn.Interrupt() |
56335a8e2e8b
interruptible dependencies, which can take a few seconds;
wenzelm
parents:
56667
diff
changeset
|
431 |
|
54549
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
432 |
try { |
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
433 |
val (loaded_theories0, known_theories0, syntax0) = |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
434 |
info.parent.map(deps(_)) match { |
54549
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
435 |
case None => |
58928
23d0ffd48006
plain value Keywords.keywords, which might be used outside theory for bootstrap purposes;
wenzelm
parents:
58918
diff
changeset
|
436 |
(Set.empty[String], Map.empty[String, Document.Node.Name], |
59736
5c1a0069b9d3
tight span for theory header, which is relevant for error positions (including semantic completion);
wenzelm
parents:
59723
diff
changeset
|
437 |
Thy_Header.bootstrap_syntax) |
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
438 |
case Some(parent) => |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
439 |
(parent.loaded_theories, parent.known_theories, parent.syntax) |
54549
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
440 |
} |
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
441 |
val resources = new Resources(loaded_theories0, known_theories0, syntax0) |
56208 | 442 |
val thy_info = new Thy_Info(resources) |
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
443 |
|
54549
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
444 |
if (verbose || list_files) { |
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
445 |
val groups = |
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
446 |
if (info.groups.isEmpty) "" |
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
447 |
else info.groups.mkString(" (", " ", ")") |
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
448 |
progress.echo("Session " + info.chapter + "/" + name + groups) |
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
449 |
} |
48478 | 450 |
|
54549
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
451 |
val thy_deps = |
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
452 |
{ |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
453 |
val root_theories = |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
454 |
info.theories.flatMap({ |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
455 |
case (global, _, thys) => |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
456 |
thys.map(thy => |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
457 |
(resources.node_name( |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
458 |
if (global) "" else name, info.dir + Resources.thy_path(thy)), info.pos)) |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
459 |
}) |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
460 |
val thy_deps = thy_info.dependencies(name, root_theories) |
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
461 |
|
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
462 |
thy_deps.errors match { |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
463 |
case Nil => thy_deps |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
464 |
case errs => error(cat_lines(errs)) |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
465 |
} |
54549
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
466 |
} |
51294
0850d43cb355
discontinued obsolete header "files" -- these are loaded explicitly after exploring dependencies;
wenzelm
parents:
51293
diff
changeset
|
467 |
|
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
468 |
val known_theories = |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
469 |
(known_theories0 /: thy_deps.deps)({ case (known, dep) => |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
470 |
val name = dep.name |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
471 |
known.get(name.theory) match { |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
472 |
case Some(name1) if name != name1 => |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
473 |
error("Duplicate theory " + quote(name.node) + " vs. " + quote(name1.node)) |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
474 |
case _ => |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
475 |
known + (name.theory -> name) + (Long_Name.base_name(name.theory) -> name) |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
476 |
} |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
477 |
}) |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
478 |
|
54549
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
479 |
val loaded_theories = thy_deps.loaded_theories |
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
480 |
val keywords = thy_deps.keywords |
56393
22f533e6a049
more abstract Prover.Syntax, as proposed by Carst Tankink;
wenzelm
parents:
56392
diff
changeset
|
481 |
val syntax = thy_deps.syntax.asInstanceOf[Outer_Syntax] |
48660
730ca503e955
static outer syntax based on session specifications;
wenzelm
parents:
48650
diff
changeset
|
482 |
|
59891
9ce697050455
added isabelle build option -k, for fast off-line checking of theory sources;
wenzelm
parents:
59811
diff
changeset
|
483 |
val theory_files = thy_deps.deps.map(dep => Path.explode(dep.name.node)) |
56392 | 484 |
val loaded_files = if (inlined_files) thy_deps.loaded_files else Nil |
48903 | 485 |
|
54549
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
486 |
val all_files = |
59891
9ce697050455
added isabelle build option -k, for fast off-line checking of theory sources;
wenzelm
parents:
59811
diff
changeset
|
487 |
(theory_files ::: loaded_files ::: |
56533
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
488 |
info.files.map(file => info.dir + file) ::: |
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
489 |
info.document_files.map(file => info.dir + file._1 + file._2)).map(_.expand) |
54549
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
490 |
|
56824
5ae68f53b7c2
discontinued adhoc check (see also ea8343187225);
wenzelm
parents:
56801
diff
changeset
|
491 |
if (list_files) |
54549
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
492 |
progress.echo(cat_lines(all_files.map(_.implode).sorted.map(" " + _))) |
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
493 |
|
59895 | 494 |
if (check_keywords.nonEmpty) |
495 |
Check_Keywords.check_keywords(progress, syntax.keywords, check_keywords, theory_files) |
|
59891
9ce697050455
added isabelle build option -k, for fast off-line checking of theory sources;
wenzelm
parents:
59811
diff
changeset
|
496 |
|
54549
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
497 |
val sources = all_files.map(p => (p, SHA1.digest(p.file))) |
48903 | 498 |
|
60077 | 499 |
val session_graph = |
500 |
Present.session_graph(info.parent getOrElse "", loaded_theories0, thy_deps.deps) |
|
59444 | 501 |
|
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
502 |
val content = |
59444 | 503 |
Session_Content(loaded_theories, known_theories, keywords, syntax, |
504 |
sources, session_graph) |
|
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
505 |
deps + (name -> content) |
54549
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
506 |
} |
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
507 |
catch { |
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
508 |
case ERROR(msg) => |
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
509 |
cat_error(msg, "The error(s) above occurred in session " + |
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
510 |
quote(name) + Position.here(info.pos)) |
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
511 |
} |
48423
0ccf143a2a69
maintain set of source digests, including relevant parts of session entry;
wenzelm
parents:
48422
diff
changeset
|
512 |
})) |
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
513 |
|
52439
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
514 |
def session_dependencies( |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
515 |
options: Options, |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
516 |
inlined_files: Boolean, |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
517 |
dirs: List[Path], |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
518 |
sessions: List[String]): Deps = |
48710
5b51ccdc8623
prefer static Build.session_content for loaded theories -- discontinued incremental protocol;
wenzelm
parents:
48708
diff
changeset
|
519 |
{ |
59892
2a616319c171
added isabelle build option -x, to exclude sessions;
wenzelm
parents:
59891
diff
changeset
|
520 |
val (_, tree) = find_sessions(options, dirs = dirs).selection(sessions = sessions) |
59891
9ce697050455
added isabelle build option -k, for fast off-line checking of theory sources;
wenzelm
parents:
59811
diff
changeset
|
521 |
dependencies(inlined_files = inlined_files, tree = tree) |
48710
5b51ccdc8623
prefer static Build.session_content for loaded theories -- discontinued incremental protocol;
wenzelm
parents:
48708
diff
changeset
|
522 |
} |
5b51ccdc8623
prefer static Build.session_content for loaded theories -- discontinued incremental protocol;
wenzelm
parents:
48708
diff
changeset
|
523 |
|
52439
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
524 |
def session_content( |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
525 |
options: Options, |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
526 |
inlined_files: Boolean, |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
527 |
dirs: List[Path], |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
528 |
session: String): Session_Content = |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
529 |
{ |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
530 |
session_dependencies(options, inlined_files, dirs, List(session))(session) |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
531 |
} |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
532 |
|
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
533 |
def outer_syntax(options: Options, session: String): Outer_Syntax = |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
534 |
session_content(options, false, Nil, session).syntax |
48710
5b51ccdc8623
prefer static Build.session_content for loaded theories -- discontinued incremental protocol;
wenzelm
parents:
48708
diff
changeset
|
535 |
|
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
536 |
|
48424 | 537 |
/* jobs */ |
48341 | 538 |
|
52114 | 539 |
private class Job(progress: Progress, |
59445 | 540 |
name: String, val info: Session_Info, output: Path, do_output: Boolean, verbose: Boolean, |
541 |
browser_info: Path, session_graph: Graph_Display.Graph, command_timings: List[Properties.T]) |
|
48418 | 542 |
{ |
48674 | 543 |
def output_path: Option[Path] = if (do_output) Some(output) else None |
62469 | 544 |
def output_standard_path: String = if (do_output) File.standard_path(output) else "" |
48674 | 545 |
|
546 |
private val parent = info.parent.getOrElse("") |
|
48418 | 547 |
|
59445 | 548 |
private val graph_file = Isabelle_System.tmp_file("session_graph", "pdf") |
549 |
try { isabelle.graphview.Graph_File.write(info.options, graph_file, session_graph) } |
|
550 |
catch { case ERROR(_) => /*error should be exposed in ML*/ } |
|
551 |
||
56428
1acf2d76ac23
more standard Isabelle_System.tmp_file and tmp_dir operations, in accordance to ML version;
wenzelm
parents:
56393
diff
changeset
|
552 |
private val args_file = Isabelle_System.tmp_file("args") |
62573 | 553 |
private val args_standard_path = File.standard_path(args_file) |
48698
2585042b1a30
pass Isabelle/Scala system options into ML process of Isar tty or build jobs;
wenzelm
parents:
48684
diff
changeset
|
554 |
File.write(args_file, YXML.string_of_body( |
2585042b1a30
pass Isabelle/Scala system options into ML process of Isar tty or build jobs;
wenzelm
parents:
48684
diff
changeset
|
555 |
if (is_pure(name)) Options.encode(info.options) |
2585042b1a30
pass Isabelle/Scala system options into ML process of Isar tty or build jobs;
wenzelm
parents:
48684
diff
changeset
|
556 |
else |
2585042b1a30
pass Isabelle/Scala system options into ML process of Isar tty or build jobs;
wenzelm
parents:
48684
diff
changeset
|
557 |
{ |
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
558 |
val theories = info.theories.map(x => (x._2, x._3)) |
48698
2585042b1a30
pass Isabelle/Scala system options into ML process of Isar tty or build jobs;
wenzelm
parents:
48684
diff
changeset
|
559 |
import XML.Encode._ |
62469 | 560 |
pair(list(pair(string, int)), pair(list(properties), pair(string, pair(Options.encode, |
61376
93224745477f
output HTML text according to Isabelle/Scala Symbol.Interpretation;
wenzelm
parents:
61375
diff
changeset
|
561 |
pair(bool, pair(Path.encode, pair(list(pair(Path.encode, Path.encode)), pair(string, |
93224745477f
output HTML text according to Isabelle/Scala Symbol.Interpretation;
wenzelm
parents:
61375
diff
changeset
|
562 |
pair(string, pair(string, pair(string, |
93224745477f
output HTML text according to Isabelle/Scala Symbol.Interpretation;
wenzelm
parents:
61375
diff
changeset
|
563 |
list(pair(Options.encode, list(Path.encode))))))))))))))( |
62469 | 564 |
(Symbol.codes, (command_timings, (output_standard_path, (info.options, |
61376
93224745477f
output HTML text according to Isabelle/Scala Symbol.Interpretation;
wenzelm
parents:
61375
diff
changeset
|
565 |
(verbose, (browser_info, (info.document_files, (File.standard_path(graph_file), |
93224745477f
output HTML text according to Isabelle/Scala Symbol.Interpretation;
wenzelm
parents:
61375
diff
changeset
|
566 |
(parent, (info.chapter, (name, |
93224745477f
output HTML text according to Isabelle/Scala Symbol.Interpretation;
wenzelm
parents:
61375
diff
changeset
|
567 |
theories)))))))))))) |
48698
2585042b1a30
pass Isabelle/Scala system options into ML process of Isar tty or build jobs;
wenzelm
parents:
48684
diff
changeset
|
568 |
})) |
2585042b1a30
pass Isabelle/Scala system options into ML process of Isar tty or build jobs;
wenzelm
parents:
48684
diff
changeset
|
569 |
|
62573 | 570 |
output.file.delete |
571 |
||
572 |
private val env = Map("ISABELLE_ML_DEBUGGER" -> info.options.bool("ML_debugger").toString) |
|
48698
2585042b1a30
pass Isabelle/Scala system options into ML process of Isar tty or build jobs;
wenzelm
parents:
48684
diff
changeset
|
573 |
|
62573 | 574 |
private val future_result: Future[Process_Result] = |
61559
313eca3fa847
more direct task future implementation, with proper cancel operation;
wenzelm
parents:
61556
diff
changeset
|
575 |
Future.thread("build") { |
62573 | 576 |
val process = |
577 |
if (is_pure(name)) { |
|
578 |
val eval = |
|
579 |
"Command_Line.tool0 (fn () => (Session.finish (); Options.reset_default ();" + |
|
580 |
" Session.shutdown (); ML_Heap.share_common_data ();" + |
|
581 |
" ML_Heap.save_state " + ML_Syntax.print_string_raw(output_standard_path) + "));" |
|
582 |
val env1 = env + ("ISABELLE_PROCESS_OPTIONS" -> args_standard_path) |
|
583 |
ML_Process(info.options, "RAW_ML_SYSTEM", List("--use", "ROOT.ML", "--eval", eval), |
|
584 |
cwd = info.dir.file, env = env1) |
|
585 |
} |
|
586 |
else { |
|
587 |
ML_Process(info.options, parent, |
|
588 |
List("--eval", "Build.build " + ML_Syntax.print_string_raw(args_standard_path)), |
|
589 |
cwd = info.dir.file, env = env) |
|
590 |
} |
|
591 |
process.result( |
|
51962
016cb7d8f297
limit build process output, to avoid bombing Isabelle/Scala process by ill-behaved jobs (e.g. Containers in AFP/9025435b29cf);
wenzelm
parents:
51663
diff
changeset
|
592 |
progress_stdout = (line: String) => |
50847 | 593 |
Library.try_unprefix("\floading_theory = ", line) match { |
594 |
case Some(theory) => progress.theory(name, theory) |
|
595 |
case None => |
|
51962
016cb7d8f297
limit build process output, to avoid bombing Isabelle/Scala process by ill-behaved jobs (e.g. Containers in AFP/9025435b29cf);
wenzelm
parents:
51663
diff
changeset
|
596 |
}, |
016cb7d8f297
limit build process output, to avoid bombing Isabelle/Scala process by ill-behaved jobs (e.g. Containers in AFP/9025435b29cf);
wenzelm
parents:
51663
diff
changeset
|
597 |
progress_limit = |
016cb7d8f297
limit build process output, to avoid bombing Isabelle/Scala process by ill-behaved jobs (e.g. Containers in AFP/9025435b29cf);
wenzelm
parents:
51663
diff
changeset
|
598 |
info.options.int("process_output_limit") match { |
016cb7d8f297
limit build process output, to avoid bombing Isabelle/Scala process by ill-behaved jobs (e.g. Containers in AFP/9025435b29cf);
wenzelm
parents:
51663
diff
changeset
|
599 |
case 0 => None |
016cb7d8f297
limit build process output, to avoid bombing Isabelle/Scala process by ill-behaved jobs (e.g. Containers in AFP/9025435b29cf);
wenzelm
parents:
51663
diff
changeset
|
600 |
case m => Some(m * 1000000L) |
56871
d06ff36b4fa7
expose interrupts more like ML version, but not in managed bash processes of Build;
wenzelm
parents:
56861
diff
changeset
|
601 |
}, |
d06ff36b4fa7
expose interrupts more like ML version, but not in managed bash processes of Build;
wenzelm
parents:
56861
diff
changeset
|
602 |
strict = false) |
50845 | 603 |
} |
48674 | 604 |
|
62572 | 605 |
def terminate: Unit = future_result.cancel |
606 |
def is_finished: Boolean = future_result.is_finished |
|
48674 | 607 |
|
62569 | 608 |
@volatile private var was_timeout = false |
56779 | 609 |
private val timeout_request: Option[Event_Timer.Request] = |
610 |
{ |
|
62569 | 611 |
if (info.timeout > Time.zero) |
612 |
Some(Event_Timer.request(Time.now() + info.timeout) { terminate; was_timeout = true }) |
|
48674 | 613 |
else None |
56779 | 614 |
} |
48674 | 615 |
|
62400 | 616 |
def join: Process_Result = |
50845 | 617 |
{ |
62572 | 618 |
val result = future_result.join |
50845 | 619 |
|
62572 | 620 |
if (result.ok && !is_pure(name)) |
61372 | 621 |
Present.finish(progress, browser_info, graph_file, info, name) |
622 |
||
59445 | 623 |
graph_file.delete |
48674 | 624 |
args_file.delete |
56779 | 625 |
timeout_request.foreach(_.cancel) |
48674 | 626 |
|
62572 | 627 |
if (result.interrupted) { |
628 |
if (was_timeout) result.error(Output.error_text("Timeout")).was_timeout |
|
629 |
else result.error(Output.error_text("Interrupt")) |
|
52063
fd533ac64390
timeout counts as regular error, with rc = 1 (cf. special Exn.Interrupt vs. regular TimeLimit.TimeOut in Isabelle/ML);
wenzelm
parents:
51987
diff
changeset
|
630 |
} |
62572 | 631 |
else result |
48674 | 632 |
} |
48364 | 633 |
} |
634 |
||
48424 | 635 |
|
51045
630c0895d9d1
more efficient inlined properties, especially relevant for voluminous tasks trace;
wenzelm
parents:
50982
diff
changeset
|
636 |
/* inlined properties (YXML) */ |
50946
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
637 |
|
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
638 |
object Props |
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
639 |
{ |
51045
630c0895d9d1
more efficient inlined properties, especially relevant for voluminous tasks trace;
wenzelm
parents:
50982
diff
changeset
|
640 |
def parse(text: String): Properties.T = XML.Decode.properties(YXML.parse_body(text)) |
50946
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
641 |
|
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
642 |
def parse_lines(prefix: String, lines: List[String]): List[Properties.T] = |
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
643 |
for (line <- lines; s <- Library.try_unprefix(prefix, line)) yield parse(s) |
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
644 |
|
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
645 |
def find_parse_line(prefix: String, lines: List[String]): Option[Properties.T] = |
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
646 |
lines.find(_.startsWith(prefix)).map(line => parse(line.substring(prefix.length))) |
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
647 |
} |
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
648 |
|
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
649 |
|
50777 | 650 |
/* log files */ |
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
651 |
|
48505 | 652 |
private val LOG = Path.explode("log") |
653 |
private def log(name: String): Path = LOG + Path.basic(name) |
|
654 |
private def log_gz(name: String): Path = log(name).ext("gz") |
|
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
655 |
|
50982 | 656 |
private val SESSION_NAME = "\fSession.name = " |
50707
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
657 |
|
50946
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
658 |
|
50975 | 659 |
sealed case class Log_Info( |
51220 | 660 |
name: String, |
661 |
stats: List[Properties.T], |
|
662 |
tasks: List[Properties.T], |
|
663 |
command_timings: List[Properties.T], |
|
664 |
session_timing: Properties.T) |
|
50777 | 665 |
|
51220 | 666 |
def parse_log(full_stats: Boolean, text: String): Log_Info = |
50777 | 667 |
{ |
668 |
val lines = split_lines(text) |
|
51223 | 669 |
val xml_cache = new XML.Cache() |
670 |
def parse_lines(prfx: String): List[Properties.T] = |
|
51663 | 671 |
Props.parse_lines(prfx, lines).map(xml_cache.props(_)) |
51223 | 672 |
|
50982 | 673 |
val name = |
674 |
lines.find(_.startsWith(SESSION_NAME)).map(_.substring(SESSION_NAME.length)) getOrElse "" |
|
51223 | 675 |
val stats = if (full_stats) parse_lines("\fML_statistics = ") else Nil |
676 |
val tasks = if (full_stats) parse_lines("\ftask_statistics = ") else Nil |
|
677 |
val command_timings = parse_lines("\fcommand_timing = ") |
|
51220 | 678 |
val session_timing = Props.find_parse_line("\fTiming = ", lines) getOrElse Nil |
679 |
Log_Info(name, stats, tasks, command_timings, session_timing) |
|
50777 | 680 |
} |
681 |
||
682 |
||
683 |
/* sources and heaps */ |
|
684 |
||
48505 | 685 |
private def sources_stamp(digests: List[SHA1.Digest]): String = |
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
686 |
digests.map(_.toString).sorted.mkString("sources: ", " ", "") |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
687 |
|
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
688 |
private val no_heap: String = "heap: -" |
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
689 |
|
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
690 |
private def heap_stamp(heap: Option[Path]): String = |
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
691 |
{ |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
692 |
"heap: " + |
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
693 |
(heap match { |
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
694 |
case Some(path) => |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
695 |
val file = path.file |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
696 |
if (file.isFile) file.length.toString + " " + file.lastModified.toString |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
697 |
else "-" |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
698 |
case None => "-" |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
699 |
}) |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
700 |
} |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
701 |
|
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
702 |
private def read_stamps(path: Path): Option[(String, String, String)] = |
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
703 |
if (path.is_file) { |
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
704 |
val stream = new GZIPInputStream (new BufferedInputStream(new FileInputStream(path.file))) |
50203 | 705 |
val reader = new BufferedReader(new InputStreamReader(stream, UTF8.charset)) |
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
706 |
val (s, h1, h2) = |
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
707 |
try { (reader.readLine, reader.readLine, reader.readLine) } |
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
708 |
finally { reader.close } |
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
709 |
if (s != null && s.startsWith("sources: ") && |
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
710 |
h1 != null && h1.startsWith("heap: ") && |
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
711 |
h2 != null && h2.startsWith("heap: ")) Some((s, h1, h2)) |
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
712 |
else None |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
713 |
} |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
714 |
else None |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
715 |
|
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
716 |
|
52114 | 717 |
/* build_results */ |
48424 | 718 |
|
62403 | 719 |
class Build_Results private [Build](results: Map[String, Option[Process_Result]]) |
720 |
{ |
|
721 |
def sessions: Set[String] = results.keySet |
|
722 |
def cancelled(name: String): Boolean = results(name).isEmpty |
|
62406 | 723 |
def apply(name: String): Process_Result = results(name).getOrElse(Process_Result(1)) |
62403 | 724 |
val rc = (0 /: results.iterator.map({ case (_, Some(r)) => r.rc case (_, None) => 1 }))(_ max _) |
62406 | 725 |
|
726 |
override def toString: String = rc.toString |
|
62403 | 727 |
} |
728 |
||
52114 | 729 |
def build_results( |
50404
898cac1dad5e
avoid startup within GUI thread -- it is only required later for dialog;
wenzelm
parents:
50367
diff
changeset
|
730 |
options: Options, |
52115 | 731 |
progress: Progress = Ignore_Progress, |
49131 | 732 |
requirements: Boolean = false, |
48509 | 733 |
all_sessions: Boolean = false, |
48511
37999ee01156
remove old output heaps, to ensure that result is valid wrt. check_stamps;
wenzelm
parents:
48509
diff
changeset
|
734 |
build_heap: Boolean = false, |
48595 | 735 |
clean_build: Boolean = false, |
56890 | 736 |
dirs: List[Path] = Nil, |
737 |
select_dirs: List[Path] = Nil, |
|
60106 | 738 |
exclude_session_groups: List[String] = Nil, |
48509 | 739 |
session_groups: List[String] = Nil, |
740 |
max_jobs: Int = 1, |
|
48903 | 741 |
list_files: Boolean = false, |
59891
9ce697050455
added isabelle build option -k, for fast off-line checking of theory sources;
wenzelm
parents:
59811
diff
changeset
|
742 |
check_keywords: Set[String] = Set.empty, |
48509 | 743 |
no_build: Boolean = false, |
744 |
system_mode: Boolean = false, |
|
745 |
verbose: Boolean = false, |
|
59892
2a616319c171
added isabelle build option -x, to exclude sessions;
wenzelm
parents:
59891
diff
changeset
|
746 |
exclude_sessions: List[String] = Nil, |
62403 | 747 |
sessions: List[String] = Nil): Build_Results = |
48341 | 748 |
{ |
51220 | 749 |
/* session tree and dependencies */ |
750 |
||
59723
193f12622072
suppress semantic completion in errors of batch build -- avoid junk in log files;
wenzelm
parents:
59705
diff
changeset
|
751 |
val full_tree = find_sessions(options.int("completion_limit") = 0, dirs, select_dirs) |
49131 | 752 |
val (selected, selected_tree) = |
60106 | 753 |
full_tree.selection(requirements, all_sessions, |
754 |
exclude_session_groups, exclude_sessions, session_groups, sessions) |
|
49131 | 755 |
|
59891
9ce697050455
added isabelle build option -k, for fast off-line checking of theory sources;
wenzelm
parents:
59811
diff
changeset
|
756 |
val deps = dependencies(progress, true, verbose, list_files, check_keywords, selected_tree) |
48368 | 757 |
|
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
758 |
def make_stamp(name: String): String = |
49131 | 759 |
sources_stamp(selected_tree(name).entry_digest :: deps.sources(name)) |
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
760 |
|
51220 | 761 |
|
762 |
/* persistent information */ |
|
763 |
||
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
764 |
val (input_dirs, output_dir, browser_info) = |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
765 |
if (system_mode) { |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
766 |
val output_dir = Path.explode("~~/heaps/$ML_IDENTIFIER") |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
767 |
(List(output_dir), output_dir, Path.explode("~~/browser_info")) |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
768 |
} |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
769 |
else { |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
770 |
val output_dir = Path.explode("$ISABELLE_OUTPUT") |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
771 |
(output_dir :: Isabelle_System.find_logics_dirs(), output_dir, |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
772 |
Path.explode("$ISABELLE_BROWSER_INFO")) |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
773 |
} |
48363 | 774 |
|
51221 | 775 |
def find_log(name: String): Option[(Path, Path)] = |
776 |
input_dirs.find(dir => (dir + log(name)).is_file).map(dir => (dir, dir + log(name))) |
|
51220 | 777 |
|
778 |
||
779 |
/* queue with scheduling information */ |
|
780 |
||
51230
19192615911e
option parallel_proofs_reuse_timing controls reuse of log information -- since it is not always beneficial for performance;
wenzelm
parents:
51229
diff
changeset
|
781 |
def load_timings(name: String): (List[Properties.T], Double) = |
51221 | 782 |
{ |
783 |
val (path, text) = |
|
784 |
find_log(name + ".gz") match { |
|
785 |
case Some((_, path)) => (path, File.read_gzip(path)) |
|
786 |
case None => |
|
787 |
find_log(name) match { |
|
788 |
case Some((_, path)) => (path, File.read(path)) |
|
789 |
case None => (Path.current, "") |
|
790 |
} |
|
791 |
} |
|
51244
d8ca566b22b3
more robust load_timings: ignore XML.Decode errors as well;
wenzelm
parents:
51230
diff
changeset
|
792 |
|
d8ca566b22b3
more robust load_timings: ignore XML.Decode errors as well;
wenzelm
parents:
51230
diff
changeset
|
793 |
def ignore_error(msg: String): (List[Properties.T], Double) = |
d8ca566b22b3
more robust load_timings: ignore XML.Decode errors as well;
wenzelm
parents:
51230
diff
changeset
|
794 |
{ |
56782
433cf57550fa
more systematic Isabelle output, like in classic Isabelle/ML (without markup);
wenzelm
parents:
56780
diff
changeset
|
795 |
Output.warning("Ignoring bad log file: " + path + (if (msg == "") "" else "\n" + msg)) |
51244
d8ca566b22b3
more robust load_timings: ignore XML.Decode errors as well;
wenzelm
parents:
51230
diff
changeset
|
796 |
(Nil, 0.0) |
d8ca566b22b3
more robust load_timings: ignore XML.Decode errors as well;
wenzelm
parents:
51230
diff
changeset
|
797 |
} |
d8ca566b22b3
more robust load_timings: ignore XML.Decode errors as well;
wenzelm
parents:
51230
diff
changeset
|
798 |
|
51221 | 799 |
try { |
800 |
val info = parse_log(false, text) |
|
801 |
val session_timing = Markup.Elapsed.unapply(info.session_timing) getOrElse 0.0 |
|
802 |
(info.command_timings, session_timing) |
|
51220 | 803 |
} |
51221 | 804 |
catch { |
51244
d8ca566b22b3
more robust load_timings: ignore XML.Decode errors as well;
wenzelm
parents:
51230
diff
changeset
|
805 |
case ERROR(msg) => ignore_error(msg) |
51986
5fdca5bfc0b4
more robust load_timings: ignore JVM errors such as java.lang.OutOfMemoryError;
wenzelm
parents:
51983
diff
changeset
|
806 |
case exn: java.lang.Error => ignore_error(Exn.message(exn)) |
51987 | 807 |
case _: XML.Error => ignore_error("") |
51221 | 808 |
} |
809 |
} |
|
51220 | 810 |
|
51230
19192615911e
option parallel_proofs_reuse_timing controls reuse of log information -- since it is not always beneficial for performance;
wenzelm
parents:
51229
diff
changeset
|
811 |
val queue = Queue(selected_tree, load_timings) |
51220 | 812 |
|
813 |
||
814 |
/* main build process */ |
|
815 |
||
48373 | 816 |
// prepare log dir |
50893
d55eb82ae77b
Isabelle_System.mkdirs with explicit error checking (in accordance to ML version), e.g. relevant with read-only DMG file-system on Mac OS X;
wenzelm
parents:
50847
diff
changeset
|
817 |
Isabelle_System.mkdirs(output_dir + LOG) |
48373 | 818 |
|
48595 | 819 |
// optional cleanup |
820 |
if (clean_build) { |
|
49131 | 821 |
for (name <- full_tree.graph.all_succs(selected)) { |
48595 | 822 |
val files = |
823 |
List(Path.basic(name), log(name), log_gz(name)).map(output_dir + _).filter(_.is_file) |
|
59319 | 824 |
if (files.nonEmpty) progress.echo("Cleaning " + name + " ...") |
50366 | 825 |
if (!files.forall(p => p.file.delete)) progress.echo(name + " FAILED to delete") |
48595 | 826 |
} |
827 |
} |
|
828 |
||
48425 | 829 |
// scheduler loop |
62402 | 830 |
case class Result(current: Boolean, heap: String, process: Option[Process_Result]) |
831 |
{ |
|
832 |
def ok: Boolean = |
|
833 |
process match { |
|
834 |
case None => false |
|
835 |
case Some(res) => res.rc == 0 |
|
836 |
} |
|
837 |
} |
|
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
838 |
|
56837
5a598f1eecfd
more robust interrupt handling for Scala_Console, which uses JVM Thread.interrupt instead of POSIX SIGINT;
wenzelm
parents:
56831
diff
changeset
|
839 |
def sleep() |
5a598f1eecfd
more robust interrupt handling for Scala_Console, which uses JVM Thread.interrupt instead of POSIX SIGINT;
wenzelm
parents:
56831
diff
changeset
|
840 |
{ |
5a598f1eecfd
more robust interrupt handling for Scala_Console, which uses JVM Thread.interrupt instead of POSIX SIGINT;
wenzelm
parents:
56831
diff
changeset
|
841 |
try { Thread.sleep(500) } |
56861 | 842 |
catch { case Exn.Interrupt() => Exn.Interrupt.impose() } |
56837
5a598f1eecfd
more robust interrupt handling for Scala_Console, which uses JVM Thread.interrupt instead of POSIX SIGINT;
wenzelm
parents:
56831
diff
changeset
|
843 |
} |
50366 | 844 |
|
48425 | 845 |
@tailrec def loop( |
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
846 |
pending: Queue, |
48674 | 847 |
running: Map[String, (String, Job)], |
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
848 |
results: Map[String, Result]): Map[String, Result] = |
48425 | 849 |
{ |
850 |
if (pending.is_empty) results |
|
51253 | 851 |
else { |
852 |
if (progress.stopped) |
|
853 |
for ((_, (_, job)) <- running) job.terminate |
|
854 |
||
48674 | 855 |
running.find({ case (_, (_, job)) => job.is_finished }) match { |
856 |
case Some((name, (parent_heap, job))) => |
|
50367 | 857 |
//{{{ finish job |
48424 | 858 |
|
62401 | 859 |
val process_result = job.join |
62573 | 860 |
process_result.err_lines.foreach(progress.echo(_)) |
861 |
if (process_result.ok) |
|
862 |
progress.echo("Finished " + name + " (" + process_result.timing.message_resources + ")") |
|
48373 | 863 |
|
62404
13a0f537e232
retain tail out_lines as printed, but not the whole log content;
wenzelm
parents:
62403
diff
changeset
|
864 |
val process_result_tail = |
13a0f537e232
retain tail out_lines as printed, but not the whole log content;
wenzelm
parents:
62403
diff
changeset
|
865 |
{ |
13a0f537e232
retain tail out_lines as printed, but not the whole log content;
wenzelm
parents:
62403
diff
changeset
|
866 |
val lines = process_result.out_lines.filterNot(_.startsWith("\f")) |
62409
e391528eff3b
proper option process_output_tail, more generous default;
wenzelm
parents:
62406
diff
changeset
|
867 |
val tail = job.info.options.int("process_output_tail") |
e391528eff3b
proper option process_output_tail, more generous default;
wenzelm
parents:
62406
diff
changeset
|
868 |
val lines1 = if (tail == 0) lines else lines.drop(lines.length - tail max 0) |
62404
13a0f537e232
retain tail out_lines as printed, but not the whole log content;
wenzelm
parents:
62403
diff
changeset
|
869 |
process_result.copy(out_lines = |
62409
e391528eff3b
proper option process_output_tail, more generous default;
wenzelm
parents:
62406
diff
changeset
|
870 |
"(see also " + (output_dir + log(name)).file.toString + ")" :: lines1) |
62404
13a0f537e232
retain tail out_lines as printed, but not the whole log content;
wenzelm
parents:
62403
diff
changeset
|
871 |
} |
13a0f537e232
retain tail out_lines as printed, but not the whole log content;
wenzelm
parents:
62403
diff
changeset
|
872 |
|
51399
6ac3c29a300e
discontinued "isabelle usedir" option -r (reset session path);
wenzelm
parents:
51397
diff
changeset
|
873 |
val heap = |
62401 | 874 |
if (process_result.ok) { |
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
875 |
(output_dir + log(name)).file.delete |
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
876 |
|
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
877 |
val sources = make_stamp(name) |
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
878 |
val heap = heap_stamp(job.output_path) |
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
879 |
File.write_gzip(output_dir + log_gz(name), |
62401 | 880 |
Library.terminate_lines(sources :: parent_heap :: heap :: process_result.out_lines)) |
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
881 |
|
51399
6ac3c29a300e
discontinued "isabelle usedir" option -r (reset session path);
wenzelm
parents:
51397
diff
changeset
|
882 |
heap |
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
883 |
} |
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
884 |
else { |
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
885 |
(output_dir + Path.basic(name)).file.delete |
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
886 |
(output_dir + log_gz(name)).file.delete |
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
887 |
|
62401 | 888 |
File.write(output_dir + log(name), Library.terminate_lines(process_result.out_lines)) |
50366 | 889 |
progress.echo(name + " FAILED") |
62404
13a0f537e232
retain tail out_lines as printed, but not the whole log content;
wenzelm
parents:
62403
diff
changeset
|
890 |
if (!process_result.interrupted) progress.echo(process_result_tail.out) |
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
891 |
|
51399
6ac3c29a300e
discontinued "isabelle usedir" option -r (reset session path);
wenzelm
parents:
51397
diff
changeset
|
892 |
no_heap |
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
893 |
} |
50707
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
894 |
loop(pending - name, running - name, |
62404
13a0f537e232
retain tail out_lines as printed, but not the whole log content;
wenzelm
parents:
62403
diff
changeset
|
895 |
results + (name -> Result(false, heap, Some(process_result_tail)))) |
50367 | 896 |
//}}} |
60215 | 897 |
case None if running.size < (max_jobs max 1) => |
50367 | 898 |
//{{{ check/start next job |
48547 | 899 |
pending.dequeue(running.isDefinedAt(_)) match { |
900 |
case Some((name, info)) => |
|
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
901 |
val parent_result = |
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
902 |
info.parent match { |
62402 | 903 |
case None => Result(true, no_heap, Some(Process_Result(0))) |
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
904 |
case Some(parent) => results(parent) |
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
905 |
} |
48547 | 906 |
val output = output_dir + Path.basic(name) |
62477 | 907 |
val do_output = build_heap || is_pure(name) || queue.is_inner(name) |
48547 | 908 |
|
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
909 |
val (current, heap) = |
48547 | 910 |
{ |
51221 | 911 |
find_log(name + ".gz") match { |
912 |
case Some((dir, path)) => |
|
51220 | 913 |
read_stamps(path) match { |
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
914 |
case Some((s, h1, h2)) => |
51221 | 915 |
val heap = heap_stamp(Some(dir + Path.basic(name))) |
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
916 |
(s == make_stamp(name) && h1 == parent_result.heap && h2 == heap && |
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
917 |
!(do_output && heap == no_heap), heap) |
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
918 |
case None => (false, no_heap) |
48547 | 919 |
} |
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
920 |
case None => (false, no_heap) |
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
921 |
} |
48547 | 922 |
} |
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
923 |
val all_current = current && parent_result.current |
48528
784c6f63d79c
proper all_current, which regards parent status as well;
wenzelm
parents:
48511
diff
changeset
|
924 |
|
48547 | 925 |
if (all_current) |
62402 | 926 |
loop(pending - name, running, |
927 |
results + (name -> Result(true, heap, Some(Process_Result(0))))) |
|
48678
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
928 |
else if (no_build) { |
50366 | 929 |
if (verbose) progress.echo("Skipping " + name + " ...") |
62402 | 930 |
loop(pending - name, running, |
931 |
results + (name -> Result(false, heap, Some(Process_Result(1))))) |
|
48678
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
932 |
} |
62402 | 933 |
else if (parent_result.ok && !progress.stopped) { |
50366 | 934 |
progress.echo((if (do_output) "Building " else "Running ") + name + " ...") |
51220 | 935 |
val job = |
936 |
new Job(progress, name, info, output, do_output, verbose, browser_info, |
|
59445 | 937 |
deps(name).session_graph, queue.command_timings(name)) |
48674 | 938 |
loop(pending, running + (name -> (parent_result.heap, job)), results) |
48547 | 939 |
} |
940 |
else { |
|
50366 | 941 |
progress.echo(name + " CANCELLED") |
62402 | 942 |
loop(pending - name, running, results + (name -> Result(false, heap, None))) |
48547 | 943 |
} |
944 |
case None => sleep(); loop(pending, running, results) |
|
48425 | 945 |
} |
50367 | 946 |
///}}} |
48425 | 947 |
case None => sleep(); loop(pending, running, results) |
48373 | 948 |
} |
51253 | 949 |
} |
48425 | 950 |
} |
951 |
||
51220 | 952 |
|
953 |
/* build results */ |
|
954 |
||
48583 | 955 |
val results = |
956 |
if (deps.is_empty) { |
|
56782
433cf57550fa
more systematic Isabelle output, like in classic Isabelle/ML (without markup);
wenzelm
parents:
56780
diff
changeset
|
957 |
progress.echo(Output.warning_text("Nothing to build")) |
50707
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
958 |
Map.empty[String, Result] |
48583 | 959 |
} |
960 |
else loop(queue, Map.empty, Map.empty) |
|
961 |
||
51418
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
962 |
|
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
963 |
/* global browser info */ |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
964 |
|
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
965 |
if (!no_build) { |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
966 |
val browser_chapters = |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
967 |
(for { |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
968 |
(name, result) <- results.iterator |
62402 | 969 |
if result.ok && !is_pure(name) |
51418
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
970 |
info = full_tree(name) |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
971 |
if info.options.bool("browser_info") |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
972 |
} yield (info.chapter, (name, info.description))).toList.groupBy(_._1). |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
973 |
map({ case (chapter, es) => (chapter, es.map(_._2)) }).filterNot(_._2.isEmpty) |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
974 |
|
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
975 |
for ((chapter, entries) <- browser_chapters) |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
976 |
Present.update_chapter_index(browser_info, chapter, entries) |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
977 |
|
61372 | 978 |
if (browser_chapters.nonEmpty) Present.make_global_index(browser_info) |
51418
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
979 |
} |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
980 |
|
62403 | 981 |
new Build_Results((for ((name, result) <- results.iterator) yield (name, result.process)).toMap) |
52114 | 982 |
} |
983 |
||
984 |
||
985 |
/* build */ |
|
50707
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
986 |
|
52114 | 987 |
def build( |
988 |
options: Options, |
|
52115 | 989 |
progress: Progress = Ignore_Progress, |
52114 | 990 |
requirements: Boolean = false, |
991 |
all_sessions: Boolean = false, |
|
992 |
build_heap: Boolean = false, |
|
993 |
clean_build: Boolean = false, |
|
56890 | 994 |
dirs: List[Path] = Nil, |
995 |
select_dirs: List[Path] = Nil, |
|
60106 | 996 |
exclude_session_groups: List[String] = Nil, |
52114 | 997 |
session_groups: List[String] = Nil, |
998 |
max_jobs: Int = 1, |
|
999 |
list_files: Boolean = false, |
|
59891
9ce697050455
added isabelle build option -k, for fast off-line checking of theory sources;
wenzelm
parents:
59811
diff
changeset
|
1000 |
check_keywords: Set[String] = Set.empty, |
52114 | 1001 |
no_build: Boolean = false, |
1002 |
system_mode: Boolean = false, |
|
1003 |
verbose: Boolean = false, |
|
59892
2a616319c171
added isabelle build option -x, to exclude sessions;
wenzelm
parents:
59891
diff
changeset
|
1004 |
exclude_sessions: List[String] = Nil, |
52114 | 1005 |
sessions: List[String] = Nil): Int = |
1006 |
{ |
|
1007 |
val results = |
|
59892
2a616319c171
added isabelle build option -x, to exclude sessions;
wenzelm
parents:
59891
diff
changeset
|
1008 |
build_results(options, progress, requirements, all_sessions, build_heap, clean_build, |
60106 | 1009 |
dirs, select_dirs, exclude_session_groups, session_groups, max_jobs, list_files, |
1010 |
check_keywords, no_build, system_mode, verbose, exclude_sessions, sessions) |
|
52114 | 1011 |
|
62403 | 1012 |
if (results.rc != 0 && (verbose || !no_build)) { |
48552 | 1013 |
val unfinished = |
62402 | 1014 |
(for { |
62403 | 1015 |
name <- results.sessions.iterator |
62406 | 1016 |
if !results(name).ok |
62402 | 1017 |
} yield name).toList.sorted |
50366 | 1018 |
progress.echo("Unfinished session(s): " + commas(unfinished)) |
48473 | 1019 |
} |
62403 | 1020 |
|
1021 |
results.rc |
|
48341 | 1022 |
} |
1023 |
||
1024 |
||
48346
e2382bede914
more general support for Isabelle/Scala command line tools;
wenzelm
parents:
48344
diff
changeset
|
1025 |
/* command line entry point */ |
48341 | 1026 |
|
1027 |
def main(args: Array[String]) |
|
1028 |
{ |
|
48346
e2382bede914
more general support for Isabelle/Scala command line tools;
wenzelm
parents:
48344
diff
changeset
|
1029 |
Command_Line.tool { |
62590 | 1030 |
def show_settings(): String = |
1031 |
cat_lines(List( |
|
1032 |
"ISABELLE_BUILD_OPTIONS=" + |
|
1033 |
quote(Isabelle_System.getenv("ISABELLE_BUILD_OPTIONS")), |
|
1034 |
"", |
|
1035 |
"ISABELLE_BUILD_JAVA_OPTIONS=" + |
|
1036 |
quote(Isabelle_System.getenv("ISABELLE_BUILD_JAVA_OPTIONS")) + |
|
1037 |
"", |
|
1038 |
"ML_PLATFORM=" + quote(Isabelle_System.getenv("ML_PLATFORM")), |
|
1039 |
"ML_HOME=" + quote(Isabelle_System.getenv("ML_HOME")), |
|
1040 |
"ML_SYSTEM=" + quote(Isabelle_System.getenv("ML_SYSTEM")), |
|
1041 |
"ML_OPTIONS=" + quote(Isabelle_System.getenv("ML_OPTIONS")))) |
|
1042 |
||
1043 |
val build_options = Word.explode(Isabelle_System.getenv("ISABELLE_BUILD_OPTIONS")) |
|
1044 |
||
1045 |
var select_dirs: List[Path] = Nil |
|
1046 |
var requirements = false |
|
1047 |
var exclude_session_groups: List[String] = Nil |
|
1048 |
var all_sessions = false |
|
1049 |
var build_heap = false |
|
1050 |
var clean_build = false |
|
1051 |
var dirs: List[Path] = Nil |
|
1052 |
var session_groups: List[String] = Nil |
|
1053 |
var max_jobs = 1 |
|
1054 |
var check_keywords: Set[String] = Set.empty |
|
1055 |
var list_files = false |
|
1056 |
var no_build = false |
|
1057 |
var options = (Options.init() /: build_options)(_ + _) |
|
1058 |
var system_mode = false |
|
1059 |
var verbose = false |
|
1060 |
var exclude_sessions: List[String] = Nil |
|
1061 |
||
1062 |
val getopts = Getopts(""" |
|
1063 |
Usage: isabelle build [OPTIONS] [SESSIONS ...] |
|
1064 |
||
1065 |
Options are: |
|
1066 |
-D DIR include session directory and select its sessions |
|
1067 |
-R operate on requirements of selected sessions |
|
1068 |
-X NAME exclude sessions from group NAME and all descendants |
|
1069 |
-a select all sessions |
|
1070 |
-b build heap images |
|
1071 |
-c clean build |
|
1072 |
-d DIR include session directory |
|
1073 |
-g NAME select session group NAME |
|
1074 |
-j INT maximum number of parallel jobs (default 1) |
|
1075 |
-k KEYWORD check theory sources for conflicts with proposed keywords |
|
1076 |
-l list session source files |
|
1077 |
-n no build -- test dependencies only |
|
1078 |
-o OPTION override Isabelle system OPTION (via NAME=VAL or NAME) |
|
1079 |
-s system build mode: produce output in ISABELLE_HOME |
|
1080 |
-v verbose |
|
1081 |
-x NAME exclude session NAME and all descendants |
|
1082 |
||
1083 |
Build and manage Isabelle sessions, depending on implicit |
|
1084 |
""" + Library.prefix_lines(" ", show_settings()), |
|
1085 |
"D:" -> (arg => select_dirs = select_dirs ::: List(Path.explode(arg))), |
|
1086 |
"R" -> (_ => requirements = true), |
|
1087 |
"X:" -> (arg => exclude_session_groups = exclude_session_groups ::: List(arg)), |
|
1088 |
"a" -> (_ => all_sessions = true), |
|
1089 |
"b" -> (_ => build_heap = true), |
|
1090 |
"c" -> (_ => clean_build = true), |
|
1091 |
"d:" -> (arg => dirs = dirs ::: List(Path.explode(arg))), |
|
1092 |
"g:" -> (arg => session_groups = session_groups ::: List(arg)), |
|
1093 |
"j:" -> (arg => max_jobs = Properties.Value.Int.parse(arg)), |
|
1094 |
"k:" -> (arg => check_keywords = check_keywords + arg), |
|
1095 |
"l" -> (_ => list_files = true), |
|
1096 |
"n" -> (_ => no_build = true), |
|
1097 |
"o:" -> (arg => options = options + arg), |
|
1098 |
"s" -> (_ => system_mode = true), |
|
1099 |
"v" -> (_ => verbose = true), |
|
1100 |
"x:" -> (arg => exclude_sessions = exclude_sessions ::: List(arg))) |
|
1101 |
||
1102 |
val sessions = getopts(args) |
|
1103 |
||
1104 |
val progress = new Console_Progress(verbose) |
|
1105 |
||
62595 | 1106 |
if (verbose) { |
62590 | 1107 |
progress.echo( |
1108 |
Library.trim_line( |
|
1109 |
Isabelle_System.bash( |
|
1110 |
"""echo "Started at $(date) ($ML_IDENTIFIER on $(hostname))" """).out)) |
|
1111 |
progress.echo(show_settings()) |
|
48341 | 1112 |
} |
62590 | 1113 |
|
62595 | 1114 |
val start_time = Time.now() |
62590 | 1115 |
val results = |
1116 |
progress.interrupt_handler { |
|
1117 |
build_results(options, progress, requirements, all_sessions, build_heap, clean_build, |
|
1118 |
dirs, select_dirs, exclude_session_groups, session_groups, max_jobs, list_files, |
|
1119 |
check_keywords, no_build, system_mode, verbose, exclude_sessions, sessions) |
|
1120 |
} |
|
62595 | 1121 |
val elapsed_time = Time.now() - start_time |
62590 | 1122 |
|
62595 | 1123 |
if (verbose) { |
62590 | 1124 |
progress.echo( |
1125 |
Library.trim_line( |
|
1126 |
Isabelle_System.bash("""echo "Finished at "; date""").out)) |
|
62595 | 1127 |
} |
62590 | 1128 |
|
62595 | 1129 |
val total_timing = |
1130 |
(Timing.zero /: results.sessions.iterator.map(a => results(a).timing))(_ + _). |
|
1131 |
copy(elapsed = elapsed_time) |
|
1132 |
progress.echo(total_timing.message_resources) |
|
62590 | 1133 |
|
1134 |
results.rc |
|
48346
e2382bede914
more general support for Isabelle/Scala command line tools;
wenzelm
parents:
48344
diff
changeset
|
1135 |
} |
48341 | 1136 |
} |
59366
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1137 |
|
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1138 |
|
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1139 |
/* PIDE protocol */ |
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1140 |
|
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1141 |
def build_theories( |
59369
7090199d3f78
more informative build_theories_result: cumulative Runtime.exn_message;
wenzelm
parents:
59367
diff
changeset
|
1142 |
session: Session, master_dir: Path, theories: List[(Options, List[Path])]): Promise[XML.Body] = |
59367 | 1143 |
session.get_protocol_handler(classOf[Handler].getName) match { |
59366
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1144 |
case Some(handler: Handler) => handler.build_theories(session, master_dir, theories) |
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1145 |
case _ => error("Cannot invoke build_theories: bad protocol handler") |
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1146 |
} |
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1147 |
|
59367 | 1148 |
class Handler(progress: Progress, session_name: String) extends Session.Protocol_Handler |
59366
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1149 |
{ |
59369
7090199d3f78
more informative build_theories_result: cumulative Runtime.exn_message;
wenzelm
parents:
59367
diff
changeset
|
1150 |
private val pending = Synchronized(Map.empty[String, Promise[XML.Body]]) |
59366
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1151 |
|
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1152 |
def build_theories( |
59369
7090199d3f78
more informative build_theories_result: cumulative Runtime.exn_message;
wenzelm
parents:
59367
diff
changeset
|
1153 |
session: Session, master_dir: Path, theories: List[(Options, List[Path])]): Promise[XML.Body] = |
59366
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1154 |
{ |
59369
7090199d3f78
more informative build_theories_result: cumulative Runtime.exn_message;
wenzelm
parents:
59367
diff
changeset
|
1155 |
val promise = Future.promise[XML.Body] |
59366
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1156 |
val id = Document_ID.make().toString |
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1157 |
pending.change(promises => promises + (id -> promise)) |
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1158 |
session.build_theories(id, master_dir, theories) |
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1159 |
promise |
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1160 |
} |
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1161 |
|
59367 | 1162 |
private def loading_theory(prover: Prover, msg: Prover.Protocol_Output): Boolean = |
1163 |
msg.properties match { |
|
1164 |
case Markup.Loading_Theory(name) => progress.theory(session_name, name); true |
|
1165 |
case _ => false |
|
1166 |
} |
|
1167 |
||
59366
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1168 |
private def build_theories_result(prover: Prover, msg: Prover.Protocol_Output): Boolean = |
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1169 |
msg.properties match { |
59369
7090199d3f78
more informative build_theories_result: cumulative Runtime.exn_message;
wenzelm
parents:
59367
diff
changeset
|
1170 |
case Markup.Build_Theories_Result(id) => |
59366
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1171 |
pending.change_result(promises => |
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1172 |
promises.get(id) match { |
59369
7090199d3f78
more informative build_theories_result: cumulative Runtime.exn_message;
wenzelm
parents:
59367
diff
changeset
|
1173 |
case Some(promise) => |
7090199d3f78
more informative build_theories_result: cumulative Runtime.exn_message;
wenzelm
parents:
59367
diff
changeset
|
1174 |
val error_message = |
7090199d3f78
more informative build_theories_result: cumulative Runtime.exn_message;
wenzelm
parents:
59367
diff
changeset
|
1175 |
try { YXML.parse_body(Symbol.decode(msg.text)) } |
7090199d3f78
more informative build_theories_result: cumulative Runtime.exn_message;
wenzelm
parents:
59367
diff
changeset
|
1176 |
catch { case exn: Throwable => List(XML.Text(Exn.message(exn))) } |
7090199d3f78
more informative build_theories_result: cumulative Runtime.exn_message;
wenzelm
parents:
59367
diff
changeset
|
1177 |
promise.fulfill(error_message) |
7090199d3f78
more informative build_theories_result: cumulative Runtime.exn_message;
wenzelm
parents:
59367
diff
changeset
|
1178 |
(true, promises - id) |
7090199d3f78
more informative build_theories_result: cumulative Runtime.exn_message;
wenzelm
parents:
59367
diff
changeset
|
1179 |
case None => |
7090199d3f78
more informative build_theories_result: cumulative Runtime.exn_message;
wenzelm
parents:
59367
diff
changeset
|
1180 |
(false, promises) |
59366
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1181 |
}) |
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1182 |
case _ => false |
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1183 |
} |
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1184 |
|
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1185 |
override def stop(prover: Prover): Unit = |
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1186 |
pending.change(promises => { for ((_, promise) <- promises) promise.cancel; Map.empty }) |
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1187 |
|
59367 | 1188 |
val functions = |
1189 |
Map( |
|
1190 |
Markup.BUILD_THEORIES_RESULT -> build_theories_result _, |
|
1191 |
Markup.LOADING_THEORY -> loading_theory _) |
|
59366
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59319
diff
changeset
|
1192 |
} |
48276 | 1193 |
} |