pass raw messages through xml_cache actor, which is important to retain ordering of results (e.g. read_command reports before assign, cf. 383c9d758a56);
--- a/src/Pure/General/xml.scala Sun Sep 04 08:43:06 2011 +0200
+++ b/src/Pure/General/xml.scala Sun Sep 04 14:29:15 2011 +0200
@@ -159,6 +159,7 @@
case Cache_Markup(x, f) => f(cache_markup(x))
case Cache_Tree(x, f) => f(cache_tree(x))
case Cache_Body(x, f) => f(cache_body(x))
+ case Cache_Ignore(x, f) => f(x)
case bad => System.err.println("XML.cache_actor: ignoring bad input " + bad)
}
}
@@ -168,12 +169,14 @@
private case class Cache_Markup(x: Markup, f: Markup => Unit)
private case class Cache_Tree(x: XML.Tree, f: XML.Tree => Unit)
private case class Cache_Body(x: XML.Body, f: XML.Body => Unit)
+ private case class Cache_Ignore[A](x: A, f: A => Unit)
// main methods
def cache_string(x: String)(f: String => Unit) { cache_actor ! Cache_String(x, f) }
def cache_markup(x: Markup)(f: Markup => Unit) { cache_actor ! Cache_Markup(x, f) }
def cache_tree(x: XML.Tree)(f: XML.Tree => Unit) { cache_actor ! Cache_Tree(x, f) }
def cache_body(x: XML.Body)(f: XML.Body => Unit) { cache_actor ! Cache_Body(x, f) }
+ def cache_ignore[A](x: A)(f: A => Unit) { cache_actor ! Cache_Ignore(x, f) }
}
--- a/src/Pure/System/isabelle_process.scala Sun Sep 04 08:43:06 2011 +0200
+++ b/src/Pure/System/isabelle_process.scala Sun Sep 04 14:29:15 2011 +0200
@@ -99,7 +99,8 @@
{
if (kind == Markup.INIT) rm_fifos()
if (kind == Markup.RAW)
- receiver ! new Result(XML.Elem(Markup(kind, props), body))
+ xml_cache.cache_ignore(
+ new Result(XML.Elem(Markup(kind, props), body)))((result: Result) => receiver ! result)
else {
val msg = XML.Elem(Markup(kind, props), Isar_Document.clean_message(body))
xml_cache.cache_tree(msg)((message: XML.Tree) =>