Renamed fields and getters/setters

Author: cheestree

liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/Enum.java

@@ -7,20 +7,20 @@
 
 public class Enum extends Expression {
 
-    private final String enumTypeName;
-    private final String enumConstantName;
+    private final String typeName;
+    private final String constName;
 
-    public Enum(String enumTypeName, String enumConstantName) {
-        this.enumTypeName = enumTypeName;
-        this.enumConstantName = enumConstantName;
+    public Enum(String typeName, String constName) {
+        this.typeName = typeName;
+        this.constName = constName;
     }
 
-    public String getEnumTypeName() {
-        return enumTypeName;
+    public String getTypeName() {
+        return typeName;
     }
 
-    public String getEnumConstantName() {
-        return enumConstantName;
+    public String getConstName() {
+        return constName;
     }
 
     @Override
@@ -45,15 +45,15 @@ public boolean isBooleanTrue() {
 
     @Override
     public String toString() {
-        return enumTypeName + "." + enumConstantName;
+        return typeName + "." + constName;
     }
 
     @Override
     public int hashCode() {
         final int prime = 31;
         int result = 1;
-        result = prime * result + ((enumTypeName == null) ? 0 : enumTypeName.hashCode());
-        result = prime * result + ((enumConstantName == null) ? 0 : enumConstantName.hashCode());
+        result = prime * result + ((typeName == null) ? 0 : typeName.hashCode());
+        result = prime * result + ((constName == null) ? 0 : constName.hashCode());
         return result;
     }
 
@@ -64,11 +64,11 @@ public boolean equals(Object obj) {
         if (obj == null || getClass() != obj.getClass())
             return false;
         Enum other = (Enum) obj;
-        return enumTypeName.equals(other.enumTypeName) && enumConstantName.equals(other.enumConstantName);
+        return typeName.equals(other.typeName) && constName.equals(other.constName);
     }
 
     @Override
     public Expression clone() {
-        return new Enum(enumTypeName, enumConstantName);
+        return new Enum(typeName, constName);
     }
 }

liquidjava-verifier/src/main/java/liquidjava/smt/ExpressionToZ3Visitor.java

@@ -124,6 +124,6 @@ public Expr<?> visitUnaryExpression(UnaryExpression exp) throws LJError {
 
     @Override
     public Expr<?> visitEnum(Enum en) throws LJError {
-        return ctx.makeEnum(en.getEnumTypeName(), en.getEnumConstantName());
+        return ctx.makeEnum(en.getTypeName(), en.getConstName());
     }
 }