Fix exceptions

Author: emmanue1

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

@@ -982,10 +982,15 @@ protected void replacePreOperatorWithPostOperator(Statements statements) {
                 String operator = poe.getOperator();
 
                 if ("++".equals(operator) || "--".equals(operator)) {
-                    ExpressionStatement cfes = (ExpressionStatement)statement;
-
-                    // Replace pre-operator statement with post-operator statement
-                    cfes.setExpression(new PostOperatorExpression(poe.getLineNumber(), poe.getExpression(), operator));
+                    if (statement.isExpressionStatement()) {
+                        ExpressionStatement es = (ExpressionStatement) statement;
+                        // Replace pre-operator statement with post-operator statement
+                        es.setExpression(new PostOperatorExpression(poe.getLineNumber(), poe.getExpression(), operator));
+                    } else if (statement.isReturnExpressionStatement()) {
+                        ReturnExpressionStatement res = (ReturnExpressionStatement) statement;
+                        // Replace pre-operator statement with post-operator statement
+                        res.setExpression(new PostOperatorExpression(poe.getLineNumber(), poe.getExpression(), operator));
+                    }
                 }
             }
         }

src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/visitor/PopulateBindingsWithTypeArgumentVisitor.java

@@ -42,7 +42,7 @@ public void visit(TypeArguments arguments) {
             Iterator<TypeArgument> typeArgumentIterator = arguments.iterator();
             Iterator<TypeArgument> typeGenericArgumentIterator = current.getTypeArgumentList().iterator();
 
-            while (typeArgumentIterator.hasNext()) {
+            while (typeArgumentIterator.hasNext() && typeGenericArgumentIterator.hasNext()) {
                 current = typeGenericArgumentIterator.next();
                 typeArgumentIterator.next().accept(this);
             }

src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/visitor/UpdateIntegerConstantTypeVisitor.java

@@ -106,12 +106,14 @@ public void visit(BinaryOperatorExpression expression) {
             case "&":
             case "|":
             case "^":
-                Type type = PrimitiveTypeUtil.getCommonPrimitiveType((PrimitiveType)leftType, (PrimitiveType)rightType);
-                if (type == null) {
-                    type = TYPE_INT;
+                if (leftType.isPrimitiveType() && rightType.isPrimitiveType()) {
+                    Type type = PrimitiveTypeUtil.getCommonPrimitiveType((PrimitiveType) leftType, (PrimitiveType) rightType);
+                    if (type == null) {
+                        type = TYPE_INT;
+                    }
+                    expression.setLeftExpression(updateExpression(type, left));
+                    expression.setRightExpression(updateExpression(type, right));
                 }
-                expression.setLeftExpression(updateExpression(type, left));
-                expression.setRightExpression(updateExpression(type, right));
                 break;
             case "=":
                 left.accept(this);
@@ -126,6 +128,7 @@ public void visit(BinaryOperatorExpression expression) {
                 if ((leftType.getDimension() == 0) && (rightType.getDimension() == 0)) {
                     if (leftType.isPrimitiveType()) {
                         if (rightType.isPrimitiveType()) {
+                            Type type;
                             if (leftType == rightType) {
                                 type = leftType;
                             } else {