diff options
| author |  Thog | 2017-03-12 13:12:50 +0100 |
|---|---|---|
| committer | Thog | 2017-03-12 13:12:50 +0100 |
| commit | 6de194e83d39c833d76edd7329d51dafac3e8f39 (patch) | |
| tree | dee1dc25e7c1131821f258feecce1c733e61ffb4 /src/main/java/cuchaz/enigma/analysis | |
| parent | Follow Fabric guidelines (diff) | |
| download | enigma-fork-6de194e83d39c833d76edd7329d51dafac3e8f39.tar.gz enigma-fork-6de194e83d39c833d76edd7329d51dafac3e8f39.tar.xz enigma-fork-6de194e83d39c833d76edd7329d51dafac3e8f39.zip | |
Fix var naming and locals var index issues
Diffstat (limited to 'src/main/java/cuchaz/enigma/analysis')
| -rw-r--r-- | src/main/java/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java b/src/main/java/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java index 4febf25..68ca87e 100644 --- a/src/main/java/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java +++ b/src/main/java/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java | |||
| @@ -174,7 +174,7 @@ public class SourceIndexBehaviorVisitor extends SourceIndexVisitor { | |||
| 174 | TypeReference typeReference = type.getUserData(Keys.TYPE_REFERENCE); | 174 | TypeReference typeReference = type.getUserData(Keys.TYPE_REFERENCE); |
| 175 | Identifier identifier = node.getVariableNameToken(); | 175 | Identifier identifier = node.getVariableNameToken(); |
| 176 | String signature = Descriptor.of(typeReference.getErasedDescription()); | 176 | String signature = Descriptor.of(typeReference.getErasedDescription()); |
| 177 | LocalVariableEntry localVariableEntry = new LocalVariableEntry(behaviorEntry, localsPosition++, identifier.getName(), new Type(signature)); | 177 | LocalVariableEntry localVariableEntry = new LocalVariableEntry(behaviorEntry, argumentPosition + localsPosition++, identifier.getName(), new Type(signature)); |
| 178 | identifierEntryCache.put(identifier.getName(), localVariableEntry); | 178 | identifierEntryCache.put(identifier.getName(), localVariableEntry); |
| 179 | addDeclarationToUnmatched(identifier.getName(), index); | 179 | addDeclarationToUnmatched(identifier.getName(), index); |
| 180 | index.addDeclaration(identifier, localVariableEntry); | 180 | index.addDeclaration(identifier, localVariableEntry); |
| @@ -194,7 +194,7 @@ public class SourceIndexBehaviorVisitor extends SourceIndexVisitor { | |||
| 194 | TypeReference typeReference = type.getUserData(Keys.TYPE_REFERENCE); | 194 | TypeReference typeReference = type.getUserData(Keys.TYPE_REFERENCE); |
| 195 | String signature = Descriptor.of(typeReference.getErasedDescription()); | 195 | String signature = Descriptor.of(typeReference.getErasedDescription()); |
| 196 | Identifier identifier = initializer.getNameToken(); | 196 | Identifier identifier = initializer.getNameToken(); |
| 197 | LocalVariableEntry localVariableEntry = new LocalVariableEntry(behaviorEntry, localsPosition++, initializer.getName(), new Type(signature)); | 197 | LocalVariableEntry localVariableEntry = new LocalVariableEntry(behaviorEntry, argumentPosition + localsPosition++, initializer.getName(), new Type(signature)); |
| 198 | identifierEntryCache.put(identifier.getName(), localVariableEntry); | 198 | identifierEntryCache.put(identifier.getName(), localVariableEntry); |
| 199 | addDeclarationToUnmatched(identifier.getName(), index); | 199 | addDeclarationToUnmatched(identifier.getName(), index); |
| 200 | index.addDeclaration(identifier, localVariableEntry); | 200 | index.addDeclaration(identifier, localVariableEntry); |