From e4b464e727d2de0d3b41f673909619de119b78c1 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 28 Jan 2025 19:20:50 -0600 Subject: InputCommon/ExpressionParser: Make function argument parsing error message more clear. --- Source/Core/InputCommon/ControlReference/ExpressionParser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/InputCommon/ControlReference/ExpressionParser.cpp') diff --git a/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp b/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp index 0db51cfe2a..67459e6b15 100644 --- a/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp +++ b/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp @@ -764,7 +764,7 @@ private: // Comma before the next argument. if (TOK_COMMA != tok.type) - return ParseResult::MakeErrorResult(tok, Common::GetStringT("Expected comma.")); + return ParseResult::MakeErrorResult(tok, Common::GetStringT("Expected closing paren.")); }; } } -- cgit v1.2.3 From 67b8100cd2eb7e13d075937bac78b87a332eab5a Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 28 Jan 2025 19:23:52 -0600 Subject: InputCommon/ExpressionParser: Make ValidateArguments access existing members instead of passing arguments. --- Source/Core/InputCommon/ControlReference/ExpressionParser.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Source/Core/InputCommon/ControlReference/ExpressionParser.cpp') diff --git a/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp b/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp index 67459e6b15..b98309a823 100644 --- a/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp +++ b/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp @@ -769,7 +769,8 @@ private: } } - const auto argument_validation = func->SetArguments(std::move(args)); + func->SetArguments(std::move(args)); + const auto argument_validation = func->ValidateArguments(); if (std::holds_alternative(argument_validation)) { -- cgit v1.2.3