Merge remote-tracking branch 'origin/bytecode2' into bytecode2

src/main/java/de/dhbwstuttgart/bytecode/TPHExtractor.java

@@ -5,6 +5,7 @@ package de.dhbwstuttgart.bytecode;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 
 import de.dhbwstuttgart.bytecode.constraint.ExtendsConstraint;
 import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
@@ -12,7 +13,11 @@ import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
 import de.dhbwstuttgart.bytecode.utilities.MethodAndTPH;
 import de.dhbwstuttgart.syntaxtree.AbstractASTWalker;
 import de.dhbwstuttgart.syntaxtree.Constructor;
+import de.dhbwstuttgart.syntaxtree.FormalParameter;
 import de.dhbwstuttgart.syntaxtree.Method;
+import de.dhbwstuttgart.syntaxtree.ParameterList;
+import de.dhbwstuttgart.syntaxtree.statement.LocalVar;
+import de.dhbwstuttgart.syntaxtree.statement.LocalVarDecl;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 import de.dhbwstuttgart.typeinference.result.GenericInsertPair;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
@@ -21,36 +26,42 @@ import de.dhbwstuttgart.typeinference.result.ResultSet;
  * @author Fayez Abu Alia
  *
  */
-public class TPHExtractor extends AbstractASTWalker{
+public class TPHExtractor extends AbstractASTWalker {
 	// Alle TPHs der Felder werden iKopf der Klasse definiert
 	// alle TPHs der Klasse: (TPH, is in Method?)
-	final HashMap<TypePlaceholder,Boolean> allTPHS = new HashMap<>();
+	final HashMap<TypePlaceholder, Boolean> allTPHS = new HashMap<>();
 	MethodAndTPH methodAndTph;
+
 	Boolean inMethod = false;
+	boolean inLocalOrParam = false;
+
 	public final ArrayList<MethodAndTPH> ListOfMethodsAndTph = new ArrayList<>();
 	final ArrayList<GenericInsertPair> allPairs = new ArrayList<>();
 	public final ArrayList<TPHConstraint> allCons = new ArrayList<>();
 	private ResultSet resultSet;
-	
+
 	public TPHExtractor() {
-		
+
 	}
-	
+
 	public void setResultSet(ResultSet resultSet) {
 		this.resultSet = resultSet;
 	}
-	
+
 	@Override
 	public void visit(TypePlaceholder tph) {
-		if(resultSet.resolveType(tph).resolvedType instanceof TypePlaceholder) {
+		if (resultSet.resolveType(tph).resolvedType instanceof TypePlaceholder) {
 			TypePlaceholder resolvedTPH = (TypePlaceholder) resultSet.resolveType(tph).resolvedType;
-			if(inMethod)
+			if (inMethod) {
 				methodAndTph.getTphs().add(resolvedTPH.getName());
-			
-			allTPHS.put(resolvedTPH,inMethod);
-			resultSet.resolveType(tph).additionalGenerics.forEach(ag ->{
-				if(ag.contains(resolvedTPH)&&ag.TA1.equals(resolvedTPH)&&!contains(allPairs,ag)) {
-					if(inMethod)
+				if (inLocalOrParam)
+					methodAndTph.getLocalTphs().add(resolvedTPH.getName());
+			}
+
+			allTPHS.put(resolvedTPH, inMethod);
+			resultSet.resolveType(tph).additionalGenerics.forEach(ag -> {
+				if (ag.contains(resolvedTPH) && ag.TA1.equals(resolvedTPH) && !contains(allPairs, ag)) {
+					if (inMethod)
 						methodAndTph.getPairs().add(ag);
 					allPairs.add(ag);
 					TPHConstraint con = new ExtendsConstraint(ag.TA1.getName(), ag.TA2.getName(), Relation.EXTENDS);
@@ -59,14 +70,16 @@ public class TPHExtractor extends AbstractASTWalker{
 			});
 		}
 	}
+
 	private boolean contains(ArrayList<GenericInsertPair> pairs, GenericInsertPair genPair) {
-		for(int i=0; i<pairs.size();++i) {
+		for (int i = 0; i < pairs.size(); ++i) {
 			GenericInsertPair p = pairs.get(i);
-			if(p.TA1.equals(genPair.TA1) && p.TA2.equals(genPair.TA2))
+			if (p.TA1.equals(genPair.TA1) && p.TA2.equals(genPair.TA2))
 				return true;
 		}
 		return false;
 	}
+
 	@Override
 	public void visit(Method method) {
 		inMethod = true;
@@ -75,12 +88,33 @@ public class TPHExtractor extends AbstractASTWalker{
 		inMethod = false;
 		ListOfMethodsAndTph.add(methodAndTph);
 	}
-	
+
 	@Override
 	public void visit(Constructor cons) {
 		inMethod = false;
 		super.visit(cons);
 		inMethod = true;
 	}
-	
+
+	@Override
+	public void visit(LocalVarDecl localVarDecl) {
+		inLocalOrParam = true;
+		super.visit(localVarDecl);
+		inLocalOrParam = false;
+	}
+
+	@Override
+	public void visit(LocalVar localVar) {
+		inLocalOrParam = true;
+		super.visit(localVar);
+		inLocalOrParam = false;
+	}
+
+	@Override
+	public void visit(ParameterList formalParameters) {
+		inLocalOrParam = true;
+		super.visit(formalParameters);
+		inLocalOrParam = false;
+	}
+
 }

src/main/java/de/dhbwstuttgart/bytecode/utilities/ConstraintsFinder.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
+import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
 
 public class ConstraintsFinder {
 	private List<TPHConstraint> allConstaints;
@@ -18,10 +19,12 @@ public class ConstraintsFinder {
 		
 		List<TPHConstraint> visitedCons = new ArrayList<>();
 		for(TPHConstraint c : allConstaints) {
-			// get constraints with the same left side
-			List<TPHConstraint> cons = getConstraints(c,visitedCons);
-			if(cons.size()>1)
-				result.add(cons);
+			if(c.getRel() == Relation.EXTENDS) {
+				// get constraints with the same left side
+				List<TPHConstraint> cons = getConstraints(c,visitedCons);
+				if(cons.size()>1)
+					result.add(cons);
+			}
 		}
 		
 		return result;

src/main/java/de/dhbwstuttgart/bytecode/utilities/MethodAndTPH.java

@@ -10,6 +10,8 @@ public class MethodAndTPH {
 	private String name;
 	private final ArrayList<String> tphs = new ArrayList<>();
 	private final ArrayList<GenericInsertPair> pairs = new ArrayList<>();
+	// tphs of local variables and parameters
+	private final ArrayList<String> localTphs = new ArrayList<>();
 
 	public MethodAndTPH(String name) {
 		this.name = name;
@@ -26,4 +28,9 @@ public class MethodAndTPH {
 	public String getName() {
 		return name;
 	}
+
+	public ArrayList<String> getLocalTphs() {
+		return localTphs;
+	}
+	
 }

src/main/java/de/dhbwstuttgart/bytecode/utilities/NameReplacer.java

@@ -12,12 +12,14 @@ public class NameReplacer {
 	private List<TPHConstraint> constraints;
 	private List<TPHConstraint> allConstraints;
 	private List<String> tphs;
+	private List<String> localTphs;
 	
-	public NameReplacer(List<TPHConstraint> constraints, List<TPHConstraint> allConstraints,List<String> tphs) {
+	public NameReplacer(List<TPHConstraint> constraints, List<TPHConstraint> allConstraints,List<String> tphs, ArrayList<String> localTphs) {
 		super();
 		this.constraints = constraints;
 		this.allConstraints = allConstraints;
 		this.tphs = tphs;
+		this.localTphs = localTphs;
 	}
 	
 	public Map<String, List<String>> replaceNames() {
@@ -34,8 +36,11 @@ public class NameReplacer {
 			if(names.contains(cons.getRight()))
 				cons.setRight(newName);
 		}
+		
 		tphs.removeAll(names);
 		tphs.add(newName);
+		localTphs.removeAll(names);
+		localTphs.add(newName);
 		
 		HashMap<String, List<String>> res = new HashMap<>();
 		res.put(newName, names);

src/test/java/bytecode/KompTphTest.java

@@ -0,0 +1,37 @@
+package bytecode;
+
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import de.dhbwstuttgart.core.JavaTXCompiler;
+
+public class KompTphTest {
+	
+	private static String path;
+	private static File fileToTest;
+	private static JavaTXCompiler compiler;
+	private static ClassLoader loader;
+	private static Class<?> classToTest;
+	private static String pathToClassFile;
+	private static Object instanceOfClass;
+	
+	@Test
+	public void generateBC() throws Exception {
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/KompTph.jav";
+		fileToTest = new File(path);
+		compiler = new JavaTXCompiler(fileToTest);
+		pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";
+		compiler.generateBytecode(pathToClassFile);
+		loader = new URLClassLoader(new URL[] {new URL("file://"+pathToClassFile)});
+		classToTest = loader.loadClass("KompTph");
+		instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
+	}
+
+}

src/test/resources/bytecode/javFiles/KompTph.jav

@@ -0,0 +1,13 @@
+public class KompTph {
+	public m(a, b, c) {
+		var d = a;
+		var e = a;
+		a = b;
+		c = b;
+		m2(a,c);
+	}
+
+	public m2(a,b){
+		m(a,a,b);
+	}
+}