summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControlReference/ExpressionParser.h
diff options
context:
space:
mode:
authorJordan Woyak <jordan.woyak@gmail.com>2019-10-12 11:41:02 -0500
committerJordan Woyak <jordan.woyak@gmail.com>2019-10-12 11:41:02 -0500
commit72302d9c4224271a606f2782dec7dc725658b150 (patch)
tree609d7542cc7446a85d0100ace75f416f93854f8a /Source/Core/InputCommon/ControlReference/ExpressionParser.h
parentb4e2b3cae330be2a9f050a90c3bbb9d38f047777 (diff)
ExpressionParser: Add support for /* */ style comments.
Diffstat (limited to 'Source/Core/InputCommon/ControlReference/ExpressionParser.h')
-rw-r--r--Source/Core/InputCommon/ControlReference/ExpressionParser.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControlReference/ExpressionParser.h b/Source/Core/InputCommon/ControlReference/ExpressionParser.h
index 2f41d2fde7..994f8c201b 100644
--- a/Source/Core/InputCommon/ControlReference/ExpressionParser.h
+++ b/Source/Core/InputCommon/ControlReference/ExpressionParser.h
@@ -15,7 +15,7 @@ namespace ciface::ExpressionParser
{
enum TokenType
{
- TOK_DISCARD,
+ TOK_WHITESPACE,
TOK_INVALID,
TOK_EOF,
TOK_LPAREN,
@@ -25,6 +25,7 @@ enum TokenType
TOK_LITERAL,
TOK_VARIABLE,
TOK_BAREWORD,
+ TOK_COMMENT,
// Binary Ops:
TOK_BINARY_OPS_BEGIN,
TOK_AND = TOK_BINARY_OPS_BEGIN,
@@ -95,6 +96,7 @@ private:
Token GetBareword(char c);
Token GetRealLiteral(char c);
+ Token PeekToken();
Token NextToken();
};
@@ -186,5 +188,6 @@ private:
ParseResult ParseExpression(const std::string& expr);
ParseResult ParseTokens(const std::vector<Token>& tokens);
+void RemoveInertTokens(std::vector<Token>* tokens);
} // namespace ciface::ExpressionParser