piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

17
Source/Core/InputCommon/ControlReference/FunctionExpression.h
View File

@ -6,6 +6,7 @@
#include <memory>
#include <string>
#include <variant>
#include <vector>
#include "InputCommon/ControlReference/ExpressionParser.h"
@ -18,15 +19,27 @@ namespace ExpressionParser
class FunctionExpression : public Expression
{
public:
struct ArgumentsAreValid
{
};
struct ExpectedArguments
{
std::string text;
};
using ArgumentValidation = std::variant<ArgumentsAreValid, ExpectedArguments>;
int CountNumControls() const override;
void UpdateReferences(ControlEnvironment& env) override;
bool SetArguments(std::vector<std::unique_ptr<Expression>>&& args);
ArgumentValidation SetArguments(std::vector<std::unique_ptr<Expression>>&& args);
void SetValue(ControlState value) override;
protected:
virtual bool ValidateArguments(const std::vector<std::unique_ptr<Expression>>& args) = 0;
virtual ArgumentValidation
ValidateArguments(const std::vector<std::unique_ptr<Expression>>& args) = 0;
Expression& GetArg(u32 number);
const Expression& GetArg(u32 number) const;