diff options
| author | JMC47 <JMC4789@gmail.com> | 2025-01-27 21:16:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-27 21:16:29 -0500 |
| commit | e18a4d04b4fc1363b1ce48b2fc43589ef3a05962 (patch) | |
| tree | 442a0a31d039f9327e61dea14d9920cf5627f1b3 /Source/Core/InputCommon/ControlReference/ExpressionParser.h | |
| parent | 2b5cd96cb1287f45e44f72dece3b53d00020725f (diff) | |
| parent | 5078a63084121fa31d6d763dfa30ba5b0f99f040 (diff) | |
Merge pull request #13178 from jordan-woyak/input-expressions-conditional-op
InputCommon: Add ternary conditional operator to input expressions.
Diffstat (limited to 'Source/Core/InputCommon/ControlReference/ExpressionParser.h')
| -rw-r--r-- | Source/Core/InputCommon/ControlReference/ExpressionParser.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/ControlReference/ExpressionParser.h b/Source/Core/InputCommon/ControlReference/ExpressionParser.h index 3172e77f48..af24900d52 100644 --- a/Source/Core/InputCommon/ControlReference/ExpressionParser.h +++ b/Source/Core/InputCommon/ControlReference/ExpressionParser.h @@ -26,6 +26,8 @@ enum TokenType TOK_BAREWORD, TOK_COMMENT, TOK_HOTKEY, + TOK_QUESTION, + TOK_COLON, // Binary Ops: TOK_BINARY_OPS_BEGIN, TOK_AND = TOK_BINARY_OPS_BEGIN, |