mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-28 15:28:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ParseStatus: replace NoDevice with EmptyExpression

Browse source
This commit is contained in:
Michael M 2017-06-07 16:03:36 -07:00
parent 754efd75c5
commit 85301e2bae
3 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/Core/InputCommon/ControlReference/ExpressionParser.cpp
View file

@ -10,6 +10,7 @@
#include <string>
#include <vector>
#include "Common/StringUtil.h"
#include "InputCommon/ControlReference/ExpressionParser.h"
using namespace ciface::Core;
@ -393,9 +394,6 @@ private:
{
std::shared_ptr<Device> device = finder.FindDevice(tok.qualifier);
Device::Control* control = finder.FindControl(tok.qualifier);
if (control == nullptr)
return {ParseStatus::NoDevice, std::make_unique<ControlExpression>(tok.qualifier, control)};
return {ParseStatus::Successful,
std::make_unique<ControlExpression>(tok.qualifier, std::move(device), control)};
}
@ -510,8 +508,8 @@ Expression::~Expression()
static std::pair<ParseStatus, std::unique_ptr<Expression>>
ParseExpressionInner(const std::string& str, ControlFinder& finder)
{
if (str == "")
return std::make_pair(ParseStatus::Successful, nullptr);
if (StripSpaces(str).empty())
return std::make_pair(ParseStatus::EmptyExpression, nullptr);
Lexer l(str);
std::vector<Token> tokens;