ra/fernflower
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed lambda parameter names already used in the context

Browse Source
This commit is contained in:
Egor.Ushakov
2017-04-26 19:58:55 +03:00
parent d40f673689
commit 6a7763922b
7 changed files with 96 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/jetbrains/java/decompiler/main/collectors/VarNamesCollector.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
*/
package org.jetbrains.java.decompiler.main.collectors;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
@@ -24,7 +25,7 @@ public class VarNamesCollector {
public VarNamesCollector() { }
public VarNamesCollector(Set<String> setNames) {
public VarNamesCollector(Collection<String> setNames) {
usedNames.addAll(setNames);
}

18
src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
View File

@@ -142,19 +142,25 @@ public class NestedClassProcessor {
if (expr.type == Exprent.EXPRENT_NEW) {
NewExprent new_expr = (NewExprent)expr;
VarNamesCollector enclosingCollector = new VarNamesCollector(enclosingMethod.varproc.getVarNames());
if (new_expr.isLambda() && lambda_class_type.equals(new_expr.getNewType())) {
InvocationExprent inv_dynamic = new_expr.getConstructor();
int param_index = is_static_lambda_content ? 0 : 1;
int varIndex = is_static_lambda_content ? 0 : 1;
for (int i = 0; i < vars_count; ++i) {
Exprent param = inv_dynamic.getLstParameters().get(param_index + i);
for (int i = 0; i < md_content.params.length; ++i) {
VarVersionPair varVersion = new VarVersionPair(varIndex, 0);
if (i < vars_count) {
Exprent param = inv_dynamic.getLstParameters().get(param_index + i);
if (param.type == Exprent.EXPRENT_VAR) {
VarVersionPair pair = new VarVersionPair((VarExprent)param);
String name = enclosingMethod.varproc.getVarName(pair);
mapNewNames.put(new VarVersionPair(varIndex, 0), name);
if (param.type == Exprent.EXPRENT_VAR) {
mapNewNames.put(varVersion, enclosingMethod.varproc.getVarName(new VarVersionPair((VarExprent)param)));
}
}
else {
mapNewNames.put(varVersion, enclosingCollector.getFreeName(method.varproc.getVarName(varVersion)));
}
varIndex += md_content.params[i].stackSize;

4
src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
View File

@@ -115,6 +115,10 @@ public class VarProcessor {
mapVarNames.put(pair, name);
}
public Collection<String> getVarNames() {
return mapVarNames != null ? mapVarNames.values() : Collections.emptySet();
}
public int getVarFinal(VarVersionPair pair) {
return varVersions == null ? VarTypeProcessor.VAR_FINAL : varVersions.getVarFinal(pair);
}