src/Tools/jEdit/src/proofdocument/session.scala
author wenzelm
Tue, 29 Dec 2009 20:40:08 +0100
changeset 34808 e462572536e9
parent 34807 d71ecec53c61
child 34809 0fed930f2992
permissions -rw-r--r--
eliminated global Session.document_0 -- did not work due to hardwired id; more precise Session.begin_document, avoid race on var prover; replaced slightly odd Session.document_versions by Sassion.documents table (cf. src/Pure/Isar/isar_document.ML); simplified edit_document in ML: initial empty command is identified by ""; misc tuning;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
     1
/*
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
     2
 * Isabelle session, potentially with running prover
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
     3
 *
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
     4
 * @author Makarius
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
     5
 */
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
     6
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
     7
package isabelle.proofdocument
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
     8
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
import scala.actors.Actor._
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    11
34791
b97d5b38dea4 explicit object Session.Global_Settings;
wenzelm
parents: 34780
diff changeset
    12
object Session
b97d5b38dea4 explicit object Session.Global_Settings;
wenzelm
parents: 34780
diff changeset
    13
{
b97d5b38dea4 explicit object Session.Global_Settings;
wenzelm
parents: 34780
diff changeset
    14
  case object Global_Settings
b97d5b38dea4 explicit object Session.Global_Settings;
wenzelm
parents: 34780
diff changeset
    15
}
b97d5b38dea4 explicit object Session.Global_Settings;
wenzelm
parents: 34780
diff changeset
    16
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    17
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    18
class Session(system: Isabelle_System)
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    19
{
34778
8eccd35e975e removed unused Session.prover_logic;
wenzelm
parents: 34777
diff changeset
    20
  /* unique ids */
8eccd35e975e removed unused Session.prover_logic;
wenzelm
parents: 34777
diff changeset
    21
8eccd35e975e removed unused Session.prover_logic;
wenzelm
parents: 34777
diff changeset
    22
  private var id_count: BigInt = 0
8eccd35e975e removed unused Session.prover_logic;
wenzelm
parents: 34777
diff changeset
    23
  def create_id(): String = synchronized { id_count += 1; "j" + id_count }
8eccd35e975e removed unused Session.prover_logic;
wenzelm
parents: 34777
diff changeset
    24
8eccd35e975e removed unused Session.prover_logic;
wenzelm
parents: 34777
diff changeset
    25
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    26
  /* main actor */
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    27
34780
d0ff1c3a91ea more serious command line handling;
wenzelm
parents: 34778
diff changeset
    28
  private case class Start(args: List[String])
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    29
  private case object Stop
34808
e462572536e9 eliminated global Session.document_0 -- did not work due to hardwired id;
wenzelm
parents: 34807
diff changeset
    30
  private case class Begin_Document(path: String)
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    31
34802
006331f2b128 adapted to class Outer_Syntax;
wenzelm
parents: 34800
diff changeset
    32
  @volatile private var _syntax = new Outer_Syntax(system.symbols)
006331f2b128 adapted to class Outer_Syntax;
wenzelm
parents: 34800
diff changeset
    33
  def syntax(): Outer_Syntax = _syntax
34799
0330a4284a9b just one variable for outer syntax keywords and completion;
wenzelm
parents: 34795
diff changeset
    34
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    35
  private var prover: Isabelle_Process with Isar_Document = null
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    36
  private var prover_ready = false
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    37
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    38
  private val session_actor = actor {
34795
c97335b7e8c3 cache results;
wenzelm
parents: 34792
diff changeset
    39
    val xml_cache = new XML.Cache(131071)
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    40
    loop {
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    41
      react {
34780
d0ff1c3a91ea more serious command line handling;
wenzelm
parents: 34778
diff changeset
    42
        case Start(args) =>
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    43
          if (prover == null) {
34780
d0ff1c3a91ea more serious command line handling;
wenzelm
parents: 34778
diff changeset
    44
            prover = new Isabelle_Process(system, self, args:_*) with Isar_Document
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    45
            reply(())
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    46
          }
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    47
34807
wenzelm
parents: 34802
diff changeset
    48
        case Stop =>  // FIXME clarify
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    49
          if (prover != null)
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    50
            prover.kill
34778
8eccd35e975e removed unused Session.prover_logic;
wenzelm
parents: 34777
diff changeset
    51
          prover_ready = false
34808
e462572536e9 eliminated global Session.document_0 -- did not work due to hardwired id;
wenzelm
parents: 34807
diff changeset
    52
e462572536e9 eliminated global Session.document_0 -- did not work due to hardwired id;
wenzelm
parents: 34807
diff changeset
    53
        case Begin_Document(path: String) if prover_ready =>
e462572536e9 eliminated global Session.document_0 -- did not work due to hardwired id;
wenzelm
parents: 34807
diff changeset
    54
          val id = create_id()
e462572536e9 eliminated global Session.document_0 -- did not work due to hardwired id;
wenzelm
parents: 34807
diff changeset
    55
          val doc = Proof_Document.empty(id)
e462572536e9 eliminated global Session.document_0 -- did not work due to hardwired id;
wenzelm
parents: 34807
diff changeset
    56
          documents += (id -> doc)
e462572536e9 eliminated global Session.document_0 -- did not work due to hardwired id;
wenzelm
parents: 34807
diff changeset
    57
          prover.begin_document(id, path)
e462572536e9 eliminated global Session.document_0 -- did not work due to hardwired id;
wenzelm
parents: 34807
diff changeset
    58
          reply(doc)
e462572536e9 eliminated global Session.document_0 -- did not work due to hardwired id;
wenzelm
parents: 34807
diff changeset
    59
        
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    60
        case change: Change if prover_ready =>
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    61
          handle_change(change)
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    62
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    63
        case result: Isabelle_Process.Result =>
34795
c97335b7e8c3 cache results;
wenzelm
parents: 34792
diff changeset
    64
          handle_result(result.cache(xml_cache))
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    65
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    66
        case bad if prover_ready =>
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    67
          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
    68
      }
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    69
    }
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    70
  }
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    71
34780
d0ff1c3a91ea more serious command line handling;
wenzelm
parents: 34778
diff changeset
    72
  def start(args: List[String]) { session_actor !? Start(args) }
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    73
  def stop() { session_actor ! Stop }
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    74
  def input(change: Change) { session_actor ! change }
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    75
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    76
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    77
  /* pervasive event buses */
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    78
34791
b97d5b38dea4 explicit object Session.Global_Settings;
wenzelm
parents: 34780
diff changeset
    79
  val global_settings = new Event_Bus[Session.Global_Settings.type]
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    80
  val raw_results = new Event_Bus[Isabelle_Process.Result]
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    81
  val results = new Event_Bus[Command]
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    82
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    83
  val command_change = new Event_Bus[Command]
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    84
  val document_change = new Event_Bus[Proof_Document]
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    85
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    86
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    87
  /* selected state */  // FIXME!? races!?
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    88
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    89
  private var _selected_state: Command = null
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    90
  def selected_state = _selected_state
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    91
  def selected_state_=(state: Command) { _selected_state = state; results.event(state) }
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    92
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    93
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    94
  /* document state information */
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    95
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    96
  @volatile private var states = Map[Isar_Document.State_ID, Command_State]()
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    97
  @volatile private var commands = Map[Isar_Document.Command_ID, Command]()
34808
e462572536e9 eliminated global Session.document_0 -- did not work due to hardwired id;
wenzelm
parents: 34807
diff changeset
    98
  @volatile private var documents = Map[Isar_Document.Document_ID, Proof_Document]()
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
    99
34808
e462572536e9 eliminated global Session.document_0 -- did not work due to hardwired id;
wenzelm
parents: 34807
diff changeset
   100
  def state(id: Isar_Document.State_ID): Option[Command_State] = states.get(id)
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   101
  def command(id: Isar_Document.Command_ID): Option[Command] = commands.get(id)
34808
e462572536e9 eliminated global Session.document_0 -- did not work due to hardwired id;
wenzelm
parents: 34807
diff changeset
   102
  def document(id: Isar_Document.Document_ID): Option[Proof_Document] = documents.get(id)
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   103
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   104
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   105
  /* document changes */
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   106
34808
e462572536e9 eliminated global Session.document_0 -- did not work due to hardwired id;
wenzelm
parents: 34807
diff changeset
   107
  def begin_document(path: String): Proof_Document =
e462572536e9 eliminated global Session.document_0 -- did not work due to hardwired id;
wenzelm
parents: 34807
diff changeset
   108
    (session_actor !? Begin_Document(path)).asInstanceOf[Proof_Document]
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   109
34807
wenzelm
parents: 34802
diff changeset
   110
  private def handle_change(change: Change)
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   111
  {
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   112
    val old = document(change.parent.get.id).get
34778
8eccd35e975e removed unused Session.prover_logic;
wenzelm
parents: 34777
diff changeset
   113
    val (doc, changes) = old.text_changed(this, change)
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   114
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   115
    val id_changes = changes map {
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   116
      case (c1, c2) =>
34808
e462572536e9 eliminated global Session.document_0 -- did not work due to hardwired id;
wenzelm
parents: 34807
diff changeset
   117
        (c1.map(_.id).getOrElse(""),
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   118
         c2 match {
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   119
            case None => None
34808
e462572536e9 eliminated global Session.document_0 -- did not work due to hardwired id;
wenzelm
parents: 34807
diff changeset
   120
            case Some(command) =>  // FIXME clarify -- may reuse existing commands!??
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   121
              commands += (command.id -> command)
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   122
              prover.define_command(command.id, system.symbols.encode(command.content))
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   123
              Some(command.id)
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   124
          })
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   125
    }
34808
e462572536e9 eliminated global Session.document_0 -- did not work due to hardwired id;
wenzelm
parents: 34807
diff changeset
   126
    documents += (doc.id -> doc)
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   127
    prover.edit_document(old.id, doc.id, id_changes)
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   128
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   129
    document_change.event(doc)
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   130
  }
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   131
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   132
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   133
  /* prover results */
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   134
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   135
  private def handle_result(result: Isabelle_Process.Result)
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   136
  {
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   137
    raw_results.event(result)
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   138
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   139
    val state =
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   140
      Position.id_of(result.props) match {
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   141
        case None => None
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   142
        case Some(id) => commands.get(id) orElse states.get(id) orElse None
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   143
      }
34792
65130daf2883 simplified Isabelle_Process.Result;
wenzelm
parents: 34791
diff changeset
   144
    if (state.isDefined) state.get ! (this, result.message)
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   145
    else if (result.kind == Isabelle_Process.Kind.STATUS) {
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   146
      //{{{ global status message
34792
65130daf2883 simplified Isabelle_Process.Result;
wenzelm
parents: 34791
diff changeset
   147
      for (elem <- result.body) {
65130daf2883 simplified Isabelle_Process.Result;
wenzelm
parents: 34791
diff changeset
   148
        elem match {
65130daf2883 simplified Isabelle_Process.Result;
wenzelm
parents: 34791
diff changeset
   149
          // document edits
65130daf2883 simplified Isabelle_Process.Result;
wenzelm
parents: 34791
diff changeset
   150
          case XML.Elem(Markup.EDITS, (Markup.ID, doc_id) :: _, edits) =>
34808
e462572536e9 eliminated global Session.document_0 -- did not work due to hardwired id;
wenzelm
parents: 34807
diff changeset
   151
            document(doc_id) match {
e462572536e9 eliminated global Session.document_0 -- did not work due to hardwired id;
wenzelm
parents: 34807
diff changeset
   152
              case None =>  // FIXME clarify
34792
65130daf2883 simplified Isabelle_Process.Result;
wenzelm
parents: 34791
diff changeset
   153
              case Some(doc) =>
65130daf2883 simplified Isabelle_Process.Result;
wenzelm
parents: 34791
diff changeset
   154
                for {
65130daf2883 simplified Isabelle_Process.Result;
wenzelm
parents: 34791
diff changeset
   155
                  XML.Elem(Markup.EDIT, (Markup.ID, cmd_id) :: (Markup.STATE, state_id) :: _, _)
65130daf2883 simplified Isabelle_Process.Result;
wenzelm
parents: 34791
diff changeset
   156
                  <- edits }
65130daf2883 simplified Isabelle_Process.Result;
wenzelm
parents: 34791
diff changeset
   157
                {
65130daf2883 simplified Isabelle_Process.Result;
wenzelm
parents: 34791
diff changeset
   158
                  commands.get(cmd_id) match {
65130daf2883 simplified Isabelle_Process.Result;
wenzelm
parents: 34791
diff changeset
   159
                    case Some(cmd) =>
65130daf2883 simplified Isabelle_Process.Result;
wenzelm
parents: 34791
diff changeset
   160
                      val state = new Command_State(cmd)
65130daf2883 simplified Isabelle_Process.Result;
wenzelm
parents: 34791
diff changeset
   161
                      states += (state_id -> state)
65130daf2883 simplified Isabelle_Process.Result;
wenzelm
parents: 34791
diff changeset
   162
                      doc.states += (cmd -> state)
65130daf2883 simplified Isabelle_Process.Result;
wenzelm
parents: 34791
diff changeset
   163
                      command_change.event(cmd)   // FIXME really!?
65130daf2883 simplified Isabelle_Process.Result;
wenzelm
parents: 34791
diff changeset
   164
                    case None =>
65130daf2883 simplified Isabelle_Process.Result;
wenzelm
parents: 34791
diff changeset
   165
                  }
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   166
                }
34792
65130daf2883 simplified Isabelle_Process.Result;
wenzelm
parents: 34791
diff changeset
   167
            }
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   168
34792
65130daf2883 simplified Isabelle_Process.Result;
wenzelm
parents: 34791
diff changeset
   169
          // command and keyword declarations
65130daf2883 simplified Isabelle_Process.Result;
wenzelm
parents: 34791
diff changeset
   170
          case XML.Elem(Markup.COMMAND_DECL, (Markup.NAME, name) :: (Markup.KIND, kind) :: _, _) =>
34802
006331f2b128 adapted to class Outer_Syntax;
wenzelm
parents: 34800
diff changeset
   171
            _syntax += (name, kind)
34792
65130daf2883 simplified Isabelle_Process.Result;
wenzelm
parents: 34791
diff changeset
   172
          case XML.Elem(Markup.KEYWORD_DECL, (Markup.NAME, name) :: _, _) =>
34802
006331f2b128 adapted to class Outer_Syntax;
wenzelm
parents: 34800
diff changeset
   173
            _syntax += name
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   174
34792
65130daf2883 simplified Isabelle_Process.Result;
wenzelm
parents: 34791
diff changeset
   175
          // process ready (after initialization)
65130daf2883 simplified Isabelle_Process.Result;
wenzelm
parents: 34791
diff changeset
   176
          case XML.Elem(Markup.READY, _, _) => prover_ready = true
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   177
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   178
        case _ =>
34792
65130daf2883 simplified Isabelle_Process.Result;
wenzelm
parents: 34791
diff changeset
   179
        }
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   180
      }
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   181
      //}}}
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   182
    }
34778
8eccd35e975e removed unused Session.prover_logic;
wenzelm
parents: 34777
diff changeset
   183
    else if (result.kind == Isabelle_Process.Kind.EXIT)
8eccd35e975e removed unused Session.prover_logic;
wenzelm
parents: 34777
diff changeset
   184
      prover = null
34777
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   185
  }
91d6089cef88 class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff changeset
   186
}