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

Improvement from Pavel - if we've already parsed a formula then evaluated it, don't re-do the parsing the second time

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@579197 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2007-09-25 11:08:57 +00:00
parent af0eef9988
commit 5a56f23398
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
View File

@ -22,11 +22,14 @@ package org.apache.poi.hssf.usermodel;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Stack; import java.util.Stack;
import org.apache.poi.hssf.model.FormulaParser; import org.apache.poi.hssf.model.FormulaParser;
import org.apache.poi.hssf.model.Workbook; import org.apache.poi.hssf.model.Workbook;
import org.apache.poi.hssf.record.CellValueRecordInterface;
import org.apache.poi.hssf.record.aggregates.FormulaRecordAggregate;
import org.apache.poi.hssf.record.formula.AddPtg; import org.apache.poi.hssf.record.formula.AddPtg;
import org.apache.poi.hssf.record.formula.Area3DPtg; import org.apache.poi.hssf.record.formula.Area3DPtg;
import org.apache.poi.hssf.record.formula.AreaPtg; import org.apache.poi.hssf.record.formula.AreaPtg;
@ -294,25 +297,24 @@ public class HSSFFormulaEvaluator {
protected static ValueEval internalEvaluate(HSSFCell srcCell, HSSFRow srcRow, HSSFSheet sheet, HSSFWorkbook workbook) { protected static ValueEval internalEvaluate(HSSFCell srcCell, HSSFRow srcRow, HSSFSheet sheet, HSSFWorkbook workbook) {
int srcRowNum = srcRow.getRowNum(); int srcRowNum = srcRow.getRowNum();
short srcColNum = srcCell.getCellNum(); short srcColNum = srcCell.getCellNum();
FormulaParser parser = new FormulaParser(srcCell.getCellFormula(), workbook.getWorkbook());
parser.parse();
Ptg[] ptgs = parser.getRPNPtg();
// -- parsing over --
FormulaRecordAggregate record = (FormulaRecordAggregate) srcCell.getCellValueRecord();
List ptgs = record.getFormulaRecord().getParsedExpression();
Stack stack = new Stack(); Stack stack = new Stack();
for (int i = 0, iSize = ptgs.length; i < iSize; i++) { for (int i = 0, iSize = ptgs.size(); i < iSize; i++) {
Ptg token = (Ptg) ptgs.get(i);
// since we dont know how to handle these yet :( // since we dont know how to handle these yet :(
if (ptgs[i] instanceof ControlPtg) { continue; } if (token instanceof ControlPtg) { continue; }
if (ptgs[i] instanceof MemErrPtg) { continue; } if (token instanceof MemErrPtg) { continue; }
if (ptgs[i] instanceof MissingArgPtg) { continue; } if (token instanceof MissingArgPtg) { continue; }
if (ptgs[i] instanceof NamePtg) { continue; } if (token instanceof NamePtg) { continue; }
if (ptgs[i] instanceof NameXPtg) { continue; } if (token instanceof NameXPtg) { continue; }
if (ptgs[i] instanceof UnknownPtg) { continue; } if (token instanceof UnknownPtg) { continue; }
if (ptgs[i] instanceof OperationPtg) { if (token instanceof OperationPtg) {
OperationPtg optg = (OperationPtg) ptgs[i]; OperationPtg optg = (OperationPtg) token;
// parens can be ignored since we have RPN tokens // parens can be ignored since we have RPN tokens
if (optg instanceof ParenthesisPtg) { continue; } if (optg instanceof ParenthesisPtg) { continue; }
@ -332,16 +334,16 @@ public class HSSFFormulaEvaluator {
Eval opresult = operation.evaluate(ops, srcRowNum, srcColNum); Eval opresult = operation.evaluate(ops, srcRowNum, srcColNum);
stack.push(opresult); stack.push(opresult);
} }
else if (ptgs[i] instanceof ReferencePtg) { else if (token instanceof ReferencePtg) {
ReferencePtg ptg = (ReferencePtg) ptgs[i]; ReferencePtg ptg = (ReferencePtg) token;
short colnum = ptg.getColumn(); short colnum = ptg.getColumn();
short rownum = ptg.getRow(); short rownum = ptg.getRow();
HSSFRow row = sheet.getRow(rownum); HSSFRow row = sheet.getRow(rownum);
HSSFCell cell = (row != null) ? row.getCell(colnum) : null; HSSFCell cell = (row != null) ? row.getCell(colnum) : null;
pushRef2DEval(ptg, stack, cell, row, sheet, workbook); pushRef2DEval(ptg, stack, cell, row, sheet, workbook);
} }
else if (ptgs[i] instanceof Ref3DPtg) { else if (token instanceof Ref3DPtg) {
Ref3DPtg ptg = (Ref3DPtg) ptgs[i]; Ref3DPtg ptg = (Ref3DPtg) token;
short colnum = ptg.getColumn(); short colnum = ptg.getColumn();
short rownum = ptg.getRow(); short rownum = ptg.getRow();
Workbook wb = workbook.getWorkbook(); Workbook wb = workbook.getWorkbook();
@ -350,8 +352,8 @@ public class HSSFFormulaEvaluator {
HSSFCell cell = (row != null) ? row.getCell(colnum) : null; HSSFCell cell = (row != null) ? row.getCell(colnum) : null;
pushRef3DEval(ptg, stack, cell, row, xsheet, workbook); pushRef3DEval(ptg, stack, cell, row, xsheet, workbook);
} }
else if (ptgs[i] instanceof AreaPtg) { else if (token instanceof AreaPtg) {
AreaPtg ap = (AreaPtg) ptgs[i]; AreaPtg ap = (AreaPtg) token;
short row0 = ap.getFirstRow(); short row0 = ap.getFirstRow();
short col0 = ap.getFirstColumn(); short col0 = ap.getFirstColumn();
short row1 = ap.getLastRow(); short row1 = ap.getLastRow();
@ -367,8 +369,8 @@ public class HSSFFormulaEvaluator {
AreaEval ae = new Area2DEval(ap, values); AreaEval ae = new Area2DEval(ap, values);
stack.push(ae); stack.push(ae);
} }
else if (ptgs[i] instanceof Area3DPtg) { else if (token instanceof Area3DPtg) {
Area3DPtg a3dp = (Area3DPtg) ptgs[i]; Area3DPtg a3dp = (Area3DPtg) token;
short row0 = a3dp.getFirstRow(); short row0 = a3dp.getFirstRow();
short col0 = a3dp.getFirstColumn(); short col0 = a3dp.getFirstColumn();
short row1 = a3dp.getLastRow(); short row1 = a3dp.getLastRow();
@ -387,7 +389,7 @@ public class HSSFFormulaEvaluator {
stack.push(ae); stack.push(ae);
} }
else { else {
Eval ptgEval = getEvalForPtg(ptgs[i]); Eval ptgEval = getEvalForPtg(token);
stack.push(ptgEval); stack.push(ptgEval);
} }
} }
@ -698,3 +700,4 @@ public class HSSFFormulaEvaluator {
} }
} }