Skip to content

Add $result for Return Refinements #145

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
rajshivu wants to merge 4 commits into
base: main
Choose a base branch
from
+35 −1
Open

Add $result for Return Refinements #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d7e2dc
feat: implement support and restore test infrastructure
Feb 10, 2026
e111574
TestMultiple: restored original
Feb 10, 2026
ab4d600
Assert: checked assert validation tests
Feb 11, 2026
58a5475
Fix refinement handling in rj grammar
Feb 11, 2026
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
16 changes: 16 additions & 0 deletions liquidjava-example/src/main/java/testSuite/CorrectResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package testSuite;

import liquidjava.specification.Refinement;

public class CorrectResult {

@Refinement("$result > 10")
public int getLargeNumber() {
return 15;
}

@Refinement("$result == (a + b)")
public int sum(int a, int b) {
return a + b;
}
}
10 changes: 10 additions & 0 deletions liquidjava-example/src/main/java/testSuite/ErrorResultVariable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// Not Found Error
package testSuite;
import liquidjava.specification.Refinement;

public class ErrorResultVariable {
public void test() {
@Refinement("$result > 0")
int x = 10;
}
}
2 changes: 1 addition & 1 deletion liquidjava-verifier/src/main/antlr4/rj/grammar/RJ.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ BOOL : 'true' | 'false';
ID_UPPER: ([A-Z][a-zA-Z0-9]*);
OBJECT_TYPE:
(([a-zA-Z][a-zA-Z0-9]+) ('.' [a-zA-Z][a-zA-Z0-9]*)+);
ID : '#'*[a-zA-Z_][a-zA-Z0-9_#]*;
ID : '#'*('$')? [a-zA-Z_] [a-zA-Z0-9_#]* ;
STRING : '"'(~["])*'"';
INT : (([0-9]+) | ([0-9]+('_'[0-9]+)*));
REAL : (([0-9]+('.'[0-9]+)?) | '.'[0-9]+);
Expand Down
8 changes: 8 additions & 0 deletions ...ava/liquidjava/processor/refinement_checker/general_checkers/MethodsFunctionsChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ private Predicate handleFunctionRefinements(RefinedFunction f, CtElement method,
Optional<Predicate> oret = rtc.getRefinementFromAnnotation(method);
Predicate ret = oret.orElse(new Predicate());
ret = ret.substituteVariable("return", Keys.WILDCARD);
ret = ret.substituteVariable("$result", Keys.WILDCARD);// added for refinement
f.setRefReturn(ret);
return Predicate.createConjunction(joint, ret);
}
Expand All @@ -180,6 +181,13 @@ public <R> void getReturnRefinements(CtReturn<R> ret) throws LJError {
RefinedFunction fi = rtc.getContext().getFunction(method.getSimpleName(),
((CtClass<?>) method.getParent()).getQualifiedName(), method.getParameters().size());

if (fi == null)
return;// null check refinement

if (fi.getRefReturn() == null) {
return;
}

List<Variable> lv = fi.getArguments();
for (Variable v : lv) {
rtc.getContext().addVarToContext(v);
Expand Down