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

CommandManager: fix some crashes

Browse Source
This commit is contained in:
Maxime Coste 2013-03-19 18:58:21 +01:00
parent 9c78f02903
commit a19a788b94
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/command_manager.cc
View File

@ -85,6 +85,12 @@ struct unterminated_string : parse_error
{} {}
}; };
struct unknown_expand : parse_error
{
unknown_expand(const String& name)
: parse_error{"unknown expand '" + name + "'"} {}
};
TokenList parse(const String& line, TokenList parse(const String& line,
TokenPosList* opt_token_pos_info = nullptr) TokenPosList* opt_token_pos_info = nullptr)
{ {
@ -132,12 +138,17 @@ TokenList parse(const String& line,
++pos; ++pos;
String type_name = line.substr(type_start, pos - type_start); String type_name = line.substr(type_start, pos - type_start);
if (pos == length)
throw parse_error{"expected a string delimiter after '%" + type_name + "'"};
if (type_name == "sh") if (type_name == "sh")
type = Token::Type::ShellExpand; type = Token::Type::ShellExpand;
if (type_name == "reg") else if (type_name == "reg")
type = Token::Type::RegisterExpand; type = Token::Type::RegisterExpand;
if (type_name == "opt") else if (type_name == "opt")
type = Token::Type::OptionExpand; type = Token::Type::OptionExpand;
else if (type_name != "")
throw unknown_expand{type_name};
static const std::unordered_map<char, char> matching_delimiters = { static const std::unordered_map<char, char> matching_delimiters = {
{ '(', ')' }, { '[', ']' }, { '{', '}' }, { '<', '>' } { '(', ')' }, { '[', ']' }, { '{', '}' }, { '<', '>' }