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

ExpressionParser: cleanup.

This commit is contained in:
Jordan Woyak 2018-12-30 16:35:52 -06:00
parent 58efc93ed4
commit 2c89b60298
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,7 +106,7 @@ public:
case TOK_OR: case TOK_OR:
return "|"; return "|";
case TOK_UNARY: case TOK_UNARY:
return "!" + data; return '!' + data;
case TOK_ADD: case TOK_ADD:
return "+"; return "+";
case TOK_MUL: case TOK_MUL:
@ -124,7 +124,7 @@ public:
case TOK_COND: case TOK_COND:
return "?"; return "?";
case TOK_CONTROL: case TOK_CONTROL:
return "Device(" + data + ")"; return "Device(" + data + ')';
case TOK_LITERAL: case TOK_LITERAL:
return '\'' + data + '\''; return '\'' + data + '\'';
case TOK_VARIABLE: case TOK_VARIABLE:
@ -422,7 +422,7 @@ public:
operator std::string() const override operator std::string() const override
{ {
return "!" + GetFuncName() + "(" + (std::string)(*inner) + ")"; return '!' + GetFuncName() + '(' + static_cast<std::string>(*inner) + ')';
} }
protected: protected:
@ -493,7 +493,7 @@ class UnarySinExpression : public UnaryExpression
public: public:
UnarySinExpression(std::unique_ptr<Expression>&& inner_) : UnaryExpression(std::move(inner_)) {} UnarySinExpression(std::unique_ptr<Expression>&& inner_) : UnaryExpression(std::move(inner_)) {}
ControlState GetValue() const override { return std::cos(inner->GetValue()); } ControlState GetValue() const override { return std::sin(inner->GetValue()); }
void SetValue(ControlState value) override {} void SetValue(ControlState value) override {}
std::string GetFuncName() const override { return "Sin"; } std::string GetFuncName() const override { return "Sin"; }
}; };
@ -502,9 +502,10 @@ std::unique_ptr<UnaryExpression> MakeUnaryExpression(std::string name,
std::unique_ptr<Expression>&& inner_) std::unique_ptr<Expression>&& inner_)
{ {
// Case insensitive matching. // Case insensitive matching.
std::transform(name.begin(), name.end(), name.begin(), ::tolower); std::transform(name.begin(), name.end(), name.begin(),
[](char c) { return std::tolower(c, std::locale::classic()); });
if ("" == name) if (name.empty())
return std::make_unique<UnaryNotExpression>(std::move(inner_)); return std::make_unique<UnaryNotExpression>(std::move(inner_));
else if ("toggle" == name) else if ("toggle" == name)
return std::make_unique<UnaryToggleExpression>(std::move(inner_)); return std::make_unique<UnaryToggleExpression>(std::move(inner_));
@ -569,7 +570,8 @@ private:
std::unique_ptr<LiteralExpression> MakeLiteralExpression(std::string name) std::unique_ptr<LiteralExpression> MakeLiteralExpression(std::string name)
{ {
// Case insensitive matching. // Case insensitive matching.
std::transform(name.begin(), name.end(), name.begin(), ::tolower); std::transform(name.begin(), name.end(), name.begin(),
[](char c) { return std::tolower(c, std::locale::classic()); });
// Check for named literals: // Check for named literals:
if ("timer" == name) if ("timer" == name)