Skip to content

Preserve refinement on forward declared field reads #325

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
rcosta358 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Preserve refinement on forward declared field reads #325

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions ...idjava-example/src/main/java/testSuite/classes/forward_field_read_correct/ReadBefore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package testSuite.classes.forward_field_read_correct;

import liquidjava.specification.Refinement;

public class ReadBefore {
private final Job job = new Job();

@Refinement("_ >= 0")
public int get() {
return job.port;
}

static class Job {
@Refinement("_ >= 0")
int port;
}
}
4 changes: 4 additions & 0 deletions ...verifier/src/main/java/liquidjava/processor/refinement_checker/RefinementTypeChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,10 @@ public <T> void visitCtFieldRead(CtFieldRead<T> fieldRead) {
Predicate.createEquals(Predicate.createVar(Keys.WILDCARD), Predicate.createVar(enumLiteral)));
} else if (tryStaticFinalConstantRefinement(fieldRead)) {
// refinement metadata set by helper
} else if (fieldRead.getVariable().getDeclaration() != null) {
Predicate declared = getRefinementFromAnnotation(fieldRead.getVariable().getDeclaration())
.orElseGet(Predicate::new);
fieldRead.putMetadata(Keys.REFINEMENT, declared.substituteVariable(fieldName, Keys.WILDCARD));
} else {
fieldRead.putMetadata(Keys.REFINEMENT, new Predicate());
// TODO DO WE WANT THIS OR TO SHOW ERROR MESSAGE?
Expand Down
Loading