Skip to content

Fix collapse clause colon parsing flake #14

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

Merged
ouankou merged 1 commit into from
Nov 24, 2025
Merged

Fix collapse clause colon parsing flake #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions src/acclexer.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@ lexer grammar acclexer;

@ lexer :: declarations
{ /* private lexer declarations/members section */
int parenthesis_local_count, parenthesis_global_count, bracket_count;
int colon_count;
int parenthesis_local_count = 0;
int parenthesis_global_count = 0;
int bracket_count = 0;
int colon_count = 0;
bool paren_processed = false;
}
// Appears in line with the other class member definitions in the cpp file.
Expand Down Expand Up @@ -195,7 +197,12 @@ CAPTURE
;

COLLAPSE
: 'collapse' -> pushMode (expr_clause)
: 'collapse'
{
// Allow colon-delimited modifiers like collapse(force:2) to stay inside the expression.
colon_count = 1;
}
-> pushMode (expr_clause)
;

PCOPY
Expand Down