Changed Enumerate to Enum

Author: cheestree

…iquidjava/rj_language/ast/Enumerate.java …ava/liquidjava/rj_language/ast/Enum.javaliquidjava-verifier/src/main/java/liquidjava/rj_language/ast/Enumerate.java renamed to liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/Enum.java liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/Enumerate.java renamed to liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/Enum.java

@@ -5,12 +5,12 @@
 import liquidjava.diagnostics.errors.LJError;
 import liquidjava.rj_language.visitors.ExpressionVisitor;
 
-public class Enumerate extends Expression {
+public class Enum extends Expression {
 
     private final String enumTypeName;
     private final String enumConstantName;
 
-    public Enumerate(String enumTypeName, String enumConstantName) {
+    public Enum(String enumTypeName, String enumConstantName) {
         this.enumTypeName = enumTypeName;
         this.enumConstantName = enumConstantName;
     }
@@ -25,7 +25,7 @@ public String getEnumConstantName() {
 
     @Override
     public <T> T accept(ExpressionVisitor<T> visitor) throws LJError {
-        return visitor.visitEnumerate(this);
+        return visitor.visitEnum(this);
     }
 
     @Override
@@ -63,12 +63,12 @@ public boolean equals(Object obj) {
             return true;
         if (obj == null || getClass() != obj.getClass())
             return false;
-        Enumerate other = (Enumerate) obj;
+        Enum other = (Enum) obj;
         return enumTypeName.equals(other.enumTypeName) && enumConstantName.equals(other.enumConstantName);
     }
 
     @Override
     public Expression clone() {
-        return new Enumerate(enumTypeName, enumConstantName);
+        return new Enum(enumTypeName, enumConstantName);
     }
 }

liquidjava-verifier/src/main/java/liquidjava/rj_language/visitors/CreateASTVisitor.java

@@ -7,7 +7,7 @@
 import liquidjava.diagnostics.errors.SyntaxError;
 import liquidjava.rj_language.ast.AliasInvocation;
 import liquidjava.rj_language.ast.BinaryExpression;
-import liquidjava.rj_language.ast.Enumerate;
+import liquidjava.rj_language.ast.Enum;
 import liquidjava.rj_language.ast.Expression;
 import liquidjava.rj_language.ast.FunctionInvocation;
 import liquidjava.rj_language.ast.GroupExpression;
@@ -238,10 +238,10 @@ private List<Expression> getArgs(ArgsContext args) throws LJError {
         return le;
     }
 
-    private Enumerate enumCreate(EnumContext enumContext) {
+    private Enum enumCreate(EnumContext enumContext) {
         String enumText = enumContext.enumerate().getText();
         String[] parts = enumText.split("\\.");
-        return new Enumerate(parts[0], parts[1]);
+        return new Enum(parts[0], parts[1]);
     }
 
     private Expression literalCreate(LiteralContext literalContext) throws LJError {

liquidjava-verifier/src/main/java/liquidjava/rj_language/visitors/ExpressionVisitor.java

@@ -3,7 +3,7 @@
 import liquidjava.diagnostics.errors.LJError;
 import liquidjava.rj_language.ast.AliasInvocation;
 import liquidjava.rj_language.ast.BinaryExpression;
-import liquidjava.rj_language.ast.Enumerate;
+import liquidjava.rj_language.ast.Enum;
 import liquidjava.rj_language.ast.FunctionInvocation;
 import liquidjava.rj_language.ast.GroupExpression;
 import liquidjava.rj_language.ast.Ite;
@@ -41,7 +41,7 @@ public interface ExpressionVisitor<T> {
 
     T visitUnaryExpression(UnaryExpression exp) throws LJError;
 
-    T visitEnumerate(Enumerate en) throws LJError;
+    T visitEnum(Enum en) throws LJError;
 
     T visitVar(Var var) throws LJError;
 }

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

@@ -5,7 +5,7 @@
 import liquidjava.diagnostics.errors.LJError;
 import liquidjava.rj_language.ast.AliasInvocation;
 import liquidjava.rj_language.ast.BinaryExpression;
-import liquidjava.rj_language.ast.Enumerate;
+import liquidjava.rj_language.ast.Enum;
 import liquidjava.rj_language.ast.FunctionInvocation;
 import liquidjava.rj_language.ast.GroupExpression;
 import liquidjava.rj_language.ast.Ite;
@@ -123,7 +123,7 @@ public Expr<?> visitUnaryExpression(UnaryExpression exp) throws LJError {
     }
 
     @Override
-    public Expr<?> visitEnumerate(Enumerate en) throws LJError {
+    public Expr<?> visitEnum(Enum en) throws LJError {
         return ctx.makeEnum(en.getEnumTypeName(), en.getEnumConstantName());
     }
 }