Improvement in determination of types of local variables

Author: emmanue1

src/main/java/org/jd/core/v1/model/javasyntax/type/PrimitiveType.java

@@ -183,12 +183,14 @@ public String toString() {
     public int getJavaPrimitiveFlags() {
         if ((flags & FLAG_BOOLEAN) != 0)
             return FLAG_BOOLEAN;
-        else if ((flags & FLAG_BYTE) != 0)
-            return FLAG_BYTE;
+        else if ((flags & FLAG_INT) != 0)
+            return FLAG_INT;
         else if ((flags & FLAG_CHAR) != 0)
             return FLAG_CHAR;
         else if ((flags & FLAG_SHORT) != 0)
             return FLAG_SHORT;
+        else if ((flags & FLAG_BYTE) != 0)
+            return FLAG_BYTE;
 
         return flags;
     }

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

@@ -974,15 +974,17 @@ private AbstractLocalVariable getLocalVariableInAssignment(int index, int offset
         if (value.isNullExpression()) {
             return localVariableMaker.getLocalVariableInNullAssignment(index, offset, valueType);
         } else if (value.isLocalVariableReferenceExpression()) {
-            return localVariableMaker.getLocalVariableInAssignment(typeBounds, index, offset, ((ClassFileLocalVariableReferenceExpression)value).getLocalVariable());
+            AbstractLocalVariable valueLocalVariable = ((ClassFileLocalVariableReferenceExpression)value).getLocalVariable();
+            AbstractLocalVariable lv = localVariableMaker.getLocalVariableInAssignment(typeBounds, index, offset, valueLocalVariable);
+            valueLocalVariable.variableOnLeft(typeBounds, lv);
+            return lv;
         } else if (value.isMethodInvocationExpression()) {
             if (valueType.isObjectType()) {
                 // Remove type arguments
                 valueType = ((ObjectType)valueType).createType(null);
             } else if (valueType.isGenericType()) {
                 valueType = TYPE_UNDEFINED_OBJECT;
             }
-
             return localVariableMaker.getLocalVariableInAssignment(typeBounds, index, offset, valueType);
         } else {
             return localVariableMaker.getLocalVariableInAssignment(typeBounds, index, offset, valueType);

src/test/java/org/jd/core/v1/JavaBasicTest.java

@@ -118,8 +118,8 @@ public void testJdk170NoDebugInfoBasic() throws Exception {
 
         assertTrue(source.matches(PatternMaker.make("String str1 = \"3 == \" + (paramInt + 1) + \" ?\";")));
         assertTrue(source.indexOf("String str2 = String.valueOf(\"abc \\b \\f \\n \\r \\t \\\" \\007 def\");") != -1);
-        assertTrue(source.matches(PatternMaker.make("char c2 = '€';")));
-        assertTrue(source.matches(PatternMaker.make("char c4 = c3 = c2 = c1 = Character.toUpperCase('x');")));
+        assertTrue(source.matches(PatternMaker.make("int j = 8364;")));
+        assertTrue(source.matches(PatternMaker.make("int m = k = j = i = Character.toUpperCase('x');")));
         assertTrue(source.matches(PatternMaker.make("Class<String> clazz3 = String.class;")));
         assertTrue(source.matches(PatternMaker.make("Class<String> clazz2 = clazz3;")));
         assertTrue(source.matches(PatternMaker.make("Class<String> clazz1 = clazz2;")));

src/test/java/org/jd/core/v1/JavaLoopTest.java

@@ -308,12 +308,11 @@ public void testJdk170NoDebugInfoFor() throws Exception {
         String source = decompile(loader, new PlainTextPrinter(), internalClassName);
 
         // Check decompiled source code
-        assertTrue(source.matches(PatternMaker.make("for (byte b = 0; b < 10; b++)")));
-        assertTrue(source.matches(PatternMaker.make("for (byte b = 0;; b++)")));
-        assertTrue(source.matches(PatternMaker.make("for (byte b = 0; b < 10; b++)")));
+        assertTrue(source.matches(PatternMaker.make("for (int i = 0; i < 10; i++)")));
+        assertTrue(source.matches(PatternMaker.make("for (int i = 0;; i++)")));
         assertTrue(source.matches(PatternMaker.make("for (String str : paramList)")));
         assertTrue(source.matches(PatternMaker.make("for (paramInt = 0; paramInt < 10; paramInt++)")));
-        assertTrue(source.matches(PatternMaker.make("for (int i : new int[] { 4 })")));
+        assertTrue(source.matches(PatternMaker.make("for (int j : new int[] { 4 })")));
         assertTrue(source.matches(PatternMaker.make("for (String str : paramArrayOfString)")));
         assertTrue(source.matches(PatternMaker.make("for (String str : paramList)")));
 
@@ -330,16 +329,16 @@ public void testJdk150For() throws Exception {
         String source = decompile(loader, new PlainTextPrinter(), internalClassName, configuration);
 
         // Check decompiled source code
-        assertTrue(source.matches(PatternMaker.make(":  20 */", "for (byte b = 0; b < 10; b++)")));
+        assertTrue(source.matches(PatternMaker.make(":  20 */", "for (int i = 0; i < 10; i++)")));
         assertTrue(source.matches(PatternMaker.make(":  88 */", "while (paramInt < 10)")));
         assertTrue(source.matches(PatternMaker.make(": 273 */", "for (paramInt = 0; paramInt < 10; paramInt++)")));
-        assertTrue(source.matches(PatternMaker.make(": 310 */", "for (int i : new int[] { 4 })")));
+        assertTrue(source.matches(PatternMaker.make(": 310 */", "for (int j : new int[] { 4 })")));
         assertTrue(source.matches(PatternMaker.make("/* 347:   0 */", "do {")));
-        assertTrue(source.matches(PatternMaker.make(": 349 */", "while (b < 10);")));
+        assertTrue(source.matches(PatternMaker.make(": 349 */", "while (i < 10);")));
         assertTrue(source.matches(PatternMaker.make(": 385 */", "for (String str : paramArrayOfString)")));
         assertTrue(source.matches(PatternMaker.make(": 399 */", "for (String str : paramList)")));
         assertTrue(source.matches(PatternMaker.make(": 411 */", "Iterator<Class<?>> iterator = Arrays.<Class<?>>asList(getClass().getInterfaces()).iterator()")));
-        assertTrue(source.matches(PatternMaker.make(": 427 */", "for (byte b = 0; b < 3; b++)")));
+        assertTrue(source.matches(PatternMaker.make(": 427 */", "for (int i = 0; i < 3; i++)")));
 
         // Recompile decompiled source code and check errors
         assertTrue(CompilerUtil.compile("1.5", new JavaSourceFileObject(internalClassName, source)));