Add the index to the param renamer, needed for sane param name genera…

…tion..
ModCoderPack · Nov 8, 2015 · ba604f3 · ba604f3
1 parent da7239d
commit ba604f3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -731,7 +731,7 @@ else if (CodeConstants.CLINIT_NAME.equals(name)) {
             buffer.append(' ');
             String parameterName = methodWrapper.varproc.getVarName(new VarVersionPair(index, 0));
             if ((flags & (CodeConstants.ACC_ABSTRACT | CodeConstants.ACC_NATIVE)) != 0) {
-                parameterName = methodWrapper.methodStruct.renamer.renameAbstractParameter(parameterName);
+                parameterName = methodWrapper.methodStruct.renamer.renameAbstractParameter(parameterName, index);
             }
             buffer.append(parameterName == null ? "param" + index : parameterName); // null iff decompiled with errors
 

diff --git a/src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java b/src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java
@@ -14,7 +14,7 @@ public IVariableNameProvider createFactory(StructMethod method) {
   }
 
   @Override
-  public String renameAbstractParameter(String abstractParam) {
+  public String renameAbstractParameter(String abstractParam, int index) {
     return abstractParam;
   }
 

diff --git a/src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java b/src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java
@@ -6,6 +6,6 @@
 
 public interface IVariableNameProvider {
   public Map<VarVersionPair,String> rename(Map<VarVersionPair,String> variables);
-  public String renameAbstractParameter(String abstractParam);
+  public String renameAbstractParameter(String abstractParam, int index);
   public void addParentContext(IVariableNameProvider renamer);
 }
diff --git a/src/org/jetbrains/java/decompiler/util/JADNameProvider.java b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
@@ -179,7 +179,7 @@ else if (remap.containsKey(type))
     }
 
     @Override
-    public String renameAbstractParameter(String abstractParam) {
+    public String renameAbstractParameter(String abstractParam, int index) {
       return abstractParam;
     }