hasslesstech/pzks-labs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix missing bracket folds for SUB and DIV operator replacement parallelization

Browse Source
This commit is contained in:
hasslesstech
2026-10-12 21:29:02 +03:00
parent 0777faa11d
commit d97160e6ed
1 changed files with 73 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/syntaxer.cpp
+73 -75
View File
@@ -430,21 +430,20 @@ static void add_bracket_to(std::vector<Expression::Token>& tv, const int locatio
{ {
if (tv[i].t == Expression::Token::OPERATOR) if (tv[i].t == Expression::Token::OPERATOR)
{ {
switch (tv[i].v.o) if (tv[i].v.o == Expression::Token::CPA)
{ {
case Expression::Token::OPA:
lv--;
break;
case Expression::Token::CPA:
lv++; lv++;
break; }
default:
if (!lv) if (!lv)
{ {
tv.insert(tv.begin() + i + 1, Expression::Token(Expression::Token::OPA)); tv.insert(tv.begin() + i + 1, Expression::Token(Expression::Token::OPA));
return; return;
} }
break;
if (tv[i].v.o == Expression::Token::OPA)
{
lv--;
} }
} }
} }
@@ -457,21 +456,20 @@ static void add_bracket_to(std::vector<Expression::Token>& tv, const int locatio
{ {
if (tv[i].t == Expression::Token::OPERATOR) if (tv[i].t == Expression::Token::OPERATOR)
{ {
switch (tv[i].v.o) if (tv[i].v.o == Expression::Token::OPA)
{ {
case Expression::Token::OPA:
lv++; lv++;
break; }
case Expression::Token::CPA:
if (!lv)
{
tv.insert(tv.begin() + i, Expression::Token(Expression::Token::CPA));
return;
}
if (tv[i].v.o == Expression::Token::CPA)
{
lv--; lv--;
break;
default:
if (!lv)
{
tv.insert(tv.begin() + i, Expression::Token(Expression::Token::CPA));
return;
}
break;
} }
} }
} }
@@ -650,68 +648,68 @@ void apply_corrections(std::vector<Expression::Token>& tv)
for (int current_prio_level = mp[get_max_index(mp)]; current_prio_level >= 0; current_prio_level--) for (int current_prio_level = mp[get_max_index(mp)]; current_prio_level >= 0; current_prio_level--)
{ {
// calculate how many ranges need to be processed at this level int corrections = 1;
std::vector<Range> rv; int relative_level = -current_prio_level;
find_select_prio_op_ranges(mp, rv, current_prio_level);
for (int current_range = rv.size() - 1; current_range >= 0; current_range--) while (corrections)
{ {
Range &outer_range = rv[current_range]; corrections = 0;
std::vector<int> inner_prios; int same_op_cnt = -1;
rank_inner_ops_raw(inner_prios, tv, outer_range.start, outer_range.finish); for (int i = 0; i < tv.size(); i++)
for (int inner_prio = inner_prios[get_max_index(inner_prios)]; inner_prio >= 0; inner_prio--)
{ {
std::vector<Range> inner_ranges; Expression::Token& tok = tv[i];
find_select_prio_op_ranges(inner_prios, inner_ranges, inner_prio);
for (int inner_range = inner_ranges.size() - 1; inner_range >= 0; inner_range--) if (tok.t == Expression::Token::OPERATOR)
{ {
int corrections = 1; if (tok.v.o == Expression::Token::OPA)
Range &range = inner_ranges[inner_range];
while (corrections)
{ {
corrections = 0; relative_level++;
}
else if (tok.v.o == Expression::Token::CPA)
{
relative_level--;
}
int same_op_cnt = -1; if (relative_level < 0)
for (int i = outer_range.start + range.start; i < outer_range.start + range.finish + 1; i++) {
same_op_cnt = -1;
}
else if ((tok.v.o == Expression::Token::SUB || tok.v.o == Expression::Token::DIV) && !relative_level)
{
same_op_cnt++;
if (same_op_cnt == 2)
{ {
int loc = get_mop_location(tv, i); same_op_cnt = 0;
Expression::Token& tok = tv[loc];
if (tok.v.o == Expression::Token::SUB || tok.v.o == Expression::Token::DIV) corrections++;
switch (tok.v.o)
{ {
same_op_cnt++; case Expression::Token::SUB:
tok.v.o = Expression::Token::ADD;
if (same_op_cnt == 2) break;
{ case Expression::Token::DIV:
same_op_cnt = 0; tok.v.o = Expression::Token::MUL;
break;
corrections++; default:
pr_warn("Impossible operator in this branch, this is a bug!");
switch (tok.v.o) break;
{
case Expression::Token::SUB:
tok.v.o = Expression::Token::ADD;
break;
case Expression::Token::DIV:
tok.v.o = Expression::Token::MUL;
break;
default:
pr_warn("Impossible operator in this branch, this is a bug!");
break;
}
// inverse order to keep location valid between calls
add_bracket_to(tv, loc, 1);
add_bracket_to(tv, loc, -1);
pr_debug("Updated vector:");
Parser::print_math_vector(tv);
}
} }
// inverse order to keep location valid between calls
add_bracket_to(tv, i, 1);
add_bracket_to(tv, i, -1);
// advance one step to compensate for inserted left bracket
i++;
// elevate one level to compensate for new brackets
relative_level++;
pr_debug("Updated vector:");
Parser::print_math_vector(tv);
} }
} }
} }