working on writing mappings based on all the matches

5 files changed, 109 insertions, 17 deletions

diff --git a/src/cuchaz/enigma/ConvertMain.java b/src/cuchaz/enigma/ConvertMain.java
index c3a2ad5c..15658d90 100644
--- a/src/cuchaz/enigma/ConvertMain.java
+++ b/src/cuchaz/enigma/ConvertMain.java
@@ -49,15 +49,10 @@ public class ConvertMain {
                 
                 // match methods/constructors
                 //computeMethodMatches(methodMatchesFile, destJar, outMappingsFile, classMatchesFile);
-                editMethodMatches(sourceJar, destJar, outMappingsFile, mappings, classMatchesFile, methodMatchesFile);
+                //editMethodMatches(sourceJar, destJar, outMappingsFile, mappings, classMatchesFile, methodMatchesFile);
                 
-                /* TODO
-                // write out the converted mappings
-                FileWriter writer = new FileWriter(outMappingsFile);
-                new MappingsWriter().write(writer, mappings);
-                writer.close();
-                System.out.println("Wrote converted mappings to:\n\t" + outMappingsFile.getAbsolutePath());
-                */
+                // write final converted mappings
+                writeFinalMappings(outMappingsFile, sourceJar, destJar, mappings, classMatchesFile, fieldMatchesFile, methodMatchesFile);
         }
         
         private static void computeClassMatches(File classMatchesFile, JarFile sourceJar, JarFile destJar, Mappings mappings)
@@ -93,7 +88,7 @@ public class ConvertMain {
                 Deobfuscators deobfuscators = new Deobfuscators(sourceJar, destJar);
                 deobfuscators.source.setMappings(mappings);
                 
-                Mappings newMappings = MappingsConverter.newMappings(classMatches, mappings, deobfuscators.source, deobfuscators.source);
+                Mappings newMappings = MappingsConverter.newMappings(classMatches, mappings, deobfuscators.source, deobfuscators.dest);
                 
                 try (FileWriter out = new FileWriter(outMappingsFile)) {
                         new MappingsWriter().write(out, newMappings);
@@ -114,7 +109,12 @@ public class ConvertMain {
                 System.out.println("Writing matches...");
                 
                 // get the matched and unmatched mappings
-                MemberMatches<FieldEntry> fieldMatches = MappingsConverter.computeFieldMatches(destDeobfuscator, destMappings, classMatches);
+                MemberMatches<FieldEntry> fieldMatches = MappingsConverter.computeMemberMatches(
+                        destDeobfuscator,
+                        destMappings,
+                        classMatches,
+                        MappingsConverter.getFieldDoer()
+                );
                 
                 MatchesWriter.writeMembers(fieldMatches, memberMatchesFile);
                 System.out.println("Wrote:\n\t" + memberMatchesFile.getAbsolutePath());
@@ -160,7 +160,12 @@ public class ConvertMain {
                 System.out.println("Writing method matches...");
                 
                 // get the matched and unmatched mappings
-                MemberMatches<BehaviorEntry> methodMatches = MappingsConverter.computeBehaviorMatches(destDeobfuscator, destMappings, classMatches);
+                MemberMatches<BehaviorEntry> methodMatches = MappingsConverter.computeMemberMatches(
+                        destDeobfuscator,
+                        destMappings,
+                        classMatches,
+                        MappingsConverter.getMethodDoer()
+                );
                 
                 MatchesWriter.writeMembers(methodMatches, methodMatchesFile);
                 System.out.println("Wrote:\n\t" + methodMatchesFile.getAbsolutePath());
@@ -192,6 +197,29 @@ public class ConvertMain {
                         }
                 });
         }
+        
+        private static void writeFinalMappings(File outMappingsFile, JarFile sourceJar, JarFile destJar, Mappings mappings, File classMatchesFile, File fieldMatchesFile, File methodMatchesFile)
+        throws IOException {
+                
+                System.out.println("Reading matches...");
+                ClassMatches classMatches = MatchesReader.readClasses(classMatchesFile);
+                MemberMatches<FieldEntry> fieldMatches = MatchesReader.readMembers(fieldMatchesFile);
+                MemberMatches<BehaviorEntry> methodMatches = MatchesReader.readMembers(methodMatchesFile);
+
+                Deobfuscators deobfuscators = new Deobfuscators(sourceJar, destJar);
+                deobfuscators.source.setMappings(mappings);
+                
+                // apply matches
+                Mappings newMappings = MappingsConverter.newMappings(classMatches, mappings, deobfuscators.source, deobfuscators.dest);
+                MappingsConverter.applyMemberMatches(newMappings, fieldMatches, MappingsConverter.getFieldDoer());
+                MappingsConverter.applyMemberMatches(newMappings, methodMatches, MappingsConverter.getMethodDoer());
+                
+                // write out the converted mappings
+                try (FileWriter out = new FileWriter(outMappingsFile)) {
+                        new MappingsWriter().write(out, newMappings);
+                }
+                System.out.println("Wrote converted mappings to:\n\t" + outMappingsFile.getAbsolutePath());
+        }
 
         private static class Deobfuscators {
                 
diff --git a/src/cuchaz/enigma/convert/MappingsConverter.java b/src/cuchaz/enigma/convert/MappingsConverter.java
index 2987ea08..44bc8b87 100644
--- a/src/cuchaz/enigma/convert/MappingsConverter.java
+++ b/src/cuchaz/enigma/convert/MappingsConverter.java
@@ -262,10 +262,11 @@ public class MappingsConverter {
                 Collection<T> getObfEntries(JarIndex jarIndex);
                 Collection<? extends MemberMapping<T>> getMappings(ClassMapping destClassMapping);
                 Set<T> filterEntries(Collection<T> obfEntries, T obfSourceEntry, ClassMatches classMatches);
+                void setMemberObfName(ClassMapping classMapping, MemberMapping<T> memberMapping, String newObfName);
         }
         
-        public static MemberMatches<FieldEntry> computeFieldMatches(Deobfuscator destDeobfuscator, Mappings destMappings, ClassMatches classMatches) {
-                return computeMemberMatches(destDeobfuscator, destMappings, classMatches, new Doer<FieldEntry>() {
+        public static Doer<FieldEntry> getFieldDoer() {
+                return new Doer<FieldEntry>() {
 
                         @Override
                         public Collection<FieldEntry> getDroppedEntries(MappingsChecker checker) {
@@ -293,11 +294,17 @@ public class MappingsConverter {
                                 }
                                 return out;
                         }
-                });
+
+                        @Override
+                        public void setMemberObfName(ClassMapping classMapping, MemberMapping<FieldEntry> memberMapping, String newObfName) {
+                                FieldMapping fieldMapping = (FieldMapping)memberMapping;
+                                classMapping.setFieldObfName(fieldMapping.getObfName(), fieldMapping.getObfType(), newObfName);
+                        }
+                };
         }
         
-        public static MemberMatches<BehaviorEntry> computeBehaviorMatches(Deobfuscator destDeobfuscator, Mappings destMappings, ClassMatches classMatches) {
-                return computeMemberMatches(destDeobfuscator, destMappings, classMatches, new Doer<BehaviorEntry>() {
+        public static Doer<BehaviorEntry> getMethodDoer() {
+                return new Doer<BehaviorEntry>() {
 
                         @Override
                         public Collection<BehaviorEntry> getDroppedEntries(MappingsChecker checker) {
@@ -329,7 +336,13 @@ public class MappingsConverter {
                                 }
                                 return out;
                         }
-                });
+
+                        @Override
+                        public void setMemberObfName(ClassMapping classMapping, MemberMapping<BehaviorEntry> memberMapping, String newObfName) {
+                                MethodMapping methodMapping = (MethodMapping)memberMapping;
+                                classMapping.setMethodObfName(methodMapping.getObfName(), methodMapping.getObfSignature(), newObfName);
+                        }
+                };
         }
         
         public static <T extends Entry> MemberMatches<T> computeMemberMatches(Deobfuscator destDeobfuscator, Mappings destMappings, ClassMatches classMatches, Doer<T> doer) {
@@ -452,4 +465,29 @@ public class MappingsConverter {
                         }
                 });
         }
+
+        public static <T extends Entry> void applyMemberMatches(Mappings mappings, MemberMatches<T> memberMatches, Doer<T> doer) {
+                for (ClassMapping classMapping : mappings.classes()) {
+                        applyMemberMatches(classMapping, memberMatches, doer);
+                }
+        }
+        
+        private static <T extends Entry> void applyMemberMatches(ClassMapping classMapping, MemberMatches<T> memberMatches, Doer<T> doer) {
+                ClassEntry classEntry = classMapping.getObfEntry();
+                
+                // apply to this class
+                // TODO: need to sort renames so they happen in the right order!!
+                for (MemberMapping<T> memberMapping : Lists.newArrayList(doer.getMappings(classMapping))) {
+                        T obfSourceEntry = memberMapping.getObfEntry(classEntry);
+                        T obfDestEntry = memberMatches.matches().get(obfSourceEntry);
+                        if (obfDestEntry != null) {
+                                doer.setMemberObfName(classMapping, memberMapping, obfDestEntry.getName());
+                        }
+                }
+                
+                // recurse
+                for (ClassMapping innerClassMapping : classMapping.innerClasses()) {
+                        applyMemberMatches(innerClassMapping, memberMatches, doer);
+                }
+        }
 }
diff --git a/src/cuchaz/enigma/mapping/ClassMapping.java b/src/cuchaz/enigma/mapping/ClassMapping.java
index 07fed32a..ac70df0d 100644
--- a/src/cuchaz/enigma/mapping/ClassMapping.java
+++ b/src/cuchaz/enigma/mapping/ClassMapping.java
@@ -243,6 +243,15 @@ public class ClassMapping implements Serializable, Comparable<ClassMapping> {
                 }
         }
         
+        public void setFieldObfName(String oldObfName, Type obfType, String newObfName) {
+                assert(newObfName != null);
+                FieldMapping fieldMapping = m_fieldsByObf.remove(getFieldKey(oldObfName, obfType));
+                assert(fieldMapping != null);
+                fieldMapping.setObfName(newObfName);
+                boolean obfWasAdded = m_fieldsByObf.put(getFieldKey(newObfName, obfType), fieldMapping) == null;
+                assert(obfWasAdded);
+        }
+        
         
         //// METHODS ////////
         
@@ -319,6 +328,15 @@ public class ClassMapping implements Serializable, Comparable<ClassMapping> {
                 }
         }
         
+        public void setMethodObfName(String oldObfName, Signature obfSignature, String newObfName) {
+                assert(newObfName != null);
+                MethodMapping methodMapping = m_methodsByObf.remove(getMethodKey(oldObfName, obfSignature));
+                assert(methodMapping != null);
+                methodMapping.setObfName(newObfName);
+                boolean obfWasAdded = m_methodsByObf.put(getMethodKey(newObfName, obfSignature), methodMapping) == null;
+                assert(obfWasAdded);
+        }
+        
         //// ARGUMENTS ////////
         
         public void setArgumentName(String obfMethodName, Signature obfMethodSignature, int argumentIndex, String argumentName) {
diff --git a/src/cuchaz/enigma/mapping/FieldMapping.java b/src/cuchaz/enigma/mapping/FieldMapping.java
index 1289351d..3aa9e698 100644
--- a/src/cuchaz/enigma/mapping/FieldMapping.java
+++ b/src/cuchaz/enigma/mapping/FieldMapping.java
@@ -36,6 +36,10 @@ public class FieldMapping implements Serializable, Comparable<FieldMapping>, Mem
                 return m_obfName;
         }
         
+        public void setObfName(String val) {
+                m_obfName = NameValidator.validateFieldName(val);
+        }
+        
         public String getDeobfName() {
                 return m_deobfName;
         }
diff --git a/src/cuchaz/enigma/mapping/MethodMapping.java b/src/cuchaz/enigma/mapping/MethodMapping.java
index bf6dacca..a67e352f 100644
--- a/src/cuchaz/enigma/mapping/MethodMapping.java
+++ b/src/cuchaz/enigma/mapping/MethodMapping.java
@@ -56,6 +56,10 @@ public class MethodMapping implements Serializable, Comparable<MethodMapping>, M
                 return m_obfName;
         }
         
+        public void setObfName(String val) {
+                m_obfName = NameValidator.validateMethodName(val);
+        }
+        
         public String getDeobfName() {
                 return m_deobfName;
         }