README.md

@@ -1,9 +0,0 @@
-Prototype
-
-run with:
-
-mvn test -Dtest="TestComplete#matrixTest"
-
-mvn test -Dtest="typeinference.JavaTXCompilerTest#importTest"
-
-then the output is in: /tmp/output

pom.xml

@@ -53,8 +53,9 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.11.0</version>
 				<configuration>
-                    <source>22</source>
+					<compilerArgs>--enable-preview</compilerArgs>
-                    <target>22</target>
+                    <source>21</source>
+                    <target>21</target>
                 </configuration>
 			</plugin>
 			<plugin>

src/main/java/de/dhbwstuttgart/typeinference/constraints/ConstraintSet.java

@@ -127,5 +127,4 @@ public class ConstraintSet<A> {
     public Set<A> getUndConstraints() {
     	return undConstraints;
     }
-
 }

src/main/java/de/dhbwstuttgart/typeinference/constraints/Pair.java

@@ -137,10 +137,6 @@ public class Pair implements Serializable
         return eOperator == PairOperator.SMALLERDOT;
     }
     
-    public boolean OperatorSmallerNEQDot() {
-        return eOperator == PairOperator.SMALLERNEQDOT;
-    }
-
     
     static public Map<String, TypePlaceholder> generateTPHMap(ConstraintSet<Pair> constraints) {
         HashMap<String, TypePlaceholder> ret = new HashMap<>();

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

@@ -5,17 +5,13 @@ import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.syntaxtree.*;
 import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
 import de.dhbwstuttgart.syntaxtree.statement.Statement;
-import de.dhbwstuttgart.syntaxtree.type.*;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
 import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.constraints.Pair;
 import de.dhbwstuttgart.util.BiRelation;
 
-import java.io.FileWriter;
-import java.io.IOException;
 import java.util.*;
-import java.util.stream.Collectors;
 
 public class TYPE {
 
@@ -28,80 +24,16 @@ public class TYPE {
     }
 
     public ConstraintSet getConstraints() {
-        ConstraintSet<Pair> ret = new ConstraintSet();
+        ConstraintSet ret = new ConstraintSet();
         for (ClassOrInterface cl : sf.KlassenVektor) {
             var allClasses = new HashSet<ClassOrInterface>();
             allClasses.addAll(allAvailableClasses);
             allClasses.addAll(sf.availableClasses);
             ret.addAll(getConstraintsClass(cl, new TypeInferenceInformation(allClasses)));
         }
-        writeASP(ret);
-        //System.exit(0);
         return ret;
     }
 
-    private String toASP(RefTypeOrTPHOrWildcardOrGeneric type){
-        if(type instanceof TypePlaceholder){
-            return "_"+((TypePlaceholder) type).getName();
-        }else if(type instanceof RefType){
-            if(((RefType) type).getParaList().size() > 0){
-                return ((RefType) type).getName() + "<" +
-                        ((RefType) type).getParaList().stream().map(this::toASP).collect(Collectors.joining(", ")) +
-                        ">";
-            }else{
-                return ((RefType) type).getName().toString();
-            }
-        }else if(type instanceof ExtendsWildcardType){
-            return toASP(((ExtendsWildcardType) type).getInnerType());
-        } else if(type instanceof SuperWildcardType) {
-            return toASP(((SuperWildcardType) type).getInnerType());
-        } else if(type instanceof GenericRefType){
-            return "G"+((GenericRefType) type).getParsedName();
-        }
-        throw new RuntimeException("Unsupported Type: "+ type);
-    }
-    private String genASP(Set<Pair> cs){
-        String ret = "";
-        for(Pair p : cs) {
-            if (p.OperatorEqual()) {
-                ret +=(toASP(p.TA1) + "=." + toASP(p.TA2) + "\n");
-            } else if (p.OperatorSmallerDot()) {
-                ret +=(toASP(p.TA1) + "<." + toASP(p.TA2) + "\n");
-            } else if (p.OperatorSmallerNEQDot()) {
-                ret += (toASP(p.TA1) + "<." + toASP(p.TA2) + "\n");
-            }else if(p.OperatorSmaller()){
-                ret += toASP(p.TA1) +"<"+toASP(p.TA2)+ "\n";
-            } else {
-                throw new RuntimeException("Operator unsupported: " + p.GetOperator());
-            }
-        }
-        return ret;
-    }
-    private void writeASP(ConstraintSet<Pair> cs){
-        try(var f = new FileWriter("/tmp/output")){
-            f.append(genASP(cs.getUndConstraints()));
-            List<List<Set<Pair>>> orCons = cs.getOderConstraints().stream().map(css -> {
-                return css.stream().map(cp -> {
-                    return cp.stream().collect(Collectors.toSet());
-                }).collect(Collectors.toList());
-            }).toList();
-
-            for(var orCon : orCons){
-                f.append("{\n");
-                var it = orCon.iterator();
-                while(it.hasNext()) {
-                    var orC = it.next();
-                    f.append("{\n");
-                    f.append(genASP(orC));
-                    f.append("}\n");
-                    if(it.hasNext())f.append("|");
-                }
-                f.append("}\n");
-            }
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
     private ConstraintSet getConstraintsClass(ClassOrInterface cl, TypeInferenceInformation info) {
         ConstraintSet ret = new ConstraintSet();
         ConstraintSet methConstrains;

src/test/java/TestComplete.java

@@ -3,7 +3,6 @@ import de.dhbwstuttgart.environment.ByteArrayClassLoader;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import java.io.FileWriter;
 import java.lang.reflect.*;
 import java.util.AbstractList;
 import java.util.Arrays;
@@ -238,9 +237,6 @@ public class TestComplete {
     @Test
     //@Ignore("This is too complex")
     public void matrixTest() throws Exception {
-        try(var f = new FileWriter("/tmp/output")){
-            f.append("hallo");
-        }
         var classFiles = generateClassFiles(new ByteArrayClassLoader(), "Matrix.jav");
         var matrix = classFiles.get("Matrix");
 

src/test/java/typeinference/JavaTXCompilerTest.java

@@ -34,7 +34,7 @@ public class JavaTXCompilerTest {
 
     @Test
     public void importTest() throws IOException, ClassNotFoundException {
-        execute(new File(rootDirectory + "OrConsTest.jav"));
+        execute(new File(rootDirectory + "Import.jav"));
     }
 
     @Test

src/test/resources/javFiles/OrConsTest.jav

@@ -1,20 +0,0 @@
-
-import java.lang.Integer;
-import java.lang.String;
-
-
-class C1{
-    m(){return this;}
-}
-
-class C2{
-    m(){return this;}
-}
-
-public class OrConsTest {
-
-    ol(var1) {
-        return var1.m().m().m().m().m().m().m().m().m().m().m().m();
-    }
-
-}