mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-08-28 13:37:20 +02:00
Expressions Refactor - Clarified expansion rules
- Arg now has a _value member that reflects the value in play, rather than the input _raw value. Only _value is used in eval. - DOM expansion capabilities are now controlled by rc.dom.
This commit is contained in:
parent
c6229a6ca6
commit
215364958e
5 changed files with 168 additions and 166 deletions
17
src/Arg.cpp
17
src/Arg.cpp
|
@ -32,7 +32,8 @@ extern Context context;
|
|||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
Arg::Arg ()
|
||||
: _raw ("")
|
||||
: _value ("")
|
||||
, _raw ("")
|
||||
, _type ("")
|
||||
, _category ("")
|
||||
{
|
||||
|
@ -40,7 +41,8 @@ Arg::Arg ()
|
|||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
Arg::Arg (const std::string& raw)
|
||||
: _raw (raw)
|
||||
: _value ("")
|
||||
, _raw (raw)
|
||||
, _type ("")
|
||||
, _category ("")
|
||||
{
|
||||
|
@ -50,7 +52,8 @@ Arg::Arg (const std::string& raw)
|
|||
Arg::Arg (
|
||||
const std::string& raw,
|
||||
const std::string& category)
|
||||
: _raw (raw)
|
||||
: _value ("")
|
||||
, _raw (raw)
|
||||
, _type ("")
|
||||
, _category (category)
|
||||
{
|
||||
|
@ -61,7 +64,8 @@ Arg::Arg (
|
|||
const std::string& raw,
|
||||
const std::string& type,
|
||||
const std::string& category)
|
||||
: _raw (raw)
|
||||
: _value ("")
|
||||
, _raw (raw)
|
||||
, _type (type)
|
||||
, _category (category)
|
||||
{
|
||||
|
@ -70,6 +74,7 @@ Arg::Arg (
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
Arg::Arg (const Arg& other)
|
||||
{
|
||||
_value = other._value;
|
||||
_raw = other._raw;
|
||||
_type = other._type;
|
||||
_category = other._category;
|
||||
|
@ -80,6 +85,7 @@ Arg& Arg::operator= (const Arg& other)
|
|||
{
|
||||
if (this != &other)
|
||||
{
|
||||
_value = other._value;
|
||||
_raw = other._raw;
|
||||
_type = other._type;
|
||||
_category = other._category;
|
||||
|
@ -91,7 +97,8 @@ Arg& Arg::operator= (const Arg& other)
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
bool Arg::operator== (const Arg& other) const
|
||||
{
|
||||
return _raw == other._raw &&
|
||||
return _value == other._value &&
|
||||
_raw == other._raw &&
|
||||
_type == other._type &&
|
||||
_category == other._category;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue