From 2c93c43ddf0ec8ba102ffde61d09cfe9f5bff078 Mon Sep 17 00:00:00 2001 From: Aaron Hill Date: Mon, 29 Dec 2014 10:42:57 -0500 Subject: [PATCH] Properly handle enum reference for At.shift() --- .../asm/mixin/injection/InjectionPoint.java | 2 +- .../org/spongepowered/asm/util/ASMHelper.java | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java b/src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java index fa8f7c0d..6590b6e7 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java @@ -273,7 +273,7 @@ public abstract class InjectionPoint { String at = ASMHelper.getAnnotationValue(node, "value"); List args = ASMHelper.>getAnnotationValue(node, "args"); String target = ASMHelper.getAnnotationValue(node, "target", ""); - At.Shift shift = ASMHelper.getAnnotationValue(node, "shift", At.Shift.NONE); + At.Shift shift = ASMHelper.getAnnotationEnumConstantValue(node, "shift", At.Shift.class, At.Shift.NONE); int by = ASMHelper.getAnnotationValue(node, "by", Integer.valueOf(0)); int ordinal = ASMHelper.getAnnotationValue(node, "ordinal", Integer.valueOf(-1)); int opcode = ASMHelper.getAnnotationValue(node, "opcode", Integer.valueOf(0)); diff --git a/src/main/java/org/spongepowered/asm/util/ASMHelper.java b/src/main/java/org/spongepowered/asm/util/ASMHelper.java index 3ee7eea0..a8c7ebec 100644 --- a/src/main/java/org/spongepowered/asm/util/ASMHelper.java +++ b/src/main/java/org/spongepowered/asm/util/ASMHelper.java @@ -46,6 +46,7 @@ import org.objectweb.asm.util.CheckClassAdapter; import java.io.PrintWriter; import java.lang.annotation.Annotation; +import java.lang.reflect.Field; import java.util.Iterator; import java.util.List; @@ -483,6 +484,29 @@ public class ASMHelper { return null; } + /** + * Get the enum constant referenced by an annotation node + * + * @param annotationNode Annotation node to query + * @param key Key to search for + * @param enumClass Class of enum containing the enum constant to search for + * @param defaultValue Value to return if the specified key isn't found + * @return duck-typed annotation value or defaultValue if missing + * @throws NoSuchFieldException + */ + @SuppressWarnings("unchecked") + public static T getAnnotationEnumConstantValue(AnnotationNode annotationNode, String key, Class enumClass, T defaultValue) { + String[] value = ASMHelper.getAnnotationValue(annotationNode, key); + try { + Field enumField = enumClass.getField(value[1]); + if (enumField.isEnumConstant()) { + return (T) enumField; + } + } catch (NoSuchFieldException e) { + } + return defaultValue; + } + public static boolean methodIsStatic(MethodNode method) { return (method.access & Opcodes.ACC_STATIC) == Opcodes.ACC_STATIC; }