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

ExpressionParser: clean up ControlExpression

This commit is contained in:
Michael M 2017-06-07 15:54:59 -07:00
parent 3df945f8d0
commit f1ff1e3d08
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,19 +234,19 @@ class ControlExpression : public ExpressionNode
public: public:
ControlQualifier qualifier; ControlQualifier qualifier;
Device::Control* control; Device::Control* control;
// Keep a shared_ptr to the device so the control pointer doesn't become invalid
std::shared_ptr<Device> m_device;
ControlExpression(ControlQualifier qualifier_, std::shared_ptr<Device> device, ControlExpression(ControlQualifier qualifier_, std::shared_ptr<Device> device,
Device::Control* control_) Device::Control* control_)
: qualifier(qualifier_), control(control_), m_device(device) : qualifier(qualifier_), control(control_), m_device(std::move(device))
{ {
} }
ControlState GetValue() const override { return control->ToInput()->GetState(); } ControlState GetValue() const override { return control->ToInput()->GetState(); }
void SetValue(ControlState value) override { control->ToOutput()->SetState(value); } void SetValue(ControlState value) override { control->ToOutput()->SetState(value); }
int CountNumControls() const override { return 1; } int CountNumControls() const override { return 1; }
operator std::string() const override { return "`" + (std::string)qualifier + "`"; } operator std::string() const override { return "`" + static_cast<std::string>(qualifier) + "`"; }
private:
std::shared_ptr<Device> m_device;
}; };
class BinaryExpression : public ExpressionNode class BinaryExpression : public ExpressionNode
@ -405,7 +405,7 @@ private:
return {ParseStatus::NoDevice, std::make_unique<DummyExpression>(tok.qualifier)}; return {ParseStatus::NoDevice, std::make_unique<DummyExpression>(tok.qualifier)};
return {ParseStatus::Successful, return {ParseStatus::Successful,
std::make_unique<ControlExpression>(tok.qualifier, device, control)}; std::make_unique<ControlExpression>(tok.qualifier, std::move(device), control)};
} }
case TOK_LPAREN: case TOK_LPAREN:
return Paren(); return Paren();
@ -550,8 +550,8 @@ std::pair<ParseStatus, std::unique_ptr<Expression>> ParseExpression(const std::s
if (control) if (control)
{ {
return std::make_pair(ParseStatus::Successful, return std::make_pair(ParseStatus::Successful,
std::make_unique<Expression>( std::make_unique<Expression>(std::make_unique<ControlExpression>(
std::make_unique<ControlExpression>(qualifier, device, control))); qualifier, std::move(device), control)));
} }
return ParseExpressionInner(str, finder); return ParseExpressionInner(str, finder);