archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-20 11:21:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

ExpressionParser: Add support for the add operator

Browse source 
Use "+" instead of "^" this time.
This commit is contained in:
Jasper St. Pierre 2013-06-14 02:52:07 -04:00
parent 6246f6e815
commit d2753cce66
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
View file

@ -24,6 +24,7 @@ enum TokenType
TOK_AND,
TOK_OR,
TOK_NOT,
TOK_ADD,
TOK_CONTROL,
};
@ -37,6 +38,8 @@ inline std::string OpName(TokenType op)
return "Or";
case TOK_NOT:
return "Not";
case TOK_ADD:
return "Add";
default:
assert(false);
return "";
@ -72,6 +75,8 @@ public:
return "|";
case TOK_NOT:
return "!";
case TOK_ADD:
return "+";
case TOK_CONTROL:
return "Device(" + (std::string)qualifier + ")";
}
@ -144,6 +149,8 @@ public:
return Token(TOK_OR);
case '!':
return Token(TOK_NOT);
case '+':
return Token(TOK_ADD);
case '`':
return GetControlQualifier();
default:
@ -232,6 +239,8 @@ public:
return std::min(lhsValue, rhsValue);
case TOK_OR:
return std::max(lhsValue, rhsValue);
case TOK_ADD:
return std::min(lhsValue + rhsValue, 1.0f);
default:
assert(false);
return 0;
@ -412,6 +421,7 @@ private:
{
case TOK_AND:
case TOK_OR:
case TOK_ADD:
return true;
default:
return false;