From 237b2ed2a6b6f537cdbdf9fc9c6d0c7743f34375 Mon Sep 17 00:00:00 2001 From: jeff Date: Thu, 21 Aug 2014 01:10:37 -0400 Subject: fixed call graph searching added system to navigate multiple tokens for the same entry in a behavior --- src/cuchaz/enigma/analysis/EntryReference.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/cuchaz/enigma/analysis/EntryReference.java') diff --git a/src/cuchaz/enigma/analysis/EntryReference.java b/src/cuchaz/enigma/analysis/EntryReference.java index 869e08c..768c113 100644 --- a/src/cuchaz/enigma/analysis/EntryReference.java +++ b/src/cuchaz/enigma/analysis/EntryReference.java @@ -18,14 +18,13 @@ public class EntryReference { public E entry; public C context; - public int pos; public EntryReference( E entry ) { - this( entry, null, -1 ); + this( entry, null ); } - public EntryReference( E entry, C context, int pos ) + public EntryReference( E entry, C context ) { if( entry == null ) { @@ -34,7 +33,6 @@ public class EntryReference this.entry = entry; this.context = context; - this.pos = pos; } public ClassEntry getClassEntry( ) @@ -51,7 +49,7 @@ public class EntryReference { if( context != null ) { - return Util.combineHashesOrdered( entry.hashCode(), context.hashCode(), Integer.valueOf( pos ).hashCode() ); + return Util.combineHashesOrdered( entry.hashCode(), context.hashCode() ); } return entry.hashCode(); } @@ -82,7 +80,7 @@ public class EntryReference } else if( context != null && other.context != null ) { - return context.equals( other.context ) && pos == other.pos; + return context.equals( other.context ); } return false; } @@ -96,9 +94,6 @@ public class EntryReference { buf.append( " called from " ); buf.append( context ); - buf.append( " (" ); - buf.append( pos ); - buf.append( ")" ); } return buf.toString(); } -- cgit v1.2.3