tweaks and improvements to field matching gui

2 files changed, 13 insertions, 5 deletions

diff --git a/src/cuchaz/enigma/analysis/SourceIndex.java b/src/cuchaz/enigma/analysis/SourceIndex.java
index b3fb751..8f751ef 100644
--- a/src/cuchaz/enigma/analysis/SourceIndex.java
+++ b/src/cuchaz/enigma/analysis/SourceIndex.java
@@ -32,9 +32,15 @@ public class SourceIndex {
         private Multimap<EntryReference<Entry,Entry>,Token> m_referenceToTokens;
         private Map<Entry,Token> m_declarationToToken;
         private List<Integer> m_lineOffsets;
+        private boolean m_ignoreBadTokens;
         
         public SourceIndex(String source) {
+                this(source, true);
+        }
+        
+        public SourceIndex(String source, boolean ignoreBadTokens) {
                 m_source = source;
+                m_ignoreBadTokens = ignoreBadTokens;
                 m_tokenToReference = Maps.newTreeMap();
                 m_referenceToTokens = HashMultimap.create();
                 m_declarationToToken = Maps.newHashMap();
@@ -83,7 +89,7 @@ public class SourceIndex {
                 // System.out.println( String.format( "%s \"%s\" region: %s", node.getNodeType(), name, region ) );
                 
                 // if the token has a $ in it, something's wrong. Ignore this token
-                if (name.lastIndexOf('$') >= 0) {
+                if (name.lastIndexOf('$') >= 0 && m_ignoreBadTokens) {
                         // DEBUG
                         System.err.println(String.format("WARNING: %s \"%s\" is probably a bad token. It was ignored", node.getNodeType(), name));
                         return null;
diff --git a/src/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java b/src/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java
index a9a055b..eb120b6 100644
--- a/src/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java
+++ b/src/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java
@@ -111,10 +111,12 @@ public class SourceIndexBehaviorVisitor extends SourceIndexVisitor {
         @Override
         public Void visitParameterDeclaration(ParameterDeclaration node, SourceIndex index) {
                 ParameterDefinition def = node.getUserData(Keys.PARAMETER_DEFINITION);
-                MethodDefinition methodDef = (MethodDefinition)def.getMethod();
-                BehaviorEntry behaviorEntry = EntryFactory.getBehaviorEntry(methodDef);
-                ArgumentEntry argumentEntry = new ArgumentEntry(behaviorEntry, def.getPosition(), node.getName());
-                index.addDeclaration(node.getNameToken(), argumentEntry);
+                if (def.getMethod() instanceof MethodDefinition) {
+                        MethodDefinition methodDef = (MethodDefinition)def.getMethod();
+                        BehaviorEntry behaviorEntry = EntryFactory.getBehaviorEntry(methodDef);
+                        ArgumentEntry argumentEntry = new ArgumentEntry(behaviorEntry, def.getPosition(), node.getName());
+                        index.addDeclaration(node.getNameToken(), argumentEntry);
+                }
                 
                 return recurse(node, index);
         }