Add new type to record patterns

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

@@ -2,17 +2,24 @@ package de.dhbwstuttgart.bytecode;
 
 import de.dhbwstuttgart.core.JavaTXCompiler;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
+import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+import de.dhbwstuttgart.syntaxtree.Method;
+import de.dhbwstuttgart.syntaxtree.Pattern;
+import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.target.generate.ASTToTargetAST;
+import de.dhbwstuttgart.target.generate.StatementToTargetExpression;
 import de.dhbwstuttgart.target.tree.*;
 import de.dhbwstuttgart.target.tree.expression.*;
 import de.dhbwstuttgart.target.tree.type.*;
+import org.antlr.v4.codegen.Target;
 import org.objectweb.asm.*;
 
 import java.lang.invoke.*;
 import java.lang.reflect.Modifier;
 import java.util.*;
+import java.util.stream.IntStream;
 
 import static org.objectweb.asm.Opcodes.*;
 import static de.dhbwstuttgart.target.tree.expression.TargetBinaryOp.*;
@@ -1462,27 +1469,10 @@ public class Codegen {
             // TODO Check if class is a Record
 
             for (var i = 0; i < cp.subPatterns().size(); i++) {
-                var subPattern = cp.subPatterns().get(i);
-
                 state.mv.visitInsn(DUP);
+
+                var subPattern = cp.subPatterns().get(i);
                 extractField(state, cp.type(), i, clazz);
-
-                if (subPattern.type() instanceof TargetRefType || subPattern.type() instanceof TargetExtendsWildcard) {
-                    state.mv.visitInsn(DUP);
-                    state.mv.visitTypeInsn(INSTANCEOF, subPattern.type().getInternalName());
-
-                    var cont = new Label();
-                    state.mv.visitJumpInsn(IFNE, cont);
-                    for (var j = 0; j < depth + 1; j++) {
-                        state.mv.visitInsn(POP);
-                    }
-
-                    state.mv.visitVarInsn(ALOAD, state.switchResultValue.peek());
-                    state.mv.visitLdcInsn(index + 1);
-                    state.mv.visitJumpInsn(GOTO, start);
-                    state.mv.visitLabel(cont);
-                }
-
                 bindPattern(state, subPattern.type(), subPattern, start, index, depth + 1);
             }
             state.mv.visitInsn(POP);
@@ -1568,8 +1558,7 @@ public class Codegen {
                 state.mv.visitInsn(DUP);
 
             extractField(state, cp.type(), i, clazz);
-            if (subPattern.type() instanceof TargetRefType)
-                state.mv.visitTypeInsn(CHECKCAST, subPattern.type().getInternalName());
+            state.mv.visitTypeInsn(CHECKCAST, subPattern.type().getInternalName());
             offset = state.createVariable(subPattern.name(), subPattern.type()).index;
             state.mv.visitVarInsn(ASTORE, offset);
             if (subPattern instanceof TargetComplexPattern cp2) {

src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java

@@ -483,9 +483,9 @@ public class StatementGenerator {
         IdentifierContext identifierCtx = recordPatternCtx.identifier();
         var text = (identifierCtx != null) ? identifierCtx.getText() : null;
         //Hier evtl. Typ anpassen -> wenn kein Typ bekannt ist push neuen Typ auf Hashtable
-        var type = recordPatternCtx.typeType() == null ? TypePlaceholder.fresh(recordPatternCtx.getStart()) : TypeGenerator.convert(recordPatternCtx.typeType(), reg, generics);
-        if (text != null) localVars.put(text, type);
-        var ret = new RecordPattern(subPattern, text, type, recordPatternCtx.getStart());
+        var recordType = recordPatternCtx.typeType() == null ? TypePlaceholder.fresh(recordPatternCtx.getStart()) : TypeGenerator.convert(recordPatternCtx.typeType(), reg, generics);
+        if (text != null) localVars.put(text, recordType);
+        var ret = new RecordPattern(subPattern, text, recordType, TypePlaceholder.fresh(recordPatternCtx.getStart()), recordPatternCtx.getStart());
         return ret;
     }
 

src/main/java/de/dhbwstuttgart/syntaxtree/RecordPattern.java

@@ -3,6 +3,7 @@ package de.dhbwstuttgart.syntaxtree;
 import java.util.ArrayList;
 import java.util.List;
 
+import de.dhbwstuttgart.syntaxtree.type.RefType;
 import org.antlr.v4.runtime.Token;
 
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
@@ -10,15 +11,12 @@ import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 public class RecordPattern extends FormalParameter {
 
   private final List<Pattern> subPattern;
+  public final RefTypeOrTPHOrWildcardOrGeneric recordType;
 
-  public RecordPattern(String name, RefTypeOrTPHOrWildcardOrGeneric type, Token offset) {
-    super(name, type, offset);
-    subPattern = new ArrayList<>();
-  }
-
-  public RecordPattern(List<Pattern> subPattern, String name, RefTypeOrTPHOrWildcardOrGeneric type, Token offset) {
+  public RecordPattern(List<Pattern> subPattern, String name, RefTypeOrTPHOrWildcardOrGeneric recordType, RefTypeOrTPHOrWildcardOrGeneric type, Token offset) {
     super(name, type, offset);
     this.subPattern = subPattern;
+    this.recordType = recordType;
   }
 
   public List<Pattern> getSubPattern() {

src/main/java/de/dhbwstuttgart/syntaxtree/factory/ASTFactory.java

@@ -176,9 +176,8 @@ public class ASTFactory {
 		for (Type jreInterface : jreClass.getGenericInterfaces()) {
 			implementedInterfaces.add((RefType) createType(jreInterface));
 		}
-		List<RefType> permittedSubtypes = null;
+		List<RefType> permittedSubtypes = new ArrayList<>();
 		if (jreClass.isSealed()) {
-			permittedSubtypes = new ArrayList<>();
 			for (Class subclass : jreClass.getPermittedSubclasses()) {
 				permittedSubtypes.add((RefType) createType(subclass));
 			}

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

@@ -179,12 +179,17 @@ public class ASTToTargetAST {
     // This finds a common sealed interface type to group together methods that use different records
     private List<ClassOrInterface> commonSuperInterfaceTypes(TargetType a, TargetType b) {
         if (a instanceof TargetGenericType && b instanceof TargetGenericType) return List.of(ASTFactory.createClass(Object.class));
+
         if (a instanceof TargetRefType ta && b instanceof TargetRefType tb) {
             var res = new HashSet<ClassOrInterface>();
 
             var cla = compiler.getClass(new JavaClassName(ta.name()));
             var clb = compiler.getClass(new JavaClassName(tb.name()));
 
+            if (cla.equals(clb) && cla.isInterface() && cla.isSealed()) {
+                res.add(cla);
+            }
+
             while (!cla.equals(ASTFactory.createClass(Object.class))) {
                 var clb2 = clb;
                 while (!clb2.equals(ASTFactory.createClass(Object.class))) {
@@ -215,10 +220,6 @@ public class ASTToTargetAST {
             // Then check for methods with the same signature
             var resMethods = new HashSet<MethodWithTphs>();
 
-            for (var m1 : methodsWithTphs) {
-                System.out.println(m1.method.name() + " -> " + m1.method.signature().parameters().stream().map(m -> m.pattern().type()).toList());
-            }
-
             outer:
             for (var m1 : methodsWithTphs) {
                 for (var m2 : methodsWithTphs) {
@@ -248,6 +249,7 @@ public class ASTToTargetAST {
             });
             System.out.println();
         });
+
         return mapOfSignatures.values().stream().toList();
     }
 
@@ -448,6 +450,7 @@ public class ASTToTargetAST {
     }
 
     private List<TargetMethod> generatePatternOverloads(ClassOrInterface clazz, List<TargetMethod> overloadedMethods) {
+        if (true) return overloadedMethods;
         if (overloadedMethods.size() <= 1) return overloadedMethods;
         // Check if we have a pattern as a parameter
         var firstMethod = overloadedMethods.getFirst();

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

@@ -103,12 +103,18 @@ public class TYPE {
 
         var subPatternList = recordPattern.getSubPattern();
         var resolver = new GenericsResolverSameName();
-        var refType = (RefType) recordPattern.getType();
+
+        var refType = (RefType) resolver.visit((RefType) recordPattern.recordType);
 
         var allClasses = blockInformation.getAvailableClasses();
         var typename = refType.getName().getClassName();
 
         ClassOrInterface allClass = allClasses.stream().filter(c -> c.getClassName().getClassName().equals(typename)).findFirst().orElseThrow();
+        // Constraints on the type of the pattern itself
+        constraintSet.addUndConstraint(new Pair(refType, recordPattern.getType(), PairOperator.SMALLERDOT));
+        for (var superInterface : allClass.getSuperInterfaces()) {
+            constraintSet.addUndConstraint(new Pair(recordPattern.getType(), resolver.visit(superInterface), PairOperator.SMALLERDOT));
+        }
 
         int counter = 0;
         for (Pattern el : subPatternList){
@@ -118,7 +124,7 @@ public class TYPE {
                 FormalParameter param = (FormalParameter) allClass.getConstructors().getFirst().getParameterList().getParameterAt(counter);
                 FieldAssumption assumption = new FieldAssumption(param.getName(), allClass, param.getType(), blockInformation.getCurrentTypeScope());
 
-                var fieldCons = new Pair(el.getType(), assumption.getType(resolver), PairOperator.SMALLERDOT);
+                var fieldCons = new Pair(el.getType(), assumption.getType(resolver), PairOperator.EQUALSDOT);
                 var recvCons = new Pair(refType, assumption.getReceiverType(resolver), PairOperator.EQUALSDOT);
                 constraintSet.addUndConstraint(fieldCons);
                 constraintSet.addUndConstraint(recvCons);
@@ -128,6 +134,7 @@ public class TYPE {
                             ((RefType)assumption.getReceiverType(resolver)).getParaList().get(i),
                             PairOperator.EQUALSDOT));
                 }
+
             }
             counter++;
         }

src/test/java/TestComplete.java

@@ -940,9 +940,6 @@ public class TestComplete {
 
         var list1 = ConsCtor.newInstance(1, ConsCtor.newInstance(2, ConsCtor.newInstance(3, EmptyCtor.newInstance())));
         var list2 = ConsCtor.newInstance(4, ConsCtor.newInstance(5, ConsCtor.newInstance(6, EmptyCtor.newInstance())));
-
-        var append = clazz.getDeclaredMethod("append", List, List);
-        System.out.println(append.invoke(instance, list1, list2));
     }
 
     @Test