| author | blanchet |
| Tue, 17 Aug 2010 13:10:58 +0200 | |
| changeset 38457 | b8760b6e7c65 |
| parent 38446 | 9d59dab38fef |
| child 38569 | 9d480f6a2589 |
| permissions | -rw-r--r-- |
| 36676 | 1 |
/* Title: Pure/System/session.scala |
2 |
Author: Makarius |
|
| 38221 | 3 |
Options: :folding=explicit:collapseFolds=1: |
| 36676 | 4 |
|
5 |
Isabelle session, potentially with running prover. |
|
6 |
*/ |
|
|
34777
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
7 |
|
|
34871
e596a0b71f3c
incorporate "proofdocument" part into main Isabelle/Pure.jar -- except for html_panel.scala, which depends on external library (Lobo/Cobra browser);
wenzelm
parents:
34859
diff
changeset
|
8 |
package isabelle |
|
34777
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
9 |
|
|
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
10 |
|
|
34820
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
11 |
import scala.actors.TIMEOUT |
|
38226
9d8848d70b0a
maintain editor history independently of Swing thread, which is potentially a bottle-neck or might be unavailable (e.g. in batch mode);
wenzelm
parents:
38222
diff
changeset
|
12 |
import scala.actors.Actor |
|
34777
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
13 |
import scala.actors.Actor._ |
|
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
14 |
|
|
34815
6bae73cd8e33
unified Command and Command_State, eliminated separate Accumulator;
wenzelm
parents:
34813
diff
changeset
|
15 |
|
| 34791 | 16 |
object Session |
17 |
{
|
|
|
34813
f0107bc96961
more explicit modeling of Command and Command_State as Session.Entity;
wenzelm
parents:
34810
diff
changeset
|
18 |
/* events */ |
|
f0107bc96961
more explicit modeling of Command and Command_State as Session.Entity;
wenzelm
parents:
34810
diff
changeset
|
19 |
|
| 34791 | 20 |
case object Global_Settings |
| 37849 | 21 |
case object Perspective |
| 38360 | 22 |
case class Commands_Changed(set: Set[Command]) |
| 34791 | 23 |
} |
24 |
||
|
34777
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
25 |
|
|
34851
304a86164dd2
provide global "Isabelle" within interpreter loop -- using import instead of val avoids pontential conflicts with later import isabelle.jedit._;
wenzelm
parents:
34848
diff
changeset
|
26 |
class Session(system: Isabelle_System) |
|
34777
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
27 |
{
|
| 37849 | 28 |
/* real time parameters */ // FIXME properties or settings (!?) |
29 |
||
30 |
// user input (e.g. text edits, cursor movement) |
|
31 |
val input_delay = 300 |
|
32 |
||
33 |
// prover output (markup, common messages) |
|
34 |
val output_delay = 100 |
|
35 |
||
36 |
// GUI layout updates |
|
37 |
val update_delay = 500 |
|
38 |
||
39 |
||
| 34809 | 40 |
/* pervasive event buses */ |
41 |
||
42 |
val global_settings = new Event_Bus[Session.Global_Settings.type] |
|
| 38423 | 43 |
val raw_protocol = new Event_Bus[Isabelle_Process.Result] |
|
37065
2a73253b5898
separate event bus and dockable for raw output (stdout);
wenzelm
parents:
37063
diff
changeset
|
44 |
val raw_output = new Event_Bus[Isabelle_Process.Result] |
| 38360 | 45 |
val commands_changed = new Event_Bus[Session.Commands_Changed] |
| 37849 | 46 |
val perspective = new Event_Bus[Session.Perspective.type] |
| 34809 | 47 |
|
48 |
||
| 34778 | 49 |
/* unique ids */ |
50 |
||
|
38363
af7f41a8a0a8
clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents:
38360
diff
changeset
|
51 |
private var id_count: Document.ID = 0 |
| 38419 | 52 |
def new_id(): Document.ID = synchronized {
|
|
38355
8cb265fb12fe
represent document ids by (long) int, to benefit from the somewhat faster Inttab in ML (LinearSet in Scala is invariably indexed by native object ids);
wenzelm
parents:
38260
diff
changeset
|
53 |
require(id_count > java.lang.Long.MIN_VALUE) |
|
8cb265fb12fe
represent document ids by (long) int, to benefit from the somewhat faster Inttab in ML (LinearSet in Scala is invariably indexed by native object ids);
wenzelm
parents:
38260
diff
changeset
|
54 |
id_count -= 1 |
|
8cb265fb12fe
represent document ids by (long) int, to benefit from the somewhat faster Inttab in ML (LinearSet in Scala is invariably indexed by native object ids);
wenzelm
parents:
38260
diff
changeset
|
55 |
id_count |
|
8cb265fb12fe
represent document ids by (long) int, to benefit from the somewhat faster Inttab in ML (LinearSet in Scala is invariably indexed by native object ids);
wenzelm
parents:
38260
diff
changeset
|
56 |
} |
| 34778 | 57 |
|
58 |
||
| 34826 | 59 |
|
60 |
/** main actor **/ |
|
| 34809 | 61 |
|
|
34851
304a86164dd2
provide global "Isabelle" within interpreter loop -- using import instead of val avoids pontential conflicts with later import isabelle.jedit._;
wenzelm
parents:
34848
diff
changeset
|
62 |
@volatile private var syntax = new Outer_Syntax(system.symbols) |
| 34819 | 63 |
def current_syntax: Outer_Syntax = syntax |
| 34809 | 64 |
|
|
38370
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
65 |
@volatile private var global_state = Document.State.init |
|
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
66 |
private def change_state(f: Document.State => Document.State) { global_state = f(global_state) }
|
|
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
67 |
def current_state(): Document.State = global_state |
|
34816
d33312514220
maintain generic session entities -- cover commands, states, etc. (but not yet documents);
wenzelm
parents:
34815
diff
changeset
|
68 |
|
| 38221 | 69 |
private case class Started(timeout: Int, args: List[String]) |
|
34777
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
70 |
private case object Stop |
|
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
71 |
|
| 37129 | 72 |
private lazy val session_actor = actor {
|
| 34809 | 73 |
|
74 |
var prover: Isabelle_Process with Isar_Document = null |
|
75 |
||
76 |
||
77 |
/* document changes */ |
|
78 |
||
|
38227
6bbb42843b6e
concentrate structural document notions in document.scala;
wenzelm
parents:
38226
diff
changeset
|
79 |
def handle_change(change: Document.Change) |
| 38221 | 80 |
//{{{
|
| 34809 | 81 |
{
|
|
38366
fea82d1add74
simplified/clarified Change: transition prev --edits--> result, based on futures;
wenzelm
parents:
38365
diff
changeset
|
82 |
require(change.is_finished) |
| 34809 | 83 |
|
| 38417 | 84 |
val previous = change.previous.join |
85 |
val (node_edits, current) = change.result.join |
|
|
38366
fea82d1add74
simplified/clarified Change: transition prev --edits--> result, based on futures;
wenzelm
parents:
38365
diff
changeset
|
86 |
|
| 38417 | 87 |
var former_assignment = current_state().the_assignment(previous).join |
|
38370
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
88 |
for {
|
|
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
89 |
(name, Some(cmd_edits)) <- node_edits |
|
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
90 |
(prev, None) <- cmd_edits |
| 38417 | 91 |
removed <- previous.nodes(name).commands.get_after(prev) |
|
38370
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
92 |
} former_assignment -= removed |
|
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
93 |
|
|
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
37849
diff
changeset
|
94 |
val id_edits = |
|
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
37849
diff
changeset
|
95 |
node_edits map {
|
|
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
37849
diff
changeset
|
96 |
case (name, None) => (name, None) |
|
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
37849
diff
changeset
|
97 |
case (name, Some(cmd_edits)) => |
|
38370
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
98 |
val ids = |
|
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
37849
diff
changeset
|
99 |
cmd_edits map {
|
|
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
37849
diff
changeset
|
100 |
case (c1, c2) => |
|
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
37849
diff
changeset
|
101 |
val id1 = c1.map(_.id) |
|
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
37849
diff
changeset
|
102 |
val id2 = |
|
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
37849
diff
changeset
|
103 |
c2 match {
|
|
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
37849
diff
changeset
|
104 |
case None => None |
|
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
37849
diff
changeset
|
105 |
case Some(command) => |
|
38370
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
106 |
if (current_state().lookup_command(command.id).isEmpty) {
|
|
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
107 |
change_state(_.define_command(command)) |
|
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
37849
diff
changeset
|
108 |
prover.define_command(command.id, system.symbols.encode(command.source)) |
|
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
37849
diff
changeset
|
109 |
} |
|
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
37849
diff
changeset
|
110 |
Some(command.id) |
|
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
37849
diff
changeset
|
111 |
} |
|
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
37849
diff
changeset
|
112 |
(id1, id2) |
|
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
37849
diff
changeset
|
113 |
} |
|
38370
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
114 |
(name -> Some(ids)) |
|
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
37849
diff
changeset
|
115 |
} |
| 38417 | 116 |
change_state(_.define_version(current, former_assignment)) |
117 |
prover.edit_version(previous.id, current.id, id_edits) |
|
| 34809 | 118 |
} |
| 38221 | 119 |
//}}} |
| 34809 | 120 |
|
121 |
||
122 |
/* prover results */ |
|
123 |
||
|
34836
b83c7a738eb8
singleton status messages, with more precise patterns -- report bad messages;
wenzelm
parents:
34835
diff
changeset
|
124 |
def bad_result(result: Isabelle_Process.Result) |
|
b83c7a738eb8
singleton status messages, with more precise patterns -- report bad messages;
wenzelm
parents:
34835
diff
changeset
|
125 |
{
|
| 37041 | 126 |
System.err.println("Ignoring prover result: " + result.message.toString)
|
|
34836
b83c7a738eb8
singleton status messages, with more precise patterns -- report bad messages;
wenzelm
parents:
34835
diff
changeset
|
127 |
} |
|
b83c7a738eb8
singleton status messages, with more precise patterns -- report bad messages;
wenzelm
parents:
34835
diff
changeset
|
128 |
|
| 34809 | 129 |
def handle_result(result: Isabelle_Process.Result) |
| 38221 | 130 |
//{{{
|
| 34809 | 131 |
{
|
| 38423 | 132 |
raw_protocol.event(result) |
|
34799
0330a4284a9b
just one variable for outer syntax keywords and completion;
wenzelm
parents:
34795
diff
changeset
|
133 |
|
|
38370
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
134 |
Position.get_id(result.properties) match {
|
|
38414
49f1f657adc2
more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents:
38413
diff
changeset
|
135 |
case Some(state_id) => |
|
38370
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
136 |
try {
|
|
38414
49f1f657adc2
more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents:
38413
diff
changeset
|
137 |
val (st, state) = global_state.accumulate(state_id, result.message) |
|
38370
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
138 |
global_state = state |
|
38414
49f1f657adc2
more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents:
38413
diff
changeset
|
139 |
indicate_command_change(st.command) |
|
38370
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
140 |
} |
|
38414
49f1f657adc2
more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents:
38413
diff
changeset
|
141 |
catch { case _: Document.State.Fail => bad_result(result) }
|
|
38370
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
142 |
case None => |
|
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
143 |
if (result.is_status) {
|
|
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
144 |
result.body match {
|
| 38417 | 145 |
case List(Isar_Document.Assign(id, edits)) => |
146 |
try { change_state(_.assign(id, edits)) }
|
|
|
38414
49f1f657adc2
more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents:
38413
diff
changeset
|
147 |
catch { case _: Document.State.Fail => bad_result(result) }
|
|
38370
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
148 |
case List(Keyword.Command_Decl(name, kind)) => syntax += (name, kind) |
|
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
149 |
case List(Keyword.Keyword_Decl(name)) => syntax += name |
|
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
150 |
case _ => if (!result.is_ready) bad_result(result) |
|
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
151 |
} |
|
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
152 |
} |
|
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
153 |
else if (result.kind == Markup.EXIT) prover = null |
|
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
154 |
else if (result.is_raw) raw_output.event(result) |
|
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38366
diff
changeset
|
155 |
else if (!result.is_system) bad_result(result) // FIXME syslog for system messages (!?) |
| 34809 | 156 |
} |
157 |
} |
|
| 38221 | 158 |
//}}} |
| 34809 | 159 |
|
|
34820
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
160 |
|
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
161 |
/* prover startup */ |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
162 |
|
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
163 |
def startup_error(): String = |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
164 |
{
|
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
165 |
val buf = new StringBuilder |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
166 |
while ( |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
167 |
receiveWithin(0) {
|
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
168 |
case result: Isabelle_Process.Result => |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
169 |
if (result.is_raw) {
|
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
170 |
for (text <- XML.content(result.message)) |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
171 |
buf.append(text) |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
172 |
} |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
173 |
true |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
174 |
case TIMEOUT => false |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
175 |
}) {}
|
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
176 |
buf.toString |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
177 |
} |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
178 |
|
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
179 |
def prover_startup(timeout: Int): Option[String] = |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
180 |
{
|
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
181 |
receiveWithin(timeout) {
|
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
182 |
case result: Isabelle_Process.Result |
|
37689
628eabe2213a
simplified Isabelle_Process.Result: use markup directly;
wenzelm
parents:
37132
diff
changeset
|
183 |
if result.kind == Markup.INIT => |
|
34820
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
184 |
while (receive {
|
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
185 |
case result: Isabelle_Process.Result => |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
186 |
handle_result(result); !result.is_ready |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
187 |
}) {}
|
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
188 |
None |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
189 |
|
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
190 |
case result: Isabelle_Process.Result |
|
37689
628eabe2213a
simplified Isabelle_Process.Result: use markup directly;
wenzelm
parents:
37132
diff
changeset
|
191 |
if result.kind == Markup.EXIT => |
|
34820
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
192 |
Some(startup_error()) |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
193 |
|
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
194 |
case TIMEOUT => // FIXME clarify |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
195 |
prover.kill; Some(startup_error()) |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
196 |
} |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
197 |
} |
| 34809 | 198 |
|
199 |
||
200 |
/* main loop */ |
|
201 |
||
|
34777
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
202 |
loop {
|
|
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
203 |
react {
|
| 38221 | 204 |
case Started(timeout, args) => |
|
34777
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
205 |
if (prover == null) {
|
|
34851
304a86164dd2
provide global "Isabelle" within interpreter loop -- using import instead of val avoids pontential conflicts with later import isabelle.jedit._;
wenzelm
parents:
34848
diff
changeset
|
206 |
prover = new Isabelle_Process(system, self, args:_*) with Isar_Document |
|
34820
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
207 |
val origin = sender |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
208 |
val opt_err = prover_startup(timeout) |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
209 |
if (opt_err.isDefined) prover = null |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
210 |
origin ! opt_err |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
211 |
} |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
212 |
else reply(None) |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
213 |
|
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
214 |
case Stop => // FIXME clarify; synchronous |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
215 |
if (prover != null) {
|
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
216 |
prover.kill |
|
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
217 |
prover = null |
|
34777
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
218 |
} |
|
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
219 |
|
|
38227
6bbb42843b6e
concentrate structural document notions in document.scala;
wenzelm
parents:
38226
diff
changeset
|
220 |
case change: Document.Change if prover != null => |
|
34777
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
221 |
handle_change(change) |
|
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
222 |
|
|
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
223 |
case result: Isabelle_Process.Result => |
|
38446
9d59dab38fef
XML.Cache: pipe-lined (thread-safe) version using actor;
wenzelm
parents:
38425
diff
changeset
|
224 |
handle_result(result) |
|
34777
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
225 |
|
|
36782
0499d05663dd
ignore spurious TIMEOUT messages, maybe caused by change of actor semantics in scala-2.8;
wenzelm
parents:
36682
diff
changeset
|
226 |
case TIMEOUT => // FIXME clarify! |
|
0499d05663dd
ignore spurious TIMEOUT messages, maybe caused by change of actor semantics in scala-2.8;
wenzelm
parents:
36682
diff
changeset
|
227 |
|
|
34820
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
228 |
case bad if prover != null => |
|
34777
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
229 |
System.err.println("session_actor: ignoring bad message " + bad)
|
|
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
230 |
} |
|
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
231 |
} |
|
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
232 |
} |
|
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
233 |
|
| 34809 | 234 |
|
| 37129 | 235 |
|
|
38226
9d8848d70b0a
maintain editor history independently of Swing thread, which is potentially a bottle-neck or might be unavailable (e.g. in batch mode);
wenzelm
parents:
38222
diff
changeset
|
236 |
/** buffered command changes (delay_first discipline) **/ |
| 37129 | 237 |
|
| 38221 | 238 |
private lazy val command_change_buffer = actor |
239 |
//{{{
|
|
240 |
{
|
|
| 37129 | 241 |
import scala.compat.Platform.currentTime |
242 |
||
243 |
var changed: Set[Command] = Set() |
|
244 |
var flush_time: Option[Long] = None |
|
245 |
||
246 |
def flush_timeout: Long = |
|
247 |
flush_time match {
|
|
248 |
case None => 5000L |
|
249 |
case Some(time) => (time - currentTime) max 0 |
|
250 |
} |
|
251 |
||
252 |
def flush() |
|
253 |
{
|
|
| 38360 | 254 |
if (!changed.isEmpty) commands_changed.event(Session.Commands_Changed(changed)) |
| 37129 | 255 |
changed = Set() |
256 |
flush_time = None |
|
257 |
} |
|
258 |
||
259 |
def invoke() |
|
260 |
{
|
|
261 |
val now = currentTime |
|
262 |
flush_time match {
|
|
| 37849 | 263 |
case None => flush_time = Some(now + output_delay) |
| 37129 | 264 |
case Some(time) => if (now >= time) flush() |
265 |
} |
|
266 |
} |
|
267 |
||
268 |
loop {
|
|
269 |
reactWithin(flush_timeout) {
|
|
270 |
case command: Command => changed += command; invoke() |
|
271 |
case TIMEOUT => flush() |
|
272 |
case bad => System.err.println("command_change_buffer: ignoring bad message " + bad)
|
|
273 |
} |
|
274 |
} |
|
275 |
} |
|
| 38221 | 276 |
//}}} |
| 37129 | 277 |
|
278 |
def indicate_command_change(command: Command) |
|
279 |
{
|
|
280 |
command_change_buffer ! command |
|
281 |
} |
|
282 |
||
283 |
||
|
38226
9d8848d70b0a
maintain editor history independently of Swing thread, which is potentially a bottle-neck or might be unavailable (e.g. in batch mode);
wenzelm
parents:
38222
diff
changeset
|
284 |
|
|
9d8848d70b0a
maintain editor history independently of Swing thread, which is potentially a bottle-neck or might be unavailable (e.g. in batch mode);
wenzelm
parents:
38222
diff
changeset
|
285 |
/** editor history **/ |
|
9d8848d70b0a
maintain editor history independently of Swing thread, which is potentially a bottle-neck or might be unavailable (e.g. in batch mode);
wenzelm
parents:
38222
diff
changeset
|
286 |
|
| 38417 | 287 |
private case class Edit_Version(edits: List[Document.Node_Text_Edit]) |
|
38226
9d8848d70b0a
maintain editor history independently of Swing thread, which is potentially a bottle-neck or might be unavailable (e.g. in batch mode);
wenzelm
parents:
38222
diff
changeset
|
288 |
|
|
9d8848d70b0a
maintain editor history independently of Swing thread, which is potentially a bottle-neck or might be unavailable (e.g. in batch mode);
wenzelm
parents:
38222
diff
changeset
|
289 |
private val editor_history = new Actor |
|
9d8848d70b0a
maintain editor history independently of Swing thread, which is potentially a bottle-neck or might be unavailable (e.g. in batch mode);
wenzelm
parents:
38222
diff
changeset
|
290 |
{
|
| 38424 | 291 |
@volatile private var history = Document.History.init |
| 38365 | 292 |
|
| 38425 | 293 |
def snapshot(name: String, pending_edits: List[Text.Edit]): Document.Snapshot = |
| 38424 | 294 |
history.snapshot(name, pending_edits, current_state()) |
|
38226
9d8848d70b0a
maintain editor history independently of Swing thread, which is potentially a bottle-neck or might be unavailable (e.g. in batch mode);
wenzelm
parents:
38222
diff
changeset
|
295 |
|
|
9d8848d70b0a
maintain editor history independently of Swing thread, which is potentially a bottle-neck or might be unavailable (e.g. in batch mode);
wenzelm
parents:
38222
diff
changeset
|
296 |
def act |
|
9d8848d70b0a
maintain editor history independently of Swing thread, which is potentially a bottle-neck or might be unavailable (e.g. in batch mode);
wenzelm
parents:
38222
diff
changeset
|
297 |
{
|
|
9d8848d70b0a
maintain editor history independently of Swing thread, which is potentially a bottle-neck or might be unavailable (e.g. in batch mode);
wenzelm
parents:
38222
diff
changeset
|
298 |
loop {
|
|
9d8848d70b0a
maintain editor history independently of Swing thread, which is potentially a bottle-neck or might be unavailable (e.g. in batch mode);
wenzelm
parents:
38222
diff
changeset
|
299 |
react {
|
| 38417 | 300 |
case Edit_Version(edits) => |
| 38424 | 301 |
val prev = history.tip.current |
| 38417 | 302 |
val result = |
|
38226
9d8848d70b0a
maintain editor history independently of Swing thread, which is potentially a bottle-neck or might be unavailable (e.g. in batch mode);
wenzelm
parents:
38222
diff
changeset
|
303 |
isabelle.Future.fork {
|
| 38417 | 304 |
val previous = prev.join |
305 |
val former_assignment = current_state().the_assignment(previous).join // FIXME async!? |
|
306 |
Thy_Syntax.text_edits(Session.this, previous, edits) |
|
|
38226
9d8848d70b0a
maintain editor history independently of Swing thread, which is potentially a bottle-neck or might be unavailable (e.g. in batch mode);
wenzelm
parents:
38222
diff
changeset
|
307 |
} |
| 38424 | 308 |
val change = new Document.Change(prev, edits, result) |
309 |
history += change |
|
310 |
change.current.map(_ => session_actor ! change) |
|
|
38260
d4a1c7a19be3
edit_document: synchronous reply to ensure consistent state wrt. calling (AWT) thread;
wenzelm
parents:
38230
diff
changeset
|
311 |
reply(()) |
|
38226
9d8848d70b0a
maintain editor history independently of Swing thread, which is potentially a bottle-neck or might be unavailable (e.g. in batch mode);
wenzelm
parents:
38222
diff
changeset
|
312 |
|
|
9d8848d70b0a
maintain editor history independently of Swing thread, which is potentially a bottle-neck or might be unavailable (e.g. in batch mode);
wenzelm
parents:
38222
diff
changeset
|
313 |
case bad => System.err.println("editor_model: ignoring bad message " + bad)
|
|
9d8848d70b0a
maintain editor history independently of Swing thread, which is potentially a bottle-neck or might be unavailable (e.g. in batch mode);
wenzelm
parents:
38222
diff
changeset
|
314 |
} |
|
9d8848d70b0a
maintain editor history independently of Swing thread, which is potentially a bottle-neck or might be unavailable (e.g. in batch mode);
wenzelm
parents:
38222
diff
changeset
|
315 |
} |
|
9d8848d70b0a
maintain editor history independently of Swing thread, which is potentially a bottle-neck or might be unavailable (e.g. in batch mode);
wenzelm
parents:
38222
diff
changeset
|
316 |
} |
|
9d8848d70b0a
maintain editor history independently of Swing thread, which is potentially a bottle-neck or might be unavailable (e.g. in batch mode);
wenzelm
parents:
38222
diff
changeset
|
317 |
} |
|
9d8848d70b0a
maintain editor history independently of Swing thread, which is potentially a bottle-neck or might be unavailable (e.g. in batch mode);
wenzelm
parents:
38222
diff
changeset
|
318 |
editor_history.start |
|
9d8848d70b0a
maintain editor history independently of Swing thread, which is potentially a bottle-neck or might be unavailable (e.g. in batch mode);
wenzelm
parents:
38222
diff
changeset
|
319 |
|
|
9d8848d70b0a
maintain editor history independently of Swing thread, which is potentially a bottle-neck or might be unavailable (e.g. in batch mode);
wenzelm
parents:
38222
diff
changeset
|
320 |
|
|
9d8848d70b0a
maintain editor history independently of Swing thread, which is potentially a bottle-neck or might be unavailable (e.g. in batch mode);
wenzelm
parents:
38222
diff
changeset
|
321 |
|
|
9d8848d70b0a
maintain editor history independently of Swing thread, which is potentially a bottle-neck or might be unavailable (e.g. in batch mode);
wenzelm
parents:
38222
diff
changeset
|
322 |
/** main methods **/ |
| 34809 | 323 |
|
| 38221 | 324 |
def started(timeout: Int, args: List[String]): Option[String] = |
325 |
(session_actor !? Started(timeout, args)).asInstanceOf[Option[String]] |
|
|
34820
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
326 |
|
|
34777
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
327 |
def stop() { session_actor ! Stop }
|
| 38221 | 328 |
|
| 38425 | 329 |
def snapshot(name: String, pending_edits: List[Text.Edit]): Document.Snapshot = |
| 38365 | 330 |
editor_history.snapshot(name, pending_edits) |
|
38260
d4a1c7a19be3
edit_document: synchronous reply to ensure consistent state wrt. calling (AWT) thread;
wenzelm
parents:
38230
diff
changeset
|
331 |
|
| 38417 | 332 |
def edit_version(edits: List[Document.Node_Text_Edit]) { editor_history !? Edit_Version(edits) }
|
|
34777
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
333 |
} |