Skip to content

Simplify expression numbering logic in CelExprFactory #889

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
copybara-service merged 1 commit into from
Dec 15, 2025
Merged

Simplify expression numbering logic in CelExprFactory #889

Show file tree
Hide file tree
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
7 changes: 0 additions & 7 deletions common/src/main/java/dev/cel/common/ast/CelExprFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,12 +264,5 @@ protected long nextExprId() {
return ++exprId;
}

/** Attempts to decrement the next expr ID if possible. */
protected void maybeDeleteId(long id) {
if (id == exprId - 1) {
exprId--;
}
}

protected CelExprFactory() {}
}
8 changes: 1 addition & 7 deletions parser/src/main/java/dev/cel/parser/Parser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,7 @@ private Optional<CelExpr> visitMacro(
CelExpr.newBuilder().setCall(callExpr.build()).build());
}

exprFactory.maybeDeleteId(expr.id());
sourceInfo.removePositions(expr.id());
return expandedMacro;
}

Expand Down Expand Up @@ -1165,12 +1165,6 @@ private long nextExprId(int position) {
return exprId;
}

@Override
protected void maybeDeleteId(long id) {
sourceInfo.removePositions(id);
super.maybeDeleteId(id);
}

@Override
public long copyExprId(long id) {
return nextExprId(getPosition(id));
Expand Down
Loading