Commit Graph
40 Commits
Author SHA1 Message Date
Atsushi Eno a57cd64a04 2004-07-11 Atsushi Enomoto <[email protected]>
* Expression.cs, Iterator.cs, XPathNavigator.cs :
	  Use IXmlNamespaceResolver for net 2.0. Removed unused code.
	* XPathEditableNavigator.cs : fixed namespace.
	* XPathNavigator.cs :
	  Fixed inheritance. Added missing MonoTODO.
	  Removed old .net 1.2 code.

svn path=/trunk/mcs/; revision=31000
2004-07-11 09:51:49 +00:00
Duncan Mak 8fa6e766dd Add MIT license to System.XML.DLL
svn path=/trunk/mcs/; revision=30055
2004-06-21 18:07:31 +00:00
Atsushi Eno 6f208edbf7 2004-06-18 Atsushi Enomoto <[email protected]>
* DefaultContext.cs : Globalization.
	* Iterator.cs : In SlashIterator.MoveNext() position might keep 0
	  in case of empty list. Thus extraneous iteration might happened.
	  Removed unused (and clone unsafe) EnumeratorIterator.

svn path=/trunk/mcs/; revision=29828
2004-06-18 01:30:02 +00:00
Atsushi Eno 1fdaec5cc7 2004-03-16 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs, Iterator.cs : Considered detached nodes, the
	  result of MoveToParent() should be checked.

svn path=/trunk/mcs/; revision=24106
2004-03-16 04:32:06 +00:00
Atsushi Eno 99012ec054 2004-02-16 Atsushi Enomoto <[email protected]>
* Expression.cs : Added EvaluatedNodeType and NeedAbsoluteMatching
	  to reduce extraneous Matches() trial.
	* Iterator.cs : Removed unused MergedIterator.
	* XPathNavigator.cs : Optimized Matches() not to evaluate ancestors
	  unnecessarily. (Test with NeedAbsoluteMatching).

svn path=/trunk/mcs/; revision=23144
2004-02-16 20:28:42 +00:00
Atsushi Eno 848087839d 2004-02-10 Atsushi Enomoto <[email protected]>
* Iterator.cs : Added overriden Count properties for some iterators
	  (this fixes the half of #50678).
	  Added ListIterator class (which can reduce GetEnumerator()).
	  In some places we can omit clone for Current property, so added
	  some check logic (It has no effect as yet).
	* Expression.cs, DefaultContext.cs :
	  use ListIterator instead of EnumeratorIterator.

svn path=/trunk/mcs/; revision=22934
2004-02-10 06:04:28 +00:00
Atsushi Eno 99b1f3bfd3 2004-02-08 Atsushi Enomoto <[email protected]>
* DefaultContext.cs, Expression.cs, Iterator.cs :
	  tiny foreach elimination.

svn path=/trunk/mcs/; revision=22889
2004-02-08 20:23:41 +00:00
Atsushi Eno bbc8ceabde 2004-01-27 Atsushi Enomoto <[email protected]>
* DefaultContext.cs : Avoid exception if possible.
	* Iterator.cs : Fixed PrecedingSiblingIterator.MoveNext(). When the
	  nav was positioned at the first, it incorrectly points itself.
	  Don't add names to name table while it is useless and expensive.

svn path=/trunk/mcs/; revision=22544
2004-01-27 15:57:08 +00:00
Nick Drochak 074d8f46d5 2004-01-08 Nick Drochak <[email protected]>
* Iterator.cs: Removed unused variable.

svn path=/trunk/mcs/; revision=21820
2004-01-07 15:13:11 +00:00
Atsushi Eno 8c751bda97 2003-12-16 Atsushi Enomoto <[email protected]>
* Iterator.cs : On its iteration, moving Current must not affect to
	  MoveNext(). To assure this, Current must be a clone of navigator.
	  Removed unused code.

svn path=/trunk/mcs/; revision=21225
2003-12-16 05:27:27 +00:00
Atsushi Eno 7040240ff7 2003-12-07 Atsushi Enomoto <[email protected]>
* Tokenizer.cs : Removed some TODOs. (trivial ;-)
	* Iterator.cs : ParensIterator can inherit from BaseIterator.
	  SlashIterator copy .ctor() always failed to clone. This fixes Count.

svn path=/trunk/mcs/; revision=20825
2003-12-07 05:45:00 +00:00
Atsushi Eno bd9c6af0a8 2003-12-03 Atsushi Enomoto <[email protected]>
* DefaultContext.cs : Overrode all functions' ToString().
	  XPathFunctions.ToNumber() trims whitespaces at both side.
	  Fixed NullReferenceException in normalize-space().
	* Iterator.cs : Fixed AncestorOrSelfIterator.MoveNext() didn't handle
	  attribute or namespace node correctly.
	  SlashIterator.Clone() didn't clone "next node iterator" correctly.
	  EnumeratorIterator.ctor() should raise an error (not at Clone())
	  when the target IEnumerator is not ICloneable.

svn path=/trunk/mcs/; revision=20711
2003-12-03 02:02:24 +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 3b45ef8b4d 2003-11-24 Atsushi Enomoto <[email protected]>
* Iterator.cs : PrecedingIterator.MoveNext() now breaks up at Root.
	* XPathNavigator.cs : ComparePosition() didn't handle attributes
	  correctly.

svn path=/trunk/mcs/; revision=20392
2003-11-24 17:03:12 +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 a92e6d2af7 2003-11-09 Atsushi Enomoto <[email protected]>
* Iterator.cs : Fixed SlashIterator that might return nodes 1)in
	  inconsistent order, and 2)may return duplicate result nodes.

svn path=/trunk/mcs/; revision=19766
2003-11-09 17:16:22 +00:00
Ben Maurer 54b6da7498 2003-11-06 Ben Maurer <[email protected]>
* Iterator.cs: (AxisIterator.ComparablePosition): Remove. Let
	it inherit from the base class. This made b[2] evaluated on
	<a /><b /><c /><a /><b /><c /> return the first b node because
	in the ChildIterator it was the second node and seemed to satsify
	the predicate.

svn path=/trunk/mcs/; revision=19706
2003-11-07 04:46:49 +00:00
Atsushi Eno 70968e882c 2003-11-04 Atsushi Enomoto <[email protected]>
* Iterator.cs : Added bool ReverseAxis property to identify whether
	  the iterator is in reverse order or not.  Added ComparablePosition
	  for correct position comparison for PredicateIterator and reverse-
	  order-axes.  Modified AncestorIterator, AncestorOrSelfIterator,
	  PrecedingIterator and PrecedingSiblingIterator to make MoveNext()
	  return their nodes in document order. This fixes bugzilla #39079.

svn path=/trunk/mcs/; revision=19621
2003-11-04 18:56:16 +00:00
Atsushi Eno b3af718991 2003-10-15 Atsushi Enomoto <[email protected]>
* Iterator.cs : DescendantIterator and FollowingIterator also should
	  not MoveNext() after they reached to the end.

svn path=/trunk/mcs/; revision=19085
2003-10-15 18:11:48 +00:00
Atsushi Eno 146f34e000 2003-10-13 Atsushi Enomoto <[email protected]>
* Iterator.cs : Fixed UnionIterator who ignores document order.
	  Fixed SlashIterator whose MoveNext() should finish at its end.

svn path=/trunk/mcs/; revision=18955
2003-10-13 08:31:13 +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 bc43a0c5b3 Optimize
svn path=/trunk/mcs/; revision=17979
2003-09-07 19:40:30 +00:00
Ben Maurer a7578be9cf initial pattern work
svn path=/trunk/mcs/; revision=17786
2003-09-01 03:59:12 +00:00
Piers Haken 67f7f27e51 2003-08-13 Piers Haken <[email protected]>
* Iterator.cs:
		fix MergedIterator.Clone(), now clones other's iterators
		fix DescendantIterator.Clone(), now copies depth
		make iterator cloning constructors more type-specific

svn path=/trunk/mcs/; revision=17310
2003-08-13 19:40:13 +00:00
Ben Maurer 4272203791 2003-07-31 Ben Maurer <[email protected]>
* Compiler.cs: Add support for key, utility function to parse
	QName's from the XsltContext. Store keys in the CompiledStyle, not
	in the Stylesheet.
	* XslKey.cs: Real implementation
	* XslStylesheet.cs: Move the keys to CompiledStyle.
	* XsltCompiledContext.cs: Implement the key function
	* Iterator.cs: Allow creation of an EnumeratorIterator with an
	XmlNamespaceManager

svn path=/trunk/mcs/; revision=16959
2003-07-31 21:37:58 +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 bee42267a2 2003-07-29 Piers Haken <[email protected]>
* Iterator.cs: fix PredicateIterator.CurrentPosition bug (it wasn't incrementing)

svn path=/trunk/mcs/; revision=16862
2003-07-30 00:23:46 +00:00
Ben Maurer f03699ac71 2003-07-29 Ben Maurer <[email protected]>
* Iterator.cs: make sure we dont throw exceptions on ToString ()

svn path=/trunk/mcs/; revision=16853
2003-07-29 18:31:25 +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 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 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 0d3a9e6aaf 2002-09-12 Piers Haken <[email protected]>
* Iterator.cs: added NullIterator to handle unspecified contexts
	* XPathNavigator.cs: use NullIterator insted of SelfIterator when context is unspecified.
	* XPathNodeIterator.cs: change default _count to -1 to prevent recalculations for NullIterators

svn path=/trunk/mcs/; revision=7424
2002-09-13 02:35:47 +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
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 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 ce5805bcb5 2002-07-12 Piers Haken <[email protected]>
* Iterator.cs: PredicateIterator: handle numeric predicates
	* Parser.jay: add some debugging support: yyparseDebug
	* Tokenizer.cs: cleanup, include '-' chars in identifier tokens

svn path=/trunk/mcs/; revision=5723
2002-07-12 10:52:30 +00:00
Piers Haken 2dfdf317d6 2002-06-23 Piers Haken <[email protected]>
* DefaultContext.cs: implemented XPathFUnctionId
	* Iterator.cs: new ArrayListIterator for id() support

svn path=/trunk/mcs/; revision=5426
2002-06-24 01:26:23 +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