Fix syntax errors in decompiled sources

emmanue1 · emmanue1 · commit 9b3a168487a0 · 2019-12-08T12:06:55.000+01:00
diff --git a/src/main/java/org/jd/core/v1/model/javasyntax/declaration/AnnotationDeclaration.java b/src/main/java/org/jd/core/v1/model/javasyntax/declaration/AnnotationDeclaration.java
@@ -11,22 +11,16 @@
 
 public class AnnotationDeclaration extends TypeDeclaration {
     protected BaseFieldDeclarator annotationDeclarators;
-    protected BodyDeclaration bodyDeclaration;
 
     public AnnotationDeclaration(BaseAnnotationReference annotationReferences, int flags, String internalName, String name, BaseFieldDeclarator annotationDeclarators, BodyDeclaration bodyDeclaration) {
-        super(annotationReferences, flags, internalName, name);
+        super(annotationReferences, flags, internalName, name, bodyDeclaration);
         this.annotationDeclarators = annotationDeclarators;
-        this.bodyDeclaration = bodyDeclaration;
     }
 
     public BaseFieldDeclarator getAnnotationDeclarators() {
         return annotationDeclarators;
     }
 
-    public BodyDeclaration getBodyDeclaration() {
-        return bodyDeclaration;
-    }
-
     @Override
     public void accept(DeclarationVisitor visitor) {
         visitor.visit(this);
diff --git a/src/main/java/org/jd/core/v1/model/javasyntax/declaration/EnumDeclaration.java b/src/main/java/org/jd/core/v1/model/javasyntax/declaration/EnumDeclaration.java
@@ -16,19 +16,16 @@
 public class EnumDeclaration extends TypeDeclaration {
     protected BaseType interfaces;
     protected List<Constant> constants;
-    protected BodyDeclaration bodyDeclaration;
 
     public EnumDeclaration(int flags, String internalName, String name, List<Constant> constants, BodyDeclaration bodyDeclaration) {
-        super(null, flags, internalName, name);
+        super(null, flags, internalName, name, bodyDeclaration);
         this.constants = constants;
-        this.bodyDeclaration = bodyDeclaration;
     }
 
     public EnumDeclaration(BaseAnnotationReference annotationReferences, int flags, String internalName, String name, BaseType interfaces, List<Constant> constants, BodyDeclaration bodyDeclaration) {
-        super(annotationReferences, flags, internalName, name);
+        super(annotationReferences, flags, internalName, name, bodyDeclaration);
         this.interfaces = interfaces;
         this.constants = constants;
-        this.bodyDeclaration = bodyDeclaration;
     }
 
     public BaseType getInterfaces() {
@@ -39,10 +36,6 @@ public List<Constant> getConstants() {
         return constants;
     }
 
-    public BodyDeclaration getBodyDeclaration() {
-        return bodyDeclaration;
-    }
-
     @Override
     public void accept(DeclarationVisitor visitor) {
         visitor.visit(this);
diff --git a/src/main/java/org/jd/core/v1/model/javasyntax/declaration/InterfaceDeclaration.java b/src/main/java/org/jd/core/v1/model/javasyntax/declaration/InterfaceDeclaration.java
@@ -14,18 +14,16 @@
 public class InterfaceDeclaration extends TypeDeclaration {
     protected BaseTypeParameter typeParameters;
     protected BaseType interfaces;
-    protected BodyDeclaration bodyDeclaration;
 
     public InterfaceDeclaration(int flags, String internalName, String name, BaseType interfaces) {
-        super(null, flags, internalName, name);
+        super(null, flags, internalName, name, null);
         this.interfaces = interfaces;
     }
 
     public InterfaceDeclaration(BaseAnnotationReference annotationReferences, int flags, String internalName, String name, BaseTypeParameter typeParameters, BaseType interfaces, BodyDeclaration bodyDeclaration) {
-        super(annotationReferences, flags, internalName, name);
+        super(annotationReferences, flags, internalName, name, bodyDeclaration);
         this.typeParameters = typeParameters;
         this.interfaces = interfaces;
-        this.bodyDeclaration = bodyDeclaration;
     }
 
     public BaseTypeParameter getTypeParameters() {
@@ -36,10 +34,6 @@ public BaseType getInterfaces() {
         return interfaces;
     }
 
-    public BodyDeclaration getBodyDeclaration() {
-        return bodyDeclaration;
-    }
-
     @Override
     public void accept(DeclarationVisitor visitor) {
         visitor.visit(this);
diff --git a/src/main/java/org/jd/core/v1/model/javasyntax/declaration/ModuleDeclaration.java b/src/main/java/org/jd/core/v1/model/javasyntax/declaration/ModuleDeclaration.java
@@ -18,7 +18,7 @@ public class ModuleDeclaration extends TypeDeclaration {
     protected List<ServiceInfo> provides;
 
     public ModuleDeclaration(int flags, String internalName, String name, String version, List<ModuleInfo> requires, List<PackageInfo> exports, List<PackageInfo> opens, List<String> uses, List<ServiceInfo> provides) {
-        super(null, flags, internalName, name);
+        super(null, flags, internalName, name, null);
         this.version = version;
         this.requires = requires;
         this.exports = exports;
diff --git a/src/main/java/org/jd/core/v1/model/javasyntax/declaration/TypeDeclaration.java b/src/main/java/org/jd/core/v1/model/javasyntax/declaration/TypeDeclaration.java
@@ -14,12 +14,14 @@ public abstract class TypeDeclaration implements BaseTypeDeclaration, MemberDecl
     protected int flags;
     protected String internalTypeName;
     protected String name;
+    protected BodyDeclaration bodyDeclaration;
 
-    protected TypeDeclaration(BaseAnnotationReference annotationReferences, int flags, String internalTypeName, String name) {
+    protected TypeDeclaration(BaseAnnotationReference annotationReferences, int flags, String internalTypeName, String name, BodyDeclaration bodyDeclaration) {
         this.annotationReferences = annotationReferences;
         this.flags = flags;
         this.internalTypeName = internalTypeName;
         this.name = name;
+        this.bodyDeclaration = bodyDeclaration;
     }
 
     public BaseAnnotationReference getAnnotationReferences() {
@@ -37,4 +39,8 @@ public String getInternalTypeName() {
     public String getName() {
         return name;
     }
+
+    public BodyDeclaration getBodyDeclaration() {
+        return bodyDeclaration;
+    }
 }
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileAnnotationDeclaration.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileAnnotationDeclaration.java
@@ -10,7 +10,7 @@
 import org.jd.core.v1.model.javasyntax.declaration.AnnotationDeclaration;
 import org.jd.core.v1.model.javasyntax.reference.BaseAnnotationReference;
 
-public class ClassFileAnnotationDeclaration extends AnnotationDeclaration implements ClassFileMemberDeclaration {
+public class ClassFileAnnotationDeclaration extends AnnotationDeclaration implements ClassFileTypeDeclaration {
     protected int firstLineNumber;
 
     public ClassFileAnnotationDeclaration(BaseAnnotationReference annotationReferences, int flags, String internalName, String name, ClassFileBodyDeclaration bodyDeclaration) {
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileBodyDeclaration.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileBodyDeclaration.java
@@ -9,8 +9,6 @@
 
 import org.jd.core.v1.model.javasyntax.declaration.BaseMemberDeclaration;
 import org.jd.core.v1.model.javasyntax.declaration.BodyDeclaration;
-import org.jd.core.v1.model.javasyntax.declaration.TypeDeclaration;
-import org.jd.core.v1.model.javasyntax.expression.FieldReferenceExpression;
 import org.jd.core.v1.model.javasyntax.type.BaseType;
 import org.jd.core.v1.model.javasyntax.type.ObjectType;
 import org.jd.core.v1.model.javasyntax.type.TypeArgument;
@@ -24,8 +22,8 @@
 public class ClassFileBodyDeclaration extends BodyDeclaration implements ClassFileMemberDeclaration {
     protected List<ClassFileFieldDeclaration> fieldDeclarations;
     protected List<ClassFileConstructorOrMethodDeclaration> methodDeclarations;
-    protected List<ClassFileMemberDeclaration> innerTypeDeclarations;
-    protected Map<String, ClassFileMemberDeclaration> innerTypeMap = Collections.emptyMap();
+    protected List<ClassFileTypeDeclaration> innerTypeDeclarations;
+    protected Map<String, ClassFileTypeDeclaration> innerTypeMap = Collections.emptyMap();
     protected int firstLineNumber;
     protected ObjectType outerType;
     protected DefaultList<String> syntheticInnerFieldNames;
@@ -64,25 +62,24 @@ public void setMethodDeclarations(List<ClassFileConstructorOrMethodDeclaration>
         }
     }
 
-    public List<ClassFileMemberDeclaration> getInnerTypeDeclarations() {
+    public List<ClassFileTypeDeclaration> getInnerTypeDeclarations() {
         return innerTypeDeclarations;
     }
 
-    public void setInnerTypeDeclarations(List<ClassFileMemberDeclaration> innerTypeDeclarations) {
+    public void setInnerTypeDeclarations(List<ClassFileTypeDeclaration> innerTypeDeclarations) {
         if (innerTypeDeclarations != null) {
             updateFirstLineNumber(this.innerTypeDeclarations = innerTypeDeclarations);
 
             innerTypeMap = new HashMap<>();
 
-            for (ClassFileMemberDeclaration innerType : innerTypeDeclarations) {
-                TypeDeclaration td = (TypeDeclaration) innerType;
-                innerTypeMap.put(td.getInternalTypeName(), innerType);
+            for (ClassFileTypeDeclaration innerType : innerTypeDeclarations) {
+                innerTypeMap.put(innerType.getInternalTypeName(), innerType);
             }
         }
     }
 
-    public ClassFileMemberDeclaration getInnerTypeDeclaration(String internalName) {
-        ClassFileMemberDeclaration declaration = innerTypeMap.get(internalName);
+    public ClassFileTypeDeclaration getInnerTypeDeclaration(String internalName) {
+        ClassFileTypeDeclaration declaration = innerTypeMap.get(internalName);
 
         if ((declaration == null) && (outerBodyDeclaration != null)) {
             return outerBodyDeclaration.getInnerTypeDeclaration(internalName);
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileClassDeclaration.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileClassDeclaration.java
@@ -13,7 +13,7 @@
 import org.jd.core.v1.model.javasyntax.type.BaseTypeParameter;
 import org.jd.core.v1.model.javasyntax.type.ObjectType;
 
-public class ClassFileClassDeclaration extends ClassDeclaration implements ClassFileMemberDeclaration {
+public class ClassFileClassDeclaration extends ClassDeclaration implements ClassFileTypeDeclaration {
     protected int firstLineNumber;
 
     public ClassFileClassDeclaration(BaseAnnotationReference annotationReferences, int flags, String internalName, String name, BaseTypeParameter typeParameters, ObjectType superType, BaseType interfaces, ClassFileBodyDeclaration bodyDeclaration) {
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileEnumDeclaration.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileEnumDeclaration.java
@@ -15,7 +15,7 @@
 
 import java.util.List;
 
-public class ClassFileEnumDeclaration extends EnumDeclaration implements ClassFileMemberDeclaration {
+public class ClassFileEnumDeclaration extends EnumDeclaration implements ClassFileTypeDeclaration {
     protected int firstLineNumber;
 
     public ClassFileEnumDeclaration(BaseAnnotationReference annotationReferences, int flags, String internalName, String name, BaseType interfaces, ClassFileBodyDeclaration bodyDeclaration) {
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileInterfaceDeclaration.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileInterfaceDeclaration.java
@@ -12,7 +12,7 @@
 import org.jd.core.v1.model.javasyntax.type.BaseType;
 import org.jd.core.v1.model.javasyntax.type.BaseTypeParameter;
 
-public class ClassFileInterfaceDeclaration extends InterfaceDeclaration implements ClassFileMemberDeclaration {
+public class ClassFileInterfaceDeclaration extends InterfaceDeclaration implements ClassFileTypeDeclaration {
     protected int firstLineNumber;
 
     public ClassFileInterfaceDeclaration(BaseAnnotationReference annotationReferences, int flags, String internalName, String name, BaseTypeParameter typeParameters, BaseType interfaces, ClassFileBodyDeclaration bodyDeclaration) {
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileTypeDeclaration.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileTypeDeclaration.java
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2008, 2019 Emmanuel Dupuy.
+ * This project is distributed under the GPLv3 license.
+ * This is a Copyleft license that gives the user the right to use,
+ * copy and modify the code freely for non-commercial purposes.
+ */
+
+package org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.declaration;
+
+import org.jd.core.v1.model.javasyntax.declaration.BodyDeclaration;
+
+public interface ClassFileTypeDeclaration extends ClassFileMemberDeclaration {
+    String getInternalTypeName();
+    int getFirstLineNumber();
+    BodyDeclaration getBodyDeclaration();
+}
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/processor/ConvertClassFileProcessor.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/processor/ConvertClassFileProcessor.java
@@ -228,17 +228,17 @@ protected List<ClassFileConstructorOrMethodDeclaration> convertMethods(TypeMaker
         }
     }
 
-    protected List<ClassFileMemberDeclaration> convertInnerTypes(TypeMaker parser, AnnotationConverter converter, ClassFile classFile, ClassFileBodyDeclaration outerClassFileBodyDeclaration) {
+    protected List<ClassFileTypeDeclaration> convertInnerTypes(TypeMaker parser, AnnotationConverter converter, ClassFile classFile, ClassFileBodyDeclaration outerClassFileBodyDeclaration) {
         List<ClassFile> innerClassFiles = classFile.getInnerClassFiles();
 
         if (innerClassFiles == null) {
             return null;
         } else {
-            DefaultList<ClassFileMemberDeclaration> list = new DefaultList<>(innerClassFiles.size());
+            DefaultList<ClassFileTypeDeclaration> list = new DefaultList<>(innerClassFiles.size());
 
             for (ClassFile innerClassFile : innerClassFiles) {
                 int flags = innerClassFile.getAccessFlags();
-                ClassFileMemberDeclaration innerTypeDeclaration;
+                ClassFileTypeDeclaration innerTypeDeclaration;
 
                 if ((flags & Constants.ACC_ENUM) != 0) {
                     innerTypeDeclaration = convertEnumDeclaration(parser, converter, innerClassFile, outerClassFileBodyDeclaration);
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/ByteCodeParser.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/ByteCodeParser.java
@@ -1745,12 +1745,12 @@ private Expression newNewExpression(int lineNumber, String internalTypeName) {
         ObjectType objectType = typeMaker.makeFromInternalTypeName(internalTypeName);
 
         if ((objectType.getQualifiedName() == null) && (objectType.getName() == null)) {
-            ClassFileMemberDeclaration memberDeclaration = bodyDeclaration.getInnerTypeDeclaration(internalTypeName);
+            ClassFileTypeDeclaration typeDeclaration = bodyDeclaration.getInnerTypeDeclaration(internalTypeName);
 
-            if (memberDeclaration == null) {
+            if (typeDeclaration == null) {
                 return new ClassFileNewExpression(lineNumber, ObjectType.TYPE_OBJECT);
-            } else if (memberDeclaration.getClass() == ClassFileClassDeclaration.class) {
-                ClassFileClassDeclaration declaration = (ClassFileClassDeclaration) memberDeclaration;
+            } else if (typeDeclaration.getClass() == ClassFileClassDeclaration.class) {
+                ClassFileClassDeclaration declaration = (ClassFileClassDeclaration) typeDeclaration;
                 BodyDeclaration bodyDeclaration;
 
                 if (this.internalTypeName.equals(internalTypeName)) {
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/SwitchStatementMaker.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/SwitchStatementMaker.java
@@ -11,8 +11,8 @@
 import org.jd.core.v1.model.javasyntax.statement.*;
 import org.jd.core.v1.model.javasyntax.type.ObjectType;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.declaration.ClassFileBodyDeclaration;
-import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.declaration.ClassFileClassDeclaration;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.declaration.ClassFileConstructorOrMethodDeclaration;
+import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.declaration.ClassFileTypeDeclaration;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.expression.ClassFileLocalVariableReferenceExpression;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.expression.ClassFileMethodInvocationExpression;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.statement.ClassFileTryStatement;
@@ -187,11 +187,11 @@ public static void makeSwitchEnum(ClassFileBodyDeclaration bodyDeclaration, Swit
             FieldReferenceExpression fre = (FieldReferenceExpression)ae.getExpression();
 
             if (fre.getDescriptor().equals("[I") && fre.getName().startsWith("$SwitchMap$")) {
-                ClassFileClassDeclaration syntheticClass = (ClassFileClassDeclaration)bodyDeclaration.getInnerTypeDeclaration(fre.getInternalTypeName());
+                ClassFileTypeDeclaration syntheticClassDeclaration = bodyDeclaration.getInnerTypeDeclaration(fre.getInternalTypeName());
 
-                if (syntheticClass != null) {
+                if (syntheticClassDeclaration != null) {
                     // Javac switch-enum pattern
-                    bodyDeclaration = (ClassFileBodyDeclaration) syntheticClass.getBodyDeclaration();
+                    bodyDeclaration = (ClassFileBodyDeclaration) syntheticClassDeclaration.getBodyDeclaration();
                     DefaultList<Statement> statements = bodyDeclaration.getMethodDeclarations().get(0).getStatements().getList();
                     updateSwitchStatement(switchStatement, statements.listIterator(1));
                 }
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/visitor/InitEnumVisitor.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/visitor/InitEnumVisitor.java
@@ -125,9 +125,9 @@ public void visit(NewExpression expression) {
         String enumInternalTypeName = expression.getObjectType().getInternalName();
 
         if (!enumInternalTypeName.equals(bodyDeclaration.getInternalTypeName())) {
-            ClassFileMemberDeclaration md = bodyDeclaration.getInnerTypeDeclaration(enumInternalTypeName);
-            if (md != null) {
-                constantBodyDeclaration = ((ClassFileEnumDeclaration)md).getBodyDeclaration();
+            ClassFileTypeDeclaration typeDeclaration = bodyDeclaration.getInnerTypeDeclaration(enumInternalTypeName);
+            if (typeDeclaration != null) {
+                constantBodyDeclaration = typeDeclaration.getBodyDeclaration();
             }
         }
     }
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/visitor/InitInnerClassVisitor.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/visitor/InitInnerClassVisitor.java
@@ -222,13 +222,11 @@ public void visit(FieldReferenceExpression expression) {
                     expression.setExpression(new ObjectTypeReferenceExpression(exp.getLineNumber(), outerType.createType(null)));
                     expression.setName("this");
                 } else {
-                    ClassFileMemberDeclaration memberDeclaration = bodyDeclaration.getInnerTypeDeclaration(expression.getInternalTypeName());
+                    ClassFileTypeDeclaration typeDeclaration = bodyDeclaration.getInnerTypeDeclaration(expression.getInternalTypeName());
 
-                    if ((memberDeclaration != null) && (memberDeclaration.getClass() == ClassFileClassDeclaration.class)) {
-                        ClassFileClassDeclaration cfcd = (ClassFileClassDeclaration) memberDeclaration;
-
-                        if (cfcd.getInternalTypeName().equals(expression.getInternalTypeName())) {
-                            ClassFileBodyDeclaration cfbd = (ClassFileBodyDeclaration) cfcd.getBodyDeclaration();
+                    if ((typeDeclaration != null) && (typeDeclaration.getClass() == ClassFileClassDeclaration.class)) {
+                        if (typeDeclaration.getInternalTypeName().equals(expression.getInternalTypeName())) {
+                            ClassFileBodyDeclaration cfbd = (ClassFileBodyDeclaration) typeDeclaration.getBodyDeclaration();
                             String outerInternalTypeName = cfbd.getOuterBodyDeclaration().getInternalTypeName();
                             ObjectType objectType = (ObjectType)expression.getType();
 
@@ -380,10 +378,23 @@ public void visit(NewExpression expression) {
                 if (ne.getBodyDeclaration() == null) {
                     ObjectType type = ne.getObjectType();
                     String internalName = type.getInternalName();
-                    ClassFileMemberDeclaration memberDeclaration = bodyDeclaration.getInnerTypeDeclaration(internalName);
+                    ClassFileTypeDeclaration typeDeclaration = bodyDeclaration.getInnerTypeDeclaration(internalName);
+
+                    if (typeDeclaration == null) {
+                        ClassFileBodyDeclaration bd = bodyDeclaration;
 
-                    if ((memberDeclaration != null) && (memberDeclaration.getClass() == ClassFileClassDeclaration.class)) {
-                        ClassFileClassDeclaration cfcd = (ClassFileClassDeclaration) memberDeclaration;
+                        for (;;) {
+                            if (bd.getInternalTypeName().equals(internalName)) {
+                                cfbd = bd;
+                                break;
+                            }
+                            bd = bd.getOuterBodyDeclaration();
+                            if (bd == null) {
+                                break;
+                            }
+                        }
+                    } else if (typeDeclaration.getClass() == ClassFileClassDeclaration.class) {
+                        ClassFileClassDeclaration cfcd = (ClassFileClassDeclaration) typeDeclaration;
                         cfbd = (ClassFileBodyDeclaration) cfcd.getBodyDeclaration();
 
                         if ((type.getQualifiedName() == null) && (type.getName() != null)) {
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/visitor/SortMembersVisitor.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/visitor/SortMembersVisitor.java
