From 6c4440ac1133bfaa7871d1049d174528a289ef30 Mon Sep 17 00:00:00 2001
From: hg
Date: Sun, 17 Aug 2014 10:56:17 -0400
Subject: added support for automatic reconstruction of inner and anonymous
 classes also added class to restore bridge method flags taken out by the
 obfuscator

---
 src/cuchaz/enigma/analysis/SourceIndex.java | 31 +++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

(limited to 'src/cuchaz/enigma/analysis/SourceIndex.java')

diff --git a/src/cuchaz/enigma/analysis/SourceIndex.java b/src/cuchaz/enigma/analysis/SourceIndex.java
index 531f3e0..645a71d 100644
--- a/src/cuchaz/enigma/analysis/SourceIndex.java
+++ b/src/cuchaz/enigma/analysis/SourceIndex.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.strobel.decompiler.languages.Region;
-import com.strobel.decompiler.languages.java.ast.AstNode;
+import com.strobel.decompiler.languages.java.ast.Identifier;
 
 import cuchaz.enigma.mapping.Entry;
 
@@ -51,19 +51,27 @@ public class SourceIndex
 		return m_source;
 	}
 	
-	public Token getToken( AstNode node )
+	public Token getToken( Identifier node )
 	{
 		// get a token for this node's region
 		Region region = node.getRegion();
 		if( region.getBeginLine() == 0 || region.getEndLine() == 0 )
 		{
-			throw new IllegalArgumentException( "Invalid region: " + region );
+			System.err.println( "WARNING: " + node.getNodeType() + " node has invalid region: " + region );
+			return null;
 		}
 		Token token = new Token(
 			toPos( region.getBeginLine(), region.getBeginColumn() ),
 			toPos( region.getEndLine(), region.getEndColumn() )
 		);
 		
+		// for tokens representing inner classes, make sure we only get the simple name
+		int pos = node.getName().lastIndexOf( '$' );
+		if( pos >= 0 )
+		{
+			token.end -= pos + 1;
+		}
+		
 		// HACKHACK: sometimes node regions are off by one
 		// I think this is a bug in Procyon, but it's easy to work around
 		if( !Character.isJavaIdentifierStart( m_source.charAt( token.start ) ) )
@@ -79,16 +87,23 @@ public class SourceIndex
 		return token;
 	}
 	
-	public void add( AstNode node, Entry deobfEntry )
+	public void add( Identifier node, Entry deobfEntry )
 	{
-		m_tokens.put( getToken( node ), deobfEntry );
+		Token token = getToken( node );
+		if( token != null )
+		{
+			m_tokens.put( token, deobfEntry );
+		}
 	}
 	
-	public void addDeclaration( AstNode node, Entry deobfEntry )
+	public void addDeclaration( Identifier node, Entry deobfEntry )
 	{
 		Token token = getToken( node );
-		m_tokens.put( token, deobfEntry );
-		m_declarations.put( deobfEntry, token );
+		if( token != null )
+		{
+			m_tokens.put( token, deobfEntry );
+			m_declarations.put( deobfEntry, token );
+		}
 	}
 	
 	public Token getToken( int pos )
-- 
cgit v1.2.3