Attachment #146320 for bug #280555

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 13-19 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/test/AbstractPsychoPathTest.java (-12 / +17 lines)
13	* Jesper S Moller - bug 283404 - fixed locale	13	* Jesper S Moller - bug 283404 - fixed locale
14	* Jesper S Moller - bug 281159 - fix document URIs and also filter XML namespace	14	* Jesper S Moller - bug 281159 - fix document URIs and also filter XML namespace
15	* Jesper S Moller - bug 275610 - Avoid big time and memory overhead for externals	15	* Jesper S Moller - bug 275610 - Avoid big time and memory overhead for externals
16	* Jesper Steen Moeller - bug 282096 - make test harness handle all string encoding translate function surrogate aware	16	* Jesper Steen Moeller - bug 282096 - make test harness handle all string encoding
		17	* Jesper Steen Moller - bug 280555 - Add pluggable collation support
17	*******************************************************************************/	18	*******************************************************************************/
18	package org.eclipse.wst.xml.xpath2.processor.test;	19	package org.eclipse.wst.xml.xpath2.processor.test;
19		20
Lines 173-180 Link Here
173	return xsGrammars[0].toXSModel(xsGrammars);	174	return xsGrammars[0].toXSModel(xsGrammars);
174	}	175	}
175		176
176	protected DynamicContext setupDynamicContext(XSModel schema) {	177	protected DefaultDynamicContext setupDynamicContext(XSModel schema) {
177	DynamicContext dc = dynamicContext = new DefaultDynamicContext(schema, domDoc);	178	DefaultDynamicContext dc = new DefaultDynamicContext(schema, domDoc);
		179	dynamicContext = dc;
		180
178	dc.add_namespace("xs", "http://www.w3.org/2001/XMLSchema");	181	dc.add_namespace("xs", "http://www.w3.org/2001/XMLSchema");
179	dc.add_namespace("xsd", "http://www.w3.org/2001/XMLSchema");	182	dc.add_namespace("xsd", "http://www.w3.org/2001/XMLSchema");
180	dc.add_namespace("fn", "http://www.w3.org/2005/xpath-functions");	183	dc.add_namespace("fn", "http://www.w3.org/2005/xpath-functions");
Lines 352-367 Link Here
352	protected DynamicContext setupVariables(DynamicContext dc) {	355	protected DynamicContext setupVariables(DynamicContext dc) {
353	dc.add_variable(new QName("x"));	356	dc.add_variable(new QName("x"));
354	dc.add_variable(new QName("var"));	357	dc.add_variable(new QName("var"));
355	AnyType docType = new DocType(domDoc);	358
356	ElementType elementType = new ElementType(domDoc.getDocumentElement());	359	if (domDoc != null) {
357	dc.set_variable(new QName("input-context1"), docType);	360	AnyType docType = new DocType(domDoc);
358	dc.set_variable(new QName("input-context"), docType);	361	ElementType elementType = new ElementType(domDoc.getDocumentElement());
359	if (domDoc2 == null) {	362	dc.set_variable(new QName("input-context1"), docType);
360	dc.set_variable(new QName("input-context2"), docType);	363	dc.set_variable(new QName("input-context"), docType);
361	} else {	364	if (domDoc2 == null) {
362	dc.set_variable(new QName("input-context2"), (AnyType) new DocType(domDoc2));	365	dc.set_variable(new QName("input-context2"), docType);
		366	} else {
		367	dc.set_variable(new QName("input-context2"), (AnyType) new DocType(domDoc2));
		368	}
363	}	369	}
364
365	return dc;	370	return dc;
366	}	371	}
367		372

Lines 31-45 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/test/TestBugs.java (+40 lines)
31	* bug 279376 improvements to xs:yearMonthDuration division operation	31	* bug 279376 improvements to xs:yearMonthDuration division operation
32	* bug 281046 implementation of xs:base64Binary data type	32	* bug 281046 implementation of xs:base64Binary data type
33	* Jesper S Moller - bug 286061 correct handling of quoted string	33	* Jesper S Moller - bug 286061 correct handling of quoted string
		34	* Jesper S Moller - bug 280555 - Add pluggable collation support
34	*******************************************************************************/	35	*******************************************************************************/
35	package org.eclipse.wst.xml.xpath2.processor.test;	36	package org.eclipse.wst.xml.xpath2.processor.test;
36		37
37	import java.net.URL;	38	import java.net.URL;
		39	import java.util.Comparator;
38		40
39	import javax.xml.parsers.DocumentBuilder;	41	import javax.xml.parsers.DocumentBuilder;
40	import javax.xml.parsers.DocumentBuilderFactory;	42	import javax.xml.parsers.DocumentBuilderFactory;
41		43
42	import org.apache.xerces.xs.XSModel;	44	import org.apache.xerces.xs.XSModel;
		45	import org.eclipse.wst.xml.xpath2.processor.CollationProvider;
		46	import org.eclipse.wst.xml.xpath2.processor.DefaultDynamicContext;
43	import org.eclipse.wst.xml.xpath2.processor.DefaultEvaluator;	47	import org.eclipse.wst.xml.xpath2.processor.DefaultEvaluator;
44	import org.eclipse.wst.xml.xpath2.processor.DynamicContext;	48	import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
45	import org.eclipse.wst.xml.xpath2.processor.Evaluator;	49	import org.eclipse.wst.xml.xpath2.processor.Evaluator;
Lines 53-58 Link Here
53		57
54	public class TestBugs extends AbstractPsychoPathTest {	58	public class TestBugs extends AbstractPsychoPathTest {
55		59
		60	private static final String URN_X_ECLIPSE_XPATH20_FUNKY_COLLATOR = "urn:x-eclipse:xpath20:funky-collator";
		61
56	public void testStringLengthWithElementArg() throws Exception {	62	public void testStringLengthWithElementArg() throws Exception {
57	// Bug 273719	63	// Bug 273719
58	URL fileURL = bundle.getEntry("/bugTestFiles/bug273719.xml");	64	URL fileURL = bundle.getEntry("/bugTestFiles/bug273719.xml");
Lines 980-983 Link Here
980	assertEquals("Don't try this at \"home\", she said", resultValue);	986	assertEquals("Don't try this at \"home\", she said", resultValue);
981	}	987	}
982		988
		989	public void testBug280555_collations() throws Exception {
		990	// Setup context
		991	DefaultDynamicContext dc = setupDynamicContext(null);
		992	dc.set_collation_provider(createLengthCollatorProvider());
		993	Evaluator eval = new DefaultEvaluator(dc, domDoc);
		994
		995	// Parse expression
		996	XPath path = compileXPath(dc, " 'abc' < 'de' ");
		997
		998	// Evaluate once
		999	XSBoolean bval = (XSBoolean) eval.evaluate(path).first();
		1000	assertTrue("'abc' < 'def' for normal collations", bval.value());
		1001
		1002	// Evaluate again with the funny collator
		1003	dc.set_default_collation(URN_X_ECLIPSE_XPATH20_FUNKY_COLLATOR);
		1004	XSBoolean bval2 = (XSBoolean) eval.evaluate(path).first();
		1005	assertFalse("'abc' < 'def' for normal collations", bval2.value());
		1006	}
		1007
		1008	private CollationProvider createLengthCollatorProvider() {
		1009	return new CollationProvider() {
		1010	public Comparator get_collation(String name) {
		1011	if (name.equals(URN_X_ECLIPSE_XPATH20_FUNKY_COLLATOR)) {
		1012	return new Comparator<String>() {
		1013	public int compare(String o1, String o2) {
		1014	return o1.length() - o2.length();
		1015	}
		1016	};
		1017	}
		1018	return null;
		1019	}
		1020	};
		1021	}
		1022
983	}	1023	}

Lines 13-18 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/internal/types/XSBase64Binary.java (-1 / +2 lines)
13		13
14	import org.apache.xerces.impl.dv.util.Base64;	14	import org.apache.xerces.impl.dv.util.Base64;
15	import org.apache.xerces.impl.dv.util.HexBin;	15	import org.apache.xerces.impl.dv.util.HexBin;
		16	import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
16	import org.eclipse.wst.xml.xpath2.processor.DynamicError;	17	import org.eclipse.wst.xml.xpath2.processor.DynamicError;
17	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;	18	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
18	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;	19	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
Lines 147-153 Link Here
147	*	148	*
148	* @throws DynamicError	149	* @throws DynamicError
149	*/	150	*/
150	public boolean eq(AnyType arg) throws DynamicError {	151	public boolean eq(AnyType arg, DynamicContext context) throws DynamicError {
151	String valToCompare = arg.string_value();	152	String valToCompare = arg.string_value();
152		153
153	byte[] value1 = Base64.decode(_value);	154	byte[] value1 = Base64.decode(_value);

Lines 12-17 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/internal/types/XSGYearMonth.java (-1 / +2 lines)
12		12
13	package org.eclipse.wst.xml.xpath2.processor.internal.types;	13	package org.eclipse.wst.xml.xpath2.processor.internal.types;
14		14
		15	import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
15	import org.eclipse.wst.xml.xpath2.processor.DynamicError;	16	import org.eclipse.wst.xml.xpath2.processor.DynamicError;
16	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;	17	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
17	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;	18	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
Lines 282-288 Link Here
282	* False otherwise	283	* False otherwise
283	* @throws DynamicError	284	* @throws DynamicError
284	*/	285	*/
285	public boolean eq(AnyType arg) throws DynamicError {	286	public boolean eq(AnyType arg, DynamicContext context) throws DynamicError {
286	XSGYearMonth val = (XSGYearMonth) NumericType.get_single_type(arg,	287	XSGYearMonth val = (XSGYearMonth) NumericType.get_single_type(arg,
287	XSGYearMonth.class);	288	XSGYearMonth.class);
288		289





import java.math.BigInteger;

import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
import org.eclipse.wst.xml.xpath2.processor.DynamicError;
import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;

	 * @return True if they both represent the duration of time. False otherwise
	 * @throws DynamicError
	 */
	public boolean eq(AnyType arg, DynamicContext context) throws DynamicError {
		XSDuration val = (XSDuration) NumericType.get_single_type(arg,
				XSDuration.class);


	 *         stored. False otherwise
	 * @throws DynamicError
	 */
	public boolean lt(AnyType arg, DynamicContext context) throws DynamicError {
		XSDuration val = (XSDuration) NumericType.get_single_type(arg,
				XSDayTimeDuration.class);


	 *         stored. False otherwise
	 * @throws DynamicError
	 */
	public boolean gt(AnyType arg, DynamicContext context) throws DynamicError {
		XSDuration val = (XSDuration) NumericType.get_single_type(arg,
				XSDayTimeDuration.class);


Lines 12-17 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/internal/types/XSGMonth.java (-1 / +2 lines)
12		12
13	package org.eclipse.wst.xml.xpath2.processor.internal.types;	13	package org.eclipse.wst.xml.xpath2.processor.internal.types;
14		14
		15	import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
15	import org.eclipse.wst.xml.xpath2.processor.DynamicError;	16	import org.eclipse.wst.xml.xpath2.processor.DynamicError;
16	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;	17	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
17	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;	18	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
Lines 279-285 Link Here
279	* otherwise	280	* otherwise
280	* @throws DynamicError	281	* @throws DynamicError
281	*/	282	*/
282	public boolean eq(AnyType arg) throws DynamicError {	283	public boolean eq(AnyType arg, DynamicContext context) throws DynamicError {
283	XSGMonth val = (XSGMonth) NumericType.get_single_type(arg,	284	XSGMonth val = (XSGMonth) NumericType.get_single_type(arg,
284	XSGMonth.class);	285	XSGMonth.class);
285		286




import java.text.DecimalFormat;
import java.util.Iterator;

import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
import org.eclipse.wst.xml.xpath2.processor.DynamicError;
import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;


	/**
	 * Equality comparison between this number and the supplied representation.
	 * 
	 * @param aa
	 *            The datatype to compare with
	 * 
	 * @return True if the two representations are of the same number. False
	 *         otherwise
	 * @throws DynamicError
	 */
	public boolean eq(AnyType aa, DynamicContext context) throws DynamicError {
		AnyType carg = convertArg(aa);
		if (!(carg instanceof XSFloat))
			DynamicError.throw_type_error();

	 *         one stored. False otherwise
	 * @throws DynamicError
	 */
	public boolean gt(AnyType arg, DynamicContext context) throws DynamicError {
		AnyType carg = convertArg(arg);
		XSFloat val = (XSFloat) get_single_type(carg, XSFloat.class);
		return float_value() > val.float_value();

	 *         one stored. False otherwise
	 * @throws DynamicError
	 */
	public boolean lt(AnyType arg, DynamicContext context) throws DynamicError {
		AnyType carg = convertArg(arg);
		XSFloat val = (XSFloat) get_single_type(carg, XSFloat.class);
		return float_value() < val.float_value();

Lines 12-17 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/internal/types/QName.java (-1 / +2 lines)
12		12
13	package org.eclipse.wst.xml.xpath2.processor.internal.types;	13	package org.eclipse.wst.xml.xpath2.processor.internal.types;
14		14
		15	import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
15	import org.eclipse.wst.xml.xpath2.processor.DynamicError;	16	import org.eclipse.wst.xml.xpath2.processor.DynamicError;
16	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;	17	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
17	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;	18	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
Lines 321-327 Link Here
321	* @return True if the two represent the same node. False otherwise	322	* @return True if the two represent the same node. False otherwise
322	* @throws DynamicError	323	* @throws DynamicError
323	*/	324	*/
324	public boolean eq(AnyType arg) throws DynamicError {	325	public boolean eq(AnyType arg, DynamicContext context) throws DynamicError {
325	QName val = (QName) NumericType.get_single_type(arg, QName.class);	326	QName val = (QName) NumericType.get_single_type(arg, QName.class);
326	return equals(val);	327	return equals(val);
327	}	328	}




import java.math.RoundingMode;
import java.util.Iterator;

import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
import org.eclipse.wst.xml.xpath2.processor.DynamicError;
import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;


	/**
	 * Equality comparison between this number and the supplied representation.
	 * 
	 * @param aa
	 *            Representation to be compared with (must currently be of type
	 *            XSDouble)
	 * 
	 * @return True if the 2 representations represent the same number. False
	 *         otherwise
	 * @since 1.1
	 */
	public boolean eq(AnyType aa, DynamicContext context) throws DynamicError {
		ResultSequence rs = ResultSequenceFactory.create_new(aa);
		ResultSequence crs = constructor(rs);
		

	 * @return True if the supplied type represents a number smaller than this
	 *         one stored. False otherwise
	 */
	public boolean gt(AnyType arg, DynamicContext context) throws DynamicError {
		AnyType carg = convertArg(arg);
		
		XSDouble val = (XSDouble) get_single_type(carg, XSDouble.class);

	 * @return True if the supplied type represents a number greater than this
	 *         one stored. False otherwise
	 */
	public boolean lt(AnyType arg, DynamicContext context) throws DynamicError {
		AnyType carg = convertArg(arg);

		XSDouble val = (XSDouble) get_single_type(carg, XSDouble.class);





package org.eclipse.wst.xml.xpath2.processor.internal.types;

import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
import org.eclipse.wst.xml.xpath2.processor.DynamicError;
import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;

	 * @return True if the two dates are represent the same exact point in time.
	 *         False otherwise.
	 */
	public boolean eq(AnyType arg, DynamicContext context) throws DynamicError {
		XSDate val = (XSDate) NumericType.get_single_type(arg, XSDate.class);

		return calendar().equals(val.calendar());

	 * @return True if in time, this date lies before the date supplied. False
	 *         otherwise.
	 */
	public boolean lt(AnyType arg, DynamicContext context) throws DynamicError {
		XSDate val = (XSDate) NumericType.get_single_type(arg, XSDate.class);

		return calendar().before(val.calendar());

	 * @return True if in time, this date lies after the date supplied. False
	 *         otherwise.
	 */
	public boolean gt(AnyType arg, DynamicContext context) throws DynamicError {
		XSDate val = (XSDate) NumericType.get_single_type(arg, XSDate.class);

		return calendar().after(val.calendar());

Lines 13-18 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/internal/types/XSGDay.java (-1 / +2 lines)
13		13
14	package org.eclipse.wst.xml.xpath2.processor.internal.types;	14	package org.eclipse.wst.xml.xpath2.processor.internal.types;
15		15
		16	import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
16	import org.eclipse.wst.xml.xpath2.processor.DynamicError;	17	import org.eclipse.wst.xml.xpath2.processor.DynamicError;
17	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;	18	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
18	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;	19	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
Lines 298-304 Link Here
298	* otherwise	299	* otherwise
299	* @throws DynamicError	300	* @throws DynamicError
300	*/	301	*/
301	public boolean eq(AnyType arg) throws DynamicError {	302	public boolean eq(AnyType arg, DynamicContext context) throws DynamicError {
302	XSGDay val = (XSGDay) NumericType.get_single_type(arg, XSGDay.class);	303	XSGDay val = (XSGDay) NumericType.get_single_type(arg, XSGDay.class);
303		304
304	return calendar().equals(val.calendar());	305	return calendar().equals(val.calendar());

Lines 14-19 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/internal/types/XSHexBinary.java (-1 / +2 lines)
14		14
15	import org.apache.xerces.impl.dv.util.Base64;	15	import org.apache.xerces.impl.dv.util.Base64;
16	import org.apache.xerces.impl.dv.util.HexBin;	16	import org.apache.xerces.impl.dv.util.HexBin;
		17	import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
17	import org.eclipse.wst.xml.xpath2.processor.DynamicError;	18	import org.eclipse.wst.xml.xpath2.processor.DynamicError;
18	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;	19	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
19	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;	20	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
Lines 163-169 Link Here
163	*	164	*
164	* @throws DynamicError	165	* @throws DynamicError
165	*/	166	*/
166	public boolean eq(AnyType arg) throws DynamicError {	167	public boolean eq(AnyType arg, DynamicContext context) throws DynamicError {
167	String valToCompare = arg.string_value();	168	String valToCompare = arg.string_value();
168		169
169	byte[] value1 = HexBin.decode(_value);	170	byte[] value1 = HexBin.decode(_value);




import java.util.ArrayList;
import java.util.Collection;

import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
import org.eclipse.wst.xml.xpath2.processor.DynamicError;
import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;

	 *         otherwise
	 * @throws DynamicError
	 */
	public boolean eq(AnyType arg, DynamicContext context) throws DynamicError {
		if (arg instanceof XSAnyURI || arg instanceof XSString) {
			if (this.string_value().equals(arg.string_value())) {
				return true;

	 * must be of type xs:anyURI (or, by promotion of this, xs:string)
	 * @since 1.1
	 */
	public boolean gt(AnyType arg, DynamicContext context) throws DynamicError {
		if (!(arg instanceof XSAnyURI || arg instanceof XSString)) {
			throw DynamicError.throw_type_error();	
		}

	 * 
	 * @since 1.1
	 */
	public boolean lt(AnyType arg, DynamicContext context) throws DynamicError {
		if (!(arg instanceof XSAnyURI || arg instanceof XSString)) {
			throw DynamicError.throw_type_error();
		}





package org.eclipse.wst.xml.xpath2.processor.internal.types;

import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
import org.eclipse.wst.xml.xpath2.processor.DynamicError;
import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;

	 * @return New XSBoolean representation of true/false result of the equality
	 *         comparison
	 */
	public boolean eq(AnyType arg, DynamicContext context) throws DynamicError {
		XSBoolean barg = (XSBoolean) NumericType.get_single_type(arg,
				XSBoolean.class);


	 * @return New XSBoolean representation of true/false result of the
	 *         comparison
	 */
	public boolean gt(AnyType arg, DynamicContext context) throws DynamicError {
		XSBoolean barg = (XSBoolean) NumericType.get_single_type(arg,
				XSBoolean.class);


	 * @return New XSBoolean representation of true/false result of the
	 *         comparison
	 */
	public boolean lt(AnyType arg, DynamicContext context) throws DynamicError {
		XSBoolean barg = (XSBoolean) NumericType.get_single_type(arg,
				XSBoolean.class);





import java.math.RoundingMode;
import java.util.Iterator;

import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
import org.eclipse.wst.xml.xpath2.processor.DynamicError;
import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;

	 * (non-Javadoc)
	 * @see org.eclipse.wst.xml.xpath2.processor.internal.types.XSDecimal#gt(org.eclipse.wst.xml.xpath2.processor.internal.types.AnyType)
	 */
	public boolean gt(AnyType arg, DynamicContext context) throws DynamicError {
		AnyType carg = convertArg(arg);
        XSInteger val = (XSInteger) get_single_type(carg, XSInteger.class);
        

	 * (non-Javadoc)
	 * @see org.eclipse.wst.xml.xpath2.processor.internal.types.XSDecimal#lt(org.eclipse.wst.xml.xpath2.processor.internal.types.AnyType)
	 */
	public boolean lt(AnyType arg, DynamicContext context) throws DynamicError {
		AnyType carg = convertArg(arg);
        XSInteger val = (XSInteger) get_single_type(carg, XSInteger.class);
        




import java.math.RoundingMode;
import java.util.Iterator;

import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
import org.eclipse.wst.xml.xpath2.processor.DynamicError;
import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;

	// comparisons
	/**
	 * Equality comparison between this number and the supplied representation.
	 * 
	 * 
	 * @param at
	 *            Representation to be compared with (must currently be of type
	 *            XSDecimal)
	 * 
	 * 
	 * @return True if the 2 representation represent the same number. False
	 *         otherwise
	 */
	public boolean eq(AnyType at, DynamicContext context) throws DynamicError {
		
		ResultSequence rs = ResultSequenceFactory.create_new(at);
		

	 * @return True if the supplied type represents a number smaller than this
	 *         one stored. False otherwise
	 */
	public boolean gt(AnyType arg, DynamicContext context) throws DynamicError {
		AnyType carg = convertArg(arg);
		
		XSDecimal val = (XSDecimal) get_single_type(carg, XSDecimal.class);

	 * @return True if the supplied type represents a number greater than this
	 *         one stored. False otherwise
	 */
	public boolean lt(AnyType arg, DynamicContext context) throws DynamicError {
		AnyType carg = convertArg(arg);
		XSDecimal val = (XSDecimal) get_single_type(carg, XSDecimal.class);
		return (_value.compareTo(val.getValue()) == -1);




 *     Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0
 *     Mukul Gandhi - improved comparison of xs:string with other XDM types
 *  Jesper S Moller - bug 286061   correct handling of quoted string 
 *  Jesper S Moller - bug 280555 - Add pluggable collation support
 *******************************************************************************/

package org.eclipse.wst.xml.xpath2.processor.internal.types;

import java.math.BigInteger;

import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
import org.eclipse.wst.xml.xpath2.processor.DynamicError;
import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
import org.eclipse.wst.xml.xpath2.processor.internal.function.CmpEq;
import org.eclipse.wst.xml.xpath2.processor.internal.function.CmpGt;
import org.eclipse.wst.xml.xpath2.processor.internal.function.CmpLt;
import org.eclipse.wst.xml.xpath2.processor.internal.function.FnCompare;

/**
 * A representation of the String datatype

	// comparisons

	// 666 indicates death [compare returned empty seq]
	private int do_compare(AnyType arg, DynamicContext dc) throws DynamicError {
		Collection args = new ArrayList();

		ResultSequence rs = ResultSequenceFactory.create_new();
		// XXX: This can't happen, I guess
		if (arg == null) return 666;
				                       XSString(arg.string_value())));
		rs = FnCompare.compare(args);

		if (rs.empty())
			return 666;

		XSString comparand = arg instanceof XSString ? (XSString)arg : new XSString(arg.string_value());
		
		BigInteger result = FnCompare.compare_string(dc.default_collation_name(), this, comparand, dc);

		return result.intValue();
	}

	/**

	 *         otherwise
	 * @throws DynamicError
	 */
	public boolean eq(AnyType arg, DynamicContext context) throws DynamicError {
		int cmp = do_compare(arg, context);

		// XXX im not sure what to do here!!! because eq has to return
		// something i fink....

	 *         supplied. False otherwise
	 * @throws DynamicError
	 */
	public boolean gt(AnyType arg, DynamicContext context) throws DynamicError {
		int cmp = do_compare(arg, context);

		assert cmp != 666;


	 *         False otherwise
	 * @throws DynamicError
	 */
	public boolean lt(AnyType arg, DynamicContext context) throws DynamicError {
		int cmp = do_compare(arg, context);

		assert cmp != 666;






package org.eclipse.wst.xml.xpath2.processor.internal.types;

import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
import org.eclipse.wst.xml.xpath2.processor.DynamicError;
import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;

	 * @return True if both XSTime's represent the same time. False otherwise
	 * @throws DynamicError
	 */
	public boolean eq(AnyType arg, DynamicContext context) throws DynamicError {
		XSTime val = (XSTime) NumericType.get_single_type(arg, XSTime.class);

		return calendar().equals(val.calendar());

	 * @return True if the supplied time represnts a point in time after that
	 *         represented by the time stored. False otherwise
	 */
	public boolean lt(AnyType arg, DynamicContext context) throws DynamicError {
		XSTime val = (XSTime) NumericType.get_single_type(arg, XSTime.class);

		return calendar().before(val.calendar());

	 *         represented by the time stored. False otherwise
	 * @throws DynamicError
	 */
	public boolean gt(AnyType arg, DynamicContext context) throws DynamicError {
		XSTime val = (XSTime) NumericType.get_single_type(arg, XSTime.class);

		return calendar().after(val.calendar());

Lines 12-17 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/internal/types/XSGYear.java (-1 / +2 lines)
12		12
13	package org.eclipse.wst.xml.xpath2.processor.internal.types;	13	package org.eclipse.wst.xml.xpath2.processor.internal.types;
14		14
		15	import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
15	import org.eclipse.wst.xml.xpath2.processor.DynamicError;	16	import org.eclipse.wst.xml.xpath2.processor.DynamicError;
16	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;	17	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
17	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;	18	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
Lines 264-270 Link Here
264	* otherwise	265	* otherwise
265	* @throws DynamicError	266	* @throws DynamicError
266	*/	267	*/
267	public boolean eq(AnyType arg) throws DynamicError {	268	public boolean eq(AnyType arg, DynamicContext context) throws DynamicError {
268	XSGYear val = (XSGYear) NumericType.get_single_type(arg, XSGYear.class);	269	XSGYear val = (XSGYear) NumericType.get_single_type(arg, XSGYear.class);
269		270
270	return calendar().equals(val.calendar());	271	return calendar().equals(val.calendar());





import java.math.BigDecimal;

import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
import org.eclipse.wst.xml.xpath2.processor.DynamicError;
import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;

	 * @return True if they both represent the duration of time. False otherwise
	 * @throws DynamicError
	 */
	public boolean eq(AnyType arg, DynamicContext context) throws DynamicError {
		if (arg instanceof XSDayTimeDuration) {
			XSDayTimeDuration dayTimeDuration = (XSDayTimeDuration)arg;
			return (monthValue() == 0 && dayTimeDuration.value() == 0.0);

		}
		XSDuration val = (XSDuration) NumericType
				.get_single_type(arg, XSDuration.class);
		return super.eq(val, context);
	}

	/**

	 *         stored. False otherwise
	 * @throws DynamicError
	 */
	public boolean lt(AnyType arg, DynamicContext context) throws DynamicError {
		XSYearMonthDuration val = (XSYearMonthDuration) NumericType
				.get_single_type(arg, XSYearMonthDuration.class);


	 *         stored. False otherwise
	 * @throws DynamicError
	 */
	public boolean gt(AnyType arg, DynamicContext context) throws DynamicError {
		XSYearMonthDuration val = (XSYearMonthDuration) NumericType
				.get_single_type(arg, XSYearMonthDuration.class);






package org.eclipse.wst.xml.xpath2.processor.internal.types;

import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
import org.eclipse.wst.xml.xpath2.processor.DynamicError;
import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;

	 * @return True if the two dates and times are represent the same exact
	 *         point in time. False otherwise.
	 */
	public boolean eq(AnyType arg, DynamicContext context) throws DynamicError {
		XSDateTime val = (XSDateTime) NumericType.get_single_type(arg,
				XSDateTime.class);


	 * @return True if in time, this date and time lies before the date and time
	 *         supplied. False otherwise.
	 */
	public boolean lt(AnyType arg, DynamicContext context) throws DynamicError {
		XSDateTime val = (XSDateTime) NumericType.get_single_type(arg,
				XSDateTime.class);


	 * @return True if in time, this date and time lies after the date and time
	 *         supplied. False otherwise.
	 */
	public boolean gt(AnyType arg, DynamicContext context) throws DynamicError {
		XSDateTime val = (XSDateTime) NumericType.get_single_type(arg,
				XSDateTime.class);


Lines 14-19 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/internal/types/XSGMonthDay.java (-1 / +2 lines)
14		14
15	package org.eclipse.wst.xml.xpath2.processor.internal.types;	15	package org.eclipse.wst.xml.xpath2.processor.internal.types;
16		16
		17	import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
17	import org.eclipse.wst.xml.xpath2.processor.DynamicError;	18	import org.eclipse.wst.xml.xpath2.processor.DynamicError;
18	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;	19	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
19	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;	20	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
Lines 313-319 Link Here
313	* False otherwise	314	* False otherwise
314	* @throws DynamicError	315	* @throws DynamicError
315	*/	316	*/
316	public boolean eq(AnyType arg) throws DynamicError {	317	public boolean eq(AnyType arg, DynamicContext context) throws DynamicError {
317	XSGMonthDay val = (XSGMonthDay) NumericType.get_single_type(arg,	318	XSGMonthDay val = (XSGMonthDay) NumericType.get_single_type(arg,
318	XSGMonthDay.class);	319	XSGMonthDay.class);
319		320




 *     Jesper Steen Moeller - bug 28149 - add more fn:error info
 *     Jesper Steen Moller  - bug 281159 - fix document loading and resolving URIs 
 *     Jesper Steen Moller  - Bug 286062 - Add FOAR0002  
 *     Jesper Steen Moller  - bug 280555 - Add pluggable collation support
 *******************************************************************************/

package org.eclipse.wst.xml.xpath2.processor;


		return new DynamicError("FOCH0001", error);
	}

	/**
	 * Returns the dynamic error for an unsupported normalization form
	 * 
	 * @param collationName
	 *            is the error
	 * @return the DynamicError.
	 * @since 1.1
	 * 
	 */
	public static DynamicError unsupported_collation(String collationName) {
		String error = "Unsupported collation URI. ";

		if (collationName != null)
			error += " " + collationName;

		return new DynamicError("FOCH0002", error);
	}

	/**
	 * Returns the dynamic error for an unsupported normalization form
	 * 




 *     Jesper Moller- bug 281159 - fix document loading and resolving URIs 
 *     Jesper Moller- bug 286452 - always return the stable date/time from dynamic context
 *     Jesper Moller- bug 275610 - Avoid big time and memory overhead for externals
 *     Jesper Moller- bug 280555 - Add pluggable collation support
 *******************************************************************************/

package org.eclipse.wst.xml.xpath2.processor;

import org.eclipse.wst.xml.xpath2.processor.internal.Focus;
import org.eclipse.wst.xml.xpath2.processor.internal.types.*;

import java.net.URI;
import java.util.Collection;
import java.util.Comparator;
import java.util.GregorianCalendar;

import org.eclipse.wst.xml.xpath2.processor.internal.Focus;
import org.eclipse.wst.xml.xpath2.processor.internal.types.AnyType;
import org.eclipse.wst.xml.xpath2.processor.internal.types.QName;
import org.eclipse.wst.xml.xpath2.processor.internal.types.XSDuration;

/**
 * Interface for dynamic context.

public interface DynamicContext extends StaticContext {

	/**
	 * The default collation which is guaranteed to always be implemented
	 */
	public static final String CODEPOINT_COLLATION = "http://www.w3.org/2005/xpath-functions/collation/codepoint";

	/**
	 * Get context item.
	 * 
	 * @return the context item.

	 * @return Focus
	 */
	public Focus focus();
	
	/**
	 * Return a useful collator for the specified URI
	 * 
	 * @param uri
	 * @return A Jaa collator, or null, if no such Collator exists 
	 */
	public Comparator<Object> get_collation(String uri); 
	
	/**
	 * Returns the current default collator
	 * 
	 * @return The default name to use as the collator
	 */
	public String default_collation_name();

}




 *     Jesper Steen Moeller - bug 285145 - check arguments to op:to
 *     Jesper Steen Moeller - bug 262765 - fixed node state iteration
 *     Jesper Steen Moller  - bug 275610 - Avoid big time and memory overhead for externals
 *     Jesper Steen Moller  - bug 280555 - Add pluggable collation support
 *******************************************************************************/

package org.eclipse.wst.xml.xpath2.processor;


			switch (cmpex.type()) {
			case CmpExpr.EQ:
				return FsEq.fs_eq_value(args, _dc);

			case CmpExpr.NE:
				return FsNe.fs_ne_value(args, _dc);

			case CmpExpr.GT:
				return FsGt.fs_gt_value(args, _dc);

			case CmpExpr.LT:
				return FsLt.fs_lt_value(args, _dc);

			case CmpExpr.GE:
				return FsGe.fs_ge_value(args, _dc);

			case CmpExpr.LE:
				return FsLe.fs_le_value(args, _dc);

			case CmpExpr.EQUALS:
				return FsEq.fs_eq_general(args, _dc);

			case CmpExpr.NOTEQUALS:
				return FsNe.fs_ne_general(args, _dc);

			case CmpExpr.GREATER:
				return FsGt.fs_gt_general(args, _dc);

			case CmpExpr.LESSTHAN:
				return FsLt.fs_lt_general(args, _dc);

			case CmpExpr.GREATEREQUAL:
				return FsGe.fs_ge_general(args, _dc);

			case CmpExpr.LESSEQUAL:
				return FsLe.fs_le_general(args, _dc);

			case CmpExpr.IS:
			case CmpExpr.LESS_LESS:

			if (at instanceof NumericType) {
				try {
					_g_xsint.set_int(BigInteger.valueOf(_dc.context_position()));
					return FsEq.fs_eq_fast(at, _g_xsint, _dc);
				} catch (DynamicError err) {
					report_error(err);


Lines 13-18 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/DefaultDynamicContext.java (+30 lines)
13	* Jesper Moller- bug 281159 - fix document loading and resolving URIs	13	* Jesper Moller- bug 281159 - fix document loading and resolving URIs
14	* Jesper Moller- bug 286452 - always return the stable date/time from dynamic context	14	* Jesper Moller- bug 286452 - always return the stable date/time from dynamic context
15	* Jesper Moller- bug 275610 - Avoid big time and memory overhead for externals	15	* Jesper Moller- bug 275610 - Avoid big time and memory overhead for externals
		16	* Jesper Moller- bug 280555 - Add pluggable collation support
16	*******************************************************************************/	17	*******************************************************************************/
17		18
18	package org.eclipse.wst.xml.xpath2.processor;	19	package org.eclipse.wst.xml.xpath2.processor;
Lines 23-28 Link Here
23	import org.eclipse.wst.xml.xpath2.processor.internal.function.*;	24	import org.eclipse.wst.xml.xpath2.processor.internal.function.*;
24	import org.eclipse.wst.xml.xpath2.processor.internal.types.*;	25	import org.eclipse.wst.xml.xpath2.processor.internal.types.*;
25		26
		27	import java.text.Collator;
26	import java.util.*;	28	import java.util.*;
27		29
28	import org.w3c.dom.*;	30	import org.w3c.dom.*;
Lines 44-49 Link Here
44	private XSDuration _tz;	46	private XSDuration _tz;
45	private Map _loaded_documents;	47	private Map _loaded_documents;
46	private GregorianCalendar _current_date_time;	48	private GregorianCalendar _current_date_time;
		49	private String _default_collation_name = CODEPOINT_COLLATION;
		50	private CollationProvider _collation_provider;
47		51
48	/**	52	/**
49	* Constructor.	53	* Constructor.
Lines 242-245 Link Here
242	super.set_variable(var, val);	246	super.set_variable(var, val);
243	}	247	}
244		248
		249	public void set_default_collation(String _default_collation) {
		250	this._default_collation_name = _default_collation;
		251	}
		252
		253	public String default_collation_name() {
		254	return _default_collation_name;
		255	}
		256
		257	// We are explicitly NOT using generics here, in anticipation of JDK1.4 compatibility
		258	private static Comparator CODEPOINT_COMPARATOR = new Comparator() {
		259
		260	public int compare(Object o1, Object o2) {
		261	return ((String)o1).compareTo((String)o2);
		262	}
		263	};
		264
		265	public Comparator<Object> get_collation(String uri) {
		266	if (CODEPOINT_COLLATION.equals(uri)) return CODEPOINT_COMPARATOR;
		267
		268	return _collation_provider != null ? _collation_provider.get_collation(uri) : null;
		269	}
		270
		271	public void set_collation_provider(CollationProvider provider) {
		272	this._collation_provider = provider;
		273	}
		274
245	}	275	}




 *     David Carver - bug 262765 - fixed comparison on sequence range values.
 *     Jesper S Moller - bug 283214 - fix eq for untyped atomic values
 *     Jesper Steen Moeller - bug 285145 - implement full arity checking
 *     Jesper Steen Moeller - bug 280555 - Add pluggable collation support
 *******************************************************************************/

package org.eclipse.wst.xml.xpath2.processor.internal.function;

import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
import org.eclipse.wst.xml.xpath2.processor.DynamicError;
import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;

	public ResultSequence evaluate(Collection args) throws DynamicError {
		assert args.size() >= min_arity() && args.size() <= max_arity();

		return fs_eq_value(args, dynamic_context());
	}

	/**

	 *             Dynamic error.
	 * @return Result of conversion.
	 */
	public static ResultSequence fs_eq_value(Collection args, DynamicContext dynamicContext)
			throws DynamicError {
		return do_cmp_value_op(args, CmpEq.class, "eq", dynamicContext);
	}

	/**

	 *             Dynamic error.
	 * @return Result of Equality operation.
	 */
	public static boolean fs_eq_fast(AnyType one, AnyType two, DynamicContext dynamicContext)
			throws DynamicError {

		one = FnData.atomize(one);


		CmpEq cmpone = (CmpEq) one;

		return cmpone.eq(two, dynamicContext);
	}

	/**

	 *            input1 of any type.
	 * @param b
	 *            input2 of any type.
	 * @param dc
	 *              Dynamic Context
	 * @throws DynamicError
	 *             Dynamic error.
	 * @return Result of Equality operation.
	 */
	private static boolean do_general_pair(AnyType a, AnyType b,
			Method comparator, DynamicContext dc) throws DynamicError {

		// section 3.5.2


		args.add(one);
		args.add(two);

		Object margs[] = { args, dc };

		ResultSequence result = null;
		try {

	 * 
	 * @param args
	 *            input arguments.
	 * @param dc
	 *         Dynamic context 
	 * @throws DynamicError
	 *             Dynamic error.
	 * @return Result of general equality operation.
	 */
	public static ResultSequence fs_eq_general(Collection args, DynamicContext dc)
			throws DynamicError {
		return do_cmp_general_op(args, FsEq.class, "fs_eq_value", dc);
	}

	// voodoo 3

	 * @return Result of the operation.
	 */
	public static ResultSequence do_cmp_general_op(Collection args, Class type,
			String mname, DynamicContext dc) throws DynamicError {

		// do the voodoo
		Method comparator = null;

		try {
			Class margsdef[] = { Collection.class, DynamicContext.class };

			comparator = type.getMethod(mname, margsdef);

		} catch (NoSuchMethodException err) {
			throw new RuntimeException("Can¿'t find method : " + mname, err);
		}

		// sanity check args and get them

			for (Iterator j = two.iterator(); j.hasNext();) {
				AnyType b = (AnyType) j.next();

				if (do_general_pair(a, b, comparator, dc))
					return ResultSequenceFactory
							.create_new(new XSBoolean(true));
			}

	 *            type of the arguments.
	 * @param mname
	 *            Method name for template simulation.
	 * @param dynamicContext 
	 *             Dynamic error.
	 * @throws DynamicError
	 *             Dynamic error.
	 * @return Result of the operation.
	 */
	public static ResultSequence do_cmp_value_op(Collection args, Class type,
			String mname, DynamicContext dynamicContext) throws DynamicError {

		// sanity check args + convert em
		if (args.size() != 2)

			DynamicError.throw_type_error();

		try {
			Class margsdef[] = { AnyType.class, DynamicContext.class };
			Method method = null;

			method = type.getMethod(mname, margsdef);

			Object margs[] = { arg2.first(), dynamicContext };
			Boolean cmpres = (Boolean) method.invoke(arg, margs);

			return ResultSequenceFactory.create_new(new XSBoolean(cmpres
					.booleanValue()));
		} catch (NoSuchMethodException err) {
			assert false;
			throw new RuntimeException("cannot compare using method " + mname, err);
		} catch (IllegalAccessException err) {
			assert false;
			throw new RuntimeException("cannot compare using method " + mname, err);
		} catch (InvocationTargetException err) {
			Throwable ex = err.getTargetException();

			if (ex instanceof DynamicError)
				throw (DynamicError) ex;

			throw new RuntimeException("cannot compare using method " + mname, ex);
			System.exit(1);
		}
		return null; // unreach!
	}
}




 *
 * Contributors:
 *     Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0 
 *     Jesper Moller - bug 280555 - Add pluggable collation support
 *******************************************************************************/

package org.eclipse.wst.xml.xpath2.processor.internal.function;

import java.util.Collection;
import java.util.Iterator;

import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
import org.eclipse.wst.xml.xpath2.processor.DynamicError;
import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;

	 */
	@Override
	public ResultSequence evaluate(Collection args) throws DynamicError {
		return index_of(args, dynamic_context());
	}

	/**

	 * 
	 * @param args
	 *            Result from the expressions evaluation.
	 * @param dynamicContext 
	 * @throws DynamicError
	 *             Dynamic error.
	 * @return Result of fn:index-of operation.
	 */
	public static ResultSequence index_of(Collection args, DynamicContext dynamicContext) throws DynamicError {

		assert args.size() == 2;


		for (Iterator i = arg1.iterator(); i.hasNext();) {
			CmpEq candidate = get_comparable((AnyType) i.next());

			if (candidate.eq(at, dynamicContext))
				rs.add(new XSInteger(BigInteger.valueOf(index)));

			index++;




 * Contributors:
 *     Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0 
 *     Jesper Steen Moeller - bug 285145 - implement full arity checking
 *     Jesper Steen Moeller - bug 280555 - Add pluggable collation support
 *******************************************************************************/

package org.eclipse.wst.xml.xpath2.processor.internal.function;

import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
import org.eclipse.wst.xml.xpath2.processor.DynamicError;
import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;

	 * Constructor of FnCompare.
	 */
	public FnCompare() {
		super(new QName("compare"), 2, 3);
		super(new QName("compare"), 2);
	}

	/**

	 */
	@Override
	public ResultSequence evaluate(Collection args) throws DynamicError {
		return compare(args, dynamic_context());
	}

	/**
	 * Compare the arguments.
	 * 
	 * @param args
	 *            are compared (optional 3rd argument is the collation)
	 * @param dynamicContext
	 * 	       Current dynamic context 
	 * @throws DynamicError
	 *             Dynamic error.
	 * @return The result of the comparison of the arguments.
	 */
	public static ResultSequence compare(Collection args, DynamicContext dynamicContext) throws DynamicError {
		Collection cargs = Function.convert_arguments(args, expected_args());

		ResultSequence rs = ResultSequenceFactory.create_new();

		Iterator argiter = cargs.iterator();
		ResultSequence arg1 = (ResultSequence) argiter.next();
		if (arg1.empty())
			return rs;
		ResultSequence arg2 = (ResultSequence) argiter.next();
		if (arg2.empty())
			return rs;

		String collationUri = dynamicContext.default_collation_name();
		if (argiter.hasNext()) {
			ResultSequence collArg = (ResultSequence) argiter.next();
			collationUri = collArg.first().string_value();
		}

		XSString xstr1 = arg1.empty() ? null : (XSString) arg1.first();
		XSString xstr2 = arg2.empty() ? null : (XSString) arg2.first();

		BigInteger result = compare_string(collationUri, xstr1, xstr2, dynamicContext);
		if (result != null) {
			return ResultSequenceFactory.create_new(new XSInteger(result));
		} else {
			return ResultSequenceFactory.create_new();			
		}
	}

	public static BigInteger compare_string(String collationUri, XSString xstr1,
			XSString xstr2, DynamicContext dynamicContext) throws DynamicError {
		Comparator collator = dynamicContext.get_collation(collationUri);
		if (collator == null) throw DynamicError.unsupported_collation(collationUri);

		if (xstr1 == null || xstr2 == null) return null;
		
		int ret = collator.compare(xstr1.value(), xstr2.value());

		if (ret == 0)
			return BigInteger.ZERO;
		else if (ret < 0)
			return BigInteger.valueOf(-1);
		else
			return BigInteger.ONE;

		return rs;
	}

	/**

			SeqType arg = new SeqType(new XSString(), SeqType.OCC_QMARK);
			_expected_args.add(arg);
			_expected_args.add(arg);
			_expected_args.add(new SeqType(new XSString(), SeqType.OCC_NONE));
		}

		return _expected_args;




 *
 * Contributors:
 *     Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0 
 *     Jesper Moller - bug 280555 - Add pluggable collation support
 *******************************************************************************/

package org.eclipse.wst.xml.xpath2.processor.internal.function;

import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
import org.eclipse.wst.xml.xpath2.processor.DynamicError;
import org.eclipse.wst.xml.xpath2.processor.internal.*;
import org.eclipse.wst.xml.xpath2.processor.internal.types.*;

	 * 
	 * @param arg
	 *            argument of any type.
	 * @param context TODO
	 * @throws DynamicError
	 *             Dynamic error.
	 * @return Result of operation, true/false.
	 */
	public boolean gt(AnyType arg, DynamicContext context) throws DynamicError;
}




 *
 * Contributors:
 *     Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0 
 *     Jesper Moller - bug 280555 - Add pluggable collation support
 *******************************************************************************/

package org.eclipse.wst.xml.xpath2.processor.internal.function;

import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
import org.eclipse.wst.xml.xpath2.processor.DynamicError;
import org.eclipse.wst.xml.xpath2.processor.internal.*;
import org.eclipse.wst.xml.xpath2.processor.internal.types.*;

	 * 
	 * @param arg
	 *            argument of any type.
	 * @param context TODO
	 * @throws DynamicError
	 *             Dynamic error.
	 * @return Result of operation, true/false.
	 */
	public boolean eq(AnyType arg, DynamicContext context) throws DynamicError;
}

Lines 7-16 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/internal/function/FnMax.java (-3 / +7 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0	9	* Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0
		10	* Jesper Moller - bug 280555 - Add pluggable collation support
10	*******************************************************************************/	11	*******************************************************************************/
11		12
12	package org.eclipse.wst.xml.xpath2.processor.internal.function;	13	package org.eclipse.wst.xml.xpath2.processor.internal.function;
13		14
		15	import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
14	import org.eclipse.wst.xml.xpath2.processor.DynamicError;	16	import org.eclipse.wst.xml.xpath2.processor.DynamicError;
15	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;	17	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
16	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;	18	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
Lines 44-50 Link Here
44	*/	46	*/
45	@Override	47	@Override
46	public ResultSequence evaluate(Collection args) throws DynamicError {	48	public ResultSequence evaluate(Collection args) throws DynamicError {
47	return max(args);	49	return max(args, dynamic_context());
48	}	50	}
49		51
50	/**	52	/**
Lines 52-62 Link Here
52	*	54	*
53	* @param args	55	* @param args
54	* Result from the expressions evaluation.	56	* Result from the expressions evaluation.
		57	* @param context
		58	* Relevant dynamic context
55	* @throws DynamicError	59	* @throws DynamicError
56	* Dynamic error.	60	* Dynamic error.
57	* @return Result of fn:max operation.	61	* @return Result of fn:max operation.
58	*/	62	*/
59	public static ResultSequence max(Collection args) throws DynamicError {	63	public static ResultSequence max(Collection args, DynamicContext context) throws DynamicError {
60		64
61	// XXX fix this	65	// XXX fix this
62	ResultSequence arg = get_arg(args, CmpGt.class);	66	ResultSequence arg = get_arg(args, CmpGt.class);
Lines 76-82 Link Here
76	if (max == null)	80	if (max == null)
77	max = item;	81	max = item;
78	else {	82	else {
79	boolean res = item.gt((AnyType) max);	83	boolean res = item.gt((AnyType) max, context);
80		84
81	if (res)	85	if (res)
82	max = item;	86	max = item;




 *
 * Contributors:
 *     Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0 
 *     Jesper Moller - bug 280555 - Add pluggable collation support
 *******************************************************************************/

package org.eclipse.wst.xml.xpath2.processor.internal.function;

import java.util.Collection;
import java.util.Iterator;

import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
import org.eclipse.wst.xml.xpath2.processor.DynamicError;
import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;

	 */
	@Override
	public ResultSequence evaluate(Collection args) throws DynamicError {
		return distinct_values(args, dynamic_context());
	}

	/**

	 *             Dynamic error.
	 * @return Result of operation.
	 */
	private static boolean contains(ResultSequence rs, AnyAtomicType item, DynamicContext context)
			throws DynamicError {
		if (!(item instanceof CmpEq))
			return false;


			CmpEq cmp = (CmpEq) at;

			if (cmp.eq(item, context))
				return true;

		}

	 *             Dynamic error.
	 * @return Result of fn:distinct-values operation.
	 */
	public static ResultSequence distinct_values(Collection args, DynamicContext context)
			throws DynamicError {

		assert args.size() == 1;

			if (!(at instanceof AnyAtomicType))
				DynamicError.throw_type_error();

			if (!contains(rs, (AnyAtomicType) at, context))
				rs.add(at);
		}





 *
 * Contributors:
 *     Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0 
 *     Jesper Moller - bug 280555 - Add pluggable collation support
 *******************************************************************************/

package org.eclipse.wst.xml.xpath2.processor.internal.function;

import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
import org.eclipse.wst.xml.xpath2.processor.DynamicError;
import org.eclipse.wst.xml.xpath2.processor.internal.*;
import org.eclipse.wst.xml.xpath2.processor.internal.types.*;

	 * 
	 * @param arg
	 *            argument of any type.
	 * @param context TODO
	 * @throws DynamicError
	 *             Dynamic error.
	 * @return Result of operation, true/false.
	 */
	public boolean lt(AnyType arg, DynamicContext context) throws DynamicError;
}

Lines 8-17 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/internal/function/FsNe.java (-5 / +11 lines)
8	* Contributors:	8	* Contributors:
9	* Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0	9	* Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0
10	* Jesper Steen Moeller - bug 285145 - implement full arity checking	10	* Jesper Steen Moeller - bug 285145 - implement full arity checking
		11	* Jesper Moller - bug 280555 - Add pluggable collation support
11	*******************************************************************************/	12	*******************************************************************************/
12		13
13	package org.eclipse.wst.xml.xpath2.processor.internal.function;	14	package org.eclipse.wst.xml.xpath2.processor.internal.function;
14		15
		16	import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
15	import org.eclipse.wst.xml.xpath2.processor.DynamicError;	17	import org.eclipse.wst.xml.xpath2.processor.DynamicError;
16	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;	18	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
17	import org.eclipse.wst.xml.xpath2.processor.internal.*;	19	import org.eclipse.wst.xml.xpath2.processor.internal.*;
Lines 43-49 Link Here
43	public ResultSequence evaluate(Collection args) throws DynamicError {	45	public ResultSequence evaluate(Collection args) throws DynamicError {
44	assert args.size() >= min_arity() && args.size() <= max_arity();	46	assert args.size() >= min_arity() && args.size() <= max_arity();
45		47
46	return fs_ne_value(args);	48	return fs_ne_value(args, dynamic_context());
47	}	49	}
48		50
49	/**	51	/**
Lines 51-63 Link Here
51	*	53	*
52	* @param args	54	* @param args
53	* input arguments.	55	* input arguments.
		56	* @param context
		57	* The dynamic context
54	* @throws DynamicError	58	* @throws DynamicError
55	* Dynamic error.	59	* Dynamic error.
56	* @return Result of the operation.	60	* @return Result of the operation.
57	*/	61	*/
58	public static ResultSequence fs_ne_value(Collection args)	62	public static ResultSequence fs_ne_value(Collection args, DynamicContext context)
59	throws DynamicError {	63	throws DynamicError {
60	return FnNot.fn_not(FsEq.fs_eq_value(args));	64	return FnNot.fn_not(FsEq.fs_eq_value(args, context));
61	}	65	}
62		66
63	/**	67	/**
Lines 65-77 Link Here
65	*	69	*
66	* @param args	70	* @param args
67	* input arguments.	71	* input arguments.
		72	* @param dc
		73	* The dynamic context
68	* @throws DynamicError	74	* @throws DynamicError
69	* Dynamic error.	75	* Dynamic error.
70	* @return Result of the operation.	76	* @return Result of the operation.
71	*/	77	*/
72	public static ResultSequence fs_ne_general(Collection args)	78	public static ResultSequence fs_ne_general(Collection args, DynamicContext dc)
73	throws DynamicError {	79	throws DynamicError {
74	return FsEq.do_cmp_general_op(args, FsNe.class, "fs_ne_value");	80	return FsEq.do_cmp_general_op(args, FsNe.class, "fs_ne_value", dc);
75	}	81	}
76		82
77	}	83	}




 * Contributors:
 *     Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0 
 *     Jesper Steen Moeller - bug 285145 - implement full arity checking
 *     Jesper Steen Mooller - bug 280555 - Add pluggable collation support
 *******************************************************************************/

package org.eclipse.wst.xml.xpath2.processor.internal.function;

import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
import org.eclipse.wst.xml.xpath2.processor.DynamicError;
import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;

	public ResultSequence evaluate(Collection args) throws DynamicError {
		assert args.size() >= min_arity() && args.size() <= max_arity();

		return fs_ge_value(args, dynamic_context());
	}

	/**

	 * 
	 * @param args
	 *            input arguments.
	 * @param dc 
	 * @throws DynamicError
	 *             Dynamic error.
	 * @return Result of the operation.
	 */
	public static ResultSequence fs_ge_value(Collection args, DynamicContext dc)
			throws DynamicError {
		ResultSequence greater = FsGt.fs_gt_value(args, dc);

		if (((XSBoolean) greater.first()).value())
			return greater;

		ResultSequence equal = FsEq.fs_eq_value(args, dc);

		if (((XSBoolean) equal.first()).value())
			return equal;

	 * 
	 * @param args
	 *            input arguments.
	 * @param dc 
	 *             The dynamic context
	 * @throws DynamicError
	 *             Dynamic error.
	 * @return Result of the operation.
	 */
	public static ResultSequence fs_ge_general(Collection args, DynamicContext dc)
			throws DynamicError {
		return FsEq.do_cmp_general_op(args, FsGe.class, "fs_ge_value", dc);
	}
}

Lines 7-16 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/internal/function/FnMin.java (-3 / +7 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0	9	* Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0
		10	* Jesper Moller - bug 280555 - Add pluggable collation support
10	*******************************************************************************/	11	*******************************************************************************/
11		12
12	package org.eclipse.wst.xml.xpath2.processor.internal.function;	13	package org.eclipse.wst.xml.xpath2.processor.internal.function;
13		14
		15	import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
14	import org.eclipse.wst.xml.xpath2.processor.DynamicError;	16	import org.eclipse.wst.xml.xpath2.processor.DynamicError;
15	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;	17	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
16	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;	18	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
Lines 44-50 Link Here
44	*/	46	*/
45	@Override	47	@Override
46	public ResultSequence evaluate(Collection args) throws DynamicError {	48	public ResultSequence evaluate(Collection args) throws DynamicError {
47	return min(args);	49	return min(args, dynamic_context());
48	}	50	}
49		51
50	/**	52	/**
Lines 52-62 Link Here
52	*	54	*
53	* @param args	55	* @param args
54	* Result from the expressions evaluation.	56	* Result from the expressions evaluation.
		57	* @param dynamic
		58	* Dynamic context
55	* @throws DynamicError	59	* @throws DynamicError
56	* Dynamic error.	60	* Dynamic error.
57	* @return Result of fn:min operation.	61	* @return Result of fn:min operation.
58	*/	62	*/
59	public static ResultSequence min(Collection args) throws DynamicError {	63	public static ResultSequence min(Collection args, DynamicContext dynamic) throws DynamicError {
60		64
61	// XXX fix this	65	// XXX fix this
62	ResultSequence arg = FnMax.get_arg(args, CmpLt.class);	66	ResultSequence arg = FnMax.get_arg(args, CmpLt.class);
Lines 76-82 Link Here
76	if (min == null)	80	if (min == null)
77	min = item;	81	min = item;
78	else {	82	else {
79	boolean res = item.lt((AnyType) min);	83	boolean res = item.lt((AnyType) min, dynamic);
80		84
81	if (res)	85	if (res)
82	min = item;	86	min = item;

Lines 8-17 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/internal/function/FsLt.java (-5 / +11 lines)
8	* Contributors:	8	* Contributors:
9	* Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0	9	* Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0
10	* Jesper Steen Moeller - bug 285145 - implement full arity checking	10	* Jesper Steen Moeller - bug 285145 - implement full arity checking
		11	* Jesper Moller - bug 280555 - Add pluggable collation support
11	*******************************************************************************/	12	*******************************************************************************/
12		13
13	package org.eclipse.wst.xml.xpath2.processor.internal.function;	14	package org.eclipse.wst.xml.xpath2.processor.internal.function;
14		15
		16	import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
15	import org.eclipse.wst.xml.xpath2.processor.DynamicError;	17	import org.eclipse.wst.xml.xpath2.processor.DynamicError;
16	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;	18	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
17	import org.eclipse.wst.xml.xpath2.processor.internal.*;	19	import org.eclipse.wst.xml.xpath2.processor.internal.*;
Lines 43-49 Link Here
43	public ResultSequence evaluate(Collection args) throws DynamicError {	45	public ResultSequence evaluate(Collection args) throws DynamicError {
44	assert args.size() >= min_arity() && args.size() <= max_arity();	46	assert args.size() >= min_arity() && args.size() <= max_arity();
45		47
46	return fs_lt_value(args);	48	return fs_lt_value(args, dynamic_context());
47	}	49	}
48		50
49	/**	51	/**
Lines 51-63 Link Here
51	*	53	*
52	* @param args	54	* @param args
53	* input arguments.	55	* input arguments.
		56	* @param context
		57	* Dynamic context
54	* @throws DynamicError	58	* @throws DynamicError
55	* Dynamic error.	59	* Dynamic error.
56	* @return Result of the operation.	60	* @return Result of the operation.
57	*/	61	*/
58	public static ResultSequence fs_lt_value(Collection args)	62	public static ResultSequence fs_lt_value(Collection args, DynamicContext context)
59	throws DynamicError {	63	throws DynamicError {
60	return FsEq.do_cmp_value_op(args, CmpLt.class, "lt");	64	return FsEq.do_cmp_value_op(args, CmpLt.class, "lt", context);
61	}	65	}
62		66
63	/**	67	/**
Lines 65-76 Link Here
65	*	69	*
66	* @param args	70	* @param args
67	* input arguments.	71	* input arguments.
		72	* @param dc
		73	* The dynamic context
68	* @throws DynamicError	74	* @throws DynamicError
69	* Dynamic error.	75	* Dynamic error.
70	* @return Result of the operation.	76	* @return Result of the operation.
71	*/	77	*/
72	public static ResultSequence fs_lt_general(Collection args)	78	public static ResultSequence fs_lt_general(Collection args, DynamicContext dc)
73	throws DynamicError {	79	throws DynamicError {
74	return FsEq.do_cmp_general_op(args, FsLt.class, "fs_lt_value");	80	return FsEq.do_cmp_general_op(args, FsLt.class, "fs_lt_value", dc);
75	}	81	}
76	}	82	}

Lines 7-16 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/internal/function/FnDeepEqual.java (-11 / +18 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0	9	* Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0
		10	* Jesper Moller - bug 280555 - Add pluggable collation support
10	*******************************************************************************/	11	*******************************************************************************/
11		12
12	package org.eclipse.wst.xml.xpath2.processor.internal.function;	13	package org.eclipse.wst.xml.xpath2.processor.internal.function;
13		14
		15	import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
14	import org.eclipse.wst.xml.xpath2.processor.DynamicError;	16	import org.eclipse.wst.xml.xpath2.processor.DynamicError;
15	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;	17	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
16	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;	18	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
Lines 49-55 Link Here
49	*/	51	*/
50	@Override	52	@Override
51	public ResultSequence evaluate(Collection args) throws DynamicError {	53	public ResultSequence evaluate(Collection args) throws DynamicError {
52	return deep_equal(args);	54	return deep_equal(args, dynamic_context());
53	}	55	}
54		56
55	/**	57	/**
Lines 57-67 Link Here
57	*	59	*
58	* @param args	60	* @param args
59	* Result from the expressions evaluation.	61	* Result from the expressions evaluation.
		62	* @param context
		63	* Dynamic context
60	* @throws DynamicError	64	* @throws DynamicError
61	* Dynamic error.	65	* Dynamic error.
62	* @return Result of fn:deep-equal operation.	66	* @return Result of fn:deep-equal operation.
63	*/	67	*/
64	public static ResultSequence deep_equal(Collection args)	68	public static ResultSequence deep_equal(Collection args, DynamicContext context)
65	throws DynamicError {	69	throws DynamicError {
66		70
67	assert args.size() == 2;	71	assert args.size() == 2;
Lines 71-77 Link Here
71	ResultSequence arg1 = (ResultSequence) citer.next();	75	ResultSequence arg1 = (ResultSequence) citer.next();
72	ResultSequence arg2 = (ResultSequence) citer.next();	76	ResultSequence arg2 = (ResultSequence) citer.next();
73		77
74	boolean result = deep_equal(arg1, arg2);	78	boolean result = deep_equal(arg1, arg2, context);
75		79
76	return ResultSequenceFactory.create_new(new XSBoolean(result));	80	return ResultSequenceFactory.create_new(new XSBoolean(result));
77	}	81	}
Lines 83-91 Link Here
83	* input1 xpath expression/variable.	87	* input1 xpath expression/variable.
84	* @param two	88	* @param two
85	* input2 xpath expression/variable.	89	* input2 xpath expression/variable.
		90	* @param context
		91	* Current dynamic context
86	* @return Result of fn:deep-equal operation.	92	* @return Result of fn:deep-equal operation.
87	*/	93	*/
88	public static boolean deep_equal(ResultSequence one, ResultSequence two) {	94	public static boolean deep_equal(ResultSequence one, ResultSequence two, DynamicContext context) {
89	if (one.empty() && two.empty())	95	if (one.empty() && two.empty())
90	return true;	96	return true;
91		97
Lines 99-105 Link Here
99	AnyType a = (AnyType) onei.next();	105	AnyType a = (AnyType) onei.next();
100	AnyType b = (AnyType) twoi.next();	106	AnyType b = (AnyType) twoi.next();
101		107
102	if (!deep_equal(a, b))	108	if (!deep_equal(a, b, context))
103	return false;	109	return false;
104	}	110	}
105	return true;	111	return true;
Lines 112-128 Link Here
112	* input1 xpath expression/variable.	118	* input1 xpath expression/variable.
113	* @param two	119	* @param two
114	* input2 xpath expression/variable.	120	* input2 xpath expression/variable.
		121	* @param context
115	* @return Result of fn:deep-equal operation.	122	* @return Result of fn:deep-equal operation.
116	*/	123	*/
117	public static boolean deep_equal(AnyType one, AnyType two) {	124	public static boolean deep_equal(AnyType one, AnyType two, DynamicContext context) {
118	if ((one instanceof AnyAtomicType) && (two instanceof AnyAtomicType))	125	if ((one instanceof AnyAtomicType) && (two instanceof AnyAtomicType))
119	return deep_equal((AnyAtomicType) one, (AnyAtomicType) two);	126	return deep_equal((AnyAtomicType) one, (AnyAtomicType) two, context);
120		127
121	else if (((one instanceof AnyAtomicType) && (two instanceof NodeType))	128	else if (((one instanceof AnyAtomicType) && (two instanceof NodeType))
122	\|\| ((one instanceof NodeType) && (two instanceof AnyAtomicType)))	129	\|\| ((one instanceof NodeType) && (two instanceof AnyAtomicType)))
123	return false;	130	return false;
124	else if ((one instanceof NodeType) && (two instanceof NodeType))	131	else if ((one instanceof NodeType) && (two instanceof NodeType))
125	return deep_equal((NodeType) one, (NodeType) two);	132	return deep_equal((NodeType) one, (NodeType) two, context);
126	else {	133	else {
127	assert false;	134	assert false;
128	return false;	135	return false;
Lines 138-144 Link Here
138	* input2 xpath expression/variable.	145	* input2 xpath expression/variable.
139	* @return Result of fn:deep-equal operation.	146	* @return Result of fn:deep-equal operation.
140	*/	147	*/
141	public static boolean deep_equal(AnyAtomicType one, AnyAtomicType two) {	148	public static boolean deep_equal(AnyAtomicType one, AnyAtomicType two, DynamicContext context) {
142	if (!(one instanceof CmpEq))	149	if (!(one instanceof CmpEq))
143	return false;	150	return false;
144	if (!(two instanceof CmpEq))	151	if (!(two instanceof CmpEq))
Lines 147-153 Link Here
147	CmpEq a = (CmpEq) one;	154	CmpEq a = (CmpEq) one;
148		155
149	try {	156	try {
150	if (a.eq(two))	157	if (a.eq(two, context))
151	return true;	158	return true;
152	return false;	159	return false;
153	} catch (DynamicError err) {	160	} catch (DynamicError err) {
Lines 164-170 Link Here
164	* input2 xpath expression/variable.	171	* input2 xpath expression/variable.
165	* @return Result of fn:deep-equal operation.	172	* @return Result of fn:deep-equal operation.
166	*/	173	*/
167	public static boolean deep_equal(NodeType one, NodeType two) {	174	public static boolean deep_equal(NodeType one, NodeType two, DynamicContext context) {
168	Node a = one.node_value();	175	Node a = one.node_value();
169	Node b = two.node_value();	176	Node b = two.node_value();
170		177

Lines 8-17 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/internal/function/FsLe.java (-6 / +12 lines)
8	* Contributors:	8	* Contributors:
9	* Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0	9	* Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0
10	* Jesper Steen Moeller - bug 285145 - implement full arity checking	10	* Jesper Steen Moeller - bug 285145 - implement full arity checking
		11	* Jesper Moller - bug 280555 - Add pluggable collation support
11	*******************************************************************************/	12	*******************************************************************************/
12		13
13	package org.eclipse.wst.xml.xpath2.processor.internal.function;	14	package org.eclipse.wst.xml.xpath2.processor.internal.function;
14		15
		16	import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
15	import org.eclipse.wst.xml.xpath2.processor.DynamicError;	17	import org.eclipse.wst.xml.xpath2.processor.DynamicError;
16	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;	18	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
17	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;	19	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
Lines 44-50 Link Here
44	public ResultSequence evaluate(Collection args) throws DynamicError {	46	public ResultSequence evaluate(Collection args) throws DynamicError {
45	assert args.size() >= min_arity() && args.size() <= max_arity();	47	assert args.size() >= min_arity() && args.size() <= max_arity();
46		48
47	return fs_le_value(args);	49	return fs_le_value(args, dynamic_context());
48	}	50	}
49		51
50	/**	52	/**
Lines 52-69 Link Here
52	*	54	*
53	* @param args	55	* @param args
54	* input arguments.	56	* input arguments.
		57	* @param
		58	* DynamicContext
55	* @throws DynamicError	59	* @throws DynamicError
56	* Dynamic error.	60	* Dynamic error.
57	* @return Result of the operation.	61	* @return Result of the operation.
58	*/	62	*/
59	public static ResultSequence fs_le_value(Collection args)	63	public static ResultSequence fs_le_value(Collection args, DynamicContext dc)
60	throws DynamicError {	64	throws DynamicError {
61	ResultSequence less = FsLt.fs_lt_value(args);	65	ResultSequence less = FsLt.fs_lt_value(args, dc);
62		66
63	if (((XSBoolean) less.first()).value())	67	if (((XSBoolean) less.first()).value())
64	return less;	68	return less;
65		69
66	ResultSequence equal = FsEq.fs_eq_value(args);	70	ResultSequence equal = FsEq.fs_eq_value(args, dc);
67		71
68	if (((XSBoolean) equal.first()).value())	72	if (((XSBoolean) equal.first()).value())
69	return equal;	73	return equal;
Lines 76-87 Link Here
76	*	80	*
77	* @param args	81	* @param args
78	* input arguments.	82	* input arguments.
		83	* @param dc
		84	* The dynamic context
79	* @throws DynamicError	85	* @throws DynamicError
80	* Dynamic error.	86	* Dynamic error.
81	* @return Result of the operation.	87	* @return Result of the operation.
82	*/	88	*/
83	public static ResultSequence fs_le_general(Collection args)	89	public static ResultSequence fs_le_general(Collection args, DynamicContext dc)
84	throws DynamicError {	90	throws DynamicError {
85	return FsEq.do_cmp_general_op(args, FsLe.class, "fs_le_value");	91	return FsEq.do_cmp_general_op(args, FsLe.class, "fs_le_value", dc);
86	}	92	}
87	}	93	}

Lines 8-17 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/internal/function/FsGt.java (-5 / +11 lines)
8	* Contributors:	8	* Contributors:
9	* Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0	9	* Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0
10	* Jesper Steen Moeller - bug 285145 - implement full arity checking	10	* Jesper Steen Moeller - bug 285145 - implement full arity checking
		11	* Jesper Steen Moeller - bug 280555 - Add pluggable collation support
11	*******************************************************************************/	12	*******************************************************************************/
12		13
13	package org.eclipse.wst.xml.xpath2.processor.internal.function;	14	package org.eclipse.wst.xml.xpath2.processor.internal.function;
14		15
		16	import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
15	import org.eclipse.wst.xml.xpath2.processor.DynamicError;	17	import org.eclipse.wst.xml.xpath2.processor.DynamicError;
16	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;	18	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
17	import org.eclipse.wst.xml.xpath2.processor.internal.*;	19	import org.eclipse.wst.xml.xpath2.processor.internal.*;
Lines 43-49 Link Here
43	public ResultSequence evaluate(Collection args) throws DynamicError {	45	public ResultSequence evaluate(Collection args) throws DynamicError {
44	assert args.size() >= min_arity() && args.size() <= max_arity();	46	assert args.size() >= min_arity() && args.size() <= max_arity();
45		47
46	return fs_gt_value(args);	48	return fs_gt_value(args, dynamic_context());
47	}	49	}
48		50
49	/**	51	/**
Lines 51-63 Link Here
51	*	53	*
52	* @param args	54	* @param args
53	* input arguments.	55	* input arguments.
		56	* @param dynamic
		57	* Dynamic contexet
54	* @throws DynamicError	58	* @throws DynamicError
55	* Dynamic error.	59	* Dynamic error.
56	* @return Result of the operation.	60	* @return Result of the operation.
57	*/	61	*/
58	public static ResultSequence fs_gt_value(Collection args)	62	public static ResultSequence fs_gt_value(Collection args, DynamicContext dynamic)
59	throws DynamicError {	63	throws DynamicError {
60	return FsEq.do_cmp_value_op(args, CmpGt.class, "gt");	64	return FsEq.do_cmp_value_op(args, CmpGt.class, "gt", dynamic);
61	}	65	}
62		66
63	/**	67	/**
Lines 65-77 Link Here
65	*	69	*
66	* @param args	70	* @param args
67	* input arguments.	71	* input arguments.
		72	* @param dc
		73	* The dynamic context
68	* @throws DynamicError	74	* @throws DynamicError
69	* Dynamic error.	75	* Dynamic error.
70	* @return Result of the operation.	76	* @return Result of the operation.
71	*/	77	*/
72	public static ResultSequence fs_gt_general(Collection args)	78	public static ResultSequence fs_gt_general(Collection args, DynamicContext dc)
73	throws DynamicError {	79	throws DynamicError {
74	return FsEq.do_cmp_general_op(args, FsGt.class, "fs_gt_value");	80	return FsEq.do_cmp_general_op(args, FsGt.class, "fs_gt_value", dc);
75	}	81	}
76		82
77	}	83	}




 * Contributors:
 *     David Carver (STAR) - initial API and implementation
 *     Jesper Steen Moeller - bug 285145 - implement full arity checking
 *     Jesper Steen Moeller - bug 280555 - Add pluggable collation support
 *******************************************************************************/
package org.eclipse.wst.xml.xpath2.processor.internal.function;


import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
import org.eclipse.wst.xml.xpath2.processor.internal.types.QName;
import org.eclipse.wst.xml.xpath2.processor.internal.types.XSBoolean;
import org.eclipse.wst.xml.xpath2.processor.internal.types.XSString;

/**

 */
public class FnDefaultCollation extends Function {

	private static final String DEFAULT_COLLATION = "http://www.w3.org/2005/xpath-functions/collation/codepoint";

	public FnDefaultCollation() {
		super(new QName("default-collation"), 0);
	}

	public ResultSequence evaluate(Collection args) throws DynamicError {
		assert args.size() >= min_arity() && args.size() <= max_arity();
		ResultSequence rs = ResultSequenceFactory.create_new();
		rs.add(new XSString(dynamic_context().default_collation_name()));
		return rs;
	}





/*******************************************************************************
 * Copyright (c) 2009 Jesper Moller, and others
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Jesper Moller - initial API and implementation
 *******************************************************************************/

package org.eclipse.wst.xml.xpath2.processor;

import java.util.Comparator;

/**
 * Service provider interface for looking up collations from within the dynamic context.
 */
public interface CollationProvider {
	/**
	 * Gets the named collator. W3C does not define collation names (yet?) so we are constrained to using an
	 * implementation-defined naming scheme.
	 * 
	 * @param name A URI designating the collation to use
	 * @return The collation to use, or null if no such collation exists by this provider
	 */
	Comparator get_collation(String name);
}

Return to bug 280555

Lines 11-16 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/DefaultEvaluator.java (-13 / +14 lines)
11	* Jesper Steen Moeller - bug 285145 - check arguments to op:to	11	* Jesper Steen Moeller - bug 285145 - check arguments to op:to
12	* Jesper Steen Moeller - bug 262765 - fixed node state iteration	12	* Jesper Steen Moeller - bug 262765 - fixed node state iteration
13	* Jesper Steen Moller - bug 275610 - Avoid big time and memory overhead for externals	13	* Jesper Steen Moller - bug 275610 - Avoid big time and memory overhead for externals
		14	* Jesper Steen Moller - bug 280555 - Add pluggable collation support
14	*******************************************************************************/	15	*******************************************************************************/
15		16
16	package org.eclipse.wst.xml.xpath2.processor;	17	package org.eclipse.wst.xml.xpath2.processor;
Lines 465-504 Link Here
465		466
466	switch (cmpex.type()) {	467	switch (cmpex.type()) {
467	case CmpExpr.EQ:	468	case CmpExpr.EQ:
468	return FsEq.fs_eq_value(args);	469	return FsEq.fs_eq_value(args, _dc);
469		470
470	case CmpExpr.NE:	471	case CmpExpr.NE:
471	return FsNe.fs_ne_value(args);	472	return FsNe.fs_ne_value(args, _dc);
472		473
473	case CmpExpr.GT:	474	case CmpExpr.GT:
474	return FsGt.fs_gt_value(args);	475	return FsGt.fs_gt_value(args, _dc);
475		476
476	case CmpExpr.LT:	477	case CmpExpr.LT:
477	return FsLt.fs_lt_value(args);	478	return FsLt.fs_lt_value(args, _dc);
478		479
479	case CmpExpr.GE:	480	case CmpExpr.GE:
480	return FsGe.fs_ge_value(args);	481	return FsGe.fs_ge_value(args, _dc);
481		482
482	case CmpExpr.LE:	483	case CmpExpr.LE:
483	return FsLe.fs_le_value(args);	484	return FsLe.fs_le_value(args, _dc);
484		485
485	case CmpExpr.EQUALS:	486	case CmpExpr.EQUALS:
486	return FsEq.fs_eq_general(args);	487	return FsEq.fs_eq_general(args, _dc);
487		488
488	case CmpExpr.NOTEQUALS:	489	case CmpExpr.NOTEQUALS:
489	return FsNe.fs_ne_general(args);	490	return FsNe.fs_ne_general(args, _dc);
490		491
491	case CmpExpr.GREATER:	492	case CmpExpr.GREATER:
492	return FsGt.fs_gt_general(args);	493	return FsGt.fs_gt_general(args, _dc);
493		494
494	case CmpExpr.LESSTHAN:	495	case CmpExpr.LESSTHAN:
495	return FsLt.fs_lt_general(args);	496	return FsLt.fs_lt_general(args, _dc);
496		497
497	case CmpExpr.GREATEREQUAL:	498	case CmpExpr.GREATEREQUAL:
498	return FsGe.fs_ge_general(args);	499	return FsGe.fs_ge_general(args, _dc);
499		500
500	case CmpExpr.LESSEQUAL:	501	case CmpExpr.LESSEQUAL:
501	return FsLe.fs_le_general(args);	502	return FsLe.fs_le_general(args, _dc);
502		503
503	case CmpExpr.IS:	504	case CmpExpr.IS:
504	case CmpExpr.LESS_LESS:	505	case CmpExpr.LESS_LESS:
Lines 1775-1781 Link Here
1775	if (at instanceof NumericType) {	1776	if (at instanceof NumericType) {
1776	try {	1777	try {
1777	_g_xsint.set_int(BigInteger.valueOf(_dc.context_position()));	1778	_g_xsint.set_int(BigInteger.valueOf(_dc.context_position()));
1778	return FsEq.fs_eq_fast(at, _g_xsint);	1779	return FsEq.fs_eq_fast(at, _g_xsint, _dc);
1779	} catch (DynamicError err) {	1780	} catch (DynamicError err) {
1780	report_error(err);	1781	report_error(err);
1781		1782

Lines 14-19 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/internal/types/XSDuration.java (-3 / +4 lines)
14		14
15	import java.math.BigInteger;	15	import java.math.BigInteger;
16		16
		17	import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
17	import org.eclipse.wst.xml.xpath2.processor.DynamicError;	18	import org.eclipse.wst.xml.xpath2.processor.DynamicError;
18	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;	19	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
19	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;	20	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
Lines 229-235 Link Here
229	* @return True if they both represent the duration of time. False otherwise	230	* @return True if they both represent the duration of time. False otherwise
230	* @throws DynamicError	231	* @throws DynamicError
231	*/	232	*/
232	public boolean eq(AnyType arg) throws DynamicError {	233	public boolean eq(AnyType arg, DynamicContext context) throws DynamicError {
233	XSDuration val = (XSDuration) NumericType.get_single_type(arg,	234	XSDuration val = (XSDuration) NumericType.get_single_type(arg,
234	XSDuration.class);	235	XSDuration.class);
235		236
Lines 245-251 Link Here
245	* stored. False otherwise	246	* stored. False otherwise
246	* @throws DynamicError	247	* @throws DynamicError
247	*/	248	*/
248	public boolean lt(AnyType arg) throws DynamicError {	249	public boolean lt(AnyType arg, DynamicContext context) throws DynamicError {
249	XSDuration val = (XSDuration) NumericType.get_single_type(arg,	250	XSDuration val = (XSDuration) NumericType.get_single_type(arg,
250	XSDayTimeDuration.class);	251	XSDayTimeDuration.class);
251		252
Lines 261-267 Link Here
261	* stored. False otherwise	262	* stored. False otherwise
262	* @throws DynamicError	263	* @throws DynamicError
263	*/	264	*/
264	public boolean gt(AnyType arg) throws DynamicError {	265	public boolean gt(AnyType arg, DynamicContext context) throws DynamicError {
265	XSDuration val = (XSDuration) NumericType.get_single_type(arg,	266	XSDuration val = (XSDuration) NumericType.get_single_type(arg,
266	XSDayTimeDuration.class);	267	XSDayTimeDuration.class);
267		268

Lines 22-27 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/internal/types/XSFloat.java (-4 / +5 lines)
22	import java.text.DecimalFormat;	22	import java.text.DecimalFormat;
23	import java.util.Iterator;	23	import java.util.Iterator;
24		24
		25	import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
25	import org.eclipse.wst.xml.xpath2.processor.DynamicError;	26	import org.eclipse.wst.xml.xpath2.processor.DynamicError;
26	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;	27	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
27	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;	28	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
Lines 194-207 Link Here
194		195
195	/**	196	/**
196	* Equality comparison between this number and the supplied representation.	197	* Equality comparison between this number and the supplied representation.
197	*
198	* @param aa	198	* @param aa
199	* The datatype to compare with	199	* The datatype to compare with
		200	*
200	* @return True if the two representations are of the same number. False	201	* @return True if the two representations are of the same number. False
201	* otherwise	202	* otherwise
202	* @throws DynamicError	203	* @throws DynamicError
203	*/	204	*/
204	public boolean eq(AnyType aa) throws DynamicError {	205	public boolean eq(AnyType aa, DynamicContext context) throws DynamicError {
205	AnyType carg = convertArg(aa);	206	AnyType carg = convertArg(aa);
206	if (!(carg instanceof XSFloat))	207	if (!(carg instanceof XSFloat))
207	DynamicError.throw_type_error();	208	DynamicError.throw_type_error();
Lines 220-226 Link Here
220	* one stored. False otherwise	221	* one stored. False otherwise
221	* @throws DynamicError	222	* @throws DynamicError
222	*/	223	*/
223	public boolean gt(AnyType arg) throws DynamicError {	224	public boolean gt(AnyType arg, DynamicContext context) throws DynamicError {
224	AnyType carg = convertArg(arg);	225	AnyType carg = convertArg(arg);
225	XSFloat val = (XSFloat) get_single_type(carg, XSFloat.class);	226	XSFloat val = (XSFloat) get_single_type(carg, XSFloat.class);
226	return float_value() > val.float_value();	227	return float_value() > val.float_value();
Lines 235-241 Link Here
235	* one stored. False otherwise	236	* one stored. False otherwise
236	* @throws DynamicError	237	* @throws DynamicError
237	*/	238	*/
238	public boolean lt(AnyType arg) throws DynamicError {	239	public boolean lt(AnyType arg, DynamicContext context) throws DynamicError {
239	AnyType carg = convertArg(arg);	240	AnyType carg = convertArg(arg);
240	XSFloat val = (XSFloat) get_single_type(carg, XSFloat.class);	241	XSFloat val = (XSFloat) get_single_type(carg, XSFloat.class);
241	return float_value() < val.float_value();	242	return float_value() < val.float_value();

Lines 22-27 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/internal/types/XSDouble.java (-4 / +5 lines)
22	import java.math.RoundingMode;	22	import java.math.RoundingMode;
23	import java.util.Iterator;	23	import java.util.Iterator;
24		24
		25	import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
25	import org.eclipse.wst.xml.xpath2.processor.DynamicError;	26	import org.eclipse.wst.xml.xpath2.processor.DynamicError;
26	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;	27	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
27	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;	28	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
Lines 241-255 Link Here
241		242
242	/**	243	/**
243	* Equality comparison between this number and the supplied representation.	244	* Equality comparison between this number and the supplied representation.
244	*
245	* @param aa	245	* @param aa
246	* Representation to be compared with (must currently be of type	246	* Representation to be compared with (must currently be of type
247	* XSDouble)	247	* XSDouble)
		248	*
248	* @return True if the 2 representations represent the same number. False	249	* @return True if the 2 representations represent the same number. False
249	* otherwise	250	* otherwise
250	* @since 1.1	251	* @since 1.1
251	*/	252	*/
252	public boolean eq(AnyType aa) throws DynamicError {	253	public boolean eq(AnyType aa, DynamicContext context) throws DynamicError {
253	ResultSequence rs = ResultSequenceFactory.create_new(aa);	254	ResultSequence rs = ResultSequenceFactory.create_new(aa);
254	ResultSequence crs = constructor(rs);	255	ResultSequence crs = constructor(rs);
255		256
Lines 272-278 Link Here
272	* @return True if the supplied type represents a number smaller than this	273	* @return True if the supplied type represents a number smaller than this
273	* one stored. False otherwise	274	* one stored. False otherwise
274	*/	275	*/
275	public boolean gt(AnyType arg) throws DynamicError {	276	public boolean gt(AnyType arg, DynamicContext context) throws DynamicError {
276	AnyType carg = convertArg(arg);	277	AnyType carg = convertArg(arg);
277		278
278	XSDouble val = (XSDouble) get_single_type(carg, XSDouble.class);	279	XSDouble val = (XSDouble) get_single_type(carg, XSDouble.class);
Lines 297-303 Link Here
297	* @return True if the supplied type represents a number greater than this	298	* @return True if the supplied type represents a number greater than this
298	* one stored. False otherwise	299	* one stored. False otherwise
299	*/	300	*/
300	public boolean lt(AnyType arg) throws DynamicError {	301	public boolean lt(AnyType arg, DynamicContext context) throws DynamicError {
301	AnyType carg = convertArg(arg);	302	AnyType carg = convertArg(arg);
302		303
303	XSDouble val = (XSDouble) get_single_type(carg, XSDouble.class);	304	XSDouble val = (XSDouble) get_single_type(carg, XSDouble.class);

Lines 19-24 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/internal/types/XSAnyURI.java (-3 / +4 lines)
19	import java.util.ArrayList;	19	import java.util.ArrayList;
20	import java.util.Collection;	20	import java.util.Collection;
21		21
		22	import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
22	import org.eclipse.wst.xml.xpath2.processor.DynamicError;	23	import org.eclipse.wst.xml.xpath2.processor.DynamicError;
23	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;	24	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
24	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;	25	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
Lines 122-128 Link Here
122	* otherwise	123	* otherwise
123	* @throws DynamicError	124	* @throws DynamicError
124	*/	125	*/
125	public boolean eq(AnyType arg) throws DynamicError {	126	public boolean eq(AnyType arg, DynamicContext context) throws DynamicError {
126	if (arg instanceof XSAnyURI \|\| arg instanceof XSString) {	127	if (arg instanceof XSAnyURI \|\| arg instanceof XSString) {
127	if (this.string_value().equals(arg.string_value())) {	128	if (this.string_value().equals(arg.string_value())) {
128	return true;	129	return true;
Lines 139-145 Link Here
139	* must be of type xs:anyURI (or, by promotion of this, xs:string)	140	* must be of type xs:anyURI (or, by promotion of this, xs:string)
140	* @since 1.1	141	* @since 1.1
141	*/	142	*/
142	public boolean gt(AnyType arg) throws DynamicError {	143	public boolean gt(AnyType arg, DynamicContext context) throws DynamicError {
143	if (!(arg instanceof XSAnyURI \|\| arg instanceof XSString)) {	144	if (!(arg instanceof XSAnyURI \|\| arg instanceof XSString)) {
144	throw DynamicError.throw_type_error();	145	throw DynamicError.throw_type_error();
145	}	146	}
Lines 159-165 Link Here
159	*	160	*
160	* @since 1.1	161	* @since 1.1
161	*/	162	*/
162	public boolean lt(AnyType arg) throws DynamicError {	163	public boolean lt(AnyType arg, DynamicContext context) throws DynamicError {
163	if (!(arg instanceof XSAnyURI \|\| arg instanceof XSString)) {	164	if (!(arg instanceof XSAnyURI \|\| arg instanceof XSString)) {
164	throw DynamicError.throw_type_error();	165	throw DynamicError.throw_type_error();
165	}	166	}

Lines 17-22 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/internal/types/XSYearMonthDuration.java (-4 / +5 lines)
17		17
18	import java.math.BigDecimal;	18	import java.math.BigDecimal;
19		19
		20	import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
20	import org.eclipse.wst.xml.xpath2.processor.DynamicError;	21	import org.eclipse.wst.xml.xpath2.processor.DynamicError;
21	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;	22	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
22	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;	23	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
Lines 277-283 Link Here
277	* @return True if they both represent the duration of time. False otherwise	278	* @return True if they both represent the duration of time. False otherwise
278	* @throws DynamicError	279	* @throws DynamicError
279	*/	280	*/
280	public boolean eq(AnyType arg) throws DynamicError {	281	public boolean eq(AnyType arg, DynamicContext context) throws DynamicError {
281	if (arg instanceof XSDayTimeDuration) {	282	if (arg instanceof XSDayTimeDuration) {
282	XSDayTimeDuration dayTimeDuration = (XSDayTimeDuration)arg;	283	XSDayTimeDuration dayTimeDuration = (XSDayTimeDuration)arg;
283	return (monthValue() == 0 && dayTimeDuration.value() == 0.0);	284	return (monthValue() == 0 && dayTimeDuration.value() == 0.0);
Lines 287-293 Link Here
287	}	288	}
288	XSDuration val = (XSDuration) NumericType	289	XSDuration val = (XSDuration) NumericType
289	.get_single_type(arg, XSDuration.class);	290	.get_single_type(arg, XSDuration.class);
290	return super.eq(val);	291	return super.eq(val, context);
291	}	292	}
292		293
293	/**	294	/**
Lines 299-305 Link Here
299	* stored. False otherwise	300	* stored. False otherwise
300	* @throws DynamicError	301	* @throws DynamicError
301	*/	302	*/
302	public boolean lt(AnyType arg) throws DynamicError {	303	public boolean lt(AnyType arg, DynamicContext context) throws DynamicError {
303	XSYearMonthDuration val = (XSYearMonthDuration) NumericType	304	XSYearMonthDuration val = (XSYearMonthDuration) NumericType
304	.get_single_type(arg, XSYearMonthDuration.class);	305	.get_single_type(arg, XSYearMonthDuration.class);
305		306
Lines 315-321 Link Here
315	* stored. False otherwise	316	* stored. False otherwise
316	* @throws DynamicError	317	* @throws DynamicError
317	*/	318	*/
318	public boolean gt(AnyType arg) throws DynamicError {	319	public boolean gt(AnyType arg, DynamicContext context) throws DynamicError {
319	XSYearMonthDuration val = (XSYearMonthDuration) NumericType	320	XSYearMonthDuration val = (XSYearMonthDuration) NumericType
320	.get_single_type(arg, XSYearMonthDuration.class);	321	.get_single_type(arg, XSYearMonthDuration.class);
321		322

Lines 12-17 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/DynamicError.java (-1 / +20 lines)
12	* Jesper Steen Moeller - bug 28149 - add more fn:error info	12	* Jesper Steen Moeller - bug 28149 - add more fn:error info
13	* Jesper Steen Moller - bug 281159 - fix document loading and resolving URIs	13	* Jesper Steen Moller - bug 281159 - fix document loading and resolving URIs
14	* Jesper Steen Moller - Bug 286062 - Add FOAR0002	14	* Jesper Steen Moller - Bug 286062 - Add FOAR0002
		15	* Jesper Steen Moller - bug 280555 - Add pluggable collation support
15	*******************************************************************************/	16	*******************************************************************************/
16		17
17	package org.eclipse.wst.xml.xpath2.processor;	18	package org.eclipse.wst.xml.xpath2.processor;
Lines 199-205 Link Here
199		200
200	return new DynamicError("FOCH0001", error);	201	return new DynamicError("FOCH0001", error);
201	}	202	}
202		203
		204	/**
		205	* Returns the dynamic error for an unsupported normalization form
		206	*
		207	* @param collationName
		208	* is the error
		209	* @return the DynamicError.
		210	* @since 1.1
		211	*
		212	*/
		213	public static DynamicError unsupported_collation(String collationName) {
		214	String error = "Unsupported collation URI. ";
		215
		216	if (collationName != null)
		217	error += " " + collationName;
		218
		219	return new DynamicError("FOCH0002", error);
		220	}
		221
203	/**	222	/**
204	* Returns the dynamic error for an unsupported normalization form	223	* Returns the dynamic error for an unsupported normalization form
205	*	224	*

Lines 12-21 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/internal/function/FsEq.java (-19 / +27 lines)
12	* David Carver - bug 262765 - fixed comparison on sequence range values.	12	* David Carver - bug 262765 - fixed comparison on sequence range values.
13	* Jesper S Moller - bug 283214 - fix eq for untyped atomic values	13	* Jesper S Moller - bug 283214 - fix eq for untyped atomic values
14	* Jesper Steen Moeller - bug 285145 - implement full arity checking	14	* Jesper Steen Moeller - bug 285145 - implement full arity checking
		15	* Jesper Steen Moeller - bug 280555 - Add pluggable collation support
15	*******************************************************************************/	16	*******************************************************************************/
16		17
17	package org.eclipse.wst.xml.xpath2.processor.internal.function;	18	package org.eclipse.wst.xml.xpath2.processor.internal.function;
18		19
		20	import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
19	import org.eclipse.wst.xml.xpath2.processor.DynamicError;	21	import org.eclipse.wst.xml.xpath2.processor.DynamicError;
20	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;	22	import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
21	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;	23	import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
Lines 49-55 Link Here
49	public ResultSequence evaluate(Collection args) throws DynamicError {	51	public ResultSequence evaluate(Collection args) throws DynamicError {
50	assert args.size() >= min_arity() && args.size() <= max_arity();	52	assert args.size() >= min_arity() && args.size() <= max_arity();
51		53
52	return fs_eq_value(args);	54	return fs_eq_value(args, dynamic_context());
53	}	55	}
54		56
55	/**	57	/**
Lines 100-108 Link Here
100	* Dynamic error.	102	* Dynamic error.
101	* @return Result of conversion.	103	* @return Result of conversion.
102	*/	104	*/
103	public static ResultSequence fs_eq_value(Collection args)	105	public static ResultSequence fs_eq_value(Collection args, DynamicContext dynamicContext)
104	throws DynamicError {	106	throws DynamicError {
105	return do_cmp_value_op(args, CmpEq.class, "eq");	107	return do_cmp_value_op(args, CmpEq.class, "eq", dynamicContext);
106	}	108	}
107		109
108	/**	110	/**
Lines 116-122 Link Here
116	* Dynamic error.	118	* Dynamic error.
117	* @return Result of Equality operation.	119	* @return Result of Equality operation.
118	*/	120	*/
119	public static boolean fs_eq_fast(AnyType one, AnyType two)	121	public static boolean fs_eq_fast(AnyType one, AnyType two, DynamicContext dynamicContext)
120	throws DynamicError {	122	throws DynamicError {
121		123
122	one = FnData.atomize(one);	124	one = FnData.atomize(one);
Lines 133-139 Link Here
133		135
134	CmpEq cmpone = (CmpEq) one;	136	CmpEq cmpone = (CmpEq) one;
135		137
136	return cmpone.eq(two);	138	return cmpone.eq(two, dynamicContext);
137	}	139	}
138		140
139	/**	141	/**
Lines 143-154 Link Here
143	* input1 of any type.	145	* input1 of any type.
144	* @param b	146	* @param b
145	* input2 of any type.	147	* input2 of any type.
		148	* @param dc
		149	* Dynamic Context
146	* @throws DynamicError	150	* @throws DynamicError
147	* Dynamic error.	151	* Dynamic error.
148	* @return Result of Equality operation.	152	* @return Result of Equality operation.
149	*/	153	*/
150	private static boolean do_general_pair(AnyType a, AnyType b,	154	private static boolean do_general_pair(AnyType a, AnyType b,
151	Method comparator) throws DynamicError {	155	Method comparator, DynamicContext dc) throws DynamicError {
152		156
153	// section 3.5.2	157	// section 3.5.2
154		158
Lines 201-207 Link Here
201	args.add(one);	205	args.add(one);
202	args.add(two);	206	args.add(two);
203		207
204	Object margs[] = { args };	208	Object margs[] = { args, dc };
205		209
206	ResultSequence result = null;	210	ResultSequence result = null;
207	try {	211	try {
Lines 229-241 Link Here
229	*	233	*
230	* @param args	234	* @param args
231	* input arguments.	235	* input arguments.
		236	* @param dc
		237	* Dynamic context
232	* @throws DynamicError	238	* @throws DynamicError
233	* Dynamic error.	239	* Dynamic error.
234	* @return Result of general equality operation.	240	* @return Result of general equality operation.
235	*/	241	*/
236	public static ResultSequence fs_eq_general(Collection args)	242	public static ResultSequence fs_eq_general(Collection args, DynamicContext dc)
237	throws DynamicError {	243	throws DynamicError {
238	return do_cmp_general_op(args, FsEq.class, "fs_eq_value");	244	return do_cmp_general_op(args, FsEq.class, "fs_eq_value", dc);
239	}	245	}
240		246
241	// voodoo 3	247	// voodoo 3
Lines 253-270 Link Here
253	* @return Result of the operation.	259	* @return Result of the operation.
254	*/	260	*/
255	public static ResultSequence do_cmp_general_op(Collection args, Class type,	261	public static ResultSequence do_cmp_general_op(Collection args, Class type,
256	String mname) throws DynamicError {	262	String mname, DynamicContext dc) throws DynamicError {
257		263
258	// do the voodoo	264	// do the voodoo
259	Method comparator = null;	265	Method comparator = null;
260		266
261	try {	267	try {
262	Class margsdef[] = { Collection.class };	268	Class margsdef[] = { Collection.class, DynamicContext.class };
263		269
264	comparator = type.getMethod(mname, margsdef);	270	comparator = type.getMethod(mname, margsdef);
265		271
266	} catch (NoSuchMethodException err) {	272	} catch (NoSuchMethodException err) {
267	assert false;	273	throw new RuntimeException("Can¿'t find method : " + mname, err);
268	}	274	}
269		275
270	// sanity check args and get them	276	// sanity check args and get them
Lines 290-296 Link Here
290	for (Iterator j = two.iterator(); j.hasNext();) {	296	for (Iterator j = two.iterator(); j.hasNext();) {
291	AnyType b = (AnyType) j.next();	297	AnyType b = (AnyType) j.next();
292		298
293	if (do_general_pair(a, b, comparator))	299	if (do_general_pair(a, b, comparator, dc))
294	return ResultSequenceFactory	300	return ResultSequenceFactory
295	.create_new(new XSBoolean(true));	301	.create_new(new XSBoolean(true));
296	}	302	}
Lines 309-320 Link Here
309	* type of the arguments.	315	* type of the arguments.
310	* @param mname	316	* @param mname
311	* Method name for template simulation.	317	* Method name for template simulation.
		318	* @param dynamicContext
		319	* Dynamic error.
312	* @throws DynamicError	320	* @throws DynamicError
313	* Dynamic error.	321	* Dynamic error.
314	* @return Result of the operation.	322	* @return Result of the operation.
315	*/	323	*/
316	public static ResultSequence do_cmp_value_op(Collection args, Class type,	324	public static ResultSequence do_cmp_value_op(Collection args, Class type,
317	String mname) throws DynamicError {	325	String mname, DynamicContext dynamicContext) throws DynamicError {
318		326
319	// sanity check args + convert em	327	// sanity check args + convert em
320	if (args.size() != 2)	328	if (args.size() != 2)
Lines 339-367 Link Here
339	DynamicError.throw_type_error();	347	DynamicError.throw_type_error();
340		348
341	try {	349	try {
342	Class margsdef[] = { AnyType.class };	350	Class margsdef[] = { AnyType.class, DynamicContext.class };
343	Method method = null;	351	Method method = null;
344		352
345	method = type.getMethod(mname, margsdef);	353	method = type.getMethod(mname, margsdef);
346		354
347	Object margs[] = { arg2.first() };	355	Object margs[] = { arg2.first(), dynamicContext };
348	Boolean cmpres = (Boolean) method.invoke(arg, margs);	356	Boolean cmpres = (Boolean) method.invoke(arg, margs);
349		357
350	return ResultSequenceFactory.create_new(new XSBoolean(cmpres	358	return ResultSequenceFactory.create_new(new XSBoolean(cmpres
351	.booleanValue()));	359	.booleanValue()));
352	} catch (NoSuchMethodException err) {	360	} catch (NoSuchMethodException err) {
353	assert false;	361	assert false;
		362	throw new RuntimeException("cannot compare using method " + mname, err);
354	} catch (IllegalAccessException err) {	363	} catch (IllegalAccessException err) {
355	assert false;	364	assert false;
		365	throw new RuntimeException("cannot compare using method " + mname, err);
356	} catch (InvocationTargetException err) {	366	} catch (InvocationTargetException err) {
357	Throwable ex = err.getTargetException();	367	Throwable ex = err.getTargetException();
358		368
359	if (ex instanceof DynamicError)	369	if (ex instanceof DynamicError)
360	throw (DynamicError) ex;	370	throw (DynamicError) ex;
361		371
362	ex.printStackTrace();	372	throw new RuntimeException("cannot compare using method " + mname, ex);
363	System.exit(1);
364	}	373	}
365	return null; // unreach!
366	}	374	}
367	}	375	}

Added Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/CollationProvider.java (+28 lines)
1	/*******************************************************************************
2	* Copyright (c) 2009 Jesper Moller, and others
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Jesper Moller - initial API and implementation
10	*******************************************************************************/
11
12	package org.eclipse.wst.xml.xpath2.processor;
13
14	import java.util.Comparator;
15
16	/**
17	* Service provider interface for looking up collations from within the dynamic context.
18	*/
19	public interface CollationProvider {
20	/**
21	* Gets the named collator. W3C does not define collation names (yet?) so we are constrained to using an
22	* implementation-defined naming scheme.
23	*
24	* @param name A URI designating the collation to use
25	* @return The collation to use, or null if no such collation exists by this provider
26	*/
27	Comparator get_collation(String name);
28	}