diff --git a/lib/external/pattern_language b/lib/external/pattern_language index 4c257ee28..6b7c486d2 160000 --- a/lib/external/pattern_language +++ b/lib/external/pattern_language @@ -1 +1 @@ -Subproject commit 4c257ee280ee80062f1e84b01e266a6aae1d9a66 +Subproject commit 6b7c486d2778bd5e95a3339bf920eebfb52aa569 diff --git a/plugins/builtin/source/content/helpers/math_evaluator.cpp b/plugins/builtin/source/content/helpers/math_evaluator.cpp index b34e17ced..57afa95e1 100644 --- a/plugins/builtin/source/content/helpers/math_evaluator.cpp +++ b/plugins/builtin/source/content/helpers/math_evaluator.cpp @@ -24,30 +24,30 @@ namespace hex { template std::pair::Operator, size_t> MathEvaluator::toOperator(const std::string &input) { - if (input.starts_with("##")) return { Operator::Combine, 2 }; - if (input.starts_with("==")) return { Operator::Equals, 2 }; - if (input.starts_with("!=")) return { Operator::NotEquals, 2 }; - if (input.starts_with(">=")) return { Operator::GreaterThanOrEquals, 2 }; - if (input.starts_with("<=")) return { Operator::LessThanOrEquals, 2 }; - if (input.starts_with(">>")) return { Operator::ShiftRight, 2 }; - if (input.starts_with("<<")) return { Operator::ShiftLeft, 2 }; - if (input.starts_with("||")) return { Operator::Or, 2 }; - if (input.starts_with("^^")) return { Operator::Xor, 2 }; - if (input.starts_with("&&")) return { Operator::And, 2 }; - if (input.starts_with("**")) return { Operator::Exponentiation, 2 }; - if (input.starts_with(">")) return { Operator::GreaterThan, 1 }; - if (input.starts_with("<")) return { Operator::LessThan, 1 }; - if (input.starts_with("!")) return { Operator::Not, 1 }; - if (input.starts_with("|")) return { Operator::BitwiseOr, 1 }; - if (input.starts_with("^")) return { Operator::BitwiseXor, 1 }; - if (input.starts_with("&")) return { Operator::BitwiseAnd, 1 }; - if (input.starts_with("~")) return { Operator::BitwiseNot, 1 }; - if (input.starts_with("+")) return { Operator::Addition, 1 }; - if (input.starts_with("-")) return { Operator::Subtraction, 1 }; - if (input.starts_with("*")) return { Operator::Multiplication, 1 }; - if (input.starts_with("/")) return { Operator::Division, 1 }; - if (input.starts_with("%")) return { Operator::Modulus, 1 }; - if (input.starts_with("=")) return { Operator::Assign, 1 }; + if (input.starts_with("##")) return { Operator::Combine, 2 }; + if (input.starts_with("==")) return { Operator::Equals, 2 }; + if (input.starts_with("!=")) return { Operator::NotEquals, 2 }; + if (input.starts_with(">=")) return { Operator::GreaterThanOrEquals, 2 }; + if (input.starts_with("<=")) return { Operator::LessThanOrEquals, 2 }; + if (input.starts_with(">>")) return { Operator::ShiftRight, 2 }; + if (input.starts_with("<<")) return { Operator::ShiftLeft, 2 }; + if (input.starts_with("||")) return { Operator::Or, 2 }; + if (input.starts_with("^^")) return { Operator::Xor, 2 }; + if (input.starts_with("&&")) return { Operator::And, 2 }; + if (input.starts_with("**")) return { Operator::Exponentiation, 2 }; + if (input.starts_with(">")) return { Operator::GreaterThan, 1 }; + if (input.starts_with("<")) return { Operator::LessThan, 1 }; + if (input.starts_with("!")) return { Operator::Not, 1 }; + if (input.starts_with("|")) return { Operator::BitwiseOr, 1 }; + if (input.starts_with("^")) return { Operator::BitwiseXor, 1 }; + if (input.starts_with("&")) return { Operator::BitwiseAnd, 1 }; + if (input.starts_with("~")) return { Operator::BitwiseNot, 1 }; + if (input.starts_with("+")) return { Operator::Addition, 1 }; + if (input.starts_with("-")) return { Operator::Subtraction, 1 }; + if (input.starts_with("*")) return { Operator::Multiplication, 1 }; + if (input.starts_with("/")) return { Operator::Division, 1 }; + if (input.starts_with("%")) return { Operator::Modulus, 1 }; + if (input.starts_with("=")) return { Operator::Assign, 1 }; return { Operator::Invalid, 0 }; } @@ -455,8 +455,7 @@ namespace hex { this->setFunction( "floor", [](auto args) { return std::floor(args[0]); }, 1, 1); this->setFunction( - "sign", [](auto args) { return (args[0] > 0) ? 1 : (args[0] == 0) ? 0 - : -1; }, 1, 1); + "sign", [](auto args) { return (args[0] > 0) ? 1 : (args[0] == 0) ? 0 : -1; }, 1, 1); this->setFunction( "abs", [](auto args) { return std::abs(args[0]); }, 1, 1); this->setFunction(