geirm 02/03/24 16:47:30
Modified: src/java/org/apache/velocity/runtime/parser/node
ASTEQNode.java ASTGENode.java ASTGTNode.java
ASTLENode.java ASTLTNode.java
Log:
Fixes for 7396 - there is no reason why we shouldn't be able to do
#set($foo = ( 3 == 3 ))
there is now real downside - we allow any other kind of expression...
Revision Changes Path
1.9 +10 -1
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTEQNode.java
Index: ASTEQNode.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTEQNode.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ASTEQNode.java 7 Aug 2001 21:56:30 -0000 1.8
+++ ASTEQNode.java 25 Mar 2002 00:47:30 -0000 1.9
@@ -67,7 +67,7 @@
* This operator requires that the LHS and RHS are both of the
* same Class.
*
- * @version $Id: ASTEQNode.java,v 1.8 2001/08/07 21:56:30 geirm Exp $
+ * @version $Id: ASTEQNode.java,v 1.9 2002/03/25 00:47:30 geirm Exp $
*/
public class ASTEQNode extends SimpleNode
{
@@ -149,4 +149,13 @@
return false;
}
+
+ public Object value(InternalContextAdapter context)
+ throws MethodInvocationException
+ {
+ boolean val = evaluate(context);
+
+ return val ? Boolean.TRUE : Boolean.FALSE;
+ }
+
}
1.9 +9 -0
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTGENode.java
Index: ASTGENode.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTGENode.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ASTGENode.java 7 Aug 2001 21:56:30 -0000 1.8
+++ ASTGENode.java 25 Mar 2002 00:47:30 -0000 1.9
@@ -122,4 +122,13 @@
return ( (Integer) left).intValue() >= ((Integer) right).intValue();
}
+
+ public Object value(InternalContextAdapter context)
+ throws MethodInvocationException
+ {
+ boolean val = evaluate(context);
+
+ return val ? Boolean.TRUE : Boolean.FALSE;
+ }
+
}
1.8 +9 -0
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTGTNode.java
Index: ASTGTNode.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTGTNode.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ASTGTNode.java 7 Aug 2001 21:56:30 -0000 1.7
+++ ASTGTNode.java 25 Mar 2002 00:47:30 -0000 1.8
@@ -122,4 +122,13 @@
return ((Integer) left).intValue() > ((Integer) right).intValue();
}
+
+ public Object value(InternalContextAdapter context)
+ throws MethodInvocationException
+ {
+ boolean val = evaluate(context);
+
+ return val ? Boolean.TRUE : Boolean.FALSE;
+ }
+
}
1.8 +9 -0
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTLENode.java
Index: ASTLENode.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTLENode.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ASTLENode.java 7 Aug 2001 21:56:30 -0000 1.7
+++ ASTLENode.java 25 Mar 2002 00:47:30 -0000 1.8
@@ -122,4 +122,13 @@
return ((Integer) left).intValue() <= ((Integer) right).intValue();
}
+
+ public Object value(InternalContextAdapter context)
+ throws MethodInvocationException
+ {
+ boolean val = evaluate(context);
+
+ return val ? Boolean.TRUE : Boolean.FALSE;
+ }
+
}
1.8 +9 -0
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTLTNode.java
Index: ASTLTNode.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTLTNode.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ASTLTNode.java 7 Aug 2001 21:56:30 -0000 1.7
+++ ASTLTNode.java 25 Mar 2002 00:47:30 -0000 1.8
@@ -122,4 +122,13 @@
return ((Integer) left).intValue() < ((Integer) right).intValue();
}
+
+ public Object value(InternalContextAdapter context)
+ throws MethodInvocationException
+ {
+ boolean val = evaluate(context);
+
+ return val ? Boolean.TRUE : Boolean.FALSE;
+ }
+
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
