diff options
| author | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2002-09-03 14:01:37 +0400 |
|---|---|---|
| committer | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2002-09-03 14:01:37 +0400 |
| commit | 56b6a6396b57ba9fe9fd0676b5321cb2706d884b (patch) | |
| tree | 094100bddb70216524c1c10cae75a40ed63a7f31 /mcs/class/System.XML | |
| parent | 9fc1f796b09dab1b2ab22c3d346706ac1efe0ab0 (diff) | |
2002-09-03 Gonzalo Paniagua Javier <gonzalo@ximian.com>
* DefaultContext.cs: fixed bug #28840.
* Expression.cs: added FIXME.
svn path=/trunk/mcs/; revision=7195
Diffstat (limited to 'mcs/class/System.XML')
| -rw-r--r-- | mcs/class/System.XML/System.Xml.XPath/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System.XML/System.Xml.XPath/DefaultContext.cs | 4 | ||||
| -rw-r--r-- | mcs/class/System.XML/System.Xml.XPath/Expression.cs | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/mcs/class/System.XML/System.Xml.XPath/ChangeLog b/mcs/class/System.XML/System.Xml.XPath/ChangeLog index 59222021cdc..97610b85bad 100644 --- a/mcs/class/System.XML/System.Xml.XPath/ChangeLog +++ b/mcs/class/System.XML/System.Xml.XPath/ChangeLog @@ -1,3 +1,8 @@ +2002-09-03 Gonzalo Paniagua Javier <gonzalo@ximian.com> + + * DefaultContext.cs: fixed bug #28840. + * Expression.cs: added FIXME. + 2002-08-17 Jason Diamond <jason@injektilo.org> * XPathNavigator.cs: Fixed matching on patterns that look like diff --git a/mcs/class/System.XML/System.Xml.XPath/DefaultContext.cs b/mcs/class/System.XML/System.Xml.XPath/DefaultContext.cs index 00f1026f81b..c13cdd3b59a 100644 --- a/mcs/class/System.XML/System.Xml.XPath/DefaultContext.cs +++ b/mcs/class/System.XML/System.Xml.XPath/DefaultContext.cs @@ -507,10 +507,10 @@ namespace System.Xml.XPath public override XPathResultType ReturnType { get { return XPathResultType.Boolean; }} public override int Minargs { get { return 1; }} public override int Maxargs { get { return 1; }} - public override XPathResultType [] ArgTypes { get { return new XPathResultType [] { XPathResultType.Boolean }; }} + public override XPathResultType [] ArgTypes { get { return new XPathResultType [] { XPathResultType.Any }; }} public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext) { - return !((bool) args [0]); + return !(XPathFunctions.ToBoolean (args [0])); } public override string Name { get { return "not"; }} } diff --git a/mcs/class/System.XML/System.Xml.XPath/Expression.cs b/mcs/class/System.XML/System.Xml.XPath/Expression.cs index e5dd7218891..edc09085641 100644 --- a/mcs/class/System.XML/System.Xml.XPath/Expression.cs +++ b/mcs/class/System.XML/System.Xml.XPath/Expression.cs @@ -976,6 +976,7 @@ namespace System.Xml.XPath } XPathResultType [] rgTypes = GetArgTypes (iter); + //FIXME: what if func == null after next line? IXsltContextFunction func = iter.Context.ResolveFunction (_name.Prefix, _name.Local, rgTypes); object [] rgArgs = new object [_args.Count]; for (int iArg = 0; iArg < _args.Count; iArg ++) |