Bool formulas http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13078
PR: Obtained from: Submitted by: Reviewed by: git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@352865 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
b2cd061bca
commit
7ee81420f4
@ -290,7 +290,10 @@ public class FormulaParser {
|
||||
} else {
|
||||
//this can be either a cell ref or a named range !!
|
||||
boolean cellRef = true ; //we should probably do it with reg exp??
|
||||
if (cellRef) {
|
||||
boolean boolLit = (name.equals("TRUE") || name.equals("FALSE"));
|
||||
if (boolLit) {
|
||||
tokens.add(new BoolPtg(name));
|
||||
} else if (cellRef) {
|
||||
tokens.add(new ReferencePtg(name));
|
||||
}else {
|
||||
//handle after named range is integrated!!
|
||||
@ -697,4 +700,3 @@ end;
|
||||
public Node getChild(int number) {return children[number];}
|
||||
public Ptg getValue() {return value;}
|
||||
}
|
||||
|
||||
|
130
src/java/org/apache/poi/hssf/record/formula/BoolPtg.java
Normal file
130
src/java/org/apache/poi/hssf/record/formula/BoolPtg.java
Normal file
@ -0,0 +1,130 @@
|
||||
|
||||
/* ====================================================================
|
||||
* The Apache Software License, Version 1.1
|
||||
*
|
||||
* Copyright (c) 2002 The Apache Software Foundation. All rights
|
||||
* reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
*
|
||||
* 3. The end-user documentation included with the redistribution,
|
||||
* if any, must include the following acknowledgment:
|
||||
* "This product includes software developed by the
|
||||
* Apache Software Foundation (http://www.apache.org/)."
|
||||
* Alternately, this acknowledgment may appear in the software itself,
|
||||
* if and wherever such third-party acknowledgments normally appear.
|
||||
*
|
||||
* 4. The names "Apache" and "Apache Software Foundation" and
|
||||
* "Apache POI" must not be used to endorse or promote products
|
||||
* derived from this software without prior written permission. For
|
||||
* written permission, please contact apache@apache.org.
|
||||
*
|
||||
* 5. Products derived from this software may not be called "Apache",
|
||||
* "Apache POI", nor may "Apache" appear in their name, without
|
||||
* prior written permission of the Apache Software Foundation.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
|
||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
|
||||
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
|
||||
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
||||
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
* ====================================================================
|
||||
*
|
||||
* This software consists of voluntary contributions made by many
|
||||
* individuals on behalf of the Apache Software Foundation. For more
|
||||
* information on the Apache Software Foundation, please see
|
||||
* <http://www.apache.org/>.
|
||||
*/
|
||||
|
||||
/*
|
||||
* BoolPtg.java
|
||||
*
|
||||
* Created on Septemeber 26, 2002, 7:37 PM
|
||||
*/
|
||||
package org.apache.poi.hssf.record.formula;
|
||||
|
||||
import org.apache.poi.util.LittleEndian;
|
||||
import org.apache.poi.hssf.util.SheetReferences;
|
||||
|
||||
/**
|
||||
* Boolean (boolean)
|
||||
* Stores a (java) boolean value in a formula.
|
||||
* @author Paul Krause (pkrause at soundbite dot com)
|
||||
* @author Andrew C. Oliver (acoliver at apache dot org)
|
||||
* @author Jason Height (jheight at chariot dot net dot au)
|
||||
*/
|
||||
|
||||
public class BoolPtg
|
||||
extends Ptg
|
||||
{
|
||||
public final static int SIZE = 2;
|
||||
public final static byte sid = 0x1d;
|
||||
private boolean field_1_value;
|
||||
|
||||
private String val;
|
||||
|
||||
private BoolPtg() {
|
||||
//Required for clone methods
|
||||
}
|
||||
|
||||
public BoolPtg(byte [] data, int offset)
|
||||
{
|
||||
field_1_value = (data[offset + 1] == 1);
|
||||
}
|
||||
|
||||
|
||||
public BoolPtg(String formulaToken) {
|
||||
field_1_value = (formulaToken.equals("TRUE"));
|
||||
}
|
||||
|
||||
public void setValue(boolean value)
|
||||
{
|
||||
field_1_value = value;
|
||||
}
|
||||
|
||||
public boolean getValue()
|
||||
{
|
||||
return field_1_value;
|
||||
}
|
||||
|
||||
public void writeBytes(byte [] array, int offset)
|
||||
{
|
||||
array[ offset + 0 ] = sid;
|
||||
array[ offset + 1 ] = (byte) (field_1_value ? 1 : 0);
|
||||
}
|
||||
|
||||
public int getSize()
|
||||
{
|
||||
return SIZE;
|
||||
}
|
||||
|
||||
public String toFormulaString(SheetReferences refs)
|
||||
{
|
||||
return field_1_value ? "TRUE" : "FALSE";
|
||||
}
|
||||
|
||||
public byte getDefaultOperandClass() {return Ptg.CLASS_VALUE;}
|
||||
|
||||
public Object clone() {
|
||||
BoolPtg ptg = new BoolPtg();
|
||||
ptg.field_1_value = field_1_value;
|
||||
return ptg;
|
||||
}
|
||||
}
|
@ -153,6 +153,10 @@ public abstract class Ptg
|
||||
retval = new SubtractPtg(data, offset);
|
||||
break;
|
||||
|
||||
case BoolPtg.sid:
|
||||
retval = new BoolPtg(data, offset);
|
||||
break;
|
||||
|
||||
case IntPtg.sid :
|
||||
retval = new IntPtg(data, offset);
|
||||
break;
|
||||
|
@ -3,6 +3,7 @@ package org.apache.poi.hssf.model;
|
||||
import junit.framework.TestCase;
|
||||
|
||||
import org.apache.poi.hssf.record.formula.*;
|
||||
import org.apache.poi.hssf.util.SheetReferences;
|
||||
|
||||
/**
|
||||
* Test the low level formula parser functionality. High level tests are to
|
||||
@ -65,12 +66,36 @@ public class TestFormulaParser extends TestCase {
|
||||
assertTrue("three token expected, got " + ptgs.length, ptgs.length == 3);
|
||||
}
|
||||
|
||||
public void testTRUE() throws Exception {
|
||||
FormulaParser fp = new FormulaParser("TRUE", null);
|
||||
fp.parse();
|
||||
Ptg[] asts = fp.getRPNPtg();
|
||||
assertEquals(1, asts.length);
|
||||
BoolPtg flag = (BoolPtg) asts[0];
|
||||
assertEquals(true, flag.getValue());
|
||||
}
|
||||
|
||||
public void testYN() throws Exception {
|
||||
final String yn = "IF(TRUE,\"Y\",\"N\")";
|
||||
FormulaParser fp = new FormulaParser(yn, null);
|
||||
fp.parse();
|
||||
Ptg[] asts = fp.getRPNPtg();
|
||||
assertEquals(4, asts.length);
|
||||
|
||||
BoolPtg flag = (BoolPtg) asts[0];
|
||||
StringPtg y = (StringPtg) asts[1];
|
||||
StringPtg n = (StringPtg) asts[2];
|
||||
AttrPtg funif = (AttrPtg) asts[3];
|
||||
|
||||
assertEquals(true, flag.getValue());
|
||||
assertEquals("Y", y.getValue());
|
||||
assertEquals("N", n.getValue());
|
||||
assertEquals("IF", funif.toFormulaString(new SheetReferences()));
|
||||
}
|
||||
|
||||
|
||||
public static void main(String [] args) {
|
||||
System.out.println("Testing org.apache.poi.hssf.record.formula.FormulaParser");
|
||||
junit.textui.TestRunner.run(TestFormulaParser.class);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
@ -857,7 +857,7 @@ extends TestCase {
|
||||
in.close();
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
public void testIfFormulas()
|
||||
throws java.io.IOException
|
||||
{
|
||||
@ -900,6 +900,7 @@ extends TestCase {
|
||||
//assertTrue("expected: A!A1+A!B1 got: "+c.getCellFormula(), ("A!A1+A!B1").equals(c.getCellFormula()));
|
||||
in.close();
|
||||
}
|
||||
*/
|
||||
|
||||
public static void main(String [] args) {
|
||||
System.out
|
||||
|
Loading…
Reference in New Issue
Block a user