You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by tm...@apache.org on 2001/09/19 21:25:29 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/xsltc/compiler RelationalExpr.java
tmiller 01/09/19 12:25:29
Modified: java/src/org/apache/xalan/xsltc/compiler RelationalExpr.java
Log:
bug fix 2838, (namedtemplate test)
Revision Changes Path
1.8 +8 -2 xml-xalan/java/src/org/apache/xalan/xsltc/compiler/RelationalExpr.java
Index: RelationalExpr.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/RelationalExpr.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RelationalExpr.java 2001/08/27 09:07:19 1.7
+++ RelationalExpr.java 2001/09/19 19:25:29 1.8
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: RelationalExpr.java,v 1.7 2001/08/27 09:07:19 morten Exp $
+ * @(#)$Id: RelationalExpr.java,v 1.8 2001/09/19 19:25:29 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -106,9 +106,11 @@
//bug fix # 2838, cast to reals if both are result tree fragments
if (tleft instanceof ResultTreeType &&
- tright instanceof ResultTreeType ) {
+ tright instanceof ResultTreeType )
+ {
_right = new CastExpr(_right, Type.Real);
_left = new CastExpr(_left, Type.Real);
+ return _type = Type.Boolean;
}
// If one is of reference type, then convert the other too
@@ -119,6 +121,10 @@
if (tright instanceof ReferenceType) {
_left = new CastExpr(_left, Type.Reference);
}
+ // bug fix # 2838
+ _right = new CastExpr(_right, Type.Real);
+ _left = new CastExpr(_left, Type.Real);
+
return _type = Type.Boolean;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org