Skip to content

Adapt terminal field qualifiers directly #914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
snazy wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Adapt terminal field qualifiers directly #914

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 31 additions & 5 deletions core/src/main/java/org/projectnessie/cel/interpreter/AttributeFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,10 @@ interface ConstantQualifier extends Qualifier {

interface ConstantQualifierEquator extends QualifierValueEquator, ConstantQualifier {}

interface ValQualifier extends Qualifier {
Val qualifyToVal(Activation vars, Object obj);
}

/**
* Attribute values are a variable or value with an optional set of qualifiers, such as field,
* key, or index accesses.
Expand Down Expand Up @@ -359,8 +363,9 @@ public Object tryResolve(org.projectnessie.cel.interpreter.Activation vars) {
ResolvedValue obj = vars.resolveName(nm);
if (obj.present()) {
Object op = obj.value();
for (Qualifier qual : qualifiers) {
Object op2 = qual.qualify(vars, op);
for (int i = 0; i < qualifiers.size(); i++) {
Qualifier qual = qualifiers.get(i);
Object op2 = qualify(vars, op, qual, i == qualifiers.size() - 1);
if (op2 instanceof Err) {
return op2;
}
Expand All @@ -383,6 +388,17 @@ public Object tryResolve(org.projectnessie.cel.interpreter.Activation vars) {
throw noSuchAttributeException(this);
}

private Object qualify(
org.projectnessie.cel.interpreter.Activation vars,
Object obj,
Qualifier qualifier,
boolean last) {
if (last && qualifier instanceof ValQualifier) {
return ((ValQualifier) qualifier).qualifyToVal(vars, obj);
}
return qualifier.qualify(vars, obj);
}

/** String implements the Stringer interface method. */
@Override
public String toString() {
Expand Down Expand Up @@ -696,11 +712,16 @@ public Object resolve(org.projectnessie.cel.interpreter.Activation vars) {
}
// Next, qualify it. Qualification handles unkonwns as well, so there's no need to recheck.
Object obj = v;
for (Qualifier qual : qualifiers) {
for (int i = 0; i < qualifiers.size(); i++) {
Qualifier qual = qualifiers.get(i);
if (obj == null) {
throw noSuchAttributeException(this);
}
obj = qual.qualify(vars, obj);
if (i == qualifiers.size() - 1 && qual instanceof ValQualifier) {
obj = ((ValQualifier) qual).qualifyToVal(vars, obj);
} else {
obj = qual.qualify(vars, obj);
}
if (obj instanceof Err) {
return obj;
}
Expand Down Expand Up @@ -1304,7 +1325,7 @@ public String toString() {
* type. When the field type is known this can be used to improve the speed and efficiency of
* field resolution.
*/
final class FieldQualifier implements Coster, ConstantQualifierEquator {
final class FieldQualifier implements Coster, ConstantQualifierEquator, ValQualifier {
final long id;
final String name;
final FieldType fieldType;
Expand Down Expand Up @@ -1332,6 +1353,11 @@ public Object qualify(org.projectnessie.cel.interpreter.Activation vars, Object
return fieldType.getFrom.getFrom(obj);
}

@Override
public Val qualifyToVal(org.projectnessie.cel.interpreter.Activation vars, Object obj) {
return adapter.nativeToValue(qualify(vars, obj));
}

/** Value implements the ConstantQualifier interface */
@Override
public Val value() {
Expand Down
Loading