BlocksMod/FernFlower
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some decompilation fixes regarding lambdas

Browse Source
This commit is contained in:
md_5 2017-05-14 12:00:00 +10:00
parent dd62950521
commit 20ea719b74
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,6 +124,9 @@ public class NestedClassProcessor {
* But they add the field to the END of the fields list. * But they add the field to the END of the fields list.
*/ */
private void gatherEnumSwitchMaps(ClassNode node) { private void gatherEnumSwitchMaps(ClassNode node) {
if (node.wrapper == null) {
return;
}
for (ClassNode child : node.nested) { for (ClassNode child : node.nested) {
gatherEnumSwitchMaps(child); gatherEnumSwitchMaps(child);
} }
@ -231,7 +234,7 @@ public class NestedClassProcessor {
private static void setLambdaVars(ClassNode parent, ClassNode child) { private static void setLambdaVars(ClassNode parent, ClassNode child) {
if (child.lambda_information.is_method_reference) { // method reference, no code and no parameters if (parent.wrapper == null || child.lambda_information.is_method_reference) { // method reference, no code and no parameters
return; return;
} }

1
src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
View File

@ -124,6 +124,7 @@ public class InvocationExprent extends Exprent {
isStatic = true; isStatic = true;
} }
else { else {
if (!lstParameters.isEmpty())
instance = lstParameters instance = lstParameters
.get(0); // FIXME: remove the first parameter completely from the list. It's the object type for a virtual lambda method. .get(0); // FIXME: remove the first parameter completely from the list. It's the object type for a virtual lambda method.
} }