Commit Graph
47 Commits
Author SHA1 Message Date
Atsushi Eno ca0a570668 2003-12-03 Atsushi Enomoto <[email protected]>
* Expression.cs : XPathSorters.Compare() should compare document
	  position. See last sentence of XSLT 1.0 secion 10.

svn path=/trunk/mcs/; revision=20720
2003-12-03 05:45:54 +00:00
Atsushi Eno feaa393fe3 2003-11-28 Atsushi Enomoto <[email protected]>
* Expression.cs : namespace axis now traversed in reverse order, so it
	  requires sorting.
	* Iterator.cs : UnionIterator.Clone() was incomplete.
	  NamespaceItarator() should be reverse order (special handling
	  because of XPathNavigator specification).

svn path=/trunk/mcs/; revision=20565
2003-11-28 01:13:15 +00:00
Atsushi Eno d0a53d86bb 2003-11-24 Atsushi Enomoto <[email protected]>
* Parser.jay, Expression.cs, Iterator.cs :
	  Added ExprParens and ParensIterator classes which is used to handle
	  precedence of parenthesized expressions.
	  (e.g. consider "(preceding::*)[3]" and "preceding::[3]" )

	* Expression.cs, Iterator.cs :
	  Added RequireSorting property for each Expr and BaseIterator classes.
	  SlashIterator.MoveNext() now considers correct sorting. But
	  considering performance, it separates two logics, sorted and sortless
	  depending on RequireSorting of left iterator and right expression.

	* Iterator.cs :
	  SimpleIterator.ctor() should consider when nav is null.
	  FollowingIterator.MoveNext() and PrecedingIterator.MoveNext() should
	  not return any nodes.
	  AncestorIterator and AncestorOrSelfIterator copy ctr() should clone
	  positions.
	  AncestorIterator.MoveNext() should skip Root if context node is
	  Root itself.
	  FollowingIterator.MoveNext() should not handle children of context
	  itself.
	  PrecedingIterator.MoveNext() should skip its ancestors.
	  AxisIterator.ReverseAxis should be dependent on its containing iter.
	  UnionIterator.MoveNext() should consider comparison of nodes in
	  different document. The behavior is implementation dependent.
	  (see XSLT spec 12.1)

svn path=/trunk/mcs/; revision=20389
2003-11-24 15:18:16 +00:00
Atsushi Eno 1156749402 2003-11-19 Atsushi Enomoto <[email protected]>
* DefaultContext.cs : XPathFunctions.ToNumber() should catch overflow.
	  XPathFunctionId.cs : Exposed Id expression.
	* Expression.cs : Added ExprLiteral.Value, and class ExprParens (it
	  will be used to solve evaluation precedence problem).

svn path=/trunk/mcs/; revision=20225
2003-11-19 15:24:04 +00:00
Ben Maurer 82a0873c65 2003-09-27 Ben Maurer <[email protected]>
* Iterator.cs, Expression.cs, XPathNavigator.cs: In AxisIterator
	use NameTable so we dont call strcmp.

svn path=/trunk/mcs/; revision=18334
2003-09-27 19:52:46 +00:00
Ben Maurer 69d5a2fc48 2003-09-27 Ben Maurer <[email protected]>
* DefaultContext.cs (translate): translate ("abc", "c", "") = "ab"
	not "abc".
	* Iterator.cs, Expression.cs: All axes are
	SimpleIterators. SimpleIterators are gaurenteed to give the same
	XPathNavigator in Current. Make AxisIterator take a
	SimpleIterator, not any old BaseIterator. Will allow us to make
	NameTable optimizations and avoid quite a few strcmp's.

svn path=/trunk/mcs/; revision=18326
2003-09-27 04:44:20 +00:00
Ben Maurer 9c0f532064 fix up //
svn path=/trunk/mcs/; revision=18281
2003-09-24 23:13:30 +00:00
Ben Maurer 4505af6030 making optimizatons in preperation for Jackson's jay patch
svn path=/trunk/mcs/; revision=18248
2003-09-21 19:22:37 +00:00
Ben Maurer 1951677126 2003-09-20 Ben Maurer <[email protected]>
* Expression.cs: num != double.NaN does not work.

svn path=/trunk/mcs/; revision=18213
2003-09-20 16:29:40 +00:00
Ben Maurer e7fd13de81 2003-09-19 Ben Maurer <[email protected]>
* Expression.cs: in NodeTypeTest dont throw an exception if it is
	an unknown node type (allows for better Pattern debugging)

svn path=/trunk/mcs/; revision=18197
2003-09-20 03:11:42 +00:00
Ben Maurer b70953fad1 lots o optimizations
svn path=/trunk/mcs/; revision=18055
2003-09-13 01:23:20 +00:00
Ben Maurer 6102de78ee Boxing is evil
svn path=/trunk/mcs/; revision=18025
2003-09-10 22:28:44 +00:00
Ben Maurer ddd0ce62f4 XSLT will never be able to tell the XPathResultType of a variable, so lets just save the lookup
svn path=/trunk/mcs/; revision=18006
2003-09-08 23:36:41 +00:00
Ben Maurer bc43a0c5b3 Optimize
svn path=/trunk/mcs/; revision=17979
2003-09-07 19:40:30 +00:00
Ben Maurer 9a14273e54 buggies
svn path=/trunk/mcs/; revision=17950
2003-09-06 19:57:06 +00:00
Ben Maurer 446f43d4be 2003-09-06 Ben Maurer <[email protected]>
* DefaultContext.cs, Expresssion.cs, Parser.jay: Rewrite so that
	system functions are actually expressions. Will allow for some
	nice optimizations.

svn path=/trunk/mcs/; revision=17947
2003-09-06 18:58:51 +00:00
Ben Maurer 572f874a3c Template priority; flush XmlWriter
svn path=/trunk/mcs/; revision=17802
2003-09-01 18:48:51 +00:00
Ben Maurer a7578be9cf initial pattern work
svn path=/trunk/mcs/; revision=17786
2003-09-01 03:59:12 +00:00
Ben Maurer 2172fba668 2003-08-25 Ben Maurer <[email protected]>
* XPathNavigator.cs: "Smart" behavior in Matches. Nice 8x speed
	improvement in the method (5ms/call -> .7 ms / call) measured by
	monodoc's rendering of N:System.
	* Expression.cs: Utility methods to support above.

svn path=/trunk/mcs/; revision=17596
2003-08-25 18:28:19 +00:00
Piers Haken 654b0fd348 2003-08-01 Piers Haken <[email protected]>
* Expression.cs: added NodeNamespaceTest
	* XPathNavigator.cs: implement Select* with namespaces

svn path=/trunk/mcs/; revision=16986
2003-08-01 10:44:37 +00:00
Piers Haken d1237a5f0e 2003-07-31 Piers Haken <[email protected]>
* Parser.jay:
		Nested predicates (uses ExprFilter instead)
		more type safety
		make grammar look more like w3c spec
	* Expression.cs:
		remove ExprStep, ExprPredicates
		NodeTest is now a NodeSet
		more type-safety
	* Iterator.cs:
		PredicateIterator now only takes a single predicate expression
		more type-safety
	* XPathNavigator.cs:
		simplified SelectTest
	* XPathException.cs:
		fixed indenting

svn path=/trunk/mcs/; revision=16953
2003-07-31 20:09:47 +00:00
Piers Haken 8e1cfb092b 2003-07-29 Piers Haken <[email protected]>
* XPathNavigator.cs:
	* Expression.cs:
		add typesafe Evaluate* methods

svn path=/trunk/mcs/; revision=16870
2003-07-30 03:20:04 +00:00
Piers Haken fcf0de145b 2003-07-28 Piers Haken <[email protected]>
* Expression.cs: boolean operators: handle comparing .Any better

svn path=/trunk/mcs/; revision=16800
2003-07-28 22:54:40 +00:00
Piers Haken cb74d89002 2003-07-28 Piers Haken <[email protected]>
* DefaultContext.cs: count() should return a double
	* Expression.cs: better support for handling non-double numbers

svn path=/trunk/mcs/; revision=16799
2003-07-28 22:12:33 +00:00
Piers Haken ae935bbac4 2003-07-27 Piers Haken <[email protected]>
* Expression.cs:
	* DefaultContext.cs:
		catch FormatExceptions while parsing numbers

svn path=/trunk/mcs/; revision=16767
2003-07-28 06:22:00 +00:00
Piers Haken 10fd05dc67 2003-07-27 Piers Haken <[email protected]>
* Expression.cs:
		fix case sorting order
		allow EvaluateNumber to take XPathResultType.Any

svn path=/trunk/mcs/; revision=16754
2003-07-27 23:27:14 +00:00
Piers Haken ce87ea0ec5 2003-07-27 Piers Haken <[email protected]>
* XmlQualifiedName.cs : fields should never be null

	* Expression.cs:
	* Tokenizer.cs:
		don't pass null to XmlQualifiedName constructor

	* XsltArgumentList.cs:
		fix type conversions in ValidateParam
		allow creating params with null namespaceUri

svn path=/trunk/mcs/; revision=16753
2003-07-27 21:49:26 +00:00
Piers Haken f203457fdf 2003-07-27 Piers Haken <[email protected]>
* Expression.cs: allow EvaluateNodeSet to take XPathResultType.Any

svn path=/trunk/mcs/; revision=16751
2003-07-27 19:33:33 +00:00
Piers Haken 0cd86fed8d 2003-07-26 Piers Haken <[email protected]>
* Expression.cs: fix function evaluation with ambigous argument types
	* XPathnavigator.cs: fix silly null reference bug

svn path=/trunk/mcs/; revision=16729
2003-07-27 02:54:26 +00:00
Piers Haken 2e273f54ed 2003-07-26 Piers Haken <[email protected]>
* Iterator.cs:
	* DefaultContext.cs:
		ArrayListIterator->EnumeratorIterator
	* Expression.cs: add sorting support

svn path=/trunk/mcs/; revision=16727
2003-07-27 02:28:24 +00:00
Piers Haken 26430406cf 2003-07-26 Piers Haken <[email protected]>
* Tokenizer.cs:
	* Parser.jay:
		move QName parsing into tokenizer
	* Expression.cs:
		fix evaluating XPathResultType.Any
		fix ExprDiv.ToString()
		fix NodeTypeTest.ToString() (for namespace axis)

svn path=/trunk/mcs/; revision=16719
2003-07-26 20:16:24 +00:00
Piers Haken 405d4ac5a9 2003-07-25 Piers Haken <[email protected]>
* Expression.cs: return clone of $var evaluation

svn path=/trunk/mcs/; revision=16708
2003-07-26 17:45:08 +00:00
Piers Haken 2654d1fc81 2003-07-25 Piers Haken <[email protected]>
* Iterator.cs: add setter for NamespaceManager
	* XPathNavigator.cs: propagate NamespaceManager from context on Evaluate
	* Expression.cs: fix func/var exception strings

svn path=/trunk/mcs/; revision=16696
2003-07-25 21:26:28 +00:00
Piers Haken ab5db15325 2003-07-25 Piers Haken <[email protected]>
* Expressioncs: implement ExprFilter.Evaluate

svn path=/trunk/mcs/; revision=16690
2003-07-25 19:14:19 +00:00
Piers Haken 65fed058e3 2003-07-25 Piers Haken <[email protected]>
* Expressioncs: implement ExprVariable.Evaluate

svn path=/trunk/mcs/; revision=16685
2003-07-25 17:42:44 +00:00
Piers Haken b3e48938d7 2003-07-24 Piers Haken <[email protected]>
* Parser.jay:
	* Expression.cs:
		allow ExprUNION to take non-nodeset (eg, $var) arguments

svn path=/trunk/mcs/; revision=16629
2003-07-24 22:37:55 +00:00
Piers Haken 2e5903d155 2003-07-24 Piers Haken <[email protected]>
* Tokenizer.cs: fix variable references
	* Parser.jay:
	* Expression.cs:
	* XPathNavigator.cs:
		use XmlQualifiedName

svn path=/trunk/mcs/; revision=16623
2003-07-24 20:41:45 +00:00
Piers Haken 7576c51d60 2003-03-07 Piers Haken <[email protected]>
* Exression.cs:
	* DefaultContext.cs:
		fixed function argument resolution

svn path=/trunk/mcs/; revision=13262
2003-04-07 10:55:13 +00:00
Piers Haken 2a62fc4766 2003-02-09 Piers Haken <[email protected]>
* XPathNavigator.cs:
	* Iterator.cs:
	* Expression.cs: fix namespace handling

svn path=/trunk/mcs/; revision=11427
2003-02-09 22:54:50 +00:00
Piers Haken e05854d185 2002-09-21 Piers Haken <[email protected]>
* XPathException: implementation
	* Expression.cs:
	* Iterator.cs:
	* Parser.jay:
	* Tokenizer.jay:
	* XPathNavigator.jay:
		use XPathException.

svn path=/trunk/mcs/; revision=7690
2002-09-21 18:26:49 +00:00
Piers Haken 643a34dd9a 2002-09-12 Piers Haken <[email protected]>
* Expression.cs, Parser.jay: allow ExprSLASH to take a generic expression as its left argument.
	* Iterator.cs: fix SlashIterator.Clone() when _iterRight is null.
	* DefaultContext.cs: fix id() return type.

svn path=/trunk/mcs/; revision=7422
2002-09-13 02:13:11 +00:00
Gonzalo Paniagua Javier 56b6a6396b 2002-09-03 Gonzalo Paniagua Javier <[email protected]>
* DefaultContext.cs: fixed bug #28840.
	* Expression.cs: added FIXME.

svn path=/trunk/mcs/; revision=7195
2002-09-03 10:01:37 +00:00
Piers Haken 2a157572bf 2002-07-17 Piers Haken <[email protected]>
* DefaultContext.cs: implement 'string-length()', 'normalize-space()'
	* Parser.jay: remove redundant production
	* Expression.cs: add switches for debugging under VS.NET

svn path=/trunk/mcs/; revision=5849
2002-07-17 13:02:13 +00:00
Piers Haken 060f49d85e 2002-07-17 Piers Haken <[email protected]>
* Expression.cs: implement nodeset/nodeset comparisons (non-optimal)

svn path=/trunk/mcs/; revision=5846
2002-07-17 11:07:20 +00:00
Piers Haken 426fb68bbd 2002-07-15 Piers Haken <[email protected]>
* Iterator.cs:
		- rename UnionIterator to MergedIterator,
		- create new UnionIterator to implment uniqueness for '|' operator
		- fix position bug in ArrayListIterator.Clone()
	* Expression.cs: use new UnionIterator constructor syntax

svn path=/trunk/mcs/; revision=5817
2002-07-16 00:42:32 +00:00
Piers Haken b795373f90 2002-06-29 Piers Haken <[email protected]>
* Expression.cs:
		- remove dead code
		- NodeTest uses XPathResultType instead of internal NodeTestTypes enum
		- remove NodeTestTypes enum
		- remove NodeTestTypeAny (functionality provided by base now)
		- fix ExprStep to handle wildcard QNames

	* Parser.jay:
		- moved to Mono.Xml.XPath namespace
		- use XPathResultType
		- handle wildcard QNames

	* Tokenizer.cs: moved to Mono.Xml.XPath namespace

	* XPathNavigator.cs: implement
		- IsDescendant
		- SelectAncestors
		- SelectDescendants
		- SelectChildren

	* XPathResultType.cs: fix enum values

svn path=/trunk/mcs/; revision=5502
2002-06-29 20:21:13 +00:00
Piers Haken 8d73a2306c 2002-06-23 Piers Haken <[email protected]>
System.Xml:

    * XmlDocumentNavigator.cs: implement Clone()
    * XmlElement.cs: remove bogus unimplemented override of InnerText
    * XmlNode.cs: implment SelectNodes/SelectSingleNode
    * XmlNodeArrayList.cs: new support class for SelectNodes

System.Xml.Xsl:

    * XsltContext.cs: added 'PreserveWhitespace' abstract method

System.Xml.XPath:

    * XPathNavigator.cs: implement:
        - Compile
        - Evaluate
        - Clone
        - Select
        - ToString
        - some forwarding methods

    * XPathNodeIterator: implement caching Count

    * Tokenizer.cs: new XPath tokenizer
    * Parser.jay: new XPath grammar
    * Parser.cs: new precompiled XPath grammar
    * Expression.cs: new XPath expression objects
    * Iterator.cs: new XPath result/context objects
    * DefaultContext.cs: new XPath function binding context

svn path=/trunk/mcs/; revision=5421
2002-06-23 16:52:58 +00:00