Commit Graph
94 Commits
Author SHA1 Message Date
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
Ben Maurer 4505af6030 making optimizatons in preperation for Jackson's jay patch
svn path=/trunk/mcs/; revision=18248
2003-09-21 19:22:37 +00:00
Ben Maurer 1951677126 2003-09-20 Ben Maurer <[email protected]>
* Expression.cs: num != double.NaN does not work.

svn path=/trunk/mcs/; revision=18213
2003-09-20 16:29:40 +00:00
Ben Maurer e7fd13de81 2003-09-19 Ben Maurer <[email protected]>
* Expression.cs: in NodeTypeTest dont throw an exception if it is
	an unknown node type (allows for better Pattern debugging)

svn path=/trunk/mcs/; revision=18197
2003-09-20 03:11:42 +00:00
Ben Maurer 0488e87a2e impl sum & translate
svn path=/trunk/mcs/; revision=18161
2003-09-18 02:58:28 +00:00
Ben Maurer add23d04b0 pass context to Evaluate* so that we dont have to clone the expression
svn path=/trunk/mcs/; revision=18062
2003-09-13 17:22:08 +00:00
Ben Maurer 446f43d4be 2003-09-06 Ben Maurer <[email protected]>
* DefaultContext.cs, Expresssion.cs, Parser.jay: Rewrite so that
	system functions are actually expressions. Will allow for some
	nice optimizations.

svn path=/trunk/mcs/; revision=17947
2003-09-06 18:58:51 +00:00
Ben Maurer 2172fba668 2003-08-25 Ben Maurer <[email protected]>
* XPathNavigator.cs: "Smart" behavior in Matches. Nice 8x speed
	improvement in the method (5ms/call -> .7 ms / call) measured by
	monodoc's rendering of N:System.
	* Expression.cs: Utility methods to support above.

svn path=/trunk/mcs/; revision=17596
2003-08-25 18:28:19 +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
Piers Haken 654b0fd348 2003-08-01 Piers Haken <[email protected]>
* Expression.cs: added NodeNamespaceTest
	* XPathNavigator.cs: implement Select* with namespaces

svn path=/trunk/mcs/; revision=16986
2003-08-01 10:44:37 +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
Duncan Mak 23c27cf065 * XPathException.cs
(GetObjectData):
(Message): Added.

* Url.cs (ToString): It should output an XML string, not just the
plain url.

svn path=/trunk/mcs/; revision=16920
2003-07-31 01:14:30 +00:00
Piers Haken 12db7efeb6 2003-07-29 Piers Haken <[email protected]>
* DefaultContext.cs: 'local-name' returns String, not NodeSet!

svn path=/trunk/mcs/; revision=16871
2003-07-30 03:23:03 +00:00
Piers Haken 8e1cfb092b 2003-07-29 Piers Haken <[email protected]>
* XPathNavigator.cs:
	* Expression.cs:
		add typesafe Evaluate* methods

svn path=/trunk/mcs/; revision=16870
2003-07-30 03:20:04 +00:00
Piers Haken a385a824fd 2003-07-29 Piers Haken <[email protected]>
* DefaultContext.cs: fix 'substring-after'

svn path=/trunk/mcs/; revision=16869
2003-07-30 02:40:03 +00:00
Piers Haken bee42267a2 2003-07-29 Piers Haken <[email protected]>
* Iterator.cs: fix PredicateIterator.CurrentPosition bug (it wasn't incrementing)

svn path=/trunk/mcs/; revision=16862
2003-07-30 00:23:46 +00:00
Ben Maurer 7bb0fa2091 forgot to commit this before. dont worry, am not slacking ;-)
svn path=/trunk/mcs/; revision=16860
2003-07-29 22:45:01 +00:00
Ben Maurer f03699ac71 2003-07-29 Ben Maurer <[email protected]>
* Iterator.cs: make sure we dont throw exceptions on ToString ()

svn path=/trunk/mcs/; revision=16853
2003-07-29 18:31:25 +00:00
Piers Haken 79ebd61c28 2003-07-28 Piers Haken <[email protected]>
* DefaultContext.cs: better handling of null argument lists
	* XPathNavigator.cs: implement ComparePosition

svn path=/trunk/mcs/; revision=16817
2003-07-29 02:27:04 +00:00
Piers Haken fcf0de145b 2003-07-28 Piers Haken <[email protected]>
* Expression.cs: boolean operators: handle comparing .Any better

svn path=/trunk/mcs/; revision=16800
2003-07-28 22:54:40 +00:00
Piers Haken cb74d89002 2003-07-28 Piers Haken <[email protected]>
* DefaultContext.cs: count() should return a double
	* Expression.cs: better support for handling non-double numbers

svn path=/trunk/mcs/; revision=16799
2003-07-28 22:12:33 +00:00
Piers Haken 471eacda6f 2003-07-28 Piers Haken <[email protected]>
* DefaultContext.cs: better function param matching

svn path=/trunk/mcs/; revision=16797
2003-07-28 21:54:15 +00:00
Piers Haken ae935bbac4 2003-07-27 Piers Haken <[email protected]>
* Expression.cs:
	* DefaultContext.cs:
		catch FormatExceptions while parsing numbers

svn path=/trunk/mcs/; revision=16767
2003-07-28 06:22:00 +00:00
Piers Haken 10fd05dc67 2003-07-27 Piers Haken <[email protected]>
* Expression.cs:
		fix case sorting order
		allow EvaluateNumber to take XPathResultType.Any

svn path=/trunk/mcs/; revision=16754
2003-07-27 23:27:14 +00:00
Piers Haken ce87ea0ec5 2003-07-27 Piers Haken <[email protected]>
* XmlQualifiedName.cs : fields should never be null

	* Expression.cs:
	* Tokenizer.cs:
		don't pass null to XmlQualifiedName constructor

	* XsltArgumentList.cs:
		fix type conversions in ValidateParam
		allow creating params with null namespaceUri

svn path=/trunk/mcs/; revision=16753
2003-07-27 21:49:26 +00:00
Piers Haken 638de75bd3 2003-07-27 Piers Haken <[email protected]>
* DefaultContext.cs: allow 'concat' to take arbitrary-typed arguments (spec?)

svn path=/trunk/mcs/; revision=16752
2003-07-27 20:01:58 +00:00
Piers Haken f203457fdf 2003-07-27 Piers Haken <[email protected]>
* Expression.cs: allow EvaluateNodeSet to take XPathResultType.Any

svn path=/trunk/mcs/; revision=16751
2003-07-27 19:33:33 +00:00
Piers Haken 0cd86fed8d 2003-07-26 Piers Haken <[email protected]>
* Expression.cs: fix function evaluation with ambigous argument types
	* XPathnavigator.cs: fix silly null reference bug

svn path=/trunk/mcs/; revision=16729
2003-07-27 02:54:26 +00:00
Piers Haken 2e273f54ed 2003-07-26 Piers Haken <[email protected]>
* Iterator.cs:
	* DefaultContext.cs:
		ArrayListIterator->EnumeratorIterator
	* Expression.cs: add sorting support

svn path=/trunk/mcs/; revision=16727
2003-07-27 02:28:24 +00:00