modified: src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java

Loeschungen angezeigt

	modified:   src/main/java/de/dhbwstuttgart/target/generate/ASTToTargetAST.java
Ansatz fuer Veraenderung des Algorithmus bei Generated Generics eingefuegt.

	modified:   src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPE.java
Loeschungen angezeigt

	modified:   src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
Loeschungen angezeigt

	modified:   src/test/java/targetast/TestComplete.java
tphTest eingfuegt

src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java

@@ -72,8 +72,9 @@ public class JavaTXCompiler {
     public volatile UnifyTaskModel usedTasks = new UnifyTaskModel();
     private final DirectoryClassLoader classLoader;
     
+    //zum Loeschen Anfang obsolet PL 2023-01-18	
     private BiRelation<String, BiRelation<Set<RefTypeOrTPHOrWildcardOrGeneric>, RefTypeOrTPHOrWildcardOrGeneric>> methCallargTypesRetType = new BiRelation<>();
-
+    //zum Loeschen Ende obsolet PL 2023-01-18
     
 	public JavaTXCompiler(File sourceFile) throws IOException, ClassNotFoundException {
 		this(Arrays.asList(sourceFile), null);

src/main/java/de/dhbwstuttgart/target/generate/ASTToTargetAST.java

@@ -4,15 +4,18 @@ import de.dhbwstuttgart.bytecode.FunNGenerator;
 import de.dhbwstuttgart.environment.ByteArrayClassLoader;
 import de.dhbwstuttgart.environment.IByteArrayClassLoader;
 import de.dhbwstuttgart.parser.NullToken;
+import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
 import de.dhbwstuttgart.syntaxtree.*;
 import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
 import de.dhbwstuttgart.syntaxtree.statement.*;
 import de.dhbwstuttgart.syntaxtree.type.*;
+import de.dhbwstuttgart.syntaxtree.type.Void;
 import de.dhbwstuttgart.target.tree.*;
 import de.dhbwstuttgart.target.tree.expression.TargetBlock;
 import de.dhbwstuttgart.target.tree.expression.TargetExpression;
 import de.dhbwstuttgart.target.tree.type.*;
 import de.dhbwstuttgart.typeinference.result.*;
+import de.dhbwstuttgart.util.BiRelation;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -163,9 +166,32 @@ public class ASTToTargetAST {
 
             var visitedMethods = new HashSet<Method>();
             method.block.accept(new TracingStatementVisitor() {
+            	
+            	private RefTypeOrTPHOrWildcardOrGeneric superType = new Void(new NullToken());
+            	
             	 @Override
                  public void visit(MethodCall methodCall) {
-                    super.visit(methodCall);
+            		//Anfang es werden Paare von TPHs gespeichert, die bei den Generated Generics ueber die Methodengrenzen hinweg
+            	    //betrachtet werden muessen 
+            		//Definition 7.2 (Family of generated generics). T1 <. R1 <.^∗ R2 <. T2
+            	    Set<RefTypeOrTPHOrWildcardOrGeneric> T1s = 
+            	    		methodCall.getArgumentList()
+            	    		          .getArguments()
+            	    		          .stream()
+            	    		          .map(x -> x.getType())
+            	    		          .collect(Collectors.toCollection(HashSet::new))
+            	    		          .stream().filter(x -> x instanceof TypePlaceholder)
+            	    		          .collect(Collectors.toCollection(HashSet::new));
+            	    RefTypeOrTPHOrWildcardOrGeneric T2 = superType;
+            	    System.out.println("T1s: " + T1s + "\nT2: " + T2);
+            	    //Ende
+            	    
+            	    superType = methodCall.receiverType;
+            	    methodCall.receiver.accept(this);
+            	    for(int i = 0;i<methodCall.arglist.getArguments().size();i++){
+                    	superType = methodCall.argTypes.get(i);
+                    	methodCall.arglist.getArguments().get(i).accept(this);
+                    }
 
                      if (methodCall.receiver instanceof ExpressionReceiver expressionReceiver) {
                          if (expressionReceiver.expr instanceof This) {
@@ -234,6 +260,168 @@ public class ASTToTargetAST {
                          }
                      }
                  }
+
+
+                @Override
+                public void visit(LambdaExpression lambdaExpression) {
+                	superType = new Void(new NullToken());
+                    lambdaExpression.methodBody.accept(this);
+                }
+
+                @Override
+                public void visit(Assign assign) {
+                	superType = assign.lefSide.getType();
+                    assign.rightSide.accept(this);
+                }
+
+                @Override
+                public void visit(BinaryExpr binary) {
+                	superType = new Void(new NullToken());
+                    binary.lexpr.accept(this);
+                    superType = new Void(new NullToken());
+                    binary.rexpr.accept(this);
+                }
+
+                @Override
+                public void visit(Block block) {
+                    for (var expr : block.statements) {
+                    	superType = new Void(new NullToken());
+                        expr.accept(this);
+                    }
+                }
+
+                @Override
+                public void visit(CastExpr castExpr) {
+
+                }
+
+                @Override
+                public void visit(EmptyStmt emptyStmt) {
+
+                }
+
+                @Override
+                public void visit(FieldVar fieldVar) {
+
+                }
+
+                @Override
+                public void visit(ForStmt forStmt) {
+                    forStmt.body_Loop_block.accept(this);
+                }
+
+                @Override
+                public void visit(IfStmt ifStmt) {
+                	superType = new Void(new NullToken());
+                	ifStmt.expr.accept(this);
+                	superType = new Void(new NullToken());
+                    ifStmt.then_block.accept(this);
+                    superType = new Void(new NullToken());
+                    ifStmt.else_block.accept(this);
+                }
+
+                @Override
+                public void visit(InstanceOf instanceOf) {
+
+                }
+
+                @Override
+                public void visit(LocalVar localVar) {
+
+                }
+
+                @Override
+                public void visit(LocalVarDecl localVarDecl) {
+
+                }
+
+                @Override
+                public void visit(NewClass newClass) {
+                    this.visit((MethodCall) newClass);
+                }
+
+                @Override
+                public void visit(NewArray newArray) {
+                    newArray.expr.forEach(expr -> expr.accept(this));
+                }
+
+                @Override
+                public void visit(Return aReturn) {
+                	superType = aReturn.getType();
+                    aReturn.retexpr.accept(this);
+                }
+
+                @Override
+                public void visit(ReturnVoid aReturn) {
+
+                }
+
+                @Override
+                public void visit(StaticClassName staticClassName) {
+
+                }
+
+                @Override
+                public void visit(Super aSuper) {
+
+                }
+
+                @Override
+                public void visit(This aThis) {
+
+                }
+
+                @Override
+                public void visit(WhileStmt whileStmt) {
+                	superType = new Void(new NullToken());
+                	whileStmt.expr.accept(this);
+                	superType = new Void(new NullToken());
+                    whileStmt.loopBlock.accept(this);
+                }
+
+                @Override
+                public void visit(DoStmt whileStmt) {
+                    whileStmt.loopBlock.accept(this);
+                }
+
+                @Override
+                public void visit(AssignToField assignLeftSide) {
+
+                }
+
+                @Override
+                public void visit(AssignToLocal assignLeftSide) {
+
+                }
+
+                @Override
+                public void visit(SuperCall superCall) {
+
+                }
+
+                @Override
+                public void visit(ExpressionReceiver expressionReceiver) {
+                    expressionReceiver.expr.accept(this);
+                }
+
+                @Override
+                public void visit(UnaryExpr unaryExpr) {
+                    unaryExpr.expr.accept(this);
+                }
+
+                @Override
+                public void visit(Literal literal) {
+
+                }
+            	@Override
+                public void visit(ArgumentList arglist) {
+                    for(int i = 0;i<arglist.getArguments().size();i++){
+                    	superType = arglist.getArguments().get(i).getType();
+                    	arglist.getArguments().get(i).accept(this);
+                    }
+                }
+            	
+               
             });
 
             // Type variables with bounds that are also type variables of fields

src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPE.java

@@ -18,7 +18,9 @@ public class TYPE {
     private final Collection<SourceFile> sfs;
     private final TypeInferenceInformation typeInferenceInformation;
     
+    //zum Loeschen Anfang obsolet PL 2023-01-18
     private BiRelation<String, BiRelation<Set<RefTypeOrTPHOrWildcardOrGeneric>, RefTypeOrTPHOrWildcardOrGeneric>> methCallargTypesRetType = new BiRelation<>();
+    //zum Loeschen Ende obsolet PL 2023-01-18
 
     public TYPE(Collection<SourceFile> sourceFiles, Collection<ClassOrInterface> allAvailableClasses){
         sfs = sourceFiles;

src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java

@@ -32,8 +32,10 @@ public class TYPEStmt implements StatementVisitor{
     private final TypeInferenceBlockInformation info;
     private final ConstraintSet constraintsSet = new ConstraintSet();
     
+    //zum Loeschen Anfang obsolet PL 2023-01-18
     private RefTypeOrTPHOrWildcardOrGeneric superType = new Void(new NullToken());
     private BiRelation<String, BiRelation<Set<RefTypeOrTPHOrWildcardOrGeneric>, RefTypeOrTPHOrWildcardOrGeneric>> methCallargTypesRetType = new BiRelation<>();
+    //zum Loeschen Ende obsolet PL 2023-01-18
 
     public TYPEStmt(TypeInferenceBlockInformation info){
         this.info = info;

src/test/java/targetast/TestComplete.java

@@ -340,6 +340,13 @@ public class TestComplete {
         var instance = classFiles.get("SubMatrix").getDeclaredConstructor().newInstance();
     }
     
+    @Test
+    public void tphTest() throws Exception {
+        var classFiles = generateClassFiles("Tph.jav", new ByteArrayClassLoader());
+        var tph = classFiles.get("Tph");
+        var instance = tph.getDeclaredConstructor().newInstance();
+    }
+
     @Test
     public void tph2Test() throws Exception {
         var classFiles = generateClassFiles("Tph2.jav", new ByteArrayClassLoader());