Compares will now use the compare fields directly instead of the type name

JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/JavaExpressionVisitor.java

@@ -2,6 +2,7 @@ package org.openzen.zenscript.javabytecode.compiler;
 
 import org.objectweb.asm.Label;
 import org.objectweb.asm.Type;
+import org.openzen.zenscript.codemodel.CompareType;
 import org.openzen.zenscript.codemodel.expression.*;
 import org.openzen.zenscript.codemodel.member.DefinitionMember;
 import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
@@ -76,9 +77,10 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
     public Void visitCompare(BasicCompareExpression expression) {
         expression.left.accept(this);
         expression.right.accept(this);
-        javaWriter.constant(expression.operator.name());
+        final Type operatorType = Type.getType(CompareType.class);
+        javaWriter.getStaticField(operatorType.getInternalName(), expression.operator.name(), operatorType.getDescriptor());
 
-        javaWriter.invokeStatic(ZenUtils.class, "compare", boolean.class, getForEquals(expression.left.type), getForEquals(expression.right.type), String.class);
+        javaWriter.invokeStatic(ZenUtils.class, "compare", boolean.class, getForEquals(expression.left.type), getForEquals(expression.right.type), CompareType.class);
 
         return null;
     }

JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/ZenUtils.java

@@ -9,51 +9,49 @@ public class ZenUtils {
     // ###############
     // ### Compare ###
     // ###############
-
-    //TODO how to compare them?
-    public static boolean compare(Object a, Object b, String compareType) {
-        CompareType type = CompareType.valueOf(compareType);
+    public static boolean compare(Object a, Object b, CompareType type) {
         if (type == CompareType.SAME || type == CompareType.NOTSAME) {
             final boolean same = a == b;
             return (type == CompareType.SAME) == same;
         }
 
+        //TODO how to compare them?
         if (a instanceof Comparable)
             return checkCompareReturn(((Comparable) a).compareTo(b), type);
         return false;
     }
 
 
-    public static boolean compare(boolean a, boolean b, String compareType) {
-        return checkCompareReturn(Boolean.compare(a, b), CompareType.valueOf(compareType));
+    public static boolean compare(boolean a, boolean b, CompareType compareType) {
+        return checkCompareReturn(Boolean.compare(a, b), compareType);
     }
 
-    public static boolean compare(int a, int b, String compareType) {
-        return checkCompareReturn(Integer.compare(a, b), CompareType.valueOf(compareType));
+    public static boolean compare(int a, int b, CompareType compareType) {
+        return checkCompareReturn(Integer.compare(a, b), compareType);
     }
 
-    public static boolean compare(char a, char b, String compareType) {
-        return checkCompareReturn(Character.compare(a, b), CompareType.valueOf(compareType));
+    public static boolean compare(char a, char b, CompareType compareType) {
+        return checkCompareReturn(Character.compare(a, b), compareType);
     }
 
-    public static boolean compare(byte a, byte b, String compareType) {
-        return checkCompareReturn(Byte.compare(a, b), CompareType.valueOf(compareType));
+    public static boolean compare(byte a, byte b, CompareType compareType) {
+        return checkCompareReturn(Byte.compare(a, b), compareType);
     }
 
-    public static boolean compare(short a, short b, String compareType) {
-        return checkCompareReturn(Short.compare(a, b), CompareType.valueOf(compareType));
+    public static boolean compare(short a, short b, CompareType compareType) {
+        return checkCompareReturn(Short.compare(a, b), compareType);
     }
 
-    public static boolean compare(long a, long b, String compareType) {
-        return checkCompareReturn(Long.compare(a, b), CompareType.valueOf(compareType));
+    public static boolean compare(long a, long b, CompareType compareType) {
+        return checkCompareReturn(Long.compare(a, b), compareType);
     }
 
-    public static boolean compare(float a, float b, String compareType) {
-        return checkCompareReturn(Float.compare(a, b), CompareType.valueOf(compareType));
+    public static boolean compare(float a, float b, CompareType compareType) {
+        return checkCompareReturn(Float.compare(a, b), compareType);
     }
 
-    public static boolean compare(double a, double b, String compareType) {
-        return checkCompareReturn(Double.compare(a, b), CompareType.valueOf(compareType));
+    public static boolean compare(double a, double b, CompareType compareType) {
+        return checkCompareReturn(Double.compare(a, b), compareType);
     }
 
     private static boolean checkCompareReturn(int compareResult, CompareType type) {