Skip to content

Update XPath2Expression.cs #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wstaelens wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update XPath2Expression.cs #74

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 20 additions & 18 deletions src/XPath2/XPath2Expression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,18 @@ private object PrepareValue(object value)
{
if (value == null)
return Undefined.Value;
XmlNode xmlNode = value as XmlNode;
if (xmlNode != null)

if (value is XmlNode xmlNode)
return xmlNode.CreateNavigator();
XNode xnode = value as XNode;
if (xnode != null)
else if (value is XNode xnode)
return xnode.CreateNavigator();
XPath2NodeIterator iter = value as XPath2NodeIterator;
if (iter != null)
else if (value is XPath2NodeIterator)
return iter;
IEnumerable<XNode> en = value as IEnumerable<XNode>;
if (en != null)
else if (value is IEnumerable<XNode> en)
return new NodeIterator(CreateIterator(en));
IEnumerable<Object> eno = value as IEnumerable<Object>;
if (eno != null)
else if (value is IEnumerable<object> eno)
return new NodeIterator(CreateIterator(eno));

return value;
}

Expand Down Expand Up @@ -112,9 +109,11 @@ public static IEnumerable<T> Select<T>(string xpath, IXmlNamespaceResolver resol
{
XPathNavigator curr = (XPathNavigator)item;
XObject o = (XObject)curr.UnderlyingObject;
if (!(o is T))

if (o is T t)
yield return t;
else
throw new InvalidOperationException(String.Format("Unexpected evaluation {0}", o.GetType()));
yield return (T)o;
}
else
throw new InvalidOperationException(String.Format("Unexpected evaluation {0}", item.TypedValue.GetType()));
Expand Down Expand Up @@ -191,16 +190,17 @@ private object[] BindExpr(IDictionary<XmlQualifiedName, object> vars)
public object Evaluate(IContextProvider provider, IDictionary<XmlQualifiedName, object> vars)
{
object res = ExpressionTree.Execute(provider, BindExpr(vars));
if (res is XPathItem)
if (res is XPathItem item)
{
XPathItem item = (XPathItem)res;
if (!item.IsNode)
res = item.TypedValue;
}

resultType = CoreFuncs.GetXPath2ResultType(res);
ValueProxy proxy = res as ValueProxy;
if (proxy != null)

if (res is ValueProxy proxy)
return proxy.Value;

return res;
}

Expand All @@ -211,7 +211,8 @@ public object EvaluateWithProperties(IContextProvider provider, object props)
{
Type type = props.GetType();
if (type.IsArray)
throw new ArgumentException("props");
throw new ArgumentException(nameof(props));

PropertyInfo[] propsInfo = type.GetProperties();
vars = new Dictionary<XmlQualifiedName, object>(propsInfo.Length);
for (int k = 0; k < propsInfo.Length; k++)
Expand All @@ -232,4 +233,5 @@ public XPath2ResultType GetResultType(IDictionary<XmlQualifiedName, object> vars
return resultType.Value;
}
}
}

}
Loading