emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

lib: query-processor: fix handling unknown flags 

Fixes #2567.
This commit is contained in:
Dirk-Jan C. Binnema 2023-10-09 23:47:06 +03:00
parent 6e45609866
commit f4a930cd19
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/mu-query-processor.cc
View File

@ -311,10 +311,10 @@ basify(Element&& element)
auto val{str->substr(pos + 1)}; auto val{str->substr(pos + 1)};
if (field == Field::Id::Flags) { if (field == Field::Id::Flags) {
if (auto&& finfo{flag_info(val)}; finfo) if (auto&& finfo{flag_info(val)}; finfo)
element.value = Element::Basic{field->name, element.value = Element::Basic{field->name,
std::string{finfo->name}}; std::string{finfo->name}};
else else
Element::Basic{*str}; element.value = Element::Basic{*str};
} else if (field == Field::Id::Priority) { } else if (field == Field::Id::Priority) {
if (auto&& prio{priority_from_name(val)}; prio) if (auto&& prio{priority_from_name(val)}; prio)
element.value = Element::Basic{field->name, element.value = Element::Basic{field->name,
@ -444,7 +444,6 @@ process(const std::string& expr)
.and_then(opify) .and_then(opify)
.and_then(basify) .and_then(basify)
.and_then(regexpify) .and_then(regexpify)
//.and_then(phrasify)
.and_then(wildcardify) .and_then(wildcardify)
.and_then(rangify); .and_then(rangify);
if (element) if (element)
@ -490,6 +489,7 @@ main (int argc, char *argv[])
#if BUILD_TESTS #if BUILD_TESTS
/* /*
*
* Tests. * Tests.
* *
*/ */
@ -505,6 +505,7 @@ test_processor()
// basics // basics
TestCase{R"(hello world)", R"(((_ "hello") (_ "world")))"}, TestCase{R"(hello world)", R"(((_ "hello") (_ "world")))"},
TestCase{R"(maildir:/"hello world")", R"(((maildir "/hello world")))"}, TestCase{R"(maildir:/"hello world")", R"(((maildir "/hello world")))"},
TestCase{R"(flag:deleted)", R"(((_ "flag:deleted")))"} // non-existing flags
}; };
for (auto&& test: cases) { for (auto&& test: cases) {