summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
2cdd898)
* Expression.cs, XPathNavigator.cs : hold raw expression field for
get_Expression. It is preparation for expression optimization.
svn path=/trunk/mcs/; revision=35767
+2004-11-05 Atsushi Enomoto <atsushi@ximian.com>
+
+ * Expression.cs, XPathNavigator.cs : hold raw expression field for
+ get_Expression. It is preparation for expression optimization.
+
2004-11-05 Atsushi Enomoto <atsushi@ximian.com>
* Iterator.cs : SimpleIterator._current could be cloned only when
2004-11-05 Atsushi Enomoto <atsushi@ximian.com>
* Iterator.cs : SimpleIterator._current could be cloned only when
protected NSResolver _nsm;
protected Expression _expr;
XPathSorters _sorters;
protected NSResolver _nsm;
protected Expression _expr;
XPathSorters _sorters;
- public CompiledExpression (Expression expr)
+ public CompiledExpression (string raw, Expression expr)
}
private CompiledExpression (CompiledExpression other)
{
_nsm = other._nsm;
_expr = other._expr;
}
private CompiledExpression (CompiledExpression other)
{
_nsm = other._nsm;
_expr = other._expr;
+ rawExpression = other.rawExpression;
}
#if XPATH_DEBUG
public override Test.Xml.XPath.XPathExpression Clone () { return new CompiledExpression (this); }
}
#if XPATH_DEBUG
public override Test.Xml.XPath.XPathExpression Clone () { return new CompiledExpression (this); }
#endif
internal NSResolver NamespaceManager { get { return _nsm; } }
#endif
internal NSResolver NamespaceManager { get { return _nsm; } }
- public override String Expression { get { return _expr.ToString (); }}
+ public override String Expression { get { return rawExpression; }}
public override XPathResultType ReturnType { get { return _expr.ReturnType; }}
public object Evaluate (BaseIterator iter)
public override XPathResultType ReturnType { get { return _expr.ReturnType; }}
public object Evaluate (BaseIterator iter)
public virtual XPathExpression Compile (string xpath)
{
XPathParser parser = new XPathParser ();
public virtual XPathExpression Compile (string xpath)
{
XPathParser parser = new XPathParser ();
- return new CompiledExpression (parser.Compile (xpath));
+ return new CompiledExpression (xpath, parser.Compile (xpath));
}
internal virtual XPathExpression Compile (string xpath, System.Xml.Xsl.IStaticXsltContext ctx)
{
XPathParser parser = new XPathParser (ctx);
}
internal virtual XPathExpression Compile (string xpath, System.Xml.Xsl.IStaticXsltContext ctx)
{
XPathParser parser = new XPathParser (ctx);
- return new CompiledExpression (parser.Compile (xpath));
+ return new CompiledExpression (xpath, parser.Compile (xpath));
}
public virtual object Evaluate (string xpath)
}
public virtual object Evaluate (string xpath)