GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Enhancements - modifier cleanup

Browse source 
- Removed obsolete modifiers
- Added above/below
This commit is contained in:
Paul Beckingham 2009-06-12 21:23:15 -04:00
parent bd0309b4ff
commit 6ac8bdc5ca
2 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/Att.cpp
View file

@ -193,9 +193,9 @@ void Att::parse (Nibbler& n)
bool Att::validMod (const std::string& mod) const
{
if (mod == "before" || mod == "after" || // i18n: TODO
mod == "none" || mod == "any" || // i18n: TODO
mod == "under" || mod == "over" || // i18n: TODO
mod == "first" || mod == "last" || // i18n: TODO
mod == "below" || mod == "above" || // i18n: TODO
mod == "none" || mod == "any" || // i18n: TODO
mod == "is" || mod == "isnt" || // i18n: TODO
mod == "has" || mod == "hasnt" || // i18n: TODO
mod == "contains" || // i18n: TODO
@ -268,17 +268,19 @@ bool Att::match (const Att& other) const
if (other.mValue.find (mValue) != std::string::npos)
return false;
// Harder:
// TODO before/after
// TODO under/below
// TODO over/above
// before = under = below = <
else if (mMod == "before" || mMod == "under" || mMod == "below")
{
// TODO Typed compare
return false;
}
// Impossible?
// TODO synth
// TODO this
// TODO next
// TODO first
// TODO last
// after = over = above = >
else if (mMod == "after" || mMod == "over" || mMod == "above")
{
// TODO Typed compare
return false;
}
return true;
}

8
src/tests/att.t.cpp
View file

@ -115,12 +115,12 @@ int main (int argc, char** argv)
t.ok (good, "Att::mod (under)");
good = true;
try {a6.mod ("first");} catch (...) {good = false;}
t.ok (good, "Att::mod (first)");
try {a6.mod ("above");} catch (...) {good = false;}
t.ok (good, "Att::mod (above)");
good = true;
try {a6.mod ("last");} catch (...) {good = false;}
t.ok (good, "Att::mod (last)");
try {a6.mod ("below");} catch (...) {good = false;}
t.ok (good, "Att::mod (below)");
good = true;
try {a6.mod ("isnt");} catch (...) {good = false;}