*** empty log message ***

[m17n/m17n-lib-cs.git] / XmlExpr.cs

diff --git a/XmlExpr.cs b/XmlExpr.cs
index c10a312..41501be 100644 (file)
--- a/XmlExpr.cs
+++ b/XmlExpr.cs
@@ -61,7 +61,7 @@ namespace System.Xml
        string str = (InnerException != null ? InnerException.ToString ()
                      : base.ToString ()) + "\n" + "Xexpression:" + name + "\n";
        if (node != null)
-         str += "  at " + node.Parent.OuterXml + "\n";
+         str += "  at " + node.OuterXml + "\n";
        if (stack != null)
          {
            str += "Call stack: ";
@@ -2344,9 +2344,10 @@ namespace System.Xml
       Function func = domain.GetFunc (name);
 
       for (node = node.FirstChild; node != null; node = node.NextSibling)
-       if (node.Name != Qdescription
-           && node.Name != Qargs)
+       if (node.Name != Qdescription && node.Name != Qargs)
          break;
+      Console.WriteLine ("found body " + node.Name);
+      
       Term[] body = Parse (domain, node, null);
       if (is_defun)
        ((Function.Lambda) func).SetBody (body);
@@ -2456,8 +2457,9 @@ namespace System.Xml
       XmlDocument doc = new XmlDocument (Symbol.NameTable);
       XmlNode node;
 
-      using (XmlTextReader reader = new XmlTextReader (url, doc.NameTable))
+      using (XmlTextReader reader = new XmlTextReader (url, Symbol.NameTable))
        {
+         reader.WhitespaceHandling = WhitespaceHandling.None;
          do {
            reader.Read ();
          } while (reader.NodeType != XmlNodeType.None