mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-28 15:28:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ExpressionParser: Show error message with expected arguments.

Browse source
This commit is contained in:
Jordan Woyak 2019-10-11 19:38:18 -05:00
parent b57178d246
commit 4d41bd64c8
3 changed files with 102 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Source/Core/InputCommon/ControlReference/ExpressionParser.cpp
View file

@ -469,7 +469,8 @@ private:
return tok.type == type;
}
ParseResult ParseFunctionArguments(std::unique_ptr<FunctionExpression>&& func,
ParseResult ParseFunctionArguments(const std::string_view& func_name,
std::unique_ptr<FunctionExpression>&& func,
const Token& func_tok)
{
std::vector<std::unique_ptr<Expression>> args;
@ -518,10 +519,15 @@ private:
}
}
if (!func->SetArguments(std::move(args)))
const auto argument_validation = func->SetArguments(std::move(args));
if (std::holds_alternative<FunctionExpression::ExpectedArguments>(argument_validation))
{
// TODO: It would be nice to output how many arguments are expected.
return ParseResult::MakeErrorResult(func_tok, _trans("Wrong number of arguments."));
const auto text = std::string(func_name) + '(' +
std::get<FunctionExpression::ExpectedArguments>(argument_validation).text +
')';
return ParseResult::MakeErrorResult(func_tok, _trans("Expected arguments: " + text));
}
return ParseResult::MakeSuccessfulResult(std::move(func));
@ -543,7 +549,7 @@ private:
return ParseAtom(control_tok);
}
return ParseFunctionArguments(std::move(func), tok);
return ParseFunctionArguments(tok.data, std::move(func), tok);
}
case TOK_CONTROL:
{
@ -553,7 +559,7 @@ private:
}
case TOK_NOT:
{
return ParseFunctionArguments(MakeFunctionExpression("not"), tok);
return ParseFunctionArguments("not", MakeFunctionExpression("not"), tok);
}
case TOK_LITERAL:
{
@ -571,7 +577,7 @@ private:
{
// An atom was expected but we got a subtraction symbol.
// Interpret it as a unary minus function.
return ParseFunctionArguments(MakeFunctionExpression("minus"), tok);
return ParseFunctionArguments("minus", MakeFunctionExpression("minus"), tok);
}
default:
{