diff options
| author | md_5 <git@md-5.net> | 2017-08-03 23:00:00 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2017-08-03 23:00:00 +1000 |
| commit | cbcd1a61d6908fa5779d0c1b6a0c980a67f41b07 (patch) | |
| tree | a43b701c04d700f48e2dc92deff16ba925dd0701 /src/org/jetbrains/java/decompiler/modules | |
| parent | 20ea719b7479a7ed66979f6f1766575bfc6fecab (diff) | |
| download | fernflower-cbcd1a61d6908fa5779d0c1b6a0c980a67f41b07.tar fernflower-cbcd1a61d6908fa5779d0c1b6a0c980a67f41b07.tar.gz fernflower-cbcd1a61d6908fa5779d0c1b6a0c980a67f41b07.tar.lz fernflower-cbcd1a61d6908fa5779d0c1b6a0c980a67f41b07.tar.xz fernflower-cbcd1a61d6908fa5779d0c1b6a0c980a67f41b07.zip | |
More lambda fixes
Diffstat (limited to 'src/org/jetbrains/java/decompiler/modules')
| -rw-r--r-- | src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java | 35 |
1 files changed, 2 insertions, 33 deletions
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java index d2b717c..68e8cfb 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java @@ -147,6 +147,7 @@ public class InvocationExprent extends Exprent { instance = instance.copy(); } invocationTyp = expr.getInvocationTyp(); + invoke_dynamic_classsuffix = expr.getInvokeDynamicClassSuffix(); stringDescriptor = expr.getStringDescriptor(); descriptor = expr.getDescriptor(); lstParameters = new ArrayList<Exprent>(expr.getLstParameters()); @@ -198,39 +199,7 @@ public class InvocationExprent extends Exprent { tracer.addMapping(bytecode); - if (invocationTyp == INVOKE_DYNAMIC) { - // ClassNode node = (ClassNode)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASSNODE); - // - // if(node != null) { - // ClassNode lambda_node = DecompilerContext.getClassprocessor().getMapRootClasses().get(node.classStruct.qualifiedName + invoke_dynamic_classsuffix); - // if(lambda_node != null) { - // - // String typename = ExprProcessor.getCastTypeName(lambda_node.anonimousClassType); - // - // StringWriter strwriter = new StringWriter(); - // BufferedWriter bufstrwriter = new BufferedWriter(strwriter); - // - // ClassWriter clwriter = new ClassWriter(); - // - // try { - // bufstrwriter.write("new " + typename + "() {"); - // bufstrwriter.newLine(); - // - // - // - // bufstrwriter.flush(); - // } catch(IOException ex) { - // throw new RuntimeException(ex); - // } - // - // buf.append(strwriter.toString()); - // - // } - // } - - } - else if (isStatic) { - + if (isStatic) { ClassNode node = (ClassNode)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_NODE); if (node == null || !classname.equals(node.classStruct.qualifiedName)) { buf.append(DecompilerContext.getImportCollector().getShortName(ExprProcessor.buildJavaClassName(classname))); |