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

Make ArrayView::subrange size arguement optional

Browse Source
This commit is contained in:
Maxime Coste 2016-11-20 11:15:15 +00:00
parent f7ab017b6a
commit 47a82b9855
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/array_view.hh
View File

@ -60,9 +60,10 @@ public:
constexpr bool empty() const { return m_size == 0; } constexpr bool empty() const { return m_size == 0; }
constexpr ArrayView subrange(size_t first, size_t count) const constexpr ArrayView subrange(size_t first, size_t count = -1) const
{ {
return ArrayView(m_pointer + first, count); return ArrayView(m_pointer + std::min(first, m_size),
std::min(count, m_size - std::min(first, m_size)));
} }
private: private:

2
src/command_manager.cc
View File

@ -662,7 +662,7 @@ Completions CommandManager::complete(const Context& context,
auto command_it = find_command(context, command_name); auto command_it = find_command(context, command_name);
if (command_it != m_commands.end() and command_it->second.completer) if (command_it != m_commands.end() and command_it->second.completer)
return command_it->second.completer( return command_it->second.completer(
context, flags, params.subrange(1, params.size()-1), context, flags, params.subrange(1),
token_to_complete-1, pos_in_token); token_to_complete-1, pos_in_token);
} }
return Completions{}; return Completions{};

4
src/highlighters.cc
View File

@ -250,7 +250,7 @@ public:
throw runtime_error("wrong parameter count"); throw runtime_error("wrong parameter count");
FacesSpec faces; FacesSpec faces;
for (auto& spec : params.subrange(1, params.size()-1)) for (auto& spec : params.subrange(1))
{ {
auto colon = find(spec, ':'); auto colon = find(spec, ':');
if (colon == spec.end()) if (colon == spec.end())
@ -440,7 +440,7 @@ HighlighterAndId create_dynamic_regex_highlighter(HighlighterParameters params)
throw runtime_error("Wrong parameter count"); throw runtime_error("Wrong parameter count");
FacesSpec faces; FacesSpec faces;
for (auto& spec : params.subrange(1, params.size()-1)) for (auto& spec : params.subrange(1))
{ {
auto colon = find(spec, ':'); auto colon = find(spec, ':');
if (colon == spec.end()) if (colon == spec.end())