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

Fix bug in command parsing post refactoring

Browse Source 
Fixes #1857
This commit is contained in:
Maxime Coste 2018-02-19 08:29:04 +11:00
parent fc60e29870
commit 76f5fb937c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/command_manager.cc
View File

@ -297,7 +297,8 @@ Optional<Token> CommandParser::read_token(bool throw_on_unterminated)
String token = get_until_delimiter(m_reader, c); String token = get_until_delimiter(m_reader, c);
if (throw_on_unterminated and not m_reader) if (throw_on_unterminated and not m_reader)
throw parse_error{format("unterminated string {0}...{0}", c)}; throw parse_error{format("unterminated string {0}...{0}", c)};
++m_reader; if (m_reader)
++m_reader;
return Token{c == '"' ? Token::Type::RawEval return Token{c == '"' ? Token::Type::RawEval
: Token::Type::RawQuoted, : Token::Type::RawQuoted,
start - line.begin(), coord, std::move(token)}; start - line.begin(), coord, std::move(token)};
@ -305,7 +306,8 @@ Optional<Token> CommandParser::read_token(bool throw_on_unterminated)
else if (c == '%') else if (c == '%')
{ {
auto token = parse_percent_token(m_reader, throw_on_unterminated); auto token = parse_percent_token(m_reader, throw_on_unterminated);
++m_reader; if (m_reader)
++m_reader;
return token; return token;
} }
else if (is_command_separator(*m_reader)) else if (is_command_separator(*m_reader))
@ -604,7 +606,7 @@ Completions CommandManager::complete(const Context& context,
case Token::Type::RawQuoted: case Token::Type::RawQuoted:
case Token::Type::RawEval: case Token::Type::RawEval:
{ {
if (token.type != Token::Type::Raw) if (token.type != Token::Type::Raw and token.type != Token::Type::RawQuoted)
return Completions{}; return Completions{};
StringView command_name = tokens.front().content; StringView command_name = tokens.front().content;