piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-26 07:39:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

ExpressionParser/DolphinQt: Added parse results to UI.

Browse Source
This commit is contained in:
Jordan Woyak
2019-03-02 14:47:26 -06:00
parent c8b2188e19
commit ca7ce67450
6 changed files with 210 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Source/Core/InputCommon/ControlReference/ExpressionParser.h
View File

@ -6,6 +6,7 @@
#include <map>
#include <memory>
#include <optional>
#include <string>
#include "InputCommon/ControllerInterface/Device.h"
@ -49,7 +50,7 @@ public:
std::size_t string_position = 0;
std::size_t string_length = 0;
Token(TokenType type_);
explicit Token(TokenType type_);
Token(TokenType type_, std::string data_);
bool IsBinaryOperator() const;
@ -166,5 +167,26 @@ public:
virtual operator std::string() const = 0;
};
std::pair<ParseStatus, std::unique_ptr<Expression>> ParseExpression(const std::string& expr);
class ParseResult
{
public:
static ParseResult MakeEmptyResult();
static ParseResult MakeSuccessfulResult(std::unique_ptr<Expression>&& expr);
static ParseResult MakeErrorResult(Token token, std::string description);
ParseStatus status;
std::unique_ptr<Expression> expr;
// Used for parse errors:
// TODO: This should probably be moved elsewhere:
std::optional<Token> token;
std::optional<std::string> description;
private:
ParseResult() = default;
};
ParseResult ParseExpression(const std::string& expr);
ParseResult ParseTokens(const std::vector<Token>& tokens);
} // namespace ciface::ExpressionParser