Result: implement identifier for method refinements

Author: RajShivu

liquidjava-example/src/main/java/testMultiple/errors/ResultRefinementRegression.java

@@ -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;
+    }
+}

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

@@ -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; 
+    }
+}

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

@@ -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);// new change for $result
         f.setRefReturn(ret);
         return Predicate.createConjunction(joint, ret);
     }

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

@@ -155,16 +155,8 @@ private Expression literalExpressionCreate(ParseTree rc) throws LJError {
         else if (rc instanceof LitContext)
             return create(((LitContext) rc).literal());
 
-        // else if (rc instanceof VarContext) {
-        // return new Var(((VarContext) rc).ID().getText());
-        // }
         else if (rc instanceof VarContext) {
-            String name = ((VarContext) rc).ID().getText();
-            if (name.equals("$result") || name.equals("return")) {
-                name = "_";
-            }
-            return new Var(name);
-
+            return new Var(((VarContext) rc).ID().getText());
         }
 
         else if (rc instanceof TargetInvocationContext) {