Skip to content

Commit 98d9760

Browse files
committed
Update: to #result
1 parent 4969ce5 commit 98d9760

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

liquidjava-example/src/main/java/testSuite/CorrectResult.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
public class CorrectResult {
66

7-
@Refinement("$result > 10")
7+
@Refinement("#result > 10")
88
public int getLargeNumber() {
99
return 15;
1010
}
1111

12-
@Refinement("$result == (a + b)")
12+
@Refinement("#result == (a + b)")
1313
public int sum(int a, int b) {
1414
return a + b;
1515
}

liquidjava-example/src/main/java/testSuite/ErrorResultVariable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
public class ErrorResultVariable {
66
public void test() {
7-
@Refinement("$result > 0")
7+
@Refinement("#result > 0")
88
int x = 10;
99
}
1010
}

liquidjava-verifier/src/main/antlr4/rj/grammar/RJ.g4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ BOOL : 'true' | 'false';
9797
ID_UPPER: ([A-Z][a-zA-Z0-9]*);
9898
OBJECT_TYPE:
9999
(([a-zA-Z][a-zA-Z0-9]+) ('.' [a-zA-Z][a-zA-Z0-9]*)+);
100-
RESULT : '$result';
100+
RESULT : '#result';
101101
ID : '#'*[a-zA-Z_][a-zA-Z0-9_#]*;
102102
STRING : '"'(~["])*'"';
103103
INT : (([0-9]+) | ([0-9]+('_'[0-9]+)*));

liquidjava-verifier/src/main/java/liquidjava/processor/refinement_checker/general_checkers/MethodsFunctionsChecker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ private Predicate handleFunctionRefinements(RefinedFunction f, CtElement method,
162162
Optional<Predicate> oret = rtc.getRefinementFromAnnotation(method);
163163
Predicate ret = oret.orElse(new Predicate());
164164
ret = ret.substituteVariable("return", Keys.WILDCARD);
165-
ret = ret.substituteVariable("$result", Keys.WILDCARD);
165+
ret = ret.substituteVariable("#result", Keys.WILDCARD);
166166
f.setRefReturn(ret);
167167
rtc.getMessageFromAnnotation(method).ifPresent(f::setMessage);
168168
return Predicate.createConjunction(joint, ret);

liquidjava-verifier/src/main/java/liquidjava/rj_language/visitors/CreateASTVisitor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ else if (rc instanceof LitContext)
160160
else if (rc instanceof VarContext) {
161161
return new Var(((VarContext) rc).ID().getText());
162162
} else if (rc instanceof ResultContext) {
163-
return new Var("$result");
163+
return new Var("#result");
164164
} else if (rc instanceof InvocationContext) {
165165
return create(((InvocationContext) rc).functionCall());
166166
} else {

0 commit comments

Comments
 (0)