src/Pure/System/session.scala
author wenzelm
Mon, 22 Aug 2011 21:42:02 +0200
changeset 44384 8f6054a63f96
parent 44383 f99906c2a1d3
child 44385 e7fdb008aa7d
permissions -rw-r--r--
some support for editor perspective;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
36676
ac7961d42ac3 some rearrangement of Scala sources;
wenzelm
parents: 35013
diff changeset
     1
/*  Title:      Pure/System/session.scala
ac7961d42ac3 some rearrangement of Scala sources;
wenzelm
parents: 35013
diff changeset
     2
    Author:     Makarius
38221
e0f00f0945b4 misc tuning and clarification;
wenzelm
parents: 38150
diff changeset
     3
    Options:    :folding=explicit:collapseFolds=1:
36676
ac7961d42ac3 some rearrangement of Scala sources;
wenzelm
parents: 35013
diff changeset
     4
43651
511df47bcadc some support for theory files within Isabelle/Scala session;
wenzelm
parents: 43649
diff changeset
     5
Main Isabelle/Scala session, potentially with running prover process.
36676
ac7961d42ac3 some rearrangement of Scala sources;
wenzelm
parents: 35013
diff changeset
     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
43520
cec9b95fa35d explicit import java.lang.System to prevent odd scope problems;
wenzelm
parents: 43443
diff changeset
    10
import java.lang.System
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    11
34820
a8ba6cde13e9 basic setup for synchronous / modal (!) prover startup;
wenzelm
parents: 34819
diff changeset
    12
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
    13
import scala.actors.Actor
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    14
import scala.actors.Actor._
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    15
34815
6bae73cd8e33 unified Command and Command_State, eliminated separate Accumulator;
wenzelm
parents: 34813
diff changeset
    16
34791
b97d5b38dea4 explicit object Session.Global_Settings;
wenzelm
parents: 34780
diff changeset
    17
object Session
b97d5b38dea4 explicit object Session.Global_Settings;
wenzelm
parents: 34780
diff changeset
    18
{
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
    19
  /* file store */
43645
ac886d096c11 some support for Session.File_Store;
wenzelm
parents: 43644
diff changeset
    20
ac886d096c11 some support for Session.File_Store;
wenzelm
parents: 43644
diff changeset
    21
  abstract class File_Store
ac886d096c11 some support for Session.File_Store;
wenzelm
parents: 43644
diff changeset
    22
  {
44163
32e0c150c010 normalized theory dependencies wrt. file_store;
wenzelm
parents: 44159
diff changeset
    23
    def append(master_dir: String, path: Path): String
32e0c150c010 normalized theory dependencies wrt. file_store;
wenzelm
parents: 44159
diff changeset
    24
    def require(file: String): Unit
43645
ac886d096c11 some support for Session.File_Store;
wenzelm
parents: 43644
diff changeset
    25
  }
ac886d096c11 some support for Session.File_Store;
wenzelm
parents: 43644
diff changeset
    26
ac886d096c11 some support for Session.File_Store;
wenzelm
parents: 43644
diff changeset
    27
34813
f0107bc96961 more explicit modeling of Command and Command_State as Session.Entity;
wenzelm
parents: 34810
diff changeset
    28
  /* events */
f0107bc96961 more explicit modeling of Command and Command_State as Session.Entity;
wenzelm
parents: 34810
diff changeset
    29
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
    30
  //{{{
34791
b97d5b38dea4 explicit object Session.Global_Settings;
wenzelm
parents: 34780
diff changeset
    31
  case object Global_Settings
37849
4f9de312cc23 Session: predefined real time parameters;
wenzelm
parents: 37689
diff changeset
    32
  case object Perspective
38849
2f198d107aef session_actor: await state assigment of previous change before signalling current change, and avoid crash in overrun situations;
wenzelm
parents: 38848
diff changeset
    33
  case object Assignment
38360
53224a4d2f0e specific Session.Commands_Changed;
wenzelm
parents: 38359
diff changeset
    34
  case class Commands_Changed(set: Set[Command])
39630
44181423183a explicit Session.Phase indication with associated event bus;
wenzelm
parents: 39629
diff changeset
    35
44181423183a explicit Session.Phase indication with associated event bus;
wenzelm
parents: 39629
diff changeset
    36
  sealed abstract class Phase
44181423183a explicit Session.Phase indication with associated event bus;
wenzelm
parents: 39629
diff changeset
    37
  case object Inactive extends Phase
39701
7c351c1c0624 simplified / clarified Session.Phase;
wenzelm
parents: 39698
diff changeset
    38
  case object Startup extends Phase  // transient
7c351c1c0624 simplified / clarified Session.Phase;
wenzelm
parents: 39698
diff changeset
    39
  case object Failed extends Phase
39630
44181423183a explicit Session.Phase indication with associated event bus;
wenzelm
parents: 39629
diff changeset
    40
  case object Ready extends Phase
39701
7c351c1c0624 simplified / clarified Session.Phase;
wenzelm
parents: 39698
diff changeset
    41
  case object Shutdown extends Phase  // transient
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
    42
  //}}}
34791
b97d5b38dea4 explicit object Session.Global_Settings;
wenzelm
parents: 34780
diff changeset
    43
}
b97d5b38dea4 explicit object Session.Global_Settings;
wenzelm
parents: 34780
diff changeset
    44
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    45
43661
39fdbd814c7f quasi-static Isabelle_System -- reduced tendency towards "functorial style";
wenzelm
parents: 43660
diff changeset
    46
class Session(val file_store: Session.File_Store)
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    47
{
37849
4f9de312cc23 Session: predefined real time parameters;
wenzelm
parents: 37689
diff changeset
    48
  /* real time parameters */  // FIXME properties or settings (!?)
4f9de312cc23 Session: predefined real time parameters;
wenzelm
parents: 37689
diff changeset
    49
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
    50
  val input_delay = Time.seconds(0.3)  // user input (e.g. text edits, cursor movement)
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
    51
  val output_delay = Time.seconds(0.1)  // prover output (markup, common messages)
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
    52
  val update_delay = Time.seconds(0.5)  // GUI layout updates
37849
4f9de312cc23 Session: predefined real time parameters;
wenzelm
parents: 37689
diff changeset
    53
4f9de312cc23 Session: predefined real time parameters;
wenzelm
parents: 37689
diff changeset
    54
34809
0fed930f2992 misc tuning;
wenzelm
parents: 34808
diff changeset
    55
  /* pervasive event buses */
0fed930f2992 misc tuning;
wenzelm
parents: 34808
diff changeset
    56
0fed930f2992 misc tuning;
wenzelm
parents: 34808
diff changeset
    57
  val global_settings = new Event_Bus[Session.Global_Settings.type]
37849
4f9de312cc23 Session: predefined real time parameters;
wenzelm
parents: 37689
diff changeset
    58
  val perspective = new Event_Bus[Session.Perspective.type]
38849
2f198d107aef session_actor: await state assigment of previous change before signalling current change, and avoid crash in overrun situations;
wenzelm
parents: 38848
diff changeset
    59
  val assignments = new Event_Bus[Session.Assignment.type]
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
    60
  val commands_changed = new Event_Bus[Session.Commands_Changed]
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
    61
  val phase_changed = new Event_Bus[Session.Phase]
43721
fad8634cee62 echo prover input via raw_messages, for improved protocol tracing;
wenzelm
parents: 43720
diff changeset
    62
  val raw_messages = new Event_Bus[Isabelle_Process.Message]
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
    63
34809
0fed930f2992 misc tuning;
wenzelm
parents: 34808
diff changeset
    64
0fed930f2992 misc tuning;
wenzelm
parents: 34808
diff changeset
    65
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    66
  /** buffered command changes (delay_first discipline) **/
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    67
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
    68
  //{{{
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    69
  private case object Stop
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    70
39572
bb3469024b6a added Isabelle_Process.syslog;
wenzelm
parents: 39528
diff changeset
    71
  private val (_, command_change_buffer) =
bb3469024b6a added Isabelle_Process.syslog;
wenzelm
parents: 39528
diff changeset
    72
    Simple_Thread.actor("command_change_buffer", daemon = true)
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    73
  {
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    74
    var changed: Set[Command] = Set()
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    75
    var flush_time: Option[Long] = None
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    76
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    77
    def flush_timeout: Long =
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    78
      flush_time match {
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    79
        case None => 5000L
40848
8662b9b1f123 more abstract/uniform handling of time, preferring seconds as Double;
wenzelm
parents: 40566
diff changeset
    80
        case Some(time) => (time - System.currentTimeMillis()) max 0
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    81
      }
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    82
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    83
    def flush()
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    84
    {
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    85
      if (!changed.isEmpty) commands_changed.event(Session.Commands_Changed(changed))
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    86
      changed = Set()
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    87
      flush_time = None
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    88
    }
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    89
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    90
    def invoke()
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    91
    {
40848
8662b9b1f123 more abstract/uniform handling of time, preferring seconds as Double;
wenzelm
parents: 40566
diff changeset
    92
      val now = System.currentTimeMillis()
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    93
      flush_time match {
40848
8662b9b1f123 more abstract/uniform handling of time, preferring seconds as Double;
wenzelm
parents: 40566
diff changeset
    94
        case None => flush_time = Some(now + output_delay.ms)
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    95
        case Some(time) => if (now >= time) flush()
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    96
      }
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    97
    }
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    98
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
    99
    var finished = false
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
   100
    while (!finished) {
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
   101
      receiveWithin(flush_timeout) {
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
   102
        case command: Command => changed += command; invoke()
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
   103
        case TIMEOUT => flush()
39630
44181423183a explicit Session.Phase indication with associated event bus;
wenzelm
parents: 39629
diff changeset
   104
        case Stop => finished = true; reply(())
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
   105
        case bad => System.err.println("command_change_buffer: ignoring bad message " + bad)
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
   106
      }
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
   107
    }
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
   108
  }
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
   109
  //}}}
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
   110
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
   111
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
   112
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
   113
  /** main protocol actor **/
34809
0fed930f2992 misc tuning;
wenzelm
parents: 34808
diff changeset
   114
43651
511df47bcadc some support for theory files within Isabelle/Scala session;
wenzelm
parents: 43649
diff changeset
   115
  /* global state */
43644
ea08ce1c314b tuned signature;
wenzelm
parents: 43553
diff changeset
   116
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   117
  @volatile var verbose: Boolean = false
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   118
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   119
  @volatile private var loaded_theories: Set[String] = Set()
43673
29eb1cd29961 Thy_Info.dependencies: ignore already loaded theories, according to initial prover session status;
wenzelm
parents: 43662
diff changeset
   120
43695
5130dfe1b7be simplified Symbol based on lazy Symbol.Interpretation -- reduced odd "functorial style";
wenzelm
parents: 43673
diff changeset
   121
  @volatile private var syntax = new Outer_Syntax
38569
9d480f6a2589 tuned signatures;
wenzelm
parents: 38446
diff changeset
   122
  def current_syntax(): Outer_Syntax = syntax
34809
0fed930f2992 misc tuning;
wenzelm
parents: 34808
diff changeset
   123
39626
a5d0bcfb95a3 manage persistent syslog via Session, not Isabelle_Process;
wenzelm
parents: 39625
diff changeset
   124
  @volatile private var reverse_syslog = List[XML.Elem]()
39629
08eb2730a8a1 tuned signature;
wenzelm
parents: 39626
diff changeset
   125
  def syslog(): String = reverse_syslog.reverse.map(msg => XML.content(msg).mkString).mkString("\n")
39626
a5d0bcfb95a3 manage persistent syslog via Session, not Isabelle_Process;
wenzelm
parents: 39625
diff changeset
   126
39630
44181423183a explicit Session.Phase indication with associated event bus;
wenzelm
parents: 39629
diff changeset
   127
  @volatile private var _phase: Session.Phase = Session.Inactive
39633
26a28110ece5 simplified Session.Phase;
wenzelm
parents: 39630
diff changeset
   128
  private def phase_=(new_phase: Session.Phase)
39630
44181423183a explicit Session.Phase indication with associated event bus;
wenzelm
parents: 39629
diff changeset
   129
  {
44181423183a explicit Session.Phase indication with associated event bus;
wenzelm
parents: 39629
diff changeset
   130
    _phase = new_phase
39701
7c351c1c0624 simplified / clarified Session.Phase;
wenzelm
parents: 39698
diff changeset
   131
    phase_changed.event(new_phase)
39630
44181423183a explicit Session.Phase indication with associated event bus;
wenzelm
parents: 39629
diff changeset
   132
  }
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   133
  def phase = _phase
43553
df80747342cb proper tokens only if session is ready;
wenzelm
parents: 43520
diff changeset
   134
  def is_ready: Boolean = phase == Session.Ready
39630
44181423183a explicit Session.Phase indication with associated event bus;
wenzelm
parents: 39629
diff changeset
   135
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
   136
  private val global_state = new Volatile(Document.State.init)
43719
ba1b2c918c32 tuned signature;
wenzelm
parents: 43718
diff changeset
   137
  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
   138
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   139
  def snapshot(name: String, pending_edits: List[Text.Edit]): Document.Snapshot =
43719
ba1b2c918c32 tuned signature;
wenzelm
parents: 43718
diff changeset
   140
    global_state().snapshot(name, pending_edits)
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   141
43651
511df47bcadc some support for theory files within Isabelle/Scala session;
wenzelm
parents: 43649
diff changeset
   142
511df47bcadc some support for theory files within Isabelle/Scala session;
wenzelm
parents: 43649
diff changeset
   143
  /* theory files */
511df47bcadc some support for theory files within Isabelle/Scala session;
wenzelm
parents: 43649
diff changeset
   144
511df47bcadc some support for theory files within Isabelle/Scala session;
wenzelm
parents: 43649
diff changeset
   145
  val thy_load = new Thy_Load
511df47bcadc some support for theory files within Isabelle/Scala session;
wenzelm
parents: 43649
diff changeset
   146
  {
43673
29eb1cd29961 Thy_Info.dependencies: ignore already loaded theories, according to initial prover session status;
wenzelm
parents: 43662
diff changeset
   147
    override def is_loaded(name: String): Boolean =
29eb1cd29961 Thy_Info.dependencies: ignore already loaded theories, according to initial prover session status;
wenzelm
parents: 43662
diff changeset
   148
      loaded_theories.contains(name)
29eb1cd29961 Thy_Info.dependencies: ignore already loaded theories, according to initial prover session status;
wenzelm
parents: 43662
diff changeset
   149
44159
9a35e88d9dc9 simplified class Thy_Header;
wenzelm
parents: 44157
diff changeset
   150
    override def check_thy(dir: Path, name: String): (String, Thy_Header) =
43651
511df47bcadc some support for theory files within Isabelle/Scala session;
wenzelm
parents: 43649
diff changeset
   151
    {
43661
39fdbd814c7f quasi-static Isabelle_System -- reduced tendency towards "functorial style";
wenzelm
parents: 43660
diff changeset
   152
      val file = Isabelle_System.platform_file(dir + Thy_Header.thy_path(name))
43652
dcd0b667f73d pervasive Basic_Library in Scala;
wenzelm
parents: 43651
diff changeset
   153
      if (!file.exists || !file.isFile) error("No such file: " + quote(file.toString))
43651
511df47bcadc some support for theory files within Isabelle/Scala session;
wenzelm
parents: 43649
diff changeset
   154
      val text = Standard_System.read_file(file)
43661
39fdbd814c7f quasi-static Isabelle_System -- reduced tendency towards "functorial style";
wenzelm
parents: 43660
diff changeset
   155
      val header = Thy_Header.read(text)
43651
511df47bcadc some support for theory files within Isabelle/Scala session;
wenzelm
parents: 43649
diff changeset
   156
      (text, header)
511df47bcadc some support for theory files within Isabelle/Scala session;
wenzelm
parents: 43649
diff changeset
   157
    }
511df47bcadc some support for theory files within Isabelle/Scala session;
wenzelm
parents: 43649
diff changeset
   158
  }
511df47bcadc some support for theory files within Isabelle/Scala session;
wenzelm
parents: 43649
diff changeset
   159
511df47bcadc some support for theory files within Isabelle/Scala session;
wenzelm
parents: 43649
diff changeset
   160
  val thy_info = new Thy_Info(thy_load)
511df47bcadc some support for theory files within Isabelle/Scala session;
wenzelm
parents: 43649
diff changeset
   161
511df47bcadc some support for theory files within Isabelle/Scala session;
wenzelm
parents: 43649
diff changeset
   162
511df47bcadc some support for theory files within Isabelle/Scala session;
wenzelm
parents: 43649
diff changeset
   163
  /* actor messages */
511df47bcadc some support for theory files within Isabelle/Scala session;
wenzelm
parents: 43649
diff changeset
   164
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   165
  private case class Start(timeout: Time, args: List[String])
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   166
  private case object Interrupt
44182
ecb51b457064 clarified node header -- exclude master_dir;
wenzelm
parents: 44163
diff changeset
   167
  private case class Init_Node(
ecb51b457064 clarified node header -- exclude master_dir;
wenzelm
parents: 44163
diff changeset
   168
    name: String, master_dir: String, header: Document.Node_Header, text: String)
ecb51b457064 clarified node header -- exclude master_dir;
wenzelm
parents: 44163
diff changeset
   169
  private case class Edit_Node(
ecb51b457064 clarified node header -- exclude master_dir;
wenzelm
parents: 44163
diff changeset
   170
    name: String, master_dir: String, header: Document.Node_Header, edits: List[Text.Edit])
43722
9b5dadb0c28d propagate header changes to prover process;
wenzelm
parents: 43721
diff changeset
   171
  private case class Change_Node(
9b5dadb0c28d propagate header changes to prover process;
wenzelm
parents: 43721
diff changeset
   172
    name: String,
9b5dadb0c28d propagate header changes to prover process;
wenzelm
parents: 43721
diff changeset
   173
    doc_edits: List[Document.Edit_Command],
9b5dadb0c28d propagate header changes to prover process;
wenzelm
parents: 43721
diff changeset
   174
    previous: Document.Version,
9b5dadb0c28d propagate header changes to prover process;
wenzelm
parents: 43721
diff changeset
   175
    version: Document.Version)
41534
f36cb6f233bd less verbosity;
wenzelm
parents: 40848
diff changeset
   176
39572
bb3469024b6a added Isabelle_Process.syslog;
wenzelm
parents: 39528
diff changeset
   177
  private val (_, session_actor) = Simple_Thread.actor("session_actor", daemon = true)
38639
f642faca303e main session actor as independent thread, to avoid starvation via regular worker pool;
wenzelm
parents: 38569
diff changeset
   178
  {
43648
e32de528b5ef more explicit edit_node vs. init_node;
wenzelm
parents: 43647
diff changeset
   179
    val this_actor = self
43649
a912f0b02359 eliminated null;
wenzelm
parents: 43648
diff changeset
   180
    var prover: Option[Isabelle_Process with Isar_Document] = None
34809
0fed930f2992 misc tuning;
wenzelm
parents: 34808
diff changeset
   181
0fed930f2992 misc tuning;
wenzelm
parents: 34808
diff changeset
   182
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   183
    /* incoming edits */
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   184
44182
ecb51b457064 clarified node header -- exclude master_dir;
wenzelm
parents: 44163
diff changeset
   185
    def handle_edits(name: String, master_dir: String,
44384
8f6054a63f96 some support for editor perspective;
wenzelm
parents: 44383
diff changeset
   186
        header: Document.Node_Header, edits: List[Document.Node.Edit[Text.Edit, Text.Perspective]])
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   187
    //{{{
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   188
    {
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   189
      val syntax = current_syntax()
43719
ba1b2c918c32 tuned signature;
wenzelm
parents: 43718
diff changeset
   190
      val previous = global_state().history.tip.version
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44183
diff changeset
   191
44222
9d5ef6cd4ee1 use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
wenzelm
parents: 44185
diff changeset
   192
      def norm_import(s: String): String =
9d5ef6cd4ee1 use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
wenzelm
parents: 44185
diff changeset
   193
      {
44225
a8f921e6484f more robust Thy_Header.base_name, with minimal assumptions about path syntax;
wenzelm
parents: 44222
diff changeset
   194
        val name = Thy_Header.base_name(s)
44222
9d5ef6cd4ee1 use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
wenzelm
parents: 44185
diff changeset
   195
        if (thy_load.is_loaded(name)) name
9d5ef6cd4ee1 use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
wenzelm
parents: 44185
diff changeset
   196
        else file_store.append(master_dir, Thy_Header.thy_path(Path.explode(s)))
9d5ef6cd4ee1 use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
wenzelm
parents: 44185
diff changeset
   197
      }
9d5ef6cd4ee1 use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
wenzelm
parents: 44185
diff changeset
   198
      def norm_use(s: String): String = file_store.append(master_dir, Path.explode(s))
44384
8f6054a63f96 some support for editor perspective;
wenzelm
parents: 44383
diff changeset
   199
      val norm_header =
8f6054a63f96 some support for editor perspective;
wenzelm
parents: 44383
diff changeset
   200
        Document.Node.norm_header[Text.Edit, Text.Perspective](norm_import, norm_use, header)
44222
9d5ef6cd4ee1 use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
wenzelm
parents: 44185
diff changeset
   201
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44183
diff changeset
   202
      val text_edits = (name, norm_header) :: edits.map(edit => (name, edit))
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44183
diff changeset
   203
      val result = Future.fork { Thy_Syntax.text_edits(syntax, previous.join, text_edits) }
43722
9b5dadb0c28d propagate header changes to prover process;
wenzelm
parents: 43721
diff changeset
   204
      val change =
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44183
diff changeset
   205
        global_state.change_yield(_.extend_history(previous, text_edits, result.map(_._2)))
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   206
43722
9b5dadb0c28d propagate header changes to prover process;
wenzelm
parents: 43721
diff changeset
   207
      result.map {
44157
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
   208
        case (doc_edits, _) =>
43722
9b5dadb0c28d propagate header changes to prover process;
wenzelm
parents: 43721
diff changeset
   209
          assignments.await { global_state().is_assigned(previous.get_finished) }
44157
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
   210
          this_actor ! Change_Node(name, doc_edits, previous.join, change.version.join)
43722
9b5dadb0c28d propagate header changes to prover process;
wenzelm
parents: 43721
diff changeset
   211
      }
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   212
    }
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   213
    //}}}
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   214
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   215
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   216
    /* resulting changes */
34809
0fed930f2992 misc tuning;
wenzelm
parents: 34808
diff changeset
   217
43722
9b5dadb0c28d propagate header changes to prover process;
wenzelm
parents: 43721
diff changeset
   218
    def handle_change(change: Change_Node)
38221
e0f00f0945b4 misc tuning and clarification;
wenzelm
parents: 38150
diff changeset
   219
    //{{{
34809
0fed930f2992 misc tuning;
wenzelm
parents: 34808
diff changeset
   220
    {
43722
9b5dadb0c28d propagate header changes to prover process;
wenzelm
parents: 43721
diff changeset
   221
      val previous = change.previous
9b5dadb0c28d propagate header changes to prover process;
wenzelm
parents: 43721
diff changeset
   222
      val version = change.version
9b5dadb0c28d propagate header changes to prover process;
wenzelm
parents: 43721
diff changeset
   223
      val name = change.name
9b5dadb0c28d propagate header changes to prover process;
wenzelm
parents: 43721
diff changeset
   224
      val doc_edits = change.doc_edits
38366
fea82d1add74 simplified/clarified Change: transition prev --edits--> result, based on futures;
wenzelm
parents: 38365
diff changeset
   225
43719
ba1b2c918c32 tuned signature;
wenzelm
parents: 43718
diff changeset
   226
      var former_assignment = global_state().the_assignment(previous).get_finished
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38366
diff changeset
   227
      for {
44156
6aa25b80e1a5 explicit datatypes for document node edits;
wenzelm
parents: 43748
diff changeset
   228
        (name, Document.Node.Edits(cmd_edits)) <- doc_edits  // FIXME proper coverage!?
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38366
diff changeset
   229
        (prev, None) <- cmd_edits
38417
b8922ae21111 renamed class Document to Document.Version etc.;
wenzelm
parents: 38416
diff changeset
   230
        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
   231
      } former_assignment -= removed
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38366
diff changeset
   232
44383
f99906c2a1d3 discontinued redundant Edit_Command_ID;
wenzelm
parents: 44298
diff changeset
   233
      def id_command(command: Command)
43720
wenzelm
parents: 43719
diff changeset
   234
      {
wenzelm
parents: 43719
diff changeset
   235
        if (global_state().lookup_command(command.id).isEmpty) {
wenzelm
parents: 43719
diff changeset
   236
          global_state.change(_.define_command(command))
wenzelm
parents: 43719
diff changeset
   237
          prover.get.define_command(command.id, Symbol.encode(command.source))
wenzelm
parents: 43719
diff changeset
   238
        }
wenzelm
parents: 43719
diff changeset
   239
      }
44383
f99906c2a1d3 discontinued redundant Edit_Command_ID;
wenzelm
parents: 44298
diff changeset
   240
      doc_edits foreach {
f99906c2a1d3 discontinued redundant Edit_Command_ID;
wenzelm
parents: 44298
diff changeset
   241
        case (_, edit) =>
f99906c2a1d3 discontinued redundant Edit_Command_ID;
wenzelm
parents: 44298
diff changeset
   242
          edit foreach { case (c1, c2) => c1 foreach id_command; c2 foreach id_command }
f99906c2a1d3 discontinued redundant Edit_Command_ID;
wenzelm
parents: 44298
diff changeset
   243
      }
43722
9b5dadb0c28d propagate header changes to prover process;
wenzelm
parents: 43721
diff changeset
   244
39698
625a3bc4417b tuned signature;
wenzelm
parents: 39696
diff changeset
   245
      global_state.change(_.define_version(version, former_assignment))
44383
f99906c2a1d3 discontinued redundant Edit_Command_ID;
wenzelm
parents: 44298
diff changeset
   246
      prover.get.edit_version(previous.id, version.id, doc_edits)
34809
0fed930f2992 misc tuning;
wenzelm
parents: 34808
diff changeset
   247
    }
38221
e0f00f0945b4 misc tuning and clarification;
wenzelm
parents: 38150
diff changeset
   248
    //}}}
34809
0fed930f2992 misc tuning;
wenzelm
parents: 34808
diff changeset
   249
0fed930f2992 misc tuning;
wenzelm
parents: 34808
diff changeset
   250
0fed930f2992 misc tuning;
wenzelm
parents: 34808
diff changeset
   251
    /* prover results */
0fed930f2992 misc tuning;
wenzelm
parents: 34808
diff changeset
   252
0fed930f2992 misc tuning;
wenzelm
parents: 34808
diff changeset
   253
    def handle_result(result: Isabelle_Process.Result)
38221
e0f00f0945b4 misc tuning and clarification;
wenzelm
parents: 38150
diff changeset
   254
    //{{{
34809
0fed930f2992 misc tuning;
wenzelm
parents: 34808
diff changeset
   255
    {
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   256
      def bad_result(result: Isabelle_Process.Result)
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   257
      {
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   258
        if (verbose)
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   259
          System.err.println("Ignoring prover result: " + result.message.toString)
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   260
      }
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   261
38722
ba31936497c2 organized markup properties via apply/unapply patterns;
wenzelm
parents: 38639
diff changeset
   262
      result.properties match {
43748
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43746
diff changeset
   263
        case Position.Id(state_id) if !result.is_raw =>
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38366
diff changeset
   264
          try {
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
   265
            val st = global_state.change_yield(_.accumulate(state_id, result.message))
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
   266
            command_change_buffer ! st.command
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38366
diff changeset
   267
          }
43748
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43746
diff changeset
   268
          catch {
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43746
diff changeset
   269
            case _: Document.State.Fail => bad_result(result)
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43746
diff changeset
   270
          }
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43746
diff changeset
   271
        case Markup.Invoke_Scala(name, id) if result.is_raw =>
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43746
diff changeset
   272
          Future.fork {
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43746
diff changeset
   273
            val arg = XML.content(result.body).mkString
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43746
diff changeset
   274
            val (tag, res) = Invoke_Scala.method(name, arg)
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43746
diff changeset
   275
            prover.get.invoke_scala(id, tag, res)
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43746
diff changeset
   276
          }
44298
b8f8488704e2 Future.promise: explicit abort operation (like uninterruptible future job);
wenzelm
parents: 44225
diff changeset
   277
        case Markup.Cancel_Scala(id) =>
b8f8488704e2 Future.promise: explicit abort operation (like uninterruptible future job);
wenzelm
parents: 44225
diff changeset
   278
          System.err.println("cancel_scala " + id)  // FIXME cancel JVM task
38722
ba31936497c2 organized markup properties via apply/unapply patterns;
wenzelm
parents: 38639
diff changeset
   279
        case _ =>
39630
44181423183a explicit Session.Phase indication with associated event bus;
wenzelm
parents: 39629
diff changeset
   280
          if (result.is_syslog) {
44181423183a explicit Session.Phase indication with associated event bus;
wenzelm
parents: 39629
diff changeset
   281
            reverse_syslog ::= result.message
40533
e38e80686ce5 somewhat adhoc replacement for 'thus' and 'hence';
wenzelm
parents: 40479
diff changeset
   282
            if (result.is_ready) {
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   283
              // FIXME move to ML side (!?)
40533
e38e80686ce5 somewhat adhoc replacement for 'thus' and 'hence';
wenzelm
parents: 40479
diff changeset
   284
              syntax += ("hence", Keyword.PRF_ASM_GOAL, "then have")
e38e80686ce5 somewhat adhoc replacement for 'thus' and 'hence';
wenzelm
parents: 40479
diff changeset
   285
              syntax += ("thus", Keyword.PRF_ASM_GOAL, "then show")
e38e80686ce5 somewhat adhoc replacement for 'thus' and 'hence';
wenzelm
parents: 40479
diff changeset
   286
              phase = Session.Ready
e38e80686ce5 somewhat adhoc replacement for 'thus' and 'hence';
wenzelm
parents: 40479
diff changeset
   287
            }
39701
7c351c1c0624 simplified / clarified Session.Phase;
wenzelm
parents: 39698
diff changeset
   288
            else if (result.is_exit && phase == Session.Startup) phase = Session.Failed
39696
f4da0428dc78 more informative Session.Phase;
wenzelm
parents: 39633
diff changeset
   289
            else if (result.is_exit) phase = Session.Inactive
39630
44181423183a explicit Session.Phase indication with associated event bus;
wenzelm
parents: 39629
diff changeset
   290
          }
39626
a5d0bcfb95a3 manage persistent syslog via Session, not Isabelle_Process;
wenzelm
parents: 39625
diff changeset
   291
          else if (result.is_stdout) { }
39625
fb0c851e4f9d tuned prover message categorization;
wenzelm
parents: 39593
diff changeset
   292
          else if (result.is_status) {
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38366
diff changeset
   293
            result.body match {
38417
b8922ae21111 renamed class Document to Document.Version etc.;
wenzelm
parents: 38416
diff changeset
   294
              case List(Isar_Document.Assign(id, edits)) =>
38849
2f198d107aef session_actor: await state assigment of previous change before signalling current change, and avoid crash in overrun situations;
wenzelm
parents: 38848
diff changeset
   295
                try {
38882
e1fb3bbc22ab Document state assignment indicates command change;
wenzelm
parents: 38850
diff changeset
   296
                  val cmds: List[Command] = global_state.change_yield(_.assign(id, edits))
e1fb3bbc22ab Document state assignment indicates command change;
wenzelm
parents: 38850
diff changeset
   297
                  for (cmd <- cmds) command_change_buffer ! cmd
38849
2f198d107aef session_actor: await state assigment of previous change before signalling current change, and avoid crash in overrun situations;
wenzelm
parents: 38848
diff changeset
   298
                  assignments.event(Session.Assignment)
2f198d107aef session_actor: await state assigment of previous change before signalling current change, and avoid crash in overrun situations;
wenzelm
parents: 38848
diff changeset
   299
                }
38414
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38413
diff changeset
   300
                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
   301
              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
   302
              case List(Keyword.Keyword_Decl(name)) => syntax += name
43673
29eb1cd29961 Thy_Info.dependencies: ignore already loaded theories, according to initial prover session status;
wenzelm
parents: 43662
diff changeset
   303
              case List(Thy_Info.Loaded_Theory(name)) => loaded_theories += name
39625
fb0c851e4f9d tuned prover message categorization;
wenzelm
parents: 39593
diff changeset
   304
              case _ => bad_result(result)
38370
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38366
diff changeset
   305
            }
8b15d0f98962 explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents: 38366
diff changeset
   306
          }
39625
fb0c851e4f9d tuned prover message categorization;
wenzelm
parents: 39593
diff changeset
   307
          else bad_result(result)
43748
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43746
diff changeset
   308
      }
34809
0fed930f2992 misc tuning;
wenzelm
parents: 34808
diff changeset
   309
    }
38221
e0f00f0945b4 misc tuning and clarification;
wenzelm
parents: 38150
diff changeset
   310
    //}}}
34809
0fed930f2992 misc tuning;
wenzelm
parents: 34808
diff changeset
   311
34820
a8ba6cde13e9 basic setup for synchronous / modal (!) prover startup;
wenzelm
parents: 34819
diff changeset
   312
39630
44181423183a explicit Session.Phase indication with associated event bus;
wenzelm
parents: 39629
diff changeset
   313
    /* main loop */
34809
0fed930f2992 misc tuning;
wenzelm
parents: 34808
diff changeset
   314
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   315
    //{{{
38639
f642faca303e main session actor as independent thread, to avoid starvation via regular worker pool;
wenzelm
parents: 38569
diff changeset
   316
    var finished = false
f642faca303e main session actor as independent thread, to avoid starvation via regular worker pool;
wenzelm
parents: 38569
diff changeset
   317
    while (!finished) {
f642faca303e main session actor as independent thread, to avoid starvation via regular worker pool;
wenzelm
parents: 38569
diff changeset
   318
      receive {
43649
a912f0b02359 eliminated null;
wenzelm
parents: 43648
diff changeset
   319
        case Start(timeout, args) if prover.isEmpty =>
39701
7c351c1c0624 simplified / clarified Session.Phase;
wenzelm
parents: 39698
diff changeset
   320
          if (phase == Session.Inactive || phase == Session.Failed) {
7c351c1c0624 simplified / clarified Session.Phase;
wenzelm
parents: 39698
diff changeset
   321
            phase = Session.Startup
43661
39fdbd814c7f quasi-static Isabelle_System -- reduced tendency towards "functorial style";
wenzelm
parents: 43660
diff changeset
   322
            prover = Some(new Isabelle_Process(timeout, this_actor, args:_*) with Isar_Document)
39701
7c351c1c0624 simplified / clarified Session.Phase;
wenzelm
parents: 39698
diff changeset
   323
          }
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
   324
39701
7c351c1c0624 simplified / clarified Session.Phase;
wenzelm
parents: 39698
diff changeset
   325
        case Stop =>
7c351c1c0624 simplified / clarified Session.Phase;
wenzelm
parents: 39698
diff changeset
   326
          if (phase == Session.Ready) {
7c351c1c0624 simplified / clarified Session.Phase;
wenzelm
parents: 39698
diff changeset
   327
            global_state.change(_ => Document.State.init)  // FIXME event bus!?
7c351c1c0624 simplified / clarified Session.Phase;
wenzelm
parents: 39698
diff changeset
   328
            phase = Session.Shutdown
43649
a912f0b02359 eliminated null;
wenzelm
parents: 43648
diff changeset
   329
            prover.get.terminate
43717
c3ddb5537a2f more precise treatment of prover definedness;
wenzelm
parents: 43716
diff changeset
   330
            prover = None
39701
7c351c1c0624 simplified / clarified Session.Phase;
wenzelm
parents: 39698
diff changeset
   331
            phase = Session.Inactive
7c351c1c0624 simplified / clarified Session.Phase;
wenzelm
parents: 39698
diff changeset
   332
          }
39630
44181423183a explicit Session.Phase indication with associated event bus;
wenzelm
parents: 39629
diff changeset
   333
          finished = true
44181423183a explicit Session.Phase indication with associated event bus;
wenzelm
parents: 39629
diff changeset
   334
          reply(())
38850
5c3e5c548f12 session_actor: ignore spurious TIMEOUT (again) -- probably stemming from earlier use of receiveWithin;
wenzelm
parents: 38849
diff changeset
   335
43717
c3ddb5537a2f more precise treatment of prover definedness;
wenzelm
parents: 43716
diff changeset
   336
        case Interrupt if prover.isDefined =>
c3ddb5537a2f more precise treatment of prover definedness;
wenzelm
parents: 43716
diff changeset
   337
          prover.get.interrupt
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   338
44182
ecb51b457064 clarified node header -- exclude master_dir;
wenzelm
parents: 44163
diff changeset
   339
        case Init_Node(name, master_dir, header, text) if prover.isDefined =>
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   340
          // FIXME compare with existing node
44182
ecb51b457064 clarified node header -- exclude master_dir;
wenzelm
parents: 44163
diff changeset
   341
          handle_edits(name, master_dir, header,
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44183
diff changeset
   342
            List(Document.Node.Clear(), Document.Node.Edits(List(Text.Edit.insert(0, text)))))
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   343
          reply(())
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   344
44182
ecb51b457064 clarified node header -- exclude master_dir;
wenzelm
parents: 44163
diff changeset
   345
        case Edit_Node(name, master_dir, header, text_edits) if prover.isDefined =>
ecb51b457064 clarified node header -- exclude master_dir;
wenzelm
parents: 44163
diff changeset
   346
          handle_edits(name, master_dir, header, List(Document.Node.Edits(text_edits)))
43718
4a4ca9e4a14b clarified propagation of node name and header;
wenzelm
parents: 43717
diff changeset
   347
          reply(())
4a4ca9e4a14b clarified propagation of node name and header;
wenzelm
parents: 43717
diff changeset
   348
43722
9b5dadb0c28d propagate header changes to prover process;
wenzelm
parents: 43721
diff changeset
   349
        case change: Change_Node if prover.isDefined =>
9b5dadb0c28d propagate header changes to prover process;
wenzelm
parents: 43721
diff changeset
   350
          handle_change(change)
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   351
43721
fad8634cee62 echo prover input via raw_messages, for improved protocol tracing;
wenzelm
parents: 43720
diff changeset
   352
        case input: Isabelle_Process.Input =>
fad8634cee62 echo prover input via raw_messages, for improved protocol tracing;
wenzelm
parents: 43720
diff changeset
   353
          raw_messages.event(input)
fad8634cee62 echo prover input via raw_messages, for improved protocol tracing;
wenzelm
parents: 43720
diff changeset
   354
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   355
        case result: Isabelle_Process.Result =>
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   356
          handle_result(result)
43721
fad8634cee62 echo prover input via raw_messages, for improved protocol tracing;
wenzelm
parents: 43720
diff changeset
   357
          raw_messages.event(result)
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   358
43717
c3ddb5537a2f more precise treatment of prover definedness;
wenzelm
parents: 43716
diff changeset
   359
        case bad => System.err.println("session_actor: ignoring bad message " + bad)
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   360
      }
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   361
    }
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   362
    //}}}
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   363
  }
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   364
34809
0fed930f2992 misc tuning;
wenzelm
parents: 34808
diff changeset
   365
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   366
  /* actions */
34809
0fed930f2992 misc tuning;
wenzelm
parents: 34808
diff changeset
   367
40848
8662b9b1f123 more abstract/uniform handling of time, preferring seconds as Double;
wenzelm
parents: 40566
diff changeset
   368
  def start(timeout: Time, args: List[String]) { session_actor ! Start(timeout, args) }
34820
a8ba6cde13e9 basic setup for synchronous / modal (!) prover startup;
wenzelm
parents: 34819
diff changeset
   369
39630
44181423183a explicit Session.Phase indication with associated event bus;
wenzelm
parents: 39629
diff changeset
   370
  def stop() { command_change_buffer !? Stop; session_actor !? Stop }
38841
4df7b76249a0 include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents: 38722
diff changeset
   371
43716
1d64662c1bfd tuned source structure;
wenzelm
parents: 43697
diff changeset
   372
  def interrupt() { session_actor ! Interrupt }
43648
e32de528b5ef more explicit edit_node vs. init_node;
wenzelm
parents: 43647
diff changeset
   373
44182
ecb51b457064 clarified node header -- exclude master_dir;
wenzelm
parents: 44163
diff changeset
   374
  def init_node(name: String, master_dir: String, header: Document.Node_Header, text: String)
ecb51b457064 clarified node header -- exclude master_dir;
wenzelm
parents: 44163
diff changeset
   375
  { session_actor !? Init_Node(name, master_dir, header, text) }
38221
e0f00f0945b4 misc tuning and clarification;
wenzelm
parents: 38150
diff changeset
   376
44182
ecb51b457064 clarified node header -- exclude master_dir;
wenzelm
parents: 44163
diff changeset
   377
  def edit_node(name: String, master_dir: String, header: Document.Node_Header, edits: List[Text.Edit])
ecb51b457064 clarified node header -- exclude master_dir;
wenzelm
parents: 44163
diff changeset
   378
  { session_actor !? Edit_Node(name, master_dir, header, edits) }
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   379
}