moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Made BlankEval instance consistent with other Eval singletons.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@885061 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Josh Micich 2009-11-28 02:50:47 +00:00
parent f81973441b
commit baa4640ec9
27 changed files with 73 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/org/apache/poi/hssf/record/formula/eval/BlankEval.java
View File

@ -23,7 +23,11 @@ package org.apache.poi.hssf.record.formula.eval;
*/
public final class BlankEval implements ValueEval {
public static BlankEval INSTANCE = new BlankEval();
public static final BlankEval instance = new BlankEval();
/**
* @deprecated (Nov 2009) use {@link #instance}
*/
public static final BlankEval INSTANCE = instance;
private BlankEval() {
// enforce singleton

2
src/java/org/apache/poi/hssf/record/formula/eval/ConcatEval.java
View File

@ -51,7 +51,7 @@ public final class ConcatEval extends Fixed2ArgFunction {
StringValueEval sve = (StringValueEval) ve;
return sve.getStringValue();
}
if (ve == BlankEval.INSTANCE) {
if (ve == BlankEval.instance) {
return "";
}
throw new IllegalAccessError("Unexpected value type ("

12
src/java/org/apache/poi/hssf/record/formula/eval/OperandResolver.java
View File

@ -106,7 +106,7 @@ public final class OperandResolver {
if(result == null) {
// This seems to be required because AreaEval.values() array may contain nulls.
// perhaps that should not be allowed.
result = BlankEval.INSTANCE;
result = BlankEval.instance;
}
if (result instanceof ErrorEval) {
throw new EvaluationException((ErrorEval) result);
@ -179,7 +179,7 @@ public final class OperandResolver {
*
*/
public static int coerceValueToInt(ValueEval ev) throws EvaluationException {
if (ev == BlankEval.INSTANCE) {
if (ev == BlankEval.instance) {
return 0;
}
double d = coerceValueToDouble(ev);
@ -201,7 +201,7 @@ public final class OperandResolver {
*/
public static double coerceValueToDouble(ValueEval ev) throws EvaluationException {
if (ev == BlankEval.INSTANCE) {
if (ev == BlankEval.instance) {
return 0.0;
}
if (ev instanceof NumericValueEval) {
@ -268,7 +268,7 @@ public final class OperandResolver {
StringValueEval sve = (StringValueEval) ve;
return sve.getStringValue();
}
if (ve == BlankEval.INSTANCE) {
if (ve == BlankEval.instance) {
return "";
}
throw new IllegalArgumentException("Unexpected eval class (" + ve.getClass().getName() + ")");
@ -280,7 +280,7 @@ public final class OperandResolver {
*/
public static Boolean coerceValueToBoolean(ValueEval ve, boolean stringsAreBlanks) throws EvaluationException {
if (ve == null || ve == BlankEval.INSTANCE) {
if (ve == null || ve == BlankEval.instance) {
// TODO - remove 've == null' condition once AreaEval is fixed
return null;
}
@ -288,7 +288,7 @@ public final class OperandResolver {
return Boolean.valueOf(((BoolEval) ve).getBooleanValue());
}
if (ve == BlankEval.INSTANCE) {
if (ve == BlankEval.instance) {
return null;
}

6
src/java/org/apache/poi/hssf/record/formula/eval/RelationalOperationEval.java
View File

@ -73,10 +73,10 @@ public abstract class RelationalOperationEval extends Fixed2ArgFunction {
private static int doCompare(ValueEval va, ValueEval vb) {
// special cases when one operand is blank
if (va == BlankEval.INSTANCE) {
if (va == BlankEval.instance) {
return compareBlank(vb);
}
if (vb == BlankEval.INSTANCE) {
if (vb == BlankEval.instance) {
return -compareBlank(va);
}
@ -117,7 +117,7 @@ public abstract class RelationalOperationEval extends Fixed2ArgFunction {
}
private static int compareBlank(ValueEval v) {
if (v == BlankEval.INSTANCE) {
if (v == BlankEval.instance) {
return 0;
}
if (v instanceof BoolEval) {

2
src/java/org/apache/poi/hssf/record/formula/functions/Choose.java
View File

@ -41,7 +41,7 @@ public final class Choose implements Function {
}
ValueEval result = OperandResolver.getSingleValue(args[ix], srcRowIndex, srcColumnIndex);
if (result == MissingArgEval.instance) {
return BlankEval.INSTANCE;
return BlankEval.instance;
}
return result;
} catch (EvaluationException e) {

2
src/java/org/apache/poi/hssf/record/formula/functions/Counta.java
View File

@ -62,7 +62,7 @@ public final class Counta implements Function {
// Error values like #VALUE!, #REF!, #DIV/0!, #NAME? etc don't cause this COUNTA to return an error
// in fact, they seem to get counted
if(valueEval == BlankEval.INSTANCE) {
if(valueEval == BlankEval.instance) {
return false;
}
// Note - everything but BlankEval counts

2
src/java/org/apache/poi/hssf/record/formula/functions/Countblank.java
View File

@ -54,7 +54,7 @@ public final class Countblank extends Fixed1ArgFunction {
public boolean matches(ValueEval valueEval) {
// Note - only BlankEval counts
return valueEval == BlankEval.INSTANCE;
return valueEval == BlankEval.instance;
}
};
}

2
src/java/org/apache/poi/hssf/record/formula/functions/Countif.java
View File

@ -445,7 +445,7 @@ public final class Countif extends Fixed2ArgFunction {
if(evaluatedCriteriaArg instanceof ErrorEval) {
return new ErrorMatcher(((ErrorEval)evaluatedCriteriaArg).getErrorCode(), CmpOp.OP_NONE);
}
if(evaluatedCriteriaArg == BlankEval.INSTANCE) {
if(evaluatedCriteriaArg == BlankEval.instance) {
return null;
}
throw new RuntimeException("Unexpected type for criteria ("

6
src/java/org/apache/poi/hssf/record/formula/functions/If.java
View File

@ -38,7 +38,7 @@ public final class If extends Var2or3ArgFunction {
}
if (b) {
if (arg1 == MissingArgEval.instance) {
return BlankEval.INSTANCE;
return BlankEval.instance;
}
return arg1;
}
@ -55,12 +55,12 @@ public final class If extends Var2or3ArgFunction {
}
if (b) {
if (arg1 == MissingArgEval.instance) {
return BlankEval.INSTANCE;
return BlankEval.instance;
}
return arg1;
}
if (arg2 == MissingArgEval.instance) {
return BlankEval.INSTANCE;
return BlankEval.instance;
}
return arg2;
}

2
src/java/org/apache/poi/hssf/record/formula/functions/Index.java
View File

@ -200,7 +200,7 @@ public final class Index implements Function2Arg, Function3Arg, Function4Arg {
if (ev == MissingArgEval.instance) {
return 0;
}
if (ev == BlankEval.INSTANCE) {
if (ev == BlankEval.instance) {
return 0;
}
int result = OperandResolver.coerceValueToInt(ev);

2
src/java/org/apache/poi/hssf/record/formula/functions/Indirect.java
View File

@ -80,7 +80,7 @@ public final class Indirect implements FreeRefFunction {
throws EvaluationException {
ValueEval ve = OperandResolver.getSingleValue(arg, ec.getRowIndex(), ec.getColumnIndex());
if (ve == BlankEval.INSTANCE || ve == MissingArgEval.instance) {
if (ve == BlankEval.instance || ve == MissingArgEval.instance) {
return false;
}
// numeric quantities follow standard boolean conversion rules

2
src/java/org/apache/poi/hssf/record/formula/functions/LookupUtils.java
View File

@ -585,7 +585,7 @@ final class LookupUtils {
public static LookupValueComparer createLookupComparer(ValueEval lookupValue) {
if (lookupValue == BlankEval.INSTANCE) {
if (lookupValue == BlankEval.instance) {
// blank eval translates to zero
// Note - a blank eval in the lookup column/row never matches anything
// empty string in the lookup column/row can only be matched by explicit empty string

2
src/java/org/apache/poi/hssf/record/formula/functions/Mode.java
View File

@ -118,7 +118,7 @@ public final class Mode implements Function {
if (arg instanceof ErrorEval) {
throw new EvaluationException((ErrorEval) arg);
}
if (arg == BlankEval.INSTANCE || arg instanceof BoolEval || arg instanceof StringEval) {
if (arg == BlankEval.instance || arg instanceof BoolEval || arg instanceof StringEval) {
if (mustBeNumber) {
throw EvaluationException.invalidValue();
}

2
src/java/org/apache/poi/hssf/record/formula/functions/MultiOperandNumericFunction.java
View File

@ -185,7 +185,7 @@ public abstract class MultiOperandNumericFunction implements Function {
}
return;
}
if (ve == BlankEval.INSTANCE) {
if (ve == BlankEval.instance) {
if (_isBlankCounted) {
temp.add(0.0);
}

3
src/java/org/apache/poi/ss/formula/CellCacheEntry.java
View File

@ -63,7 +63,7 @@ abstract class CellCacheEntry implements ICacheEntry {
// value type is changing
return false;
}
if (a == BlankEval.INSTANCE) {
if (a == BlankEval.instance) {
return b == a;
}
if (cls == NumberEval.class) {
@ -133,5 +133,4 @@ abstract class CellCacheEntry implements ICacheEntry {
fc.recurseClearCachedFormulaResults(listener, depth+1);
}
}
}

7
src/java/org/apache/poi/ss/formula/EvaluationCache.java
View File

@ -34,7 +34,6 @@ import org.apache.poi.ss.formula.PlainCellCache.Loc;
* calculated values of already visited cells, to avoid unnecessary re-calculation when the
* same cells are referenced multiple times
*
*
* @author Josh Micich
*/
final class EvaluationCache {
@ -84,7 +83,7 @@ final class EvaluationCache {
} else {
ValueEval value = WorkbookEvaluator.getValueFromNonFormulaCell(cell);
if (pcce == null) {
if (value != BlankEval.INSTANCE) {
if (value != BlankEval.instance) {
// only cache non-blank values in the plain cell cache
// (dependencies on blank cells are managed by
// FormulaCellCacheEntry._usedBlankCellGroup)
@ -102,7 +101,7 @@ final class EvaluationCache {
if (pcce.updateValue(value)) {
pcce.recurseClearCachedFormulaResults(_evaluationListener);
}
if (value == BlankEval.INSTANCE) {
if (value == BlankEval.instance) {
_plainCellCache.remove(loc);
}
}
@ -159,7 +158,7 @@ final class EvaluationCache {
// value type is changing
return false;
}
if (a == BlankEval.INSTANCE) {
if (a == BlankEval.instance) {
return b == a;
}
if (cls == NumberEval.class) {

2
src/java/org/apache/poi/ss/formula/EvaluationTracker.java
View File

@ -140,7 +140,7 @@ final class EvaluationTracker {
// Top level frame, there is no 'cell' above this frame that is using the current cell
} else {
CellEvaluationFrame consumingFrame = _evaluationFrames.get(prevFrameIndex);
if (value == BlankEval.INSTANCE) {
if (value == BlankEval.instance) {
consumingFrame.addUsedBlankCell(bookIndex, sheetIndex, rowIndex, columnIndex);
} else {
PlainValueCellCacheEntry cce = _cache.getPlainValueEntry(bookIndex, sheetIndex,

8
src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java
View File

@ -313,7 +313,7 @@ public final class WorkbookEvaluator {
*/
/* package */ static ValueEval getValueFromNonFormulaCell(EvaluationCell cell) {
if (cell == null) {
return BlankEval.INSTANCE;
return BlankEval.instance;
}
int cellType = cell.getCellType();
switch (cellType) {
@ -324,7 +324,7 @@ public final class WorkbookEvaluator {
case Cell.CELL_TYPE_BOOLEAN:
return BoolEval.valueOf(cell.getBooleanCellValue());
case Cell.CELL_TYPE_BLANK:
return BlankEval.INSTANCE;
return BlankEval.instance;
case Cell.CELL_TYPE_ERROR:
return ErrorEval.valueOf(cell.getErrorCellValue());
}
@ -401,7 +401,7 @@ public final class WorkbookEvaluator {
i+= countTokensToBeSkipped(ptgs, i, dist);
if (stack.peek() == MissingArgEval.instance) {
stack.pop();
stack.push(BlankEval.INSTANCE);
stack.push(BlankEval.instance);
}
continue;
}
@ -450,7 +450,7 @@ public final class WorkbookEvaluator {
throw new IllegalStateException("evaluation stack not empty");
}
value = dereferenceValue(value, ec.getRowIndex(), ec.getColumnIndex());
if (value == BlankEval.INSTANCE) {
if (value == BlankEval.instance) {
// Note Excel behaviour here. A blank final final value is converted to zero.
return NumberEval.ZERO;
// Formulas _never_ evaluate to blank. If a formula appears to have evaluated to

2
src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java
View File

@ -49,7 +49,7 @@ final class ForkedEvaluationCell implements EvaluationCell {
_sheet = sheet;
_masterCell = masterCell;
// start with value blank, but expect construction to be immediately
setValue(BlankEval.INSTANCE); // followed by a proper call to setValue()
setValue(BlankEval.instance); // followed by a proper call to setValue()
}
public Object getIdentityKey() {

2
src/testcases/org/apache/poi/hssf/record/formula/eval/TestEqualEval.java
View File

@ -59,7 +59,7 @@ public final class TestEqualEval extends TestCase {
ValueEval[] args = {
new StringEval(""),
BlankEval.INSTANCE,
BlankEval.instance,
};
ValueEval result = evaluate(EI.Equal, args, 10, 10);
assertEquals(BoolEval.class, result.getClass());

6
src/testcases/org/apache/poi/hssf/record/formula/functions/TestAverage.java
View File

@ -61,11 +61,11 @@ public final class TestAverage extends TestCase {
values = new ValueEval[] {
new NumberEval(1),
new NumberEval(2),
BlankEval.INSTANCE,
BlankEval.instance,
new NumberEval(3),
BlankEval.INSTANCE,
BlankEval.instance,
new NumberEval(4),
BlankEval.INSTANCE,
BlankEval.instance,
};
confirmAverage(values, 2.5);

10
src/testcases/org/apache/poi/hssf/record/formula/functions/TestCountFuncs.java
View File

@ -57,7 +57,7 @@ public final class TestCountFuncs extends TestCase {
BoolEval.TRUE,
BoolEval.FALSE,
ErrorEval.DIV_ZERO,
BlankEval.INSTANCE,
BlankEval.instance,
};
range = EvalFactory.createAreaEval("A1:B3", values);
confirmCountBlank(1, range);
@ -65,10 +65,10 @@ public final class TestCountFuncs extends TestCase {
values = new ValueEval[] {
new NumberEval(0),
new StringEval(""), // note - does not match blank
BlankEval.INSTANCE,
BlankEval.instance,
BoolEval.FALSE,
BoolEval.TRUE,
BlankEval.INSTANCE,
BlankEval.instance,
};
range = EvalFactory.createAreaEval("A1:B3", values);
confirmCountBlank(2, range);
@ -116,7 +116,7 @@ public final class TestCountFuncs extends TestCase {
BoolEval.TRUE,
BoolEval.FALSE,
BoolEval.TRUE,
BlankEval.INSTANCE,
BlankEval.instance,
};
range = EvalFactory.createAreaEval("A1:B3", values);
confirmCountIf(2, range, BoolEval.TRUE);
@ -414,7 +414,7 @@ public final class TestCountFuncs extends TestCase {
assertEquals(expectedResult, matchPredicate.matches(new NumberEval(value)));
}
private static void confirmPredicate(boolean expectedResult, I_MatchPredicate matchPredicate, String value) {
ValueEval ev = value == null ? BlankEval.INSTANCE : new StringEval(value);
ValueEval ev = value == null ? BlankEval.instance : new StringEval(value);
assertEquals(expectedResult, matchPredicate.matches(ev));
}
private static void confirmPredicate(boolean expectedResult, I_MatchPredicate matchPredicate, ErrorEval value) {

2
src/testcases/org/apache/poi/hssf/record/formula/functions/TestLen.java
View File

@ -63,7 +63,7 @@ public final class TestLen extends TestCase {
confirmLen(new NumberEval(123456), 6);
confirmLen(BoolEval.FALSE, 5);
confirmLen(BoolEval.TRUE, 4);
confirmLen(BlankEval.INSTANCE, 0);
confirmLen(BlankEval.instance, 0);
}
public void testErrors() {

6
src/testcases/org/apache/poi/hssf/record/formula/functions/TestMid.java
View File

@ -75,11 +75,11 @@ public final class TestMid extends TestCase {
RefEval reNumChars = EvalFactory.createRefEval("B1", new NumberEval(3));
confirmMid(new StringEval("galactic"), aeStart, reNumChars, "ala");
confirmMid(new StringEval("galactic"), new NumberEval(3.1), BlankEval.INSTANCE, "");
confirmMid(new StringEval("galactic"), new NumberEval(3.1), BlankEval.instance, "");
confirmMid(new StringEval("galactic"), new NumberEval(3), BoolEval.FALSE, "");
confirmMid(new StringEval("galactic"), new NumberEval(3), BoolEval.TRUE, "l");
confirmMid(BlankEval.INSTANCE, new NumberEval(3), BoolEval.TRUE, "");
confirmMid(BlankEval.instance, new NumberEval(3), BoolEval.TRUE, "");
}
@ -102,7 +102,7 @@ public final class TestMid extends TestCase {
confirmMid(new StringEval("galactic"), new NumberEval(3), ErrorEval.NAME_INVALID, ErrorEval.NAME_INVALID);
confirmMid(new StringEval("galactic"), ErrorEval.DIV_ZERO, ErrorEval.NAME_INVALID, ErrorEval.DIV_ZERO);
confirmMid(new StringEval("galactic"), BlankEval.INSTANCE, new NumberEval(3.1), ErrorEval.VALUE_INVALID);
confirmMid(new StringEval("galactic"), BlankEval.instance, new NumberEval(3.1), ErrorEval.VALUE_INVALID);
confirmMid(new StringEval("galactic"), new NumberEval(0), new NumberEval(4), ErrorEval.VALUE_INVALID);
confirmMid(new StringEval("galactic"), new NumberEval(1), new NumberEval(-1), ErrorEval.VALUE_INVALID);

2
src/testcases/org/apache/poi/hssf/record/formula/functions/TestTFunc.java
View File

@ -94,7 +94,7 @@ public final class TestTFunc extends TestCase {
public void testOtherValues() {
confirmOther(new NumberEval(2));
confirmOther(BoolEval.FALSE);
confirmOther(BlankEval.INSTANCE); // can this particular case be verified?
confirmOther(BlankEval.instance); // can this particular case be verified?
}
public void testRefValues() {

2
src/testcases/org/apache/poi/hssf/record/formula/functions/TestTrim.java
View File

@ -69,7 +69,7 @@ public final class TestTrim extends TestCase {
confirmTrim(new NumberEval(123456), "123456");
confirmTrim(BoolEval.FALSE, "FALSE");
confirmTrim(BoolEval.TRUE, "TRUE");
confirmTrim(BlankEval.INSTANCE, "");
confirmTrim(BlankEval.instance, "");
}
public void testErrors() {

2
src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java
View File

@ -178,7 +178,7 @@ public class TestEvaluationCache extends TestCase {
BoolEval be = (BoolEval) value;
return be.getStringValue();
}
if (value == BlankEval.INSTANCE) {
if (value == BlankEval.instance) {
return "#BLANK#";
}
if (value instanceof ErrorEval) {