Upload test for #298

with '#' will be ignored, and an empty message aborts the commit.

.gitea/workflows/build_and_test.yml

@@ -0,0 +1,25 @@
+name: Build and Test with Maven
+on: [push]
+
+jobs:
+  Build-and-test-with-Maven:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v3
+      - name: Install maven
+        run: |
+          apt update
+          apt install -y maven
+      - name: Install java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+          cache: 'maven'
+      - name: Compile project
+        run: |
+          mvn compile
+      - name: Run tests
+        run: |
+          mvn test

.gitignore

@@ -19,7 +19,9 @@ bin
 .DS_Store
 .project
 .settings/
+.vscode/
 /target/
+settings.json
 
 #
 manually/

README_aktuelle_Branches

@@ -9,3 +9,6 @@ Stand: 24.5.21
   simplifyRes, Basis fuer Plugin, sollte auf Plugin gemerged werden, noch keine Packages, Michael
   strucTypesNew, Struturelle Typen, alte Basis, arbeite derzeit niemand
 
+Stand 21.2.23
+  unif23: Testbranch fuer Tagungseinrecihung Unif23
+

doc/pluginBau.md

@@ -0,0 +1,24 @@
+## Bau und installation des Eclipse plugins
+
+1. Zunächst muss der JavaTX Compiler gebaut werden. Dafür wird im Rootverzeichnis des JavaTX Compilers
+`mvn install` ausgeführt. Falls die Tests nicht laufen kann das mit `-DskipTests` beseitigt werden.
+
+2. Dann muss das Plugin gebaut werden. Dafür muss ebenfalls `mvn install` ausgeführt werden, im Rootverzeichnis des Plugins.
+Falls es dabei zu Fehlern mit der Java-Version kommen sollte muss man in ~\.mavenrc oder \~.mavenrc_pre.bat die Zeile
+`set JAVA_HOME=<JDK-19-Pfad>` (Windows) oder `JAVA_HOME="<JDK-19-Pfad>"` (Linux) einfügen. Damit sollte maven korrekt konfiguriert sein.
+
+3. Als letzter Schritt muss nun das Plugin in Eclipse geladen werden. Wichtig dabei ist, dass Eclipse selber mit Java 19 startet.
+Dafür kann die Datei `eclipse.ini` angepasst werden die im Installationsverzeichnis von Eclipse vorhanden ist. Hier müssen zwei Zeilen
+eingetragen werden:
+```
+-vm
+<JDK-19-Pfad>/javaw.exe
+```
+Ganz am Anfang der Datei
+und unter -vmargs die Option `--enable-preview`
+
+4. Das gebaute Plugin befindet sich unter `JavaCompilerPlugin\releng\JavaCompilerPlugin.Update\target`
+Um dieses Plugin in Eclipse laden zu können muss den Dialog `Help > Install new Software` öffnen. Oben rechts steht die Option `Add...`
+Im sich öffnenden Dialog muss man `Archive` anklicken und dort das Zip Archiv aus dem Oben genannten Pfad einfügen. Nun mit Add den Dialog schließen.
+Als letztes muss in der Liste oben der Eintrag `JavaCompilerPlugin.Update` ausgewählt werden. Hier sollte nun unten das Plugin angezeigt werden.
+Einfach auswählen und unten Next drücken. Damit sollte der Vorgang abgeschlossen sein.

pom.xml

@@ -42,7 +42,7 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 		<dependency>
 			<groupId>org.ow2.asm</groupId>
 			<artifactId>asm</artifactId>
-			<version>7.0</version>
+			<version>9.5</version>
 		</dependency>
 	</dependencies>
 
@@ -51,13 +51,29 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.0</version>
+				<version>3.11.0</version>
 				<configuration>
 					<compilerArgs>--enable-preview</compilerArgs>
-                    <source>19</source>
-                    <target>19</target>
+                    <source>21</source>
+                    <target>21</target>
                 </configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>3.1.0</version>
+				<configuration>
+					<redirectTestOutputToFile>true</redirectTestOutputToFile>
+					<reportsDirectory>${project.build.directory}/test-reports</reportsDirectory>
+					<argLine>--enable-preview</argLine>
+					<trimStackTrace>true</trimStackTrace>
+					<excludes>
+						<exclude>**/JavaTXCompilerTest.java</exclude>
+						<exclude>**/AllgemeinTest.java</exclude>
+						<exclude>**/syntaxtreegenerator/*.java</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.antlr</groupId>
 				<artifactId>antlr4-maven-plugin</artifactId>
@@ -74,6 +90,7 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.3.0</version>
 				<configuration>
 					<archive>
 						<manifest>
@@ -112,8 +129,6 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 		</repository>
 	</repositories>
 	<properties>
-		<maven.compiler.source>19</maven.compiler.source>
-		<maven.compiler.target>19</maven.compiler.target>
 		<mainClass>de.dhbwstuttgart.core.ConsoleInterface</mainClass>
 	</properties>
 	<distributionManagement>
@@ -123,4 +138,4 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 			<url>file:///${project.basedir}/maven-repository/</url>
 		</repository>
 	</distributionManagement>
-</project>
+</project>

resources/AllgemeinTest/Box.jav

@@ -1,13 +0,0 @@
-class Box<A>{
-void m(A a){}
-}
-
-class B { }
-
-class Box_Main extends B {
-
-    m(b) {
-       b.m(new Box_Main());
-       b.m(new B());
-    }
-}

resources/AllgemeinTest/Box_Main.jav

@@ -1,13 +0,0 @@
-class Box<A>{
-	A f;
-}
-
-class B { }
-
-class Box_Main extends B {//Fehler Bugzilla Bug 230
-
-    m(b) {
-    	b.f = new Box_Main();
-    	b.f = new B();
-    }
-}

resources/AllgemeinTest/Complex.jav

@@ -0,0 +1,22 @@
+class Pair<U, T> {
+    U a;
+    T b;
+    Pair(U x, T y) {
+        a = x; b = y;
+    }
+}
+
+class Complex {
+    m(b) {
+        var c = b;
+        var d = c;
+        var e;
+        d = e;
+        var r1 = e;
+        var f = e;
+        var g;
+        f = g;
+        var r2 = g;
+        return new Pair<>(r1, r2);
+    }
+}

resources/AllgemeinTest/FCTest1.jav

@@ -1,12 +0,0 @@
-import java.util.Vector;
-import java.util.List;
-import java.lang.Integer;
-
-class FCTest1 extends Vector<Vector<Integer>> {
-	fc1() {
-		var y;
-		var z;
-		y.add(z);
-		return y;
-	}
-}

resources/AllgemeinTest/FCTest2.jav

@@ -1,11 +0,0 @@
-import java.util.Vector;
-import java.util.List;
-import java.lang.Integer;
-
-class FCTest2 extends Vector<Vector<Integer>> {
-	fc2(y) {
-		var z;
-		y.add(z);
-		return y;
-	}
-}

resources/AllgemeinTest/FCTest3.jav

@@ -1,19 +0,0 @@
-import java.util.Vector;
-import java.lang.Integer;
-
-class FCTest3 extends Pair<Vector<Integer>, Vector<Integer>> {
-
-	
-	fc2(x) {
-		x.snd().addElement(2);
-	}
-	
-	
-	
-	fc2a() {
-		var y;
-		y.snd().addElement(2);
-		return y;
-	}
-	
-}

resources/AllgemeinTest/GenTest.jav

@@ -1,10 +0,0 @@
-import java.lang.Integer;
-import java.util.Vector;
-
-public class GenTest {
-
-    main(x) {
-		var v = new Vector();
-		return 1 + v.elementAt(0);
-    }
-}

resources/AllgemeinTest/Generics.jav

@@ -1,9 +0,0 @@
-class Generics {
-    a;
-    id(b) { return b; }
-    setA(x) {
-        a = x;
-        return a;
-    }
-    m(x,y) { x = id(y); }
-}

resources/AllgemeinTest/InfReturn.jav

@@ -0,0 +1,7 @@
+public class InfReturn {
+    m(a) {
+        var ret;
+        a = ret;
+        return ret;
+    }
+}

resources/AllgemeinTest/InfReturnII.jav

@@ -0,0 +1,8 @@
+public class InfReturnII {
+    m(a, b) {
+        var ret;
+        a = ret;
+        b = ret;
+        return ret;
+    }
+}

resources/AllgemeinTest/InnerInf.jav

@@ -0,0 +1,7 @@
+class InnerInf {
+    m(a, b) {
+        var i;
+        a = i;
+        b = i;
+    }
+}

resources/AllgemeinTest/Iteration.jav

@@ -0,0 +1,43 @@
+/*
+class Pair<T, U> {
+	T x;
+	U y;
+	
+	public Pair() { }
+	public Pair(T x, U y) {
+		this.x = x;
+		this.y = y;
+	}
+	
+	public T fst () {
+		return x;
+	}
+	
+	public U snd () { 
+		return y;
+    }
+}
+*/
+
+public class Iteration {
+    id(x) {
+        return x;
+    }
+
+    m1(x, y) {
+    	var help;
+        help = m2(x, y);
+        var y2 = help.snd();
+        var x2 = id(x);
+        return new Pair<>(x2,y2);
+
+    }
+
+    m2(x,y) {
+        var help = m1(x, y);
+        var x2 = help.fst();
+        var y2 = id(y);
+        return new Pair<>(x2, y2);
+    }
+}
+ 

resources/AllgemeinTest/M.jav

@@ -1,7 +0,0 @@
-import java.util.List;
-class M {
-void m(p, p2){
-
-  new addList().addLists(p, p2);
-}
-}

resources/AllgemeinTest/Overloading.jav

@@ -0,0 +1,7 @@
+import java.lang.Integer;
+import java.lang.Double;
+
+class Overloading {
+	m(x) { return x + x; }
+	m(x) { return x || x; }
+}

resources/AllgemeinTest/OverloadingMain.jav

@@ -1,9 +0,0 @@
-import java.util.Stack;
-import java.util.Vector;
-
-class OverloadingMain {
-
-    mmMain(x) { var y; return new O1().mm(y); }
-      
-}
-	   

resources/AllgemeinTest/Overloading_Generics.jav

@@ -1,20 +0,0 @@
-import java.lang.Integer;
-
-
-public class Overloading_Generics {
-
-    id1 (x) { return x; }
-
-    //Integer id (Integer x) { return x; }
-}
-
-
-class Overloading_Generics1 {
-    main(x) {
-		var olg = new Overloading_Generics();
-		return olg.id1(1);
-    }
-}
-
-
-

resources/AllgemeinTest/OverrideMain.jav

@@ -1,25 +0,0 @@
-import java.util.Vector;
-import java.util.Stack;
-
-class OverrideMain {
-    ovrMain(x) {
-	var overide;
-	overide.ovr(x);
-    }
-}
-
-/*
- [
-  [(TPH L = java.util.Stack<TPH FTM>), (TPH N = java.lang.String), (TPH M = ? extends Override2), (TPH FTN, TPH FTM), (TPH K = void)], 
-[(TPH FTO, TPH FTP), (TPH M = ? extends Override2), (TPH N = java.lang.String), (TPH L = java.util.Stack<TPH FTP>), (TPH K = void)], 
-[(TPH M = ? extends Override2), (TPH N = java.lang.String), (TPH K = void), (TPH FTR, TPH FTQ), (TPH L = java.util.Vector<TPH FTQ>)], 
-[(TPH FTT, TPH FTS), (TPH M = ? extends Override2), (TPH L = java.util.Vector<TPH FTS>), (TPH K = void), (TPH N = java.lang.String)], 
-[(TPH L = java.util.Vector<TPH FTV>), (TPH M = ? extends Override2), (TPH N = java.lang.String), (TPH FTU, TPH FTV), (TPH K = void)], 
-[(TPH FTX, TPH FTW), (TPH M = ? extends Override2), (TPH L = java.util.Vector<TPH FTW>), (TPH K = void), (TPH N = java.lang.String)], 
-[(TPH M = ? extends Override2), (TPH L = java.util.Stack<TPH FTZ>), (TPH K = void), (TPH FTY, TPH FTZ), (TPH N = java.lang.String)], 
-[(TPH FUB, TPH FUA), (TPH K = void), (TPH M = ? extends Override2), (TPH N = java.lang.String), (TPH L = java.util.Vector<TPH FUA>)], 
-[(TPH N = java.lang.String), (TPH L = java.util.Vector<TPH FUC>), (TPH FUD, TPH FUC), (TPH M = ? extends Override2), (TPH K = void)], 
-[(TPH N = java.lang.String), (TPH FUF, TPH FUE), (TPH M = ? extends Override2), (TPH K = void), (TPH L = java.util.Vector<TPH FUE>)]]
-
- [[(TPH M = ? extends Override2), (TPH MNX, TPH MNY), (TPH N = java.lang.String), (TPH K = void), (TPH L = java.util.Stack<TPH MNY>)], [(TPH L = java.util.Stack<TPH MOC>), (TPH N = java.lang.String), (TPH M = ? extends Override2), (TPH K = void), (TPH MOB, TPH MOC)], [(TPH M = ? extends Override2), (TPH N = java.lang.String), (TPH MNZ, TPH MOA), (TPH L = java.util.Vector<TPH MOA>), (TPH K = void)], [(TPH L = java.util.Vector<TPH MOE>), (TPH K = void), (TPH M = ? extends Override2), (TPH MOD, TPH MOE), (TPH N = java.lang.String)], [(TPH M = ? extends Override2), (TPH K = void), (TPH N = java.lang.String), (TPH MOF, TPH MOG), (TPH L = java.util.Stack<TPH MOG>)], [(TPH L = java.util.Vector<TPH MOI>), (TPH K = void), (TPH MOH, TPH MOI), (TPH M = ? extends Override2), (TPH N = java.lang.String)], [(TPH L = java.util.Vector<TPH MOK>), (TPH MOJ, TPH MOK), (TPH K = void), (TPH M = ? extends Override2), (TPH N = java.lang.String)], [(TPH MOL, TPH MOM), (TPH L = java.util.Stack<TPH MOM>), (TPH M = ? extends Override2), (TPH K = void), (TPH N = java.lang.String)], [(TPH L = java.util.Vector<TPH MOO>), (TPH MON, TPH MOO), (TPH N = java.lang.String), (TPH K = void), (TPH M = ? extends Override2)], [(TPH L = java.util.Stack<TPH MOP>), (TPH N = java.lang.String), (TPH M = ? extends Override2), (TPH MOQ, TPH MOP), (TPH K = void)]]
-*/

resources/AllgemeinTest/OverrideMainRet.jav

@@ -1,11 +0,0 @@
-import java.util.Vector;
-import java.util.Stack;
-
-class OverrideMainRet {
-    ovrMain() {
-	var overide;
-	var x;
-	overide.ovr(x);
-	return x;
-    }
-}

resources/AllgemeinTest/Pair.jav

@@ -13,7 +13,7 @@ class Pair<U, T> {
 		return ret;
     }
 
-
+ 
     eq(a, b) {
     	b = a;
     	return a == b;

resources/AllgemeinTest/Pair.java

@@ -1,18 +0,0 @@
-class Pair<T, U> {
-	T x;
-	U y;
-	
-	public Pair() { }
-	public Pair(T x, U y) {
-		this.x = x;
-		this.y = y;
-	}
-	
-	public T fst () {
-		return x;
-	}
-	
-	public U snd () { 
-		return y;
-    }
-}

resources/AllgemeinTest/Put.jav

@@ -1,19 +0,0 @@
-import java.util.Vector;
-import java.util.Stack;
-
-class Put {
-
-    putElement(ele, v) {
-	    v.addElement(ele);
-    }
-
-    putElement(ele, s) {
-	    s.push(ele);
-    }
-
-
-    main(ele, x) { 
-        putElement(ele, x);
-    }
-
-}

resources/AllgemeinTest/RecursionCond.jav

@@ -0,0 +1,8 @@
+class RecursionCond {
+    m(a, b, c) {
+        if (1 == 2) {
+            b = m(a, b);
+            c = m(a, b);
+        } else return a;
+    }
+}

resources/AllgemeinTest/StreamTest.jav

@@ -0,0 +1,14 @@
+import java.util.stream.Stream;
+import java.util.Vector;
+import java.lang.Integer;
+
+class StreamTest {
+
+      m() {
+      	     var vecInt = new Vector<Integer>();
+	     var strInt = vecInt.stream();
+	     var dup = x -> x*2;
+	     strInt.map(dup);
+	     return dup;
+      }
+}

resources/AllgemeinTest/Test.jav

@@ -1,4 +1,9 @@
-class Test {
-	a;
-	Test b;
+import java.lang.Boolean;
+import java.lang.Integer;
+
+public class Test {
+	fac = (x) -> {
+		if (x == 1) { return 1; }
+		return x * fac.apply(x - 1);
+	};
 }

resources/AllgemeinTest/TestSubTypless.jav

@@ -1,12 +0,0 @@
-import java.util.ArrayList;
-
-class TestSubTypless {
-        m(a){
-                var l = new ArrayList<>();
-                l.add(a);
-                return m2(l).get(0);
-        }
-        m2(a){
-                return m(a);
-        }
-}

resources/AllgemeinTest/TripleTest.jav

@@ -0,0 +1,19 @@
+class Triple<U, T, S> {
+    U a;
+    T b;
+    S c;
+
+    Triple(U x, T y, S z) {
+        a = x; b = y; c = z;
+    }
+
+    U fst() { return a; }
+    T snd() { return b; }
+    S thrd() { return c; }
+}
+
+public class TripleTest {
+    m() {
+        return new Triple<>(m().thrd(), m().thrd(), m().thrd());
+    }
+}

resources/AllgemeinTest/Twice.jav

@@ -1,3 +0,0 @@
-class Twice {
-    twice = f -> x -> f.apply(f.apply(x));
-}

resources/AllgemeinTest/Twice2.jav

@@ -0,0 +1,12 @@
+class Twice2 {
+	id1inst = new Id<>();
+	id1 = id1inst.id;
+	id2inst = new Id<>();
+	id2 = id2inst.id;
+    twice = id1.apply(id2);
+	    
+}
+
+class Id<T> {
+	id = (T x) -> x;
+} 

resources/AllgemeinTest/Var.jav

@@ -1,5 +0,0 @@
-class Var {
-
-    var(x) { var y;  }
-      
-}

resources/AllgemeinTest/VectorConstAdd.jav

@@ -1,15 +0,0 @@
-import java.util.Vector;
-import java.lang.Integer;
-
-
-public class VectorConstAdd {
-	vectorAdd(v1) {
-		var i = 0;
-		var erg = new Vector<>();
-		while (i < v1.size()) {
-			erg.addElement(v1.elementAt(i) + 1);
-			i++;
-		} 
-		return erg; 
-	}
-}

resources/AllgemeinTest/VectorNotObject.jav

@@ -1,9 +0,0 @@
-import java.util.Vector;
-
-class VectorNotObject {
- 
- vectorAddAll(v1, v2) {
-        v1.addAll(v2);
- 	    return v1;
- 	}
- }

resources/AllgemeinTest/Wildcard_Andi.jav

@@ -1,8 +0,0 @@
-class Wildcard_Andi {
-
-    Test<? extends A> ex = new Test<>();
-
-    Test<? super A> sup = new Test<>();
-}
-
-

resources/AllgemeinTest/addList.jav

@@ -1,8 +0,0 @@
-import java.util.List;
-
-class addList {
- addLists(a, b){
-a.add(b.get(0));
-b.add(a.get(0));
-}
-}

resources/AllgemeinTest/wildcardPair.jav

@@ -1,22 +0,0 @@
-import java.util.List;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Boolean;
-
-class wildcardPair {
-
-	make(l) { 
-		var p = new Pair(l.get(0), l.get(1));
-		return p; 
-	}
-	//<X>Boolean compare(Pair<X, X> x) { return true; }
-	void m(l) {
-		Object o = l.get(0);
-		
-		//Pair<? extends Object, ? extends Object> p;
-		//List<?> b;
-		//this.compare(p);             //1, type incorrect
-		make(l);
-		//this.compare(this.make(b));  //2, OK
-	} 
-}

resources/bytecode/javFiles/AA.jav

@@ -2,7 +2,7 @@ import java.lang.Integer;
 import java.lang.String;
 
 public class AA {
-	m(Integer i) { return "AA"; }
+	public m(Integer i) { return "AA"; }
 	
-	m2(AA x) { return "AA"; }
+	public m2(AA x) { return "AA"; }
 }

resources/bytecode/javFiles/Access.jav

@@ -0,0 +1,14 @@
+public class Access {
+    public int fPublic;
+    int fDefault;
+    private int fPrivate;
+    protected int fProtected;
+
+    public void mPublic() {}
+    void mDefault() {}
+    private void mPrivate() {}
+    protected void mProtected() {}
+}
+
+class AccessDefault {
+}

resources/bytecode/javFiles/Annotation.jav

@@ -0,0 +1,8 @@
+class Base {
+    public void foo() {}
+}
+
+public class Annotation extends Base {
+    @Override
+    public void foo() {}
+}

resources/bytecode/javFiles/BB.jav

@@ -1,3 +1,4 @@
 import java.lang.Integer;
+import AA;
 
 public class BB extends AA { }

resources/bytecode/javFiles/BinaryInMeth.jav

@@ -3,15 +3,15 @@ import java.lang.Double;
 
 public class BinaryInMeth {
 	
-	m(a){
+	public m(a){
 		return ++a;
 	}
 	
-	m2(a,b){
+	public m2(a,b){
 		return m(a+b);
 	}
 	
-	m3(a) {
+	public m3(a) {
 		return m(++a);
 	}
 }

resources/bytecode/javFiles/Bug112.jav

@@ -0,0 +1,7 @@
+public class Bug112 {
+    public m(x) {
+        var y;
+        x = y;
+        return y;
+    }
+}

resources/bytecode/javFiles/Bug122.jav

@@ -0,0 +1,12 @@
+import java.lang.Integer;
+import java.lang.Boolean;
+
+public class Bug122 {
+    public void main() {
+        if (true) {
+            for (Integer i = 0; i < 10; i++) {
+
+            }
+        }
+    }
+}

resources/bytecode/javFiles/Bug123.jav

@@ -0,0 +1,13 @@
+import java.lang.Boolean;
+import java.lang.Integer;
+
+public class Bug123 {
+    public Boolean works(){
+        if(true) return true;
+        else return false;
+    }
+    public void fails(){
+        Boolean a = true;
+        if(true) a = false;
+    }
+}

resources/bytecode/javFiles/Bug125.jav

@@ -0,0 +1,16 @@
+import java.lang.Boolean;
+import java.lang.Integer;
+import java.lang.String;
+import java.util.List;
+import java.util.LinkedList;
+import java.util.ArrayList;
+
+public class Bug125 {
+    static ArrayList<String> works = new ArrayList<>();
+    static List<String> fails = new ArrayList<>();
+
+    public void main() {
+        works.toString();
+        fails.toString();
+    }
+}

resources/bytecode/javFiles/Bug285.jav

@@ -0,0 +1,15 @@
+import java.util.Optional;
+import java.lang.Integer;
+
+public class StaticClass {
+    public static StaticClass barbar() {
+        return new StaticClass();
+    }
+}
+
+public class Bug285 {
+    public void foo() {
+        Optional<Integer> opt = Optional.empty();
+        StaticClass b = StaticClass.barbar();
+    }
+}

resources/bytecode/javFiles/Bug290A.jav

@@ -0,0 +1,7 @@
+import Bug290B;
+
+public class Bug290A {
+    public void m() {
+        new Bug290B();
+    }
+}

resources/bytecode/javFiles/Bug290B.jav

@@ -0,0 +1,11 @@
+import java.lang.String;
+import java.lang.Integer;
+
+public class Bug290B {
+    String name;
+
+    public Bug290B() {
+        Integer i = 0;
+        name = i.toString() + "$$";
+    }
+}

resources/bytecode/javFiles/Bug293.jav

@@ -0,0 +1,13 @@
+import java.lang.Integer;
+import java.lang.Float;
+
+public class Bug293 {
+    bar(a) {
+        return 2 * a;
+    }
+}
+
+interface IFoo {
+    void ga();
+}
+

resources/bytecode/javFiles/Bug295.jav

@@ -0,0 +1,18 @@
+import java.lang.Integer;
+
+public class Bug295 {
+    public Integer a;
+    public Integer b;
+    public Integer c;
+
+    public Bug295(a, b, c) {
+        this(a);
+        this.b = b;
+        this.c = c;
+    }
+
+    public Bug295(a) {
+        this.a = a;
+    }
+}
+

resources/bytecode/javFiles/Bug296.jav

@@ -0,0 +1,11 @@
+import java.lang.Integer;
+
+public class Bug296 {
+    public static m1() {
+        return m2();
+    }
+
+    static m2() {
+        return 10;
+    }
+}

resources/bytecode/javFiles/Bug297.jav

@@ -0,0 +1,11 @@
+import java.lang.Integer;
+
+public class Bug297 {
+    public static operation(func, a, b) {
+        return func.apply(a, b);
+    }
+
+    public exec() {
+        return Foo.operation((x, y) -> x + y, 10, 10);
+    }
+}

resources/bytecode/javFiles/Bug298.jav

@@ -0,0 +1,19 @@
+import java.util.List;
+import java.util.ArrayList;
+import java.lang.Integer;
+import java.lang.System;
+import java.io.PrintStream;
+import java.util.stream.Stream;
+import java.util.function.Function;
+
+public class Bug298 {
+    public <R, T> Stream<R> takes(Stream<T> s, Function<? super T, ? super R> fun) {
+        return null;
+    }
+
+    public void m() {
+        List<Integer> list = new ArrayList<>();
+        Stream<Integer> a = list.stream();
+        takes(a, x -> 2 * x);
+    }
+}

resources/bytecode/javFiles/Bug98.jav

@@ -2,9 +2,9 @@ import java.util.Vector;
 import java.lang.Integer;
 import java.lang.String;
 
-class WildcardCaptureConversionTest {
+public class Bug98 {
 
-	m(x, y ,z) {
+	public m(x, y ,z) {
 		x = new Vector<Integer>();
 		y = new Vector<String>();
 		x.add(1);
@@ -13,4 +13,4 @@ class WildcardCaptureConversionTest {
 		//String s = y.elementAt(0);
 	    return 	z.vectorAddAll(x, y);
 	}
-} 
+}

resources/bytecode/javFiles/CC.jav

@@ -1,11 +1,11 @@
 import java.lang.Integer;
 import java.lang.String;
-
+import BB;
 
 public class CC extends BB {
-	m(Integer i) { 
+	public m(Integer i) {
 	   return "CC"; 
 	}
 	
-	m2(CC x) { return "CC"; }
+	public m2(CC x) { return "CC"; }
 }	

resources/bytecode/javFiles/Chain.jav

@@ -0,0 +1,13 @@
+import java.lang.Integer;
+
+public class Chain {
+    x = 5;
+
+    chain() {
+        return this;
+    }
+
+    public m() {
+        return this.chain().chain().chain().x;
+    }
+}

resources/bytecode/javFiles/Cycle.jav

@@ -1,5 +1,5 @@
-class Cycle {
-    m(x, y) {
+public class Cycle {
+    public m(x, y) {
         y = x;
         x = y;
     }

resources/bytecode/javFiles/DD.jav

@@ -1,4 +1,5 @@
 import java.lang.Integer;
+import CC;
 
 public class DD extends CC { }
 

resources/bytecode/javFiles/Exceptions.jav

@@ -1,3 +1,8 @@
+import java.lang.String;
+import java.lang.RuntimeException;
+
 public class Exceptions {
-//	m(Integer i) throws 
+    public m() {
+        throw new RuntimeException("Some Exception");
+    }
 }

resources/bytecode/javFiles/Fac.jav

@@ -1,12 +1,12 @@
 import java.lang.Integer;
-//import java.lang.Double;
+import java.lang.Double;
+import java.lang.String;
 
-public class Fac  {
-	
-	getFac(n){
+public class Fac {
+	getFac(n) {
 		var res = 1;
 		var i = 1;
-		while(i<=n) {
+		while (i <= n) {
 			res = res * i;
 			i++;
 		}

resources/bytecode/javFiles/Faculty.jav

@@ -17,7 +17,7 @@ public class Faculty {
     
     
     
-    public getFact(x) {
+    public getFact(java.lang.Integer x) {
         return fact.apply(x);
     }
 }

resources/bytecode/javFiles/FieldTph2.jav

@@ -1,12 +1,14 @@
+import java.lang.String;
+
 public class FieldTph2 {
-	a;
+	public a;
 	
-	m(b){
+	public m(b){
 		b = a;
 		return b;
 	}
 	
-	m2(c){
+	public m2(c){
 		a = c;
 	}
 }

resources/bytecode/javFiles/FieldTphConsMeth.jav

@@ -1,20 +1,20 @@
 public class FieldTphConsMeth {
 	
-	a;
+	public a;
 	public FieldTphConsMeth(c) {
 		a = id(c);
 	}
 	
-	id(b) {
+	public id(b) {
 		return b;
 	}
 
-	setA(x) {
+	public setA(x) {
 	    a = x;
 	    return a;
 	}
 
-	m(x,y) {
+	public m(x,y) {
 	    x = id(y);
 	}
 

resources/bytecode/javFiles/FieldTphMMeth.jav

@@ -1,13 +1,13 @@
 import java.lang.Boolean;
 
 public class FieldTphMMeth {
-	a;
+	public a;
 	
 	public FieldTphMMeth(c,d,e) {
 		a = m(c,d,e);
 	}
 	
-	m(b,d,e) {
+	public m(b,d,e) {
 		if(e) {
 			return m3(b);
 		} else{
@@ -16,11 +16,11 @@ public class FieldTphMMeth {
 		
 	}
 	
-	m2(b) {
+	public m2(b) {
 		a = m3(b);
 	}
 	
-	m3(b){
+	public m3(b){
 		return b;
 	}
 	

resources/bytecode/javFiles/For.jav

@@ -1,23 +1,23 @@
 import java.lang.Integer;
 import java.lang.Boolean;
 
-class For{
-	Integer m(Integer x){
+public class For{
+	public Integer m(Integer x){
 		var c = x + 2;
-//		Boolean b = true;
-//		c = 5;
-//		c++;
-//		++c;
-//		c--;
-//		--c;
-//		while(x<2){
-//			x = x +1;
-//			b = false;
-//		}
-		return c;
-//		for(int i = 0;i<10;i++) {
-//			x = x + 5;
-//		}
+		Boolean b = true;
+		c = 5;
+		c++;
+		++c;
+		c--;
+		--c;
+		while(x<2){
+			x = x +1;
+			b = false;
+		}
+		for(int i = 0; i<10; i++) {
+			x = x + 5;
+		}
+		return x;
 	}
 	
 //	m2(Integer x){

resources/bytecode/javFiles/ForEach.jav

@@ -0,0 +1,23 @@
+import java.util.ArrayList;
+import java.lang.Integer;
+import java.lang.Number;
+
+public class ForEach {
+    public m() {
+        var list = new ArrayList<>();
+        list.add(1); list.add(2); list.add(3);
+
+        var sum = 0;
+        for (var i : list) {
+            sum = sum + i;
+        }
+        return sum;
+    }
+
+    public m2() {
+        var list = new ArrayList<? extends Number>();
+
+        for (Number n : list) {
+        }
+    }
+}