feat: add Literal in Records and LPattern for Syntaxtreegenerator

gen/Java17ParserBaseListener.java

@@ -2147,6 +2147,18 @@ public class Java17ParserBaseListener implements Java17ParserListener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitEnclosedPattern(Java17Parser.EnclosedPatternContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterLPattern(Java17Parser.LPatternContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitLPattern(Java17Parser.LPatternContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *

gen/Java17ParserBaseVisitor.java

@@ -1257,6 +1257,13 @@ public class Java17ParserBaseVisitor<T> extends AbstractParseTreeVisitor<T> impl
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
 	@Override public T visitEnclosedPattern(Java17Parser.EnclosedPatternContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitLPattern(Java17Parser.LPatternContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *

gen/Java17ParserListener.java

@@ -1960,6 +1960,18 @@ public interface Java17ParserListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitEnclosedPattern(Java17Parser.EnclosedPatternContext ctx);
+	/**
+	 * Enter a parse tree produced by the {@code lPattern}
+	 * labeled alternative in {@link Java17Parser#primaryPattern}.
+	 * @param ctx the parse tree
+	 */
+	void enterLPattern(Java17Parser.LPatternContext ctx);
+	/**
+	 * Exit a parse tree produced by the {@code lPattern}
+	 * labeled alternative in {@link Java17Parser#primaryPattern}.
+	 * @param ctx the parse tree
+	 */
+	void exitLPattern(Java17Parser.LPatternContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link Java17Parser#recordPattern}.
 	 * @param ctx the parse tree

gen/Java17ParserVisitor.java

@@ -1164,6 +1164,13 @@ public interface Java17ParserVisitor<T> extends ParseTreeVisitor<T> {
 	 * @return the visitor result
 	 */
 	T visitEnclosedPattern(Java17Parser.EnclosedPatternContext ctx);
+	/**
+	 * Visit a parse tree produced by the {@code lPattern}
+	 * labeled alternative in {@link Java17Parser#primaryPattern}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitLPattern(Java17Parser.LPatternContext ctx);
 	/**
 	 * Visit a parse tree produced by {@link Java17Parser#recordPattern}.
 	 * @param ctx the parse tree

resources/bytecode/javFiles/PatternMatchingLiteralStyle.jav

@@ -0,0 +1,17 @@
+import java.lang.Integer;
+import java.lang.Double;
+import java.lang.Number;
+import java.lang.String;
+
+public record R(Number n) {}
+
+public class SwitchOverload {
+
+    public f(){}
+
+    public m(r) {
+        return switch(r) {
+            case R("test") -> f();
+        };
+    }
+}

src/main/antlr4/de/dhbwstuttgart/parser/antlr/Java17Parser.g4

@@ -654,6 +654,7 @@ primaryPattern
     : typePattern  #tPattern
     | recordPattern  #rPattern
     | '(' pattern ')'  #enclosedPattern
+    | literal (',' literal)* #lPattern
     ;
 
 recordPattern
@@ -677,7 +678,6 @@ recordComponentPatternElement
 
 recordComponentPatternList
     : pattern (',' pattern)*
-    | literal (',' literal)*
     ;
 
 // Java8

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

@@ -15,6 +15,7 @@ import de.dhbwstuttgart.syntaxtree.*;
 import de.dhbwstuttgart.syntaxtree.statement.*;
 import de.dhbwstuttgart.syntaxtree.type.Void;
 import de.dhbwstuttgart.target.tree.expression.TargetUnaryOp;
+import de.dhbwstuttgart.target.generate.StatementToTargetExpression;
 import org.antlr.v4.runtime.Token;
 
 import de.dhbwstuttgart.exceptions.NotImplementedException;
@@ -441,6 +442,7 @@ public class StatementGenerator {
     }
 
     private Pattern convert(PatternContext pattern) {
+
         return switch (pattern) {
         case PPatternContext pPattern -> {
             yield convert(pPattern.primaryPattern());
@@ -455,6 +457,7 @@ public class StatementGenerator {
     }
 
     private FormalParameter convert(PrimaryPatternContext pPattern) {
+
         switch (pPattern) {
         case TPatternContext tPattern:
             TypePatternContext typePattern = tPattern.typePattern();
@@ -465,8 +468,10 @@ public class StatementGenerator {
         case RPatternContext rPattern:
             RecordPatternContext recordPattern = rPattern.recordPattern();
             return convert(recordPattern);
-        default:
+            case Java17Parser.LPatternContext patternContext: return new LiteralPattern(TypePlaceholder.fresh(patternContext.start), patternContext.literal().get(0).getText(), patternContext.start);
-            throw new NotImplementedException();
+
+            default:
+                throw new NotImplementedException();
 
         }
     }
@@ -479,7 +484,8 @@ public class StatementGenerator {
         //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);
-        return new RecordPattern(subPattern, text, type, recordPatternCtx.getStart());
+        var ret = new RecordPattern(subPattern, text, type, recordPatternCtx.getStart());
+        return ret;
     }
 
     private Statement convert(Java17Parser.WhileloopContext stmt) {

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

@@ -0,0 +1,29 @@
+package de.dhbwstuttgart.syntaxtree;
+
+
+import de.dhbwstuttgart.syntaxtree.ASTVisitor;
+import de.dhbwstuttgart.syntaxtree.Pattern;
+import de.dhbwstuttgart.syntaxtree.StatementVisitor;
+import de.dhbwstuttgart.syntaxtree.statement.Expression;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
+import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
+import org.antlr.v4.runtime.Token;
+
+public class LiteralPattern extends FormalParameter
+{
+    public final Object value;
+    public LiteralPattern(RefTypeOrTPHOrWildcardOrGeneric type, Object value, Token offset) {
+        super((String) value, type, offset);
+
+        this.value = value;
+    }
+    @Override
+    public FormalParameter withType(RefTypeOrTPHOrWildcardOrGeneric type) {
+        return null;
+    }
+    @Override
+    public void accept(ASTVisitor visitor) {
+        visitor.visit(this);
+    }
+}

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

@@ -3,6 +3,7 @@ package de.dhbwstuttgart.syntaxtree;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
 import de.dhbwstuttgart.syntaxtree.statement.*;
 
+
 public interface StatementVisitor {
 
     void visit(ArgumentList argumentList);

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

@@ -117,6 +117,8 @@ public class TYPEStmt implements StatementVisitor {
     public void visit(FieldVar fieldVar) {
         fieldVar.receiver.accept(this);
         Set<Constraint> oderConstraints = new HashSet<>();
+
+
         for (FieldAssumption fieldAssumption : info.getFields(fieldVar.fieldVarName)) {
             Constraint constraint = new Constraint();
             GenericsResolver resolver = getResolverInstance();
@@ -128,7 +130,6 @@ public class TYPEStmt implements StatementVisitor {
             throw new TypeinferenceException("Kein Feld " + fieldVar.fieldVarName + " gefunden", fieldVar.getOffset());
         constraintsSet.addOderConstraint(oderConstraints);
     }
-
     @Override
     public void visit(ForStmt forStmt) {
         forStmt.initializer.forEach(s -> s.accept(this));

src/test/java/TestComplete.java

@@ -728,7 +728,12 @@ public class TestComplete {
 
         assertEquals(res, expected);
     }
+    @Test
+    public void testSwitchRecordLiteral() throws Exception {
+        var classFiles = generateClassFiles(new ByteArrayClassLoader(), "PatternMatchingLiteralStyle.jav");
+        var clazz = classFiles.get("SwitchOverload");
 
+    }
     @Test
     public void testSwitchCaseHeritageDetection() throws Exception {
         var classFiles = generateClassFiles(new ByteArrayClassLoader(), "SwitchCaseHeritageDetection.jav");