0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GUI2/Typed Formula: made use of std::optional

Browse source
This commit is contained in:
Charles Dang 2021-01-26 11:12:39 +11:00
parent 3757f2caf6
commit 26426ea338
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gui/auxiliary/typed_formula.hpp
View file

@ -25,6 +25,7 @@
#include "tstring.hpp"
#include <cassert>
#include <optional>
namespace gui2
{
@ -93,7 +94,7 @@ public:
/** Determine whether the class contains a formula. */
bool has_formula() const
{
return !formula_.empty();
return formula_.has_value();
}
private:
@ -123,9 +124,9 @@ private:
/**
* Contains the formula for the variable.
*
* If the string is empty, there's no formula.
* If without value, there's no formula.
*/
std::string formula_;
std::optional<std::string> formula_;
/** If there's no formula it contains the value. */
T value_;
@ -154,10 +155,10 @@ operator()(const wfl::map_formula_callable& variables, wfl::function_symbol_tabl
return value_;
}
wfl::variant v = wfl::formula(formula_, functions).evaluate(variables);
wfl::variant v = wfl::formula(*formula_, functions).evaluate(variables);
const T& result = execute(v);
LOG_GUI_D << "Formula: execute '" << formula_ << "' result '" << result << "'.\n";
LOG_GUI_D << "Formula: execute '" << *formula_ << "' result '" << result << "'.\n";
return result;
}