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

CommandManager: diagnose unterminated strings

Browse Source
This commit is contained in:
Maxime Coste 2012-11-21 13:56:52 +01:00
parent 6bbbd2543a
commit 9d04c773c1
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/command_manager.cc
View File

@ -31,6 +31,10 @@ void CommandManager::register_commands(const memoryview<String>& command_names,
register_command(command_name, command, completer);
}
parse_error::parse_error(const String& error)
: runtime_error{"parse error: " + error} {}
namespace
{
@ -73,8 +77,16 @@ bool is_horizontal_blank(char c)
return c == ' ' or c == '\t';
}
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: " + int_to_str(nest) + ")" : "")}
{}
};
TokenList parse(const String& line,
TokenPosList* opt_token_pos_info = NULL)
TokenPosList* opt_token_pos_info = nullptr)
{
TokenList result;
@ -109,6 +121,8 @@ TokenList parse(const String& line,
while ((line[pos] != delimiter or line[pos-1] == '\\') and
pos != length)
++pos;
if (pos == length)
throw unterminated_string(String{delimiter}, String{delimiter});
}
else if (line[pos] == '%')
{
@ -149,12 +163,18 @@ TokenList parse(const String& line,
}
++pos;
}
if (pos == length)
throw unterminated_string("%" + type_name + opening_delimiter,
String{closing_delimiter}, level);
}
else
{
while (pos != length and
(line[pos] != opening_delimiter or line[pos-1] == '\\'))
++pos;
if (pos == length)
throw unterminated_string("%" + type_name + opening_delimiter,
String{opening_delimiter});
}
}
else

4
src/command_manager.hh
View File

@ -16,6 +16,10 @@ namespace Kakoune
struct Context;
struct parse_error : runtime_error
{
parse_error(const String& error);
};
using CommandParameters = memoryview<String>;