From 5e3743a0aca3529eacf9be400c8b8d7547f66e7f Mon Sep 17 00:00:00 2001
From: jeff
Date: Mon, 16 Mar 2015 19:22:22 -0400
Subject: started adding minimal support for generics fixed
 mark-as-deobfuscated issue

---
 src/cuchaz/enigma/analysis/JarIndex.java           | 31 +++++++++++++++-------
 .../enigma/analysis/SourceIndexClassVisitor.java   |  7 ++---
 2 files changed, 24 insertions(+), 14 deletions(-)

(limited to 'src/cuchaz/enigma/analysis')

diff --git a/src/cuchaz/enigma/analysis/JarIndex.java b/src/cuchaz/enigma/analysis/JarIndex.java
index 7ebbd97..e255468 100644
--- a/src/cuchaz/enigma/analysis/JarIndex.java
+++ b/src/cuchaz/enigma/analysis/JarIndex.java
@@ -28,6 +28,7 @@ import javassist.CtMethod;
 import javassist.NotFoundException;
 import javassist.bytecode.AccessFlag;
 import javassist.bytecode.Descriptor;
+import javassist.bytecode.EnclosingMethodAttribute;
 import javassist.bytecode.FieldInfo;
 import javassist.bytecode.InnerClassesAttribute;
 import javassist.expr.ConstructorCall;
@@ -314,15 +315,6 @@ public class JarIndex {
 		if (classEntry.isInnerClass()) {
 			return classEntry.getOuterClassEntry();
 		}
-		InnerClassesAttribute innerClassesAttribute = (InnerClassesAttribute)c.getClassFile().getAttribute(InnerClassesAttribute.tag);
-		if (innerClassesAttribute != null) {
-			for (int i=0; i<innerClassesAttribute.tableLength(); i++) {
-				ClassEntry innerClassEntry = new ClassEntry(Descriptor.toJvmName(innerClassesAttribute.innerClass(i)));
-				if (classEntry.equals(innerClassEntry)) {
-					return new ClassEntry(Descriptor.toJvmName(innerClassesAttribute.outerClass(i)));
-				}
-			}
-		}
 		
 		// inner classes:
 		// have constructors that can (illegally) set synthetic fields
@@ -481,6 +473,27 @@ public class JarIndex {
 	
 	private BehaviorEntry isAnonymousClass(CtClass c, ClassEntry outerClassEntry) {
 		
+		// is this class already marked anonymous?
+		EnclosingMethodAttribute enclosingMethodAttribute = (EnclosingMethodAttribute)c.getClassFile().getAttribute(EnclosingMethodAttribute.tag);
+		if (enclosingMethodAttribute != null) {
+			if (enclosingMethodAttribute.methodIndex() > 0) {
+				return EntryFactory.getBehaviorEntry(
+					Descriptor.toJvmName(enclosingMethodAttribute.className()),
+					enclosingMethodAttribute.methodName(),
+					enclosingMethodAttribute.methodDescriptor()
+				);
+			} else {
+				// an attribute but no method? assume not anonymous
+				return null;
+			}
+		}
+		
+		// if there's an inner class attribute, but not an enclosing method attribute, then it's not anonymous
+		InnerClassesAttribute innerClassesAttribute = (InnerClassesAttribute)c.getClassFile().getAttribute(InnerClassesAttribute.tag);
+		if (innerClassesAttribute != null) {
+			return null;
+		}
+		
 		ClassEntry innerClassEntry = new ClassEntry(Descriptor.toJvmName(c.getName()));
 		
 		// anonymous classes:
diff --git a/src/cuchaz/enigma/analysis/SourceIndexClassVisitor.java b/src/cuchaz/enigma/analysis/SourceIndexClassVisitor.java
index f4f4956..f4202b5 100644
--- a/src/cuchaz/enigma/analysis/SourceIndexClassVisitor.java
+++ b/src/cuchaz/enigma/analysis/SourceIndexClassVisitor.java
@@ -30,7 +30,6 @@ import cuchaz.enigma.mapping.ClassEntry;
 import cuchaz.enigma.mapping.ConstructorEntry;
 import cuchaz.enigma.mapping.EntryFactory;
 import cuchaz.enigma.mapping.FieldEntry;
-import cuchaz.enigma.mapping.Type;
 
 public class SourceIndexClassVisitor extends SourceIndexVisitor {
 	
@@ -93,8 +92,7 @@ public class SourceIndexClassVisitor extends SourceIndexVisitor {
 	@Override
 	public Void visitFieldDeclaration(FieldDeclaration node, SourceIndex index) {
 		FieldDefinition def = node.getUserData(Keys.FIELD_DEFINITION);
-		ClassEntry classEntry = new ClassEntry(def.getDeclaringType().getInternalName());
-		FieldEntry fieldEntry = new FieldEntry(classEntry, def.getName(), new Type(def.getErasedSignature()));
+		FieldEntry fieldEntry = EntryFactory.getFieldEntry(def);
 		assert (node.getVariables().size() == 1);
 		VariableInitializer variable = node.getVariables().firstOrNullObject();
 		index.addDeclaration(variable.getNameToken(), fieldEntry);
@@ -106,8 +104,7 @@ public class SourceIndexClassVisitor extends SourceIndexVisitor {
 	public Void visitEnumValueDeclaration(EnumValueDeclaration node, SourceIndex index) {
 		// treat enum declarations as field declarations
 		FieldDefinition def = node.getUserData(Keys.FIELD_DEFINITION);
-		ClassEntry classEntry = new ClassEntry(def.getDeclaringType().getInternalName());
-		FieldEntry fieldEntry = new FieldEntry(classEntry, def.getName(), new Type(def.getErasedSignature()));
+		FieldEntry fieldEntry = EntryFactory.getFieldEntry(def);
 		index.addDeclaration(node.getNameToken(), fieldEntry);
 		
 		return recurse(node, index);
-- 
cgit v1.2.3