work around bad tokens generated by procyon for now

5 files changed, 16 insertions, 29 deletions

diff --git a/src/cuchaz/enigma/TranslatingTypeLoader.java b/src/cuchaz/enigma/TranslatingTypeLoader.java
index cfa03a1a..8bec17fb 100644
--- a/src/cuchaz/enigma/TranslatingTypeLoader.java
+++ b/src/cuchaz/enigma/TranslatingTypeLoader.java
@@ -104,6 +104,7 @@ public class TranslatingTypeLoader implements ITypeLoader {
         }
         
         private byte[] loadType(String deobfClassName) {
+                
                 ClassEntry deobfClassEntry = new ClassEntry(deobfClassName);
                 ClassEntry obfClassEntry = m_obfuscatingTranslator.translateEntry(deobfClassEntry);
                 
@@ -176,7 +177,9 @@ public class TranslatingTypeLoader implements ITypeLoader {
                 }
         }
         
-        public CtClass transformClass(CtClass c) throws IOException, NotFoundException, CannotCompileException {
+        public CtClass transformClass(CtClass c)
+        throws IOException, NotFoundException, CannotCompileException {
+                
                 // we moved a lot of classes out of the default package into the none package
                 // make sure all the class references are consistent
                 ClassRenamer.moveAllClassesOutOfDefaultPackage(c, Constants.NonePackage);
diff --git a/src/cuchaz/enigma/analysis/SourceIndex.java b/src/cuchaz/enigma/analysis/SourceIndex.java
index b43ab614..e31b8032 100644
--- a/src/cuchaz/enigma/analysis/SourceIndex.java
+++ b/src/cuchaz/enigma/analysis/SourceIndex.java
@@ -82,10 +82,11 @@ public class SourceIndex {
                 // DEBUG
                 // System.out.println( String.format( "%s \"%s\" region: %s", node.getNodeType(), name, region ) );
                 
-                // for tokens representing inner classes, make sure we only get the simple name
-                int pos = name.lastIndexOf('$');
-                if (pos >= 0) {
-                        token.end -= pos + 1;
+                // if the token has a $ in it, something's wrong. Ignore this token
+                if (name.lastIndexOf('$') >= 0) {
+                        // DEBUG
+                        System.err.println(String.format("WARNING: %s \"%s\" is probably a bad token. It was ignored", node.getNodeType(), name));
+                        return null;
                 }
                 
                 return token;
diff --git a/src/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java b/src/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java
index b4094d9e..a9a055be 100644
--- a/src/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java
+++ b/src/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java
@@ -17,12 +17,10 @@ import com.strobel.assembler.metadata.ParameterDefinition;
 import com.strobel.assembler.metadata.TypeReference;
 import com.strobel.decompiler.languages.TextLocation;
 import com.strobel.decompiler.languages.java.ast.AstNode;
-import com.strobel.decompiler.languages.java.ast.ConstructorDeclaration;
 import com.strobel.decompiler.languages.java.ast.IdentifierExpression;
 import com.strobel.decompiler.languages.java.ast.InvocationExpression;
 import com.strobel.decompiler.languages.java.ast.Keys;
 import com.strobel.decompiler.languages.java.ast.MemberReferenceExpression;
-import com.strobel.decompiler.languages.java.ast.MethodDeclaration;
 import com.strobel.decompiler.languages.java.ast.ObjectCreationExpression;
 import com.strobel.decompiler.languages.java.ast.ParameterDeclaration;
 import com.strobel.decompiler.languages.java.ast.SimpleType;
@@ -33,6 +31,7 @@ import cuchaz.enigma.mapping.ArgumentEntry;
 import cuchaz.enigma.mapping.BehaviorEntry;
 import cuchaz.enigma.mapping.ClassEntry;
 import cuchaz.enigma.mapping.ConstructorEntry;
+import cuchaz.enigma.mapping.EntryFactory;
 import cuchaz.enigma.mapping.FieldEntry;
 import cuchaz.enigma.mapping.MethodEntry;
 import cuchaz.enigma.mapping.Signature;
@@ -47,16 +46,6 @@ public class SourceIndexBehaviorVisitor extends SourceIndexVisitor {
         }
         
         @Override
-        public Void visitMethodDeclaration(MethodDeclaration node, SourceIndex index) {
-                return recurse(node, index);
-        }
-        
-        @Override
-        public Void visitConstructorDeclaration(ConstructorDeclaration node, SourceIndex index) {
-                return recurse(node, index);
-        }
-        
-        @Override
         public Void visitInvocationExpression(InvocationExpression node, SourceIndex index) {
                 MemberReference ref = node.getUserData(Keys.MEMBER_REFERENCE);
                 
@@ -122,14 +111,8 @@ public class SourceIndexBehaviorVisitor extends SourceIndexVisitor {
         @Override
         public Void visitParameterDeclaration(ParameterDeclaration node, SourceIndex index) {
                 ParameterDefinition def = node.getUserData(Keys.PARAMETER_DEFINITION);
-                ClassEntry classEntry = new ClassEntry(def.getDeclaringType().getInternalName());
                 MethodDefinition methodDef = (MethodDefinition)def.getMethod();
-                BehaviorEntry behaviorEntry;
-                if (methodDef.isConstructor()) {
-                        behaviorEntry = new ConstructorEntry(classEntry, new Signature(methodDef.getSignature()));
-                } else {
-                        behaviorEntry = new MethodEntry(classEntry, methodDef.getName(), new Signature(methodDef.getSignature()));
-                }
+                BehaviorEntry behaviorEntry = EntryFactory.getBehaviorEntry(methodDef);
                 ArgumentEntry argumentEntry = new ArgumentEntry(behaviorEntry, def.getPosition(), node.getName());
                 index.addDeclaration(node.getNameToken(), argumentEntry);
                 
diff --git a/src/cuchaz/enigma/analysis/SourceIndexClassVisitor.java b/src/cuchaz/enigma/analysis/SourceIndexClassVisitor.java
index d6692f60..f4f49568 100644
--- a/src/cuchaz/enigma/analysis/SourceIndexClassVisitor.java
+++ b/src/cuchaz/enigma/analysis/SourceIndexClassVisitor.java
@@ -94,7 +94,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(), new Type(def.getSignature()));
+                FieldEntry fieldEntry = new FieldEntry(classEntry, def.getName(), new Type(def.getErasedSignature()));
                 assert (node.getVariables().size() == 1);
                 VariableInitializer variable = node.getVariables().firstOrNullObject();
                 index.addDeclaration(variable.getNameToken(), fieldEntry);
@@ -107,7 +107,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(), new Type(def.getSignature()));
+                FieldEntry fieldEntry = new FieldEntry(classEntry, def.getName(), new Type(def.getErasedSignature()));
                 index.addDeclaration(node.getNameToken(), fieldEntry);
                 
                 return recurse(node, index);
diff --git a/src/cuchaz/enigma/bytecode/InnerClassWriter.java b/src/cuchaz/enigma/bytecode/InnerClassWriter.java
index 817500b7..5350b86c 100644
--- a/src/cuchaz/enigma/bytecode/InnerClassWriter.java
+++ b/src/cuchaz/enigma/bytecode/InnerClassWriter.java
@@ -13,7 +13,6 @@ package cuchaz.enigma.bytecode;
 import java.util.Collection;
 
 import javassist.CtClass;
-import javassist.bytecode.AccessFlag;
 import javassist.bytecode.ConstPool;
 import javassist.bytecode.Descriptor;
 import javassist.bytecode.EnclosingMethodAttribute;
@@ -77,18 +76,19 @@ public class InnerClassWriter {
                         int innerClassIndex = constPool.addClassInfo(obfClassEntry.getName());
                         int outerClassIndex = 0;
                         int innerClassSimpleNameIndex = 0;
+                        int accessFlags = 0;
                         if (!m_jarIndex.isAnonymousClass(obfInnerClassName)) {
                                 outerClassIndex = constPool.addClassInfo(obfClassEntry.getOuterClassName());
                                 innerClassSimpleNameIndex = constPool.addUtf8Info(obfClassEntry.getInnerClassName());
                         }
                         
-                        attr.append(innerClassIndex, outerClassIndex, innerClassSimpleNameIndex, c.getClassFile().getAccessFlags() & ~AccessFlag.SUPER);
+                        attr.append(innerClassIndex, outerClassIndex, innerClassSimpleNameIndex, accessFlags);
                         
                         /* DEBUG 
                         System.out.println(String.format("\tOBF: %s -> ATTR: %s,%s,%s (replace %s with %s)",
                                 obfClassEntry,
-                                attr.outerClass(attr.tableLength() - 1),
                                 attr.innerClass(attr.tableLength() - 1),
+                                attr.outerClass(attr.tableLength() - 1),
                                 attr.innerName(attr.tableLength() - 1),
                                 Constants.NonePackage + "/" + obfInnerClassName,
                                 obfClassEntry.getName()