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

Change list separators to ; and tuple separators to |

Browse Source
This commit is contained in:
Maxime Coste 2013-04-02 18:56:09 +02:00
parent 07f3bbe523
commit 3a351aa436
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/option_types.hh
View File

@ -29,6 +29,8 @@ inline void option_from_string(const String& str, bool& opt)
throw runtime_error("boolean values are either true, yes, false or no");
}
constexpr Codepoint list_separator = ';';
template<typename T>
String option_to_string(const std::vector<T>& opt)
{
@ -37,7 +39,7 @@ String option_to_string(const std::vector<T>& opt)
{
res += option_to_string(opt[i]);
if (i != opt.size() - 1)
res += ',';
res += list_separator;
}
return res;
}
@ -46,7 +48,7 @@ template<typename T>
void option_from_string(const String& str, std::vector<T>& opt)
{
opt.clear();
std::vector<String> elems = split(str, ',');
std::vector<String> elems = split(str, list_separator);
for (auto& elem: elems)
{
T opt_elem;
@ -62,26 +64,21 @@ bool option_add(std::vector<T>& opt, const std::vector<T>& vec)
return not vec.empty();
}
constexpr Codepoint tuple_separator = '|';
template<size_t I, typename... Types>
struct TupleOptionDetail
{
static String to_string(const std::tuple<Types...>& opt)
{
return TupleOptionDetail<I-1, Types...>::to_string(opt) + ":" + option_to_string(std::get<I>(opt));
return TupleOptionDetail<I-1, Types...>::to_string(opt) +
tuple_separator + option_to_string(std::get<I>(opt));
}
static void from_string(const String& str, std::tuple<Types...>& opt)
static void from_string(const memoryview<String>& elems, std::tuple<Types...>& opt)
{
auto it = str.begin();
auto end = str.end();
for (size_t i = 0; i < I; ++i)
it = std::find(it+1, end, ':');
if (it == end)
throw runtime_error("not enough elements in tuple");
option_from_string(String{it+1, std::find(it+1, end, ':')}, std::get<I>(opt));
TupleOptionDetail<I-1, Types...>::from_string(str, opt);
option_from_string(elems[I], std::get<I>(opt));
TupleOptionDetail<I-1, Types...>::from_string(elems, opt);
}
};
@ -93,9 +90,9 @@ struct TupleOptionDetail<0, Types...>
return option_to_string(std::get<0>(opt));
}
static void from_string(const String& str, std::tuple<Types...>& opt)
static void from_string(const memoryview<String>& elems, std::tuple<Types...>& opt)
{
option_from_string(String{str.begin(), std::find(str.begin(), str.end(), ':')}, std::get<0>(opt));
option_from_string(elems[0], std::get<0>(opt));
}
};
@ -108,7 +105,10 @@ String option_to_string(const std::tuple<Types...>& opt)
template<typename... Types>
void option_from_string(const String& str, std::tuple<Types...>& opt)
{
TupleOptionDetail<sizeof...(Types)-1, Types...>::from_string(str, opt);
auto elems = split(str, tuple_separator);
if (elems.size() != sizeof...(Types))
throw runtime_error("not enough elements in tuple");
TupleOptionDetail<sizeof...(Types)-1, Types...>::from_string(elems, opt);
}
template<typename RealType, typename ValueType = int>

2
src/rc/clang.kak
View File

@ -21,7 +21,7 @@ def clang-complete %{
rm -r $(dirname ${kak_opt_clang_filename})
completions="${kak_cursor_line}:${kak_cursor_column}@${kak_timestamp}"
for cmp in ${output}; do
completions="${completions},${cmp}"
completions="${completions};${cmp}"
done
echo "eval -client $kak_client %[ echo completed; setb completions '${completions}' ]" | socat stdin UNIX-CONNECT:${kak_socket}
) >& /dev/null < /dev/null &

2
src/rc/git-tools.kak
View File

@ -36,7 +36,7 @@ def git-blame %{
text="${sha:0:8} ${authors[$sha]}"
flag="$line:black:$text"
for (( i=1; $i < $count; i++ )); do
flag="$flag,$(($line+$i)):black:$text"
flag="$flag;$(($line+$i))|black|$text"
done
echo "setb -add -buffer $kak_bufname git_blame_flags %{${flag}}" | socat -u stdin UNIX-CONNECT:${kak_socket}
}