Fix syntax errors in decompiled sources

Author: emmanue1

src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/ByteCodeParser.java

@@ -7,7 +7,6 @@
 
 package org.jd.core.v1.service.converter.classfiletojavasyntax.util;
 
-import org.jd.core.v1.api.printer.Printer;
 import org.jd.core.v1.model.classfile.ClassFile;
 import org.jd.core.v1.model.classfile.ConstantPool;
 import org.jd.core.v1.model.classfile.Method;
@@ -90,7 +89,7 @@ public void parse(BasicBlock basicBlock, Statements statements, DefaultStack<Exp
 
         for (int offset=fromOffset; offset<toOffset; offset++) {
             int opcode = code[offset] & 255;
-            int lineNumber = syntheticFlag ? Printer.UNKNOWN_LINE_NUMBER : cfg.getLineNumber(offset);
+            int lineNumber = syntheticFlag ? Expression.UNKNOWN_LINE_NUMBER : cfg.getLineNumber(offset);
 
             switch (opcode) {
                 case 0: // NOP

src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/ControlFlowGraphLoopReducer.java

@@ -274,46 +274,24 @@ protected static Loop makeLoop(List<BasicBlock> list, BasicBlock start, BitSet s
 
         if (end == END) {
             // Not found, check all member blocks
-            for (BasicBlock member : members) {
-                switch (member.getType()) {
-                    case TYPE_CONDITIONAL_BRANCH:
-                        BasicBlock bb = member.getBranch();
-                        if (!memberIndexes.get(bb.getIndex()) && (maxOffset < bb.getFromOffset())) {
-                            end = bb;
-                            maxOffset = bb.getFromOffset();
-                            break;
-                        }
-                    case TYPE_STATEMENTS:
-                    case TYPE_GOTO:
-                        bb = member.getNext();
-                        if (!memberIndexes.get(bb.getIndex()) && (maxOffset < bb.getFromOffset())) {
-                            end = bb;
-                            maxOffset = bb.getFromOffset();
-                        }
-                        break;
-                    case TYPE_SWITCH_DECLARATION:
-                        for (SwitchCase switchCase : member.getSwitchCases()) {
-                            bb = switchCase.getBasicBlock();
-                            if (!memberIndexes.get(bb.getIndex()) && (maxOffset < bb.getFromOffset())) {
-                                end = bb;
-                                maxOffset = bb.getFromOffset();
-                            }
-                        }
-                        break;
-                    case TYPE_TRY_DECLARATION:
-                        bb = member.getNext();
-                        if (!memberIndexes.get(bb.getIndex()) && (maxOffset < bb.getFromOffset())) {
-                            end = bb;
-                            maxOffset = bb.getFromOffset();
-                        }
-                        for (ExceptionHandler exceptionHandler : member.getExceptionHandlers()) {
-                            bb = exceptionHandler.getBasicBlock();
-                            if (!memberIndexes.get(bb.getIndex()) && (maxOffset < bb.getFromOffset())) {
-                                end = bb;
-                                maxOffset = bb.getFromOffset();
-                            }
+            end = searchEndBasicBlock(memberIndexes, maxOffset, members);
+
+            if (!end.matchType(TYPE_END|TYPE_RETURN|TYPE_LOOP_START|TYPE_LOOP_CONTINUE|TYPE_LOOP_END) &&
+                (end.getPredecessors().size() == 1) &&
+                (end.getPredecessors().iterator().next().getLastLineNumber() + 1 >= end.getFirstLineNumber()))
+            {
+                HashSet<BasicBlock> set = new HashSet<>();
+
+                if (recursiveForwardSearchLastLoopMemberIndexes(members, searchZoneIndexes, set, end, null)) {
+                    members.addAll(set);
+
+                    for (BasicBlock member : set) {
+                        if (member.getIndex() >= 0) {
+                            memberIndexes.set(member.getIndex());
                         }
-                        break;
+                    }
+
+                    end = searchEndBasicBlock(memberIndexes, maxOffset, set);
                 }
             }
         }
@@ -340,6 +318,55 @@ protected static Loop makeLoop(List<BasicBlock> list, BasicBlock start, BitSet s
         return new Loop(start, members, end);
     }
 
+    private static BasicBlock searchEndBasicBlock(BitSet memberIndexes, int maxOffset, Set<BasicBlock> members) {
+        BasicBlock end = END;
+
+        for (BasicBlock member : members) {
+            switch (member.getType()) {
+                case TYPE_CONDITIONAL_BRANCH:
+                    BasicBlock bb = member.getBranch();
+                    if (!memberIndexes.get(bb.getIndex()) && (maxOffset < bb.getFromOffset())) {
+                        end = bb;
+                        maxOffset = bb.getFromOffset();
+                        break;
+                    }
+                case TYPE_STATEMENTS:
+                case TYPE_GOTO:
+                    bb = member.getNext();
+                    if (!memberIndexes.get(bb.getIndex()) && (maxOffset < bb.getFromOffset())) {
+                        end = bb;
+                        maxOffset = bb.getFromOffset();
+                    }
+                    break;
+                case TYPE_SWITCH_DECLARATION:
+                    for (SwitchCase switchCase : member.getSwitchCases()) {
+                        bb = switchCase.getBasicBlock();
+                        if (!memberIndexes.get(bb.getIndex()) && (maxOffset < bb.getFromOffset())) {
+                            end = bb;
+                            maxOffset = bb.getFromOffset();
+                        }
+                    }
+                    break;
+                case TYPE_TRY_DECLARATION:
+                    bb = member.getNext();
+                    if (!memberIndexes.get(bb.getIndex()) && (maxOffset < bb.getFromOffset())) {
+                        end = bb;
+                        maxOffset = bb.getFromOffset();
+                    }
+                    for (ExceptionHandler exceptionHandler : member.getExceptionHandlers()) {
+                        bb = exceptionHandler.getBasicBlock();
+                        if (!memberIndexes.get(bb.getIndex()) && (maxOffset < bb.getFromOffset())) {
+                            end = bb;
+                            maxOffset = bb.getFromOffset();
+                        }
+                    }
+                    break;
+            }
+        }
+
+        return end;
+    }
+
     private static int checkMaxOffset(BasicBlock basicBlock) {
         int maxOffset = basicBlock.getFromOffset();
         int offset;

src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/ControlFlowGraphReducer.java

@@ -1319,7 +1319,7 @@ protected static BasicBlock searchUpdateBlockAndCreateContinueLoop(BitSet visite
                         int stackDepth = ByteCodeParser.evalStackDepth(subBasicBlock);
 
                         while (stackDepth != 0) {
-                            Set<BasicBlock> predecessors = basicBlock.getPredecessors();
+                            Set<BasicBlock> predecessors = subBasicBlock.getPredecessors();
                             if (predecessors.size() != 1) {
                                 break;
                             }