diff --git a/src/de/dhbwstuttgart/syntaxtree/Method.java b/src/de/dhbwstuttgart/syntaxtree/Method.java index dfff897c..c50f8416 100755 --- a/src/de/dhbwstuttgart/syntaxtree/Method.java +++ b/src/de/dhbwstuttgart/syntaxtree/Method.java @@ -78,15 +78,12 @@ public class Method extends Field implements IItemWithOffset, TypeInsertable private Modifiers modifiers; protected static Logger inferencelog = Logger.getLogger("inference"); protected static Logger parserlog = Logger.getLogger("parser"); - - protected Menge createdMethods = new Menge<>(); public Method(int offset) { super(offset); } - public Method(String name, Type returnType, ParameterList parameterList, - Block block, GenericDeclarationList gtvDeclarations, int offset) { + public Method(String name, Type returnType, ParameterList parameterList, Block block, GenericDeclarationList gtvDeclarations, int offset) { this(offset); /* * if(parameterList != null)parameterList.parserPostProcessing(this); diff --git a/src/de/dhbwstuttgart/syntaxtree/type/RefType.java b/src/de/dhbwstuttgart/syntaxtree/type/RefType.java index 20e8fe25..2df27dba 100755 --- a/src/de/dhbwstuttgart/syntaxtree/type/RefType.java +++ b/src/de/dhbwstuttgart/syntaxtree/type/RefType.java @@ -602,17 +602,18 @@ public class RefType extends ObjectType implements IMatchable sb.append(((RefType) type).getCombinedType(cg, rs).replace(".", "%")); }else if(type instanceof TypePlaceholder){ sb.append(((TypePlaceholder) type).getBytecodeType(cg, rs).toString().replace(".", "%")); + }else if(type instanceof WildcardType){ + return this.getName().toString(); }else{ sb.append(type.getBytecodeType(cg, rs).toString().replace(".", "%")); } sb.append("%"); } - }else{ - sb.append(this.getName().toString()); - } + return sb.toString(); + } - return sb.toString(); + return sb.append(this.getName().toString()).toString(); } public GenericClassType getGenericClassType(){ diff --git a/src/de/dhbwstuttgart/syntaxtree/type/Type.java b/src/de/dhbwstuttgart/syntaxtree/type/Type.java index 7d57e1e9..6fc42efa 100755 --- a/src/de/dhbwstuttgart/syntaxtree/type/Type.java +++ b/src/de/dhbwstuttgart/syntaxtree/type/Type.java @@ -17,11 +17,6 @@ import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions; import de.dhbwstuttgart.typeinference.exceptions.DebugException; import de.dhbwstuttgart.typeinference.exceptions.TypeinferenceException; -class Test { - void methode(ArrayList t){ - - } -} //TODO: Die Klasse Type muss abstract werden! // ino.class.Type.26716.declaration diff --git a/test/bytecode/types/OL.jav b/test/bytecode/types/OL.jav index c6349bdc..67a79c55 100644 --- a/test/bytecode/types/OL.jav +++ b/test/bytecode/types/OL.jav @@ -1,6 +1,6 @@ class OL { - m(x) { return x + x; } - Boolean m(Boolean x) {return x; } + m(Boolean x) {return x; } + } \ No newline at end of file