From 23cc4f1236ed5aa390a6c53b429811c817f906f0 Mon Sep 17 00:00:00 2001 From: Jared Date: Mon, 22 Aug 2016 12:31:42 +0200 Subject: [PATCH] String equals --- .../zenscript/util/AnyClassWriter.java | 20 +++++++++---------- .../stanhebben/zenscript/util/StringUtil.java | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ZenScript/src/main/java/stanhebben/zenscript/util/AnyClassWriter.java b/ZenScript/src/main/java/stanhebben/zenscript/util/AnyClassWriter.java index 9f44404..6d9f08e 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/util/AnyClassWriter.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/util/AnyClassWriter.java @@ -6,17 +6,17 @@ package stanhebben.zenscript.util; -import java.util.Iterator; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; import stanhebben.zenscript.type.natives.IJavaMethod; import stanhebben.zenscript.type.natives.JavaMethod; -import static stanhebben.zenscript.util.ZenTypeUtil.EMPTY_REGISTRY; -import static stanhebben.zenscript.util.ZenTypeUtil.internal; -import static stanhebben.zenscript.util.ZenTypeUtil.signature; import stanhebben.zenscript.value.IAny; +import java.util.Iterator; + +import static stanhebben.zenscript.util.ZenTypeUtil.*; + /** * * @author Stan @@ -396,12 +396,12 @@ public class AnyClassWriter { definition.defineHashCode(outputHashCode); outputHashCode.end(); - /* - * MethodOutput outputEquals = new MethodOutput( writer, - * Opcodes.ACC_PUBLIC, "equals", "(Ljava/lang/Object;)Z", null, - * null); outputEquals.enableDebug(); outputEquals.start(); - * definition.defineEquals(outputEquals); outputEquals.end(); - */ + + MethodOutput outputEquals = new MethodOutput( writer, + Opcodes.ACC_PUBLIC, "equals", "(Ljava/lang/Object;)Z", null, + null); outputEquals.enableDebug(); outputEquals.start(); + definition.defineEquals(outputEquals); outputEquals.end(); + writer.visitEnd(); return writer.toByteArray(); diff --git a/ZenScript/src/main/java/stanhebben/zenscript/util/StringUtil.java b/ZenScript/src/main/java/stanhebben/zenscript/util/StringUtil.java index 3029c56..876150e 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/util/StringUtil.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/util/StringUtil.java @@ -194,8 +194,8 @@ public class StringUtil { if ((oldstr.charAt(0) != '"' || oldstr.charAt(oldstr.length() - 1) != '"') && (oldstr.charAt(0) != '\'' || oldstr.charAt(oldstr.length() - 1) != '\'')) { // TODO: error - // throw new TweakerExecuteException("Not a valid string constant: " - // + oldstr); +// throw new TweakerExecuteException("Not a valid string constant: " +// + oldstr); } oldstr = oldstr.substring(1, oldstr.length() - 1);