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

minor code cleanup

Browse Source
This commit is contained in:
Maxime Coste 2014-11-04 13:40:35 +00:00
parent 60c1bb1315
commit f5be7c7ba5
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/command_manager.cc
View File

@ -77,20 +77,6 @@ bool is_command_separator(char c)
return c == ';' or c == '\n'; return c == ';' or c == '\n';
} }
struct unterminated_string : parse_error
{
unterminated_string(const String& open, const String& close, int nest = 0)
: parse_error{"unterminated string '" + open + "..." + close + "'" +
(nest > 0 ? "(nesting: " + to_string(nest) + ")" : "")}
{}
};
struct unknown_expand : parse_error
{
unknown_expand(const String& name)
: parse_error{"unknown expand '" + name + "'"} {}
};
String get_until_delimiter(StringView base, ByteCount& pos, char delimiter) String get_until_delimiter(StringView base, ByteCount& pos, char delimiter)
{ {
const ByteCount length = base.length(); const ByteCount length = base.length();
@ -134,6 +120,12 @@ String get_until_delimiter(StringView base, ByteCount& pos,
return base.substr(start, pos - start); return base.substr(start, pos - start);
} }
struct unknown_expand : parse_error
{
unknown_expand(const String& name)
: parse_error{"unknown expand '" + name + "'"} {}
};
template<bool throw_on_invalid> template<bool throw_on_invalid>
Token::Type token_type(StringView type_name) Token::Type token_type(StringView type_name)
{ {
@ -177,6 +169,14 @@ void skip_blanks_and_comments(StringView base, ByteCount& pos)
} }
} }
struct unterminated_string : parse_error
{
unterminated_string(const String& open, const String& close, int nest = 0)
: parse_error{"unterminated string '" + open + "..." + close + "'" +
(nest > 0 ? "(nesting: " + to_string(nest) + ")" : "")}
{}
};
template<bool throw_on_unterminated> template<bool throw_on_unterminated>
Token parse_percent_token(StringView line, ByteCount& pos) Token parse_percent_token(StringView line, ByteCount& pos)
{ {