Skip to content

Commit 9a3b384

Browse files
l46kokcopybara-github
authored andcommitted
Add cel.@block test coverage for parsed-only mode
PiperOrigin-RevId: 894125313
1 parent 7d73658 commit 9a3b384

File tree

14 files changed

+525
-153
lines changed

14 files changed

+525
-153
lines changed

extensions/src/main/java/dev/cel/extensions/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ java_library(
142142
deps = [
143143
"//common:compiler_common",
144144
"//common/ast",
145+
"//common/types",
145146
"//compiler:compiler_builder",
146147
"//extensions:extension_library",
147148
"//parser:macro",

extensions/src/main/java/dev/cel/extensions/CelBindingsExtensions.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@
2222
import com.google.errorprone.annotations.Immutable;
2323
import dev.cel.common.CelFunctionDecl;
2424
import dev.cel.common.CelIssue;
25+
import dev.cel.common.CelOverloadDecl;
2526
import dev.cel.common.ast.CelExpr;
27+
import dev.cel.common.types.ListType;
28+
import dev.cel.common.types.SimpleType;
29+
import dev.cel.common.types.TypeParamType;
2630
import dev.cel.compiler.CelCompilerLibrary;
2731
import dev.cel.parser.CelMacro;
2832
import dev.cel.parser.CelMacroExprFactory;
@@ -62,7 +66,15 @@ public int version() {
6266

6367
@Override
6468
public ImmutableSet<CelFunctionDecl> functions() {
65-
return ImmutableSet.of();
69+
// TODO: Add bindings for block once decorator support is available.
70+
return ImmutableSet.of(
71+
CelFunctionDecl.newFunctionDeclaration(
72+
"cel.@block",
73+
CelOverloadDecl.newGlobalOverload(
74+
"cel_block_list",
75+
TypeParamType.create("T"),
76+
ListType.create(SimpleType.DYN),
77+
TypeParamType.create("T"))));
6678
}
6779

6880
@Override

extensions/src/main/java/dev/cel/extensions/CelComprehensionsExtensions.java

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -118,29 +118,18 @@ public void setRuntimeOptions(CelRuntimeBuilder runtimeBuilder) {
118118
@Override
119119
public void setRuntimeOptions(
120120
CelRuntimeBuilder runtimeBuilder, RuntimeEquality runtimeEquality, CelOptions celOptions) {
121-
for (Function function : functions) {
122-
for (CelOverloadDecl overload : function.functionDecl.overloads()) {
123-
switch (overload.overloadId()) {
124-
case MAP_INSERT_OVERLOAD_MAP_MAP:
125-
runtimeBuilder.addFunctionBindings(
126-
CelFunctionBinding.from(
127-
MAP_INSERT_OVERLOAD_MAP_MAP,
128-
Map.class,
129-
Map.class,
130-
(map1, map2) -> mapInsertMap(map1, map2, runtimeEquality)));
131-
break;
132-
case MAP_INSERT_OVERLOAD_KEY_VALUE:
133-
runtimeBuilder.addFunctionBindings(
134-
CelFunctionBinding.from(
135-
MAP_INSERT_OVERLOAD_KEY_VALUE,
136-
ImmutableList.of(Map.class, Object.class, Object.class),
137-
args -> mapInsertKeyValue(args, runtimeEquality)));
138-
break;
139-
default:
140-
// Nothing to add.
141-
}
142-
}
143-
}
121+
runtimeBuilder.addFunctionBindings(
122+
CelFunctionBinding.fromOverloads(
123+
MAP_INSERT_FUNCTION,
124+
CelFunctionBinding.from(
125+
MAP_INSERT_OVERLOAD_MAP_MAP,
126+
Map.class,
127+
Map.class,
128+
(map1, map2) -> mapInsertMap(map1, map2, runtimeEquality)),
129+
CelFunctionBinding.from(
130+
MAP_INSERT_OVERLOAD_KEY_VALUE,
131+
ImmutableList.of(Map.class, Object.class, Object.class),
132+
args -> mapInsertKeyValue(args, runtimeEquality))));
144133
}
145134

146135
@Override

extensions/src/test/java/dev/cel/extensions/CelBindingsExtensionsTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ public void library() {
6363
CelExtensions.getExtensionLibrary("bindings", CelOptions.DEFAULT);
6464
assertThat(library.name()).isEqualTo("bindings");
6565
assertThat(library.latest().version()).isEqualTo(0);
66-
assertThat(library.version(0).functions()).isEmpty();
66+
assertThat(library.version(0).functions().stream().map(CelFunctionDecl::name))
67+
.containsExactly("cel.@block");
6768
assertThat(library.version(0).macros().stream().map(CelMacro::getFunction))
6869
.containsExactly("bind");
6970
}

optimizer/src/test/java/dev/cel/optimizer/optimizers/BUILD.bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ java_library(
3333
"//parser:unparser",
3434
"//runtime",
3535
"//runtime:function_binding",
36+
"//runtime:partial_vars",
37+
"//runtime:program",
38+
"//runtime:unknown_attributes",
3639
"//testing:baseline_test_case",
3740
"@maven//:junit_junit",
3841
"@maven//:com_google_testparameterinjector_test_parameter_injector",

0 commit comments

Comments
 (0)