From b8a0a7a59b8ce85a34d7eb6aa1d59002a6e01250 Mon Sep 17 00:00:00 2001 From: Sour Date: Tue, 19 May 2020 21:55:43 -0400 Subject: [PATCH] Debugger: Fixed modulo operator in expressions --- Core/ExpressionEvaluator.cpp | 16 ++++++++++++---- Core/ExpressionEvaluator.h | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Core/ExpressionEvaluator.cpp b/Core/ExpressionEvaluator.cpp index cfa7be0b..dbf483c3 100644 --- a/Core/ExpressionEvaluator.cpp +++ b/Core/ExpressionEvaluator.cpp @@ -143,7 +143,7 @@ bool ExpressionEvaluator::CheckSpecialTokens(string expression, size_t &pos, str return true; } -string ExpressionEvaluator::GetNextToken(string expression, size_t &pos, ExpressionData &data, bool &success) +string ExpressionEvaluator::GetNextToken(string expression, size_t& pos, ExpressionData& data, bool& success, bool previousTokenIsOp) { string output; success = true; @@ -165,12 +165,12 @@ string ExpressionEvaluator::GetNextToken(string expression, size_t &pos, Express success = false; } output = std::to_string((uint32_t)HexUtilities::FromHex(output)); - } else if(c == '%') { + } else if(c == '%' && previousTokenIsOp) { //Binary numbers pos++; for(size_t len = expression.size(); pos < len; pos++) { c = std::tolower(expression[pos]); - if(c == '0' || c <= '1') { + if(c == '0' || c == '1') { output += c; } else { break; @@ -257,7 +257,7 @@ bool ExpressionEvaluator::ToRpn(string expression, ExpressionData &data) bool operatorOrEndTokenExpected = false; while(true) { bool success = true; - string token = GetNextToken(expression, position, data, success); + string token = GetNextToken(expression, position, data, success, previousTokenIsOp); if(!success) { return false; } @@ -617,6 +617,14 @@ void ExpressionEvaluator::RunTests() test("%1011", EvalResultType::Numeric, 11); test("%12", EvalResultType::Invalid, 0); + test("10 % 5", EvalResultType::Numeric, 0); + test("%100 % 5", EvalResultType::Numeric, 4); + test("%100%5", EvalResultType::Numeric, 4); + test("%10(10)", EvalResultType::Invalid, 0); + test("10%4*10", EvalResultType::Numeric, 20); + test("(5+5)%3", EvalResultType::Numeric, 1); + test("11%%10", EvalResultType::Numeric, 1); //11 modulo of 2 in binary (%10) + test(":$00", EvalResultType::Numeric, 0); test(":50", EvalResultType::Numeric, 50); test(":$50", EvalResultType::Numeric, 0x50); diff --git a/Core/ExpressionEvaluator.h b/Core/ExpressionEvaluator.h index 19098fef..a5cecc1d 100644 --- a/Core/ExpressionEvaluator.h +++ b/Core/ExpressionEvaluator.h @@ -123,7 +123,7 @@ private: bool IsOperator(string token, int &precedence, bool unaryOperator); EvalOperators GetOperator(string token, bool unaryOperator); bool CheckSpecialTokens(string expression, size_t &pos, string &output, ExpressionData &data); - string GetNextToken(string expression, size_t &pos, ExpressionData &data, bool &success); + string GetNextToken(string expression, size_t &pos, ExpressionData &data, bool &success, bool previousTokenIsOp); bool ProcessSpecialOperator(EvalOperators evalOp, std::stack &opStack, std::stack &precedenceStack, vector &outputQueue); bool ToRpn(string expression, ExpressionData &data); int32_t PrivateEvaluate(string expression, DebugState &state, EvalResultType &resultType, OperationInfo &operationInfo, bool &success);