Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More test coverage for the expression AST

Browse Source
This commit is contained in:
Andy Clement
2009-04-04 01:04:31 +00:00
parent c4de2ba006
commit c695d00dbe
7 changed files with 84 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorGreaterThan.java
View File

@@ -43,19 +43,14 @@ public class OperatorGreaterThan extends Operator {
Object left = getLeftOperand().getValueInternal(state).getValue();
Object right = getRightOperand().getValueInternal(state).getValue();
if (left instanceof Number && right instanceof Number) {
Number op1 = (Number) left;
Number op2 = (Number) right;
if (op1 instanceof Double || op2 instanceof Double) {
return BooleanTypedValue.forValue(op1.doubleValue() > op2.doubleValue());
}
else if (op1 instanceof Float || op2 instanceof Float) {
return BooleanTypedValue.forValue(op1.floatValue() > op2.floatValue());
}
else if (op1 instanceof Long || op2 instanceof Long) {
return BooleanTypedValue.forValue(op1.longValue() > op2.longValue());
}
else {
return BooleanTypedValue.forValue(op1.intValue() > op2.intValue());
Number leftNumber = (Number) left;
Number rightNumber = (Number) right;
if (leftNumber instanceof Double || rightNumber instanceof Double) {
return BooleanTypedValue.forValue(leftNumber.doubleValue() > rightNumber.doubleValue());
} else if (leftNumber instanceof Long || rightNumber instanceof Long) {
return BooleanTypedValue.forValue(leftNumber.longValue() > rightNumber.longValue());
} else {
return BooleanTypedValue.forValue(leftNumber.intValue() > rightNumber.intValue());
}
}
return BooleanTypedValue.forValue(state.getTypeComparator().compare(left, right) > 0);

22
org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorLessThan.java
View File

@@ -42,20 +42,16 @@ public class OperatorLessThan extends Operator {
public BooleanTypedValue getValueInternal(ExpressionState state) throws EvaluationException {
Object left = getLeftOperand().getValueInternal(state).getValue();
Object right = getRightOperand().getValueInternal(state).getValue();
// TODO could leave all of these to the comparator - just seems quicker to do some here
if (left instanceof Number && right instanceof Number) {
Number op1 = (Number) left;
Number op2 = (Number) right;
if (op1 instanceof Double || op2 instanceof Double) {
return BooleanTypedValue.forValue(op1.doubleValue() < op2.doubleValue());
}
else if (op1 instanceof Float || op2 instanceof Float) {
return BooleanTypedValue.forValue(op1.floatValue() < op2.floatValue());
}
else if (op1 instanceof Long || op2 instanceof Long) {
return BooleanTypedValue.forValue(op1.longValue() < op2.longValue());
}
else {
return BooleanTypedValue.forValue(op1.intValue() < op2.intValue());
Number leftNumber = (Number) left;
Number rightNumber = (Number) right;
if (leftNumber instanceof Double || rightNumber instanceof Double) {
return BooleanTypedValue.forValue(leftNumber.doubleValue() < rightNumber.doubleValue());
} else if (leftNumber instanceof Long || rightNumber instanceof Long) {
return BooleanTypedValue.forValue(leftNumber.longValue() < rightNumber.longValue());
} else {
return BooleanTypedValue.forValue(leftNumber.intValue() < rightNumber.intValue());
}
}
return BooleanTypedValue.forValue(state.getTypeComparator().compare(left, right) < 0);

21
org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorLessThanOrEqual.java
View File

@@ -38,19 +38,14 @@ public class OperatorLessThanOrEqual extends Operator {
Object left = getLeftOperand().getValueInternal(state).getValue();
Object right = getRightOperand().getValueInternal(state).getValue();
if (left instanceof Number && right instanceof Number) {
Number op1 = (Number) left;
Number op2 = (Number) right;
if (op1 instanceof Double || op2 instanceof Double) {
return BooleanTypedValue.forValue(op1.doubleValue() <= op2.doubleValue());
}
else if (op1 instanceof Float || op2 instanceof Float) {
return BooleanTypedValue.forValue(op1.floatValue() <= op2.floatValue());
}
else if (op1 instanceof Long || op2 instanceof Long) {
return BooleanTypedValue.forValue(op1.longValue() <= op2.longValue());
}
else {
return BooleanTypedValue.forValue(op1.intValue() <= op2.intValue());
Number leftNumber = (Number) left;
Number rightNumber = (Number) right;
if (leftNumber instanceof Double || rightNumber instanceof Double) {
return BooleanTypedValue.forValue(leftNumber.doubleValue() <= rightNumber.doubleValue());
} else if (leftNumber instanceof Long || rightNumber instanceof Long) {
return BooleanTypedValue.forValue(leftNumber.longValue() <= rightNumber.longValue());
} else {
return BooleanTypedValue.forValue(leftNumber.intValue() <= rightNumber.intValue());
}
}
return BooleanTypedValue.forValue( state.getTypeComparator().compare(left, right) <= 0);

15
org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Ternary.java
View File

@@ -44,17 +44,10 @@ public class Ternary extends SpelNodeImpl {
@Override
public TypedValue getValueInternal(ExpressionState state) throws EvaluationException {
Boolean value = getChild(0).getValue(state, Boolean.class);
try {
if (Boolean.TRUE.equals(value)) {
return getChild(1).getValueInternal(state);
}
else {
return getChild(2).getValueInternal(state);
}
}
catch (SpelException ex) {
ex.setPosition(getChild(0).getCharPositionInLine());
throw ex;
if (value.booleanValue()) {
return getChild(1).getValueInternal(state);
} else {
return getChild(2).getValueInternal(state);
}
}