Skip to content

Remove modifier create from CelCreateList, CelCreateMap and CelCreateStruct #318

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
Apr 30, 2024
Merged

Remove modifier create from CelCreateList, CelCreateMap and CelCreateStruct #318

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
4 changes: 2 additions & 2 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
import dev.cel.common.CelValidationResult;
import dev.cel.common.CelVarDecl;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelExpr.CelCreateList;
import dev.cel.common.ast.CelExpr.CelList;
import dev.cel.common.testing.RepeatedTestProvider;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelType;
Expand Down Expand Up @@ -486,7 +486,7 @@ public void compile_withOptionalTypes() throws Exception {

CelAbstractSyntaxTree ast = cel.compile("[?a]").getAst();

CelCreateList createList = ast.getExpr().createList();
CelList createList = ast.getExpr().createList();
assertThat(createList.optionalIndices()).containsExactly(0);
assertThat(createList.elements()).containsExactly(CelExpr.ofIdent(2, "a"));
}
Expand Down
37 changes: 18 additions & 19 deletions checker/src/main/java/dev/cel/checker/ExprChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,11 @@ public CelExpr visit(CelExpr expr) {
return visit(expr, expr.select());
case CALL:
return visit(expr, expr.call());
case CREATE_LIST:
case LIST:
return visit(expr, expr.createList());
case CREATE_STRUCT:
case STRUCT:
return visit(expr, expr.createStruct());
case CREATE_MAP:
case MAP:
return visit(expr, expr.createMap());
case COMPREHENSION:
return visit(expr, expr.comprehension());
Expand Down Expand Up @@ -355,7 +355,7 @@ private CelExpr visit(CelExpr expr, CelExpr.CelCall call) {
}

@CheckReturnValue
private CelExpr visit(CelExpr expr, CelExpr.CelCreateStruct createStruct) {
private CelExpr visit(CelExpr expr, CelExpr.CelStruct createStruct) {
// Determine the type of the message.
CelType messageType = SimpleType.ERROR;
CelIdentDecl decl = env.lookupIdent(getPosition(expr), inContainer, createStruct.messageName());
Expand Down Expand Up @@ -383,9 +383,9 @@ private CelExpr visit(CelExpr expr, CelExpr.CelCreateStruct createStruct) {
}

// Check the field initializers.
ImmutableList<CelExpr.CelCreateStruct.Entry> entriesList = createStruct.entries();
ImmutableList<CelExpr.CelStruct.Entry> entriesList = createStruct.entries();
for (int i = 0; i < entriesList.size(); i++) {
CelExpr.CelCreateStruct.Entry entry = entriesList.get(i);
CelExpr.CelStruct.Entry entry = entriesList.get(i);
CelExpr visitedValueExpr = visit(entry.value());
if (namespacedDeclarations && !visitedValueExpr.equals(entry.value())) {
// Subtree has been rewritten. Replace the struct value.
Expand Down Expand Up @@ -414,12 +414,12 @@ private CelExpr visit(CelExpr expr, CelExpr.CelCreateStruct createStruct) {
}

@CheckReturnValue
private CelExpr visit(CelExpr expr, CelExpr.CelCreateMap createMap) {
private CelExpr visit(CelExpr expr, CelExpr.CelMap createMap) {
CelType mapKeyType = null;
CelType mapValueType = null;
ImmutableList<CelExpr.CelCreateMap.Entry> entriesList = createMap.entries();
ImmutableList<CelExpr.CelMap.Entry> entriesList = createMap.entries();
for (int i = 0; i < entriesList.size(); i++) {
CelExpr.CelCreateMap.Entry entry = entriesList.get(i);
CelExpr.CelMap.Entry entry = entriesList.get(i);
CelExpr visitedMapKeyExpr = visit(entry.key());
if (namespacedDeclarations && !visitedMapKeyExpr.equals(entry.key())) {
// Subtree has been rewritten. Replace the map key.
Expand Down Expand Up @@ -455,7 +455,7 @@ private CelExpr visit(CelExpr expr, CelExpr.CelCreateMap createMap) {
}

@CheckReturnValue
private CelExpr visit(CelExpr expr, CelExpr.CelCreateList createList) {
private CelExpr visit(CelExpr expr, CelExpr.CelList createList) {
CelType elemsType = null;
ImmutableList<CelExpr> elementsList = createList.elements();
HashSet<Integer> optionalIndices = new HashSet<>(createList.optionalIndices());
Expand Down Expand Up @@ -797,7 +797,7 @@ private int getPosition(CelExpr expr) {
return pos == null ? 0 : pos;
}

private int getPosition(CelExpr.CelCreateStruct.Entry entry) {
private int getPosition(CelExpr.CelStruct.Entry entry) {
Integer pos = positionMap.get(entry.id());
return pos == null ? 0 : pos;
}
Expand Down Expand Up @@ -848,30 +848,29 @@ private static CelExpr replaceCallSubtree(CelExpr expr, CelExpr target) {
}

private static CelExpr replaceListElementSubtree(CelExpr expr, CelExpr element, int index) {
CelExpr.CelCreateList newList =
expr.createList().toBuilder().setElement(index, element).build();
CelExpr.CelList newList = expr.createList().toBuilder().setElement(index, element).build();
return expr.toBuilder().setCreateList(newList).build();
}

private static CelExpr replaceStructEntryValueSubtree(CelExpr expr, CelExpr newValue, int index) {
CelExpr.CelCreateStruct createStruct = expr.createStruct();
CelExpr.CelCreateStruct.Entry newEntry =
CelExpr.CelStruct createStruct = expr.createStruct();
CelExpr.CelStruct.Entry newEntry =
createStruct.entries().get(index).toBuilder().setValue(newValue).build();
createStruct = createStruct.toBuilder().setEntry(index, newEntry).build();
return expr.toBuilder().setCreateStruct(createStruct).build();
}

private static CelExpr replaceMapEntryKeySubtree(CelExpr expr, CelExpr newKey, int index) {
CelExpr.CelCreateMap createMap = expr.createMap();
CelExpr.CelCreateMap.Entry newEntry =
CelExpr.CelMap createMap = expr.createMap();
CelExpr.CelMap.Entry newEntry =
createMap.entries().get(index).toBuilder().setKey(newKey).build();
createMap = createMap.toBuilder().setEntry(index, newEntry).build();
return expr.toBuilder().setCreateMap(createMap).build();
}

private static CelExpr replaceMapEntryValueSubtree(CelExpr expr, CelExpr newValue, int index) {
CelExpr.CelCreateMap createMap = expr.createMap();
CelExpr.CelCreateMap.Entry newEntry =
CelExpr.CelMap createMap = expr.createMap();
CelExpr.CelMap.Entry newEntry =
createMap.entries().get(index).toBuilder().setValue(newValue).build();
createMap = createMap.toBuilder().setEntry(index, newEntry).build();
return expr.toBuilder().setCreateMap(createMap).build();
Expand Down
Loading