Commit Graph
243 Commits
Author SHA1 Message Date
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 8922e4e424 2004-03-25 Atsushi Enomoto <[email protected]>
* Expression.cs : In ExprSLASH2, replace A//B with A/descendant::B if
	  B is child axis test (thus peer&subtree optimization became possible)
	  Fixed warning (incorrect variable let).


svn path=/trunk/mcs/; revision=42247
2005-03-25 10:56:11 +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 bf86f5ec7b 2004-03-22 Atsushi Enomoto <[email protected]>
* Expression.cs : EvaluateBoolean() for RTF should check return true
	  for empty elements. Fixed static analysis for RTF.

	* XslTransformTests.cs : added test 1)that examines pattern sanity and
	  2)that examines if empty element RTF is evaluated as true for bool.


--his line, and those below, will be ignored--

M    System.Xml.XPath/ChangeLog
M    System.Xml.XPath/Expression.cs
M    Test/System.Xml.Xsl/ChangeLog
M    Test/System.Xml.Xsl/XslTransformTests.cs
M    Test/System.Xml.Xsl/standalone_tests/Makefile

svn path=/trunk/mcs/; revision=42118
2005-03-22 15:44:41 +00:00
Atsushi Eno ad73d6ca40 2004-03-22 Atsushi Enomoto <[email protected]>
* Makefile : now it creates XSLT pattern parser files from
	  Parser.jay and Tokenizer.cs in System.Xml.XPath.

	* Parser.jay, Tokenizer.cs : Now they are used as common code base for
	  XPath parser and XSLT pattern parser. Makefile now creates two
	  set of sources of them. (This change takes effect on the next change).


svn path=/trunk/mcs/; revision=42062
2005-03-22 07:26:41 +00:00
Atsushi Eno 32efbfc3a1 2004-03-16 Atsushi Enomoto <[email protected]>
* Parser.jay : rewrote step part to be reusable for upcoming XSLT
	  pattern parser.


svn path=/trunk/mcs/; revision=41921
2005-03-16 20:55:55 +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 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 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 16b2217356 2004-03-11 Atsushi Enomoto <[email protected]>
* Expression.cs, DefaultContext.cs : more Peer overrides.


svn path=/trunk/mcs/; revision=41702
2005-03-11 14:36:25 +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 e9f471bbab 2004-03-04 Atsushi Enomoto <[email protected]>
* Expression.cs : Significant whitespace nodes must be returned in
	  text() NodeTypeTest.


svn path=/trunk/mcs/; revision=41427
2005-03-04 07:05:22 +00:00
Atsushi Eno 78640dbcdb 2004-02-23 Atsushi Enomoto <[email protected]>
* Expression.cs : xsl:sort case-order was not handled properly.


svn path=/trunk/mcs/; revision=41099
2005-02-23 16:13:11 +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 b821d60b25 2004-02-18 Atsushi Enomoto <[email protected]>
* Expression.cs : string() function expects "Infinity" and "-Infinity"
	  instead of "INF" for conversion from number. XmlConvert is for XSD,
	  not for XSLT.


svn path=/trunk/mcs/; revision=40845
2005-02-18 08:11:22 +00:00
Atsushi Eno d08da3813d 2004-02-09 Atsushi Enomoto <[email protected]>
* Expression.cs : RelationalExpr was comparing number and node in
	  reverse order. Patch by Kazuki Oikawa. Fixed bug #72343.
	  RelationalExpr should also handle result tree fragment as node-set
	  as well as EqualityExpr. This fixes RTF case wrt #72343.


svn path=/trunk/mcs/; revision=40326
2005-02-09 07:03:41 +00:00
Atsushi Eno 7a88a433f7 2004-02-08 Atsushi Enomoto <[email protected]>
* Expression.cs : tiny code format fix by Andrew Skiba.


svn path=/trunk/mcs/; revision=40295
2005-02-08 11:06:56 +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 c5958e71ca 2004-12-04 Atsushi Enomoto <[email protected]>
* XPathDocument.cs : switch to DTMXPathNavigator2 which fully
	  eliminated string fields from struct.
	  (When we switch from struct to class, revert this change to use
	  DTMXPathNavigator, since class-based DTMXPathNavigator2 is rather
	  wasting processing speed.)



svn path=/trunk/mcs/; revision=37086
2004-12-04 17:23:43 +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 9186b8c3c1 2004-12-01 Atsushi Enomoto <[email protected]>
* IXPathChangeNavigable.cs,
	  XmlChangeFilters.cs,
	  XPathDocumentNodeChangedAction.cs : removed old files.
	* System.Xml.dll.sources : removed old files.


svn path=/trunk/mcs/; revision=36895
2004-12-01 10:57:55 +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 4a31df6a00 2004-11-26 Atsushi Enomoto <[email protected]>
* Expression.cs : warning removal. Added Optimize() which is not
	  implemented at all.
	* Tokenizer.cs : warning elimination



svn path=/trunk/mcs/; revision=36597
2004-11-26 02:56:02 +00:00
Miguel de Icaza 7f712723c0 Add yacc_verbose_flag supprot
svn path=/trunk/mcs/; revision=36510
2004-11-25 03:36:14 +00:00
Atsushi Eno d5d5457465 2004-11-24 Atsushi Enomoto <[email protected]>
* XPathEditableNavigator.cs, XPathChangeNavigator.cs,
	  IXPathEditable.cs : more removal of oldies.



svn path=/trunk/mcs/; revision=36450
2004-11-24 03:50:11 +00:00
Atsushi Eno 59d34af3a1 2004-11-24 Atsushi Enomoto <[email protected]>
* NodeChangedEventArgs.cs, NodeChangedEventHandler.cs : removed oldies.



svn path=/trunk/mcs/; revision=36448
2004-11-24 03:32:36 +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 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 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 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 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 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 69eec1fc95 2004-10-09 Atsushi Enomoto <[email protected]>
* XPathAtomicValue.cs : Init(string, XmlSchemaType) is private.

svn path=/trunk/mcs/; revision=34840
2004-10-09 19:39:29 +00:00
Atsushi Eno 166ee63ee3 2004-10-05 Atsushi Enomoto <[email protected]>
* XPathAtomicValue.cs : missing Init() definition for float and string;
	  latter one resulted in infinite loop in Init(object,XmlSchemaType).

svn path=/trunk/mcs/; revision=34733
2004-10-05 21:01:49 +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 505e8bf944 2004-09-13 Atsushi Enomoto <[email protected]>
* XPathAtomicValue.cs : All .ctor() are separeted from Init().
	  In .ctor(object, XmlSchemaType):
	  - For lists that contains just one item, Init() recursively.
	  - For XPathAtomicValue, Init() recursively for its content fields.
	  For Value and TypedValue, consider typecode from XmlSchemaType.

svn path=/trunk/mcs/; revision=33790
2004-09-13 04:03:54 +00:00
Atsushi Eno f5cb620bcf 2004-09-06 Atsushi Enomoto <[email protected]>
* XPathEditableNavigator.cs :
	  AppendChild(xmlReader) ignored nodes after than first one, and
	  resulted in infinite loop.
	  Added get_OuterXml overrides. set_OuterXml should not move to
	  parent before deleting current.

svn path=/trunk/mcs/; revision=33414
2004-09-06 14:51:43 +00:00