Skip to content

Fix bug where certain combinations of loop constructs can freeze gearlance (and variants). #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lymia wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix bug where certain combinations of loop constructs can freeze gearlance (and variants). #3

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
212bf46
Fix issue where some loop constructs crashed the hill evaluator.
Lymia Oct 30, 2024
4396f69
Merge https://github.com/fis/chainlance
Lymia Oct 30, 2024
272fab5
Clean up unintended spacing change.
Lymia Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,13 +273,14 @@ void matchrep(struct oplist *ops)
fail("starting ( without a matching )");
}

void cleanrep(struct oplist *ops)
int cleanrep(struct oplist *ops)
{
/* turn contentless loops into *0's.
transform ({a}b)%N to ()*0a(b)*N.
transform (a{b})%N to (a)*Nb()*0. */

int last_real = -1;
int any_changed = 0;

for (unsigned at = 0; at < ops->len; at++)
{
Expand All @@ -299,6 +300,7 @@ void cleanrep(struct oplist *ops)
/* empty () loop */
op->count = 0;
ops->ops[op->match].count = 0;
any_changed = 1;
}
break;
case OP_INNER1:
Expand All @@ -316,6 +318,7 @@ void cleanrep(struct oplist *ops)
ops->ops[inner2].inner = -1;
ops->ops[rep2].type = OP_REP2;
ops->ops[rep2].inner = -1;
any_changed = 1;
}
break;
case OP_IREP2:
Expand All @@ -333,6 +336,7 @@ void cleanrep(struct oplist *ops)
ops->ops[rep2].type = OP_REP2;
ops->ops[rep2].count = EMPTY_LOOP_COUNT;
ops->ops[rep2].inner = -1;
any_changed = 1;
}
break;
default:
Expand All @@ -353,6 +357,7 @@ void cleanrep(struct oplist *ops)
ops->len -= del_to - at + 1; /* fixup length */
at = del_to; /* skip the loop */
to--; /* don't copy anything */
any_changed = 1;
}
else if (to < at)
{
Expand All @@ -363,6 +368,8 @@ void cleanrep(struct oplist *ops)
ops->ops[to] = *op;
}
}

return any_changed;
}

void matchloop(struct oplist *ops)
Expand Down Expand Up @@ -426,7 +433,7 @@ struct oplist *parse(stream_id input)
/* handle (...) constructions first */

matchrep(ops);
cleanrep(ops);
while (cleanrep(ops));

/* handle [...] constructions now that rep/inner levels are known */

Expand Down