Use Strings in Error Classes

`CtElement` will also need to be replaced at some point

Author: rcosta358

liquidjava-verifier/src/main/java/liquidjava/diagnostics/errors/GhostInvocationError.java

@@ -1,6 +1,5 @@
 package liquidjava.diagnostics.errors;
 
-import liquidjava.rj_language.Predicate;
 import spoon.reflect.declaration.CtElement;
 
 /**
@@ -10,21 +9,21 @@
  */
 public class GhostInvocationError extends LJError {
 
-    private Predicate expected;
+    private String expected;
 
-    public GhostInvocationError(CtElement element, Predicate expected) {
+    public GhostInvocationError(CtElement element, String expected) {
         super("Ghost Invocation Error", "Invalid types or number of arguments in ghost invocation", element);
         this.expected = expected;
     }
 
-    public Predicate getExpected() {
+    public String getExpected() {
         return expected;
     }
 
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("Expected: ").append(expected.toString()).append("\n");
+        sb.append("Expected: ").append(expected).append("\n");
         return super.toString(sb.toString());
     }
 }

liquidjava-verifier/src/main/java/liquidjava/diagnostics/errors/RefinementError.java

@@ -1,6 +1,5 @@
 package liquidjava.diagnostics.errors;
 
-import liquidjava.rj_language.Predicate;
 import liquidjava.rj_language.opt.derivation_node.ValDerivationNode;
 import liquidjava.utils.Utils;
 import spoon.reflect.declaration.CtElement;
@@ -12,19 +11,27 @@
  */
 public class RefinementError extends LJError {
 
-    private Predicate expected;
+    private String expected;
     private ValDerivationNode found;
 
-    public RefinementError(CtElement element, Predicate expected, ValDerivationNode found) {
+    public RefinementError(CtElement element, String expected, ValDerivationNode found) {
         super("Refinement Error", String.format("%s is not a subtype of %s", found.getValue(), expected), element);
         this.expected = expected;
         this.found = found;
     }
 
+    public String getExpected() {
+        return expected;
+    }
+
+    public ValDerivationNode getFound() {
+        return found;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("Expected: ").append(Utils.stripParens(expected.toString())).append("\n");
+        sb.append("Expected: ").append(Utils.stripParens(expected)).append("\n");
         sb.append("Found: ").append(found.getValue());
         return super.toString(sb.toString());
     }

liquidjava-verifier/src/main/java/liquidjava/diagnostics/errors/StateConflictError.java

@@ -1,6 +1,5 @@
 package liquidjava.diagnostics.errors;
 
-import liquidjava.rj_language.Predicate;
 import spoon.reflect.declaration.CtElement;
 
 /**
@@ -10,19 +9,19 @@
  */
 public class StateConflictError extends LJError {
 
-    private Predicate predicate;
+    private String state;
     private String className;
 
-    public StateConflictError(CtElement element, Predicate predicate, String className) {
+    public StateConflictError(CtElement element, String state, String className) {
         super("State Conflict Error",
                 "Found multiple disjoint states in state transition — State transition can only go to one state of each state set",
                 element);
-        this.predicate = predicate;
+        this.state = state;
         this.className = className;
     }
 
-    public Predicate getPredicate() {
-        return predicate;
+    public String getState() {
+        return state;
     }
 
     public String getClassName() {
@@ -33,7 +32,6 @@ public String getClassName() {
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("Class: ").append(className).append("\n");
-        sb.append("Predicate: ").append(predicate.toString());
         return super.toString(sb.toString());
     }
 }