ExpressionParser: Add support for simple barewords control names

If an expression can't be parsed normally, we then look to see if it's a
simple device name. This keeps backwards compatibility with simple input
ocnfigurations, where people just used the Detect button.

1 files changed, 3 insertions, 7 deletions

diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.h b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.h
index 342f513f5c..d85c17a474 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.h
@@ -41,22 +41,18 @@ private:
 	bool is_input;
 };
 
-class Parser;
 class ExpressionNode;
 class Expression
 {
-	friend class Parser;
-
 public:
-	Expression() : expr(NULL) {}
+	Expression() : node(NULL) {}
+	Expression(ExpressionNode *node);
 	~Expression();
 	ControlState GetValue();
 	void SetValue (ControlState state);
 	int num_controls;
 	bool is_complicated;
-
-private:
-	ExpressionNode *expr;
+	ExpressionNode *node;
 };
 
 enum ExpressionParseStatus