This commit is contained in:
Denis Molony 2016-03-19 16:58:52 +11:00
parent 2097a2765f
commit 3dc2a9e895
3 changed files with 5 additions and 5 deletions

View File

@ -48,7 +48,7 @@ class Condition
// System.out.println (conditionText);
if (conditionExpression == null)
{
System.out.printf ("creating %s %s %s%n", conditionText, comparator, valueText);
// System.out.printf ("creating %s %s %s%n", conditionText, comparator, valueText);
conditionExpression = new Expression (parent, conditionText);
// System.out.printf ("creating %s%n", valueText);
valueExpression = new Expression (parent, valueText);

View File

@ -92,10 +92,10 @@ class Expression implements Value
String addressText = getAddressText (line.substring (ptr));
ptr += addressText.length ();
Cell cell = parent.getCell (addressText);
if (cell != null)
values.add (parent.getCell (addressText));
else
if (cell == null)
values.add (Function.getInstance (parent, "@NA"));
else
values.add (parent.getCell (addressText));
}
else
{

View File

@ -27,7 +27,7 @@ class If extends Function
{
valueType = ValueType.VALUE;
System.out.println (functionText);
// System.out.println (functionText);
if (condition.getResult ())
{
// System.out.println ("true");