From 09d9d0534bdc73be775b686fe356ca6911929f7c Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Sun, 17 Jan 2016 01:32:13 +0000 Subject: [PATCH] Genericise recursive member resolver --- .../tools/obfuscation/AnnotatedMixins.java | 75 +++++++++---------- 1 file changed, 36 insertions(+), 39 deletions(-) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java index af54467b..af4dae7f 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java @@ -299,32 +299,52 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp this.printMessage(Kind.NOTE, "Writing " + description + " to " + new File(outSrg.toUri()).getAbsolutePath()); return new PrintWriter(outSrg.openWriter()); } - - public ObfuscationData getObfMethodRecursive(MemberInfo targetMember) { - ObfuscationData targetNames = this.getObfClass(targetMember.owner); - ObfuscationData obfMethodData = this.getObfMethod(targetMember.asMethodData()); + + @SuppressWarnings("unchecked") + public ObfuscationData getObfEntryRecursive(final MemberInfo targetMember) { + MemberInfo currentTarget = targetMember; + ObfuscationData obfTargetNames = this.getObfClass(currentTarget.owner); + ObfuscationData obfData = this.getObfEntry(currentTarget); try { - while (obfMethodData.isEmpty()) { - TypeHandle targetType = this.getTypeHandle(targetMember.owner); + while (obfData.isEmpty()) { + TypeHandle targetType = this.getTypeHandle(currentTarget.owner); if (targetType == null) { - return obfMethodData; + return obfData; } TypeHandle superClass = targetType.getSuperclass(); if (superClass == null) { - return obfMethodData; + return obfData; } - targetMember = targetMember.move(superClass.getName()); - obfMethodData = this.getObfMethod(targetMember.asMethodData()); - if (!obfMethodData.isEmpty()) { - for (ObfuscationType type : obfMethodData) { - obfMethodData.add(type, MemberInfo.fromSrgMethod(obfMethodData.get(type)).move(targetNames.get(type)).asMethodData()); + currentTarget = currentTarget.move(superClass.getName()); + obfData = this.getObfEntry(currentTarget); + if (!obfData.isEmpty()) { + for (ObfuscationType type : obfData) { + String obfClass = obfTargetNames.get(type); + T obfMember = obfData.get(type); + if (currentTarget.isField()) { + obfData.add(type, (T)MemberInfo.fromSrgField(obfMember.toString(), "").move(obfClass).toSrg()); + } else { + obfData.add(type, (T)MemberInfo.fromSrgMethod((MethodData)obfMember).move(obfClass).asMethodData()); + } } } } } catch (Exception ex) { - // ??? + return this.getObfEntry(targetMember); } - return obfMethodData; + return obfData; + } + + @SuppressWarnings("unchecked") + public ObfuscationData getObfEntry(MemberInfo targetMember) { + if (targetMember.isField()) { + return (ObfuscationData)this.getObfField(targetMember.toSrg()); + } + return (ObfuscationData)this.getObfMethod(targetMember.asMethodData()); + } + + public ObfuscationData getObfMethodRecursive(MemberInfo targetMember) { + return this.getObfEntryRecursive(targetMember); } public ObfuscationData getObfMethod(MemberInfo method) { @@ -357,30 +377,7 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp } public ObfuscationData getObfFieldRecursive(MemberInfo targetMember) { - ObfuscationData targetNames = this.getObfClass(targetMember.owner); - ObfuscationData obfFieldData = this.getObfField(targetMember.toSrg()); - try { - while (obfFieldData.isEmpty()) { - TypeHandle targetType = this.getTypeHandle(targetMember.owner); - if (targetType == null) { - return obfFieldData; - } - TypeHandle superClass = targetType.getSuperclass(); - if (superClass == null) { - return obfFieldData; - } - targetMember = targetMember.move(superClass.getName()); - obfFieldData = this.getObfField(targetMember.toSrg()); - if (!obfFieldData.isEmpty()) { - for (ObfuscationType type : obfFieldData) { - obfFieldData.add(type, MemberInfo.fromSrgField(obfFieldData.get(type), "").move(targetNames.get(type)).toSrg()); - } - } - } - } catch (Exception ex) { - // ??? - } - return obfFieldData; + return this.getObfEntryRecursive(targetMember); } /**