Merge remote-tracking branch 'origin/plugin' into plugin

# Conflicts: # src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java # src/test/resources/bytecode/javFiles/MatrixOP.jav
Merge branch 'bigRefactoring' into plugin
2019-04-05 13:02:17 +02:00 · 2019-04-05 12:56:57 +02:00 · 2019-03-28 15:44:03 +01:00 · 2019-03-20 16:30:21 +01:00 · 2019-03-20 16:24:55 +01:00 · 2019-03-20 14:35:50 +01:00
2235 changed files with 459139 additions and 26481 deletions
@@ -1,9 +0,0 @@
-#
-# https://help.github.com/articles/dealing-with-line-endings/
-#
-# Linux start script should use lf
-/gradlew        text eol=lf
-
-# These are Windows script files and should use crlf
-*.bat           text eol=crlf
-
@@ -23,18 +23,3 @@ bin

 #
 manually/
-
-logFiles/**
-!logFiles/.gitkeep
-
-src/main/java/de/dhbwstuttgart/parser/antlr/
-src/main/java/de/dhbwstuttgart/sat/asp/parser/antlr/
-
-#GRADLE
-# Ignore Gradle project-specific cache directory
-.gradle
-
-# Ignore Gradle build output directory
-build
-
-
@@ -0,0 +1,88 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html> <head>
+<title>Java-TX Plugin</title></head>
+<center>
+<h1>Java-TX Plugin</h1>
+</center>
+<h2>Content</h2>
+<ul>
+  <li><h4><a href="#introduction">Introduction</a></h4></li>
+  <li><h4><a href="newJavaTXProject/newJavaTXProject.html" >New Java-TX project</a></h4></li>
+  <li><h4><a href=" JavaTXExamples.zip" >Example project</a></h4></li>
+  <li><a href="usePlugin/usePlugin.html" >Using the plugin</a></li>
+  <li><h4><a href="install/install.html" >Installation</a></h4>
+</li>
+</ul>
+
+<br/>
+<h2 id="introduction">Introduction</h2>
+Java-TX (Java Type eXtended) is an extension of Java in which a global type inference algorithm and real function types are added. Since the end of the nineties features from functional program- ming languages have been transferred to Java. Parametric polymorphism extended by wildcards, called generics, were transfered to Java 5.0. Higher-order functions and lambda expression were introduced in Java 8. Java 8 uses functional interfaces as target types of lambda expressions in contrast to real function types as in functional programming languages.
+The powerful feature type inference from functional programming languages is incorporated into Java, as into other object-oriented
+languages, i.e. only in a restricted way called local type inference. Local type inference allows certain type annotations to be omitted. For instance, it is often not necessary to specify the type of a variable. Type parameters of classes in the new-statement can be left out. Return types of methods can often also be omitted. Local type inference is at its most pronounced in Scala. In Java 10 an extention of local type inference is introduced, where types of local variables can be replaced by the keyword var and inferred automatically during the compilation. In contrast to global type inference, local type inference allows types of recursive methods and lambda expressions not to be omitted.<br>
+The Java-TX project contributes to the design of object-oriented languages by developing global type inference algorithms for Java-like languages.
+
+<h3>First Example</h3>
+The class <tt>Id</tt> has the method <tt>id</tt>. The type annotations are omitted.
+<br/>
+
+<pre> <code class="language-java">
+  class Id {
+      id(x) {
+          return x;
+      }
+  } 
+</code> </pre>
+The type inference algorithm inferrs the types, such that <tt>Id</tt> can be applied:
+<pre>
+    new Id().id(1);
+
+    new Id().id("hallo");
+</pre>
+
+<h3>More complex example</h3>
+<pre>
+  import java.lang.Integer;
+  import java.lang.Double; 
+  import java.lang.String; 
+
+
+  class OL {
+     m(x) { return x + x; }
+	
+  }
+    
+         
+  class OLMain {
+     main(x) { 
+	var ol;
+	ol = new OL(); 
+	return ol.m(x); 
+     }  
+  }
+</pre>
+The type inference mechanism considers only imported types. Therefore  <tt>Integer</tt> <tt>Double</tt>, and <tt>String</tt> are imported.
+<br/>
+As the operator <tt>+</tt> is overloaded by all numeric types and String the methods  <tt>m</tt> in  the class <tt>OL</tt> and <tt>main</tt> in the class <tt>OLMain</tt>, respectively, gets all these types. The generated classfile demonstrates this:
+<pre>
+> javap OL.class 
+Compiled from "OL.jav"
+class OL {
+  public OL();
+  public java.lang.Integer m(java.lang.Integer);
+  public java.lang.Double m(java.lang.Double);
+}
+
+> javap OLMain.class 
+Compiled from "OLMain.jav"
+class OLMain {
+  public OLMain();
+  public java.lang.Integer main(java.lang.Integer);
+  public java.lang.Double main(java.lang.Double);
+}
+</pre>
+
+
+<hr>
+<address></address>
+<!-- hhmts start -->Last modified: Fri Jun  1 16:43:55 CEST 2018 <!-- hhmts end -->
+</body> </html>
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html> <head>
+<title>Install Java-TX Plugin</title>
+</head>
+
+<body>
+<h1>Install Java-TX Plugin</h1>
+<ol>
+  <li>Select "Install New Software ..."<br>
+  <img width= 400 src="newsoftware.png" >
+  
+  </li>
+  <li>Add ...<br>
+  <img width=550 src="availableSoftware1.png" >
+  </li>
+  <li>Insert address<br>
+  <img width=550 src="availableSoftware2.png" >
+  </li>
+  <li>Select installation<br>
+  <img width=550 src="selectInstallation.png" >
+  </li>
+  <li>Installation details<br>
+  <img width=550 src="installationDetails.png" >
+  </li>
+  <li>Accept license agreement<br>
+  <img width=550 src="licenseAgreement.png" >
+  </li>
+  <li>Install anyway<br>
+  <img width=450 src="installAnyway.png">
+  </li>
+  <li>Restart<br>
+  <img width=450 src="Restart.png">
+  </li>
+</ol>
+
+
+<hr>
+<address></address>
+<!-- hhmts start -->Last modified: Fri Jun  1 11:57:15 CEST 2018 <!-- hhmts end -->
+</body> </html>
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html> <head>
+<title>Install Java-TX Plugin</title>
+</head>
+
+<body>
+<h2>Install Java-TX Plugin</h2>
+<ol>
+  <li>Select "Install New Software ..."<br>
+  <img width= 400 src="newsoftware.png" >
+  
+  </li>
+  <li>Add ...<br>
+  <img width=550 src="availableSoftware1.png" >
+  </li>
+  <li>Insert address<br>
+  <img width=550 src="availableSoftware2.png" >
+  </li>
+  <li>Select installation<br>
+  <img width=550 src="selectInstallation.png" >
+  </li>
+  <li>Installation details<br>
+  <img width=550 src="installationDetails.png" >
+  </li>
+  <li>Accept license agreement<br>
+  <img width=550 src="licenseAgreement.png" >
+  </li>
+  <li>Install anyway<br>
+  <img width=450 src="installAnyway.png">
+  </li>
+  <li>Restart<br>
+  <img width=450 src="Restart.png">
+  </li>
+</ol>
+
+
+<hr>
+<address></address>
+<!-- hhmts start -->Last modified: Fri Jun  1 12:05:43 CEST 2018 <!-- hhmts end -->
+</body> </html>
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html> <head>
+<title></title>
+</head>
+<h2>New Java-TX project in eclipse</h2>
+<ol>
+  <li>New -> Java Project<br/>
+  <img  width= 400 src="newJavaTXProject.png" >
+  </li>
+  <br/>
+  <li>Generate a jav-File folder<br/>
+  <img  width= 550 src="newJavFolder1.png" ><br/><br/>
+  <img  width= 550 src="newJavFolder2.png" >
+  </li>
+  <br/>
+  <li>Add jav-File folder as library<br/>
+  At the moment no package system is implemented, Therefore the compiled class files are in the jav-File folder. This has to be added as library:<br/>
+  <img  width= 550 src="buildPath1.png" ><br/><br/>
+  <img  width= 550 src="buildPath2.png" ><br/><br/>
+  <img  width= 400 src="buildPath3.png" ><br/><br/>
+  <img  width= 550 src="buildPath4.png" ><br/>
+  
+  
+  </li>
+</ol>
+<body>
+<h1></h1>
+
+
+
+<hr>
+<address></address>
+<!-- hhmts start -->Last modified: Fri Jun  1 16:50:02 CEST 2018 <!-- hhmts end -->
+</body> </html>
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html> <head>
+<title>Using the plugin</title>
+</head>
+<h2>Using the plugin</h2>
+<ol>
+  <li>Overview<br/>
+  <img  width=800 src="usePlugin1.png" >
+  </li>
+  <br/>
+  <li>Select types<br/>
+  If the method is overloaded the user can select types in the outline the right mouse button:<br/><br/>
+  <img src="usePlugin2.png" ><br/>
+  </li>
+</ol>
+<body>
+<h1></h1>
+
+
+
+<hr>
+<address></address>
+<!-- hhmts start -->Last modified: Fri Jun  1 16:51:28 CEST 2018 <!-- hhmts end -->
+</body> </html>
@@ -1,53 +0,0 @@
-/*
- * This file was generated by the Gradle 'init' task.
- *
- * This generated file contains a sample Java application project to get you started.
- * For more details take a look at the 'Building Java & JVM projects' chapter in the Gradle
- * User Manual available at https://docs.gradle.org/7.6/userguide/building_java_projects.html
- */
-
-plugins {
-    // Apply the application plugin to add support for building a CLI application in Java.
-    antlr
-    application
-}
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(19))
-    }
-}
-
-repositories {
-    // Use Maven Central for resolving dependencies.
-    mavenCentral()
-}
-
-dependencies {
-    // Use JUnit test framework.
-    testImplementation("junit:junit:4.13.2")
-
-    // This dependency is used by the application.
-    implementation("com.google.guava:guava:31.1-jre")
-    implementation("commons-io:commons-io:2.6")
-    implementation("org.reflections:reflections:0.9.11")
-    implementation("org.ow2.asm:asm:7.0")
-    //implementation("org.antlr:antlr4:4.11.1")
-    antlr("org.antlr:antlr4:4.8-1")
-}
-
-
-tasks.withType<JavaCompile> {
-    options.compilerArgs.add("--enable-preview")
-}
-tasks.withType<Test> {
-    jvmArgs("--enable-preview")
-}
-tasks.withType<JavaExec> {
-    jvmArgs("--enable-preview")
-}
-
-application {
-    // Define the main class for the application.
-    mainClass.set("de.dhbwstuttgart.App")
-}
@@ -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());
-    }
-}
@@ -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();
-    }
-}
@@ -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;
-	}
-}
@@ -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;
-	}
-}
@@ -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;
-	}
-	
-}
@@ -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);
-    }
-}
@@ -1,9 +0,0 @@
-class Generics {
-    a;
-    id(b) { return b; }
-    setA(x) {
-        a = x;
-        return a;
-    }
-    m(x,y) { x = id(y); }
-}
@@ -1,7 +0,0 @@
-import java.util.List;
-class M {
-void m(p, p2){
-
-  new addList().addLists(p, p2);
-}
-}
@@ -1,9 +0,0 @@
-import java.util.Stack;
-import java.util.Vector;
-
-class OverloadingMain {
-
-    mmMain(x) { var y; return new O1().mm(y); }
-      
-}
-	   
@@ -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);
-    }
-}
-
-
-
@@ -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)]]
-*/
@@ -1,11 +0,0 @@
-import java.util.Vector;
-import java.util.Stack;
-
-class OverrideMainRet {
-    ovrMain() {
-	var overide;
-	var x;
-	overide.ovr(x);
-	return x;
-    }
-}
@@ -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;
-    }
-}
@@ -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);
-    }
-
-}
@@ -1,4 +0,0 @@
-class Test {
-	a;
-	Test b;
-}
@@ -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);
-        }
-}
@@ -1,3 +0,0 @@
-class Twice {
-    twice = f -> x -> f.apply(f.apply(x));
-}
@@ -1,5 +0,0 @@
-class Var {
-
-    var(x) { var y;  }
-      
-}
@@ -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; 
-	}
-}
@@ -1,8 +0,0 @@
-class Wildcard_Andi {
-
-    Test<? extends A> ex = new Test<>();
-
-    Test<? super A> sup = new Test<>();
-}
-
-
@@ -1,8 +0,0 @@
-import java.util.List;
-
-class addList {
- addLists(a, b){
-a.add(b.get(0));
-b.add(a.get(0));
-}
-}
@@ -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
-	} 
-}
@@ -1,8 +0,0 @@
-import java.lang.Integer;
-import java.lang.String;
-
-public class AA {
-	m(Integer i) { return "AA"; }
-	
-	m2(AA x) { return "AA"; }
-}
@@ -1,3 +0,0 @@
-import java.lang.Integer;
-
-public class BB extends AA { }
@@ -1,11 +0,0 @@
-import java.lang.Integer;
-import java.lang.String;
-
-
-public class CC extends BB {
-	m(Integer i) { 
-	   return "CC"; 
-	}
-	
-	m2(CC x) { return "CC"; }
-}	
@@ -1,8 +0,0 @@
-import java.lang.Integer;
-
-public class ClassGenLam {
-	lam = x-> x;
-//	public ClassGenLam() {
-//		lam = x->x; 
-//	}
-}
@@ -1,6 +0,0 @@
-class Cycle {
-    m(x, y) {
-        y = x;
-        x = y;
-    }
-}
@@ -1,4 +0,0 @@
-import java.lang.Integer;
-
-public class DD extends CC { }
-
@@ -1,26 +0,0 @@
-public class FieldTphConsMeth {
-	
-	a;
-	public FieldTphConsMeth(c) {
-		a = id(c);
-	}
-	
-	id(b) {
-		return b;
-	}
-
-	setA(x) {
-	    a = x;
-	    return a;
-	}
-
-	m(x,y) {
-	    x = id(y);
-	}
-
-	/*m2(x,y) {
-    	    x = setA(y);
-    	    return x;
-    	}*/
-
-}
@@ -1,20 +0,0 @@
-public class Id {
-//	a;
-//	id(b){
-//		return b;
-//	}
-	id2 = x -> x;
-//	id2 = () -> {
-//		var x = m(a);
-//		var y = x;
-//		var z = y;
-//	};
-//	
-//	m(a){
-//		return a;
-//	}
-	id3 (x) {
-	   	return id2.apply(x);
-	}
-}
-
@@ -1,55 +0,0 @@
-public class Inf {
-	m(x,y,a){
-		var z; 
-		var v;
-		var w;
-		var b;
-		y=x;
-		z=x;
-		v=y;
-		w=y;
-		y=a;
-		b=a;
-	}
-}
-
-/*
-TPH M m(TPH N x, TPH O y, TPH P a)({
-    TPH Q z;
-    TPH R v;
-    TPH S w;
-    TPH T b;
-    (y)::TPH O = (x)::TPH N;
-    (z)::TPH Q = (x)::TPH N;
-    (v)::TPH R = (y)::TPH O;
-    (w)::TPH S = (y)::TPH O;
-    (y)::TPH O = (a)::TPH P;
-    (b)::TPH T = (a)::TPH P;
-    return;
-  })::TPH U
-
-  Inf()({
-    super(());
-  })::TPH X
-
-}
-//    v::R w::S
-//       \  /
-//  z::Q y::O  b::T
-//    \ /   \  /
-//   x::N  a::P
-
-RESULT Final: [[(TPH O < TPH S), (TPH P < TPH O), (TPH O < TPH R), (TPH P < TPH T), (TPH M = void), (TPH N < TPH O), (TPH N < TPH Q)]]
-Simplified constraints: [(TPH O < TPH S), (TPH P < TPH O), (TPH O < TPH R), (TPH P < TPH T), (TPH N < TPH O), (TPH N < TPH Q)]
-m: [(TPH DDV = java.lang.Object), (TPH DDX = java.lang.Object), (TPH DDX < TPH DDV), (TPH N < TPH DDX), (TPH P < TPH DDX)]
-Class Inf: []
-Inf: []
-
-Unify nach Oder-Constraints-Anpassung:
-UND:[(void =. M, , -1 WC: false, IT: false), (N <. O, 1 WC: false, IT: false, 1 WC: false, IT: false), (P <. O, 1 WC: false, IT: false, 1 WC: false, IT: false), (N <. Q, 1 WC: false, IT: false, 0 WC: true, IT: false), (O <. S, 1 WC: false, IT: false, 0 WC: true, IT: false), (O <. R, 1 WC: false, IT: false, 0 WC: true, IT: false), (P <. T, 1 WC: false, IT: false, 0 WC: true, IT: false)]
-isInherited = false
-isStatement = false
-
-ODER:
-*/
-
@@ -1,6 +0,0 @@
-class Infimum {
-    m(x, y, z) {
-        y = x;
-        z = x;
-    }
-}
@@ -1,18 +0,0 @@
-import java.util.Vector;
-
-import java.lang.Integer;
-import java.lang.String;
-
-
-public class Inherit {
-	
-	main(d, i) {
-	  return d.m(i);
-	}
-
-	main(v, i) {
-		var aa = v.elementAt(0);
-		return aa.m(i);
-	}
-
-}
@@ -1,17 +0,0 @@
-import java.util.Vector;
-
-import java.lang.Integer;
-import java.lang.String;
-
-
-public class Inherit2 {
-	
-	main(d) {
-	  return d.m2(d);
-	}
-	
-	main(v) {
-		var aa = v.elementAt(0);
-		return aa.m2(aa);
-	}
-}
@@ -1,32 +0,0 @@
-import java.lang.String;
-import java.lang.Integer;
-import java.lang.Double; 
-import java.lang.Boolean;
-//import java.util.Vector;
-
-
-public class OL     {
-
-     java.lang.Double m(java.lang.Double x) { return x + x; }
-     java.lang.Integer m(java.lang.Integer x) { return x + x; }
-     java.lang.String m(java.lang.String x) { return x + x; }
-     java.lang.Boolean m(Boolean x) { return x; } 
-     
-// if the class contains just this method, then correct BC will be generated.
-// But if another methods are contained then the generated BC is not correct
-//	m(x) {
-//		//x.add(1);
-//		x.addAll(x);
-//		return x;
-// 	}
-	
-}
-
-public class OLMain   {
-
-	main(x) { 
-		var ol;
-		ol = new OL(); 
-		return ol.m(x); 
-	}  
-}
@@ -1,13 +0,0 @@
-import java.lang.String;
-import java.lang.Integer;
-import java.lang.Double;
-import java.util.Vector;
-import java.lang.Boolean; 
-
-public class OLFun    {
-
-	//f = x -> {return x + x;};
-	m(f, x) {
-	    x = f.apply(x+x);
-	}
-}
@@ -1,13 +0,0 @@
-import java.lang.String;
-import java.lang.Integer;
-import java.lang.Double;
-import java.util.Vector;
-import java.lang.Boolean;
-
-public class OLFun2 {
-
-    x;
-	m(f){
-	    x = f.apply(x + x)
-	}
-}
@@ -1,19 +0,0 @@
-import java.util.Vector;
-import java.util.Stack;
-
-public class Put {
-
-    putElement(ele, v) {
-	    v.addElement(ele);
-    }
-
-    putElement(ele, s) {
-	    s.push(ele);
-    }
-
-
-    main(ele, x) { 
-        putElement(ele, x);
-    }
-
-}
@@ -1,25 +0,0 @@
-public class SimpleCycle {
-	
-	m(a,b,d){
-		var g;
-		var h;
-		g = h;
-		h = g;
-		/*
-		var y;
-		var z;
-		y=z;
-		z=y;
-		
-		var j = z;
-		var x;
-		b = a;
-		var c = b;
-		var f = d;
-		b = x;
-		var l = c;
-		a = l;
-		*/
-	}
-	
-}
@@ -1,11 +0,0 @@
-public class Tph7 {
-
-	m(a,b){
-		var c = m2(b);
-		return m2(b);
-	}
-
-	m2(b){
-		return b;
-	}
-}
@@ -1,12 +0,0 @@
-public class TypedID/*<L extends K,K> */ {
-	
-	lam = x-> x;
-	
-    id(b){  
-        return b;
-    }
-    
-    m(){
-    	return lam;
-    }
-}
@@ -1,16 +0,0 @@
-import java.util.Vector;
-import java.lang.Integer;
-
-
-public class VectorAdd {
-	vectorAdd(v1, v2) {
-		var i = 0;
-		v1 = new Vector<Integer>();
-		var erg = new Vector<>();
-		while (i < v1.size()) {
-			erg.addElement(v1.elementAt(i) + v2.elementAt(i));
-			i++;
-		} 
-		return erg; 
-	}
-}
@@ -1,11 +0,0 @@
-import java.util.Vector;
-import java.lang.Integer;
-
-public class VectorSuper {
-	
-	m(x){
-		Integer y = 1;
-		x.addElement(y);
-		//return x;
-	}
-}
@@ -1,15 +0,0 @@
-import java.util.Vector;
-import java.lang.Integer;
-
-public class mathStruc {
-	model; 
-	
-	//Fun1*<Fun2*<A,A,A>, Fun1*<MathStruc <A>,MathStruc <A>>> 
-	innerOp = (o) -> (ms) -> new mathStruc<>(o.apply(model,ms.model));
-
-	public mathStruc(m) {
-		model =m;
-		//innerOp = (o) -> (ms) -> new mathStruc<>(o.apply(this.model,ms.model));
-	}
-}
-
@@ -1,23 +0,0 @@
-import java.util.Vector;
-import java.lang.Integer;
-
-public class mathStrucInteger {
-	model; 
-
-	innerOp = (o) -> (ms) -> new mathStrucInteger<>(o.apply(model,ms.model));
-
-	public mathStrucInteger(m) {
-		model =m;
-	}
-}
-
-class mathStrucIntegerUse {
-
-    main() {
-    	var ms;
-		ms = new mathStrucInteger<>(2);
-		var ms2;
-		ms2 = ms.innerOp.apply((x,y) -> x+y).apply(ms);
-		return ms2;
-	}
-}
@@ -1,91 +0,0 @@
-//PL 2019-10-24: laeuft nicht durch, zu gross
-import java.util.Vector;
-import java.lang.Integer;
-import java.lang.Boolean;
-
-public class mathStrucMatrixOP {
-	model; 
-	
-	innerOp = (o) -> (ms) -> new mathStrucMatrixOP<>(o.apply(model,ms.model));
-
-	public mathStrucMatrixOP(m) {
-		model =m;
-	}
-}
-
-public class MatrixOP extends Vector<Vector<Integer>> {
-   
-	MatrixOP () {
-    }
-
-	MatrixOP(vv) {
-    	Integer i;
-    	i = 0;
-	  while(i < vv.size()) {
-//	    	Boolean a = this.add(vv.elementAt(i));
-		  this.add(vv.elementAt(i));
-		  i=i+1;
-	  }
-    }
-
-	public mul = (m1, m2) -> {
-        var ret = new MatrixOP();
-        var i = 0;
-        while(i < m1.size()) {
-            var v1 = m1.elementAt(i);
-            var v2 = new Vector<Integer>();
-            var j = 0;
-            while(j < v1.size()) {
-                var erg = 0;
-                var k = 0;
-                while(k < v1.size()) {
-                    erg = erg + v1.elementAt(k)
-                             * m2.elementAt(k).elementAt(j);
-                    k++; }
-//                v2.addElement(new Integer(erg));
-                v2.addElement(erg);
-                j++; }
-            ret.addElement(v2);
-            i++; 
-         }
-        return ret;
-    };
-}
-
-
-class mathStrucUseMatrixOP {
-
-    main() {
-		Vector<Vector<Integer>> vv = new Vector<Vector<Integer>>();
-		Vector<Integer> v1 = new Vector<Integer>();
-		v1.addElement(2);
-		v1.addElement(2);
-		Vector<Integer> v2 = new Vector<Integer>();
-		v2.addElement(3);
-		v2.addElement(3);
-		vv.addElement(v1);
-		vv.addElement(v2);
-
-		MatrixOP m1 = new MatrixOP(vv);
-	
-		Vector<Vector<Integer>> vv1 = new Vector<Vector<Integer>>();
-		Vector<Integer> v3 = new Vector<Integer>();
-		v3.addElement(2);
-		v3.addElement(2);
-		Vector<Integer> v4 = new Vector<Integer>();
-		v4.addElement(3);
-		v4.addElement(3);
-		vv1.addElement(v3);
-		vv1.addElement(v4);
-
-		MatrixOP m2 = new MatrixOP(vv1);
-
-		var mms;
-		mms = new mathStrucMatrixOP<>(m1);
-		var mms2;
-		mms2 = new mathStrucMatrixOP<>(m2);
-		var mms3;
-		mms3 = mms.innerOp.apply(m1.mul).apply(mms2);
-		return mms3;
-    }
-}
@@ -1,13 +0,0 @@
-class TestAny {
-    a;
-    b = a;
-    anyMethod() {
-        var f;
-        return f;
-    }
-    otherMethod(e) {
-        b = e;
-        e = a;
-        return e;
-    }
-}
@@ -1,6 +0,0 @@
-class Example{
-    f;
-    fReturn(){
-        return f;
-    }
-}
@@ -1,12 +0,0 @@
-public class TestContraVariant {
-
-    m(x) {
-        var y;
-        x = y;
-        return y;
-    }
-    
-    main(x) {
-    	return m(x);
-    }
-}
@@ -1,17 +0,0 @@
-public class TestGGFinder {
-    a;
-
-    id(b) {
-        var c = b;
-        return c;
-    }
-
-    setA(x) {
-        a = x;
-        return a;
-    }
-
-    m(x,y) {
-        x = id(y);
-    }
-}
@@ -1,7 +0,0 @@
-public class TestLocalVarLambda {
-
-m(x) {
-  var id = z -> z;
-  return id.apply(x);
-  }
-} 
@@ -1,17 +0,0 @@
-public class TestMutualRecursion {
-    a;
-
-    id(b) {
-        var c = b;
-        return main(b,c);
-    }
-
-    m(x,y) {
-        x = id(y);
-        return x;
-    }
-    
-    main(x,y) {
-    	return m(id(x),y);
-    }
-}
@@ -1,22 +0,0 @@
-public class TestMutualRecursionWithField {
-    a;
-
-    id(b) {
-        var c = b;
-        return main(b,c);
-    }
-
-    setA(x) {
-        a = x;
-        return a;
-    }
-
-    m(x,y) {
-        x = id(y);
-        return x;
-    }
-    
-    main(x,y) {
-    	return m(id(x),setA(y));
-    }
-}
@@ -1,22 +0,0 @@
-public class TestMutualRecursionWithField2 {
-    a;
-
-    id(b) {
-        var c = b;
-        return main(b,c);
-    }
-
-    setA(x) {
-        a = x;
-        return a;
-    }
-
-    m(x,y) {
-        x = id(y);
-        return x;
-    }
-    
-    main(x,y) {
-    	return m(setA(x),id(y));
-    }
-}
@@ -1,23 +0,0 @@
-public class TestMutualRecursionWithField3 {
-    a;
-
-    id(b) {
-        var c = b;
-        return main(b,c);
-    }
-
-    setA(x) {
-        a = x;
-        return a;
-    }
-
-    m(x,y) {
-        x = id(y);
-        return x;
-    }
-    
-    main(x,y) {
-    	var z = m(setA(x),id(y));
-    	return z;
-    }
-}
@@ -1,6 +0,0 @@
-class VarReturn {
-    anyMethod() {
-        var f;
-        return f;
-    }
-}
@@ -1,12 +0,0 @@
-class Example {
-    a;
-    b = a;
-    anyMethod() {
-        var f;
-        return f;
-    }
-    otherMethod(e) {
-        e = a;
-        return e;
-    }
-}
@@ -1,13 +0,0 @@
-class TPHsAndGenerics {
-    id = x -> x;
-    id2 (x) {
-        return id.apply(x);
-    }
-    m(a, b){
-        var c = m2(a,b);
-        return a;
-    }
-    m2(a, b){
-        return b;
-    }
-}
@@ -1,13 +0,0 @@
-class TPHsAndGenerics2 {
-    id = x -> x;
-    id2 (x) {
-        return id.apply(x);
-    }
-    m(a, b){
-        var c = m2(a,b);
-        return a;
-    }
-    m2(a, b){
-        return b;
-    }
-}
@@ -1,15 +0,0 @@
-public class TestThreeArgs {
-    a;
-
-    id(b) {
-        var a /* = null */;
-        var c = b;
-        m(a,a,b);
-        return c;
-    }
-
-    m(x,y, z) {
-        x = id(y);
-        return x;
-    }
-}
@@ -1,22 +0,0 @@
-public class TestTwoArgs {
-    a;
-
-    id(b) {
-        var c = b;
-        return c;
-    }
-
-    setA(x) {
-        a = x;
-        return a;
-    }
-
-    m(x,y) {
-        x = id(y);
-        return x;
-    }
-    
-    main(x,y) {
-    	return m(id(x),setA(y));
-    }
-}
@@ -1,17 +0,0 @@
-public class TestTwoArgs2 {
-    a;
-
-    id(b) {
-        var c = b;
-        return c;
-    }
-
-    m(x,y) {
-        x = id(y);
-        return x;
-    }
-    
-    main(x,y) {
-    	return m(id(x),m(x,y));
-    }
-}
@@ -1,12 +0,0 @@
-public class TestTwoCalls {
-
-    id(b) {
-        var c = b;
-        return c;
-    }
-    
-    main(x,y) {
-    	id(x);
-    	return id(y);
-    }
-}
@@ -1,12 +0,0 @@
-import java.util.Vector;
-
-public class TestVector {
-
-	m(v, w) {
-		w.addElement(id(v.elementAt(0)));
-	}
-	
-	id(x) {
-		return x;
-	}
-}
@@ -1,12 +0,0 @@
-import java.util.Vector;
-
-public class TestVectorArg {
-
-    add(v, e) {
-		v.addElement(e);
-    }
-
-    main(v, e) {
-		add(v, e);
-    }
-}
@@ -1,4 +0,0 @@
-class VoidMeth {
-    anyMethod() {
-    }
-}
@@ -1,13 +0,0 @@
-class Box<A> {
-A f;
-}
-class B {
- }
-
-class Box_Main extends B {
-
-    m(b) {
-    	b.f = new Box_Main();
-    	b.f = new B();
-    }
-}
@@ -1,21 +0,0 @@
-/*
-class C<A>{
-    A f;
-    m(b, c){
-        c.f = b;
-        c.m(b, c);
-    }
-}
-*/
-class C<X>{
-    X f;
-    m(b, c, d){
-        this.f = b;
-        this.f = c.f;
-        c.m2(d);
-    }
-
-    m2(a){
-        a.f = this.f;
-    }
-}
@@ -1,15 +0,0 @@
-import java.util.List;
-import java.util.Collection;
-
-class Sorting{
-    void merge(a, b){
-        a.addAll(b);
-        return a;
-    }
-    
-    sort(in){
-    	var firstHalf = in;
-    	var secondHalf = in; 
-    	return merge(sort(firstHalf), sort(secondHalf));
-    }
-}
@@ -1,8 +0,0 @@
-import java.lang.Integer;
-import java.util.Vector;
-
-public class Gen{
-	Vector<Integer> m(Vector<Integer> v){
-		return v;
-	}
-}
@@ -1,22 +0,0 @@
-import java.lang.String;
-import java.lang.Integer;
-import java.lang.Double; 
-import java.lang.Boolean;
-
-
-public class OLOneFile     {
-
-     m2(x) { return x + x; }
-	
-}
-
-public class OLextendsOneFile extends OLOneFile { } 
-
-public class OLMainOneFile   {
-
-	main(x) { 
-		var ol;
-		ol = new OLextendsOneFile(); 
-		return ol.m2(x); 
-	}  
-}
--- a/Show More
+++ b/Show More