github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 06:13:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated binary parsing to be right-associative. Fixed PopulateExpressionValues bug.

Browse source
This commit is contained in:
Anthony Stewart 2025-07-02 23:25:13 -05:00 • committed by xxAtrain223
commit 3f6069b9a5
2 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
soh/soh/Enhancements/randomizer/logic_expression.cpp
View file

@ -230,37 +230,28 @@ class Parser {
std::shared_ptr<LogicExpression::Impl>
ParseBinaryOp(size_t& pos, const std::vector<Token>& tokens, LowerFunc lowerFunc,
const std::vector<std::pair<std::string, LogicExpression::Impl::Type>>& operators) {
size_t initial_pos = pos;
auto left = (this->*lowerFunc)();
while (pos < tokens.size() && tokens[pos].Type == LETokenType::Operator) {
bool matched = false;
if (pos < tokens.size() && tokens[pos].Type == LETokenType::Operator) {
for (const auto& [op, exprType] : operators) {
if (tokens[pos].Text == op) {
++pos; // consume operator
auto right = (this->*lowerFunc)();
auto right = ParseBinaryOp(pos, tokens, lowerFunc, operators);
auto expr = std::make_shared<LogicExpression::Impl>();
expr->type = exprType;
// For comparison operators, store the operation
if (exprType == LogicExpression::Impl::Type::Comparison) {
expr->operation = op;
}
expr->children.emplace_back(left);
expr->children.back()->parent = expr.get();
expr->children.emplace_back(right);
expr->children.back()->parent = expr.get();
expr->startIndex = tokens[initial_pos].StartIndex;
expr->endIndex = tokens[pos - 1].EndIndex;
left = expr;
matched = true;
break;
return expr;
}
}
if (!matched)
break;
}
return left;
}

3
soh/soh/Enhancements/randomizer/randomizer_logic_tracker.cpp
View file

@ -73,8 +73,9 @@ static void PopulateExpressionValues(LogicTrackerCheck::Region::ExpressionRow& r
for (auto& rowChild : row.Children) {
for (const auto& evalChild : eval.Children) {
if (row.Expression == eval.Expression) {
if (rowChild.Expression == evalChild.Expression) {
PopulateExpressionValues(rowChild, evalChild, ageTime);
break;
}
}
}