oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Songfilter: move code to ExpectWord()

Browse Source
This commit is contained in:
Max Kellermann
2018-07-30 10:18:42 +02:00
parent 8707ae6fd4
commit 7a8d5070f5
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/SongFilter.cxx
View File

@@ -274,14 +274,21 @@ FirstNonTagNameChar(const char *s) noexcept
} }
static auto static auto
ExpectFilterType(const char *&s) ExpectWord(const char *&s)
{ {
const char *begin = s;
const char *end = FirstNonTagNameChar(s); const char *end = FirstNonTagNameChar(s);
if (end == s) if (end == s)
throw std::runtime_error("Tag name expected"); throw std::runtime_error("Word expected");
const std::string name(s, end);
s = StripLeft(end); s = StripLeft(end);
return std::string(begin, end);
}
static auto
ExpectFilterType(const char *&s)
{
const auto name = ExpectWord(s);
const auto type = locate_parse_type(name.c_str()); const auto type = locate_parse_type(name.c_str());
if (type == TAG_NUM_OF_ITEM_TYPES) if (type == TAG_NUM_OF_ITEM_TYPES)