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

ExpressionParser: Make function names case sensitive.

This commit is contained in:
Jordan Woyak 2019-01-08 20:34:24 -06:00
parent 2b0297489f
commit 2a377e35ed
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -477,7 +477,7 @@ private:
} }
ControlState GetValue() const override { return 0.0; } ControlState GetValue() const override { return 0.0; }
void SetValue(ControlState value) override {} void SetValue(ControlState value) override {}
std::string GetFuncName() const override { return "Unknown"; } std::string GetFuncName() const override { return "unknown"; }
}; };
class ToggleExpression : public FunctionExpression class ToggleExpression : public FunctionExpression
@ -506,7 +506,7 @@ private:
} }
void SetValue(ControlState value) override {} void SetValue(ControlState value) override {}
std::string GetFuncName() const override { return "Toggle"; } std::string GetFuncName() const override { return "toggle"; }
mutable bool m_released{}; mutable bool m_released{};
mutable bool m_state{}; mutable bool m_state{};
@ -535,7 +535,7 @@ private:
ControlState GetValue() const override { return std::sin(GetArg(0).GetValue()); } ControlState GetValue() const override { return std::sin(GetArg(0).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"; }
}; };
class TimerExpression : public FunctionExpression class TimerExpression : public FunctionExpression
@ -574,7 +574,7 @@ private:
return progress; return progress;
} }
void SetValue(ControlState value) override {} void SetValue(ControlState value) override {}
std::string GetFuncName() const override { return "Timer"; } std::string GetFuncName() const override { return "timer"; }
private: private:
using Clock = std::chrono::steady_clock; using Clock = std::chrono::steady_clock;
@ -596,7 +596,7 @@ private:
} }
void SetValue(ControlState value) override {} void SetValue(ControlState value) override {}
std::string GetFuncName() const override { return "If"; } std::string GetFuncName() const override { return "if"; }
}; };
class UnaryMinusExpression : public FunctionExpression class UnaryMinusExpression : public FunctionExpression
@ -614,7 +614,7 @@ private:
} }
void SetValue(ControlState value) override {} void SetValue(ControlState value) override {}
std::string GetFuncName() const override { return "Minus"; } std::string GetFuncName() const override { return "minus"; }
}; };
class WhileExpression : public FunctionExpression class WhileExpression : public FunctionExpression
@ -644,15 +644,11 @@ class WhileExpression : public FunctionExpression
} }
void SetValue(ControlState value) override {} void SetValue(ControlState value) override {}
std::string GetFuncName() const override { return "While"; } std::string GetFuncName() const override { return "while"; }
}; };
std::unique_ptr<FunctionExpression> MakeFunctionExpression(std::string name) std::unique_ptr<FunctionExpression> MakeFunctionExpression(std::string name)
{ {
// Case insensitive matching.
std::transform(name.begin(), name.end(), name.begin(),
[](char c) { return std::tolower(c, std::locale::classic()); });
if (name.empty()) if (name.empty())
return std::make_unique<NotExpression>(); return std::make_unique<NotExpression>();
else if ("if" == name) else if ("if" == name)