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

Templatize parse_quoted to avoid utf8 decoding with ascii delimiter

Browse Source
This commit is contained in:
Maxime Coste 2021-11-25 12:23:21 +11:00
parent 16493a99bb
commit 28ac8adbfc
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/command_manager.cc
View File

@ -90,7 +90,7 @@ struct parse_error : runtime_error
namespace namespace
{ {
bool is_command_separator(Codepoint c) bool is_command_separator(char c)
{ {
return c == ';' or c == '\n'; return c == ';' or c == '\n';
} }
@ -101,8 +101,17 @@ struct ParseResult
bool terminated; bool terminated;
}; };
ParseResult parse_quoted(ParseState& state, Codepoint delimiter) template<typename Delimiter>
ParseResult parse_quoted(ParseState& state, Delimiter delimiter)
{ {
static_assert(std::is_same_v<Delimiter, char> or std::is_same_v<Delimiter, Codepoint>);
auto read = [](const char*& it, const char* end) {
if constexpr (std::is_same_v<Delimiter, Codepoint>)
return utf8::read_codepoint(it, end);
else
return *it++;
};
const char* beg = state.pos; const char* beg = state.pos;
const char* end = state.str.end(); const char* end = state.str.end();
String str; String str;
@ -110,11 +119,11 @@ ParseResult parse_quoted(ParseState& state, Codepoint delimiter)
while (state.pos != end) while (state.pos != end)
{ {
const char* cur = state.pos; const char* cur = state.pos;
const Codepoint c = utf8::read_codepoint(state.pos, end); const auto c = read(state.pos, end);
if (c == delimiter) if (c == delimiter)
{ {
auto next = state.pos; auto next = state.pos;
if (utf8::read_codepoint(next, end) != delimiter) if (read(next, end) != delimiter)
{ {
if (str.empty()) if (str.empty())
return {String{String::NoCopy{}, {beg, cur}}, true}; return {String{String::NoCopy{}, {beg, cur}}, true};
@ -283,7 +292,8 @@ Token parse_percent_token(ParseState& state, bool throw_on_unterminated)
} }
else else
{ {
auto quoted = parse_quoted(state, opening_delimiter); const bool is_ascii = opening_delimiter < 128;
auto quoted = is_ascii ? parse_quoted(state, (char)opening_delimiter) : parse_quoted(state, opening_delimiter);
if (throw_on_unterminated and not quoted.terminated) if (throw_on_unterminated and not quoted.terminated)
{ {