From 5fc29f7650bef0519ac6e50558e8cb2e34096366 Mon Sep 17 00:00:00 2001 From: handa Date: Tue, 15 Sep 2009 00:10:51 +0000 Subject: [PATCH] *** empty log message *** --- XmlExpr.cs | 17 ++++++++++++++--- xex.xml | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/XmlExpr.cs b/XmlExpr.cs index 610e055..714c61a 100644 --- a/XmlExpr.cs +++ b/XmlExpr.cs @@ -212,7 +212,7 @@ namespace System.Xml.Expression if (! specialp) foreach (Xex a in args) if (a.Eval (domain) == null) - throw new Exception ("evaled to null"); + throw new Exception (a + ":evaled to null"); result = builtin (args, domain); Console.WriteLine (result); return result; @@ -243,7 +243,18 @@ namespace System.Xml.Expression public override string ToString () { - return name; + string str; + + if (builtin != null) + str = name; + else + { + str = "(" + name; + foreach (Xex a in lambda.args) + str += " " + a; + str += ")"; + } + return str; } } @@ -274,7 +285,7 @@ namespace System.Xml.Expression public abstract bool ValueP (object value); - public override string ToString () { return name + "(" + type + ")"; } + public override string ToString () { return name + "=" + val; } } internal class VarInt : Variable diff --git a/xex.xml b/xex.xml index 6f84e29..05425e6 100644 --- a/xex.xml +++ b/xex.xml @@ -2,7 +2,7 @@ - xy + -- 1.7.10.4