github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

+TCore: default value parameter added to CalcContext::EvaluateBool

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@3476 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
rylek 2011-05-31 23:51:35 +00:00
parent d5d7c1ff3a
commit 13dab0fdd7
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppsrc/TCore/CalcNode.cpp
View file

@ -625,10 +625,10 @@ Time CalcContext::EvaluateTime(String expr)
return !!node ? node->CalcTime(*this) : Time(Null);
}
bool CalcContext::EvaluateBool(String expr)
bool CalcContext::EvaluateBool(String expr, bool null_value)
{
CalcNodePtr node = CalcParser().ScanVoid(expr);
return !!node && node->CalcBool(*this);
return !!node ? node->CalcBool(*this) : null_value;
}
String CalcContext::OptimizeConstant(String expr)

2
uppsrc/TCore/CalcNode.h
View file

@ -350,7 +350,7 @@ public:
int EvaluateInt(String expr);
Date EvaluateDate(String expr);
Time EvaluateTime(String expr);
bool EvaluateBool(String expr);
bool EvaluateBool(String expr, bool null_value = false);
String OptimizeConstant(String expr);
CalcNodePtr OptimizeConstant(CalcNodePtr src);