You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by di...@apache.org on 2006/03/21 08:23:16 UTC
svn commit: r387449 - in /jakarta/commons/proper/jexl/trunk:
src/java/org/apache/commons/jexl/parser/ASTBitwiseComplNode.java
src/test/org/apache/commons/jexl/BitwiseOperatorTest.java xdocs/changes.xml
Author: dion
Date: Mon Mar 20 23:23:14 2006
New Revision: 387449
URL: http://svn.apache.org/viewcvs?rev=387449&view=rev
Log:
Basic Bitwise Complement implementation
Modified:
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTBitwiseComplNode.java
jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/BitwiseOperatorTest.java
jakarta/commons/proper/jexl/trunk/xdocs/changes.xml
Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTBitwiseComplNode.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTBitwiseComplNode.java?rev=387449&r1=387448&r2=387449&view=diff
==============================================================================
--- jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTBitwiseComplNode.java (original)
+++ jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTBitwiseComplNode.java Mon Mar 20 23:23:14 2006
@@ -2,6 +2,16 @@
package org.apache.commons.jexl.parser;
+import org.apache.commons.jexl.JexlContext;
+import org.apache.commons.jexl.util.Coercion;
+
+/**
+ * Bitwise Complement. Syntax:
+ * ~a
+ * Result is a Long
+ * @author Dion Gillard
+ * @since 1.0.1
+ */
public class ASTBitwiseComplNode extends SimpleNode {
public ASTBitwiseComplNode(int id) {
super(id);
@@ -16,4 +26,16 @@
public Object jjtAccept(ParserVisitor visitor, Object data) {
return visitor.visit(this, data);
}
+
+ /**
+ * @return a {@link Long} which is the bitwise complement of the operand.
+ */
+ public Object value(JexlContext context) throws Exception
+ {
+ Object left = ((SimpleNode) jjtGetChild(0)).value(context);
+
+ Long l = left == null ? new Long(0) : Coercion.coerceLong(left);
+ return new Long(~l.longValue());
+ }
+
}
Modified: jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/BitwiseOperatorTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/BitwiseOperatorTest.java?rev=387449&r1=387448&r2=387449&view=diff
==============================================================================
--- jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/BitwiseOperatorTest.java (original)
+++ jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/BitwiseOperatorTest.java Mon Mar 20 23:23:14 2006
@@ -78,4 +78,34 @@
Object o = e.evaluate(jc);
assertEquals("Result is wrong", new Long(7), o);
}
+
+ public void testComplementWithNull() throws Exception {
+ Expression e = ExpressionFactory.createExpression("~null");
+ JexlContext jc = JexlHelper.createContext();
+ Object o = e.evaluate(jc);
+ assertEquals("Result is wrong", new Long(-1), o);
+ }
+
+ public void testComplementSimple() throws Exception {
+ Expression e = ExpressionFactory.createExpression("~128");
+ JexlContext jc = JexlHelper.createContext();
+ Object o = e.evaluate(jc);
+ assertEquals("Result is wrong", new Long(-129), o);
+ }
+
+ public void testComplementVariableNumberCoercion() throws Exception {
+ Expression e = ExpressionFactory.createExpression("~x");
+ JexlContext jc = JexlHelper.createContext();
+ jc.getVars().put("x", new Integer(15));
+ Object o = e.evaluate(jc);
+ assertEquals("Result is wrong", new Long(-16), o);
+ }
+
+ public void testComplementVariableStringCoercion() throws Exception {
+ Expression e = ExpressionFactory.createExpression("~x");
+ JexlContext jc = JexlHelper.createContext();
+ jc.getVars().put("x", "15");
+ Object o = e.evaluate(jc);
+ assertEquals("Result is wrong", new Long(-16), o);
+ }
}
Modified: jakarta/commons/proper/jexl/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jexl/trunk/xdocs/changes.xml?rev=387449&r1=387448&r2=387449&view=diff
==============================================================================
--- jakarta/commons/proper/jexl/trunk/xdocs/changes.xml (original)
+++ jakarta/commons/proper/jexl/trunk/xdocs/changes.xml Mon Mar 20 23:23:14 2006
@@ -25,7 +25,7 @@
</properties>
<body>
<release version="1.0.1-SNAPSHOT" date="in SVN">
- <action dev="dion" type="add">Added implementation for bitwise and operator.</action>
+ <action dev="dion" type="add">Added implementation for bitwise and operator, plus bitiwse complement.</action>
<action dev="dion" type="add">Added implementation for the foreach statement.</action>
<action dev="dion" type="add">Added implementation for the while statement.</action>
<action dev="dion" type="add">Added implementation for block statements, e.g. curly braces containing multiple statements.</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org