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

Fix use of dead string memory and quick cleanup

Browse Source
This commit is contained in:
Maxime Coste 2016-07-27 00:25:05 +01:00
parent 35f1ad100e
commit f30bd4c540
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/normal.cc
View File

@ -924,8 +924,8 @@ void select_object(Context& context, NormalParams params)
const int level = params.count <= 0 ? 0 : params.count - 1; const int level = params.count <= 0 ? 0 : params.count - 1;
on_next_key_with_autoinfo(context, KeymapMode::Object, on_next_key_with_autoinfo(context, KeymapMode::Object,
[level](Key key, Context& context) { [level](Key key, Context& context) {
auto cp = key.codepoint(); auto cp = key.codepoint().value_or(Codepoint{0});
if (not cp) if (cp == 0)
return; return;
static constexpr struct static constexpr struct
@ -943,14 +943,14 @@ void select_object(Context& context, NormalParams params)
}; };
for (auto& sel : selectors) for (auto& sel : selectors)
{ {
if (*cp == sel.key) if (cp == sel.key)
return select<mode>(context, std::bind(sel.func, _1, _2, flags)); return select<mode>(context, std::bind(sel.func, _1, _2, flags));
} }
if (*cp == 'u') if (cp == 'u')
return select<mode>(context, std::bind(select_argument, _1, _2, level, flags)); return select<mode>(context, std::bind(select_argument, _1, _2, level, flags));
if (*cp == ':') if (cp == ':')
{ {
const bool info = show_auto_info_ifn( const bool info = show_auto_info_ifn(
"Enter object desc", "format: <open text>,<close text>", "Enter object desc", "format: <open text>,<close text>",
@ -989,19 +989,19 @@ void select_object(Context& context, NormalParams params)
}; };
for (auto& sur : surrounding_pairs) for (auto& sur : surrounding_pairs)
{ {
if (sur.opening[0_char] == *cp or if (sur.opening[0_char] == cp or
sur.closing[0_char] == *cp or sur.closing[0_char] == cp or
(sur.name != 0 and sur.name == *cp)) (sur.name != 0 and sur.name == cp))
return select<mode>(context, std::bind(select_surrounding, _1, _2, return select<mode>(context, std::bind(select_surrounding, _1, _2,
sur.opening, sur.closing, sur.opening, sur.closing,
level, flags)); level, flags));
} }
if (is_punctuation(*cp)) if (is_punctuation(cp))
{ {
StringView strview_codepoint{String(*cp)}; auto utf8cp = to_string(cp);
return select<mode>(context, std::bind(select_surrounding, _1, _2, return select<mode>(context, std::bind(select_surrounding, _1, _2,
strview_codepoint, strview_codepoint, utf8cp, utf8cp,
level, flags)); level, flags));
} }
}, get_title(), }, get_title(),