Commit Graph
139 Commits
Author SHA1 Message Date
Atsushi Eno 4cef0e0346 2004-08-03 Atsushi Enomoto <[email protected]>
* XPathEditableNavigator.cs : implemented some editor support methods.

svn path=/trunk/mcs/; revision=31780
2004-08-03 06:48:05 +00:00
Atsushi Eno 806622d4ea 2004-08-02 Atsushi Enomoto <[email protected]>
* XPathDocument.cs :
	  - For .NET 2.0, added a switch to support new XPathDocument2.
	    If switch is off, then it uses DTM.
	  - Implemented remaining 2.0 bits (except for Obsolete ones).

	To use them in XPathDocument, set environment MONO_XPATH_DOCUMENT_2=yes
	(It is still too unstable to pass all nunit tests and standalone XSLT
	tests).

svn path=/trunk/mcs/; revision=31724
2004-08-02 03:26:41 +00:00
Atsushi Eno 06d12486a7 2004-07-29 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs : Implemented ReadSubtree().

svn path=/trunk/mcs/; revision=31609
2004-07-29 14:33:04 +00:00
Atsushi Eno 920a2a0482 2004-07-28 Atsushi Enomoto <[email protected]>
* XPathDocument.cs : for .ctor() and .ctor(XmlNameTable), now it
	  creates Mono.Xml.XPath.XPathEditableDocument and thus supports
	  IXPathEditable.CreateEditor().

svn path=/trunk/mcs/; revision=31548
2004-07-28 11:22:18 +00:00
Atsushi Eno 03a0f59d34 2004-07-28 Atsushi Enomoto <[email protected]>
* XPathEditableNavigator.cs : Implemented InsertAfter() and
	  PrependChild(); they are virtual, not abstract.
	* XPathNavigator.cs :
	  Implemented many 2.0 virtual properties and methods that were
	  abstract in 1.x.
	  Implemented some Select() methods that uses IXmlNamespaceResolver.
	  Implemented most of ValueAsXxx() using XQueryConvert.
	  IsNode is always true. Implemented OuterXml and WriteSubtree() (but
	  actually they don't work because it depends on ReadSubtree()).

svn path=/trunk/mcs/; revision=31542
2004-07-28 09:17:27 +00:00
Atsushi Eno 785c451928 2004-07-26 Atsushi Enomoto <[email protected]>
* XPathDocument.cs : added missing && not-likely-to-be-removed members.
	* XPathEditableNavigator.cs : added BuildSubTree().
	* XPathException.cs : added missing methods. Hide Message in NET_2_0.

svn path=/trunk/mcs/; revision=31469
2004-07-26 14:00:15 +00:00
Atsushi Eno aa7574acdb 2004-07-23 Atsushi Enomoto <[email protected]>
* XPathNodeIterator.cs : implemented 2.0 GetEnumerator().

svn path=/trunk/mcs/; revision=31405
2004-07-23 06:30:05 +00:00
Atsushi Eno 48b6668436 2004-07-21 Atsushi Enomoto <[email protected]>
* XPathExpression.cs, Expression.cs :
	  Added SetContext(IXmlNamespaceResolver).
	* NodeChangedEventArgs.cs : Added missing [MonoTODO].
	* XPathAtomicValue.cs : Halfly implemented.
	* XPathDocument.cs : Added 2.0 members.
	* XPathDocumentNodeChangedAction.cs : updated member names.
	* XPathEditableNavigator.cs : Added missing 2.0 members and MonoTODO.
	* XPathNavigator.cs : Added missing 2.0 members.
	  Fixed some members as virtual->override.

svn path=/trunk/mcs/; revision=31337
2004-07-21 15:00:11 +00:00
Atsushi Eno 4565e2ec31 2004-07-13 Atsushi Enomoto <[email protected]>
* XmlNodeChageType.cs, XmlChangeFilters.cs : fixed enum values.
	* XPathResultType.cs : marked [MonoFIX] on .Navigator.

svn path=/trunk/mcs/; revision=31093
2004-07-13 16:10:02 +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 98c0f22bb9 2004-06-06 Atsushi Enomoto <[email protected]>
* XPathDocument.s : The previous patch is still incomplete to close.

svn path=/trunk/mcs/; revision=28901
2004-06-06 07:34:53 +00:00
Atsushi Eno f68fd091c5 2004-06-05 Atsushi Enomoto <[email protected]>
* XPathDocument.cs : close self-opened XmlTextReader in .ctor().

svn path=/trunk/mcs/; revision=28860
2004-06-05 08:55:21 +00:00
Atsushi Eno a29d95c9e9 2004-06-03 Atsushi Enomoto <[email protected]>
* Expression.cs : LookupNamespace() only allows already-atomized names.
	* XPathEditableNavigator.cs : removed incorrect set_OuterXml() and
	  set_InnerXml().

svn path=/trunk/mcs/; revision=28791
2004-06-03 21:05:17 +00:00
Atsushi Eno 2ead87db32 2004-05-22 Atsushi Enomoto <[email protected]>
* DefaultContext.cs : Add XPathNavigator input support for ToBoolean()
	  and ToNavigator().
	* Expression.cs : In Equality comparison, evaluate XPathNavigator in
	  the same as well as NodeSet. This fixes bug #59134.

svn path=/trunk/mcs/; revision=28237
2004-05-27 09:10:08 +00:00
Atsushi Eno 8c53a3828d 2004-05-22 Atsushi Enomoto <[email protected]>
* XPathAtomicValue.cs : missed NET_2_0.

svn path=/trunk/mcs/; revision=27888
2004-05-22 17:13:00 +00:00
Atsushi Eno edcb7df121 2004-05-22 Atsushi Enomoto <[email protected]>
* IXPathChangeNavigable.cs,
	  IXPathEditable.cs,
	  NodeChangedEventArgs.cs,
	  NodeChangedEventHandler.cs,
	  XPathAtomicValue.cs,
	  XPathChangeNavigator.cs,
	  XPathDocumentNodeChangedAction.cs,
	  XPathEditableNavigator.cs,
	  XPathItem.cs,
	  XmlChangeFilters.cs,
	  XmlNodeChangeType.cs : added NET_2_0 classes.
	* XPathDocument.cs,
	  XPathNavigator.cs : updated NET_2_0 members.

svn path=/trunk/mcs/; revision=27884
2004-05-22 16:59:30 +00:00
Atsushi Eno 7efc4e561b 2004-05-20 Atsushi Enomoto <[email protected]>
* Expression.cs : We should not catch all kind of exception. Just
	  throwing any kind of exception would be preferable.
	  Added support for XPathNavigator values.

svn path=/trunk/mcs/; revision=27726
2004-05-20 08:42:32 +00:00
Atsushi Eno da650ba480 2004-05-13 Atsushi Enomoto <[email protected]>
* DefaultContext.cs : Removed MonoTODO. done.
	* Expression.cs : handle XPathResultType.Navigator in some places and
	  removed MonoTODO. Mark MonoTODO with explicit comments (though they
	  are mostly pointing out possibilities of optimization).
	  Removed extra check that depended on the old bugs.
	* XPathResultType.cs : Fixed .Navigator that had the same value as
	  .String.

svn path=/trunk/mcs/; revision=27224
2004-05-13 05:09:14 +00:00
Atsushi Eno 20efd1a861 2004-05-12 Atsushi Enomoto <[email protected]>
* Parser.jay : made class internal.

svn path=/trunk/mcs/; revision=27151
2004-05-12 09:13:26 +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 9182a21d27 2004-02-17 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs : Only child and attribute axes are allowed for
	  Matches().
	* Expression.cs : Added IsPositional property.
	* DefaultContext.cs : Added some overrides.

svn path=/trunk/mcs/; revision=23181
2004-02-17 20:09:12 +00:00
Atsushi Eno 5211dc2d80 2004-02-16 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs : no, its still not ok. comment out now.

svn path=/trunk/mcs/; revision=23146
2004-02-16 20:45:31 +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 54a092c5a7 2004-02-05 Atsushi Enomoto <[email protected]>
* DefaultContext.cs : trivial processing order fix.

svn path=/trunk/mcs/; revision=22802
2004-02-05 16:15:59 +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 9f60bab588 2003-12-18 Atsushi Enomoto <[email protected]>
* Parser.jay : now it supresses error output from jay.
	* DefaultContext.cs : (XPathFunctionSubstring) exclude -Infinity.
	* Tokenizer.cs : better error message.
	* XPathDocument.cs : Use XmlValidatingReader to support id() function.
	  (just found MS.NET actually supports it)

svn path=/trunk/mcs/; revision=21310
2003-12-18 08:49:08 +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 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 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 997edebaec 2003-11-19 Atsushi Enomoto <[email protected]>
* Added XPathComparer.cs
	* DefaultContext.cs : Fixed XPathFunctionId.Evaluate() to iterate base
	  iterator correctly, and sort results.

svn path=/trunk/mcs/; revision=20239
2003-11-19 19:09:35 +00:00
Atsushi Eno 400eba4fbe 2003-11-19 Atsushi Enomoto <[email protected]>
* DefaultContext.cs : Imcomplete fix ;-)

svn path=/trunk/mcs/; revision=20227
2003-11-19 15:28:52 +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
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 9c0f532064 fix up //
svn path=/trunk/mcs/; revision=18281
2003-09-24 23:13:30 +00:00
Ben Maurer 51e00007f6 so *this* is why c# has definate assignment@
svn path=/trunk/mcs/; revision=18249
2003-09-21 20:02:17 +00:00