mkwan 2003/01/24 11:30:43
Modified: java/src/org/apache/xalan/xsltc/compiler FunctionCall.java
Log:
For Bugzilla 16386. Add rules for object type matching.
Revision Changes Path
1.27 +12 -1
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FunctionCall.java
Index: FunctionCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FunctionCall.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- FunctionCall.java 25 Oct 2002 21:26:04 -0000 1.26
+++ FunctionCall.java 24 Jan 2003 19:30:42 -0000 1.27
@@ -482,6 +482,17 @@
if (match != null) {
currConstrDistance += ((JavaType)match).distance;
}
+ else if (intType instanceof ObjectType) {
+ ObjectType objectType = (ObjectType)intType;
+ if (objectType.getJavaClass() == extType)
+ continue;
+ else if
(extType.isAssignableFrom(objectType.getJavaClass()))
+ currConstrDistance += 1;
+ else {
+ currConstrDistance = Integer.MAX_VALUE;
+ break;
+ }
+ }
else {
// no mapping available
currConstrDistance = Integer.MAX_VALUE;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
