From 26fa3b593984ae654b1db6c83429e809b2f78bff Mon Sep 17 00:00:00 2001 From: zeedh Date: Wed, 29 Jan 2020 18:38:41 +0900 Subject: [PATCH 1/2] bug fixes generating wrong constructor name with synthetic class --- .../strobel/decompiler/languages/java/JavaOutputVisitor.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Procyon.CompilerTools/src/main/java/com/strobel/decompiler/languages/java/JavaOutputVisitor.java b/Procyon.CompilerTools/src/main/java/com/strobel/decompiler/languages/java/JavaOutputVisitor.java index e02485ab..63bb817e 100644 --- a/Procyon.CompilerTools/src/main/java/com/strobel/decompiler/languages/java/JavaOutputVisitor.java +++ b/Procyon.CompilerTools/src/main/java/com/strobel/decompiler/languages/java/JavaOutputVisitor.java @@ -33,6 +33,7 @@ import com.strobel.decompiler.ITextOutput; import com.strobel.decompiler.languages.LineNumberPosition; import com.strobel.decompiler.languages.TextLocation; +import com.strobel.decompiler.languages.EntityType; import com.strobel.decompiler.languages.java.TextOutputFormatter.LineNumberMode; import com.strobel.decompiler.languages.java.ast.*; import com.strobel.decompiler.languages.java.utilities.TypeUtilities; @@ -1675,6 +1676,9 @@ public Void visitTypeDeclaration(final TypeDeclaration node, final Void ignored) EntityDeclaration lastMember = null; for (final EntityDeclaration member : members) { + if (isTrulyAnonymous && member.getEntityType() == EntityType.CONSTRUCTOR) { + continue; + } if (first) { first = false; } From 2cfec62bda55861df31531d55a5e0065789c1c5f Mon Sep 17 00:00:00 2001 From: zeedh Date: Wed, 29 Jan 2020 18:39:12 +0900 Subject: [PATCH 2/2] bug fixes wrong return value. --- .../strobel/decompiler/languages/java/ast/CompilationUnit.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procyon.CompilerTools/src/main/java/com/strobel/decompiler/languages/java/ast/CompilationUnit.java b/Procyon.CompilerTools/src/main/java/com/strobel/decompiler/languages/java/ast/CompilationUnit.java index b05a11f7..61ff97c5 100644 --- a/Procyon.CompilerTools/src/main/java/com/strobel/decompiler/languages/java/ast/CompilationUnit.java +++ b/Procyon.CompilerTools/src/main/java/com/strobel/decompiler/languages/java/ast/CompilationUnit.java @@ -123,7 +123,7 @@ private TypeDeclaration selectNext() { } } - return null; + return next; } @Override