Fix bad operand types for binary operator '|'

Author: emmanue1

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

@@ -1825,16 +1825,22 @@ private Expression newIntegerOrBooleanBinaryOperatorExpression(int lineNumber, E
                     leftVariable.typeOnRight(typeBounds, type = TYPE_BOOLEAN);
                 }
             }
-        } else {
-            if (rightExpression.isLocalVariableReferenceExpression()) {
-                if (leftExpression.getType() == TYPE_BOOLEAN) {
-                    AbstractLocalVariable rightVariable = ((ClassFileLocalVariableReferenceExpression)rightExpression).getLocalVariable();
+        } else if (rightExpression.isLocalVariableReferenceExpression()) {
+            if (leftExpression.getType() == TYPE_BOOLEAN) {
+                AbstractLocalVariable rightVariable = ((ClassFileLocalVariableReferenceExpression)rightExpression).getLocalVariable();
+                rightVariable.typeOnRight(typeBounds, type = TYPE_BOOLEAN);
+            }
+        }
 
-                    rightVariable.typeOnRight(typeBounds, type = TYPE_BOOLEAN);
-                }
+        if (type == TYPE_INT) {
+            if ((leftExpression.getType() == TYPE_BOOLEAN) || (rightExpression.getType() == TYPE_BOOLEAN)) {
+                type = TYPE_BOOLEAN;
             }
         }
 
+        bindParameterTypesWithArgumentTypes(leftExpression.getType(), rightExpression);
+        bindParameterTypesWithArgumentTypes(rightExpression.getType(), leftExpression);
+
         return new BinaryOperatorExpression(lineNumber, type, leftExpression, operator, rightExpression, priority);
     }
 
@@ -1858,12 +1864,10 @@ private Expression newIntegerOrBooleanComparisonOperatorExpression(int lineNumbe
                     leftVariable.typeOnRight(typeBounds, TYPE_BOOLEAN);
                 }
             }
-        } else {
-            if (rightExpression.isLocalVariableReferenceExpression()) {
-                if (leftExpression.getType() == TYPE_BOOLEAN) {
-                    AbstractLocalVariable rightVariable = ((ClassFileLocalVariableReferenceExpression)rightExpression).getLocalVariable();
-                    rightVariable.typeOnRight(typeBounds, TYPE_BOOLEAN);
-                }
+        } else if (rightExpression.isLocalVariableReferenceExpression()) {
+            if (leftExpression.getType() == TYPE_BOOLEAN) {
+                AbstractLocalVariable rightVariable = ((ClassFileLocalVariableReferenceExpression)rightExpression).getLocalVariable();
+                rightVariable.typeOnRight(typeBounds, TYPE_BOOLEAN);
             }
         }
 
@@ -1888,6 +1892,9 @@ private Expression newIntegerComparisonOperatorExpression(int lineNumber, Expres
             rightVariable.typeOnLeft(typeBounds, MAYBE_BYTE_TYPE);
         }
 
+        bindParameterTypesWithArgumentTypes(leftExpression.getType(), rightExpression);
+        bindParameterTypesWithArgumentTypes(rightExpression.getType(), leftExpression);
+
         return new BinaryOperatorExpression(lineNumber, TYPE_BOOLEAN, leftExpression, operator, rightExpression, priority);
     }