xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Options: rework conversion to string of prefixed lists

Browse Source 
* use the list_separator variable instead of hard coding ':'
* fix trailing separator when converting empty prefixed list to string
* correctly escape the prefix in case it contains a separator
This commit is contained in:
Maxime Coste 2017-11-13 11:28:22 +08:00
parent 078f0b5c90
commit 615fe0368c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/option_types.hh
View File

@ -322,13 +322,17 @@ EnableIfWithBitOps<Flags, bool> option_add(Flags& opt, StringView str)
template<typename P, typename T> template<typename P, typename T>
inline String option_to_string(const PrefixedList<P, T>& opt) inline String option_to_string(const PrefixedList<P, T>& opt)
{ {
return format("{}:{}", opt.prefix, option_to_string(opt.list)); if (opt.list.empty())
return format("{}", escape(option_to_string(opt.prefix), list_separator, '\\'));
else
return format("{}{}{}", escape(option_to_string(opt.prefix), list_separator, '\\'),
list_separator, option_to_string(opt.list));
} }
template<typename P, typename T> template<typename P, typename T>
inline void option_from_string(StringView str, PrefixedList<P, T>& opt) inline void option_from_string(StringView str, PrefixedList<P, T>& opt)
{ {
auto it = find(str, ':'); auto it = find(str, list_separator);
option_from_string(StringView{str.begin(), it}, opt.prefix); option_from_string(StringView{str.begin(), it}, opt.prefix);
if (it != str.end()) if (it != str.end())
option_from_string({it+1, str.end()}, opt.list); option_from_string({it+1, str.end()}, opt.list);