From a40d2b991fc9ab20b60b6f7a286ab91802c27213 Mon Sep 17 00:00:00 2001 From: Fayez Abu Alia Date: Thu, 24 May 2018 16:44:05 +0200 Subject: [PATCH 1/3] =?UTF-8?q?kleine=20=C3=84nderung?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dhbwstuttgart/bytecode/descriptor/TypeToDescriptor.java | 2 +- test/bytecode/FacTest.java | 4 ++-- test/bytecode/javFiles/Plus.jav | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/de/dhbwstuttgart/bytecode/descriptor/TypeToDescriptor.java b/src/de/dhbwstuttgart/bytecode/descriptor/TypeToDescriptor.java index e5c853b3d..69ac6d137 100644 --- a/src/de/dhbwstuttgart/bytecode/descriptor/TypeToDescriptor.java +++ b/src/de/dhbwstuttgart/bytecode/descriptor/TypeToDescriptor.java @@ -29,7 +29,7 @@ public class TypeToDescriptor implements TypeVisitor{ @Override public String visit(ExtendsWildcardType extendsWildcardType) { - return extendsWildcardType.getInnerType().toString(); + return extendsWildcardType.getInnerType().toString().replace(".", "/"); //throw new NotImplementedException(); } diff --git a/test/bytecode/FacTest.java b/test/bytecode/FacTest.java index b2840026d..c5eb281e6 100644 --- a/test/bytecode/FacTest.java +++ b/test/bytecode/FacTest.java @@ -36,9 +36,9 @@ public class FacTest { @Test public void test() throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { - Method getFac = classToTest.getDeclaredMethod("getFac", Integer.class,Integer.class); + Method getFac = classToTest.getDeclaredMethod("getFac", Integer.class); Integer result = (Integer) getFac.invoke(instanceOfClass,3); - assertEquals(result, 6); + assertEquals(result, 4); } } diff --git a/test/bytecode/javFiles/Plus.jav b/test/bytecode/javFiles/Plus.jav index 86b4eb369..4d425bf06 100644 --- a/test/bytecode/javFiles/Plus.jav +++ b/test/bytecode/javFiles/Plus.jav @@ -1,4 +1,4 @@ -//import java.lang.Integer; +import java.lang.Integer; public class Plus { From 6fce2760c5f2bf45970e07ad8e0b3e65b1c75931 Mon Sep 17 00:00:00 2001 From: Fayez Abu Alia Date: Fri, 25 May 2018 09:53:30 +0200 Subject: [PATCH 2/3] While.jav --- src/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java | 2 +- test/bytecode/javFiles/While.jav | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java b/src/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java index 8bb7dca14..468b079be 100644 --- a/src/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java +++ b/src/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java @@ -888,7 +888,7 @@ public class BytecodeGenMethod implements StatementVisitor { default: // wenn die Typ des Literals = Number ist, wird integer-value // verwendet - // visitIntegerLiteral(((Double) value).intValue(), false); +// visitIntegerLiteral(((Double) value).intValue(), false); break; } // Boxing diff --git a/test/bytecode/javFiles/While.jav b/test/bytecode/javFiles/While.jav index ed7e83567..5b983f3eb 100644 --- a/test/bytecode/javFiles/While.jav +++ b/test/bytecode/javFiles/While.jav @@ -2,7 +2,7 @@ import java.lang.Integer; // wenn nur ein Import da steht,wird die Type von // dem Literal 2 Number berechnet => Deswegen kann // nicht auf den Stack geladen. -import java.lang.Long; +//import java.lang.Long; public class While { m(x) { From 58f5e17ab5c1e34082c54f07ceb325cc5da5ffd2 Mon Sep 17 00:00:00 2001 From: Fayez Abu Alia Date: Fri, 25 May 2018 10:01:44 +0200 Subject: [PATCH 3/3] FacTest.java --- test/bytecode/FacTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/bytecode/FacTest.java b/test/bytecode/FacTest.java index c5eb281e6..0875db05c 100644 --- a/test/bytecode/FacTest.java +++ b/test/bytecode/FacTest.java @@ -38,7 +38,7 @@ public class FacTest { public void test() throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { Method getFac = classToTest.getDeclaredMethod("getFac", Integer.class); Integer result = (Integer) getFac.invoke(instanceOfClass,3); - assertEquals(result, 4); + assertEquals(result, 6); } }