added types to fields

4 files changed, 33 insertions, 32 deletions

diff --git a/src/cuchaz/enigma/analysis/EntryRenamer.java b/src/cuchaz/enigma/analysis/EntryRenamer.java
index b54489c..2f27049 100644
--- a/src/cuchaz/enigma/analysis/EntryRenamer.java
+++ b/src/cuchaz/enigma/analysis/EntryRenamer.java
@@ -21,10 +21,13 @@ import com.google.common.collect.Sets;
 
 import cuchaz.enigma.mapping.ArgumentEntry;
 import cuchaz.enigma.mapping.ClassEntry;
+import cuchaz.enigma.mapping.ClassNameReplacer;
 import cuchaz.enigma.mapping.ConstructorEntry;
 import cuchaz.enigma.mapping.Entry;
 import cuchaz.enigma.mapping.FieldEntry;
 import cuchaz.enigma.mapping.MethodEntry;
+import cuchaz.enigma.mapping.Signature;
+import cuchaz.enigma.mapping.Type;
 
 public class EntryRenamer {
         
@@ -127,7 +130,7 @@ public class EntryRenamer {
         }
         
         @SuppressWarnings("unchecked")
-        public static <T> T renameClassesInThing(Map<String,String> renames, T thing) {
+        public static <T> T renameClassesInThing(final Map<String,String> renames, T thing) {
                 if (thing instanceof String) {
                         String stringEntry = (String)thing;
                         if (renames.containsKey(stringEntry)) {
@@ -138,19 +141,23 @@ public class EntryRenamer {
                         return (T)new ClassEntry(renameClassesInThing(renames, classEntry.getClassName()));
                 } else if (thing instanceof FieldEntry) {
                         FieldEntry fieldEntry = (FieldEntry)thing;
-                        return (T)new FieldEntry(renameClassesInThing(renames, fieldEntry.getClassEntry()), fieldEntry.getName());
+                        return (T)new FieldEntry(
+                                renameClassesInThing(renames, fieldEntry.getClassEntry()),
+                                fieldEntry.getName(),
+                                renameClassesInThing(renames, fieldEntry.getType())
+                        );
                 } else if (thing instanceof ConstructorEntry) {
                         ConstructorEntry constructorEntry = (ConstructorEntry)thing;
                         return (T)new ConstructorEntry(
                                 renameClassesInThing(renames, constructorEntry.getClassEntry()),
-                                constructorEntry.getSignature()
+                                renameClassesInThing(renames, constructorEntry.getSignature())
                         );
                 } else if (thing instanceof MethodEntry) {
                         MethodEntry methodEntry = (MethodEntry)thing;
                         return (T)new MethodEntry(
                                 renameClassesInThing(renames, methodEntry.getClassEntry()),
                                 methodEntry.getName(),
-                                methodEntry.getSignature()
+                                renameClassesInThing(renames, methodEntry.getSignature())
                         );
                 } else if (thing instanceof ArgumentEntry) {
                         ArgumentEntry argumentEntry = (ArgumentEntry)thing;
@@ -164,6 +171,20 @@ public class EntryRenamer {
                         reference.entry = renameClassesInThing(renames, reference.entry);
                         reference.context = renameClassesInThing(renames, reference.context);
                         return thing;
+                } else if (thing instanceof Signature) {
+                        return (T)new Signature((Signature)thing, new ClassNameReplacer() {
+                                @Override
+                                public String replace(String className) {
+                                        return renameClassesInThing(renames, className);
+                                }
+                        });
+                } else if (thing instanceof Type) {
+                        return (T)new Type((Type)thing, new ClassNameReplacer() {
+                                @Override
+                                public String replace(String className) {
+                                        return renameClassesInThing(renames, className);
+                                }
+                        });
                 }
                 
                 return thing;
diff --git a/src/cuchaz/enigma/analysis/JarIndex.java b/src/cuchaz/enigma/analysis/JarIndex.java
index 3aac8bd..f54beda 100644
--- a/src/cuchaz/enigma/analysis/JarIndex.java
+++ b/src/cuchaz/enigma/analysis/JarIndex.java
@@ -57,7 +57,6 @@ public class JarIndex {
         private TranslationIndex m_translationIndex;
         private Multimap<String,String> m_interfaces;
         private Map<Entry,Access> m_access;
-        private Map<FieldEntry,ClassEntry> m_fieldClasses; // TODO: this will become obsolete!
         private Multimap<String,MethodEntry> m_methodImplementations;
         private Multimap<BehaviorEntry,EntryReference<BehaviorEntry,BehaviorEntry>> m_behaviorReferences;
         private Multimap<FieldEntry,EntryReference<FieldEntry,BehaviorEntry>> m_fieldReferences;
@@ -70,7 +69,6 @@ public class JarIndex {
                 m_translationIndex = new TranslationIndex();
                 m_interfaces = HashMultimap.create();
                 m_access = Maps.newHashMap();
-                m_fieldClasses = Maps.newHashMap();
                 m_methodImplementations = HashMultimap.create();
                 m_behaviorReferences = HashMultimap.create();
                 m_fieldReferences = HashMultimap.create();
@@ -114,9 +112,6 @@ public class JarIndex {
                                 }
                                 m_interfaces.put(className, interfaceName);
                         }
-                        for (CtField field : c.getDeclaredFields()) {
-                                indexField(field);
-                        }
                         for (CtBehavior behavior : c.getDeclaredBehaviors()) {
                                 indexBehavior(behavior);
                         }
@@ -169,18 +164,6 @@ public class JarIndex {
                 }
         }
         
-        private void indexField(CtField field) {
-                // get the field entry
-                String className = Descriptor.toJvmName(field.getDeclaringClass().getName());
-                FieldEntry fieldEntry = new FieldEntry(new ClassEntry(className), field.getName());
-                
-                // is the field a class type?
-                if (field.getSignature().startsWith("L")) {
-                        ClassEntry fieldTypeEntry = new ClassEntry(field.getSignature().substring(1, field.getSignature().length() - 1));
-                        m_fieldClasses.put(fieldEntry, fieldTypeEntry);
-                }
-        }
-        
         private void indexBehavior(CtBehavior behavior) {
                 // get the behavior entry
                 final BehaviorEntry behaviorEntry = BehaviorEntryFactory.create(behavior);
@@ -222,7 +205,7 @@ public class JarIndex {
                                         FieldEntry calledFieldEntry = JavassistUtil.getFieldEntry(call);
                                         ClassEntry resolvedClassEntry = m_translationIndex.resolveEntryClass(calledFieldEntry);
                                         if (resolvedClassEntry != null && !resolvedClassEntry.equals(calledFieldEntry.getClassEntry())) {
-                                                calledFieldEntry = new FieldEntry(resolvedClassEntry, call.getFieldName());
+                                                calledFieldEntry = new FieldEntry(calledFieldEntry, resolvedClassEntry);
                                         }
                                         EntryReference<FieldEntry,BehaviorEntry> reference = new EntryReference<FieldEntry,BehaviorEntry>(
                                                 calledFieldEntry,
@@ -448,8 +431,7 @@ public class JarIndex {
                 // does the caller use this type?
                 BehaviorEntry caller = references.iterator().next().context;
                 for (FieldEntry fieldEntry : getReferencedFields(caller)) {
-                        ClassEntry fieldClass = getFieldClass(fieldEntry);
-                        if (fieldClass != null && fieldClass.equals(innerClassEntry)) {
+                        if (fieldEntry.getType().hasClass() && fieldEntry.getType().getClassEntry().equals(innerClassEntry)) {
                                 // caller references this type, so it can't be anonymous
                                 return null;
                         }
@@ -475,10 +457,6 @@ public class JarIndex {
                 return m_access.get(entry);
         }
         
-        public ClassEntry getFieldClass(FieldEntry fieldEntry) {
-                return m_fieldClasses.get(fieldEntry);
-        }
-        
         public ClassInheritanceTreeNode getClassInheritance(Translator deobfuscatingTranslator, ClassEntry obfClassEntry) {
                 
                 // get the root node
diff --git a/src/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java b/src/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java
index 4155128..f15a724 100644
--- a/src/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java
+++ b/src/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java
@@ -36,6 +36,7 @@ import cuchaz.enigma.mapping.ConstructorEntry;
 import cuchaz.enigma.mapping.FieldEntry;
 import cuchaz.enigma.mapping.MethodEntry;
 import cuchaz.enigma.mapping.Signature;
+import cuchaz.enigma.mapping.Type;
 
 public class SourceIndexBehaviorVisitor extends SourceIndexVisitor {
         
@@ -100,7 +101,7 @@ public class SourceIndexBehaviorVisitor extends SourceIndexVisitor {
                         }
                         
                         ClassEntry classEntry = new ClassEntry(ref.getDeclaringType().getInternalName());
-                        FieldEntry fieldEntry = new FieldEntry(classEntry, ref.getName());
+                        FieldEntry fieldEntry = new FieldEntry(classEntry, ref.getName(), new Type(ref.getSignature()));
                         index.addReference(node.getMemberNameToken(), fieldEntry, m_behaviorEntry);
                 }
                 
@@ -140,7 +141,7 @@ public class SourceIndexBehaviorVisitor extends SourceIndexVisitor {
                 MemberReference ref = node.getUserData(Keys.MEMBER_REFERENCE);
                 if (ref != null) {
                         ClassEntry classEntry = new ClassEntry(ref.getDeclaringType().getInternalName());
-                        FieldEntry fieldEntry = new FieldEntry(classEntry, ref.getName());
+                        FieldEntry fieldEntry = new FieldEntry(classEntry, ref.getName(), new Type(ref.getSignature()));
                         index.addReference(node.getIdentifierToken(), fieldEntry, m_behaviorEntry);
                 }
                 
diff --git a/src/cuchaz/enigma/analysis/SourceIndexClassVisitor.java b/src/cuchaz/enigma/analysis/SourceIndexClassVisitor.java
index 7222035..e2ff300 100644
--- a/src/cuchaz/enigma/analysis/SourceIndexClassVisitor.java
+++ b/src/cuchaz/enigma/analysis/SourceIndexClassVisitor.java
@@ -31,6 +31,7 @@ import cuchaz.enigma.mapping.ClassEntry;
 import cuchaz.enigma.mapping.ConstructorEntry;
 import cuchaz.enigma.mapping.FieldEntry;
 import cuchaz.enigma.mapping.Signature;
+import cuchaz.enigma.mapping.Type;
 
 public class SourceIndexClassVisitor extends SourceIndexVisitor {
         
@@ -94,7 +95,7 @@ public class SourceIndexClassVisitor extends SourceIndexVisitor {
         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());
+                FieldEntry fieldEntry = new FieldEntry(classEntry, def.getName(), new Type(def.getSignature()));
                 assert (node.getVariables().size() == 1);
                 VariableInitializer variable = node.getVariables().firstOrNullObject();
                 index.addDeclaration(variable.getNameToken(), fieldEntry);
@@ -107,7 +108,7 @@ public class SourceIndexClassVisitor extends SourceIndexVisitor {
                 // 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());
+                FieldEntry fieldEntry = new FieldEntry(classEntry, def.getName(), new Type(def.getSignature()));
                 index.addDeclaration(node.getNameToken(), fieldEntry);
                 
                 return recurse(node, index);