expected invocation, got LogEleemnt fixed

Author: Kirill Golubev

liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/logging/LogElement.java

@@ -2,6 +2,7 @@
 
 import liquidjava.processor.context.PlacementInCode;
 import spoon.reflect.code.CtComment;
+import spoon.reflect.code.CtInvocation;
 import spoon.reflect.cu.SourcePosition;
 import spoon.reflect.declaration.CtAnnotation;
 import spoon.reflect.declaration.CtElement;
@@ -13,10 +14,8 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.ElementType;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 public class LogElement {
@@ -169,4 +168,10 @@ public LogElement strippedElement() {
     public String toString() {
         return elem.toString();
     }
+
+    public Optional<String> inspectInvocation(Function<CtInvocation<?>, String> insperctor){
+        return elem instanceof CtInvocation<?> ?
+            Optional.of(insperctor.apply((CtInvocation<?>) elem)) :
+            Optional.empty();
+    }
 }

liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/processor/refinement_checker/VCChecker.java

@@ -300,17 +300,14 @@ public void printSameStateError(LogElement element, Predicate expectedType, Stri
 
     private void printError(Exception e, Predicate premisesBeforeChange, Predicate expectedType, LogElement element,
             HashMap<String, PlacementInCode> map) {
-        String s = null;
-        if (element instanceof CtInvocation) {
-            CtInvocation<?> ci = (CtInvocation<?>) element;
+        String s = element.inspectInvocation( ci -> {
             String totalS = ci.getExecutable().toString();
             if (ci.getTarget() != null) {
                 int targetL = ci.getTarget().toString().length();
                 totalS = ci.toString().substring(targetL + 1);
             }
-            s = "Method invocation " + totalS + " in:";
-            System.out.println();
-        }
+            return "Method invocation " + totalS + " in:";
+        }).orElse(null);
 
         Predicate etMessageReady = expectedType;// substituteByMap(expectedType, map);
         Predicate cSMTMessageReady = premisesBeforeChange;// substituteByMap(premisesBeforeChange, map);