Fix syntax errors in decompiled sources

Author: emmanue1

src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/localvariable/Frame.java

@@ -15,6 +15,7 @@
 import org.jd.core.v1.model.javasyntax.statement.Statements;
 import org.jd.core.v1.model.javasyntax.type.*;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.expression.ClassFileLocalVariableReferenceExpression;
+import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.expression.ClassFileSuperConstructorInvocationExpression;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.statement.ClassFileForStatement;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.util.LocalVariableMaker;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.visitor.SearchUndeclaredLocalVariableVisitor;
@@ -170,13 +171,6 @@ public void addChild(Frame child) {
         children.add(child);
     }
 
-    public void addNewExpression(NewExpression ne, AbstractLocalVariable lv) {
-        if (newExpressions == null) {
-            newExpressions = new HashMap<>();
-        }
-        newExpressions.put(ne, lv);
-    }
-
     public void close() {
         // Update lastType for 'new' expression
         if (newExpressions != null) {
@@ -340,17 +334,6 @@ protected boolean createInlineDeclarations() {
                         break;
                     }
                 }
-
-                if (!undeclaredLocalVariables.isEmpty()) {
-                    DefaultList<AbstractLocalVariable> sorted = new DefaultList<>(undeclaredLocalVariables);
-                    sorted.sort(ABSTRACT_LOCAL_VARIABLE_COMPARATOR);
-
-                    for (AbstractLocalVariable lv : sorted) {
-                        // Create start-block declarations
-                        statements.add(0, new LocalVariableDeclarationStatement(lv.getType(), new LocalVariableDeclarator(lv.getName())));
-                        lv.setDeclared(true);
-                    }
-                }
             }
         }
 
@@ -610,14 +593,18 @@ protected LocalVariableDeclarators createDeclarators1(DefaultList<BinaryOperator
 
     @SuppressWarnings("unchecked")
     protected void createStartBlockDeclarations() {
+        int addIndex = -1;
         int i = localVariableArray.length;
 
         while (i-- > 0) {
             AbstractLocalVariable lv = localVariableArray[i];
 
             while (lv != null) {
-                if ((this != lv.getFrame()) && !lv.isDeclared()) {
-                    statements.add(0, new LocalVariableDeclarationStatement(lv.getType(), new LocalVariableDeclarator(lv.getName())));
+                if (!lv.isDeclared()) {
+                    if (addIndex == -1) {
+                        addIndex = getAddIndex();
+                    }
+                    statements.add(addIndex, new LocalVariableDeclarationStatement(lv.getType(), new LocalVariableDeclarator(lv.getName())));
                     lv.setDeclared(true);
                 }
 
@@ -626,6 +613,31 @@ protected void createStartBlockDeclarations() {
         }
     }
 
+    protected int getAddIndex() {
+        int addIndex = 0;
+
+        if (parent.parent == null) {
+            // Insert declarations after 'super' call invocation => Search index of SuperConstructorInvocationExpression.
+            int len = statements.size();
+
+            while (addIndex < len) {
+                Statement statement = statements.get(addIndex++);
+                if (statement.getClass() == ExpressionStatement.class) {
+                    Expression expression = ((ExpressionStatement)statement).getExpression();
+                    if (expression.getClass() == ClassFileSuperConstructorInvocationExpression.class) {
+                        break;
+                    }
+                }
+            }
+
+            if (addIndex >= len) {
+                addIndex = 0;
+            }
+        }
+
+        return addIndex;
+    }
+
     @SuppressWarnings("unchecked")
     protected void mergeDeclarations() {
         int size = statements.size();