GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-28 13:37:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

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 bool Att::validMod (const std::string& mod) const
{ {
if (mod == "before" || mod == "after" || // i18n: TODO if (mod == "before" || mod == "after" || // i18n: TODO
mod == "none" || mod == "any" || // i18n: TODO
mod == "under" || mod == "over" || // 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 == "is" || mod == "isnt" || // i18n: TODO
mod == "has" || mod == "hasnt" || // i18n: TODO mod == "has" || mod == "hasnt" || // i18n: TODO
mod == "contains" || // 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) if (other.mValue.find (mValue) != std::string::npos)
return false; return false;
// Harder: // before = under = below = <
// TODO before/after else if (mMod == "before" || mMod == "under" || mMod == "below")
// TODO under/below {
// TODO over/above // TODO Typed compare
return false;
}
// Impossible? // after = over = above = >
// TODO synth else if (mMod == "after" || mMod == "over" || mMod == "above")
// TODO this {
// TODO next // TODO Typed compare
// TODO first return false;
// TODO last }
return true; 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)"); t.ok (good, "Att::mod (under)");
good = true; good = true;
try {a6.mod ("first");} catch (...) {good = false;} try {a6.mod ("above");} catch (...) {good = false;}
t.ok (good, "Att::mod (first)"); t.ok (good, "Att::mod (above)");
good = true; good = true;
try {a6.mod ("last");} catch (...) {good = false;} try {a6.mod ("below");} catch (...) {good = false;}
t.ok (good, "Att::mod (last)"); t.ok (good, "Att::mod (below)");
good = true; good = true;
try {a6.mod ("isnt");} catch (...) {good = false;} try {a6.mod ("isnt");} catch (...) {good = false;}