Commit Graph
63 Commits
Author SHA1 Message Date
Vladimir Krasnov e10ae0f43f merge -r 53398:53399
svn path=/branches/mainsoft/gh1.7/mcs/; revision=53447
2005-11-24 09:59:32 +00:00
Vladimir Krasnov bb643c443f merge -r 53397:53398
svn path=/branches/mainsoft/gh1.7/mcs/; revision=53446
2005-11-24 09:58:28 +00:00
Atsushi Eno 9c904a47d5 2004-03-25 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs : reduced some Clone().
	  Simplified ComparePosition().
	* Iterator.cs : some iterators are not actually reverse axis.


svn path=/trunk/mcs/; revision=42246
2005-03-25 05:35:58 +00:00
Atsushi Eno b6ab8c257e 2004-03-16 Atsushi Enomoto <[email protected]>
* Iterator.cs : reduced extra clone.


svn path=/trunk/mcs/; revision=41870
2005-03-16 05:53:02 +00:00
Atsushi Eno 91af8aea97 2004-03-15 Atsushi Enomoto <[email protected]>
* DefaultContext.cs,
	  Expression.cs,
	  Iterator.cs : Now RequireSorting is not required in BaseIterator
	  (it is now fully in Expression).
	  Removed the last ListIterator .ctor() argument.

	* XslKey.cs : removed last ListIterator.ctor() argument.
	  Reverted the last commit that changed internal key index change 
	  from ArrayList to Hashtable. Avoid clone in CollectIndex().
	  Sort results in Evaluate() before passing list to ListIterator.
	* XslFunctions.cs : removed last ListIterator.ctor() argument.

	* XslVariable.cs : removed last ListIterator.ctor() argument.


svn path=/trunk/mcs/; revision=41864
2005-03-15 21:34:04 +00:00
Atsushi Eno fa27b95fd6 2004-03-14 Atsushi Enomoto <[email protected]>
* Expression.cs,
	  DefaultContext.cs : Basic constant folding optimization (not so
	  effective right now). Unified number-to-string conversion code into
	  XPathFunctions.ToString(double) to avoid roundtrip format right now.
	* Iterator.cs : removed unused code.


svn path=/trunk/mcs/; revision=41781
2005-03-14 04:32:30 +00:00
Atsushi Eno 62dc883eac 2004-03-11 Atsushi Enomoto <[email protected]>
* Iterator.cs : more clone reduction.


svn path=/trunk/mcs/; revision=41714
2005-03-11 19:07:43 +00:00
Atsushi Eno a643fbe57b 2004-03-11 Atsushi Enomoto <[email protected]>
* Expression.cs,
	  DefaultContext.cs : Removed unused NeedAbsoluteMatching.
	  Added Peer and Subtree (for "peer & subtree optimization. See:
	  http://idealliance.org/papers/dx_xmle04/papers/02-03-02/02-03-02.html
	  Fixed some ToString() that caused NullReferenceException.

	* Iterator.cs : Predicate does not affect on RequireSorting.
	  Added SimpleSlashIterator for peer & subtree optimization.

	  Added PreserveWhitespace() consideration in BaseIterator.MoveNext().

	* XslKey.cs : removed unused NeedAbsoluteMatching.
	* XslFunctions.cs : Added Peer (for peer & subtree optimization).
	  Added some missing ToString() overrides.


svn path=/trunk/mcs/; revision=41687
2005-03-11 11:33:30 +00:00
Atsushi Eno 8584919df5 2004-03-09 Atsushi Enomoto <[email protected]>
* Expression.cs,
	  Iterator.cs, :
	  SlashIterator is now constructed with requireSorting parameter 
	  that thus just use RequireSorting from both left/right Expressions, 
	  not iterators.
	  When attribute axis is on the left expression, the result needs to
	  be sorted.


svn path=/trunk/mcs/; revision=41614
2005-03-09 20:06:59 +00:00
Atsushi Eno 57543d7be7 2005-03-09 Atsushi Enomoto <[email protected]>
* XslVariable.cs : clone stored XPathNavigator items before storing.
	* XslAttribute.cs : tiny code reduction.

	* Iterator.cs : Now for most of iterator types, Current property always
	  returns the same instance. It results in huge memory reduction.


svn path=/trunk/mcs/; revision=41591
2005-03-09 10:11:52 +00:00
Atsushi Eno ccbee83783 2004-03-04 Atsushi Enomoto <[email protected]>
* Iterator.cs : (SlashIterator.MoveNext()) For SortedList.Add(), the
	  key should be iterator itself. Key by list count never makes sense.



svn path=/trunk/mcs/; revision=41556
2005-03-08 10:48:37 +00:00
Atsushi Eno 2ae16a5f2b 2004-02-23 Atsushi Enomoto <[email protected]>
* Iterator.cs :
	  In FollowingIterator, attribute and namespace nodes should be 
	  considered to have following nodes. See XPath 1.0 section 5 (esp.
	  the description on "document order").
	  On fixing @*/following::*, attribute nodes are regarded as to be
	  RequireSorting = true (which might result in duplicate).



svn path=/trunk/mcs/; revision=41074
2005-02-23 01:22:59 +00:00
Atsushi Eno 86cb03be47 2004-12-02 Atsushi Enomoto <[email protected]>
* Iterator.cs : when PredicateIterator has a numeric predicate, it
	  will never be true twice. So just break up the iteration on true.
	* XPathNavigator.cs : implemented LookupPrefix().
	* Expression.cs : ExprParens.Optimize() could just return the content
	  expression.



svn path=/trunk/mcs/; revision=36944
2004-12-02 16:01:25 +00:00
Atsushi Eno f54b64bcfb 2004-12-01 Atsushi Enomoto <[email protected]>
* Iterator.cs : with related to the previous patch, many comments
	  got making no sense. Thanks to Harinath.



svn path=/trunk/mcs/; revision=36892
2004-12-01 10:23:11 +00:00
Atsushi Eno 32db6338bd 2004-12-01 Atsushi Enomoto <[email protected]>
* Iterator.cs : actually I mean this patch.



svn path=/trunk/mcs/; revision=36881
2004-12-01 06:54:14 +00:00
Atsushi Eno 1c66f8ee48 2004-12-01 Atsushi Enomoto <[email protected]>
* Iterator.cs : Create _current clone only when required. So just set
	  null when MoveNextCore() succeeded (except for some cases that
	  _current is _nav, such as SelfIterator).



svn path=/trunk/mcs/; revision=36879
2004-12-01 05:27:59 +00:00
Atsushi Eno adae6ad585 2004-11-30 Atsushi Enomoto <[email protected]>
* Iterator.cs : SlashIterator.RequireSorting is always false. Whether
	  it has to collect nodes in prior or not and whether it might return
	  nodes in inconsistent order is different matter.
	  (It still needs to store nodes when either of branches requires
	  sorting, because they might return the same node later.)



svn path=/trunk/mcs/; revision=36850
2004-11-30 17:20:34 +00:00
Atsushi Eno dcadbf1ba2 2004-11-30 Atsushi Enomoto <[email protected]>
* Iterator.cs : reduced some extraneous ComparePosition() that could
	  be written as IsSamePosition(). ParentIterator doesn't have to be
	  RequireSorting.



svn path=/trunk/mcs/; revision=36848
2004-11-30 16:31:04 +00:00
Atsushi Eno aa244372ec 2004-11-30 Atsushi Enomoto <[email protected]>
* Iterator.cs : reimplemented AncestorIterator and 
	  AncestorOrSelfIterator just to collect parents and not to move to
	  siblings. In some cases like thousands of siblings, it used to be
	  so slow, while we usually don't have so deep ancestors.



svn path=/trunk/mcs/; revision=36847
2004-11-30 15:53:31 +00:00
Atsushi Eno f0687f3392 2004-11-07 Atsushi Enomoto <[email protected]>
* Iterator.cs :
	  - Made copy constructor certainly different from other constructors.
	  - Position is never computed in each derived type. All MoveNext() are
	    now MoveNextCore().
	  - Most of the protected members could just be private.

svn path=/trunk/mcs/; revision=35776
2004-11-07 12:46:00 +00:00
Atsushi Eno 2cdd898c24 2004-11-05 Atsushi Enomoto <[email protected]>
* Iterator.cs : SimpleIterator._current could be cloned only when
	  it is required.

svn path=/trunk/mcs/; revision=35765
2004-11-06 12:04:35 +00:00
Atsushi Eno f6c2c59e66 2004-11-05 Atsushi Enomoto <[email protected]>
* Iterator.cs : Some removal of Clone() were harmless.

svn path=/trunk/mcs/; revision=35763
2004-11-06 11:46:18 +00:00
Atsushi Eno b8f5a25be1 2004-10-14 Atsushi Enomoto <[email protected]>
* Iterator.cs :
	  - Added WrapperIterator to return BaseIterator in such case that
	    variable reference is resolved to XPathNodeIterator. This fixes
	    bug #68267.
	  - Path ".." is reverse axis (actually no effect).
	  - Fixed DescendantIterator.Clone() that missed "_finished" field.
	* Expression.cs :
	  In ExprVariable.Evaluate(), use WrapperIterator() for custom
	  XPathNodeIterator.

svn path=/trunk/mcs/; revision=34996
2004-10-14 15:07:36 +00:00
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