# HG changeset patch
# User wenzelm
# Date 1281480160 -7200
# Node ID cd6906d9199f28d7486bcb52c07e570a5d63ae32
# Parent  beb86b80559059233130db79a634da9d6d4f8dec
proper handling of empty text;
more informative exceptions;

diff -r beb86b805590 -r cd6906d9199f src/Pure/General/xml_data.ML
--- a/src/Pure/General/xml_data.ML	Wed Aug 11 00:42:01 2010 +0200
+++ b/src/Pure/General/xml_data.ML	Wed Aug 11 00:42:40 2010 +0200
@@ -78,9 +78,11 @@
   | dest_properties ts = raise XML_BODY ts;
 
 
-fun make_string s = [XML.Text s];
+fun make_string "" = []
+  | make_string s = [XML.Text s];
 
-fun dest_string [XML.Text s] = s
+fun dest_string [] = ""
+  | dest_string [XML.Text s] = s
   | dest_string ts = raise XML_BODY ts;
 
 
diff -r beb86b805590 -r cd6906d9199f src/Pure/General/xml_data.scala
--- a/src/Pure/General/xml_data.scala	Wed Aug 11 00:42:01 2010 +0200
+++ b/src/Pure/General/xml_data.scala	Wed Aug 11 00:42:40 2010 +0200
@@ -38,14 +38,14 @@
 
   /* structural nodes */
 
-  class XML_Body extends Exception  // FIXME exception argument!?
+  class XML_Body(body: XML.Body) extends Exception
 
   private def make_node(ts: XML.Body): XML.Tree = XML.Elem(Markup(":", Nil), ts)
 
   private def dest_node(t: XML.Tree): XML.Body =
     t match {
       case XML.Elem(Markup(":", Nil), ts) => ts
-      case _ => throw new XML_Body
+      case _ => throw new XML_Body(List(t))
     }
 
 
@@ -57,16 +57,17 @@
   def dest_properties(ts: XML.Body): List[(String, String)] =
     ts match {
       case List(XML.Elem(Markup(":", props), Nil)) => props
-      case _ => throw new XML_Body
+      case _ => throw new XML_Body(ts)
     }
 
 
-  def make_string(s: String): XML.Body = List(XML.Text(s))
+  def make_string(s: String): XML.Body = if (s.isEmpty) Nil else List(XML.Text(s))
 
   def dest_string(ts: XML.Body): String =
     ts match {
+      case Nil => ""
       case List(XML.Text(s)) => s
-      case _ => throw new XML_Body
+      case _ => throw new XML_Body(ts)
     }
 
 
@@ -86,7 +87,7 @@
   def dest_pair[A, B](dest1: XML.Body => A)(dest2: XML.Body => B)(ts: XML.Body): (A, B) =
     ts match {
       case List(t1, t2) => (dest1(dest_node(t1)), dest2(dest_node(t2)))
-      case _ => throw new XML_Body
+      case _ => throw new XML_Body(ts)
     }
 
 
@@ -98,7 +99,7 @@
       (ts: XML.Body): (A, B, C) =
     ts match {
       case List(t1, t2, t3) => (dest1(dest_node(t1)), dest2(dest_node(t2)), dest3(dest_node(t3)))
-      case _ => throw new XML_Body
+      case _ => throw new XML_Body(ts)
     }
 
 
@@ -119,6 +120,6 @@
     dest_list(dest)(ts) match {
       case Nil => None
       case List(x) => Some(x)
-      case _ => throw new XML_Body
+      case _ => throw new XML_Body(ts)
     }
 }