Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion extensions/src/main/java/dev/cel/extensions/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,7 +122,6 @@ java_library(
":extension_library",
"//checker:checker_builder",
"//common:compiler_common",
"//common:options",
"//common/ast",
"//common/exceptions:numeric_overflow",
"//common/internal:comparison_functions",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,8 @@
* planner runtime, along with parsed-only and checked expression evaluations for the planner.
*/
abstract class CelExtensionTestBase {
@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter public boolean isParseOnly;
@TestParameter CelRuntimeFlavor runtimeFlavor;
@TestParameter boolean isParseOnly;

@Before
public void setUpBase() {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,8 +46,8 @@

@RunWith(TestParameterInjector.class)
public class CelMathExtensionsTest {
@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter public boolean isParseOnly;
@TestParameter private CelRuntimeFlavor runtimeFlavor;
@TestParameter private boolean isParseOnly;

private Cel cel;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ public final class CelPolicyCompilerImplTest {
.enableHeterogeneousNumericComparisons(true)
.build();

@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter private CelRuntimeFlavor runtimeFlavor;

@Test
public void compileYamlPolicy_success(@TestParameter TestYamlPolicy yamlPolicy) throws Exception {
Expand Down
6 changes: 6 additions & 0 deletions runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,3 +9,9 @@ java_library(
name = "program_planner",
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:program_planner"],
)

java_library(
name = "planned_program",
visibility = ["//:internal"],
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:planned_program"],
)
5 changes: 5 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -853,6 +853,11 @@ java_library(
"//common/values:cel_value_provider",
"//common/values:combined_cel_value_provider",
"//common/values:proto_message_value_provider",
"//runtime:activation",
"//runtime:interpretable",
"//runtime:proto_message_activation_factory",
"//runtime:resolved_overload",
"//runtime/planner:planned_program",
"//runtime/planner:program_planner",
"//runtime/standard:type",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand Down
56 changes: 49 additions & 7 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,12 +45,14 @@
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.CombinedCelValueProvider;
import dev.cel.common.values.ProtoMessageValueProvider;
import dev.cel.runtime.planner.PlannedProgram;
import dev.cel.runtime.planner.ProgramPlanner;
import dev.cel.runtime.standard.TypeFunction;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;

Expand DownExpand Up@@ -98,6 +100,21 @@ public Program createProgram(CelAbstractSyntaxTree ast) throws CelEvaluationExce
return toRuntimeProgram(planner().plan(ast));
}

private static final CelFunctionResolver EMPTY_FUNCTION_RESOLVER =
new CelFunctionResolver() {
@Override
public Optional<CelResolvedOverload> findOverloadMatchingArgs(
String functionName, Collection<String> overloadIds, Object[] args) {
return Optional.empty();
}

@Override
public Optional<CelResolvedOverload> findOverloadMatchingArgs(
String functionName, Object[] args) {
return Optional.empty();
}
};

public Program toRuntimeProgram(dev.cel.runtime.Program program) {
return new Program() {

Expand All@@ -119,7 +136,13 @@ public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctio

@Override
public Object eval(Message message) throws CelEvaluationException {
throw new UnsupportedOperationException("Not yet supported.");
PlannedProgram plannedProgram = (PlannedProgram) program;
return plannedProgram.evalOrThrow(
plannedProgram.interpretable(),
ProtoMessageActivationFactory.fromProto(message, plannedProgram.options()),
EMPTY_FUNCTION_RESOLVER,
/* partialVars= */ null,
/* listener= */ null);
}

@Override
Expand All@@ -141,25 +164,38 @@ public Object eval(PartialVars partialVars) throws CelEvaluationException {

@Override
public Object trace(CelEvaluationListener listener) throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(GlobalResolver.EMPTY, EMPTY_FUNCTION_RESOLVER, null, listener);
}

@Override
public Object trace(Map<String, ?> mapValue, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(Activation.copyOf(mapValue), EMPTY_FUNCTION_RESOLVER, null, listener);
}

@Override
public Object trace(Message message, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
PlannedProgram plannedProgram = (PlannedProgram) program;
return plannedProgram.evalOrThrow(
plannedProgram.interpretable(),
ProtoMessageActivationFactory.fromProto(message, plannedProgram.options()),
EMPTY_FUNCTION_RESOLVER,
/* partialVars= */ null,
listener);
}

@Override
public Object trace(CelVariableResolver resolver, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(
(name) -> resolver.find(name).orElse(null),
EMPTY_FUNCTION_RESOLVER,
null,
listener);
}

@Override
Expand All@@ -168,7 +204,12 @@ public Object trace(
CelFunctionResolver lateBoundFunctionResolver,
CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(
(name) -> resolver.find(name).orElse(null),
lateBoundFunctionResolver,
null,
listener);
}

@Override
Expand All@@ -177,7 +218,8 @@ public Object trace(
CelFunctionResolver lateBoundFunctionResolver,
CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(Activation.copyOf(mapValue), lateBoundFunctionResolver, null, listener);
}

@Override
Expand Down
30 changes: 28 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,17 +66,21 @@ java_library(
java_library(
name = "planned_program",
srcs = ["PlannedProgram.java"],
tags = [
],
deps = [
":error_metadata",
":localized_evaluation_exception",
":planned_interpretable",
"//:auto_value",
"//common:options",
"//common/annotations",
"//common/exceptions:runtime_exception",
"//common/values",
"//runtime:activation",
"//runtime:evaluation_exception",
"//runtime:evaluation_exception_builder",
"//runtime:evaluation_listener",
"//runtime:function_resolver",
"//runtime:interpretable",
"//runtime:interpreter_util",
Expand All@@ -85,6 +89,7 @@ java_library(
"//runtime:resolved_overload",
"//runtime:variable_resolver",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
],
)

Expand All@@ -93,6 +98,7 @@ java_library(
srcs = ["EvalConstant.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
],
Expand All@@ -104,6 +110,7 @@ java_library(
deps = [
":planned_interpretable",
":qualifier",
"//common/ast",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
Expand DownExpand Up@@ -183,6 +190,7 @@ java_library(
":interpretable_attribute",
":planned_interpretable",
":qualifier",
"//common/ast",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
],
Expand All@@ -196,6 +204,7 @@ java_library(
":planned_interpretable",
":presence_test_qualifier",
":qualifier",
"//common/ast",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -208,6 +217,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All@@ -221,6 +231,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All@@ -234,6 +245,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
Expand All@@ -248,6 +260,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
Expand All@@ -262,6 +275,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//common/values",
"//runtime:accumulated_unknowns",
Expand All@@ -278,6 +292,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -291,6 +306,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -303,6 +319,7 @@ java_library(
srcs = ["EvalConditional.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All@@ -316,11 +333,11 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/types:type_providers",
"//common/values",
"//common/values:cel_value_provider",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All@@ -333,8 +350,8 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All@@ -348,6 +365,7 @@ java_library(
":eval_helpers",
":localized_evaluation_exception",
":planned_interpretable",
"//common/ast",
"//common/exceptions:duplicate_key",
"//common/exceptions:invalid_argument",
"//runtime:accumulated_unknowns",
Expand All@@ -364,6 +382,7 @@ java_library(
deps = [
":activation_wrapper",
":planned_interpretable",
"//common/ast",
"//common/exceptions:runtime_exception",
"//common/values:mutable_map_value",
"//runtime:accumulated_unknowns",
Expand DownExpand Up@@ -421,13 +440,16 @@ java_library(
deps = [
":localized_evaluation_exception",
"//common:options",
"//common/ast",
"//common/exceptions:iteration_budget_exceeded",
"//runtime:evaluation_exception",
"//runtime:evaluation_listener",
"//runtime:function_resolver",
"//runtime:interpretable",
"//runtime:partial_vars",
"//runtime:resolved_overload",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
],
)

Expand All@@ -437,6 +459,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -451,6 +474,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -465,6 +489,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -478,6 +503,7 @@ java_library(
srcs = ["EvalBlock.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion extensions/src/main/java/dev/cel/extensions/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,7 +122,6 @@ java_library(
":extension_library",
"//checker:checker_builder",
"//common:compiler_common",
"//common:options",
"//common/ast",
"//common/exceptions:numeric_overflow",
"//common/internal:comparison_functions",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,8 @@
* planner runtime, along with parsed-only and checked expression evaluations for the planner.
*/
abstract class CelExtensionTestBase {
@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter public boolean isParseOnly;
@TestParameter CelRuntimeFlavor runtimeFlavor;
@TestParameter boolean isParseOnly;

@Before
public void setUpBase() {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,8 +46,8 @@

@RunWith(TestParameterInjector.class)
public class CelMathExtensionsTest {
@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter public boolean isParseOnly;
@TestParameter private CelRuntimeFlavor runtimeFlavor;
@TestParameter private boolean isParseOnly;

private Cel cel;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ public final class CelPolicyCompilerImplTest {
.enableHeterogeneousNumericComparisons(true)
.build();

@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter private CelRuntimeFlavor runtimeFlavor;

@Test
public void compileYamlPolicy_success(@TestParameter TestYamlPolicy yamlPolicy) throws Exception {
Expand Down
6 changes: 6 additions & 0 deletions runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,3 +9,9 @@ java_library(
name = "program_planner",
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:program_planner"],
)

java_library(
name = "planned_program",
visibility = ["//:internal"],
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:planned_program"],
)
5 changes: 5 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -853,6 +853,11 @@ java_library(
"//common/values:cel_value_provider",
"//common/values:combined_cel_value_provider",
"//common/values:proto_message_value_provider",
"//runtime:activation",
"//runtime:interpretable",
"//runtime:proto_message_activation_factory",
"//runtime:resolved_overload",
"//runtime/planner:planned_program",
"//runtime/planner:program_planner",
"//runtime/standard:type",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand Down
56 changes: 49 additions & 7 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,12 +45,14 @@
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.CombinedCelValueProvider;
import dev.cel.common.values.ProtoMessageValueProvider;
import dev.cel.runtime.planner.PlannedProgram;
import dev.cel.runtime.planner.ProgramPlanner;
import dev.cel.runtime.standard.TypeFunction;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;

Expand DownExpand Up@@ -98,6 +100,21 @@ public Program createProgram(CelAbstractSyntaxTree ast) throws CelEvaluationExce
return toRuntimeProgram(planner().plan(ast));
}

private static final CelFunctionResolver EMPTY_FUNCTION_RESOLVER =
new CelFunctionResolver() {
@Override
public Optional<CelResolvedOverload> findOverloadMatchingArgs(
String functionName, Collection<String> overloadIds, Object[] args) {
return Optional.empty();
}

@Override
public Optional<CelResolvedOverload> findOverloadMatchingArgs(
String functionName, Object[] args) {
return Optional.empty();
}
};

public Program toRuntimeProgram(dev.cel.runtime.Program program) {
return new Program() {

Expand All@@ -119,7 +136,13 @@ public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctio

@Override
public Object eval(Message message) throws CelEvaluationException {
throw new UnsupportedOperationException("Not yet supported.");
PlannedProgram plannedProgram = (PlannedProgram) program;
return plannedProgram.evalOrThrow(
plannedProgram.interpretable(),
ProtoMessageActivationFactory.fromProto(message, plannedProgram.options()),
EMPTY_FUNCTION_RESOLVER,
/* partialVars= */ null,
/* listener= */ null);
}

@Override
Expand All@@ -141,25 +164,38 @@ public Object eval(PartialVars partialVars) throws CelEvaluationException {

@Override
public Object trace(CelEvaluationListener listener) throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(GlobalResolver.EMPTY, EMPTY_FUNCTION_RESOLVER, null, listener);
}

@Override
public Object trace(Map<String, ?> mapValue, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(Activation.copyOf(mapValue), EMPTY_FUNCTION_RESOLVER, null, listener);
}

@Override
public Object trace(Message message, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
PlannedProgram plannedProgram = (PlannedProgram) program;
return plannedProgram.evalOrThrow(
plannedProgram.interpretable(),
ProtoMessageActivationFactory.fromProto(message, plannedProgram.options()),
EMPTY_FUNCTION_RESOLVER,
/* partialVars= */ null,
listener);
}

@Override
public Object trace(CelVariableResolver resolver, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(
(name) -> resolver.find(name).orElse(null),
EMPTY_FUNCTION_RESOLVER,
null,
listener);
}

@Override
Expand All@@ -168,7 +204,12 @@ public Object trace(
CelFunctionResolver lateBoundFunctionResolver,
CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(
(name) -> resolver.find(name).orElse(null),
lateBoundFunctionResolver,
null,
listener);
}

@Override
Expand All@@ -177,7 +218,8 @@ public Object trace(
CelFunctionResolver lateBoundFunctionResolver,
CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(Activation.copyOf(mapValue), lateBoundFunctionResolver, null, listener);
}

@Override
Expand Down
30 changes: 28 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,17 +66,21 @@ java_library(
java_library(
name = "planned_program",
srcs = ["PlannedProgram.java"],
tags = [
],
deps = [
":error_metadata",
":localized_evaluation_exception",
":planned_interpretable",
"//:auto_value",
"//common:options",
"//common/annotations",
"//common/exceptions:runtime_exception",
"//common/values",
"//runtime:activation",
"//runtime:evaluation_exception",
"//runtime:evaluation_exception_builder",
"//runtime:evaluation_listener",
"//runtime:function_resolver",
"//runtime:interpretable",
"//runtime:interpreter_util",
Expand All@@ -85,6 +89,7 @@ java_library(
"//runtime:resolved_overload",
"//runtime:variable_resolver",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
],
)

Expand All@@ -93,6 +98,7 @@ java_library(
srcs = ["EvalConstant.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
],
Expand All@@ -104,6 +110,7 @@ java_library(
deps = [
":planned_interpretable",
":qualifier",
"//common/ast",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
Expand DownExpand Up@@ -183,6 +190,7 @@ java_library(
":interpretable_attribute",
":planned_interpretable",
":qualifier",
"//common/ast",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
],
Expand All@@ -196,6 +204,7 @@ java_library(
":planned_interpretable",
":presence_test_qualifier",
":qualifier",
"//common/ast",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -208,6 +217,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All@@ -221,6 +231,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All@@ -234,6 +245,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
Expand All@@ -248,6 +260,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
Expand All@@ -262,6 +275,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//common/values",
"//runtime:accumulated_unknowns",
Expand All@@ -278,6 +292,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -291,6 +306,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -303,6 +319,7 @@ java_library(
srcs = ["EvalConditional.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All@@ -316,11 +333,11 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/types:type_providers",
"//common/values",
"//common/values:cel_value_provider",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All@@ -333,8 +350,8 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All@@ -348,6 +365,7 @@ java_library(
":eval_helpers",
":localized_evaluation_exception",
":planned_interpretable",
"//common/ast",
"//common/exceptions:duplicate_key",
"//common/exceptions:invalid_argument",
"//runtime:accumulated_unknowns",
Expand All@@ -364,6 +382,7 @@ java_library(
deps = [
":activation_wrapper",
":planned_interpretable",
"//common/ast",
"//common/exceptions:runtime_exception",
"//common/values:mutable_map_value",
"//runtime:accumulated_unknowns",
Expand DownExpand Up@@ -421,13 +440,16 @@ java_library(
deps = [
":localized_evaluation_exception",
"//common:options",
"//common/ast",
"//common/exceptions:iteration_budget_exceeded",
"//runtime:evaluation_exception",
"//runtime:evaluation_listener",
"//runtime:function_resolver",
"//runtime:interpretable",
"//runtime:partial_vars",
"//runtime:resolved_overload",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
],
)

Expand All@@ -437,6 +459,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -451,6 +474,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -465,6 +489,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -478,6 +503,7 @@ java_library(
srcs = ["EvalBlock.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion extensions/src/main/java/dev/cel/extensions/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,7 +122,6 @@ java_library(
":extension_library",
"//checker:checker_builder",
"//common:compiler_common",
"//common:options",
"//common/ast",
"//common/exceptions:numeric_overflow",
"//common/internal:comparison_functions",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,8 @@
* planner runtime, along with parsed-only and checked expression evaluations for the planner.
*/
abstract class CelExtensionTestBase {
@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter public boolean isParseOnly;
@TestParameter CelRuntimeFlavor runtimeFlavor;
@TestParameter boolean isParseOnly;

@Before
public void setUpBase() {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,8 +46,8 @@

@RunWith(TestParameterInjector.class)
public class CelMathExtensionsTest {
@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter public boolean isParseOnly;
@TestParameter private CelRuntimeFlavor runtimeFlavor;
@TestParameter private boolean isParseOnly;

private Cel cel;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ public final class CelPolicyCompilerImplTest {
.enableHeterogeneousNumericComparisons(true)
.build();

@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter private CelRuntimeFlavor runtimeFlavor;

@Test
public void compileYamlPolicy_success(@TestParameter TestYamlPolicy yamlPolicy) throws Exception {
Expand Down
6 changes: 6 additions & 0 deletions runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,3 +9,9 @@ java_library(
name = "program_planner",
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:program_planner"],
)

java_library(
name = "planned_program",
visibility = ["//:internal"],
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:planned_program"],
)
5 changes: 5 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -853,6 +853,11 @@ java_library(
"//common/values:cel_value_provider",
"//common/values:combined_cel_value_provider",
"//common/values:proto_message_value_provider",
"//runtime:activation",
"//runtime:interpretable",
"//runtime:proto_message_activation_factory",
"//runtime:resolved_overload",
"//runtime/planner:planned_program",
"//runtime/planner:program_planner",
"//runtime/standard:type",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand Down
56 changes: 49 additions & 7 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,12 +45,14 @@
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.CombinedCelValueProvider;
import dev.cel.common.values.ProtoMessageValueProvider;
import dev.cel.runtime.planner.PlannedProgram;
import dev.cel.runtime.planner.ProgramPlanner;
import dev.cel.runtime.standard.TypeFunction;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;

Expand DownExpand Up@@ -98,6 +100,21 @@ public Program createProgram(CelAbstractSyntaxTree ast) throws CelEvaluationExce
return toRuntimeProgram(planner().plan(ast));
}

private static final CelFunctionResolver EMPTY_FUNCTION_RESOLVER =
new CelFunctionResolver() {
@Override
public Optional<CelResolvedOverload> findOverloadMatchingArgs(
String functionName, Collection<String> overloadIds, Object[] args) {
return Optional.empty();
}

@Override
public Optional<CelResolvedOverload> findOverloadMatchingArgs(
String functionName, Object[] args) {
return Optional.empty();
}
};

public Program toRuntimeProgram(dev.cel.runtime.Program program) {
return new Program() {

Expand All@@ -119,7 +136,13 @@ public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctio

@Override
public Object eval(Message message) throws CelEvaluationException {
throw new UnsupportedOperationException("Not yet supported.");
PlannedProgram plannedProgram = (PlannedProgram) program;
return plannedProgram.evalOrThrow(
plannedProgram.interpretable(),
ProtoMessageActivationFactory.fromProto(message, plannedProgram.options()),
EMPTY_FUNCTION_RESOLVER,
/* partialVars= */ null,
/* listener= */ null);
}

@Override
Expand All@@ -141,25 +164,38 @@ public Object eval(PartialVars partialVars) throws CelEvaluationException {

@Override
public Object trace(CelEvaluationListener listener) throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(GlobalResolver.EMPTY, EMPTY_FUNCTION_RESOLVER, null, listener);
}

@Override
public Object trace(Map<String, ?> mapValue, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(Activation.copyOf(mapValue), EMPTY_FUNCTION_RESOLVER, null, listener);
}

@Override
public Object trace(Message message, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
PlannedProgram plannedProgram = (PlannedProgram) program;
return plannedProgram.evalOrThrow(
plannedProgram.interpretable(),
ProtoMessageActivationFactory.fromProto(message, plannedProgram.options()),
EMPTY_FUNCTION_RESOLVER,
/* partialVars= */ null,
listener);
}

@Override
public Object trace(CelVariableResolver resolver, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(
(name) -> resolver.find(name).orElse(null),
EMPTY_FUNCTION_RESOLVER,
null,
listener);
}

@Override
Expand All@@ -168,7 +204,12 @@ public Object trace(
CelFunctionResolver lateBoundFunctionResolver,
CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(
(name) -> resolver.find(name).orElse(null),
lateBoundFunctionResolver,
null,
listener);
}

@Override
Expand All@@ -177,7 +218,8 @@ public Object trace(
CelFunctionResolver lateBoundFunctionResolver,
CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(Activation.copyOf(mapValue), lateBoundFunctionResolver, null, listener);
}

@Override
Expand Down
30 changes: 28 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,17 +66,21 @@ java_library(
java_library(
name = "planned_program",
srcs = ["PlannedProgram.java"],
tags = [
],
deps = [
":error_metadata",
":localized_evaluation_exception",
":planned_interpretable",
"//:auto_value",
"//common:options",
"//common/annotations",
"//common/exceptions:runtime_exception",
"//common/values",
"//runtime:activation",
"//runtime:evaluation_exception",
"//runtime:evaluation_exception_builder",
"//runtime:evaluation_listener",
"//runtime:function_resolver",
"//runtime:interpretable",
"//runtime:interpreter_util",
Expand All@@ -85,6 +89,7 @@ java_library(
"//runtime:resolved_overload",
"//runtime:variable_resolver",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
],
)

Expand All@@ -93,6 +98,7 @@ java_library(
srcs = ["EvalConstant.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
],
Expand All@@ -104,6 +110,7 @@ java_library(
deps = [
":planned_interpretable",
":qualifier",
"//common/ast",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
Expand DownExpand Up@@ -183,6 +190,7 @@ java_library(
":interpretable_attribute",
":planned_interpretable",
":qualifier",
"//common/ast",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
],
Expand All@@ -196,6 +204,7 @@ java_library(
":planned_interpretable",
":presence_test_qualifier",
":qualifier",
"//common/ast",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -208,6 +217,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All@@ -221,6 +231,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All@@ -234,6 +245,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
Expand All@@ -248,6 +260,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
Expand All@@ -262,6 +275,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//common/values",
"//runtime:accumulated_unknowns",
Expand All@@ -278,6 +292,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -291,6 +306,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -303,6 +319,7 @@ java_library(
srcs = ["EvalConditional.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All@@ -316,11 +333,11 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/types:type_providers",
"//common/values",
"//common/values:cel_value_provider",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All@@ -333,8 +350,8 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All@@ -348,6 +365,7 @@ java_library(
":eval_helpers",
":localized_evaluation_exception",
":planned_interpretable",
"//common/ast",
"//common/exceptions:duplicate_key",
"//common/exceptions:invalid_argument",
"//runtime:accumulated_unknowns",
Expand All@@ -364,6 +382,7 @@ java_library(
deps = [
":activation_wrapper",
":planned_interpretable",
"//common/ast",
"//common/exceptions:runtime_exception",
"//common/values:mutable_map_value",
"//runtime:accumulated_unknowns",
Expand DownExpand Up@@ -421,13 +440,16 @@ java_library(
deps = [
":localized_evaluation_exception",
"//common:options",
"//common/ast",
"//common/exceptions:iteration_budget_exceeded",
"//runtime:evaluation_exception",
"//runtime:evaluation_listener",
"//runtime:function_resolver",
"//runtime:interpretable",
"//runtime:partial_vars",
"//runtime:resolved_overload",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
],
)

Expand All@@ -437,6 +459,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -451,6 +474,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -465,6 +489,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -478,6 +503,7 @@ java_library(
srcs = ["EvalBlock.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion extensions/src/main/java/dev/cel/extensions/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,7 +122,6 @@ java_library(
":extension_library",
"//checker:checker_builder",
"//common:compiler_common",
"//common:options",
"//common/ast",
"//common/exceptions:numeric_overflow",
"//common/internal:comparison_functions",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,8 @@
* planner runtime, along with parsed-only and checked expression evaluations for the planner.
*/
abstract class CelExtensionTestBase {
@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter public boolean isParseOnly;
@TestParameter CelRuntimeFlavor runtimeFlavor;
@TestParameter boolean isParseOnly;

@Before
public void setUpBase() {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,8 +46,8 @@

@RunWith(TestParameterInjector.class)
public class CelMathExtensionsTest {
@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter public boolean isParseOnly;
@TestParameter private CelRuntimeFlavor runtimeFlavor;
@TestParameter private boolean isParseOnly;

private Cel cel;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ public final class CelPolicyCompilerImplTest {
.enableHeterogeneousNumericComparisons(true)
.build();

@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter private CelRuntimeFlavor runtimeFlavor;

@Test
public void compileYamlPolicy_success(@TestParameter TestYamlPolicy yamlPolicy) throws Exception {
Expand Down
6 changes: 6 additions & 0 deletions runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,3 +9,9 @@ java_library(
name = "program_planner",
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:program_planner"],
)

java_library(
name = "planned_program",
visibility = ["//:internal"],
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:planned_program"],
)
5 changes: 5 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -853,6 +853,11 @@ java_library(
"//common/values:cel_value_provider",
"//common/values:combined_cel_value_provider",
"//common/values:proto_message_value_provider",
"//runtime:activation",
"//runtime:interpretable",
"//runtime:proto_message_activation_factory",
"//runtime:resolved_overload",
"//runtime/planner:planned_program",
"//runtime/planner:program_planner",
"//runtime/standard:type",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand Down
56 changes: 49 additions & 7 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,12 +45,14 @@
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.CombinedCelValueProvider;
import dev.cel.common.values.ProtoMessageValueProvider;
import dev.cel.runtime.planner.PlannedProgram;
import dev.cel.runtime.planner.ProgramPlanner;
import dev.cel.runtime.standard.TypeFunction;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;

Expand DownExpand Up@@ -98,6 +100,21 @@ public Program createProgram(CelAbstractSyntaxTree ast) throws CelEvaluationExce
return toRuntimeProgram(planner().plan(ast));
}

private static final CelFunctionResolver EMPTY_FUNCTION_RESOLVER =
new CelFunctionResolver() {
@Override
public Optional<CelResolvedOverload> findOverloadMatchingArgs(
String functionName, Collection<String> overloadIds, Object[] args) {
return Optional.empty();
}

@Override
public Optional<CelResolvedOverload> findOverloadMatchingArgs(
String functionName, Object[] args) {
return Optional.empty();
}
};

public Program toRuntimeProgram(dev.cel.runtime.Program program) {
return new Program() {

Expand All@@ -119,7 +136,13 @@ public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctio

@Override
public Object eval(Message message) throws CelEvaluationException {
throw new UnsupportedOperationException("Not yet supported.");
PlannedProgram plannedProgram = (PlannedProgram) program;
return plannedProgram.evalOrThrow(
plannedProgram.interpretable(),
ProtoMessageActivationFactory.fromProto(message, plannedProgram.options()),
EMPTY_FUNCTION_RESOLVER,
/* partialVars= */ null,
/* listener= */ null);
}

@Override
Expand All@@ -141,25 +164,38 @@ public Object eval(PartialVars partialVars) throws CelEvaluationException {

@Override
public Object trace(CelEvaluationListener listener) throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(GlobalResolver.EMPTY, EMPTY_FUNCTION_RESOLVER, null, listener);
}

@Override
public Object trace(Map<String, ?> mapValue, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(Activation.copyOf(mapValue), EMPTY_FUNCTION_RESOLVER, null, listener);
}

@Override
public Object trace(Message message, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
PlannedProgram plannedProgram = (PlannedProgram) program;
return plannedProgram.evalOrThrow(
plannedProgram.interpretable(),
ProtoMessageActivationFactory.fromProto(message, plannedProgram.options()),
EMPTY_FUNCTION_RESOLVER,
/* partialVars= */ null,
listener);
}

@Override
public Object trace(CelVariableResolver resolver, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(
(name) -> resolver.find(name).orElse(null),
EMPTY_FUNCTION_RESOLVER,
null,
listener);
}

@Override
Expand All@@ -168,7 +204,12 @@ public Object trace(
CelFunctionResolver lateBoundFunctionResolver,
CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(
(name) -> resolver.find(name).orElse(null),
lateBoundFunctionResolver,
null,
listener);
}

@Override
Expand All@@ -177,7 +218,8 @@ public Object trace(
CelFunctionResolver lateBoundFunctionResolver,
CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(Activation.copyOf(mapValue), lateBoundFunctionResolver, null, listener);
}

@Override
Expand Down
30 changes: 28 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,17 +66,21 @@ java_library(
java_library(
name = "planned_program",
srcs = ["PlannedProgram.java"],
tags = [
],
deps = [
":error_metadata",
":localized_evaluation_exception",
":planned_interpretable",
"//:auto_value",
"//common:options",
"//common/annotations",
"//common/exceptions:runtime_exception",
"//common/values",
"//runtime:activation",
"//runtime:evaluation_exception",
"//runtime:evaluation_exception_builder",
"//runtime:evaluation_listener",
"//runtime:function_resolver",
"//runtime:interpretable",
"//runtime:interpreter_util",
Expand All@@ -85,6 +89,7 @@ java_library(
"//runtime:resolved_overload",
"//runtime:variable_resolver",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
],
)

Expand All@@ -93,6 +98,7 @@ java_library(
srcs = ["EvalConstant.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
],
Expand All@@ -104,6 +110,7 @@ java_library(
deps = [
":planned_interpretable",
":qualifier",
"//common/ast",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
Expand DownExpand Up@@ -183,6 +190,7 @@ java_library(
":interpretable_attribute",
":planned_interpretable",
":qualifier",
"//common/ast",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
],
Expand All@@ -196,6 +204,7 @@ java_library(
":planned_interpretable",
":presence_test_qualifier",
":qualifier",
"//common/ast",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -208,6 +217,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All@@ -221,6 +231,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All@@ -234,6 +245,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
Expand All@@ -248,6 +260,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
Expand All@@ -262,6 +275,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//common/values",
"//runtime:accumulated_unknowns",
Expand All@@ -278,6 +292,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -291,6 +306,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -303,6 +319,7 @@ java_library(
srcs = ["EvalConditional.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All@@ -316,11 +333,11 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/types:type_providers",
"//common/values",
"//common/values:cel_value_provider",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All@@ -333,8 +350,8 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All@@ -348,6 +365,7 @@ java_library(
":eval_helpers",
":localized_evaluation_exception",
":planned_interpretable",
"//common/ast",
"//common/exceptions:duplicate_key",
"//common/exceptions:invalid_argument",
"//runtime:accumulated_unknowns",
Expand All@@ -364,6 +382,7 @@ java_library(
deps = [
":activation_wrapper",
":planned_interpretable",
"//common/ast",
"//common/exceptions:runtime_exception",
"//common/values:mutable_map_value",
"//runtime:accumulated_unknowns",
Expand DownExpand Up@@ -421,13 +440,16 @@ java_library(
deps = [
":localized_evaluation_exception",
"//common:options",
"//common/ast",
"//common/exceptions:iteration_budget_exceeded",
"//runtime:evaluation_exception",
"//runtime:evaluation_listener",
"//runtime:function_resolver",
"//runtime:interpretable",
"//runtime:partial_vars",
"//runtime:resolved_overload",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
],
)

Expand All@@ -437,6 +459,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -451,6 +474,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -465,6 +489,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -478,6 +503,7 @@ java_library(
srcs = ["EvalBlock.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion extensions/src/main/java/dev/cel/extensions/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,7 +122,6 @@ java_library(
":extension_library",
"//checker:checker_builder",
"//common:compiler_common",
"//common:options",
"//common/ast",
"//common/exceptions:numeric_overflow",
"//common/internal:comparison_functions",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,8 @@
* planner runtime, along with parsed-only and checked expression evaluations for the planner.
*/
abstract class CelExtensionTestBase {
@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter public boolean isParseOnly;
@TestParameter CelRuntimeFlavor runtimeFlavor;
@TestParameter boolean isParseOnly;

@Before
public void setUpBase() {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,8 +46,8 @@

@RunWith(TestParameterInjector.class)
public class CelMathExtensionsTest {
@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter public boolean isParseOnly;
@TestParameter private CelRuntimeFlavor runtimeFlavor;
@TestParameter private boolean isParseOnly;

private Cel cel;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ public final class CelPolicyCompilerImplTest {
.enableHeterogeneousNumericComparisons(true)
.build();

@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter private CelRuntimeFlavor runtimeFlavor;

@Test
public void compileYamlPolicy_success(@TestParameter TestYamlPolicy yamlPolicy) throws Exception {
Expand Down
6 changes: 6 additions & 0 deletions runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,3 +9,9 @@ java_library(
name = "program_planner",
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:program_planner"],
)

java_library(
name = "planned_program",
visibility = ["//:internal"],
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:planned_program"],
)
5 changes: 5 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -853,6 +853,11 @@ java_library(
"//common/values:cel_value_provider",
"//common/values:combined_cel_value_provider",
"//common/values:proto_message_value_provider",
"//runtime:activation",
"//runtime:interpretable",
"//runtime:proto_message_activation_factory",
"//runtime:resolved_overload",
"//runtime/planner:planned_program",
"//runtime/planner:program_planner",
"//runtime/standard:type",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand Down
56 changes: 49 additions & 7 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,12 +45,14 @@
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.CombinedCelValueProvider;
import dev.cel.common.values.ProtoMessageValueProvider;
import dev.cel.runtime.planner.PlannedProgram;
import dev.cel.runtime.planner.ProgramPlanner;
import dev.cel.runtime.standard.TypeFunction;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;

Expand DownExpand Up@@ -98,6 +100,21 @@ public Program createProgram(CelAbstractSyntaxTree ast) throws CelEvaluationExce
return toRuntimeProgram(planner().plan(ast));
}

private static final CelFunctionResolver EMPTY_FUNCTION_RESOLVER =
new CelFunctionResolver() {
@Override
public Optional<CelResolvedOverload> findOverloadMatchingArgs(
String functionName, Collection<String> overloadIds, Object[] args) {
return Optional.empty();
}

@Override
public Optional<CelResolvedOverload> findOverloadMatchingArgs(
String functionName, Object[] args) {
return Optional.empty();
}
};

public Program toRuntimeProgram(dev.cel.runtime.Program program) {
return new Program() {

Expand All@@ -119,7 +136,13 @@ public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctio

@Override
public Object eval(Message message) throws CelEvaluationException {
throw new UnsupportedOperationException("Not yet supported.");
PlannedProgram plannedProgram = (PlannedProgram) program;
return plannedProgram.evalOrThrow(
plannedProgram.interpretable(),
ProtoMessageActivationFactory.fromProto(message, plannedProgram.options()),
EMPTY_FUNCTION_RESOLVER,
/* partialVars= */ null,
/* listener= */ null);
}

@Override
Expand All@@ -141,25 +164,38 @@ public Object eval(PartialVars partialVars) throws CelEvaluationException {

@Override
public Object trace(CelEvaluationListener listener) throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(GlobalResolver.EMPTY, EMPTY_FUNCTION_RESOLVER, null, listener);
}

@Override
public Object trace(Map<String, ?> mapValue, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(Activation.copyOf(mapValue), EMPTY_FUNCTION_RESOLVER, null, listener);
}

@Override
public Object trace(Message message, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
PlannedProgram plannedProgram = (PlannedProgram) program;
return plannedProgram.evalOrThrow(
plannedProgram.interpretable(),
ProtoMessageActivationFactory.fromProto(message, plannedProgram.options()),
EMPTY_FUNCTION_RESOLVER,
/* partialVars= */ null,
listener);
}

@Override
public Object trace(CelVariableResolver resolver, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(
(name) -> resolver.find(name).orElse(null),
EMPTY_FUNCTION_RESOLVER,
null,
listener);
}

@Override
Expand All@@ -168,7 +204,12 @@ public Object trace(
CelFunctionResolver lateBoundFunctionResolver,
CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(
(name) -> resolver.find(name).orElse(null),
lateBoundFunctionResolver,
null,
listener);
}

@Override
Expand All@@ -177,7 +218,8 @@ public Object trace(
CelFunctionResolver lateBoundFunctionResolver,
CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(Activation.copyOf(mapValue), lateBoundFunctionResolver, null, listener);
}

@Override
Expand Down
30 changes: 28 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,17 +66,21 @@ java_library(
java_library(
name = "planned_program",
srcs = ["PlannedProgram.java"],
tags = [
],
deps = [
":error_metadata",
":localized_evaluation_exception",
":planned_interpretable",
"//:auto_value",
"//common:options",
"//common/annotations",
"//common/exceptions:runtime_exception",
"//common/values",
"//runtime:activation",
"//runtime:evaluation_exception",
"//runtime:evaluation_exception_builder",
"//runtime:evaluation_listener",
"//runtime:function_resolver",
"//runtime:interpretable",
"//runtime:interpreter_util",
Expand All@@ -85,6 +89,7 @@ java_library(
"//runtime:resolved_overload",
"//runtime:variable_resolver",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
],
)

Expand All@@ -93,6 +98,7 @@ java_library(
srcs = ["EvalConstant.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
],
Expand All@@ -104,6 +110,7 @@ java_library(
deps = [
":planned_interpretable",
":qualifier",
"//common/ast",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
Expand DownExpand Up@@ -183,6 +190,7 @@ java_library(
":interpretable_attribute",
":planned_interpretable",
":qualifier",
"//common/ast",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
],
Expand All@@ -196,6 +204,7 @@ java_library(
":planned_interpretable",
":presence_test_qualifier",
":qualifier",
"//common/ast",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -208,6 +217,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All@@ -221,6 +231,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All@@ -234,6 +245,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
Expand All@@ -248,6 +260,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
Expand All@@ -262,6 +275,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//common/values",
"//runtime:accumulated_unknowns",
Expand All@@ -278,6 +292,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -291,6 +306,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -303,6 +319,7 @@ java_library(
srcs = ["EvalConditional.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All@@ -316,11 +333,11 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/types:type_providers",
"//common/values",
"//common/values:cel_value_provider",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All@@ -333,8 +350,8 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All@@ -348,6 +365,7 @@ java_library(
":eval_helpers",
":localized_evaluation_exception",
":planned_interpretable",
"//common/ast",
"//common/exceptions:duplicate_key",
"//common/exceptions:invalid_argument",
"//runtime:accumulated_unknowns",
Expand All@@ -364,6 +382,7 @@ java_library(
deps = [
":activation_wrapper",
":planned_interpretable",
"//common/ast",
"//common/exceptions:runtime_exception",
"//common/values:mutable_map_value",
"//runtime:accumulated_unknowns",
Expand DownExpand Up@@ -421,13 +440,16 @@ java_library(
deps = [
":localized_evaluation_exception",
"//common:options",
"//common/ast",
"//common/exceptions:iteration_budget_exceeded",
"//runtime:evaluation_exception",
"//runtime:evaluation_listener",
"//runtime:function_resolver",
"//runtime:interpretable",
"//runtime:partial_vars",
"//runtime:resolved_overload",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
],
)

Expand All@@ -437,6 +459,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -451,6 +474,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -465,6 +489,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -478,6 +503,7 @@ java_library(
srcs = ["EvalBlock.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion extensions/src/main/java/dev/cel/extensions/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,7 +122,6 @@ java_library(
":extension_library",
"//checker:checker_builder",
"//common:compiler_common",
"//common:options",
"//common/ast",
"//common/exceptions:numeric_overflow",
"//common/internal:comparison_functions",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,8 @@
* planner runtime, along with parsed-only and checked expression evaluations for the planner.
*/
abstract class CelExtensionTestBase {
@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter public boolean isParseOnly;
@TestParameter CelRuntimeFlavor runtimeFlavor;
@TestParameter boolean isParseOnly;

@Before
public void setUpBase() {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,8 +46,8 @@

@RunWith(TestParameterInjector.class)
public class CelMathExtensionsTest {
@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter public boolean isParseOnly;
@TestParameter private CelRuntimeFlavor runtimeFlavor;
@TestParameter private boolean isParseOnly;

private Cel cel;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ public final class CelPolicyCompilerImplTest {
.enableHeterogeneousNumericComparisons(true)
.build();

@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter private CelRuntimeFlavor runtimeFlavor;

@Test
public void compileYamlPolicy_success(@TestParameter TestYamlPolicy yamlPolicy) throws Exception {
Expand Down
6 changes: 6 additions & 0 deletions runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,3 +9,9 @@ java_library(
name = "program_planner",
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:program_planner"],
)

java_library(
name = "planned_program",
visibility = ["//:internal"],
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:planned_program"],
)
5 changes: 5 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -853,6 +853,11 @@ java_library(
"//common/values:cel_value_provider",
"//common/values:combined_cel_value_provider",
"//common/values:proto_message_value_provider",
"//runtime:activation",
"//runtime:interpretable",
"//runtime:proto_message_activation_factory",
"//runtime:resolved_overload",
"//runtime/planner:planned_program",
"//runtime/planner:program_planner",
"//runtime/standard:type",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand Down
56 changes: 49 additions & 7 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,12 +45,14 @@
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.CombinedCelValueProvider;
import dev.cel.common.values.ProtoMessageValueProvider;
import dev.cel.runtime.planner.PlannedProgram;
import dev.cel.runtime.planner.ProgramPlanner;
import dev.cel.runtime.standard.TypeFunction;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;

Expand DownExpand Up@@ -98,6 +100,21 @@ public Program createProgram(CelAbstractSyntaxTree ast) throws CelEvaluationExce
return toRuntimeProgram(planner().plan(ast));
}

private static final CelFunctionResolver EMPTY_FUNCTION_RESOLVER =
new CelFunctionResolver() {
@Override
public Optional<CelResolvedOverload> findOverloadMatchingArgs(
String functionName, Collection<String> overloadIds, Object[] args) {
return Optional.empty();
}

@Override
public Optional<CelResolvedOverload> findOverloadMatchingArgs(
String functionName, Object[] args) {
return Optional.empty();
}
};

public Program toRuntimeProgram(dev.cel.runtime.Program program) {
return new Program() {

Expand All@@ -119,7 +136,13 @@ public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctio

@Override
public Object eval(Message message) throws CelEvaluationException {
throw new UnsupportedOperationException("Not yet supported.");
PlannedProgram plannedProgram = (PlannedProgram) program;
return plannedProgram.evalOrThrow(
plannedProgram.interpretable(),
ProtoMessageActivationFactory.fromProto(message, plannedProgram.options()),
EMPTY_FUNCTION_RESOLVER,
/* partialVars= */ null,
/* listener= */ null);
}

@Override
Expand All@@ -141,25 +164,38 @@ public Object eval(PartialVars partialVars) throws CelEvaluationException {

@Override
public Object trace(CelEvaluationListener listener) throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(GlobalResolver.EMPTY, EMPTY_FUNCTION_RESOLVER, null, listener);
}

@Override
public Object trace(Map<String, ?> mapValue, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(Activation.copyOf(mapValue), EMPTY_FUNCTION_RESOLVER, null, listener);
}

@Override
public Object trace(Message message, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
PlannedProgram plannedProgram = (PlannedProgram) program;
return plannedProgram.evalOrThrow(
plannedProgram.interpretable(),
ProtoMessageActivationFactory.fromProto(message, plannedProgram.options()),
EMPTY_FUNCTION_RESOLVER,
/* partialVars= */ null,
listener);
}

@Override
public Object trace(CelVariableResolver resolver, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(
(name) -> resolver.find(name).orElse(null),
EMPTY_FUNCTION_RESOLVER,
null,
listener);
}

@Override
Expand All@@ -168,7 +204,12 @@ public Object trace(
CelFunctionResolver lateBoundFunctionResolver,
CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(
(name) -> resolver.find(name).orElse(null),
lateBoundFunctionResolver,
null,
listener);
}

@Override
Expand All@@ -177,7 +218,8 @@ public Object trace(
CelFunctionResolver lateBoundFunctionResolver,
CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(Activation.copyOf(mapValue), lateBoundFunctionResolver, null, listener);
}

@Override
Expand Down
30 changes: 28 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,17 +66,21 @@ java_library(
java_library(
name = "planned_program",
srcs = ["PlannedProgram.java"],
tags = [
],
deps = [
":error_metadata",
":localized_evaluation_exception",
":planned_interpretable",
"//:auto_value",
"//common:options",
"//common/annotations",
"//common/exceptions:runtime_exception",
"//common/values",
"//runtime:activation",
"//runtime:evaluation_exception",
"//runtime:evaluation_exception_builder",
"//runtime:evaluation_listener",
"//runtime:function_resolver",
"//runtime:interpretable",
"//runtime:interpreter_util",
Expand All@@ -85,6 +89,7 @@ java_library(
"//runtime:resolved_overload",
"//runtime:variable_resolver",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
],
)

Expand All@@ -93,6 +98,7 @@ java_library(
srcs = ["EvalConstant.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
],
Expand All@@ -104,6 +110,7 @@ java_library(
deps = [
":planned_interpretable",
":qualifier",
"//common/ast",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
Expand DownExpand Up@@ -183,6 +190,7 @@ java_library(
":interpretable_attribute",
":planned_interpretable",
":qualifier",
"//common/ast",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
],
Expand All@@ -196,6 +204,7 @@ java_library(
":planned_interpretable",
":presence_test_qualifier",
":qualifier",
"//common/ast",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -208,6 +217,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All@@ -221,6 +231,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All@@ -234,6 +245,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
Expand All@@ -248,6 +260,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
Expand All@@ -262,6 +275,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//common/values",
"//runtime:accumulated_unknowns",
Expand All@@ -278,6 +292,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -291,6 +306,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -303,6 +319,7 @@ java_library(
srcs = ["EvalConditional.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All@@ -316,11 +333,11 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/types:type_providers",
"//common/values",
"//common/values:cel_value_provider",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All@@ -333,8 +350,8 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All@@ -348,6 +365,7 @@ java_library(
":eval_helpers",
":localized_evaluation_exception",
":planned_interpretable",
"//common/ast",
"//common/exceptions:duplicate_key",
"//common/exceptions:invalid_argument",
"//runtime:accumulated_unknowns",
Expand All@@ -364,6 +382,7 @@ java_library(
deps = [
":activation_wrapper",
":planned_interpretable",
"//common/ast",
"//common/exceptions:runtime_exception",
"//common/values:mutable_map_value",
"//runtime:accumulated_unknowns",
Expand DownExpand Up@@ -421,13 +440,16 @@ java_library(
deps = [
":localized_evaluation_exception",
"//common:options",
"//common/ast",
"//common/exceptions:iteration_budget_exceeded",
"//runtime:evaluation_exception",
"//runtime:evaluation_listener",
"//runtime:function_resolver",
"//runtime:interpretable",
"//runtime:partial_vars",
"//runtime:resolved_overload",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
],
)

Expand All@@ -437,6 +459,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -451,6 +474,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -465,6 +489,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -478,6 +503,7 @@ java_library(
srcs = ["EvalBlock.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion extensions/src/main/java/dev/cel/extensions/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,7 +122,6 @@ java_library(
":extension_library",
"//checker:checker_builder",
"//common:compiler_common",
"//common:options",
"//common/ast",
"//common/exceptions:numeric_overflow",
"//common/internal:comparison_functions",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,8 @@
* planner runtime, along with parsed-only and checked expression evaluations for the planner.
*/
abstract class CelExtensionTestBase {
@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter public boolean isParseOnly;
@TestParameter CelRuntimeFlavor runtimeFlavor;
@TestParameter boolean isParseOnly;

@Before
public void setUpBase() {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,8 +46,8 @@

@RunWith(TestParameterInjector.class)
public class CelMathExtensionsTest {
@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter public boolean isParseOnly;
@TestParameter private CelRuntimeFlavor runtimeFlavor;
@TestParameter private boolean isParseOnly;

private Cel cel;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ public final class CelPolicyCompilerImplTest {
.enableHeterogeneousNumericComparisons(true)
.build();

@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter private CelRuntimeFlavor runtimeFlavor;

@Test
public void compileYamlPolicy_success(@TestParameter TestYamlPolicy yamlPolicy) throws Exception {
Expand Down
6 changes: 6 additions & 0 deletions runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,3 +9,9 @@ java_library(
name = "program_planner",
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:program_planner"],
)

java_library(
name = "planned_program",
visibility = ["//:internal"],
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:planned_program"],
)
5 changes: 5 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -853,6 +853,11 @@ java_library(
"//common/values:cel_value_provider",
"//common/values:combined_cel_value_provider",
"//common/values:proto_message_value_provider",
"//runtime:activation",
"//runtime:interpretable",
"//runtime:proto_message_activation_factory",
"//runtime:resolved_overload",
"//runtime/planner:planned_program",
"//runtime/planner:program_planner",
"//runtime/standard:type",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand Down
56 changes: 49 additions & 7 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,12 +45,14 @@
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.CombinedCelValueProvider;
import dev.cel.common.values.ProtoMessageValueProvider;
import dev.cel.runtime.planner.PlannedProgram;
import dev.cel.runtime.planner.ProgramPlanner;
import dev.cel.runtime.standard.TypeFunction;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;

Expand DownExpand Up@@ -98,6 +100,21 @@ public Program createProgram(CelAbstractSyntaxTree ast) throws CelEvaluationExce
return toRuntimeProgram(planner().plan(ast));
}

private static final CelFunctionResolver EMPTY_FUNCTION_RESOLVER =
new CelFunctionResolver() {
@Override
public Optional<CelResolvedOverload> findOverloadMatchingArgs(
String functionName, Collection<String> overloadIds, Object[] args) {
return Optional.empty();
}

@Override
public Optional<CelResolvedOverload> findOverloadMatchingArgs(
String functionName, Object[] args) {
return Optional.empty();
}
};

public Program toRuntimeProgram(dev.cel.runtime.Program program) {
return new Program() {

Expand All@@ -119,7 +136,13 @@ public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctio

@Override
public Object eval(Message message) throws CelEvaluationException {
throw new UnsupportedOperationException("Not yet supported.");
PlannedProgram plannedProgram = (PlannedProgram) program;
return plannedProgram.evalOrThrow(
plannedProgram.interpretable(),
ProtoMessageActivationFactory.fromProto(message, plannedProgram.options()),
EMPTY_FUNCTION_RESOLVER,
/* partialVars= */ null,
/* listener= */ null);
}

@Override
Expand All@@ -141,25 +164,38 @@ public Object eval(PartialVars partialVars) throws CelEvaluationException {

@Override
public Object trace(CelEvaluationListener listener) throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(GlobalResolver.EMPTY, EMPTY_FUNCTION_RESOLVER, null, listener);
}

@Override
public Object trace(Map<String, ?> mapValue, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(Activation.copyOf(mapValue), EMPTY_FUNCTION_RESOLVER, null, listener);
}

@Override
public Object trace(Message message, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
PlannedProgram plannedProgram = (PlannedProgram) program;
return plannedProgram.evalOrThrow(
plannedProgram.interpretable(),
ProtoMessageActivationFactory.fromProto(message, plannedProgram.options()),
EMPTY_FUNCTION_RESOLVER,
/* partialVars= */ null,
listener);
}

@Override
public Object trace(CelVariableResolver resolver, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(
(name) -> resolver.find(name).orElse(null),
EMPTY_FUNCTION_RESOLVER,
null,
listener);
}

@Override
Expand All@@ -168,7 +204,12 @@ public Object trace(
CelFunctionResolver lateBoundFunctionResolver,
CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(
(name) -> resolver.find(name).orElse(null),
lateBoundFunctionResolver,
null,
listener);
}

@Override
Expand All@@ -177,7 +218,8 @@ public Object trace(
CelFunctionResolver lateBoundFunctionResolver,
CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(Activation.copyOf(mapValue), lateBoundFunctionResolver, null, listener);
}

@Override
Expand Down
30 changes: 28 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,17 +66,21 @@ java_library(
java_library(
name = "planned_program",
srcs = ["PlannedProgram.java"],
tags = [
],
deps = [
":error_metadata",
":localized_evaluation_exception",
":planned_interpretable",
"//:auto_value",
"//common:options",
"//common/annotations",
"//common/exceptions:runtime_exception",
"//common/values",
"//runtime:activation",
"//runtime:evaluation_exception",
"//runtime:evaluation_exception_builder",
"//runtime:evaluation_listener",
"//runtime:function_resolver",
"//runtime:interpretable",
"//runtime:interpreter_util",
Expand All@@ -85,6 +89,7 @@ java_library(
"//runtime:resolved_overload",
"//runtime:variable_resolver",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
],
)

Expand All@@ -93,6 +98,7 @@ java_library(
srcs = ["EvalConstant.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
],
Expand All@@ -104,6 +110,7 @@ java_library(
deps = [
":planned_interpretable",
":qualifier",
"//common/ast",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
Expand DownExpand Up@@ -183,6 +190,7 @@ java_library(
":interpretable_attribute",
":planned_interpretable",
":qualifier",
"//common/ast",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
],
Expand All@@ -196,6 +204,7 @@ java_library(
":planned_interpretable",
":presence_test_qualifier",
":qualifier",
"//common/ast",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -208,6 +217,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All@@ -221,6 +231,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All@@ -234,6 +245,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
Expand All@@ -248,6 +260,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
Expand All@@ -262,6 +275,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//common/values",
"//runtime:accumulated_unknowns",
Expand All@@ -278,6 +292,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -291,6 +306,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -303,6 +319,7 @@ java_library(
srcs = ["EvalConditional.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All@@ -316,11 +333,11 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/types:type_providers",
"//common/values",
"//common/values:cel_value_provider",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All@@ -333,8 +350,8 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All@@ -348,6 +365,7 @@ java_library(
":eval_helpers",
":localized_evaluation_exception",
":planned_interpretable",
"//common/ast",
"//common/exceptions:duplicate_key",
"//common/exceptions:invalid_argument",
"//runtime:accumulated_unknowns",
Expand All@@ -364,6 +382,7 @@ java_library(
deps = [
":activation_wrapper",
":planned_interpretable",
"//common/ast",
"//common/exceptions:runtime_exception",
"//common/values:mutable_map_value",
"//runtime:accumulated_unknowns",
Expand DownExpand Up@@ -421,13 +440,16 @@ java_library(
deps = [
":localized_evaluation_exception",
"//common:options",
"//common/ast",
"//common/exceptions:iteration_budget_exceeded",
"//runtime:evaluation_exception",
"//runtime:evaluation_listener",
"//runtime:function_resolver",
"//runtime:interpretable",
"//runtime:partial_vars",
"//runtime:resolved_overload",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
],
)

Expand All@@ -437,6 +459,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -451,6 +474,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -465,6 +489,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -478,6 +503,7 @@ java_library(
srcs = ["EvalBlock.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion extensions/src/main/java/dev/cel/extensions/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,7 +122,6 @@ java_library(
":extension_library",
"//checker:checker_builder",
"//common:compiler_common",
"//common:options",
"//common/ast",
"//common/exceptions:numeric_overflow",
"//common/internal:comparison_functions",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,8 @@
* planner runtime, along with parsed-only and checked expression evaluations for the planner.
*/
abstract class CelExtensionTestBase {
@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter public boolean isParseOnly;
@TestParameter CelRuntimeFlavor runtimeFlavor;
@TestParameter boolean isParseOnly;

@Before
public void setUpBase() {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,8 +46,8 @@

@RunWith(TestParameterInjector.class)
public class CelMathExtensionsTest {
@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter public boolean isParseOnly;
@TestParameter private CelRuntimeFlavor runtimeFlavor;
@TestParameter private boolean isParseOnly;

private Cel cel;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ public final class CelPolicyCompilerImplTest {
.enableHeterogeneousNumericComparisons(true)
.build();

@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter private CelRuntimeFlavor runtimeFlavor;

@Test
public void compileYamlPolicy_success(@TestParameter TestYamlPolicy yamlPolicy) throws Exception {
Expand Down
6 changes: 6 additions & 0 deletions runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,3 +9,9 @@ java_library(
name = "program_planner",
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:program_planner"],
)

java_library(
name = "planned_program",
visibility = ["//:internal"],
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:planned_program"],
)
5 changes: 5 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -853,6 +853,11 @@ java_library(
"//common/values:cel_value_provider",
"//common/values:combined_cel_value_provider",
"//common/values:proto_message_value_provider",
"//runtime:activation",
"//runtime:interpretable",
"//runtime:proto_message_activation_factory",
"//runtime:resolved_overload",
"//runtime/planner:planned_program",
"//runtime/planner:program_planner",
"//runtime/standard:type",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand Down
56 changes: 49 additions & 7 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,12 +45,14 @@
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.CombinedCelValueProvider;
import dev.cel.common.values.ProtoMessageValueProvider;
import dev.cel.runtime.planner.PlannedProgram;
import dev.cel.runtime.planner.ProgramPlanner;
import dev.cel.runtime.standard.TypeFunction;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;

Expand DownExpand Up@@ -98,6 +100,21 @@ public Program createProgram(CelAbstractSyntaxTree ast) throws CelEvaluationExce
return toRuntimeProgram(planner().plan(ast));
}

private static final CelFunctionResolver EMPTY_FUNCTION_RESOLVER =
new CelFunctionResolver() {
@Override
public Optional<CelResolvedOverload> findOverloadMatchingArgs(
String functionName, Collection<String> overloadIds, Object[] args) {
return Optional.empty();
}

@Override
public Optional<CelResolvedOverload> findOverloadMatchingArgs(
String functionName, Object[] args) {
return Optional.empty();
}
};

public Program toRuntimeProgram(dev.cel.runtime.Program program) {
return new Program() {

Expand All@@ -119,7 +136,13 @@ public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctio

@Override
public Object eval(Message message) throws CelEvaluationException {
throw new UnsupportedOperationException("Not yet supported.");
PlannedProgram plannedProgram = (PlannedProgram) program;
return plannedProgram.evalOrThrow(
plannedProgram.interpretable(),
ProtoMessageActivationFactory.fromProto(message, plannedProgram.options()),
EMPTY_FUNCTION_RESOLVER,
/* partialVars= */ null,
/* listener= */ null);
}

@Override
Expand All@@ -141,25 +164,38 @@ public Object eval(PartialVars partialVars) throws CelEvaluationException {

@Override
public Object trace(CelEvaluationListener listener) throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(GlobalResolver.EMPTY, EMPTY_FUNCTION_RESOLVER, null, listener);
}

@Override
public Object trace(Map<String, ?> mapValue, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(Activation.copyOf(mapValue), EMPTY_FUNCTION_RESOLVER, null, listener);
}

@Override
public Object trace(Message message, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
PlannedProgram plannedProgram = (PlannedProgram) program;
return plannedProgram.evalOrThrow(
plannedProgram.interpretable(),
ProtoMessageActivationFactory.fromProto(message, plannedProgram.options()),
EMPTY_FUNCTION_RESOLVER,
/* partialVars= */ null,
listener);
}

@Override
public Object trace(CelVariableResolver resolver, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(
(name) -> resolver.find(name).orElse(null),
EMPTY_FUNCTION_RESOLVER,
null,
listener);
}

@Override
Expand All@@ -168,7 +204,12 @@ public Object trace(
CelFunctionResolver lateBoundFunctionResolver,
CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(
(name) -> resolver.find(name).orElse(null),
lateBoundFunctionResolver,
null,
listener);
}

@Override
Expand All@@ -177,7 +218,8 @@ public Object trace(
CelFunctionResolver lateBoundFunctionResolver,
CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(Activation.copyOf(mapValue), lateBoundFunctionResolver, null, listener);
}

@Override
Expand Down
30 changes: 28 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,17 +66,21 @@ java_library(
java_library(
name = "planned_program",
srcs = ["PlannedProgram.java"],
tags = [
],
deps = [
":error_metadata",
":localized_evaluation_exception",
":planned_interpretable",
"//:auto_value",
"//common:options",
"//common/annotations",
"//common/exceptions:runtime_exception",
"//common/values",
"//runtime:activation",
"//runtime:evaluation_exception",
"//runtime:evaluation_exception_builder",
"//runtime:evaluation_listener",
"//runtime:function_resolver",
"//runtime:interpretable",
"//runtime:interpreter_util",
Expand All@@ -85,6 +89,7 @@ java_library(
"//runtime:resolved_overload",
"//runtime:variable_resolver",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
],
)

Expand All@@ -93,6 +98,7 @@ java_library(
srcs = ["EvalConstant.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
],
Expand All@@ -104,6 +110,7 @@ java_library(
deps = [
":planned_interpretable",
":qualifier",
"//common/ast",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
Expand DownExpand Up@@ -183,6 +190,7 @@ java_library(
":interpretable_attribute",
":planned_interpretable",
":qualifier",
"//common/ast",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
],
Expand All@@ -196,6 +204,7 @@ java_library(
":planned_interpretable",
":presence_test_qualifier",
":qualifier",
"//common/ast",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -208,6 +217,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All@@ -221,6 +231,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All@@ -234,6 +245,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
Expand All@@ -248,6 +260,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
Expand All@@ -262,6 +275,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//common/values",
"//runtime:accumulated_unknowns",
Expand All@@ -278,6 +292,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -291,6 +306,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -303,6 +319,7 @@ java_library(
srcs = ["EvalConditional.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All@@ -316,11 +333,11 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/types:type_providers",
"//common/values",
"//common/values:cel_value_provider",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All@@ -333,8 +350,8 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All@@ -348,6 +365,7 @@ java_library(
":eval_helpers",
":localized_evaluation_exception",
":planned_interpretable",
"//common/ast",
"//common/exceptions:duplicate_key",
"//common/exceptions:invalid_argument",
"//runtime:accumulated_unknowns",
Expand All@@ -364,6 +382,7 @@ java_library(
deps = [
":activation_wrapper",
":planned_interpretable",
"//common/ast",
"//common/exceptions:runtime_exception",
"//common/values:mutable_map_value",
"//runtime:accumulated_unknowns",
Expand DownExpand Up@@ -421,13 +440,16 @@ java_library(
deps = [
":localized_evaluation_exception",
"//common:options",
"//common/ast",
"//common/exceptions:iteration_budget_exceeded",
"//runtime:evaluation_exception",
"//runtime:evaluation_listener",
"//runtime:function_resolver",
"//runtime:interpretable",
"//runtime:partial_vars",
"//runtime:resolved_overload",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
],
)

Expand All@@ -437,6 +459,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -451,6 +474,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -465,6 +489,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All@@ -478,6 +503,7 @@ java_library(
srcs = ["EvalBlock.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand Down
Loading
Loading