Feature/weave (#138)

* Add weave/stitch style command system to enigma

Also fixed divide by zero stupidity

Signed-off-by: liach <liach@users.noreply.github.com>

* Add tests for package access index and command

Signed-off-by: liach <liach@users.noreply.github.com>

* Minor tweaks

Signed-off-by: liach <liach@users.noreply.github.com>

2 files changed, 7 insertions, 6 deletions

diff --git a/src/main/java/cuchaz/enigma/analysis/index/PackageVisibilityIndex.java b/src/main/java/cuchaz/enigma/analysis/index/PackageVisibilityIndex.java
index 9e9115f..da28ac4 100644
--- a/src/main/java/cuchaz/enigma/analysis/index/PackageVisibilityIndex.java
+++ b/src/main/java/cuchaz/enigma/analysis/index/PackageVisibilityIndex.java
@@ -11,7 +11,7 @@ import cuchaz.enigma.translation.representation.entry.*;
 import java.util.*;

 

 public class PackageVisibilityIndex implements JarIndexer {

-        private static boolean isPackageVisibleOnlyRef(AccessFlags entryAcc, EntryReference ref, InheritanceIndex inheritanceIndex) {

+        private static boolean requiresSamePackage(AccessFlags entryAcc, EntryReference ref, InheritanceIndex inheritanceIndex) {

                 if (entryAcc.isPublic()) return false;

                 if (entryAcc.isProtected()) {

                         Set<ClassEntry> callerAncestors = inheritanceIndex.getAncestors(ref.context.getContainingClass());

@@ -43,7 +43,7 @@ public class PackageVisibilityIndex implements JarIndexer {
                         AccessFlags entryAcc = entryIndex.getFieldAccess(entry);

                         if (!entryAcc.isPublic() && !entryAcc.isPrivate()) {

                                 for (EntryReference<FieldEntry, MethodDefEntry> ref : referenceIndex.getReferencesToField(entry)) {

-                                        if (isPackageVisibleOnlyRef(entryAcc, ref, inheritanceIndex)) {

+                                        if (requiresSamePackage(entryAcc, ref, inheritanceIndex)) {

                                                 addConnection(ref.entry.getContainingClass(), ref.context.getContainingClass());

                                         }

                                 }

@@ -54,7 +54,7 @@ public class PackageVisibilityIndex implements JarIndexer {
                         AccessFlags entryAcc = entryIndex.getMethodAccess(entry);

                         if (!entryAcc.isPublic() && !entryAcc.isPrivate()) {

                                 for (EntryReference<MethodEntry, MethodDefEntry> ref : referenceIndex.getReferencesToMethod(entry)) {

-                                        if (isPackageVisibleOnlyRef(entryAcc, ref, inheritanceIndex)) {

+                                        if (requiresSamePackage(entryAcc, ref, inheritanceIndex)) {

                                                 addConnection(ref.entry.getContainingClass(), ref.context.getContainingClass());

                                         }

                                 }

@@ -65,13 +65,13 @@ public class PackageVisibilityIndex implements JarIndexer {
                         AccessFlags entryAcc = entryIndex.getClassAccess(entry);

                         if (!entryAcc.isPublic() && !entryAcc.isPrivate()) {

                                 for (EntryReference<ClassEntry, FieldDefEntry> ref : referenceIndex.getFieldTypeReferencesToClass(entry)) {

-                                        if (isPackageVisibleOnlyRef(entryAcc, ref, inheritanceIndex)) {

+                                        if (requiresSamePackage(entryAcc, ref, inheritanceIndex)) {

                                                 addConnection(ref.entry.getContainingClass(), ref.context.getContainingClass());

                                         }

                                 }

 

                                 for (EntryReference<ClassEntry, MethodDefEntry> ref : referenceIndex.getMethodTypeReferencesToClass(entry)) {

-                                        if (isPackageVisibleOnlyRef(entryAcc, ref, inheritanceIndex)) {

+                                        if (requiresSamePackage(entryAcc, ref, inheritanceIndex)) {

                                                 addConnection(ref.entry.getContainingClass(), ref.context.getContainingClass());

                                         }

                                 }

diff --git a/src/main/java/cuchaz/enigma/analysis/index/ReferenceIndex.java b/src/main/java/cuchaz/enigma/analysis/index/ReferenceIndex.java
index 6764ac0..04306bd 100644
--- a/src/main/java/cuchaz/enigma/analysis/index/ReferenceIndex.java
+++ b/src/main/java/cuchaz/enigma/analysis/index/ReferenceIndex.java
@@ -92,7 +92,8 @@ public class ReferenceIndex implements JarIndexer {
         }
 
         private <E extends Entry<?>, C extends Entry<?>> Multimap<E, EntryReference<E, C>> remapReferencesTo(JarIndex index, Multimap<E, EntryReference<E, C>> multimap) {
-                Multimap<E, EntryReference<E, C>> resolved = HashMultimap.create(multimap.keySet().size(), multimap.size() / multimap.keySet().size());
+                final int keySetSize = multimap.keySet().size();
+                Multimap<E, EntryReference<E, C>> resolved = HashMultimap.create(keySetSize, keySetSize == 0 ? 0 : multimap.size() / keySetSize);
                 for (Map.Entry<E, EntryReference<E, C>> entry : multimap.entries()) {
                         resolved.put(remap(index, entry.getKey()), remap(index, entry.getValue()));
                 }