JavaTX/JavaCompilerCore
2
0
Fork 3
Code Issues 99 Pull Requests Actions Packages Projects Releases Wiki Activity

modified: ../../../../main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java

Browse Source 
Typen der Methoden der Oder-Constraiunts benutzen wieder rueckgaenig gemacht

	modified:   ../../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
wieder alle grArg im a <. theta' benutzen
	modified:   ../../bytecode/javFiles/MatrixOP.jav
This commit is contained in:
pl@gohorb.ba-horb.de 2020-03-09 18:30:36 +01:00
parent b38340fc60
commit d63c27579c
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
View File

@ -754,8 +754,7 @@ public class BytecodeGenMethod implements StatementVisitor {
public void visit(MethodCall methodCall) { public void visit(MethodCall methodCall) {
boolean parentBinary = isParentBinary; boolean parentBinary = isParentBinary;
System.out.println("In MethodCall = " + methodCall.name); System.out.println("In MethodCall = " + methodCall.name);
//String receiverName = resolver.getResolvedType(methodCall.receiver.getType()); String receiverName = resolver.getResolvedType(methodCall.receiver.getType());
String receiverName = resolver.getResolvedType(methodCall.receiverType);
System.out.println("Methods of " + receiverName + " "); System.out.println("Methods of " + receiverName + " ");
java.lang.reflect.Method methodRefl = null; java.lang.reflect.Method methodRefl = null;
String clazz = receiverName.replace("/", "."); String clazz = receiverName.replace("/", ".");
@ -769,8 +768,7 @@ public class BytecodeGenMethod implements StatementVisitor {
ClassLoader cLoader2; ClassLoader cLoader2;
String methCallType = resultSet.resolveType(methodCall.getType()).resolvedType.acceptTV(new TypeToDescriptor()); String methCallType = resultSet.resolveType(methodCall.getType()).resolvedType.acceptTV(new TypeToDescriptor());
//String[] typesOfParams = getTypes(methodCall.arglist.getArguments()); String[] typesOfParams = getTypes(methodCall.arglist.getArguments());
String[] typesOfParams = getTypes(methodCall.argTypes);
try { try {
clazz = getRawClassName(receiverName, clazz); clazz = getRawClassName(receiverName, clazz);
@ -920,10 +918,10 @@ public class BytecodeGenMethod implements StatementVisitor {
return clazz; return clazz;
} }
private String[] getTypes(List<RefTypeOrTPHOrWildcardOrGeneric> arguments) { private String[] getTypes(List<Expression> arguments) {
String[] types = new String[arguments.size()]; String[] types = new String[arguments.size()];
for(int i = 0; i<arguments.size(); ++i) { for(int i = 0; i<arguments.size(); ++i) {
String t = resolver.getResolvedType(arguments.get(i)); String t = resolver.getResolvedType(arguments.get(i).getType());
types[i] = t; types[i] = t;
} }
return types; return types;

2
src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
View File

@ -2178,8 +2178,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>> {
//writeLog("MAX: " + oup.max(resultPrime.iterator()).toString()); //writeLog("MAX: " + oup.max(resultPrime.iterator()).toString());
} }
} }
break;//Wenn ein unifier gefunden ist reicht es aus PL 2020-03-07
} }
} }

2
src/test/resources/bytecode/javFiles/MatrixOP.jav
View File

@ -1,6 +1,6 @@
import java.util.Vector; import java.util.Vector;
import java.lang.Integer; import java.lang.Integer;
import java.lang.Byte; //import java.lang.Byte;
import java.lang.Boolean; import java.lang.Boolean;
public class MatrixOP extends Vector<Vector<Integer>> { public class MatrixOP extends Vector<Vector<Integer>> {