diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-07-22 02:36:26 -0400 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-07-22 03:19:22 -0400 |
| commit | bc17798ef26a56e2df3b2145f3cbccccd53d90a2 (patch) | |
| tree | 7e1cb7b38214183cc0ed8e56fb349dd2cb4fd763 /Source/Core/InputCommon/Src/ControllerInterface | |
| parent | 3c7f223aa10412dcd76d6d79f93250c69f96813a (diff) | |
InputConfigDiag: Add a simple error status label
This tells you what you did wrong at a high level if you messed up.
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp index f0870a18a4..d2982bba24 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp @@ -228,9 +228,7 @@ void ControllerInterface::UpdateReference(ControllerInterface::ControlReference* ref->parsed_expression = NULL; ControlFinder finder(*this, default_device, ref->is_input); - ExpressionParseStatus status; - status = ParseExpression(ref->expression, finder, &ref->parsed_expression); - // XXX: do something with status? + ref->parse_error = ParseExpression(ref->expression, finder, &ref->parsed_expression); } // diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h index 711f393894..00b4b2c07d 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h @@ -64,6 +64,7 @@ public: ControlState range; std::string expression; const bool is_input; + ciface::ExpressionParser::ExpressionParseStatus parse_error; virtual ~ControlReference() { delete parsed_expression; |
