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
2 changes: 2 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -446,6 +446,7 @@ java_library(
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"//runtime:resolved_overload",
Expand DownExpand Up@@ -957,6 +958,7 @@ cel_android_library(
"//runtime:evaluation_exception",
"//runtime:interpretable_android",
"//runtime:resolved_overload_android",
"//runtime/src/main/java/dev/cel/runtime:accumulated_unknowns_android",
],
)

Expand Down
21 changes: 9 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/planner/EvalBinary.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,20 +34,17 @@ final class EvalBinary extends PlannedInterpretable {

@Override
Object evalInternal(GlobalResolver resolver, ExecutionFrame frame) throws CelEvaluationException {
boolean isStrict = resolvedOverload.isStrict();
Object argVal1 =
resolvedOverload.isStrict()
? evalStrictly(arg1, resolver, frame)
: evalNonstrictly(arg1, resolver, frame);
isStrict ? evalStrictly(arg1, resolver, frame) : evalNonstrictly(arg1, resolver, frame);
Object argVal2 =
resolvedOverload.isStrict()
? evalStrictly(arg2, resolver, frame)
: evalNonstrictly(arg2, resolver, frame);

AccumulatedUnknowns unknowns = AccumulatedUnknowns.maybeMerge(null, argVal1);
unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal2);

if (unknowns != null) {
return unknowns;
isStrict ? evalStrictly(arg2, resolver, frame) : evalNonstrictly(arg2, resolver, frame);
if (isStrict) {
AccumulatedUnknowns unknowns = AccumulatedUnknowns.maybeMerge(null, argVal1);
unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal2);
if (unknowns != null) {
return unknowns;
}
}

return EvalHelpers.dispatch(
Expand Down
20 changes: 18 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/planner/EvalFold.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,15 @@ private Object evalMap(Map<?, ?> iterRange, Folder folder, ExecutionFrame frame)
folder.iterVar2Val = entry.getValue();
}

boolean cond = (boolean) condition.eval(folder, frame);
Object condResult = condition.eval(folder, frame);
if (condResult instanceof AccumulatedUnknowns) {
return condResult;
}
if (!(condResult instanceof Boolean)) {
throw new IllegalArgumentException(
String.format("Expected boolean value, found :%s", condResult));
}
boolean cond = (boolean) condResult;
if (!cond) {
folder.computeResult = true;
return result.eval(folder, frame);
Expand All@@ -131,7 +139,15 @@ private Object evalList(Collection<?> iterRange, Folder folder, ExecutionFrame f
folder.iterVar2Val = item;
}

boolean cond = (boolean) condition.eval(folder, frame);
Object condResult = condition.eval(folder, frame);
if (condResult instanceof AccumulatedUnknowns) {
return condResult;
}
if (!(condResult instanceof Boolean)) {
throw new IllegalArgumentException(
String.format("Expected boolean value, found :%s", condResult));
}
boolean cond = (boolean) condResult;
if (!cond) {
folder.computeResult = true;
return maybeUnwrapAccumulator(result.eval(folder, frame));
Expand Down
9 changes: 6 additions & 3 deletions runtime/src/main/java/dev/cel/runtime/planner/EvalUnary.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@

import dev.cel.common.ast.CelExpr;
import dev.cel.common.values.CelValueConverter;
import dev.cel.runtime.AccumulatedUnknowns;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelResolvedOverload;
import dev.cel.runtime.GlobalResolver;
Expand All@@ -32,10 +33,12 @@ final class EvalUnary extends PlannedInterpretable {

@Override
Object evalInternal(GlobalResolver resolver, ExecutionFrame frame) throws CelEvaluationException {
boolean isStrict = resolvedOverload.isStrict();
Object argVal =
resolvedOverload.isStrict()
? evalStrictly(arg, resolver, frame)
: evalNonstrictly(arg, resolver, frame);
isStrict ? evalStrictly(arg, resolver, frame) : evalNonstrictly(arg, resolver, frame);
if (isStrict && argVal instanceof AccumulatedUnknowns) {
return argVal;
}
return EvalHelpers.dispatch(functionName, resolvedOverload, celValueConverter, argVal);
}

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,18 +36,17 @@ final class EvalVarArgsCall extends PlannedInterpretable {

@Override
Object evalInternal(GlobalResolver resolver, ExecutionFrame frame) throws CelEvaluationException {
boolean isStrict = resolvedOverload.isStrict();
Object[] argVals = new Object[args.length];
AccumulatedUnknowns unknowns = null;
for (int i = 0; i < args.length; i++) {
PlannedInterpretable arg = args[i];
argVals[i] =
resolvedOverload.isStrict()
? evalStrictly(arg, resolver, frame)
: evalNonstrictly(arg, resolver, frame);

unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVals[i]);
isStrict ? evalStrictly(arg, resolver, frame) : evalNonstrictly(arg, resolver, frame);
if (isStrict) {
unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVals[i]);
}
}

if (unknowns != null) {
return unknowns;
}
Expand Down
179 changes: 179 additions & 0 deletions runtime/src/test/java/dev/cel/runtime/planner/ProgramPlannerTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelOptions;
import dev.cel.common.CelSource;
import dev.cel.common.ast.CelConstant;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.exceptions.CelDivideByZeroException;
import dev.cel.common.internal.CelDescriptorPool;
Expand DownExpand Up@@ -210,6 +211,20 @@ private static DefaultDispatcher newDispatcher() {
CelFunctionBinding.from("neg_int", Long.class, arg -> -arg),
CelFunctionBinding.from("neg_double", Double.class, arg -> -arg)));

addBindingsToDispatcher(
builder,
CelFunctionBinding.fromOverloads(
"add", CelFunctionBinding.from("add_int", Long.class, Long.class, (a, b) -> a + b)));

addBindingsToDispatcher(
builder,
CelFunctionBinding.fromOverloads(
"func",
CelFunctionBinding.from(
"func_int",
ImmutableList.of(Long.class, Long.class, Long.class),
(args) -> (long) args.length)));

addBindingsToDispatcher(
builder,
CelFunctionBinding.fromOverloads(
Expand DownExpand Up@@ -977,6 +992,170 @@ public void plan_partialEval_withWildcardQualification() throws Exception {
ImmutableSet.of(2L, 5L, 7L)));
}

@Test
public void plan_unaryFunction_withUnknownArg() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addVar("unk", SimpleType.INT)
.addFunctionDeclarations(
newFunctionDeclaration(
"neg", newGlobalOverload("neg_int", SimpleType.INT, SimpleType.INT)))
.build();
CelAbstractSyntaxTree ast = compile(compiler, "neg(unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(2L)));
}

@Test
public void plan_fold_withUnknownCondition() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.addVar("unk", SimpleType.BOOL)
.build();
CelAbstractSyntaxTree ast = compile(compiler, "[1, 2].all(x, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(6L)));
}

@Test
public void plan_foldMap_withUnknownCondition() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.addVar("unk", SimpleType.BOOL)
.build();
CelAbstractSyntaxTree ast = compile(compiler, "{\"a\": 1, \"b\": 2}.exists(k, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(
ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(10L)));
}

@Test
public void plan_foldList_withUnknownLoopCondition_earlyReturn() throws Exception {
CelExpr comprehensionExpr =
CelExpr.ofComprehension(
1L,
"x",
"",
CelExpr.ofList(
2L,
ImmutableList.of(CelExpr.ofConstant(3L, CelConstant.ofValue(1L))),
ImmutableList.of()),
"acc",
CelExpr.ofConstant(4L, CelConstant.ofValue(true)),
CelExpr.ofIdent(5L, "unk"),
CelExpr.ofIdent(6L, "acc"),
CelExpr.ofIdent(7L, "acc"));
CelAbstractSyntaxTree ast =
CelAbstractSyntaxTree.newParsedAst(comprehensionExpr, CelSource.newBuilder().build());

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(5L)));
}

@Test
public void plan_foldMap_withUnknownLoopCondition_earlyReturn() throws Exception {
CelExpr comprehensionExpr =
CelExpr.ofComprehension(
1L,
"k",
"",
CelExpr.ofMap(
2L,
ImmutableList.of(
CelExpr.ofMapEntry(
3L,
CelExpr.ofConstant(4L, CelConstant.ofValue("a")),
CelExpr.ofConstant(5L, CelConstant.ofValue(1L)),
false))),
"acc",
CelExpr.ofConstant(6L, CelConstant.ofValue(true)),
CelExpr.ofIdent(7L, "unk"),
CelExpr.ofIdent(8L, "acc"),
CelExpr.ofIdent(9L, "acc"));
CelAbstractSyntaxTree ast =
CelAbstractSyntaxTree.newParsedAst(comprehensionExpr, CelSource.newBuilder().build());

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(7L)));
}

@Test
public void plan_binaryFunction_withUnknownArg() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addVar("unk", SimpleType.INT)
.addFunctionDeclarations(
newFunctionDeclaration(
"add",
newGlobalOverload("add_int", SimpleType.INT, SimpleType.INT, SimpleType.INT)))
.build();
CelAbstractSyntaxTree ast = compile(compiler, "add(1, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(3L)));
}

@Test
public void plan_varargsFunction_withUnknownArg() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addVar("unk", SimpleType.INT)
.addFunctionDeclarations(
newFunctionDeclaration(
"func",
newGlobalOverload(
"func_int",
SimpleType.INT,
SimpleType.INT,
SimpleType.INT,
SimpleType.INT)))
.build();
CelAbstractSyntaxTree ast = compile(compiler, "func(1, 2, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(4L)));
}

@Test
public void localShadowIdentifier_inSelect() throws Exception {
CelCompiler celCompiler =
Expand Down
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
2 changes: 2 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -446,6 +446,7 @@ java_library(
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"//runtime:resolved_overload",
Expand DownExpand Up@@ -957,6 +958,7 @@ cel_android_library(
"//runtime:evaluation_exception",
"//runtime:interpretable_android",
"//runtime:resolved_overload_android",
"//runtime/src/main/java/dev/cel/runtime:accumulated_unknowns_android",
],
)

Expand Down
21 changes: 9 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/planner/EvalBinary.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,20 +34,17 @@ final class EvalBinary extends PlannedInterpretable {

@Override
Object evalInternal(GlobalResolver resolver, ExecutionFrame frame) throws CelEvaluationException {
boolean isStrict = resolvedOverload.isStrict();
Object argVal1 =
resolvedOverload.isStrict()
? evalStrictly(arg1, resolver, frame)
: evalNonstrictly(arg1, resolver, frame);
isStrict ? evalStrictly(arg1, resolver, frame) : evalNonstrictly(arg1, resolver, frame);
Object argVal2 =
resolvedOverload.isStrict()
? evalStrictly(arg2, resolver, frame)
: evalNonstrictly(arg2, resolver, frame);

AccumulatedUnknowns unknowns = AccumulatedUnknowns.maybeMerge(null, argVal1);
unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal2);

if (unknowns != null) {
return unknowns;
isStrict ? evalStrictly(arg2, resolver, frame) : evalNonstrictly(arg2, resolver, frame);
if (isStrict) {
AccumulatedUnknowns unknowns = AccumulatedUnknowns.maybeMerge(null, argVal1);
unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal2);
if (unknowns != null) {
return unknowns;
}
}

return EvalHelpers.dispatch(
Expand Down
20 changes: 18 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/planner/EvalFold.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,15 @@ private Object evalMap(Map<?, ?> iterRange, Folder folder, ExecutionFrame frame)
folder.iterVar2Val = entry.getValue();
}

boolean cond = (boolean) condition.eval(folder, frame);
Object condResult = condition.eval(folder, frame);
if (condResult instanceof AccumulatedUnknowns) {
return condResult;
}
if (!(condResult instanceof Boolean)) {
throw new IllegalArgumentException(
String.format("Expected boolean value, found :%s", condResult));
}
boolean cond = (boolean) condResult;
if (!cond) {
folder.computeResult = true;
return result.eval(folder, frame);
Expand All@@ -131,7 +139,15 @@ private Object evalList(Collection<?> iterRange, Folder folder, ExecutionFrame f
folder.iterVar2Val = item;
}

boolean cond = (boolean) condition.eval(folder, frame);
Object condResult = condition.eval(folder, frame);
if (condResult instanceof AccumulatedUnknowns) {
return condResult;
}
if (!(condResult instanceof Boolean)) {
throw new IllegalArgumentException(
String.format("Expected boolean value, found :%s", condResult));
}
boolean cond = (boolean) condResult;
if (!cond) {
folder.computeResult = true;
return maybeUnwrapAccumulator(result.eval(folder, frame));
Expand Down
9 changes: 6 additions & 3 deletions runtime/src/main/java/dev/cel/runtime/planner/EvalUnary.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@

import dev.cel.common.ast.CelExpr;
import dev.cel.common.values.CelValueConverter;
import dev.cel.runtime.AccumulatedUnknowns;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelResolvedOverload;
import dev.cel.runtime.GlobalResolver;
Expand All@@ -32,10 +33,12 @@ final class EvalUnary extends PlannedInterpretable {

@Override
Object evalInternal(GlobalResolver resolver, ExecutionFrame frame) throws CelEvaluationException {
boolean isStrict = resolvedOverload.isStrict();
Object argVal =
resolvedOverload.isStrict()
? evalStrictly(arg, resolver, frame)
: evalNonstrictly(arg, resolver, frame);
isStrict ? evalStrictly(arg, resolver, frame) : evalNonstrictly(arg, resolver, frame);
if (isStrict && argVal instanceof AccumulatedUnknowns) {
return argVal;
}
return EvalHelpers.dispatch(functionName, resolvedOverload, celValueConverter, argVal);
}

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,18 +36,17 @@ final class EvalVarArgsCall extends PlannedInterpretable {

@Override
Object evalInternal(GlobalResolver resolver, ExecutionFrame frame) throws CelEvaluationException {
boolean isStrict = resolvedOverload.isStrict();
Object[] argVals = new Object[args.length];
AccumulatedUnknowns unknowns = null;
for (int i = 0; i < args.length; i++) {
PlannedInterpretable arg = args[i];
argVals[i] =
resolvedOverload.isStrict()
? evalStrictly(arg, resolver, frame)
: evalNonstrictly(arg, resolver, frame);

unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVals[i]);
isStrict ? evalStrictly(arg, resolver, frame) : evalNonstrictly(arg, resolver, frame);
if (isStrict) {
unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVals[i]);
}
}

if (unknowns != null) {
return unknowns;
}
Expand Down
179 changes: 179 additions & 0 deletions runtime/src/test/java/dev/cel/runtime/planner/ProgramPlannerTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelOptions;
import dev.cel.common.CelSource;
import dev.cel.common.ast.CelConstant;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.exceptions.CelDivideByZeroException;
import dev.cel.common.internal.CelDescriptorPool;
Expand DownExpand Up@@ -210,6 +211,20 @@ private static DefaultDispatcher newDispatcher() {
CelFunctionBinding.from("neg_int", Long.class, arg -> -arg),
CelFunctionBinding.from("neg_double", Double.class, arg -> -arg)));

addBindingsToDispatcher(
builder,
CelFunctionBinding.fromOverloads(
"add", CelFunctionBinding.from("add_int", Long.class, Long.class, (a, b) -> a + b)));

addBindingsToDispatcher(
builder,
CelFunctionBinding.fromOverloads(
"func",
CelFunctionBinding.from(
"func_int",
ImmutableList.of(Long.class, Long.class, Long.class),
(args) -> (long) args.length)));

addBindingsToDispatcher(
builder,
CelFunctionBinding.fromOverloads(
Expand DownExpand Up@@ -977,6 +992,170 @@ public void plan_partialEval_withWildcardQualification() throws Exception {
ImmutableSet.of(2L, 5L, 7L)));
}

@Test
public void plan_unaryFunction_withUnknownArg() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addVar("unk", SimpleType.INT)
.addFunctionDeclarations(
newFunctionDeclaration(
"neg", newGlobalOverload("neg_int", SimpleType.INT, SimpleType.INT)))
.build();
CelAbstractSyntaxTree ast = compile(compiler, "neg(unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(2L)));
}

@Test
public void plan_fold_withUnknownCondition() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.addVar("unk", SimpleType.BOOL)
.build();
CelAbstractSyntaxTree ast = compile(compiler, "[1, 2].all(x, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(6L)));
}

@Test
public void plan_foldMap_withUnknownCondition() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.addVar("unk", SimpleType.BOOL)
.build();
CelAbstractSyntaxTree ast = compile(compiler, "{\"a\": 1, \"b\": 2}.exists(k, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(
ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(10L)));
}

@Test
public void plan_foldList_withUnknownLoopCondition_earlyReturn() throws Exception {
CelExpr comprehensionExpr =
CelExpr.ofComprehension(
1L,
"x",
"",
CelExpr.ofList(
2L,
ImmutableList.of(CelExpr.ofConstant(3L, CelConstant.ofValue(1L))),
ImmutableList.of()),
"acc",
CelExpr.ofConstant(4L, CelConstant.ofValue(true)),
CelExpr.ofIdent(5L, "unk"),
CelExpr.ofIdent(6L, "acc"),
CelExpr.ofIdent(7L, "acc"));
CelAbstractSyntaxTree ast =
CelAbstractSyntaxTree.newParsedAst(comprehensionExpr, CelSource.newBuilder().build());

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(5L)));
}

@Test
public void plan_foldMap_withUnknownLoopCondition_earlyReturn() throws Exception {
CelExpr comprehensionExpr =
CelExpr.ofComprehension(
1L,
"k",
"",
CelExpr.ofMap(
2L,
ImmutableList.of(
CelExpr.ofMapEntry(
3L,
CelExpr.ofConstant(4L, CelConstant.ofValue("a")),
CelExpr.ofConstant(5L, CelConstant.ofValue(1L)),
false))),
"acc",
CelExpr.ofConstant(6L, CelConstant.ofValue(true)),
CelExpr.ofIdent(7L, "unk"),
CelExpr.ofIdent(8L, "acc"),
CelExpr.ofIdent(9L, "acc"));
CelAbstractSyntaxTree ast =
CelAbstractSyntaxTree.newParsedAst(comprehensionExpr, CelSource.newBuilder().build());

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(7L)));
}

@Test
public void plan_binaryFunction_withUnknownArg() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addVar("unk", SimpleType.INT)
.addFunctionDeclarations(
newFunctionDeclaration(
"add",
newGlobalOverload("add_int", SimpleType.INT, SimpleType.INT, SimpleType.INT)))
.build();
CelAbstractSyntaxTree ast = compile(compiler, "add(1, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(3L)));
}

@Test
public void plan_varargsFunction_withUnknownArg() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addVar("unk", SimpleType.INT)
.addFunctionDeclarations(
newFunctionDeclaration(
"func",
newGlobalOverload(
"func_int",
SimpleType.INT,
SimpleType.INT,
SimpleType.INT,
SimpleType.INT)))
.build();
CelAbstractSyntaxTree ast = compile(compiler, "func(1, 2, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(4L)));
}

@Test
public void localShadowIdentifier_inSelect() throws Exception {
CelCompiler celCompiler =
Expand Down
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
2 changes: 2 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -446,6 +446,7 @@ java_library(
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"//runtime:resolved_overload",
Expand DownExpand Up@@ -957,6 +958,7 @@ cel_android_library(
"//runtime:evaluation_exception",
"//runtime:interpretable_android",
"//runtime:resolved_overload_android",
"//runtime/src/main/java/dev/cel/runtime:accumulated_unknowns_android",
],
)

Expand Down
21 changes: 9 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/planner/EvalBinary.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,20 +34,17 @@ final class EvalBinary extends PlannedInterpretable {

@Override
Object evalInternal(GlobalResolver resolver, ExecutionFrame frame) throws CelEvaluationException {
boolean isStrict = resolvedOverload.isStrict();
Object argVal1 =
resolvedOverload.isStrict()
? evalStrictly(arg1, resolver, frame)
: evalNonstrictly(arg1, resolver, frame);
isStrict ? evalStrictly(arg1, resolver, frame) : evalNonstrictly(arg1, resolver, frame);
Object argVal2 =
resolvedOverload.isStrict()
? evalStrictly(arg2, resolver, frame)
: evalNonstrictly(arg2, resolver, frame);

AccumulatedUnknowns unknowns = AccumulatedUnknowns.maybeMerge(null, argVal1);
unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal2);

if (unknowns != null) {
return unknowns;
isStrict ? evalStrictly(arg2, resolver, frame) : evalNonstrictly(arg2, resolver, frame);
if (isStrict) {
AccumulatedUnknowns unknowns = AccumulatedUnknowns.maybeMerge(null, argVal1);
unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal2);
if (unknowns != null) {
return unknowns;
}
}

return EvalHelpers.dispatch(
Expand Down
20 changes: 18 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/planner/EvalFold.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,15 @@ private Object evalMap(Map<?, ?> iterRange, Folder folder, ExecutionFrame frame)
folder.iterVar2Val = entry.getValue();
}

boolean cond = (boolean) condition.eval(folder, frame);
Object condResult = condition.eval(folder, frame);
if (condResult instanceof AccumulatedUnknowns) {
return condResult;
}
if (!(condResult instanceof Boolean)) {
throw new IllegalArgumentException(
String.format("Expected boolean value, found :%s", condResult));
}
boolean cond = (boolean) condResult;
if (!cond) {
folder.computeResult = true;
return result.eval(folder, frame);
Expand All@@ -131,7 +139,15 @@ private Object evalList(Collection<?> iterRange, Folder folder, ExecutionFrame f
folder.iterVar2Val = item;
}

boolean cond = (boolean) condition.eval(folder, frame);
Object condResult = condition.eval(folder, frame);
if (condResult instanceof AccumulatedUnknowns) {
return condResult;
}
if (!(condResult instanceof Boolean)) {
throw new IllegalArgumentException(
String.format("Expected boolean value, found :%s", condResult));
}
boolean cond = (boolean) condResult;
if (!cond) {
folder.computeResult = true;
return maybeUnwrapAccumulator(result.eval(folder, frame));
Expand Down
9 changes: 6 additions & 3 deletions runtime/src/main/java/dev/cel/runtime/planner/EvalUnary.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@

import dev.cel.common.ast.CelExpr;
import dev.cel.common.values.CelValueConverter;
import dev.cel.runtime.AccumulatedUnknowns;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelResolvedOverload;
import dev.cel.runtime.GlobalResolver;
Expand All@@ -32,10 +33,12 @@ final class EvalUnary extends PlannedInterpretable {

@Override
Object evalInternal(GlobalResolver resolver, ExecutionFrame frame) throws CelEvaluationException {
boolean isStrict = resolvedOverload.isStrict();
Object argVal =
resolvedOverload.isStrict()
? evalStrictly(arg, resolver, frame)
: evalNonstrictly(arg, resolver, frame);
isStrict ? evalStrictly(arg, resolver, frame) : evalNonstrictly(arg, resolver, frame);
if (isStrict && argVal instanceof AccumulatedUnknowns) {
return argVal;
}
return EvalHelpers.dispatch(functionName, resolvedOverload, celValueConverter, argVal);
}

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,18 +36,17 @@ final class EvalVarArgsCall extends PlannedInterpretable {

@Override
Object evalInternal(GlobalResolver resolver, ExecutionFrame frame) throws CelEvaluationException {
boolean isStrict = resolvedOverload.isStrict();
Object[] argVals = new Object[args.length];
AccumulatedUnknowns unknowns = null;
for (int i = 0; i < args.length; i++) {
PlannedInterpretable arg = args[i];
argVals[i] =
resolvedOverload.isStrict()
? evalStrictly(arg, resolver, frame)
: evalNonstrictly(arg, resolver, frame);

unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVals[i]);
isStrict ? evalStrictly(arg, resolver, frame) : evalNonstrictly(arg, resolver, frame);
if (isStrict) {
unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVals[i]);
}
}

if (unknowns != null) {
return unknowns;
}
Expand Down
179 changes: 179 additions & 0 deletions runtime/src/test/java/dev/cel/runtime/planner/ProgramPlannerTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelOptions;
import dev.cel.common.CelSource;
import dev.cel.common.ast.CelConstant;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.exceptions.CelDivideByZeroException;
import dev.cel.common.internal.CelDescriptorPool;
Expand DownExpand Up@@ -210,6 +211,20 @@ private static DefaultDispatcher newDispatcher() {
CelFunctionBinding.from("neg_int", Long.class, arg -> -arg),
CelFunctionBinding.from("neg_double", Double.class, arg -> -arg)));

addBindingsToDispatcher(
builder,
CelFunctionBinding.fromOverloads(
"add", CelFunctionBinding.from("add_int", Long.class, Long.class, (a, b) -> a + b)));

addBindingsToDispatcher(
builder,
CelFunctionBinding.fromOverloads(
"func",
CelFunctionBinding.from(
"func_int",
ImmutableList.of(Long.class, Long.class, Long.class),
(args) -> (long) args.length)));

addBindingsToDispatcher(
builder,
CelFunctionBinding.fromOverloads(
Expand DownExpand Up@@ -977,6 +992,170 @@ public void plan_partialEval_withWildcardQualification() throws Exception {
ImmutableSet.of(2L, 5L, 7L)));
}

@Test
public void plan_unaryFunction_withUnknownArg() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addVar("unk", SimpleType.INT)
.addFunctionDeclarations(
newFunctionDeclaration(
"neg", newGlobalOverload("neg_int", SimpleType.INT, SimpleType.INT)))
.build();
CelAbstractSyntaxTree ast = compile(compiler, "neg(unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(2L)));
}

@Test
public void plan_fold_withUnknownCondition() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.addVar("unk", SimpleType.BOOL)
.build();
CelAbstractSyntaxTree ast = compile(compiler, "[1, 2].all(x, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(6L)));
}

@Test
public void plan_foldMap_withUnknownCondition() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.addVar("unk", SimpleType.BOOL)
.build();
CelAbstractSyntaxTree ast = compile(compiler, "{\"a\": 1, \"b\": 2}.exists(k, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(
ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(10L)));
}

@Test
public void plan_foldList_withUnknownLoopCondition_earlyReturn() throws Exception {
CelExpr comprehensionExpr =
CelExpr.ofComprehension(
1L,
"x",
"",
CelExpr.ofList(
2L,
ImmutableList.of(CelExpr.ofConstant(3L, CelConstant.ofValue(1L))),
ImmutableList.of()),
"acc",
CelExpr.ofConstant(4L, CelConstant.ofValue(true)),
CelExpr.ofIdent(5L, "unk"),
CelExpr.ofIdent(6L, "acc"),
CelExpr.ofIdent(7L, "acc"));
CelAbstractSyntaxTree ast =
CelAbstractSyntaxTree.newParsedAst(comprehensionExpr, CelSource.newBuilder().build());

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(5L)));
}

@Test
public void plan_foldMap_withUnknownLoopCondition_earlyReturn() throws Exception {
CelExpr comprehensionExpr =
CelExpr.ofComprehension(
1L,
"k",
"",
CelExpr.ofMap(
2L,
ImmutableList.of(
CelExpr.ofMapEntry(
3L,
CelExpr.ofConstant(4L, CelConstant.ofValue("a")),
CelExpr.ofConstant(5L, CelConstant.ofValue(1L)),
false))),
"acc",
CelExpr.ofConstant(6L, CelConstant.ofValue(true)),
CelExpr.ofIdent(7L, "unk"),
CelExpr.ofIdent(8L, "acc"),
CelExpr.ofIdent(9L, "acc"));
CelAbstractSyntaxTree ast =
CelAbstractSyntaxTree.newParsedAst(comprehensionExpr, CelSource.newBuilder().build());

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(7L)));
}

@Test
public void plan_binaryFunction_withUnknownArg() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addVar("unk", SimpleType.INT)
.addFunctionDeclarations(
newFunctionDeclaration(
"add",
newGlobalOverload("add_int", SimpleType.INT, SimpleType.INT, SimpleType.INT)))
.build();
CelAbstractSyntaxTree ast = compile(compiler, "add(1, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(3L)));
}

@Test
public void plan_varargsFunction_withUnknownArg() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addVar("unk", SimpleType.INT)
.addFunctionDeclarations(
newFunctionDeclaration(
"func",
newGlobalOverload(
"func_int",
SimpleType.INT,
SimpleType.INT,
SimpleType.INT,
SimpleType.INT)))
.build();
CelAbstractSyntaxTree ast = compile(compiler, "func(1, 2, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(4L)));
}

@Test
public void localShadowIdentifier_inSelect() throws Exception {
CelCompiler celCompiler =
Expand Down
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
2 changes: 2 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -446,6 +446,7 @@ java_library(
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"//runtime:resolved_overload",
Expand DownExpand Up@@ -957,6 +958,7 @@ cel_android_library(
"//runtime:evaluation_exception",
"//runtime:interpretable_android",
"//runtime:resolved_overload_android",
"//runtime/src/main/java/dev/cel/runtime:accumulated_unknowns_android",
],
)

Expand Down
21 changes: 9 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/planner/EvalBinary.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,20 +34,17 @@ final class EvalBinary extends PlannedInterpretable {

@Override
Object evalInternal(GlobalResolver resolver, ExecutionFrame frame) throws CelEvaluationException {
boolean isStrict = resolvedOverload.isStrict();
Object argVal1 =
resolvedOverload.isStrict()
? evalStrictly(arg1, resolver, frame)
: evalNonstrictly(arg1, resolver, frame);
isStrict ? evalStrictly(arg1, resolver, frame) : evalNonstrictly(arg1, resolver, frame);
Object argVal2 =
resolvedOverload.isStrict()
? evalStrictly(arg2, resolver, frame)
: evalNonstrictly(arg2, resolver, frame);

AccumulatedUnknowns unknowns = AccumulatedUnknowns.maybeMerge(null, argVal1);
unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal2);

if (unknowns != null) {
return unknowns;
isStrict ? evalStrictly(arg2, resolver, frame) : evalNonstrictly(arg2, resolver, frame);
if (isStrict) {
AccumulatedUnknowns unknowns = AccumulatedUnknowns.maybeMerge(null, argVal1);
unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal2);
if (unknowns != null) {
return unknowns;
}
}

return EvalHelpers.dispatch(
Expand Down
20 changes: 18 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/planner/EvalFold.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,15 @@ private Object evalMap(Map<?, ?> iterRange, Folder folder, ExecutionFrame frame)
folder.iterVar2Val = entry.getValue();
}

boolean cond = (boolean) condition.eval(folder, frame);
Object condResult = condition.eval(folder, frame);
if (condResult instanceof AccumulatedUnknowns) {
return condResult;
}
if (!(condResult instanceof Boolean)) {
throw new IllegalArgumentException(
String.format("Expected boolean value, found :%s", condResult));
}
boolean cond = (boolean) condResult;
if (!cond) {
folder.computeResult = true;
return result.eval(folder, frame);
Expand All@@ -131,7 +139,15 @@ private Object evalList(Collection<?> iterRange, Folder folder, ExecutionFrame f
folder.iterVar2Val = item;
}

boolean cond = (boolean) condition.eval(folder, frame);
Object condResult = condition.eval(folder, frame);
if (condResult instanceof AccumulatedUnknowns) {
return condResult;
}
if (!(condResult instanceof Boolean)) {
throw new IllegalArgumentException(
String.format("Expected boolean value, found :%s", condResult));
}
boolean cond = (boolean) condResult;
if (!cond) {
folder.computeResult = true;
return maybeUnwrapAccumulator(result.eval(folder, frame));
Expand Down
9 changes: 6 additions & 3 deletions runtime/src/main/java/dev/cel/runtime/planner/EvalUnary.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@

import dev.cel.common.ast.CelExpr;
import dev.cel.common.values.CelValueConverter;
import dev.cel.runtime.AccumulatedUnknowns;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelResolvedOverload;
import dev.cel.runtime.GlobalResolver;
Expand All@@ -32,10 +33,12 @@ final class EvalUnary extends PlannedInterpretable {

@Override
Object evalInternal(GlobalResolver resolver, ExecutionFrame frame) throws CelEvaluationException {
boolean isStrict = resolvedOverload.isStrict();
Object argVal =
resolvedOverload.isStrict()
? evalStrictly(arg, resolver, frame)
: evalNonstrictly(arg, resolver, frame);
isStrict ? evalStrictly(arg, resolver, frame) : evalNonstrictly(arg, resolver, frame);
if (isStrict && argVal instanceof AccumulatedUnknowns) {
return argVal;
}
return EvalHelpers.dispatch(functionName, resolvedOverload, celValueConverter, argVal);
}

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,18 +36,17 @@ final class EvalVarArgsCall extends PlannedInterpretable {

@Override
Object evalInternal(GlobalResolver resolver, ExecutionFrame frame) throws CelEvaluationException {
boolean isStrict = resolvedOverload.isStrict();
Object[] argVals = new Object[args.length];
AccumulatedUnknowns unknowns = null;
for (int i = 0; i < args.length; i++) {
PlannedInterpretable arg = args[i];
argVals[i] =
resolvedOverload.isStrict()
? evalStrictly(arg, resolver, frame)
: evalNonstrictly(arg, resolver, frame);

unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVals[i]);
isStrict ? evalStrictly(arg, resolver, frame) : evalNonstrictly(arg, resolver, frame);
if (isStrict) {
unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVals[i]);
}
}

if (unknowns != null) {
return unknowns;
}
Expand Down
179 changes: 179 additions & 0 deletions runtime/src/test/java/dev/cel/runtime/planner/ProgramPlannerTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelOptions;
import dev.cel.common.CelSource;
import dev.cel.common.ast.CelConstant;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.exceptions.CelDivideByZeroException;
import dev.cel.common.internal.CelDescriptorPool;
Expand DownExpand Up@@ -210,6 +211,20 @@ private static DefaultDispatcher newDispatcher() {
CelFunctionBinding.from("neg_int", Long.class, arg -> -arg),
CelFunctionBinding.from("neg_double", Double.class, arg -> -arg)));

addBindingsToDispatcher(
builder,
CelFunctionBinding.fromOverloads(
"add", CelFunctionBinding.from("add_int", Long.class, Long.class, (a, b) -> a + b)));

addBindingsToDispatcher(
builder,
CelFunctionBinding.fromOverloads(
"func",
CelFunctionBinding.from(
"func_int",
ImmutableList.of(Long.class, Long.class, Long.class),
(args) -> (long) args.length)));

addBindingsToDispatcher(
builder,
CelFunctionBinding.fromOverloads(
Expand DownExpand Up@@ -977,6 +992,170 @@ public void plan_partialEval_withWildcardQualification() throws Exception {
ImmutableSet.of(2L, 5L, 7L)));
}

@Test
public void plan_unaryFunction_withUnknownArg() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addVar("unk", SimpleType.INT)
.addFunctionDeclarations(
newFunctionDeclaration(
"neg", newGlobalOverload("neg_int", SimpleType.INT, SimpleType.INT)))
.build();
CelAbstractSyntaxTree ast = compile(compiler, "neg(unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(2L)));
}

@Test
public void plan_fold_withUnknownCondition() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.addVar("unk", SimpleType.BOOL)
.build();
CelAbstractSyntaxTree ast = compile(compiler, "[1, 2].all(x, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(6L)));
}

@Test
public void plan_foldMap_withUnknownCondition() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.addVar("unk", SimpleType.BOOL)
.build();
CelAbstractSyntaxTree ast = compile(compiler, "{\"a\": 1, \"b\": 2}.exists(k, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(
ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(10L)));
}

@Test
public void plan_foldList_withUnknownLoopCondition_earlyReturn() throws Exception {
CelExpr comprehensionExpr =
CelExpr.ofComprehension(
1L,
"x",
"",
CelExpr.ofList(
2L,
ImmutableList.of(CelExpr.ofConstant(3L, CelConstant.ofValue(1L))),
ImmutableList.of()),
"acc",
CelExpr.ofConstant(4L, CelConstant.ofValue(true)),
CelExpr.ofIdent(5L, "unk"),
CelExpr.ofIdent(6L, "acc"),
CelExpr.ofIdent(7L, "acc"));
CelAbstractSyntaxTree ast =
CelAbstractSyntaxTree.newParsedAst(comprehensionExpr, CelSource.newBuilder().build());

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(5L)));
}

@Test
public void plan_foldMap_withUnknownLoopCondition_earlyReturn() throws Exception {
CelExpr comprehensionExpr =
CelExpr.ofComprehension(
1L,
"k",
"",
CelExpr.ofMap(
2L,
ImmutableList.of(
CelExpr.ofMapEntry(
3L,
CelExpr.ofConstant(4L, CelConstant.ofValue("a")),
CelExpr.ofConstant(5L, CelConstant.ofValue(1L)),
false))),
"acc",
CelExpr.ofConstant(6L, CelConstant.ofValue(true)),
CelExpr.ofIdent(7L, "unk"),
CelExpr.ofIdent(8L, "acc"),
CelExpr.ofIdent(9L, "acc"));
CelAbstractSyntaxTree ast =
CelAbstractSyntaxTree.newParsedAst(comprehensionExpr, CelSource.newBuilder().build());

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(7L)));
}

@Test
public void plan_binaryFunction_withUnknownArg() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addVar("unk", SimpleType.INT)
.addFunctionDeclarations(
newFunctionDeclaration(
"add",
newGlobalOverload("add_int", SimpleType.INT, SimpleType.INT, SimpleType.INT)))
.build();
CelAbstractSyntaxTree ast = compile(compiler, "add(1, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(3L)));
}

@Test
public void plan_varargsFunction_withUnknownArg() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addVar("unk", SimpleType.INT)
.addFunctionDeclarations(
newFunctionDeclaration(
"func",
newGlobalOverload(
"func_int",
SimpleType.INT,
SimpleType.INT,
SimpleType.INT,
SimpleType.INT)))
.build();
CelAbstractSyntaxTree ast = compile(compiler, "func(1, 2, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(4L)));
}

@Test
public void localShadowIdentifier_inSelect() throws Exception {
CelCompiler celCompiler =
Expand Down
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
2 changes: 2 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -446,6 +446,7 @@ java_library(
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"//runtime:resolved_overload",
Expand DownExpand Up@@ -957,6 +958,7 @@ cel_android_library(
"//runtime:evaluation_exception",
"//runtime:interpretable_android",
"//runtime:resolved_overload_android",
"//runtime/src/main/java/dev/cel/runtime:accumulated_unknowns_android",
],
)

Expand Down
21 changes: 9 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/planner/EvalBinary.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,20 +34,17 @@ final class EvalBinary extends PlannedInterpretable {

@Override
Object evalInternal(GlobalResolver resolver, ExecutionFrame frame) throws CelEvaluationException {
boolean isStrict = resolvedOverload.isStrict();
Object argVal1 =
resolvedOverload.isStrict()
? evalStrictly(arg1, resolver, frame)
: evalNonstrictly(arg1, resolver, frame);
isStrict ? evalStrictly(arg1, resolver, frame) : evalNonstrictly(arg1, resolver, frame);
Object argVal2 =
resolvedOverload.isStrict()
? evalStrictly(arg2, resolver, frame)
: evalNonstrictly(arg2, resolver, frame);

AccumulatedUnknowns unknowns = AccumulatedUnknowns.maybeMerge(null, argVal1);
unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal2);

if (unknowns != null) {
return unknowns;
isStrict ? evalStrictly(arg2, resolver, frame) : evalNonstrictly(arg2, resolver, frame);
if (isStrict) {
AccumulatedUnknowns unknowns = AccumulatedUnknowns.maybeMerge(null, argVal1);
unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal2);
if (unknowns != null) {
return unknowns;
}
}

return EvalHelpers.dispatch(
Expand Down
20 changes: 18 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/planner/EvalFold.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,15 @@ private Object evalMap(Map<?, ?> iterRange, Folder folder, ExecutionFrame frame)
folder.iterVar2Val = entry.getValue();
}

boolean cond = (boolean) condition.eval(folder, frame);
Object condResult = condition.eval(folder, frame);
if (condResult instanceof AccumulatedUnknowns) {
return condResult;
}
if (!(condResult instanceof Boolean)) {
throw new IllegalArgumentException(
String.format("Expected boolean value, found :%s", condResult));
}
boolean cond = (boolean) condResult;
if (!cond) {
folder.computeResult = true;
return result.eval(folder, frame);
Expand All@@ -131,7 +139,15 @@ private Object evalList(Collection<?> iterRange, Folder folder, ExecutionFrame f
folder.iterVar2Val = item;
}

boolean cond = (boolean) condition.eval(folder, frame);
Object condResult = condition.eval(folder, frame);
if (condResult instanceof AccumulatedUnknowns) {
return condResult;
}
if (!(condResult instanceof Boolean)) {
throw new IllegalArgumentException(
String.format("Expected boolean value, found :%s", condResult));
}
boolean cond = (boolean) condResult;
if (!cond) {
folder.computeResult = true;
return maybeUnwrapAccumulator(result.eval(folder, frame));
Expand Down
9 changes: 6 additions & 3 deletions runtime/src/main/java/dev/cel/runtime/planner/EvalUnary.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@

import dev.cel.common.ast.CelExpr;
import dev.cel.common.values.CelValueConverter;
import dev.cel.runtime.AccumulatedUnknowns;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelResolvedOverload;
import dev.cel.runtime.GlobalResolver;
Expand All@@ -32,10 +33,12 @@ final class EvalUnary extends PlannedInterpretable {

@Override
Object evalInternal(GlobalResolver resolver, ExecutionFrame frame) throws CelEvaluationException {
boolean isStrict = resolvedOverload.isStrict();
Object argVal =
resolvedOverload.isStrict()
? evalStrictly(arg, resolver, frame)
: evalNonstrictly(arg, resolver, frame);
isStrict ? evalStrictly(arg, resolver, frame) : evalNonstrictly(arg, resolver, frame);
if (isStrict && argVal instanceof AccumulatedUnknowns) {
return argVal;
}
return EvalHelpers.dispatch(functionName, resolvedOverload, celValueConverter, argVal);
}

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,18 +36,17 @@ final class EvalVarArgsCall extends PlannedInterpretable {

@Override
Object evalInternal(GlobalResolver resolver, ExecutionFrame frame) throws CelEvaluationException {
boolean isStrict = resolvedOverload.isStrict();
Object[] argVals = new Object[args.length];
AccumulatedUnknowns unknowns = null;
for (int i = 0; i < args.length; i++) {
PlannedInterpretable arg = args[i];
argVals[i] =
resolvedOverload.isStrict()
? evalStrictly(arg, resolver, frame)
: evalNonstrictly(arg, resolver, frame);

unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVals[i]);
isStrict ? evalStrictly(arg, resolver, frame) : evalNonstrictly(arg, resolver, frame);
if (isStrict) {
unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVals[i]);
}
}

if (unknowns != null) {
return unknowns;
}
Expand Down
179 changes: 179 additions & 0 deletions runtime/src/test/java/dev/cel/runtime/planner/ProgramPlannerTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelOptions;
import dev.cel.common.CelSource;
import dev.cel.common.ast.CelConstant;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.exceptions.CelDivideByZeroException;
import dev.cel.common.internal.CelDescriptorPool;
Expand DownExpand Up@@ -210,6 +211,20 @@ private static DefaultDispatcher newDispatcher() {
CelFunctionBinding.from("neg_int", Long.class, arg -> -arg),
CelFunctionBinding.from("neg_double", Double.class, arg -> -arg)));

addBindingsToDispatcher(
builder,
CelFunctionBinding.fromOverloads(
"add", CelFunctionBinding.from("add_int", Long.class, Long.class, (a, b) -> a + b)));

addBindingsToDispatcher(
builder,
CelFunctionBinding.fromOverloads(
"func",
CelFunctionBinding.from(
"func_int",
ImmutableList.of(Long.class, Long.class, Long.class),
(args) -> (long) args.length)));

addBindingsToDispatcher(
builder,
CelFunctionBinding.fromOverloads(
Expand DownExpand Up@@ -977,6 +992,170 @@ public void plan_partialEval_withWildcardQualification() throws Exception {
ImmutableSet.of(2L, 5L, 7L)));
}

@Test
public void plan_unaryFunction_withUnknownArg() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addVar("unk", SimpleType.INT)
.addFunctionDeclarations(
newFunctionDeclaration(
"neg", newGlobalOverload("neg_int", SimpleType.INT, SimpleType.INT)))
.build();
CelAbstractSyntaxTree ast = compile(compiler, "neg(unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(2L)));
}

@Test
public void plan_fold_withUnknownCondition() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.addVar("unk", SimpleType.BOOL)
.build();
CelAbstractSyntaxTree ast = compile(compiler, "[1, 2].all(x, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(6L)));
}

@Test
public void plan_foldMap_withUnknownCondition() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.addVar("unk", SimpleType.BOOL)
.build();
CelAbstractSyntaxTree ast = compile(compiler, "{\"a\": 1, \"b\": 2}.exists(k, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(
ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(10L)));
}

@Test
public void plan_foldList_withUnknownLoopCondition_earlyReturn() throws Exception {
CelExpr comprehensionExpr =
CelExpr.ofComprehension(
1L,
"x",
"",
CelExpr.ofList(
2L,
ImmutableList.of(CelExpr.ofConstant(3L, CelConstant.ofValue(1L))),
ImmutableList.of()),
"acc",
CelExpr.ofConstant(4L, CelConstant.ofValue(true)),
CelExpr.ofIdent(5L, "unk"),
CelExpr.ofIdent(6L, "acc"),
CelExpr.ofIdent(7L, "acc"));
CelAbstractSyntaxTree ast =
CelAbstractSyntaxTree.newParsedAst(comprehensionExpr, CelSource.newBuilder().build());

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(5L)));
}

@Test
public void plan_foldMap_withUnknownLoopCondition_earlyReturn() throws Exception {
CelExpr comprehensionExpr =
CelExpr.ofComprehension(
1L,
"k",
"",
CelExpr.ofMap(
2L,
ImmutableList.of(
CelExpr.ofMapEntry(
3L,
CelExpr.ofConstant(4L, CelConstant.ofValue("a")),
CelExpr.ofConstant(5L, CelConstant.ofValue(1L)),
false))),
"acc",
CelExpr.ofConstant(6L, CelConstant.ofValue(true)),
CelExpr.ofIdent(7L, "unk"),
CelExpr.ofIdent(8L, "acc"),
CelExpr.ofIdent(9L, "acc"));
CelAbstractSyntaxTree ast =
CelAbstractSyntaxTree.newParsedAst(comprehensionExpr, CelSource.newBuilder().build());

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(7L)));
}

@Test
public void plan_binaryFunction_withUnknownArg() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addVar("unk", SimpleType.INT)
.addFunctionDeclarations(
newFunctionDeclaration(
"add",
newGlobalOverload("add_int", SimpleType.INT, SimpleType.INT, SimpleType.INT)))
.build();
CelAbstractSyntaxTree ast = compile(compiler, "add(1, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(3L)));
}

@Test
public void plan_varargsFunction_withUnknownArg() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addVar("unk", SimpleType.INT)
.addFunctionDeclarations(
newFunctionDeclaration(
"func",
newGlobalOverload(
"func_int",
SimpleType.INT,
SimpleType.INT,
SimpleType.INT,
SimpleType.INT)))
.build();
CelAbstractSyntaxTree ast = compile(compiler, "func(1, 2, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(4L)));
}

@Test
public void localShadowIdentifier_inSelect() throws Exception {
CelCompiler celCompiler =
Expand Down
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
2 changes: 2 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -446,6 +446,7 @@ java_library(
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"//runtime:resolved_overload",
Expand DownExpand Up@@ -957,6 +958,7 @@ cel_android_library(
"//runtime:evaluation_exception",
"//runtime:interpretable_android",
"//runtime:resolved_overload_android",
"//runtime/src/main/java/dev/cel/runtime:accumulated_unknowns_android",
],
)

Expand Down
21 changes: 9 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/planner/EvalBinary.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,20 +34,17 @@ final class EvalBinary extends PlannedInterpretable {

@Override
Object evalInternal(GlobalResolver resolver, ExecutionFrame frame) throws CelEvaluationException {
boolean isStrict = resolvedOverload.isStrict();
Object argVal1 =
resolvedOverload.isStrict()
? evalStrictly(arg1, resolver, frame)
: evalNonstrictly(arg1, resolver, frame);
isStrict ? evalStrictly(arg1, resolver, frame) : evalNonstrictly(arg1, resolver, frame);
Object argVal2 =
resolvedOverload.isStrict()
? evalStrictly(arg2, resolver, frame)
: evalNonstrictly(arg2, resolver, frame);

AccumulatedUnknowns unknowns = AccumulatedUnknowns.maybeMerge(null, argVal1);
unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal2);

if (unknowns != null) {
return unknowns;
isStrict ? evalStrictly(arg2, resolver, frame) : evalNonstrictly(arg2, resolver, frame);
if (isStrict) {
AccumulatedUnknowns unknowns = AccumulatedUnknowns.maybeMerge(null, argVal1);
unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal2);
if (unknowns != null) {
return unknowns;
}
}

return EvalHelpers.dispatch(
Expand Down
20 changes: 18 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/planner/EvalFold.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,15 @@ private Object evalMap(Map<?, ?> iterRange, Folder folder, ExecutionFrame frame)
folder.iterVar2Val = entry.getValue();
}

boolean cond = (boolean) condition.eval(folder, frame);
Object condResult = condition.eval(folder, frame);
if (condResult instanceof AccumulatedUnknowns) {
return condResult;
}
if (!(condResult instanceof Boolean)) {
throw new IllegalArgumentException(
String.format("Expected boolean value, found :%s", condResult));
}
boolean cond = (boolean) condResult;
if (!cond) {
folder.computeResult = true;
return result.eval(folder, frame);
Expand All@@ -131,7 +139,15 @@ private Object evalList(Collection<?> iterRange, Folder folder, ExecutionFrame f
folder.iterVar2Val = item;
}

boolean cond = (boolean) condition.eval(folder, frame);
Object condResult = condition.eval(folder, frame);
if (condResult instanceof AccumulatedUnknowns) {
return condResult;
}
if (!(condResult instanceof Boolean)) {
throw new IllegalArgumentException(
String.format("Expected boolean value, found :%s", condResult));
}
boolean cond = (boolean) condResult;
if (!cond) {
folder.computeResult = true;
return maybeUnwrapAccumulator(result.eval(folder, frame));
Expand Down
9 changes: 6 additions & 3 deletions runtime/src/main/java/dev/cel/runtime/planner/EvalUnary.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@

import dev.cel.common.ast.CelExpr;
import dev.cel.common.values.CelValueConverter;
import dev.cel.runtime.AccumulatedUnknowns;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelResolvedOverload;
import dev.cel.runtime.GlobalResolver;
Expand All@@ -32,10 +33,12 @@ final class EvalUnary extends PlannedInterpretable {

@Override
Object evalInternal(GlobalResolver resolver, ExecutionFrame frame) throws CelEvaluationException {
boolean isStrict = resolvedOverload.isStrict();
Object argVal =
resolvedOverload.isStrict()
? evalStrictly(arg, resolver, frame)
: evalNonstrictly(arg, resolver, frame);
isStrict ? evalStrictly(arg, resolver, frame) : evalNonstrictly(arg, resolver, frame);
if (isStrict && argVal instanceof AccumulatedUnknowns) {
return argVal;
}
return EvalHelpers.dispatch(functionName, resolvedOverload, celValueConverter, argVal);
}

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,18 +36,17 @@ final class EvalVarArgsCall extends PlannedInterpretable {

@Override
Object evalInternal(GlobalResolver resolver, ExecutionFrame frame) throws CelEvaluationException {
boolean isStrict = resolvedOverload.isStrict();
Object[] argVals = new Object[args.length];
AccumulatedUnknowns unknowns = null;
for (int i = 0; i < args.length; i++) {
PlannedInterpretable arg = args[i];
argVals[i] =
resolvedOverload.isStrict()
? evalStrictly(arg, resolver, frame)
: evalNonstrictly(arg, resolver, frame);

unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVals[i]);
isStrict ? evalStrictly(arg, resolver, frame) : evalNonstrictly(arg, resolver, frame);
if (isStrict) {
unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVals[i]);
}
}

if (unknowns != null) {
return unknowns;
}
Expand Down
179 changes: 179 additions & 0 deletions runtime/src/test/java/dev/cel/runtime/planner/ProgramPlannerTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelOptions;
import dev.cel.common.CelSource;
import dev.cel.common.ast.CelConstant;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.exceptions.CelDivideByZeroException;
import dev.cel.common.internal.CelDescriptorPool;
Expand DownExpand Up@@ -210,6 +211,20 @@ private static DefaultDispatcher newDispatcher() {
CelFunctionBinding.from("neg_int", Long.class, arg -> -arg),
CelFunctionBinding.from("neg_double", Double.class, arg -> -arg)));

addBindingsToDispatcher(
builder,
CelFunctionBinding.fromOverloads(
"add", CelFunctionBinding.from("add_int", Long.class, Long.class, (a, b) -> a + b)));

addBindingsToDispatcher(
builder,
CelFunctionBinding.fromOverloads(
"func",
CelFunctionBinding.from(
"func_int",
ImmutableList.of(Long.class, Long.class, Long.class),
(args) -> (long) args.length)));

addBindingsToDispatcher(
builder,
CelFunctionBinding.fromOverloads(
Expand DownExpand Up@@ -977,6 +992,170 @@ public void plan_partialEval_withWildcardQualification() throws Exception {
ImmutableSet.of(2L, 5L, 7L)));
}

@Test
public void plan_unaryFunction_withUnknownArg() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addVar("unk", SimpleType.INT)
.addFunctionDeclarations(
newFunctionDeclaration(
"neg", newGlobalOverload("neg_int", SimpleType.INT, SimpleType.INT)))
.build();
CelAbstractSyntaxTree ast = compile(compiler, "neg(unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(2L)));
}

@Test
public void plan_fold_withUnknownCondition() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.addVar("unk", SimpleType.BOOL)
.build();
CelAbstractSyntaxTree ast = compile(compiler, "[1, 2].all(x, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(6L)));
}

@Test
public void plan_foldMap_withUnknownCondition() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.addVar("unk", SimpleType.BOOL)
.build();
CelAbstractSyntaxTree ast = compile(compiler, "{\"a\": 1, \"b\": 2}.exists(k, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(
ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(10L)));
}

@Test
public void plan_foldList_withUnknownLoopCondition_earlyReturn() throws Exception {
CelExpr comprehensionExpr =
CelExpr.ofComprehension(
1L,
"x",
"",
CelExpr.ofList(
2L,
ImmutableList.of(CelExpr.ofConstant(3L, CelConstant.ofValue(1L))),
ImmutableList.of()),
"acc",
CelExpr.ofConstant(4L, CelConstant.ofValue(true)),
CelExpr.ofIdent(5L, "unk"),
CelExpr.ofIdent(6L, "acc"),
CelExpr.ofIdent(7L, "acc"));
CelAbstractSyntaxTree ast =
CelAbstractSyntaxTree.newParsedAst(comprehensionExpr, CelSource.newBuilder().build());

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(5L)));
}

@Test
public void plan_foldMap_withUnknownLoopCondition_earlyReturn() throws Exception {
CelExpr comprehensionExpr =
CelExpr.ofComprehension(
1L,
"k",
"",
CelExpr.ofMap(
2L,
ImmutableList.of(
CelExpr.ofMapEntry(
3L,
CelExpr.ofConstant(4L, CelConstant.ofValue("a")),
CelExpr.ofConstant(5L, CelConstant.ofValue(1L)),
false))),
"acc",
CelExpr.ofConstant(6L, CelConstant.ofValue(true)),
CelExpr.ofIdent(7L, "unk"),
CelExpr.ofIdent(8L, "acc"),
CelExpr.ofIdent(9L, "acc"));
CelAbstractSyntaxTree ast =
CelAbstractSyntaxTree.newParsedAst(comprehensionExpr, CelSource.newBuilder().build());

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(7L)));
}

@Test
public void plan_binaryFunction_withUnknownArg() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addVar("unk", SimpleType.INT)
.addFunctionDeclarations(
newFunctionDeclaration(
"add",
newGlobalOverload("add_int", SimpleType.INT, SimpleType.INT, SimpleType.INT)))
.build();
CelAbstractSyntaxTree ast = compile(compiler, "add(1, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(3L)));
}

@Test
public void plan_varargsFunction_withUnknownArg() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addVar("unk", SimpleType.INT)
.addFunctionDeclarations(
newFunctionDeclaration(
"func",
newGlobalOverload(
"func_int",
SimpleType.INT,
SimpleType.INT,
SimpleType.INT,
SimpleType.INT)))
.build();
CelAbstractSyntaxTree ast = compile(compiler, "func(1, 2, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(4L)));
}

@Test
public void localShadowIdentifier_inSelect() throws Exception {
CelCompiler celCompiler =
Expand Down
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
2 changes: 2 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -446,6 +446,7 @@ java_library(
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"//runtime:resolved_overload",
Expand DownExpand Up@@ -957,6 +958,7 @@ cel_android_library(
"//runtime:evaluation_exception",
"//runtime:interpretable_android",
"//runtime:resolved_overload_android",
"//runtime/src/main/java/dev/cel/runtime:accumulated_unknowns_android",
],
)

Expand Down
21 changes: 9 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/planner/EvalBinary.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,20 +34,17 @@ final class EvalBinary extends PlannedInterpretable {

@Override
Object evalInternal(GlobalResolver resolver, ExecutionFrame frame) throws CelEvaluationException {
boolean isStrict = resolvedOverload.isStrict();
Object argVal1 =
resolvedOverload.isStrict()
? evalStrictly(arg1, resolver, frame)
: evalNonstrictly(arg1, resolver, frame);
isStrict ? evalStrictly(arg1, resolver, frame) : evalNonstrictly(arg1, resolver, frame);
Object argVal2 =
resolvedOverload.isStrict()
? evalStrictly(arg2, resolver, frame)
: evalNonstrictly(arg2, resolver, frame);

AccumulatedUnknowns unknowns = AccumulatedUnknowns.maybeMerge(null, argVal1);
unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal2);

if (unknowns != null) {
return unknowns;
isStrict ? evalStrictly(arg2, resolver, frame) : evalNonstrictly(arg2, resolver, frame);
if (isStrict) {
AccumulatedUnknowns unknowns = AccumulatedUnknowns.maybeMerge(null, argVal1);
unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal2);
if (unknowns != null) {
return unknowns;
}
}

return EvalHelpers.dispatch(
Expand Down
20 changes: 18 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/planner/EvalFold.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,15 @@ private Object evalMap(Map<?, ?> iterRange, Folder folder, ExecutionFrame frame)
folder.iterVar2Val = entry.getValue();
}

boolean cond = (boolean) condition.eval(folder, frame);
Object condResult = condition.eval(folder, frame);
if (condResult instanceof AccumulatedUnknowns) {
return condResult;
}
if (!(condResult instanceof Boolean)) {
throw new IllegalArgumentException(
String.format("Expected boolean value, found :%s", condResult));
}
boolean cond = (boolean) condResult;
if (!cond) {
folder.computeResult = true;
return result.eval(folder, frame);
Expand All@@ -131,7 +139,15 @@ private Object evalList(Collection<?> iterRange, Folder folder, ExecutionFrame f
folder.iterVar2Val = item;
}

boolean cond = (boolean) condition.eval(folder, frame);
Object condResult = condition.eval(folder, frame);
if (condResult instanceof AccumulatedUnknowns) {
return condResult;
}
if (!(condResult instanceof Boolean)) {
throw new IllegalArgumentException(
String.format("Expected boolean value, found :%s", condResult));
}
boolean cond = (boolean) condResult;
if (!cond) {
folder.computeResult = true;
return maybeUnwrapAccumulator(result.eval(folder, frame));
Expand Down
9 changes: 6 additions & 3 deletions runtime/src/main/java/dev/cel/runtime/planner/EvalUnary.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@

import dev.cel.common.ast.CelExpr;
import dev.cel.common.values.CelValueConverter;
import dev.cel.runtime.AccumulatedUnknowns;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelResolvedOverload;
import dev.cel.runtime.GlobalResolver;
Expand All@@ -32,10 +33,12 @@ final class EvalUnary extends PlannedInterpretable {

@Override
Object evalInternal(GlobalResolver resolver, ExecutionFrame frame) throws CelEvaluationException {
boolean isStrict = resolvedOverload.isStrict();
Object argVal =
resolvedOverload.isStrict()
? evalStrictly(arg, resolver, frame)
: evalNonstrictly(arg, resolver, frame);
isStrict ? evalStrictly(arg, resolver, frame) : evalNonstrictly(arg, resolver, frame);
if (isStrict && argVal instanceof AccumulatedUnknowns) {
return argVal;
}
return EvalHelpers.dispatch(functionName, resolvedOverload, celValueConverter, argVal);
}

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,18 +36,17 @@ final class EvalVarArgsCall extends PlannedInterpretable {

@Override
Object evalInternal(GlobalResolver resolver, ExecutionFrame frame) throws CelEvaluationException {
boolean isStrict = resolvedOverload.isStrict();
Object[] argVals = new Object[args.length];
AccumulatedUnknowns unknowns = null;
for (int i = 0; i < args.length; i++) {
PlannedInterpretable arg = args[i];
argVals[i] =
resolvedOverload.isStrict()
? evalStrictly(arg, resolver, frame)
: evalNonstrictly(arg, resolver, frame);

unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVals[i]);
isStrict ? evalStrictly(arg, resolver, frame) : evalNonstrictly(arg, resolver, frame);
if (isStrict) {
unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVals[i]);
}
}

if (unknowns != null) {
return unknowns;
}
Expand Down
179 changes: 179 additions & 0 deletions runtime/src/test/java/dev/cel/runtime/planner/ProgramPlannerTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelOptions;
import dev.cel.common.CelSource;
import dev.cel.common.ast.CelConstant;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.exceptions.CelDivideByZeroException;
import dev.cel.common.internal.CelDescriptorPool;
Expand DownExpand Up@@ -210,6 +211,20 @@ private static DefaultDispatcher newDispatcher() {
CelFunctionBinding.from("neg_int", Long.class, arg -> -arg),
CelFunctionBinding.from("neg_double", Double.class, arg -> -arg)));

addBindingsToDispatcher(
builder,
CelFunctionBinding.fromOverloads(
"add", CelFunctionBinding.from("add_int", Long.class, Long.class, (a, b) -> a + b)));

addBindingsToDispatcher(
builder,
CelFunctionBinding.fromOverloads(
"func",
CelFunctionBinding.from(
"func_int",
ImmutableList.of(Long.class, Long.class, Long.class),
(args) -> (long) args.length)));

addBindingsToDispatcher(
builder,
CelFunctionBinding.fromOverloads(
Expand DownExpand Up@@ -977,6 +992,170 @@ public void plan_partialEval_withWildcardQualification() throws Exception {
ImmutableSet.of(2L, 5L, 7L)));
}

@Test
public void plan_unaryFunction_withUnknownArg() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addVar("unk", SimpleType.INT)
.addFunctionDeclarations(
newFunctionDeclaration(
"neg", newGlobalOverload("neg_int", SimpleType.INT, SimpleType.INT)))
.build();
CelAbstractSyntaxTree ast = compile(compiler, "neg(unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(2L)));
}

@Test
public void plan_fold_withUnknownCondition() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.addVar("unk", SimpleType.BOOL)
.build();
CelAbstractSyntaxTree ast = compile(compiler, "[1, 2].all(x, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(6L)));
}

@Test
public void plan_foldMap_withUnknownCondition() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.addVar("unk", SimpleType.BOOL)
.build();
CelAbstractSyntaxTree ast = compile(compiler, "{\"a\": 1, \"b\": 2}.exists(k, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(
ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(10L)));
}

@Test
public void plan_foldList_withUnknownLoopCondition_earlyReturn() throws Exception {
CelExpr comprehensionExpr =
CelExpr.ofComprehension(
1L,
"x",
"",
CelExpr.ofList(
2L,
ImmutableList.of(CelExpr.ofConstant(3L, CelConstant.ofValue(1L))),
ImmutableList.of()),
"acc",
CelExpr.ofConstant(4L, CelConstant.ofValue(true)),
CelExpr.ofIdent(5L, "unk"),
CelExpr.ofIdent(6L, "acc"),
CelExpr.ofIdent(7L, "acc"));
CelAbstractSyntaxTree ast =
CelAbstractSyntaxTree.newParsedAst(comprehensionExpr, CelSource.newBuilder().build());

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(5L)));
}

@Test
public void plan_foldMap_withUnknownLoopCondition_earlyReturn() throws Exception {
CelExpr comprehensionExpr =
CelExpr.ofComprehension(
1L,
"k",
"",
CelExpr.ofMap(
2L,
ImmutableList.of(
CelExpr.ofMapEntry(
3L,
CelExpr.ofConstant(4L, CelConstant.ofValue("a")),
CelExpr.ofConstant(5L, CelConstant.ofValue(1L)),
false))),
"acc",
CelExpr.ofConstant(6L, CelConstant.ofValue(true)),
CelExpr.ofIdent(7L, "unk"),
CelExpr.ofIdent(8L, "acc"),
CelExpr.ofIdent(9L, "acc"));
CelAbstractSyntaxTree ast =
CelAbstractSyntaxTree.newParsedAst(comprehensionExpr, CelSource.newBuilder().build());

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(7L)));
}

@Test
public void plan_binaryFunction_withUnknownArg() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addVar("unk", SimpleType.INT)
.addFunctionDeclarations(
newFunctionDeclaration(
"add",
newGlobalOverload("add_int", SimpleType.INT, SimpleType.INT, SimpleType.INT)))
.build();
CelAbstractSyntaxTree ast = compile(compiler, "add(1, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(3L)));
}

@Test
public void plan_varargsFunction_withUnknownArg() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addVar("unk", SimpleType.INT)
.addFunctionDeclarations(
newFunctionDeclaration(
"func",
newGlobalOverload(
"func_int",
SimpleType.INT,
SimpleType.INT,
SimpleType.INT,
SimpleType.INT)))
.build();
CelAbstractSyntaxTree ast = compile(compiler, "func(1, 2, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(4L)));
}

@Test
public void localShadowIdentifier_inSelect() throws Exception {
CelCompiler celCompiler =
Expand Down
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
2 changes: 2 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/planner/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -446,6 +446,7 @@ java_library(
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"//runtime:resolved_overload",
Expand DownExpand Up@@ -957,6 +958,7 @@ cel_android_library(
"//runtime:evaluation_exception",
"//runtime:interpretable_android",
"//runtime:resolved_overload_android",
"//runtime/src/main/java/dev/cel/runtime:accumulated_unknowns_android",
],
)

Expand Down
21 changes: 9 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/planner/EvalBinary.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,20 +34,17 @@ final class EvalBinary extends PlannedInterpretable {

@Override
Object evalInternal(GlobalResolver resolver, ExecutionFrame frame) throws CelEvaluationException {
boolean isStrict = resolvedOverload.isStrict();
Object argVal1 =
resolvedOverload.isStrict()
? evalStrictly(arg1, resolver, frame)
: evalNonstrictly(arg1, resolver, frame);
isStrict ? evalStrictly(arg1, resolver, frame) : evalNonstrictly(arg1, resolver, frame);
Object argVal2 =
resolvedOverload.isStrict()
? evalStrictly(arg2, resolver, frame)
: evalNonstrictly(arg2, resolver, frame);

AccumulatedUnknowns unknowns = AccumulatedUnknowns.maybeMerge(null, argVal1);
unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal2);

if (unknowns != null) {
return unknowns;
isStrict ? evalStrictly(arg2, resolver, frame) : evalNonstrictly(arg2, resolver, frame);
if (isStrict) {
AccumulatedUnknowns unknowns = AccumulatedUnknowns.maybeMerge(null, argVal1);
unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal2);
if (unknowns != null) {
return unknowns;
}
}

return EvalHelpers.dispatch(
Expand Down
20 changes: 18 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/planner/EvalFold.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,15 @@ private Object evalMap(Map<?, ?> iterRange, Folder folder, ExecutionFrame frame)
folder.iterVar2Val = entry.getValue();
}

boolean cond = (boolean) condition.eval(folder, frame);
Object condResult = condition.eval(folder, frame);
if (condResult instanceof AccumulatedUnknowns) {
return condResult;
}
if (!(condResult instanceof Boolean)) {
throw new IllegalArgumentException(
String.format("Expected boolean value, found :%s", condResult));
}
boolean cond = (boolean) condResult;
if (!cond) {
folder.computeResult = true;
return result.eval(folder, frame);
Expand All@@ -131,7 +139,15 @@ private Object evalList(Collection<?> iterRange, Folder folder, ExecutionFrame f
folder.iterVar2Val = item;
}

boolean cond = (boolean) condition.eval(folder, frame);
Object condResult = condition.eval(folder, frame);
if (condResult instanceof AccumulatedUnknowns) {
return condResult;
}
if (!(condResult instanceof Boolean)) {
throw new IllegalArgumentException(
String.format("Expected boolean value, found :%s", condResult));
}
boolean cond = (boolean) condResult;
if (!cond) {
folder.computeResult = true;
return maybeUnwrapAccumulator(result.eval(folder, frame));
Expand Down
9 changes: 6 additions & 3 deletions runtime/src/main/java/dev/cel/runtime/planner/EvalUnary.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@

import dev.cel.common.ast.CelExpr;
import dev.cel.common.values.CelValueConverter;
import dev.cel.runtime.AccumulatedUnknowns;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelResolvedOverload;
import dev.cel.runtime.GlobalResolver;
Expand All@@ -32,10 +33,12 @@ final class EvalUnary extends PlannedInterpretable {

@Override
Object evalInternal(GlobalResolver resolver, ExecutionFrame frame) throws CelEvaluationException {
boolean isStrict = resolvedOverload.isStrict();
Object argVal =
resolvedOverload.isStrict()
? evalStrictly(arg, resolver, frame)
: evalNonstrictly(arg, resolver, frame);
isStrict ? evalStrictly(arg, resolver, frame) : evalNonstrictly(arg, resolver, frame);
if (isStrict && argVal instanceof AccumulatedUnknowns) {
return argVal;
}
return EvalHelpers.dispatch(functionName, resolvedOverload, celValueConverter, argVal);
}

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,18 +36,17 @@ final class EvalVarArgsCall extends PlannedInterpretable {

@Override
Object evalInternal(GlobalResolver resolver, ExecutionFrame frame) throws CelEvaluationException {
boolean isStrict = resolvedOverload.isStrict();
Object[] argVals = new Object[args.length];
AccumulatedUnknowns unknowns = null;
for (int i = 0; i < args.length; i++) {
PlannedInterpretable arg = args[i];
argVals[i] =
resolvedOverload.isStrict()
? evalStrictly(arg, resolver, frame)
: evalNonstrictly(arg, resolver, frame);

unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVals[i]);
isStrict ? evalStrictly(arg, resolver, frame) : evalNonstrictly(arg, resolver, frame);
if (isStrict) {
unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVals[i]);
}
}

if (unknowns != null) {
return unknowns;
}
Expand Down
179 changes: 179 additions & 0 deletions runtime/src/test/java/dev/cel/runtime/planner/ProgramPlannerTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelOptions;
import dev.cel.common.CelSource;
import dev.cel.common.ast.CelConstant;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.exceptions.CelDivideByZeroException;
import dev.cel.common.internal.CelDescriptorPool;
Expand DownExpand Up@@ -210,6 +211,20 @@ private static DefaultDispatcher newDispatcher() {
CelFunctionBinding.from("neg_int", Long.class, arg -> -arg),
CelFunctionBinding.from("neg_double", Double.class, arg -> -arg)));

addBindingsToDispatcher(
builder,
CelFunctionBinding.fromOverloads(
"add", CelFunctionBinding.from("add_int", Long.class, Long.class, (a, b) -> a + b)));

addBindingsToDispatcher(
builder,
CelFunctionBinding.fromOverloads(
"func",
CelFunctionBinding.from(
"func_int",
ImmutableList.of(Long.class, Long.class, Long.class),
(args) -> (long) args.length)));

addBindingsToDispatcher(
builder,
CelFunctionBinding.fromOverloads(
Expand DownExpand Up@@ -977,6 +992,170 @@ public void plan_partialEval_withWildcardQualification() throws Exception {
ImmutableSet.of(2L, 5L, 7L)));
}

@Test
public void plan_unaryFunction_withUnknownArg() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addVar("unk", SimpleType.INT)
.addFunctionDeclarations(
newFunctionDeclaration(
"neg", newGlobalOverload("neg_int", SimpleType.INT, SimpleType.INT)))
.build();
CelAbstractSyntaxTree ast = compile(compiler, "neg(unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(2L)));
}

@Test
public void plan_fold_withUnknownCondition() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.addVar("unk", SimpleType.BOOL)
.build();
CelAbstractSyntaxTree ast = compile(compiler, "[1, 2].all(x, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(6L)));
}

@Test
public void plan_foldMap_withUnknownCondition() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.addVar("unk", SimpleType.BOOL)
.build();
CelAbstractSyntaxTree ast = compile(compiler, "{\"a\": 1, \"b\": 2}.exists(k, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(
ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(10L)));
}

@Test
public void plan_foldList_withUnknownLoopCondition_earlyReturn() throws Exception {
CelExpr comprehensionExpr =
CelExpr.ofComprehension(
1L,
"x",
"",
CelExpr.ofList(
2L,
ImmutableList.of(CelExpr.ofConstant(3L, CelConstant.ofValue(1L))),
ImmutableList.of()),
"acc",
CelExpr.ofConstant(4L, CelConstant.ofValue(true)),
CelExpr.ofIdent(5L, "unk"),
CelExpr.ofIdent(6L, "acc"),
CelExpr.ofIdent(7L, "acc"));
CelAbstractSyntaxTree ast =
CelAbstractSyntaxTree.newParsedAst(comprehensionExpr, CelSource.newBuilder().build());

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(5L)));
}

@Test
public void plan_foldMap_withUnknownLoopCondition_earlyReturn() throws Exception {
CelExpr comprehensionExpr =
CelExpr.ofComprehension(
1L,
"k",
"",
CelExpr.ofMap(
2L,
ImmutableList.of(
CelExpr.ofMapEntry(
3L,
CelExpr.ofConstant(4L, CelConstant.ofValue("a")),
CelExpr.ofConstant(5L, CelConstant.ofValue(1L)),
false))),
"acc",
CelExpr.ofConstant(6L, CelConstant.ofValue(true)),
CelExpr.ofIdent(7L, "unk"),
CelExpr.ofIdent(8L, "acc"),
CelExpr.ofIdent(9L, "acc"));
CelAbstractSyntaxTree ast =
CelAbstractSyntaxTree.newParsedAst(comprehensionExpr, CelSource.newBuilder().build());

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(7L)));
}

@Test
public void plan_binaryFunction_withUnknownArg() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addVar("unk", SimpleType.INT)
.addFunctionDeclarations(
newFunctionDeclaration(
"add",
newGlobalOverload("add_int", SimpleType.INT, SimpleType.INT, SimpleType.INT)))
.build();
CelAbstractSyntaxTree ast = compile(compiler, "add(1, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(3L)));
}

@Test
public void plan_varargsFunction_withUnknownArg() throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addVar("unk", SimpleType.INT)
.addFunctionDeclarations(
newFunctionDeclaration(
"func",
newGlobalOverload(
"func_int",
SimpleType.INT,
SimpleType.INT,
SimpleType.INT,
SimpleType.INT)))
.build();
CelAbstractSyntaxTree ast = compile(compiler, "func(1, 2, unk)");

Program program = PLANNER.plan(ast);

CelUnknownSet result =
(CelUnknownSet) program.eval(PartialVars.of(CelAttributePattern.create("unk")));
assertThat(result)
.isEqualTo(
CelUnknownSet.create(ImmutableSet.of(CelAttribute.create("unk")), ImmutableSet.of(4L)));
}

@Test
public void localShadowIdentifier_inSelect() throws Exception {
CelCompiler celCompiler =
Expand Down
Loading