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

CommandManager: unescape % while parsing the string

Browse Source
This commit is contained in:
Maxime Coste 2018-02-18 14:56:52 +11:00
parent dc30b0e6d6
commit 536fa29ed5
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/command_manager.cc
View File

@ -66,8 +66,9 @@ bool is_command_separator(Codepoint c)
return c == ';' or c == '\n'; return c == ';' or c == '\n';
} }
template<typename Func> template<typename Func, typename UnescapeFunc>
String get_until_delimiter(Reader& reader, Func is_delimiter) String get_until_delimiter(Reader& reader, Func is_delimiter,
UnescapeFunc unescape = [](Codepoint) { return false; })
{ {
auto beg = reader.pos; auto beg = reader.pos;
String str; String str;
@ -76,7 +77,7 @@ String get_until_delimiter(Reader& reader, Func is_delimiter)
while (reader) while (reader)
{ {
const Codepoint c = *reader; const Codepoint c = *reader;
if (is_delimiter(c)) if (is_delimiter(c) or (was_antislash and unescape(c)))
{ {
str += reader.substr_from(beg); str += reader.substr_from(beg);
if (was_antislash) if (was_antislash)
@ -98,7 +99,7 @@ String get_until_delimiter(Reader& reader, Func is_delimiter)
[[gnu::always_inline]] [[gnu::always_inline]]
inline String get_until_delimiter(Reader& reader, Codepoint c) inline String get_until_delimiter(Reader& reader, Codepoint c)
{ {
return get_until_delimiter(reader, [c](Codepoint ch) { return c == ch; }); return get_until_delimiter(reader, [c](Codepoint ch) { return c == ch; }, [](Codepoint) { return false; });
} }
StringView get_until_closing_delimiter(Reader& reader, Codepoint opening_delimiter, StringView get_until_closing_delimiter(Reader& reader, Codepoint opening_delimiter,
@ -317,9 +318,9 @@ Optional<Token> CommandParser::read_token(bool throw_on_unterminated)
{ {
String str = get_until_delimiter(m_reader, [](Codepoint c) { String str = get_until_delimiter(m_reader, [](Codepoint c) {
return is_command_separator(c) or is_horizontal_blank(c); return is_command_separator(c) or is_horizontal_blank(c);
}); }, [](Codepoint c) { return c == '%'; });
return Token{Token::Type::Raw, start - line.begin(), return Token{Token::Type::Raw, start - line.begin(),
coord, unescape(str, "%", '\\')}; coord, std::move(str)};
} }
return {}; return {};
} }