ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12961 from JosJuice/expression-parser-translation 

InputCommon: Translate ExpressionParser error messages
This commit is contained in:
Tilka 2024-08-07 03:28:48 +01:00 committed by GitHub
parent e736d611fc defc38b258
commit 603c8fad85
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Source/Core/InputCommon/ControlReference/ExpressionParser.cpp
View File

@ -15,7 +15,7 @@
#include <vector> #include <vector>
#include "Common/Assert.h" #include "Common/Assert.h"
#include "Common/Common.h" #include "Common/MsgHandler.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "InputCommon/ControlReference/FunctionExpression.h" #include "InputCommon/ControlReference/FunctionExpression.h"
@ -454,7 +454,7 @@ static ParseResult MakeLiteralExpression(const Token& token)
if (TryParse(token.data, &val)) if (TryParse(token.data, &val))
return ParseResult::MakeSuccessfulResult(std::make_unique<LiteralReal>(val)); return ParseResult::MakeSuccessfulResult(std::make_unique<LiteralReal>(val));
else else
return ParseResult::MakeErrorResult(token, _trans("Invalid literal.")); return ParseResult::MakeErrorResult(token, Common::GetStringT("Invalid literal."));
} }
class VariableExpression : public Expression class VariableExpression : public Expression
@ -690,7 +690,7 @@ public:
if (Peek().type == TOK_EOF) if (Peek().type == TOK_EOF)
return result; return result;
return ParseResult::MakeErrorResult(Peek(), _trans("Expected end of expression.")); return ParseResult::MakeErrorResult(Peek(), Common::GetStringT("Expected end of expression."));
} }
private: private:
@ -758,7 +758,7 @@ private:
// Comma before the next argument. // Comma before the next argument.
if (TOK_COMMA != tok.type) if (TOK_COMMA != tok.type)
return ParseResult::MakeErrorResult(tok, _trans("Expected comma.")); return ParseResult::MakeErrorResult(tok, Common::GetStringT("Expected comma."));
}; };
} }
} }
@ -771,7 +771,8 @@ private:
std::get<FunctionExpression::ExpectedArguments>(argument_validation).text + std::get<FunctionExpression::ExpectedArguments>(argument_validation).text +
')'; ')';
return ParseResult::MakeErrorResult(func_tok, _trans("Expected arguments: " + text)); return ParseResult::MakeErrorResult(func_tok,
Common::FmtFormatT("Expected arguments: {0}", text));
} }
return ParseResult::MakeSuccessfulResult(std::move(func)); return ParseResult::MakeSuccessfulResult(std::move(func));
@ -812,7 +813,7 @@ private:
case TOK_VARIABLE: case TOK_VARIABLE:
{ {
if (tok.data.empty()) if (tok.data.empty())
return ParseResult::MakeErrorResult(tok, _trans("Expected variable name.")); return ParseResult::MakeErrorResult(tok, Common::GetStringT("Expected variable name."));
else else
return ParseResult::MakeSuccessfulResult(std::make_unique<VariableExpression>(tok.data)); return ParseResult::MakeSuccessfulResult(std::make_unique<VariableExpression>(tok.data));
} }
@ -838,7 +839,7 @@ private:
} }
default: default:
{ {
return ParseResult::MakeErrorResult(tok, _trans("Expected start of expression.")); return ParseResult::MakeErrorResult(tok, Common::GetStringT("Expected start of expression."));
} }
} }
} }
@ -908,7 +909,7 @@ private:
const auto rparen = Chew(); const auto rparen = Chew();
if (rparen.type != TOK_RPAREN) if (rparen.type != TOK_RPAREN)
{ {
return ParseResult::MakeErrorResult(rparen, _trans("Expected closing paren.")); return ParseResult::MakeErrorResult(rparen, Common::GetStringT("Expected closing paren."));
} }
return result; return result;
@ -918,7 +919,7 @@ private:
{ {
Token tok = Chew(); Token tok = Chew();
if (tok.type != TOK_LPAREN) if (tok.type != TOK_LPAREN)
return ParseResult::MakeErrorResult(tok, _trans("Expected opening paren.")); return ParseResult::MakeErrorResult(tok, Common::GetStringT("Expected opening paren."));
std::vector<std::unique_ptr<ControlExpression>> inputs; std::vector<std::unique_ptr<ControlExpression>> inputs;
@ -927,7 +928,7 @@ private:
tok = Chew(); tok = Chew();
if (tok.type != TOK_CONTROL && tok.type != TOK_BAREWORD) if (tok.type != TOK_CONTROL && tok.type != TOK_BAREWORD)
return ParseResult::MakeErrorResult(tok, _trans("Expected name of input.")); return ParseResult::MakeErrorResult(tok, Common::GetStringT("Expected name of input."));
ControlQualifier cq; ControlQualifier cq;
cq.FromString(tok.data); cq.FromString(tok.data);
@ -941,7 +942,7 @@ private:
if (tok.type == TOK_RPAREN) if (tok.type == TOK_RPAREN)
break; break;
return ParseResult::MakeErrorResult(tok, _trans("Expected + or closing paren.")); return ParseResult::MakeErrorResult(tok, Common::GetStringT("Expected + or closing paren."));
} }
return ParseResult::MakeSuccessfulResult(std::make_unique<HotkeyExpression>(std::move(inputs))); return ParseResult::MakeSuccessfulResult(std::make_unique<HotkeyExpression>(std::move(inputs)));
@ -961,7 +962,8 @@ static ParseResult ParseComplexExpression(const std::string& str)
std::vector<Token> tokens; std::vector<Token> tokens;
const ParseStatus tokenize_status = l.Tokenize(tokens); const ParseStatus tokenize_status = l.Tokenize(tokens);
if (tokenize_status != ParseStatus::Successful) if (tokenize_status != ParseStatus::Successful)
return ParseResult::MakeErrorResult(Token(TOK_INVALID), _trans("Tokenizing failed.")); return ParseResult::MakeErrorResult(Token(TOK_INVALID),
Common::GetStringT("Tokenizing failed."));
RemoveInertTokens(&tokens); RemoveInertTokens(&tokens);
return ParseTokens(tokens); return ParseTokens(tokens);