Commit Graph
239 Commits
Author SHA1 Message Date
Atsushi Eno 8b5e57c908 2009-11-20 Atsushi Enomoto <[email protected]>
* DefaultContext.cs : do not use sloppy XmlConvert to parse xpath
	  number. Fixed bug #556619.

	* XslTransformTests.cs : added test for bug #556619 by
	  Tor Lillqvist.


svn path=/trunk/mcs/; revision=146613
2009-11-20 12:06:16 +00:00
Atsushi Eno 41d459231c 2009-09-15 Atsushi Enomoto <[email protected]>
* Expression.cs : to support external function that returns non-
	  double (such as int) as number, add conversion from non-double at
	  evaluation. This should fix bug #498389.


svn path=/trunk/mcs/; revision=141965
2009-09-15 13:20:14 +00: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
Gonzalo Paniagua Javier 95bee485a2 2009-06-09 Gonzalo Paniagua, Miguel de Icaza <[email protected], [email protected]>
* Expression.cs: improve the ExpressionCache, it still does not
	work, but it will at least work better with multithreaded apps (we
	take locks) and we use WeakReferences correctly.

	For WeakReferences it is important to not depend on IsAlive to
	retrieve the target (this is a documented race).  IsAlive is only
	useful to determine if it has already been collected, but if true,
	the Target can still be released.

	This race condition is exposed by #505678 on x86-64 platforms (only).

	Sadly, this fix is not good enough to re-enable the cache, on
	x86-64 this with a single thread, it still crashes randomly
	

svn path=/trunk/mcs/; revision=135815
2009-06-10 01:07:50 +00:00
Atsushi Eno d54e48a2c1 2009-04-15 Atsushi Enomoto <[email protected]>
* Expression.cs : extensions could return null and it should be
	  regarded as empty node-set, not an error.


svn path=/trunk/mcs/; revision=131738
2009-04-15 08:54:10 +00:00
Atsushi Eno efb1509fd7 2009-03-17 Atsushi Enomoto <[email protected]>
* Expression.cs : gave up another optimization for bug #443090.

	* SelectNodesTests.cs : added 2nd test for bug #443490.


svn path=/trunk/mcs/; revision=129574
2009-03-17 11:29:32 +00:00
Atsushi Eno 40a7f089a1 2009-03-17 Atsushi Enomoto <[email protected]>
* XPathExpression.cs : eliminate use of ExpressionCache and lose
	  significant performance in some use for the sake of multithreaded
	  use. Fixed bug #477049.


svn path=/trunk/mcs/; revision=129545
2009-03-17 08:54:09 +00:00
Atsushi Eno c982bb5013 2009-01-20 Atsushi Enomoto <[email protected]>
* Expression.cs : give up sortless iterator optimization.
	  Fixed bug #443490.

	* SelectNodesTests.cs : added test for bug #443490.


svn path=/trunk/mcs/; revision=123871
2009-01-20 11:37:44 +00:00
Atsushi Eno 0b09797b9f 2008-12-09 Atsushi Enomoto <[email protected]>
* Iterator.cs : DescendantIterator.Clone() was not cloning current
	  node in new code. Fixed bug #456103.

	* XPathNavigatorTests.cs : added test fo bug #456103.


svn path=/trunk/mcs/; revision=121080
2008-12-09 08:12:07 +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 5a15db1e4c 2008-09-19 Atsushi Enomoto <[email protected]>
* DefaultContext.cs, Expression.cs: do not premise BaseIterator.


svn path=/trunk/mcs/; revision=113511
2008-09-19 10:46:48 +00:00
Atsushi Eno ecf1894b4b 2008-09-19 Atsushi Enomoto <[email protected]>
* XPathComparer.cs : no need to limit to BaseIterator.


svn path=/trunk/mcs/; revision=113510
2008-09-19 10:45:23 +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
Atsushi Eno 2fd35a1f5c 2008-06-03 Atsushi Enomoto <[email protected]>
* Expression.cs : help diagnose variable resolution failure.


svn path=/trunk/mcs/; revision=104745
2008-06-03 11:41:34 +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 6f49cb9172 2008-02-12 Atsushi Enomoto <[email protected]>
* DefaultContext.cs : now number formatting for "R" works fine, so
	  just use it (and remove conditional compilation for TARGET_JVM).


svn path=/trunk/mcs/; revision=95479
2008-02-12 08:38:54 +00:00
Konstantin Triger 1532e9daba prevent endless recursion in AncestorIterator while collecting results
svn path=/trunk/mcs/; revision=95369
2008-02-10 12:27:49 +00:00
Sebastien Pouliot 999d3d2182 2008-01-12 Sebastien Pouliot <[email protected]>
* DefaultContext.cs: Fix direct comparison with NaN. Found by 
	Gendarme.


svn path=/trunk/mcs/; revision=92755
2008-01-12 16:55:24 +00:00
Atsushi Eno 92692a36b5 2007-12-17 Atsushi Enomoto <[email protected]>
* Iterator.cs : oops, extra removal that causes perf. loss.


svn path=/trunk/mcs/; revision=91406
2007-12-17 08:51:58 +00:00
Atsushi Eno a7e430277e 2007-12-17 Atsushi Enomoto <[email protected]>
* Iterator.cs : be more strict to detect the end of
	  PredicateIterator. Fixed bug #349111.

	* XslTransformTests.cs : added test for bug #349111.


svn path=/trunk/mcs/; revision=91405
2007-12-17 08:25:12 +00:00
Atsushi Eno e6024b90d2 2007-12-17 Atsushi Enomoto <[email protected]>
* Expression.cs : In any comparison expr, treat RTF as equivalent to
	  string type (as specified in XSLT 1.0 section 11.1: "An operation
	  is permitted on a result tree fragment only if that operation would
	  be permitted on a string." ...). Fixed bug #349035.

	* XslTransformTests.cs : added test for bug #349035.


svn path=/trunk/mcs/; revision=91402
2007-12-17 07:28:33 +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 372164c127 2007-01-30 Atsushi Enomoto <[email protected]>
* Expression.cs : typo. Close #80669


svn path=/trunk/mcs/; revision=71948
2007-01-30 11:07:40 +00:00
Atsushi Eno 8da0d1e779 2007-01-05 Atsushi Enomoto <[email protected]>
* Expression.cs : text() should match whitespace and significant
	  whitespace nodes.

	* XPathNavigatorTests.cs : added test for text() and whitespace/
	  significantwhitespace node.


svn path=/trunk/mcs/; revision=70536
2007-01-05 16:20:04 +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 a40a00bcde 2006-03-15 Atsushi Enomoto <[email protected]>
* XslTransformProcessor.cs,
	  Compiler.cs : eliminate ExpressionStore. Now sorting is done
	  inside XslSortEvaluator.
	* XslSortEvaluator.cs : new file. It handles current node in XSLT
	  context. Fixed bug #77781.

	* Expression.cs : extracted XPathSortElement, XPathSorters
	  and XPathSorter from CompiledExpression, and split
	  XPathSorters.Sort() into some methods. Those changes are to make
	  them reusable in XslSortEvaluator.

	* System.Xml.dll.sources : added XslSortEvaluator.cs.

	* knownFailures.txt : removed two xsl:sort+current() tests.


svn path=/trunk/mcs/; revision=58015
2006-03-15 14:43:45 +00:00
Atsushi Eno bea7460582 2006-02-26 Atsushi Enomoto <[email protected]>
* Iterator.cs : seems like MS XPathNodeIterator.MoveNext() itself does
	  not handle XsltContext.PreserveWhitespace() unlike ours. It results
	  in not a small performance improvement. (just removed it since it
	  didn't cause any errors in XSLT standalone tests.)


svn path=/trunk/mcs/; revision=57298
2006-02-26 12:38:08 +00:00
Atsushi Eno 17a250dd3e 2006-02-21 Atsushi Enomoto <[email protected]>
* Iterator.cs : removed extra field from AxisIterator.


svn path=/trunk/mcs/; revision=57107
2006-02-21 20:57:33 +00:00
Atsushi Eno 51c391133e 2006-02-14 Atsushi Enomoto <[email protected]>
* Iterator.cs : tiny message fix (thanks to alp).


svn path=/trunk/mcs/; revision=56851
2006-02-14 13:09:35 +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 95eed2d2f4 2006-01-11 Atsushi Enomoto <[email protected]>
* Iterator.cs : Nowadays removal of cloning of the argument list
          in ListIterator is safe. Thanks to Joshua Tauberer for the hint.


svn path=/trunk/mcs/; revision=55394
2006-01-11 18:47:40 +00:00
Atsushi Eno 2e628264bb 2006-01-11 Atsushi Enomoto <[email protected]>
* Iterator.cs : (DescendantOrSelfIterator/DescendantIterator)
          the error message is for blaming custom XPathNavigator
          implementation, not us ;-) (see also #77194)


svn path=/trunk/mcs/; revision=55389
2006-01-11 17:50:16 +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 acdcd911d4 2005-12-08 Atsushi Enomoto <[email protected]>
* XPathDocument.cs : garbage cleanup.


svn path=/trunk/mcs/; revision=54100
2005-12-08 08:38:05 +00:00
Vladimir Krasnov e9759877ca * Iterator.cs: fixed UnionIterator.SetCurrent method, the navigators may be from different xml files.
svn path=/trunk/mcs/; revision=53399
2005-11-23 17:32:01 +00:00
Vladimir Krasnov 2d6e92d133 * Iterator.cs: fixed SimpleSlashIterator.MoveNextCore method, the navigators may be from different xml files.
svn path=/trunk/mcs/; revision=53398
2005-11-23 17:25:05 +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