From ab6de199201f3cb292b986b2803d7d30b1485a47 Mon Sep 17 00:00:00 2001
From: jeff
Date: Mon, 9 Feb 2015 23:31:24 -0500
Subject: work around bad tokens generated by procyon for now

---
 src/cuchaz/enigma/analysis/SourceIndex.java         |  9 +++++----
 .../enigma/analysis/SourceIndexBehaviorVisitor.java | 21 ++-------------------
 .../enigma/analysis/SourceIndexClassVisitor.java    |  4 ++--
 3 files changed, 9 insertions(+), 25 deletions(-)

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

diff --git a/src/cuchaz/enigma/analysis/SourceIndex.java b/src/cuchaz/enigma/analysis/SourceIndex.java
index b43ab61..e31b803 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 b4094d9..a9a055b 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;
@@ -46,16 +45,6 @@ public class SourceIndexBehaviorVisitor extends SourceIndexVisitor {
 		m_behaviorEntry = behaviorEntry;
 	}
 	
-	@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 d6692f6..f4f4956 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);
-- 
cgit v1.2.3