more explicit treatment of command/document state;
misc tuning and clarification;
/*
* Prover commands with semantic state
*
* @author Johannes Hölzl, TU Munich
* @author Fabian Immler, TU Munich
*/
package isabelle.proofdocument
import scala.actors.Actor, Actor._
import scala.collection.mutable
import isabelle.jedit.Isabelle
object Command
{
object Status extends Enumeration
{
val UNPROCESSED = Value("UNPROCESSED")
val FINISHED = Value("FINISHED")
val FAILED = Value("FAILED")
}
case class HighlightInfo(highlight: String) { override def toString = highlight }
case class TypeInfo(ty: String)
case class RefInfo(file: Option[String], line: Option[Int],
command_id: Option[String], offset: Option[Int])
}
class Command(
val id: Isar_Document.Command_ID,
val tokens: List[Token],
val starts: Map[Token, Int]) // FIXME eliminate
extends Session.Entity
{
require(!tokens.isEmpty)
// FIXME override equality as well
override def hashCode = id.hashCode
/* content */
override def toString = name
val name = tokens.head.content
val content: String = Token.string_from_tokens(tokens, starts)
def content(i: Int, j: Int): String = content.substring(i, j)
lazy val symbol_index = new Symbol.Index(content)
def start(doc: Document) = doc.token_start(tokens.first)
def stop(doc: Document) = doc.token_start(tokens.last) + tokens.last.length
def contains(p: Token) = tokens.contains(p)
/* accumulated messages */
@volatile protected var state = new State(this)
def current_state: State = state
private case class Consume(session: Session, message: XML.Tree)
private case object Assign
private val accumulator = actor {
var assigned = false
loop {
react {
case Consume(session: Session, message: XML.Tree) if !assigned =>
state = state.+(session, message)
case Assign =>
assigned = true // single assigment
reply(())
case bad => System.err.println("command accumulator: ignoring bad message " + bad)
}
}
}
def consume(session: Session, message: XML.Tree) { accumulator ! Consume(session, message) }
def assign_state(state_id: Isar_Document.State_ID): Command =
{
val cmd = new Command(state_id, tokens, starts)
accumulator !? Assign
cmd.state = current_state
cmd
}
/* markup */
lazy val empty_markup = new Markup_Text(Nil, content)
def markup_node(begin: Int, end: Int, info: Any): Markup_Tree =
{
val start = symbol_index.decode(begin)
val stop = symbol_index.decode(end)
new Markup_Tree(new Markup_Node(start, stop, info), Nil)
}
}