Merge branch 'targetBytecode' of ssh://gitea.hb.dhbw-stuttgart.de:2221/JavaTX/JavaCompilerCore into targetBytecode

resources/bytecode/javFiles/Y.jav

@@ -2,41 +2,21 @@ import java.lang.Integer;
 
 public class Y {
     y;
-    //factorial;
-
     public Y() {
-		y =  f -> t -> f.apply(y.apply(f)).apply(t);
+		y = f -> t -> f.apply(y.apply(f)).apply(t);
-		//factorial = y.apply(f -> n -> { if (n == 0) return 1; else return n * f.apply(n - 1); });
-    }
-  /*  
-    getY() {
-      return y;
-    }
-    */
-}
-/*
-class fac1 {
-    factorial;
-
-    fac1() {
-      var y;
-	  y = new Y<Integer,Integer,Integer,Integer,Integer>().getY();
-	  factorial = y.apply(f -> n -> { if (n == 0) return 1; else return n * f.apply(n - 1); });
     }
 }
 
-ergibt Parse-Error
+public class Fac1 {
-class fac1 {
+    public factorial;
-    factorial;
+    public Fac1() {
-
-    fac1() {
     	var y;
-		y = new Y<>().y;
+    	var tmp = new Y<>(); // TODO Having new Y<>().y on one line doesn't work, see FIXME in StatementGenerator
+		y = tmp.y;
 		factorial = y.apply(f -> n -> { if (n == 0) return 1; else return n * f.apply(n - 1); });
     }
-     public static void main(String args[]) {
+
-		System.out.println(new fac1().factorial.apply(3));
+    public fac(v) {
+        return factorial.apply(v);
     }
- 
+}
-}
-*/

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

@@ -697,6 +697,7 @@ public class StatementGenerator {
         if (!Objects.isNull(expr.methodCall())) {
             return convert(expr.methodCall(), expr.expression(), offset);
         } else if (!Objects.isNull(expr.identifier())) {
+            // FIXME This is not the right way of handling any of this
             return generateLocalOrFieldVarOrClassName(expr.getText(), offset);
         } else {
             // Für alle anderen Optionen, wie Feldzugriff, Aufrufe von super oder explizite
@@ -779,6 +780,7 @@ public class StatementGenerator {
      * @return
      */
     private Expression generateLocalOrFieldVarOrClassName(String expression, Token offset) {
+        // FIXME Why does this take a String argument???
         String[] parts = expression.split("\\.");
         if (parts.length < 2) {
             // Check for localVar:

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

@@ -188,9 +188,8 @@ public class ClassOrInterface extends SyntaxTreeNode implements TypeScope {
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
+    if (!(o instanceof ClassOrInterface other)) return false;
-    ClassOrInterface that = (ClassOrInterface) o;
+    return Objects.equals(name, other.name);
-    return Objects.equals(name, that.name);
   }
 
   @Override

src/test/java/TestComplete.java

@@ -602,7 +602,11 @@ public class TestComplete {
     @Test
     public void yTest() throws Exception {
         var classFiles = generateClassFiles(new ByteArrayClassLoader(), "Y.jav");
-        var instance = classFiles.get("Y").getDeclaredConstructor().newInstance();
+
+        var fac1 = classFiles.get("Fac1");
+        var instance = fac1.getDeclaredConstructor().newInstance();
+        var fac = fac1.getDeclaredMethod("fac", Integer.class);
+        assertEquals(fac.invoke(instance, 10), 3628800);
     }
 
     @Test