Fix syntax errors in decompiled sources

Author: emmanue1

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

@@ -333,7 +333,9 @@ protected AbstractLocalVariable searchLocalVariable(int index, int offset) {
     }
 
     public boolean isCompatible(AbstractLocalVariable lv, Type valueType) {
-        if (valueType.isObject() && (lv.getType().getDimension() == valueType.getDimension())) {
+        if (valueType == ObjectType.TYPE_UNDEFINED_OBJECT) {
+            return true;
+        } else if (valueType.isObject() && (lv.getType().getDimension() == valueType.getDimension())) {
             ObjectType valueObjectType = (ObjectType) valueType;
 
             if (lv.getType().isObject()) {
@@ -389,33 +391,6 @@ public AbstractLocalVariable getLocalVariableInAssignment(Map<String, BaseType>
         return lv;
     }
 
-    public AbstractLocalVariable getLocalVariableInCastAssignment(Map<String, BaseType> typeBounds, int index, int offset, Type castType, Type valueType) {
-        AbstractLocalVariable lv = searchLocalVariable(index, offset);
-
-        if (lv == null) {
-            // Create a new local variable
-            createLocalVariableVisitor.init(index, offset);
-            valueType.accept(createLocalVariableVisitor);
-            lv = createLocalVariableVisitor.getLocalVariable();
-        } else if (lv.isAssignableFrom(typeBounds, castType) || isCompatible(lv, castType)) {
-            // Assignable, reduce type
-            lv.typeOnRight(typeBounds, castType);
-        } else if (lv.isAssignableFrom(typeBounds, valueType) || isCompatible(lv, valueType)) {
-            // Assignable, reduce type
-            lv.typeOnRight(typeBounds, valueType);
-        } else if (!lv.getType().isGeneric() || (ObjectType.TYPE_OBJECT != valueType)) {
-            // Not assignable -> Create a new local variable
-            createLocalVariableVisitor.init(index, offset);
-            valueType.accept(createLocalVariableVisitor);
-            lv = createLocalVariableVisitor.getLocalVariable();
-        }
-
-        lv.setToOffset(offset);
-        store(lv);
-
-        return lv;
-    }
-
     public AbstractLocalVariable getLocalVariableInNullAssignment(int index, int offset, Type valueType) {
         AbstractLocalVariable lv = searchLocalVariable(index, offset);
 

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

@@ -38,7 +38,7 @@
 
 import java.util.*;
 
-import static org.jd.core.v1.model.javasyntax.type.ObjectType.TYPE_OBJECT;
+import static org.jd.core.v1.model.javasyntax.type.ObjectType.TYPE_UNDEFINED_OBJECT;
 import static org.jd.core.v1.model.javasyntax.type.PrimitiveType.*;
 import static org.jd.core.v1.service.converter.classfiletojavasyntax.model.cfg.BasicBlock.*;
 
@@ -907,10 +907,10 @@ protected TernaryOperatorExpression newTernaryOperatorExpression(int lineNumber,
             } else if (typeMaker.isAssignable(typeBounds, ot2, ot1)) {
                 type = getTernaryOperatorExpressionType(ot2, ot1);
             } else {
-                type = TYPE_OBJECT;
+                type = TYPE_UNDEFINED_OBJECT;
             }
         } else {
-            type = TYPE_OBJECT;
+            type = TYPE_UNDEFINED_OBJECT;
         }
 
         return new TernaryOperatorExpression(lineNumber, type, condition, expressionTrue, expressionFalse);