more idomatic name construction

Kirill Golubev · Kirill Golubev · commit 62870d803a55 · 2022-10-10T03:35:52.000+03:00
diff --git a/liquidjava/liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/processor/refinement_checker/RefinementTypeChecker.java b/liquidjava/liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/processor/refinement_checker/RefinementTypeChecker.java
@@ -241,7 +241,7 @@ public <T, A extends T> void visitCtAssignment(CtAssignment<T, A> assignement) {
             transitionMethod.setParent(f.getDeclaringType());
             CtAnnotation<?> ann = factory.createAnnotation(factory.createCtTypeReference(StateRefinement.class));
 
-            String stateChangeRefinementTo = f.getSimpleName() + "(this) == " + "this#" + f.getSimpleName();
+            String stateChangeRefinementTo = f.getSimpleName() + "(this) == " + name;
             String stateChangeRefinementFrom = "true";
             ann.addValue("to", stateChangeRefinementTo);
             ann.addValue("from", stateChangeRefinementFrom);
@@ -252,13 +252,13 @@ public <T, A extends T> void visitCtAssignment(CtAssignment<T, A> assignement) {
             CtInvocation<?> inv = factory.createInvocation(fw.getTarget(), transitionMethod.getReference(),
                     Collections.emptyList());
 
-            try {
-                RefinedFunction rf = new RefinedFunction();
-                rf.setName(transitionMethod.getSimpleName());
-                rf.setType(transitionMethod.getType());
-                rf.setRefReturn(new Predicate());
-                rf.setClass(transitionMethod.getDeclaringType().getQualifiedName());
+            RefinedFunction rf = new RefinedFunction();
+            rf.setName(transitionMethod.getSimpleName());
+            rf.setType(transitionMethod.getType());
+            rf.setRefReturn(new Predicate());
+            rf.setClass(transitionMethod.getDeclaringType().getQualifiedName());
 
+            try {
                 AuxStateHandler.handleMethodState(transitionMethod, rf, this);
                 AuxStateHandler.checkTargetChanges(this, rf, inv.getTarget(), Collections.emptyMap(), inv);
             } catch (ParsingException e) {
@@ -617,7 +617,6 @@ private Predicate substituteAllVariablesForLastInstance(Predicate c) {
     /**
      * @param <T>
      * @param elem
-     * @param varDecl
      *            Cannot be null
      */
     private <T> void getPutVariableMetadada(CtElement elem, String name) {
