Commit Graph
84 Commits
Author SHA1 Message Date
Martin Baulig 7d170f400d Sync parameter names with .NET. 2012-06-03 04:02:28 +02:00
Atsushi Eno 60d5aeb3f8 2009-07-22 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs : name test did not handle String.Empty cases
	  for name and ns (i.e. no filter). Fixed bug #515136.

	* XPathNavigatorTests.cs : added test for bug #515136.


svn path=/trunk/mcs/; revision=138384
2009-07-22 11:05:00 +00:00
Atsushi Eno e30d02ad83 merge XPath optimization branch. About 15% faster/less memory use so
far.


svn path=/trunk/mcs/; revision=118710
2008-11-13 13:05:44 +00:00
Atsushi Eno bf8280aac5 2008-09-19 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs : oops, wrong #if ranges.


svn path=/trunk/mcs/; revision=113498
2008-09-19 08:58:05 +00:00
Atsushi Eno 1d36c92121 2008-09-19 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs : made some 2.0-only methods available in 1.x
	  so that we don't have to hesitate to optimize xpath using them.


svn path=/trunk/mcs/; revision=113491
2008-09-19 04:09:39 +00:00
Marek Safar 2be4aa8ed9 Warnings cleanup
svn path=/trunk/mcs/; revision=111842
2008-08-28 17:11:51 +00:00
Atsushi Eno bea2f84c76 2008-04-02 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs : fixed InnerXml to not give up with root node.
	  Indent InnerXml. Fixed bug #376191.

	* XPathNavigatorTests.cs : added test for bug #376191.


svn path=/trunk/mcs/; revision=99623
2008-04-02 08:23:10 +00:00
Atsushi Eno d6fa107ffc 2008-02-27 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs : in some MoveTo*() methods, it should allow any
	  destination node when "type" is XPathNodeType.All. Based on the
	  patch by Sanghyeon Seo, fixed bug #365112.

	* XPathNavigatorTests.cs : added test for bug #365112.


svn path=/trunk/mcs/; revision=96753
2008-02-27 11:45:11 +00:00
Atsushi Eno 2ef590022e 2007-11-29 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs : implemented ValueAs().

	* XPathNavigatorTests.cs : added ValueAs() test.


svn path=/trunk/mcs/; revision=90443
2007-11-29 17:20:54 +00:00
Atsushi Eno 1d3440fc5d sanitizing MonoTODOs.
svn path=/trunk/mcs/; revision=67899
2006-11-15 11:31:25 +00:00
Atsushi Eno 25fc3e1f3b 2006-11-10 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs :
	  - ReadSubtree() should reject everything but Element or Root.
	  - InnerXml and OuterXml should not use ReadSubtree() when it is
	    not positioned on an Element or the Root. Thus, implement them
	    in their own ways. Fixed bug #79875.

	* XPathNavigatorTests.cs : added test for bug #79875, and some
	  "escaped" text tests for InnerXml.
	* XPathNavigatorReaderTests.cs : make sure that most of XPath nodes
	  are rejected to read subtree.


svn path=/trunk/mcs/; revision=67659
2006-11-10 01:39:23 +00:00
Atsushi Eno e19092967f 2006-11-10 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs : InnerXml should allow Text-only content. Fixed
	  bug #79874, when tied to XPathNavigatorReader fix.

	* XPathNavigatorReader.cs : removed node type restriction on 
	  initialization.  Fixed bug #79874, when tied to XPathNavigator fix.

	* XPathNavigatorTests.cs : added test for bug #79874.


svn path=/trunk/mcs/; revision=67653
2006-11-10 00:08:43 +00:00
Atsushi Eno 5bcb1c6d8d 2006-04-10 Atsushi Enomoto <[email protected]>
* XPathNavigatorCommonTests.cs : added test for bug #78067.
	* XPathNavigatorReaderTests.cs : ditto, for ReadSubtree() part.

	* XPathNavigatorReader.cs : Read() did not compute Depth correctly.
	  It caused bug #78067.

	* XPathNavigator.cs : get_OuterXml() returns indented output, without
	  XML declaration.

	* XmlWriter.cs : WriteNode(XPathNavigator) : directly write element
	  and root nodes instead of dispatching to ReadSubtree().


svn path=/trunk/mcs/; revision=59286
2006-04-10 09:37:41 +00:00
Atsushi Eno 69c5728b60 2006-01-26 Atsushi Enomoto <[email protected]>
* XmlWriter.cs : Dispose() is protected.

	* XmlSchemaValidationException.cs : fixed .ctor() signatures.

	* XPathNavigator.cs : fixed IsNode signature found by updated
	  corcompare.


svn path=/trunk/mcs/; revision=56048
2006-01-25 15:36:37 +00:00
Atsushi Eno d364a58d86 2006-01-06 Atsushi Enomoto <[email protected]>
* XmlWriter.cs : In WriteNode(XPathNavigator, bool), Avoid
	  ReadSubtree() for non-element content since they are not allowed
	  in ReadSubtree() (but allowed here).

	* XPathNavigator.cs : use WriteNode(XPathNavigator, bool)
	  rather than WriteNode(XmlWriter, bool) in WriteSubtree().

	* XmlWriterTests.cs : added tests for WriteNode(XPathNavigator, bool)
	  as well as XPathNavigator.WriteSubtree(XmlWriter).


svn path=/trunk/mcs/; revision=55143
2006-01-06 11:56:08 +00:00
Atsushi Eno 0afa9b22d7 2005-12-14 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs : Added MonoTODO to CreateAttributes(). Removed
	  MonoTODO from ReadSubtree().

	* XPathNavigatorReaderTests.cs : Actually AttributesAndNamespaces()
	  does not work under MS.NET.


svn path=/trunk/mcs/; revision=54366
2005-12-14 16:09:45 +00:00
Atsushi Eno 260014cbd3 2005-12-14 Atsushi Enomoto <[email protected]>
Added UnderlyingObject support.


svn path=/trunk/mcs/; revision=54353
2005-12-14 08:36:22 +00:00
Atsushi Eno 229263cfc1 2005-12-13 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs : Reimplemented MoveToFollowing() to avoid
	  inefficient MoveToDescendant() and to match .NET 2.0 behavior.

	* XPathEditableNavigatorTests.cs : added tests for MoveToFollowing().


svn path=/trunk/mcs/; revision=54296
2005-12-13 15:18:30 +00:00
Atsushi Eno 9af8eedec3 2005-12-13 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs : ReplaceSelf() should allow document fragment.
	  Moved implementation to XPathEditableDocument.

	* XPathEditableDocument.cs : implement ReplaceSelf() here.

	* System.Xml_test.dll.sources: Added XmlAssert.cs.

	* XmlAssert.cs : new file.

	* XPathEditableNavigatorTests.cs : added tests that passes empty
	  string to editor methods. Added tests for ReplaceSelf().


svn path=/trunk/mcs/; revision=54278
2005-12-13 12:09:02 +00:00
Atsushi Eno d3f0d5ba28 2005-12-13 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs : PrependChild() should use AppendChild() when
	  there is no child.

	* XPathEditableNavigatorTests.cs : added tests for PrependChild().


svn path=/trunk/mcs/; revision=54277
2005-12-13 11:19:46 +00:00
Atsushi Eno aba5cde6e5 2005-12-13 Atsushi Enomoto <[email protected]>
* XPathEditableDocument.cs :
	  - Now it does not append "written" nodes until Close() is invoked.
	  - Use XmlDocumentFragment to store incomplete tree fragment.
	  - Implemented DeleteRange() and ReplaceRange().
	  - Added "Closed" event for ReplaceRange() to "not remove until
	    Close() is called."

	* XPathNavigator.cs : InsertAfter() should raise an error before
	  MoveToNext() when current node is either attribute or namespace.

	* XPathEditableNavigatorTests.cs :
	  Added more tests for InsertAfter() and InsertBefore().
	  Added tests for DeleteRange() and ReplaceRange().


svn path=/trunk/mcs/; revision=54276
2005-12-13 10:46:25 +00:00
Atsushi Eno bf67c4b121 2005-12-13 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs : InsertAfter() should append children after it
	  once moved to parent. This method shoulr raise an error when it is
	  placed on Root.

	* XPathEditableDocument.cs :
	  - Removed almost all redundant code in XPathEditableDocument,
	    which is based on .net 1.2 XPathDocument functionality.
	  - It was always doing AppendChild even if the operation is
	    InsertBefore or InsertAfter.

	* XPathEditableNavigatorTests.cs : added tests for InsertAfter and
	  InsertBefore.


svn path=/trunk/mcs/; revision=54272
2005-12-13 06:28:00 +00:00
Atsushi Eno 23b916eda1 2005-12-13 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs : (CreateFragmentReader) return XmlReader that
	  considers current namespace contexts.

	* XPathEditableNavigatorTests.cs : new file for testing all editor
	  functionality in XPathNavigator.

	* System.Xml_test.dll.sources: Added XPathEditableNavigatorTests.cs.


svn path=/trunk/mcs/; revision=54270
2005-12-13 04:03:36 +00:00
Atsushi Eno 79479e6643 2005-12-12 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs : removed some MonoTODOs.

	* XPathNavigatorTests.cs : added tests for ValueAsXxx properties.


svn path=/trunk/mcs/; revision=54233
2005-12-12 12:21:09 +00:00
Atsushi Eno f4112a5629 2005-11-10 Atsushi Enomoto <[email protected]>
* XmlReader.cs, XmlNode.cs :
	  [DebuggerDisplay] are not worthy of existing.

	* XPathNavigator.cs, XPathNodeIterator.cs :
	  [DebuggerDisplay] are not worthy of existing.


svn path=/trunk/mcs/; revision=52880
2005-11-10 18:30:39 +00:00
Atsushi Eno ac246c83b7 2005-11-07 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs, XPathNodeIterator.cs : DebuggerDisplayAttribute
	  values are fixed. However, they totally do not make sense since
	  there is no DebuggerDisplayProxy type in our impl.


svn path=/trunk/mcs/; revision=52661
2005-11-07 18:18:49 +00:00
Atsushi Eno a7a4be34df 2005-11-07 Atsushi Enomoto <[email protected]>
* XsdValidatingReader.cs : XmlReader.ReadTypedValue() does not exist 
	  anymore, so it is not override.

	* XmlNamespaceManager.cs : NameTable is virtual in 2.0 RTM.
	* XmlReader.cs : IsEmptyElement is reverted to be abstract in 2.0 RTM.
	  ReadTypedValue() is removed.
	* XmlValidatingReader.cs : ReadTypedValue() is not virtual now.
	* XmlWriter.cs : Settings is virtual.

	* XPathNodeIterator.cs : added [DebuggerDisplay]. pretty useless tho.
	* XPathNavigator.cs : [DebuggerDisplay] as well.
	  SelectSingleNode() and AppendChildElement() are now virtual.


svn path=/trunk/mcs/; revision=52637
2005-11-07 08:48:22 +00:00
Atsushi Eno 29581a1ead 2005-10-23 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs : now 2.0 MoveToFirst() invokes internal
	  MoveToFirstImpl() and it is from what XmlDocumentNavigator did.
	  This fixes XPathEditableDocument.MoveToFirst().

	* XmlDocumentNavigator.cs : now MoveToFirst() invokes internal
	  MoveToFirstImpl().


svn path=/trunk/mcs/; revision=52108
2005-10-23 20:45:26 +00:00
Atsushi Eno f627a0d49c 2004-10-15 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs : (DeleteRange, ReplaceRange) so they are not
	  likely to be implemented, thus MonoTODO.


svn path=/trunk/mcs/; revision=51743
2005-10-15 10:38:59 +00:00
Gert Driesen 6e38664311 * XPathNavigator.cs: Removed DebuggerDisplay attribute.
* XPathNodeIterator.cs: Removed DebuggerDisplay attribute.

svn path=/trunk/mcs/; revision=51469
2005-10-08 14:41:34 +00:00
Gert Driesen 28d6b63233 * XPathNavigator.cs: [NET_2_0] Added DebuggerDisplay attribute,
added ReplaceRange and DeleteRange methods.
* XPathNodeIterator.cs: [NET_2_0] Added DebuggerDisplay attribute.

svn path=/trunk/mcs/; revision=51466
2005-10-08 11:44:25 +00:00
Atsushi Eno 1ce27f71e9 2004-09-21 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs : added NavigatorComparer.
	* XPathComparer.cs : XPathNavigatorComparer implements
	  IEqualityComparer under NET_2_0 profile.


svn path=/trunk/mcs/; revision=50352
2005-09-21 03:30:26 +00:00
Gert Driesen b6157808b4 * XmlSchemaInference.cs: Is sealed in Beta 2.
* XmlSchemaInfo.cs: Added ContentType property.
* XmlSchemaObjectEnumerator.cs: No longer sealed in Beta 2.
* XmlSchemaSet.cs: No longer sealed in Beta 2. XmlResolver property
is now CLSCompliant.
* XmlConvert.cs: Renamed RoundTripKind to RoundtripKind.
* XmlDateTimeSerializationMode.cs: Renamed RoundTripKind to RoundtripKind 
to match .NET 2.0 Beta 2.
* XmlNodeReader2.cs: GetNamespacesInScope returns generic IDictionary
in .NET 2.0 Beta 2, and is explicit interface implementation.
* XmlTextReader.cs: GetNamespacesInScope returns generic IDictionary
in .NET 2.0 Beta 2.
* XmlTextReader2.cs: GetNamespacesInScope returns generic IDictionary
in .NET 2.0 Beta 2.
* XmlValidatingReader.cs: GetNamespacesInScope returns generic IDictionary 
in .NET 2.0 Beta 2.
* IXmlNamespaceResolver.cs: GetNamespacesInScope returns generic IDictionary 
in .NET 2.0 Beta 2.
* XmlNamespaceManager.cs: GetNamespacesInScope returns generic IDictionary 
in .NET 2.0 Beta 2.
* XmlNodeReaderImpl.cs: GetNamespacesInScope returns generic IDictionary in 
.NET 2.0 Beta 2.
* DTDValidatingReader.cs: GetNamespacesInScope returns generic IDictionary 
in .NET 2.0 Beta 2.
* XsltArgumentList.cs: No longer sealed in .NET 2.0.
* XsltException.cs: Message override is back in .NET 2.0 Beta 2.
* XmlMapping.cs: API compatibility fixes. Ctor is not protected in .NET 1.1. 
SetKey is not obsolete in .NET 2.0 Beta 2.
* XPathNavigator.cs: GetNamespacesInScope returns generic IDictionary
in .NET 2.0 Beta 2.
* XsdValidationReader.cs: GetNamespacesInScope returns generic IDictionary 
in .NET 2.0 Beta 2.
* XmlSchemaValidatingReader.cs: GetNamespacesInScope returns generic
IDictionary in .NET 2.0 Beta 2.
* SubtreeXmlReader.cs: GetNamespacesInScope now returns generic IDictionary.

svn path=/trunk/mcs/; revision=47974
2005-08-03 17:39:08 +00:00
Martin Baulig a559eb5380 IKeyComparer is gone.
svn path=/trunk/mcs/; revision=46441
2005-06-23 17:17:37 +00:00
Atsushi Eno 59f1697a06 2004-05-05 Atsushi Enomoto <[email protected]>
* System.Xml.dll.sources : XPathAtomicValue.cs -> XmlAtomicValue.cs.

	* XmlAtomicValue.cs : moved from XPathAtomicValue, removed some stuff.

	* SubtreeXmlReader.cs :
	  removed atomizedName related 2.0 member (deprecated).

	* XPathAtomicValue.cs :
	  it is now XmlAtomicValue and in sys.xml.schema.
	* XPathNavigator.cs, Expression.cs :
	  removed atomizedName related 2.0 members (deprecated).

	* XsdValidatingReader.cs :
	  removed atomicName related 2.0 members (deprecated in beta2).

	* XmlNodeReader2.cs, XmlTextReader2.cs, XmlValidatingReader.cs,
	  XmlNamespaceManager.cs, IXmlNamespaceResolver.cs,
	  DTDValidatingReader.cs : Removed most of "atomizedName" related
	  stuff that are obsoleted in 2.0 beta2.
	* XQueryConvert.cs : XPathAtomicValue -> XmlAtomicValue.

	* XmlNamespaceManagerTests.cs : removed atomizedName related tests.


svn path=/trunk/mcs/; revision=44083
2005-05-05 14:14:57 +00:00
Atsushi Eno 7a204c67e0 2004-05-05 Atsushi Enomoto <[email protected]>
* XPathExpression.cs : added static Compile().
	* XPathNavigator.cs :
	  Use XPathExpression.Compile() for now. 
	  Updated tree modification API to 2.0 beta2.
	* XPathItem.cs, XPathNavigator.cs, XPathAtomicValue.cs :
	  updated to 2.0 beta2 API.
	* XPathResultType.cs : removed [Serializable].
	* XmlNodeChangeType.cs : removed obsolete file.


svn path=/trunk/mcs/; revision=44073
2005-05-05 11:10:58 +00:00
Atsushi Eno 0c6e946eb5 2004-03-25 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs : 2.0 build fix



svn path=/trunk/mcs/; revision=42252
2005-03-25 17:17:49 +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 df1ee3d110 2004-03-15 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs : In ComparePosition(), make use of IsDescendant().

	* XmlDocumentNavigator.cs : overriden IsDescendant (default 
	  implementation extraneously clones).



svn path=/trunk/mcs/; revision=41861
2005-03-15 21:24:18 +00:00
Atsushi Eno 15a506f442 2004-12-26 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs : Added CheckValidity() and ValueType.
	  For SetTypedValue(), throw NotSupportedException instead of
	  NotImplementedException.



svn path=/trunk/mcs/; revision=38087
2004-12-26 16:37:59 +00:00
Atsushi Eno 5a1b39f67c 2004-12-16 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs :added MoveToFollowing(), ReplaceSelf() and
	  all the missing attributes.



svn path=/trunk/mcs/; revision=37836
2004-12-16 15:09:25 +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 7875109b60 2004-11-08 Atsushi Enomoto <[email protected]>
* Tokenizer.cs : just use raw string instead of char[].
	* XPathNavigator.cs : reuse NameTable when creating XmlTextReader.

svn path=/trunk/mcs/; revision=35810
2004-11-08 06:36:05 +00:00
Atsushi Eno 7e940e8ecf 2004-11-05 Atsushi Enomoto <[email protected]>
* 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-06 12:55:33 +00:00
Atsushi Eno 92eb807080 2004-10-22 Atsushi Enomoto <[email protected]>
* XPathDocument.cs : now all the new stuff that used to be in 2.0 are
	  reverted.
	* XPathEditableNavigator.cs : It will be removed. Right now modified
	  a bit to pass build.
	* XPathNavigator.cs : Added members that are merged from
	  XPathEditableNavigator. Updated members name.

svn path=/trunk/mcs/; revision=35264
2004-10-22 19:55:26 +00:00
Atsushi Eno 931efe6671 2004-10-04 Atsushi Enomoto <[email protected]>
* XPathNavigator.cs : TypedValue could be implemented.
	* XPathEditableNavigator.cs : removed some MonoTODO since now there
	  are implementations.

svn path=/trunk/mcs/; revision=34692
2004-10-04 22:04:53 +00:00
Atsushi Eno 6815019705 2004-08-25 Atsushi Enomoto <[email protected]>
* XPathAtomicValue.cs : Value was not returning expected value when
	  it is created as new XPathAtomicValue (object, XmlSchemaType).
	  Compute stringValue and reuse.
	* XPathNavigator.cs : Temporarily stubbed as to ignore SchemaInfo
	  (for checking XQuery implementation).

svn path=/trunk/mcs/; revision=32826
2004-08-25 14:30:39 +00:00
Atsushi Eno 46a3751ce1 2004-08-24 Atsushi Enomoto <[email protected]>
* XPathAtomicValue.cs : DateTime should be convertible to string.
	  Use schemaType's TypeCode for .ctor() that takes object.
	* XPathNavigator.cs : copied get_InnerXml from XPathEditableNavigator.
	* XPathEditableNavigator.cs : set_InnerXml should be different (new)
	  property from get_InnerXml. Removed get_InnerXml and get_OuterXml
	  overrides.

svn path=/trunk/mcs/; revision=32756
2004-08-24 14:31:58 +00:00
Atsushi Eno 3f40cbc057 2004-08-23 Atsushi Enomoto <[email protected]>
* XPathAtomicValue.cs, XPathNavigator.cs : Eliminate MS.Internal.Xml.*.

svn path=/trunk/mcs/; revision=32704
2004-08-23 15:05:35 +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