modified: test/strucType/javFiles/testLocalVar.jav

geändert: src/de/dhbwstuttgart/core/JavaTXCompiler.java
geändert: src/de/dhbwstuttgart/strucTypes/visitor/InferTypes.java geändert: src/de/dhbwstuttgart/typeinference/unify/RuleSet.java nach merge mit plugin-Branch
2018-07-04 11:05:25 +02:00 · 2018-06-09 16:34:05 +02:00 · 2018-06-08 14:42:18 +02:00 · 2018-06-08 14:39:51 +02:00 · 2018-06-08 14:37:04 +02:00 · 2018-06-08 14:35:22 +02:00
401 changed files with 15743 additions and 2412 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,6 @@ bin
 .project
 .settings/
 /target/
+
+#
+manually/
--- a/README.md
+++ b/README.md
@@ -0,0 +1,19 @@
+
+
+# plugin site erstellen
+* die JAvaTXCOmpiler DAtei in ein plugin umwandeln und deployen.
+* siehe: http://www.vogella.com/tutorials/EclipseJarToPlugin/article.html#convert-jar-files-to-osgi-bundles-with-the-p2-maven-plugin
+* AUsführung:
+	* mvn deploy #erstellt die JAR-Datei und steckt sie in ein lokales Repo (maven-repository)
+	* mvn p2:site
+	* mvn package # hier wird die ZIP-Filf zum Einbinden in Eclipse erstellt
+
+# Einbinden in Eclipse
+* In Eclipse kann die Zip-FIle wie ein Plugin installiert werden
+* Hier tritt FEhler auf. Reflections-Library kann nicht installiert werden. Möglicherweise wird sie auch nicht gebraucht
+* Nach dem installieren de.dhbwstuttagrt.JavaTXcompiler zu den DEpendencies des plugins hinzufügen
+* Anschließend unter "Overview" auf "Updata Classpath" klicken
+
+# Windows
+* JAVA_HOME setzen:
+	* export JAVA_HOME=/c/Program\ Files/Java/jdk1.8.0_102/
--- a/Website/JavaTXExamples.zip
+++ b/Website/JavaTXExamples.zip
--- a/Website/index.html
+++ b/Website/index.html
@@ -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>
--- a/Website/install/Restart.png
+++ b/Website/install/Restart.png
--- a/Website/install/availableSoftware1.png
+++ b/Website/install/availableSoftware1.png
--- a/Website/install/availableSoftware2.png
+++ b/Website/install/availableSoftware2.png
--- a/Website/install/instal.html
+++ b/Website/install/instal.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>
--- a/Website/install/install.html
+++ b/Website/install/install.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>
--- a/Website/install/installAnyway.png
+++ b/Website/install/installAnyway.png
--- a/Website/install/installationDetails.png
+++ b/Website/install/installationDetails.png
--- a/Website/install/licenseAgreement.png
+++ b/Website/install/licenseAgreement.png
--- a/Website/install/newsoftware.png
+++ b/Website/install/newsoftware.png
--- a/Website/install/selectInstallation.png
+++ b/Website/install/selectInstallation.png
--- a/Website/newJavaTXProject/addLibrary2.png
+++ b/Website/newJavaTXProject/addLibrary2.png
--- a/Website/newJavaTXProject/buildPath1.png
+++ b/Website/newJavaTXProject/buildPath1.png
--- a/Website/newJavaTXProject/buildPath2.png
+++ b/Website/newJavaTXProject/buildPath2.png
--- a/Website/newJavaTXProject/buildPath3.png
+++ b/Website/newJavaTXProject/buildPath3.png
--- a/Website/newJavaTXProject/buildPath4.png
+++ b/Website/newJavaTXProject/buildPath4.png
--- a/Website/newJavaTXProject/newJavFile.png
+++ b/Website/newJavaTXProject/newJavFile.png
--- a/Website/newJavaTXProject/newJavFolder1.png
+++ b/Website/newJavaTXProject/newJavFolder1.png
--- a/Website/newJavaTXProject/newJavFolder2.png
+++ b/Website/newJavaTXProject/newJavFolder2.png
--- a/Website/newJavaTXProject/newJavaTXProject.html
+++ b/Website/newJavaTXProject/newJavaTXProject.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>
--- a/Website/newJavaTXProject/newJavaTXProject.png
+++ b/Website/newJavaTXProject/newJavaTXProject.png
--- a/Website/usePlugin/usePlugin.html
+++ b/Website/usePlugin/usePlugin.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>
--- a/Website/usePlugin/usePlugin1.png
+++ b/Website/usePlugin/usePlugin1.png
--- a/Website/usePlugin/usePlugin2.png
+++ b/Website/usePlugin/usePlugin2.png
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/BoolLiteral.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/BoolLiteral.html
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.literal.Literal</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Literal</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.literal.BoolLiteral</li>
@@ -253,7 +253,7 @@ extends <a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html"
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.literal.Literal">
+<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.Literal">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;de.dhbwstuttgart.syntaxtree.statement.<a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">Literal</a></h3>
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/CharLiteral.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/CharLiteral.html
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.literal.Literal</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Literal</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.literal.CharLiteral</li>
@@ -253,7 +253,7 @@ extends <a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html"
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.literal.Literal">
+<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.Literal">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;de.dhbwstuttgart.syntaxtree.statement.<a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">Literal</a></h3>
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.html
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.literal.Literal</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Literal</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.literal.DoubleLiteral</li>
@@ -263,7 +263,7 @@ extends <a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html"
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.literal.Literal">
+<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.Literal">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;de.dhbwstuttgart.syntaxtree.statement.<a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">Literal</a></h3>
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/FloatLiteral.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/FloatLiteral.html
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.literal.Literal</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Literal</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.literal.FloatLiteral</li>
@@ -263,7 +263,7 @@ extends <a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html"
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.literal.Literal">
+<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.Literal">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;de.dhbwstuttgart.syntaxtree.statement.<a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">Literal</a></h3>
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/IntLiteral.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/IntLiteral.html
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.literal.Literal</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Literal</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.literal.NumberLiteral</li>
@@ -263,7 +263,7 @@ extends <a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html"
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.literal.Literal">
+<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.Literal">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;de.dhbwstuttgart.syntaxtree.statement.<a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">Literal</a></h3>
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Literal.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Literal.html
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.literal.Literal</li>
+<li>de.dhbwstuttgart.syntaxtree.statement.Literal</li>
 </ul>
 </li>
 </ul>
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/LongLiteral.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/LongLiteral.html
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.literal.Literal</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Literal</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.LongLiteral</li>
@@ -263,7 +263,7 @@ extends <a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html"
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.literal.Literal">
+<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.Literal">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;de.dhbwstuttgart.syntaxtree.statement.<a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">Literal</a></h3>
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/NegativeExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/NegativeExpr.html
@@ -115,7 +115,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.UnaryExpr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.NegativeExpr</li>
+<li>de.dhbwstuttgart.syntaxtree.statement.javaInternal.NegativeExpr</li>
 </ul>
 </li>
 </ul>
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/NotExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/NotExpr.html
@@ -115,7 +115,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.UnaryExpr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.NotExpr</li>
+<li>de.dhbwstuttgart.syntaxtree.statement.javaInternal.NotExpr</li>
 </ul>
 </li>
 </ul>
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Null.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Null.html
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.literal.Literal</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Literal</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.literal.Null</li>
@@ -245,7 +245,7 @@ extends <a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html"
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.literal.Literal">
+<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.Literal">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;de.dhbwstuttgart.syntaxtree.statement.<a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">Literal</a></h3>
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PositivExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PositivExpr.html
@@ -115,7 +115,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.UnaryExpr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.PositivExpr</li>
+<li>de.dhbwstuttgart.syntaxtree.statement.javaInternal.PositivExpr</li>
 </ul>
 </li>
 </ul>
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PostDecExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PostDecExpr.html
@@ -115,7 +115,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.UnaryExpr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.PostDecExpr</li>
+<li>de.dhbwstuttgart.syntaxtree.statement.javaInternal.PostDecExpr</li>
 </ul>
 </li>
 </ul>
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PostIncExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PostIncExpr.html
@@ -115,7 +115,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.UnaryExpr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.PostIncExpr</li>
+<li>de.dhbwstuttgart.syntaxtree.statement.javaInternal.PostIncExpr</li>
 </ul>
 </li>
 </ul>
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PreDecExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PreDecExpr.html
@@ -115,7 +115,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.UnaryExpr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.PreDecExpr</li>
+<li>de.dhbwstuttgart.syntaxtree.statement.javaInternal.PreDecExpr</li>
 </ul>
 </li>
 </ul>
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PreIncExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PreIncExpr.html
@@ -115,7 +115,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.UnaryExpr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.PreIncExpr</li>
+<li>de.dhbwstuttgart.syntaxtree.statement.javaInternal.PreIncExpr</li>
 </ul>
 </li>
 </ul>
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/StringLiteral.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/StringLiteral.html
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.literal.Literal</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Literal</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.literal.StringLiteral</li>
@@ -253,7 +253,7 @@ extends <a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html"
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.literal.Literal">
+<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.Literal">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;de.dhbwstuttgart.syntaxtree.statement.<a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">Literal</a></h3>
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Literal.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Literal.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.literal.Literal</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.Literal</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,7 +70,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.literal.Literal" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.Literal</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.Literal" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.Literal</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/NegativeExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/NegativeExpr.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.NegativeExpr</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.NegativeExpr</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.NegativeExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.NegativeExpr</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.NegativeExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.NegativeExpr</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.NegativeExpr</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.javaInternal.NegativeExpr</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/NotExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/NotExpr.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.NotExpr</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.NotExpr</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.NotExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.NotExpr</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.NotExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.NotExpr</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.NotExpr</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.javaInternal.NotExpr</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/PositivExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/PositivExpr.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.PositivExpr</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.PositivExpr</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.PositivExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PositivExpr</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.PositivExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PositivExpr</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.PositivExpr</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.javaInternal.PositivExpr</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/PostDecExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/PostDecExpr.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.PostDecExpr</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.PostDecExpr</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.PostDecExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PostDecExpr</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.PostDecExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PostDecExpr</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.PostDecExpr</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.javaInternal.PostDecExpr</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/PostIncExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/PostIncExpr.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.PostIncExpr</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.PostIncExpr</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.PostIncExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PostIncExpr</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.PostIncExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PostIncExpr</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.PostIncExpr</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.javaInternal.PostIncExpr</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/PreDecExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/PreDecExpr.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.PreDecExpr</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.PreDecExpr</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.PreDecExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PreDecExpr</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.PreDecExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PreDecExpr</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.PreDecExpr</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.javaInternal.PreDecExpr</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/PreIncExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/PreIncExpr.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.PreIncExpr</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.PreIncExpr</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.PreIncExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PreIncExpr</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.PreIncExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PreIncExpr</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.PreIncExpr</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.javaInternal.PreIncExpr</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
--- a/doc/Studienarbeiten/S2018_Marcel_Vollmer_Implementierung
+++ b/doc/Studienarbeiten/S2018_Marcel_Vollmer_Implementierung
--- a/pom.xml
+++ b/pom.xml
@@ -7,6 +7,7 @@
  <groupId>de.dhbwstuttgart</groupId>
  <artifactId>JavaTXcompiler</artifactId>
  <packaging>jar</packaging>
+   
  <version>0.1</version>
  <name>JavaTXcompiler</name>
  <url>http://maven.apache.org</url>
@@ -22,6 +23,11 @@
   	 <artifactId>antlr4</artifactId>
   	 <version>4.7</version>
 	</dependency>
+<dependency>
+    <groupId>commons-io</groupId>
+    <artifactId>commons-io</artifactId>
+    <version>2.6</version>
+</dependency>
 <dependency>
 <groupId>com.google.guava</groupId>
    <artifactId>guava</artifactId>
@@ -37,12 +43,18 @@
    <artifactId>asm-all</artifactId>
    <version>[4.0.0,)</version>
 </dependency>
+<!--
+<dependency>
+    <groupId>org.bitbucket.mstrobel</groupId>
+    <artifactId>procyon-reflection</artifactId>
+    <version>[0.5.32,)</version>
+</dependency> -->
  </dependencies>

  <build>
    <directory>target</directory>
    <outputDirectory>target/classes</outputDirectory>
-    <finalName>${artifactId}-${version}</finalName>
+    <finalName>${project.artifactId}-${project.version}</finalName>
    <testOutputDirectory>target/test-classes</testOutputDirectory>
    <sourceDirectory>src/</sourceDirectory>
    <testSourceDirectory>test/</testSourceDirectory>
@@ -60,18 +72,110 @@
 	    <configuration>
 		    <sourceDirectory>src/de/dhbwstuttgart/parser/antlr/</sourceDirectory>
 		    <outputDirectory>src/de/dhbwstuttgart/parser/antlr/</outputDirectory>
+		    <arguments> <argument>-package</argument> <argument>de.dhbwstuttgart.parser.antlr</argument> </arguments>
+	    </configuration>
+	    </execution>
+	    <execution>
+            <id>aspParser</id>
+            <goals>
+		    <goal>antlr4</goal>
+	    </goals>
+	    <configuration>
+		    <sourceDirectory>src/de/dhbwstuttgart/sat/asp/parser/antlr/</sourceDirectory>
+		    <outputDirectory>src/de/dhbwstuttgart/sat/asp/parser/antlr/</outputDirectory>
 		    <arguments>
 			    <argument>-package</argument>
-			   <argument>de.dhbwstuttgart.parser.antlr</argument>
+			   <argument>de.dhbwstuttgart.sat.asp.parser.antlr</argument>
 	  	    </arguments>
 	    </configuration>
          </execution>
+
        </executions>
+</plugin>
+ <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+        </configuration>
      </plugin>
+<plugin>
+    <groupId>org.reficio</groupId>
+    <artifactId>p2-maven-plugin</artifactId>
+    <version>1.1.2-SNAPSHOT</version>
+    <executions>
+     <execution>
+      <id>default-cli</id>
+      <configuration>
+       <artifacts>
+        <!-- specify your depencies here -->
+	<!-- groupId:artifactId:version -->
+        <artifact>
+		<id>de.dhbwstuttgart:JavaTXcompiler:0.1</id>
+        </artifact>
+		<artifact><id>org.reflections:reflections:0.9.11</id></artifact>
+		<artifact><id>com.google.guava:guava:22.0</id></artifact>
+		<artifact><id>javax.annotation:javax.annotation-api:1.3.1</id></artifact>
+		<artifact><id>org.glassfish:javax.annotation:3.1.1</id></artifact>
+       </artifacts>
+      </configuration>
+     </execution>
+    </executions>
+   </plugin>
+   <plugin>
+    <groupId>org.eclipse.tycho</groupId>
+    <artifactId>tycho-p2-repository-plugin</artifactId>
+    <version>${tycho.version}</version>
+    <executions>
+     <execution>
+      <phase>package</phase>
+      <goals>
+       <goal>archive-repository</goal>
+      </goals>
+     </execution>
+    </executions>
+   </plugin>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+                <source>9</source>
+                <target>9</target>
+            </configuration>
+        </plugin>
    </plugins>
       </build>
+        <pluginRepositories>
+  <pluginRepository>
+   <id>reficio</id>
+   <url>http://repo.reficio.org/maven/</url>
+  </pluginRepository>
+ </pluginRepositories>
+ <repositories>
+	 <repository>
+        <id>maven-repository</id>
+	<url>file:///${project.basedir}/target</url>
+</repository>
+</repositories>
   <properties>
    <maven.compiler.source>1.8</maven.compiler.source>
    <maven.compiler.target>1.8</maven.compiler.target>
+    <tycho.version>0.23.0</tycho.version>
  </properties>
+  <distributionManagement>
+    <repository>
+	    <id>maven-repository</id>
+      <name>MyCo Internal Repository</name>
+      <url>file:///${project.basedir}/maven-repository/</url>
+    </repository>
+  </distributionManagement>
 </project>
--- a/src/de/dhbwstuttgart/bytecode/AStatement.java
+++ b/src/de/dhbwstuttgart/bytecode/AStatement.java
@@ -0,0 +1,30 @@
+package de.dhbwstuttgart.bytecode;
+
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+import de.dhbwstuttgart.syntaxtree.statement.BinaryExpr;
+import de.dhbwstuttgart.syntaxtree.statement.Expression;
+
+public abstract class AStatement implements IStatement {
+	protected Expression expr;
+	
+	public AStatement(Expression expr) {
+		this.expr = expr;
+	}
+	
+	@Override
+	public boolean isExprBinary() {
+		return (expr instanceof BinaryExpr);
+	}
+	
+	@Override
+	public void genBCForRelOp(MethodVisitor mv,Label branchLabel, Label endLabel, BytecodeGenMethod bytecodeGenMethod) {
+		mv.visitInsn(Opcodes.ICONST_1);
+		mv.visitJumpInsn(Opcodes.GOTO, endLabel);
+		mv.visitLabel(branchLabel);
+		mv.visitInsn(Opcodes.ICONST_0);
+		mv.visitLabel(endLabel);
+	}
+}
--- a/src/de/dhbwstuttgart/bytecode/ArgumentExpr.java
+++ b/src/de/dhbwstuttgart/bytecode/ArgumentExpr.java
@@ -0,0 +1,11 @@
+package de.dhbwstuttgart.bytecode;
+
+import de.dhbwstuttgart.syntaxtree.statement.Expression;
+
+public class ArgumentExpr extends AStatement {
+	
+	public ArgumentExpr(Expression expr) {
+		super(expr);
+	}
+	
+}
--- a/src/de/dhbwstuttgart/bytecode/AssignStmt.java
+++ b/src/de/dhbwstuttgart/bytecode/AssignStmt.java
@@ -0,0 +1,11 @@
+package de.dhbwstuttgart.bytecode;
+
+import de.dhbwstuttgart.syntaxtree.statement.Expression;
+
+public class AssignStmt extends AStatement {
+	
+	public AssignStmt(Expression rightSide) {
+		super(rightSide);
+	}
+
+}
--- a/src/de/dhbwstuttgart/bytecode/BytecodeGen.java
+++ b/src/de/dhbwstuttgart/bytecode/BytecodeGen.java
@@ -1,80 +1,82 @@
 package de.dhbwstuttgart.bytecode;

-import java.awt.List;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;

+import de.dhbwstuttgart.exceptions.NotImplementedException;
+import de.dhbwstuttgart.syntaxtree.statement.*;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.FieldVisitor;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;

+import de.dhbwstuttgart.bytecode.descriptor.DescriptorToString;
+import de.dhbwstuttgart.bytecode.descriptor.TypeToDescriptor;
+import de.dhbwstuttgart.bytecode.signature.Signature;
+import de.dhbwstuttgart.bytecode.signature.TypeToString;
+import de.dhbwstuttgart.bytecode.utilities.NormalConstructor;
+import de.dhbwstuttgart.bytecode.utilities.NormalMethod;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
 import de.dhbwstuttgart.syntaxtree.*;
-import de.dhbwstuttgart.syntaxtree.statement.ArgumentList;
-import de.dhbwstuttgart.syntaxtree.statement.Assign;
-import de.dhbwstuttgart.syntaxtree.statement.AssignToField;
-import de.dhbwstuttgart.syntaxtree.statement.Binary;
-import de.dhbwstuttgart.syntaxtree.statement.Block;
-import de.dhbwstuttgart.syntaxtree.statement.CastExpr;
-import de.dhbwstuttgart.syntaxtree.statement.DoStmt;
-import de.dhbwstuttgart.syntaxtree.statement.EmptyStmt;
-import de.dhbwstuttgart.syntaxtree.statement.FieldVar;
-import de.dhbwstuttgart.syntaxtree.statement.ForStmt;
-import de.dhbwstuttgart.syntaxtree.statement.IfStmt;
-import de.dhbwstuttgart.syntaxtree.statement.InstanceOf;
-import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
-import de.dhbwstuttgart.syntaxtree.statement.LocalVar;
-import de.dhbwstuttgart.syntaxtree.statement.LocalVarDecl;
-import de.dhbwstuttgart.syntaxtree.statement.MethodCall;
-import de.dhbwstuttgart.syntaxtree.statement.NewArray;
-import de.dhbwstuttgart.syntaxtree.statement.NewClass;
-import de.dhbwstuttgart.syntaxtree.statement.Receiver;
-import de.dhbwstuttgart.syntaxtree.statement.Return;
-import de.dhbwstuttgart.syntaxtree.statement.ReturnVoid;
-import de.dhbwstuttgart.syntaxtree.statement.StaticClassName;
-import de.dhbwstuttgart.syntaxtree.statement.Super;
-import de.dhbwstuttgart.syntaxtree.statement.SuperCall;
-import de.dhbwstuttgart.syntaxtree.statement.This;
-import de.dhbwstuttgart.syntaxtree.statement.UnaryPlus;
-import de.dhbwstuttgart.syntaxtree.statement.WhileStmt;
-import de.dhbwstuttgart.syntaxtree.statement.literal.Literal;
-import de.dhbwstuttgart.syntaxtree.statement.literal.Null;
+import de.dhbwstuttgart.syntaxtree.statement.Literal;
 import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
 import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.typeinference.result.ResultPair;
+import de.dhbwstuttgart.typeinference.result.ResultSet;

 public class BytecodeGen implements ASTVisitor {
 	
 	ClassWriter cw =new ClassWriter(ClassWriter.COMPUTE_FRAMES|ClassWriter.COMPUTE_MAXS);
-//	String methDesc;
 	
 	String type;
-	
+
 	String className;
+	private boolean isInterface;
+	private List<ResultSet> listOfResultSets;
+	private ResultSet resultSet;
+	private int indexOfFirstParam = 0;
 	
 	// stores parameter, local vars and the next index on the local variable table, which use for aload_i, astore_i,...
-	HashMap<String, Integer> paramsAndLocals;// = new HashMap<>();
+	HashMap<String, Integer> paramsAndLocals = new HashMap<>();
+	// stores generics and their bounds of class
+	HashMap<String, String> genericsAndBounds = new HashMap<>();
+	// stores generics and their bounds of method
+	HashMap<String, String> genericsAndBoundsMethod = new HashMap<>();
+	
+	HashMap<String,RefTypeOrTPHOrWildcardOrGeneric> methodParamsAndTypes = new HashMap<>();
 	byte[] bytecode;
 	HashMap<String,byte[]> classFiles;
 	
-	public BytecodeGen(HashMap<String,byte[]> classFiles) {
+	ArrayList<String> methodNameAndParamsT = new ArrayList<>();
+	
+	public BytecodeGen(HashMap<String,byte[]> classFiles, List<ResultSet> listOfResultSets) {
 		this.classFiles = classFiles;
-		paramsAndLocals = new HashMap<>();
+		this.listOfResultSets = listOfResultSets;
 	}
 	
 	@Override
 	public void visit(SourceFile sourceFile) {
 		for(ClassOrInterface cl : sourceFile.getClasses()) {
-			BytecodeGen classGen = new BytecodeGen(classFiles);
+			System.out.println("in Class: " + cl.getClassName().toString());
+			BytecodeGen classGen = new BytecodeGen(classFiles, listOfResultSets);
 			cl.accept(classGen);
 			classGen.writeClass(cl.getClassName().toString());
 		}
 	}
-
+	
+	/**
+	 * Associates the bytecode of the class that was build with the classWriter {@link #cw}
+	 * with the class name in the map {@link #classFiles}
+	 * 
+	 * @param name name of the class with which the the bytecode is to be associated
+	 */
 	private void writeClass(String name) {
 		bytecode = cw.toByteArray();
 		classFiles.put(name, bytecode);
@@ -84,63 +86,164 @@ public class BytecodeGen implements ASTVisitor {
 	public HashMap<String,byte[]> getClassFiles() {
 		return classFiles;
 	}
+	
+	
 	@Override
 	public void visit(ClassOrInterface classOrInterface) {
 		className = classOrInterface.getClassName().toString();
-		// access flages??
-		cw.visit(Opcodes.V1_8, classOrInterface.getModifiers()+Opcodes.ACC_SUPER, classOrInterface.getClassName().toString()
-				, null, classOrInterface.getSuperClass().toString(), null);
 		
-		// for each field in the class
+		cw.visitSource(className +".jav", null);
+		
+		isInterface = (classOrInterface.getModifiers()&512)==512;
+
+		int acc = isInterface?classOrInterface.getModifiers()+Opcodes.ACC_ABSTRACT:classOrInterface.getModifiers()+Opcodes.ACC_SUPER;
+		String sig = null;
+		/* if class has generics then creates signature
+		 * Signature looks like:
+		 * <E:Ljava/...>Superclass 
+		 */
+		if(classOrInterface.getGenerics().iterator().hasNext()) {
+			Signature signature = new Signature(classOrInterface, genericsAndBounds);
+			sig = signature.toString();
+		}
+		// needs implemented Interfaces?
+		cw.visit(Opcodes.V1_8, acc, classOrInterface.getClassName().toString()
+				, sig, classOrInterface.getSuperClass().acceptTV(new TypeToDescriptor()), null);
+		
 		for(Field f : classOrInterface.getFieldDecl()) {
-			System.out.println("get Fields");
-			System.out.println(f.getName());
 			f.accept(this);
 		}
+//		resultSet = listOfResultSets.get(0);
+		boolean isConsWithNoParamsVisited = false;
+		for(ResultSet rs : listOfResultSets) {
+			resultSet = rs;
+
+			for(Constructor c : classOrInterface.getConstructors()) {
+				if(!isConsWithNoParamsVisited)
+					c.accept(this);
+				if(!c.getParameterList().iterator().hasNext())
+					isConsWithNoParamsVisited = true;
+			}
+			
+			for(Method m : classOrInterface.getMethods()) {
+				m.accept(this);
+			}
 		
-		for(Constructor c : classOrInterface.getConstructors()) {
-			c.accept(this);
 		}
 		
-		for(Method m : classOrInterface.getMethods()) {
-			m.accept(this);
-		}
-		cw.visitSource(classOrInterface.getClassName().toString()+".jav", null);
 	}
-	
+
 	@Override
 	public void visit(Constructor field) {
-		Descriptor desc = new Descriptor(field);
-		MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", desc.getDesc(), null, null); 
+		field.getParameterList().accept(this);
+		
+		String desc = null;
+		boolean hasGen = false;
+		
+		for(String paramName : methodParamsAndTypes.keySet()) {
+			String typeOfParam = methodParamsAndTypes.get(paramName).acceptTV(new TypeToDescriptor());
+			if(genericsAndBounds.containsKey(typeOfParam)) {
+				hasGen = true;
+				break;
+			}
+		}
+		String sig = null;
+		if(hasGen) {
+			Signature signature = new Signature(field, genericsAndBounds,methodParamsAndTypes);
+			sig = signature.toString();
+		}
+		NormalConstructor constructor = new NormalConstructor(field,genericsAndBounds,hasGen);
+		desc = constructor.accept(new DescriptorToString(resultSet));
+		MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", desc, sig, null);
 		mv.visitCode();		
-		System.out.println("-----Constructor-----");
-		BytecodeGenMethod gen = new BytecodeGenMethod(className,field, mv,paramsAndLocals,desc.getDesc(),cw);
-
-		mv.visitInsn(Opcodes.RETURN);
+		BytecodeGenMethod gen = new BytecodeGenMethod(className,resultSet,field, mv,paramsAndLocals,cw,
+				genericsAndBoundsMethod,genericsAndBounds,isInterface,classFiles);
+		if(!field.getParameterList().iterator().hasNext()) {
+			mv.visitInsn(Opcodes.RETURN);
+		}
 		mv.visitMaxs(0, 0);
 		mv.visitEnd();
 	}
-
+	
 	@Override
 	public void visit(Method method) {
+		// TODO: check if the method is static => if static then the first param will be stored in pos 0
+		// else it will be stored in pos 1 and this will be stored in pos 0
+		String retType = resultSet.resolveType(method.getReturnType()).resolvedType.acceptTV(new TypeToDescriptor());
+		String methParamTypes = retType+method.name+"%%";
 		method.getParameterList().accept(this);
-		Descriptor methDesc = new Descriptor(method);
-		System.out.println("-----Method-----");
-		MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, method.getName(), methDesc.getDesc(), null, null); 
-		mv.visitCode();		
+
+		Iterator<FormalParameter> itr = method.getParameterList().iterator();
+		while(itr.hasNext()) {
+			FormalParameter fp = itr.next();
+			methParamTypes += resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor())+";";
+		}
+		
+		if(methodNameAndParamsT.contains(methParamTypes)) {
+			return;
+		}
+		methodNameAndParamsT.add(methParamTypes);
+		System.out.println("Method: "+method.name +" , paramsType: "+methParamTypes);
+		String methDesc = null;
+		
+		// Method getModifiers() ?
+		int acc = isInterface?Opcodes.ACC_ABSTRACT:method.modifier;
+		System.out.println(acc);
+		
+		/*Prüfe, ob die Rückgabe-Type der Methode eine Type-Variable ist*/
+		boolean hasGenInParameterList = genericsAndBounds.containsKey(retType) || retType.subSequence(0, 4).equals("TPH ");
+		/*Wenn die Rückgabe-Type eine Typ-variable ist, erzeuge direkt die Signature, wenn nicht,
+		 * prüfe, ob einer der Parameter Typ-Variable als Typ hat*/
+		if(!hasGenInParameterList) {
+			for(String paramName : methodParamsAndTypes.keySet()) {
+				String typeOfParam = methodParamsAndTypes.get(paramName).acceptTV(new TypeToDescriptor());
+				if(genericsAndBounds.containsKey(typeOfParam)||typeOfParam.substring(0, 4).equals("TPH ")) {
+					hasGenInParameterList = true;
+					break;
+				}
+			}
+		}
+		
+		//TODO: Test if the return-type or any of the parameter is a parameterized type. (VP)
+		//then create the descriptor with the new syntax.
+		
+		String sig = null;
+		/* method.getGenerics: <....> RT method(..) 
+		 * */
+		boolean hasGen = method.getGenerics().iterator().hasNext() || hasGenInParameterList;
+		
+		/* if method has generics or return type is TPH, create signature */
+		// zwite operand muss weggelassen werden
+		if(hasGen||method.getReturnType().acceptTV(new TypeToString()).equals("TPH")) {
+			// resultset hier zum testen 
+			Signature signature = new Signature(method, genericsAndBoundsMethod, methodParamsAndTypes,resultSet);
+			sig = signature.toString();
+		}
+//		System.out.println(sig);
+		NormalMethod meth = new NormalMethod(method,genericsAndBounds,genericsAndBoundsMethod,hasGen);
+		methDesc = meth.accept(new DescriptorToString(resultSet));
+		
+//		System.out.println(methDesc);
+		MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC+acc, method.getName(), methDesc, sig, null);
+
+		mv.visitCode();		
+		BytecodeGenMethod gen = new BytecodeGenMethod(className,resultSet,method, mv,paramsAndLocals,cw,
+				genericsAndBoundsMethod,genericsAndBounds,isInterface,classFiles);
 		
-		BytecodeGenMethod gen = new BytecodeGenMethod(className,method, mv,paramsAndLocals,methDesc.getDesc(),cw);
 		mv.visitMaxs(0, 0);
 		mv.visitEnd();
 	}
 	
 	@Override
 	public void visit(ParameterList formalParameters) {
+		paramsAndLocals = new HashMap<>();
+		methodParamsAndTypes = new HashMap<>();
 		Iterator<FormalParameter> itr = formalParameters.iterator();
 		int i = 1;
 		while(itr.hasNext()) {
 			FormalParameter fp = itr.next();
 			paramsAndLocals.put(fp.getName(), i);
+			methodParamsAndTypes.put(fp.getName(), resultSet.resolveType(fp.getType()).resolvedType);
 			fp.accept(this);
 			i++;
 		}
@@ -183,7 +286,6 @@ public class BytecodeGen implements ASTVisitor {
 	// ??
 	@Override
 	public void visit(FieldVar fieldVar) {
-		System.out.println("in fieldvar");
 //		cw.newField(fieldVar.receiver.toString(), fieldVar.fieldVarName.toString(), fieldVar.getType().toString());
 		FieldVisitor fv = cw.visitField(Opcodes.ACC_PRIVATE, fieldVar.fieldVarName, "L"+fieldVar.getType()+";", null, null);
 		fv.visitEnd();
@@ -192,7 +294,6 @@ public class BytecodeGen implements ASTVisitor {
 	// access flages?? modifiers
 	@Override
 	public void visit(Field field) {
-		System.out.println("in field");
 		FieldVisitor fv = cw.visitField(Opcodes.ACC_PRIVATE, field.getName(), "L"+field.getType().toString().replace(".", "/")+";", null, null);
 		fv.visitEnd();
 	}
@@ -210,9 +311,8 @@ public class BytecodeGen implements ASTVisitor {
 	}

 	@Override
-	public void visit(Binary binary) {
-		// TODO Auto-generated method stub
-		
+	public void visit(BinaryExpr binary) {
+
 	}

 	@Override
@@ -281,12 +381,6 @@ public class BytecodeGen implements ASTVisitor {
 		
 	}

-	@Override
-	public void visit(Receiver receiver) {
-		// TODO Auto-generated method stub
-		
-	}
-
 	@Override
 	public void visit(Return aReturn) {
 		// TODO Auto-generated method stub
@@ -317,12 +411,6 @@ public class BytecodeGen implements ASTVisitor {
 		
 	}

-	@Override
-	public void visit(UnaryPlus unaryPlus) {
-		// TODO Auto-generated method stub
-		
-	}
-
 	@Override
 	public void visit(WhileStmt whileStmt) {
 		// TODO Auto-generated method stub
@@ -335,11 +423,6 @@ public class BytecodeGen implements ASTVisitor {
 		
 	}

-	@Override
-	public void visit(Null aNull) {
-		// TODO Auto-generated method stub
-		
-	}
 	// ???
 	@Override
 	public void visit(Literal literal) {
@@ -379,8 +462,18 @@ public class BytecodeGen implements ASTVisitor {

 	@Override
 	public void visit(SuperCall superCall) {
-		// TODO Auto-generated method stub
 		
 	}

+	@Override
+	public void visit(ExpressionReceiver expressionReceiver) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void visit(UnaryExpr unaryExpr) {
+		throw new NotImplementedException();
+	}
+
 }
--- a/src/de/dhbwstuttgart/bytecode/BytecodeGenLambda.java
+++ b/src/de/dhbwstuttgart/bytecode/BytecodeGenLambda.java
@@ -1,227 +0,0 @@
-package de.dhbwstuttgart.bytecode;
-
-import org.objectweb.asm.MethodVisitor;
-
-import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.statement.ArgumentList;
-import de.dhbwstuttgart.syntaxtree.statement.Assign;
-import de.dhbwstuttgart.syntaxtree.statement.AssignToField;
-import de.dhbwstuttgart.syntaxtree.statement.Binary;
-import de.dhbwstuttgart.syntaxtree.statement.Block;
-import de.dhbwstuttgart.syntaxtree.statement.CastExpr;
-import de.dhbwstuttgart.syntaxtree.statement.DoStmt;
-import de.dhbwstuttgart.syntaxtree.statement.EmptyStmt;
-import de.dhbwstuttgart.syntaxtree.statement.FieldVar;
-import de.dhbwstuttgart.syntaxtree.statement.ForStmt;
-import de.dhbwstuttgart.syntaxtree.statement.IfStmt;
-import de.dhbwstuttgart.syntaxtree.statement.InstanceOf;
-import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
-import de.dhbwstuttgart.syntaxtree.statement.LocalVar;
-import de.dhbwstuttgart.syntaxtree.statement.LocalVarDecl;
-import de.dhbwstuttgart.syntaxtree.statement.MethodCall;
-import de.dhbwstuttgart.syntaxtree.statement.NewArray;
-import de.dhbwstuttgart.syntaxtree.statement.NewClass;
-import de.dhbwstuttgart.syntaxtree.statement.Receiver;
-import de.dhbwstuttgart.syntaxtree.statement.Return;
-import de.dhbwstuttgart.syntaxtree.statement.ReturnVoid;
-import de.dhbwstuttgart.syntaxtree.statement.StaticClassName;
-import de.dhbwstuttgart.syntaxtree.statement.Super;
-import de.dhbwstuttgart.syntaxtree.statement.SuperCall;
-import de.dhbwstuttgart.syntaxtree.statement.This;
-import de.dhbwstuttgart.syntaxtree.statement.UnaryPlus;
-import de.dhbwstuttgart.syntaxtree.statement.WhileStmt;
-import de.dhbwstuttgart.syntaxtree.statement.literal.Literal;
-import de.dhbwstuttgart.syntaxtree.statement.literal.Null;
-
-public class BytecodeGenLambda implements StatementVisitor{
-	private LambdaExpression lambdaExpression;
-	private MethodVisitor mv;
-	
-	public BytecodeGenLambda(LambdaExpression lambdaExpression, MethodVisitor mv) {
-		this.lambdaExpression = lambdaExpression;
-		this.mv = mv;
-		
-		
-	}
-
-	@Override
-	public void visit(ArgumentList argumentList) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(LambdaExpression lambdaExpression) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(Assign assign) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(Binary binary) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(Block block) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(CastExpr castExpr) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(EmptyStmt emptyStmt) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(FieldVar fieldVar) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(ForStmt forStmt) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(IfStmt ifStmt) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(InstanceOf instanceOf) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(LocalVar localVar) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(LocalVarDecl localVarDecl) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(MethodCall methodCall) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(NewClass methodCall) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(NewArray newArray) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(Receiver receiver) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(Return aReturn) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(ReturnVoid aReturn) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(StaticClassName staticClassName) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(Super aSuper) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(This aThis) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(UnaryPlus unaryPlus) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(WhileStmt whileStmt) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(DoStmt whileStmt) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(Null aNull) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(Literal literal) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(AssignToField assignLeftSide) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(AssignToLocal assignLeftSide) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(SuperCall superCall) {
-		// TODO Auto-generated method stub
-		
-	}
-}
--- a/src/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
+++ b/src/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
--- a/src/de/dhbwstuttgart/bytecode/ClassFile.java
+++ b/src/de/dhbwstuttgart/bytecode/ClassFile.java
@@ -1,14 +0,0 @@
-package de.dhbwstuttgart.bytecode;
-
-public class ClassFile {
-	
-	String name;
-	byte[] bytecode;
-	
-	public ClassFile(String name, byte[] bytecode) {
-		this.name = name;
-		this.bytecode = bytecode;
-	}
-	
-
-}
--- a/src/de/dhbwstuttgart/bytecode/Descriptor.java
+++ b/src/de/dhbwstuttgart/bytecode/Descriptor.java
@@ -1,54 +0,0 @@
-package de.dhbwstuttgart.bytecode;
-
-import java.awt.List;
-import java.util.Iterator;
-
-import de.dhbwstuttgart.syntaxtree.Constructor;
-import de.dhbwstuttgart.syntaxtree.FormalParameter;
-import de.dhbwstuttgart.syntaxtree.Method;
-import de.dhbwstuttgart.syntaxtree.statement.ArgumentList;
-import de.dhbwstuttgart.syntaxtree.statement.Expression;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-
-public class Descriptor {
-	String desc;
-	
-	public Descriptor(Method method) {
-		desc = "(";
-		Iterator<FormalParameter> itr = method.getParameterList().iterator();
-		while(itr.hasNext()) {
-			FormalParameter fp = itr.next();
-			desc = desc + "L"+fp.getType().toString().replace(".", "/") + ";";
-		}
-		if(method.getReturnType().toString().equals("void")){
-			desc = desc + ")V";
-		}else {
-			desc = desc + ")" + "L"+method.getReturnType().toString().replace(".", "/")+";";
-		}
-		
-	}
-	
-	public Descriptor(Constructor constructor) {
-		desc = "(";
-		Iterator<FormalParameter> itr = constructor.getParameterList().iterator();
-		while(itr.hasNext()) {
-			FormalParameter fp = itr.next();
-			desc = desc + "L"+fp.getType().toString().replace(".", "/") + ";";
-		}
-		desc = desc + ")V";
-	}
-	
-	public Descriptor(ArgumentList argList, RefTypeOrTPHOrWildcardOrGeneric returnType) {
-		desc = "(";
-		for(Expression e : argList.getArguments()) {
-			desc = desc + "L"+e.getType().toString().replace(".", "/") + ";";
-		}
-		desc = desc + ")"+returnType.toString();
-		
-	}
-	
-	public String getDesc() {
-		return this.desc;
-	}
-
-}
--- a/src/de/dhbwstuttgart/bytecode/IStatement.java
+++ b/src/de/dhbwstuttgart/bytecode/IStatement.java
@@ -0,0 +1,9 @@
+package de.dhbwstuttgart.bytecode;
+
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+
+public interface IStatement {
+	public boolean isExprBinary();
+	public void genBCForRelOp(MethodVisitor mv, Label branchLabel, Label endLabel, BytecodeGenMethod bytecodeGenMethod);
+}
--- a/src/de/dhbwstuttgart/bytecode/LoopStmt.java
+++ b/src/de/dhbwstuttgart/bytecode/LoopStmt.java
@@ -0,0 +1,25 @@
+package de.dhbwstuttgart.bytecode;
+
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+import de.dhbwstuttgart.syntaxtree.statement.Expression;
+import de.dhbwstuttgart.syntaxtree.statement.Statement;
+
+public class LoopStmt extends AStatement {
+	
+    private Statement loopBlock;
+    
+    public LoopStmt(Expression expr, Statement loopBlock) {
+    		super(expr);
+    		this.loopBlock = loopBlock;
+    }
+
+	@Override
+	public void genBCForRelOp(MethodVisitor mv,Label branchLabel, Label endLabel, BytecodeGenMethod bytecodeGenMethod) {
+		this.loopBlock.accept(bytecodeGenMethod);
+		mv.visitJumpInsn(Opcodes.GOTO, endLabel);
+		mv.visitLabel(branchLabel);
+	}
+}
--- a/src/de/dhbwstuttgart/bytecode/ReturnStmt.java
+++ b/src/de/dhbwstuttgart/bytecode/ReturnStmt.java
@@ -0,0 +1,14 @@
+package de.dhbwstuttgart.bytecode;
+
+import org.objectweb.asm.MethodVisitor;
+
+import de.dhbwstuttgart.syntaxtree.statement.BinaryExpr;
+import de.dhbwstuttgart.syntaxtree.statement.Expression;
+
+public class ReturnStmt extends AStatement {
+	
+	public ReturnStmt(Expression retexpr) {
+		super(retexpr);
+	}
+	
+}
--- a/src/de/dhbwstuttgart/bytecode/Test.java
+++ b/src/de/dhbwstuttgart/bytecode/Test.java
@@ -1,150 +0,0 @@
-package de.dhbwstuttgart.bytecode;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.lang.invoke.CallSite;
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.Handle;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
-
-
-public class Test {
-	private static final String rootDirectory = System.getProperty("user.dir") + "/bin/de/dhbwstuttgart/bytecode/";
-
-	protected static ClassLoader getClassLoader() throws Exception {
-		File file = new File(rootDirectory);
-		URL url = file.toURI().toURL();
-		URL[] urls = new URL[] { url };
-		System.out.println(urls[0]);
-		return new URLClassLoader(urls);
-	}
-
-	public static void main(String[] args) {
-		// Test Lambda
-		ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
-		cw.visit(Opcodes.V1_8, Opcodes.ACC_PUBLIC + Opcodes.ACC_SUPER, "TestClass", null, "java/lang/Object", null);
-
-		cw.visitSource("TestClass.java", null);
-
-		// Create Constructor
-		MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", "()V", null, null);
-		mv.visitVarInsn(Opcodes.ALOAD, 0);
-
-		mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/Object", "<init>", "()V");
-
-		// mv.visitMethodInsn(INVOKEDYNAMIC, "#0", "run", "()Ljava/lang/Runnable");
-		//Call site, which, when invoked, returns an instance of the functional interface to which
-		//the lambda is being converted
-		MethodType mt = MethodType.methodType(CallSite.class, MethodHandles.Lookup.class, String.class,
-				MethodType.class, MethodType.class, MethodHandle.class, MethodType.class);
-		
-		Handle bootstrap = new Handle(Opcodes.H_INVOKESTATIC, "java/lang/invoke/LambdaMetafactory", "metafactory",
-				mt.toMethodDescriptorString());
-		Handle arg2 = new Handle(Opcodes.H_INVOKESTATIC, "TestClass", "lambda$0", "()V");
-
-		mv.visitInvokeDynamicInsn("run", "()Ljava/lang/Runnable;", bootstrap, 
-				Type.getMethodType("()V"), arg2,
-				Type.getMethodType("()V"));
-
-		mv.visitVarInsn(Opcodes.ASTORE, 1);
-		mv.visitVarInsn(Opcodes.ALOAD, 1);
-		mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/lang/Runnable", "run", "()V");
-		mv.visitInsn(Opcodes.RETURN);
-		
-		// creates bridge method, contains lambdas body
-				MethodVisitor mvl = cw.visitMethod(Opcodes.ACC_PRIVATE + Opcodes.ACC_STATIC + Opcodes.ACC_SYNTHETIC, "lambda$0",
-						"()V", null, null);
-				mvl.visitCode();
-				mvl.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/System", "out", "Ljava/io/PrintStream;");
-				mvl.visitLdcInsn("lambda");
-				mvl.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/io/PrintStream", "println", "(Ljava/lang/String;)V");
-				mvl.visitInsn(Opcodes.RETURN);
-				mvl.visitMaxs(2, 0);
-				mvl.visitEnd();
-		
-		mv.visitMaxs(1, 2);
-		mv.visitEnd();
-		
-
-		cw.visitInnerClass("java/lang/invoke/MethodHandles$Lookup", "java/lang/invoke/MethodHandles", "Lookup",
-				Opcodes.ACC_PUBLIC + Opcodes.ACC_STATIC + Opcodes.ACC_FINAL);
-		cw.visitEnd();
-
-		byte[] b = cw.toByteArray();
-
-		// Test if statement
-		/*
-		 * ClassWriter cw = new
-		 * ClassWriter(ClassWriter.COMPUTE_FRAMES|ClassWriter.COMPUTE_MAXS);
-		 * 
-		 * cw.visit(Opcodes.V1_8, Opcodes.ACC_PUBLIC+Opcodes.ACC_SUPER, "TestIf", null,
-		 * "java/lang/Object", null); MethodVisitor mv =
-		 * cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", "(Ljava/lang/Boolean;)V", null,
-		 * null); mv.visitCode();
-		 * 
-		 * // Label l0 = new Label(); // mv.visitLabel(l0);
-		 * 
-		 * mv.visitVarInsn(Opcodes.ALOAD, 0);
-		 * 
-		 * mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/Object", "<init>",
-		 * "()V");
-		 * 
-		 * // Label l1 = new Label(); // mv.visitLabel(l1);
-		 * mv.visitVarInsn(Opcodes.ALOAD, 1); mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL,
-		 * "java/lang/Boolean", "booleanValue", "()Z");
-		 * 
-		 * Label label = new Label(); mv.visitJumpInsn(Opcodes.IFEQ, label);
-		 * 
-		 * mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/System", "out",
-		 * "Ljava/io/PrintStream;"); mv.visitLdcInsn("1");
-		 * mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/io/PrintStream", "println",
-		 * "(Ljava/lang/String;)V");
-		 * 
-		 * Label endLabel = new Label(); mv.visitJumpInsn(Opcodes.GOTO, endLabel);
-		 * 
-		 * mv.visitLabel(label); mv.visitFieldInsn(Opcodes.GETSTATIC,
-		 * "java/lang/System", "out", "Ljava/io/PrintStream;"); mv.visitLdcInsn("0");
-		 * mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/io/PrintStream", "println",
-		 * "(Ljava/lang/String;)V");
-		 * 
-		 * 
-		 * 
-		 * mv.visitLabel(endLabel); mv.visitInsn(Opcodes.RETURN);
-		 * 
-		 * // Label l2 = new Label(); // mv.visitLabel(l2);
-		 * 
-		 * // mv.visitLocalVariable("this", "LTestIf;", null, l0, l2, 0); //
-		 * mv.visitLocalVariable("b", "Ljava/lang/Boolean;", null, l0, l2, 1);
-		 * mv.visitMaxs(2, 2); mv.visitEnd();
-		 * 
-		 * cw.visitEnd(); byte[] b = cw.toByteArray();
-		 */
-		FileOutputStream output;
-
-		try {
-			output = new FileOutputStream(new File(System.getProperty("user.dir") + "/testBytecode/TestClass.class"));
-			output.write(b);
-			output.close();
-		} catch (FileNotFoundException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-	}
-}
--- a/src/de/dhbwstuttgart/bytecode/TestClass.java
+++ b/src/de/dhbwstuttgart/bytecode/TestClass.java
@@ -1,8 +0,0 @@
-package de.dhbwstuttgart.bytecode;
-
-public class TestClass {
-	public TestClass() {
-		Runnable lam = () -> System.out.println("lambda");
-		lam.run();
-	}
-}
--- a/src/de/dhbwstuttgart/bytecode/TestFields.java
+++ b/src/de/dhbwstuttgart/bytecode/TestFields.java
@@ -1,59 +0,0 @@
-package de.dhbwstuttgart.bytecode;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
-
-public class TestFields {
-	private static final String rootDirectory = System.getProperty("user.dir") + "/bin/de/dhbwstuttgart/bytecode/";
-	
-	public static void main(String[] args) {
-		// TODO Auto-generated method stub
-		ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES|ClassWriter.COMPUTE_MAXS);
-		cw.visit(Opcodes.V1_8, Opcodes.ACC_PUBLIC + Opcodes.ACC_SUPER, "TetsF", null, "java/lang/Object", null);
-		
-		cw.visitSource("TetsF.java", null);
-
-		FieldVisitor fv = cw.visitField(Opcodes.ACC_PRIVATE, "z", Type.INT_TYPE.getDescriptor(), null, null);
-		fv.visitEnd();
-		
-		FieldVisitor fvS = cw.visitField(Opcodes.ACC_PUBLIC, "s", "Ljava/lang/String;", null, null);
-		fvS.visitEnd();
-		// Create Constructor
-		MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", "()V", null, null);
-		mv.visitCode();
-		
-		mv.visitVarInsn(Opcodes.ALOAD, 0);
-		mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/Object", "<init>", "()V");
-		mv.visitVarInsn(Opcodes.ALOAD, 0);
-		mv.visitLdcInsn("");
-		mv.visitFieldInsn(Opcodes.PUTFIELD, "TetsF", "s", "Ljava/lang/String;");
-		mv.visitInsn(Opcodes.RETURN);
-		mv.visitMaxs(2, 1);
-		mv.visitEnd();
-		
-		byte[] b = cw.toByteArray();
-		
-		FileOutputStream output;
-
-		try {
-			output = new FileOutputStream(new File(System.getProperty("user.dir") + "/testBytecode/TetsF.class"));
-			output.write(b);
-			output.close();
-		} catch (FileNotFoundException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-}
--- a/src/de/dhbwstuttgart/bytecode/TestIf.java
+++ b/src/de/dhbwstuttgart/bytecode/TestIf.java
@@ -1,11 +0,0 @@
-package de.dhbwstuttgart.bytecode;
-
-public class TestIf {
-	public TestIf(Boolean b) {
-		if(b) {
-			System.out.println("1");
-		}else {
-			System.out.println("0");
-		}
-	}
-}
--- a/src/de/dhbwstuttgart/bytecode/TestMeth.java
+++ b/src/de/dhbwstuttgart/bytecode/TestMeth.java
@@ -1,18 +0,0 @@
-package de.dhbwstuttgart.bytecode;
-
-public class TestMeth {
-	private int z;
-	public String s;
-	public TestMeth(int temp) {
-		this.z = temp;
-	}
-	public void m1(int a, int b) {
-		int y = m2(1,2,3,4);
-	}
-	
-	public int m2(int a, int b, int x, int y) {
-		Integer c = 55;
-		Integer g;
-		return a+b+y+c;
-	}
-}
--- a/src/de/dhbwstuttgart/bytecode/TetsF.java
+++ b/src/de/dhbwstuttgart/bytecode/TetsF.java
@@ -1,6 +0,0 @@
-package de.dhbwstuttgart.bytecode;
-
-public class TetsF {
-	private int z;
-	public String s = "";
-}
--- a/src/de/dhbwstuttgart/bytecode/descriptor/DescriptorToString.java
+++ b/src/de/dhbwstuttgart/bytecode/descriptor/DescriptorToString.java
@@ -0,0 +1,170 @@
+package de.dhbwstuttgart.bytecode.descriptor;
+
+import java.util.Iterator;
+
+import de.dhbwstuttgart.bytecode.signature.TypeToSignature;
+import de.dhbwstuttgart.bytecode.utilities.Lambda;
+import de.dhbwstuttgart.bytecode.utilities.MethodFromMethodCall;
+import de.dhbwstuttgart.bytecode.utilities.NormalConstructor;
+import de.dhbwstuttgart.bytecode.utilities.NormalMethod;
+import de.dhbwstuttgart.bytecode.utilities.SamMethod;
+import de.dhbwstuttgart.syntaxtree.FormalParameter;
+import de.dhbwstuttgart.syntaxtree.statement.Expression;
+import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.typeinference.result.ResultSet;
+
+public class DescriptorToString implements DescriptorVisitor{
+	ResultSet resultSet;
+	
+	public DescriptorToString(ResultSet resultSet) {
+		this.resultSet = resultSet;
+	}
+	
+	private String addReturnType(String desc, RefTypeOrTPHOrWildcardOrGeneric returnType, ResultSet resultSet) {
+		if(resultSet.resolveType(returnType).resolvedType.toString().equals("void")){
+			desc = desc + ")V";
+		}else {
+			desc = desc + ")" + "L"+resultSet.resolveType(returnType).resolvedType.acceptTV(new TypeToDescriptor())+ ";";
+		}
+		return desc;
+	}
+	
+	@Override
+	public String visit(NormalMethod method) {
+		
+		String desc = "(";
+		Iterator<FormalParameter> itr = method.getParameterList().iterator();
+		while(itr.hasNext()) {
+			FormalParameter fp = itr.next();
+//			System.out.println(resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToSignature()));
+//			System.out.println("Parmetrisierte typ ? "+ ((RefType) fp.getType()).getParaList().size());
+			if(method.hasGen()) {
+				String fpDesc = fp.getType().acceptTV(new TypeToDescriptor());
+				if(method.getGenericsAndBoundsMethod().containsKey(fpDesc)) {
+					desc += "L"+method.getGenericsAndBoundsMethod().get(fpDesc)+ ";";
+				}else if(method.getGenericsAndBounds().containsKey(fpDesc)){
+					desc += "L"+method.getGenericsAndBounds().get(fpDesc)+ ";";
+				}else {
+//					desc += "L"+resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor())+ ";";
+					String resType = resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor());
+					if(resType.subSequence(0, 4).equals("TPH ")) {
+						desc += "L"+method.getGenericsAndBoundsMethod().get(resType.substring(4)+"$")+ ";";
+					} else {
+						desc += "L"+resType+ ";";
+					}
+				}
+			}
+			//TODO: generate a class java%% ... %%
+			else if(resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor()).contains("<")){
+				desc += "L"+resultSet.resolveType(fp.getType()).resolvedType.toString().replace(".", "$$").replace("<", "$$$").replace(">", "$$$")+ ";";
+			}
+			else {
+				desc += "L"+resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor())+ ";";
+			}
+		}
+		
+		if(resultSet.resolveType(method.getReturnType()).resolvedType.toString().equals("void")) {
+			desc += ")V";
+		}else {
+			if(method.hasGen()) {
+				String ret = method.getReturnType().acceptTV(new TypeToDescriptor());
+				if(method.getGenericsAndBoundsMethod().containsKey(ret)) {
+					desc += ")L"+method.getGenericsAndBoundsMethod().get(ret)+ ";";
+				}else if(method.getGenericsAndBounds().containsKey(ret)){
+					desc += ")L"+method.getGenericsAndBounds().get(ret)+ ";";
+				}else {
+					String resType = resultSet.resolveType(method.getReturnType()).resolvedType.acceptTV(new TypeToDescriptor());
+					if(resType.subSequence(0, 4).equals("TPH ")) {
+						desc += ")" + "L"+method.getGenericsAndBoundsMethod().get(resType.substring(4)+"$")+ ";";
+					} else {
+						desc += ")" + "L"+resType+ ";";
+					}
+				}
+			}else {
+				desc += ")" + "L"+resultSet.resolveType(method.getReturnType()).resolvedType.acceptTV(new TypeToDescriptor())+ ";";
+			}
+		}
+//		desc = addReturnType(desc,method.getReturnType(), resultSet);
+		return desc;
+	}
+
+	@Override
+	public String visit(NormalConstructor constructor) {
+		String desc = "(";
+		Iterator<FormalParameter> itr = constructor.getParameterList().iterator();
+		while(itr.hasNext()) {
+			FormalParameter fp = itr.next();
+			if(constructor.hasGen()) {
+//				System.out.println("Cons has Gens");
+				String fpDesc = fp.getType().acceptTV(new TypeToDescriptor());
+//				System.out.println(fpDesc);
+				if(constructor.getGenericsAndBounds().containsKey(fpDesc)){
+					desc += "L"+constructor.getGenericsAndBounds().get(fpDesc)+ ";";
+				}else {
+					desc += "L"+resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor())+ ";";
+				}
+			}else {
+//				System.out.println("Cons has NOT Gens");
+				desc += "L"+resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor())+ ";";
+			}
+		}
+		desc = desc + ")V";
+		return desc;
+	}
+
+	@Override
+	public String visit(Lambda lambdaExpression) {
+		String desc = "(";
+		Iterator<FormalParameter> itr = lambdaExpression.getParams().iterator();
+		while(itr.hasNext()) {
+			FormalParameter fp = itr.next();
+			desc = desc + "L"+resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor()) + ";";
+		}
+		desc = addReturnType(desc, lambdaExpression.getReturnType(), resultSet);
+		return desc;
+	}
+
+	@Override
+	public String visit(SamMethod samMethod) {
+		String desc = "(";
+		Iterator<RefTypeOrTPHOrWildcardOrGeneric> itr = samMethod.getArgumentList().iterator();
+		while(itr.hasNext()) {
+			RefTypeOrTPHOrWildcardOrGeneric rt = itr.next();
+			desc = desc + "L"+resultSet.resolveType(rt).resolvedType.acceptTV(new TypeToDescriptor())+";";
+		}
+		desc = desc + ")"+"L"+resultSet.resolveType(samMethod.getReturnType()).resolvedType.acceptTV(new TypeToDescriptor())+";";
+		return desc;
+	}
+
+	@Override
+	public String visit(MethodFromMethodCall methodFromMethodCall) {
+		String desc = "(";
+		for(Expression e : methodFromMethodCall.getArgList().getArguments()) {
+			String d = e.getType().acceptTV(new TypeToDescriptor());
+			if(methodFromMethodCall.getGenericsAndBoundsMethod().containsKey(d)) {
+				desc += "L"+methodFromMethodCall.getGenericsAndBoundsMethod().get(d)+ ";";
+			}else if(methodFromMethodCall.getGenericsAndBounds().containsKey(d)) {
+				desc += "L"+methodFromMethodCall.getGenericsAndBounds().get(d)+ ";";
+			}else {
+				desc += "L"+resultSet.resolveType(e.getType()).resolvedType.acceptTV(new TypeToDescriptor())+ ";";
+			}
+		}
+		
+		if(resultSet.resolveType(methodFromMethodCall.getReturnType()).resolvedType.toString().equals("void")) {
+			desc += ")V";
+		}else {
+			String ret = resultSet.resolveType(methodFromMethodCall.getReturnType()).resolvedType.acceptTV(new TypeToDescriptor());
+			if(methodFromMethodCall.getGenericsAndBoundsMethod().containsKey(ret)) {
+				desc += ")L"+methodFromMethodCall.getGenericsAndBoundsMethod().get(ret)+ ";";
+			}else if(methodFromMethodCall.getGenericsAndBounds().containsKey(ret)){
+				desc += ")L"+methodFromMethodCall.getGenericsAndBounds().get(ret)+ ";";
+			}else {
+				desc += ")" + "L"+resultSet.resolveType(methodFromMethodCall.getReturnType()).resolvedType.acceptTV(new TypeToDescriptor())+ ";";
+			}
+		}
+//		desc = addReturnType(desc, methodFromMethodCall.getReturnType(), resultSet);
+		return desc;
+	}
+	
+}
--- a/src/de/dhbwstuttgart/bytecode/descriptor/DescriptorVisitor.java
+++ b/src/de/dhbwstuttgart/bytecode/descriptor/DescriptorVisitor.java
@@ -0,0 +1,15 @@
+package de.dhbwstuttgart.bytecode.descriptor;
+
+import de.dhbwstuttgart.bytecode.utilities.Lambda;
+import de.dhbwstuttgart.bytecode.utilities.MethodFromMethodCall;
+import de.dhbwstuttgart.bytecode.utilities.NormalConstructor;
+import de.dhbwstuttgart.bytecode.utilities.NormalMethod;
+import de.dhbwstuttgart.bytecode.utilities.SamMethod;
+
+public interface DescriptorVisitor {
+	public String visit(NormalMethod method);
+	public String visit(NormalConstructor constructor);
+	public String visit(Lambda lambdaExpression);
+	public String visit(SamMethod samMethod);
+	public String visit(MethodFromMethodCall methodFromMethodCall);
+}
--- a/src/de/dhbwstuttgart/bytecode/descriptor/TypeToDescriptor.java
+++ b/src/de/dhbwstuttgart/bytecode/descriptor/TypeToDescriptor.java
@@ -0,0 +1,40 @@
+package de.dhbwstuttgart.bytecode.descriptor;
+
+import de.dhbwstuttgart.exceptions.NotImplementedException;
+import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
+import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
+import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
+import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.type.TypeVisitor;
+
+public class TypeToDescriptor implements TypeVisitor<String>{
+
+	@Override
+	public String visit(RefType refType) {
+		return refType.getName().toString().replace(".", "/");
+//		String t = refType.getName().toString().replace(".", "/");
+//		return t.equals("Fun1")?(t+"$$"):t;
+	}
+
+	@Override
+	public String visit(SuperWildcardType superWildcardType) {
+		throw new NotImplementedException();
+	}
+
+	@Override
+	public String visit(TypePlaceholder typePlaceholder) {
+		return typePlaceholder.toString().replace(".", "/");
+	}
+
+	@Override
+	public String visit(ExtendsWildcardType extendsWildcardType) {
+		return extendsWildcardType.getInnerType().toString().replace(".", "/");
+		//throw new NotImplementedException();
+	}
+
+	@Override
+	public String visit(GenericRefType genericRefType) {
+		return genericRefType.getParsedName().replace(".", "/");
+	}
+}
--- a/src/de/dhbwstuttgart/bytecode/signature/Signature.java
+++ b/src/de/dhbwstuttgart/bytecode/signature/Signature.java
@@ -0,0 +1,225 @@
+package de.dhbwstuttgart.bytecode.signature;
+
+import java.util.HashMap;
+import java.util.Iterator;
+
+import org.objectweb.asm.Type;
+import org.objectweb.asm.signature.SignatureVisitor;
+import org.objectweb.asm.signature.SignatureWriter;
+
+import de.dhbwstuttgart.bytecode.descriptor.TypeToDescriptor;
+import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+import de.dhbwstuttgart.syntaxtree.Constructor;
+import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
+import de.dhbwstuttgart.syntaxtree.Method;
+import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
+import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.typeinference.result.ResultSet;
+
+public class Signature {
+	private ClassOrInterface classOrInterface;
+	private HashMap<String, String> genericsAndBounds;
+	private HashMap<String, String> genericsAndBoundsMethod;
+	private SignatureWriter sw;
+	private Constructor constructor;
+	private Method method;
+	private HashMap<String,RefTypeOrTPHOrWildcardOrGeneric> methodParamsAndTypes;
+	private ResultSet resultSet;
+	
+	public Signature(ClassOrInterface classOrInterface, HashMap<String, String> genericsAndBounds) {
+		this.classOrInterface = classOrInterface;
+		this.genericsAndBounds = genericsAndBounds;
+		sw = new SignatureWriter();
+		createSignatureForClassOrInterface();
+	}
+
+	public Signature(Constructor constructor, HashMap<String, String> genericsAndBounds, HashMap<String,RefTypeOrTPHOrWildcardOrGeneric> methodParamsAndTypes) {
+		this.constructor = constructor;
+		this.genericsAndBounds = genericsAndBounds;
+		this.methodParamsAndTypes = methodParamsAndTypes;
+		sw = new SignatureWriter();
+		createSignatureForConsOrMethod(this.constructor,true);
+	}
+
+	public Signature(Method method, HashMap<String, String> genericsAndBoundsMethod,
+			HashMap<String, RefTypeOrTPHOrWildcardOrGeneric> methodParamsAndTypes, ResultSet resultSet) {
+		this.method = method;
+		this.genericsAndBoundsMethod = genericsAndBoundsMethod;
+		this.methodParamsAndTypes = methodParamsAndTypes;
+		this.resultSet = resultSet;
+		sw = new SignatureWriter();
+		createSignatureForConsOrMethod(this.method,false);
+	}
+	
+	public Signature(LambdaExpression lambdaExpression,int numberOfParams) {
+		sw = new SignatureWriter();
+		createSignatureForFunN(lambdaExpression, numberOfParams);
+	}
+
+	private void createSignatureForFunN(LambdaExpression lambdaExpression, int numberOfParams) {
+		
+//		sw.visitClassBound().visitEnd();
+		for(int i = 0;i<numberOfParams;i++) {
+			int j = i+1;
+			sw.visitFormalTypeParameter("T"+ j);
+			// getBounds von Params
+			sw.visitClassBound().visitClassType(Type.getInternalName(Object.class));
+			sw.visitClassBound().visitEnd();
+		}
+
+		sw.visitFormalTypeParameter("R");
+		// getBounds vom Return-Type
+		sw.visitClassBound().visitClassType(Type.getInternalName(Object.class));
+		sw.visitClassBound().visitEnd();
+		// TODO: prüfe ob Return-Type = void,
+		sw.visitSuperclass().visitClassType(Type.getInternalName(Object.class));;
+		sw.visitEnd();
+	}
+
+	/**
+	 * Creates signature for a method or constructor with @see {@link SignatureWriter}
+	 * Signature looks like: 
+	 * <typevaliables (K:Ljava/lang/Object "Bounds")>(params L.. OR T.. Or basistape)ReturnType
+	 * 
+	 * @param method method or constructor
+	 * @param isConstructor true if constructor
+	 */
+	private void createSignatureForConsOrMethod(Method method, boolean isConstructor) {
+		Iterator<? extends GenericTypeVar> itr = method.getGenerics().iterator();
+		// visits all formal type parameter and visits their bounds <T:...;B:...;...>
+		while(itr.hasNext()) {
+			GenericTypeVar g = itr.next();
+			getBoundsOfTypeVar(g,genericsAndBoundsMethod);
+		}
+		// Wenn die RückgabeType eine TPH ist, wird als generic behandelt
+		// z.B: Type = TPH K => wird eine Formal Type Parameter K$ erzeugt und Bound = Object
+		String ret = resultSet.resolveType(method.getReturnType()).resolvedType.acceptTV(new TypeToSignature());
+		if(ret.substring(0,4).equals("TPH ")) {
+			String g = ret.substring(4)+"$";
+			sw.visitFormalTypeParameter(g);
+			sw.visitClassBound().visitClassType(Type.getInternalName(Object.class));
+			genericsAndBoundsMethod.put(g, Type.getInternalName(Object.class));
+			sw.visitClassBound().visitEnd();
+		}
+		
+		for(String paramName : methodParamsAndTypes.keySet()) {
+			RefTypeOrTPHOrWildcardOrGeneric t = methodParamsAndTypes.get(paramName);
+			String pT = t.acceptTV(new TypeToSignature()); 
+			// S.o
+			if(pT.substring(0,4).equals("TPH ") && !genericsAndBoundsMethod.containsKey(pT)) {
+				String gP = pT.substring(4)+"$";
+				sw.visitFormalTypeParameter(gP);
+				sw.visitClassBound().visitClassType(Type.getInternalName(Object.class));
+				genericsAndBoundsMethod.put(gP, Type.getInternalName(Object.class));
+				sw.visitClassBound().visitEnd();
+			}
+		}
+		
+		// visit each method-parameter to create the signature 
+		for(String paramName : methodParamsAndTypes.keySet()) {
+			RefTypeOrTPHOrWildcardOrGeneric t = methodParamsAndTypes.get(paramName);
+			// parameter type deswegen ist true
+			doVisitParamsOrReturn(t,true);
+		}
+		if(isConstructor) {
+			sw.visitReturnType().visitBaseType('V');
+		}else {
+//			String ret = resultSet.resolveType(method.getReturnType()).resolvedType.acceptTV(new TypeToSignature()); 
+//			if(ret.substring(0,4).equals("TPH ")) {
+//				String g = ret.substring(4);
+//				if(!genericsAndBoundsMethod.containsKey(g)) {
+//					genericsAndBoundsMethod.put(g, Type.getInternalName(Object.class));
+//				} else {
+//					genericsAndBoundsMethod.put(g+"_", Type.getInternalName(Object.class));
+//				}
+//			}
+			RefTypeOrTPHOrWildcardOrGeneric returnType = method.getReturnType();
+			// return type deswegen ist false
+			doVisitParamsOrReturn(returnType, false);
+		}
+//		sw.visitEnd();
+	}
+	/**
+	 * Visits parameter type or return type with {@link SignatureVisitor} to create
+	 * the method signature
+	 * @param t type of parameter or return type
+	 * @param isParameterType true if t is type of parameter
+	 */
+	private void doVisitParamsOrReturn(RefTypeOrTPHOrWildcardOrGeneric t, boolean isParameterType) {
+		String type = t.acceptTV(new TypeToString());
+		SignatureVisitor sv;
+		if(isParameterType) {
+			 sv = sw.visitParameterType();
+		}
+		else {
+			sv = sw.visitReturnType();
+		}
+		switch (type) {
+		case "RT":
+			sv.visitClassType(t.acceptTV(new TypeToSignature()));
+			break;
+		case "GRT":
+			GenericRefType g = (GenericRefType) t;
+			sv.visitTypeVariable(g.acceptTV(new TypeToSignature()));
+			break;
+		case "TPH":
+			RefTypeOrTPHOrWildcardOrGeneric r = resultSet.resolveType(t).resolvedType;
+			// der Fall wenn die Type eine Interface ist, muss betrachtet werden
+			// Deswegen muss in ResutSet noch enthalten werden, ob die Type eine
+			// Interface oder eine Klasse ist.
+			if(!r.acceptTV(new TypeToSignature()).substring(0, 4).equals("TPH ")) {
+//				sv.visitInterface().visitClassType(r.acceptTV(new TypeToSignature()));
+				sv.visitClassType(r.acceptTV(new TypeToSignature()));
+			} else {
+				System.out.println(r.getClass()+" Signature TPH: "+r.acceptTV(new TypeToSignature()));
+				sv.visitTypeVariable(r.acceptTV(new TypeToSignature()).substring(4)+"$");
+			}
+			break;
+		default:
+			if(!isParameterType)
+				sv.visitBaseType('V');
+			break;
+		}
+	}
+	/**
+	 * Creates signature for class or interface with {@link SignatureWriter}
+	 * Signature looks like: 
+	 * <typevaliables (K:Ljava/lang/Object "Bounds")>superclass
+	 */
+	private void createSignatureForClassOrInterface() {
+		Iterator<GenericTypeVar> itr = classOrInterface.getGenerics().iterator();
+
+		while(itr.hasNext()) {
+			GenericTypeVar g = itr.next();
+			getBoundsOfTypeVar(g,genericsAndBounds);
+		}
+		
+		sw.visitSuperclass().visitClassType(classOrInterface.getSuperClass().acceptTV(new TypeToDescriptor()));;
+		sw.visitEnd();
+	}
+	/**
+	 * Get bounds of type variable
+	 * @param g type variable
+	 * @param genAndBounds 
+	 */
+	private void getBoundsOfTypeVar(GenericTypeVar g, HashMap<String, String> genAndBounds) {
+		sw.visitFormalTypeParameter(g.getName());
+		
+		Iterator<? extends RefTypeOrTPHOrWildcardOrGeneric> bItr = g.getBounds().iterator(); 
+		while(bItr.hasNext()) {
+			RefTypeOrTPHOrWildcardOrGeneric b =bItr.next();
+			String boundDesc = b.acceptTV(new TypeToDescriptor());
+//			System.out.println("GetBounds: " + boundDesc);
+			// Ensure that <...> extends java.lang.Object OR ...
+			sw.visitClassBound().visitClassType(boundDesc);
+			genAndBounds.put(g.getName(), boundDesc);
+		}
+		sw.visitClassBound().visitEnd();
+	}
+	
+	public String toString() {
+		return sw.toString();
+	}
+	
+}
--- a/src/de/dhbwstuttgart/bytecode/signature/TypeToSignature.java
+++ b/src/de/dhbwstuttgart/bytecode/signature/TypeToSignature.java
@@ -0,0 +1,55 @@
+package de.dhbwstuttgart.bytecode.signature;
+
+import java.util.Iterator;
+
+import de.dhbwstuttgart.exceptions.NotImplementedException;
+import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
+import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
+import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
+import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.type.TypeVisitor;
+
+public class TypeToSignature implements TypeVisitor<String> {
+
+	@Override
+	public String visit(RefType refType) {
+//		return refType.toString().replace(".", "/");
+		String params = "";
+        if(refType.getParaList().size()>0){
+            params += "<";
+            Iterator<RefTypeOrTPHOrWildcardOrGeneric> it = refType.getParaList().iterator();
+            while(it.hasNext()){
+                RefTypeOrTPHOrWildcardOrGeneric param = it.next();
+                params += "L"+param.toString().replace(".", "/");
+                if(it.hasNext())params += ";";
+            }
+            params += ";>";
+        }
+//        		String t = refType.getName().toString().replace(".", "/");
+//        		return t.equals("Fun1")?t+"$$"+params+";":t+params+";";
+        return refType.getName().toString().replace(".", "/") + params+";";
+	}
+
+	@Override
+	public String visit(SuperWildcardType superWildcardType) {
+		throw new NotImplementedException();
+	}
+
+	@Override
+	public String visit(TypePlaceholder typePlaceholder) {
+		return typePlaceholder.toString().replace(".", "/");
+	}
+
+	@Override
+	public String visit(ExtendsWildcardType extendsWildcardType) {
+		throw new NotImplementedException();
+	}
+
+	@Override
+	public String visit(GenericRefType genericRefType) {
+		return genericRefType.getParsedName().replace(".", "/");
+	}
+	
+}
--- a/src/de/dhbwstuttgart/bytecode/signature/TypeToString.java
+++ b/src/de/dhbwstuttgart/bytecode/signature/TypeToString.java
@@ -0,0 +1,38 @@
+package de.dhbwstuttgart.bytecode.signature;
+
+import de.dhbwstuttgart.exceptions.NotImplementedException;
+import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
+import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
+import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
+import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.type.TypeVisitor;
+
+public class TypeToString implements TypeVisitor<String>{
+
+	@Override
+	public String visit(RefType refType) {
+		return "RT";
+	}
+
+	@Override
+	public String visit(SuperWildcardType superWildcardType) {
+		throw new NotImplementedException();
+	}
+
+	@Override
+	public String visit(TypePlaceholder typePlaceholder) {
+		return "TPH";
+	}
+
+	@Override
+	public String visit(ExtendsWildcardType extendsWildcardType) {
+		throw new NotImplementedException();
+	}
+
+	@Override
+	public String visit(GenericRefType genericRefType) {
+		return "GRT";
+	}
+
+}
--- a/src/de/dhbwstuttgart/bytecode/utilities/KindOfLambda.java
+++ b/src/de/dhbwstuttgart/bytecode/utilities/KindOfLambda.java
@@ -0,0 +1,198 @@
+package de.dhbwstuttgart.bytecode.utilities;
+
+import de.dhbwstuttgart.exceptions.NotImplementedException;
+import de.dhbwstuttgart.syntaxtree.statement.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
+import de.dhbwstuttgart.syntaxtree.StatementVisitor;
+import de.dhbwstuttgart.syntaxtree.statement.Literal;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+
+public class KindOfLambda implements StatementVisitor{
+	private boolean isInstanceCapturingLambda = false;
+	private List<RefTypeOrTPHOrWildcardOrGeneric> argumentList = new ArrayList<>();
+	
+	public KindOfLambda(LambdaExpression lambdaExpression) {
+		lambdaExpression.methodBody.accept(this);
+		
+	}
+	
+	public boolean isInstanceCapturingLambda() {
+		return this.isInstanceCapturingLambda;
+	}
+	
+	public List<RefTypeOrTPHOrWildcardOrGeneric> getArgumentList() {
+		return argumentList;
+	}
+	
+	@Override
+	public void visit(ArgumentList argumentList) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(LambdaExpression lambdaExpression) {
+		
+	}
+
+	@Override
+	public void visit(Assign assign) {
+		assign.rightSide.accept(this);
+	}
+
+	@Override
+	public void visit(BinaryExpr binary) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(Block block) {
+		for(Statement stmt : block.getStatements()) {
+			stmt.accept(this);
+		}
+	}
+
+	@Override
+	public void visit(CastExpr castExpr) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(EmptyStmt emptyStmt) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(FieldVar fieldVar) {
+		fieldVar.receiver.accept(this);
+	}
+
+	@Override
+	public void visit(ForStmt forStmt) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(IfStmt ifStmt) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(InstanceOf instanceOf) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(LocalVar localVar) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(LocalVarDecl localVarDecl) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(MethodCall methodCall) {
+		methodCall.receiver.accept(this);
+	}
+
+	@Override
+	public void visit(NewClass methodCall) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(NewArray newArray) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(ExpressionReceiver receiver) {
+		receiver.expr.accept(this);
+	}
+
+	@Override
+	public void visit(UnaryExpr unaryExpr) {
+		throw new NotImplementedException();
+	}
+
+	@Override
+	public void visit(Return aReturn) {
+		aReturn.retexpr.accept(this);
+	}
+
+	@Override
+	public void visit(ReturnVoid aReturn) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(StaticClassName staticClassName) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(Super aSuper) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(This aThis) {
+		this.isInstanceCapturingLambda = true;
+		this.argumentList.add(aThis.getType());
+	}
+
+	@Override
+	public void visit(WhileStmt whileStmt) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(DoStmt whileStmt) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(Literal literal) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(AssignToField assignLeftSide) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(AssignToLocal assignLeftSide) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(SuperCall superCall) {
+		// TODO Auto-generated method stub
+		
+	}
+}
--- a/src/de/dhbwstuttgart/bytecode/utilities/Lambda.java
+++ b/src/de/dhbwstuttgart/bytecode/utilities/Lambda.java
@@ -0,0 +1,26 @@
+package de.dhbwstuttgart.bytecode.utilities;
+
+import de.dhbwstuttgart.bytecode.descriptor.DescriptorVisitor;
+import de.dhbwstuttgart.syntaxtree.ParameterList;
+import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+
+public class Lambda {
+	private LambdaExpression lambdaExpression;
+	
+	public Lambda(LambdaExpression lambdaExpression) {
+		this.lambdaExpression = lambdaExpression;
+	}
+	
+	public ParameterList getParams() {
+		return lambdaExpression.params;
+	}
+	
+	public RefTypeOrTPHOrWildcardOrGeneric getReturnType() {
+		return lambdaExpression.getReturnType();
+	}
+	
+	public String accept(DescriptorVisitor descVisitor) {
+		return descVisitor.visit(this);
+	}
+}
--- a/src/de/dhbwstuttgart/bytecode/utilities/MethodFromMethodCall.java
+++ b/src/de/dhbwstuttgart/bytecode/utilities/MethodFromMethodCall.java
@@ -0,0 +1,42 @@
+package de.dhbwstuttgart.bytecode.utilities;
+
+import java.util.HashMap;
+
+import de.dhbwstuttgart.bytecode.descriptor.DescriptorVisitor;
+import de.dhbwstuttgart.syntaxtree.statement.ArgumentList;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+
+public class MethodFromMethodCall {
+	private ArgumentList argList;
+	private RefTypeOrTPHOrWildcardOrGeneric returnType;
+	private HashMap<String, String> genericsAndBoundsMethod;
+	private HashMap<String,String> genericsAndBounds;
+	
+	public MethodFromMethodCall(ArgumentList argList,RefTypeOrTPHOrWildcardOrGeneric returnType,
+			HashMap<String, String> genericsAndBoundsMethod,HashMap<String,String> genericsAndBounds) {
+		this.argList = argList;
+		this.returnType = returnType;
+		this.genericsAndBoundsMethod = genericsAndBoundsMethod;
+		this.genericsAndBounds = genericsAndBounds;
+	}
+	
+	public ArgumentList getArgList() {
+		return argList;
+	}
+
+	public RefTypeOrTPHOrWildcardOrGeneric getReturnType() {
+		return returnType;
+	}
+	
+	public HashMap<String, String> getGenericsAndBoundsMethod(){
+		return genericsAndBoundsMethod;
+	}
+	
+	public HashMap<String,String> getGenericsAndBounds(){
+		return genericsAndBounds;
+	}
+	
+	public String accept(DescriptorVisitor descVisitor) {
+		return descVisitor.visit(this);
+	}
+}
--- a/src/de/dhbwstuttgart/bytecode/utilities/NormalConstructor.java
+++ b/src/de/dhbwstuttgart/bytecode/utilities/NormalConstructor.java
@@ -0,0 +1,40 @@
+package de.dhbwstuttgart.bytecode.utilities;
+
+import java.util.HashMap;
+
+import de.dhbwstuttgart.bytecode.descriptor.DescriptorVisitor;
+import de.dhbwstuttgart.syntaxtree.Constructor;
+import de.dhbwstuttgart.syntaxtree.ParameterList;
+
+public class NormalConstructor {
+	private Constructor constructor;
+	private HashMap<String, String> genericsAndBounds;
+	private boolean hasGenerics;
+	
+	public NormalConstructor(Constructor constructor, boolean hasGenerics) {
+		this.constructor = constructor;
+		this.hasGenerics = hasGenerics;
+	}
+	
+	public NormalConstructor(Constructor constructor, HashMap<String, String> genericsAndBounds, boolean hasGenerics) {
+		this.constructor = constructor;
+		this.genericsAndBounds = genericsAndBounds;
+		this.hasGenerics = hasGenerics;
+	}
+
+	public HashMap<String, String> getGenericsAndBounds() {
+		return genericsAndBounds;
+	}
+
+	public boolean hasGen() {
+		return hasGenerics;
+	}
+
+	public ParameterList getParameterList() {
+		return constructor.getParameterList();
+	}
+	
+	public String accept(DescriptorVisitor descVisitor) {
+		return descVisitor.visit(this);
+	}
+}
--- a/src/de/dhbwstuttgart/bytecode/utilities/NormalMethod.java
+++ b/src/de/dhbwstuttgart/bytecode/utilities/NormalMethod.java
@@ -0,0 +1,56 @@
+package de.dhbwstuttgart.bytecode.utilities;
+
+import java.util.HashMap;
+
+import de.dhbwstuttgart.bytecode.descriptor.DescriptorVisitor;
+import de.dhbwstuttgart.syntaxtree.Method;
+import de.dhbwstuttgart.syntaxtree.ParameterList;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+
+public class NormalMethod {
+	private Method method;
+	private HashMap<String, String> genericsAndBounds;
+	private HashMap<String, String> genericsAndBoundsMethod;
+	private boolean hasGenerics;
+	
+	public NormalMethod(Method method, boolean hasGenerics) {
+		this.method = method;
+		this.hasGenerics = hasGenerics;
+	}
+
+	public NormalMethod(Method method, HashMap<String, String> genericsAndBounds,
+			HashMap<String, String> genericsAndBoundsMethod,boolean hasGenerics) {
+		this.method = method;
+		this.genericsAndBounds = genericsAndBounds;
+		this.genericsAndBoundsMethod = genericsAndBoundsMethod;
+		this.hasGenerics = hasGenerics;
+	}
+
+	public Method getMethod() {
+		return method;
+	}
+	
+	public ParameterList getParameterList() {
+		return method.getParameterList();
+	}
+	
+	public HashMap<String, String> getGenericsAndBounds(){
+		return genericsAndBounds;
+	}
+	
+	public HashMap<String, String> getGenericsAndBoundsMethod(){
+		return genericsAndBoundsMethod;
+	}
+	
+	public RefTypeOrTPHOrWildcardOrGeneric getReturnType() {
+		return method.getReturnType();
+	}
+	
+	public boolean hasGen() {
+		return this.hasGenerics;
+	}
+	
+	public String accept(DescriptorVisitor descVisitor) {
+		return descVisitor.visit(this);
+	}
+}
--- a/src/de/dhbwstuttgart/bytecode/utilities/SamMethod.java
+++ b/src/de/dhbwstuttgart/bytecode/utilities/SamMethod.java
@@ -0,0 +1,32 @@
+package de.dhbwstuttgart.bytecode.utilities;
+
+import java.util.List;
+
+import de.dhbwstuttgart.bytecode.descriptor.DescriptorVisitor;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+
+public class SamMethod {
+	private List<RefTypeOrTPHOrWildcardOrGeneric> argumentList;
+	private RefTypeOrTPHOrWildcardOrGeneric returnType;
+	
+	public SamMethod(List<RefTypeOrTPHOrWildcardOrGeneric> argumentList, RefTypeOrTPHOrWildcardOrGeneric returnType) {
+		this.argumentList = argumentList;
+		this.returnType = returnType;
+	}
+	
+	public List<RefTypeOrTPHOrWildcardOrGeneric> getArgumentList() {
+		return argumentList;
+	}
+
+
+
+	public RefTypeOrTPHOrWildcardOrGeneric getReturnType() {
+		return returnType;
+	}
+
+
+
+	public String accept(DescriptorVisitor descVisitor) {
+		return descVisitor.visit(this);
+	}
+}
--- a/src/de/dhbwstuttgart/core/JavaTXCompiler.java
+++ b/src/de/dhbwstuttgart/core/JavaTXCompiler.java
@@ -1,103 +1,180 @@
 package de.dhbwstuttgart.core;

+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;

+import de.dhbwstuttgart.bytecode.BytecodeGen;
 import de.dhbwstuttgart.environment.CompilationEnvironment;
 import de.dhbwstuttgart.parser.JavaTXParser;
-import de.dhbwstuttgart.parser.scope.GenericsRegistry;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.SyntaxTreeGenerator;
 import de.dhbwstuttgart.parser.antlr.Java8Parser.CompilationUnitContext;
+import de.dhbwstuttgart.parser.scope.GenericsRegistry;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
-import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
+import de.dhbwstuttgart.strucTypes.Construct;
+import de.dhbwstuttgart.strucTypes.Solve;
+import de.dhbwstuttgart.strucTypes.StrucTYPE;
+import de.dhbwstuttgart.strucTypes.constraint.ConstraintsSet;
+import de.dhbwstuttgart.strucTypes.constraint.SubTypeConstraint;
+import de.dhbwstuttgart.strucTypes.exception.ImpossibleSubTypeException;
+import de.dhbwstuttgart.strucTypes.exception.InconsistentConstraintsException;
+import de.dhbwstuttgart.strucTypes.model.InferredTypes;
+import de.dhbwstuttgart.strucTypes.model.SolvedClass;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+import de.dhbwstuttgart.syntaxtree.ParameterList;
 import de.dhbwstuttgart.syntaxtree.SourceFile;
 import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
 import de.dhbwstuttgart.syntaxtree.factory.UnifyTypeFactory;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.visual.ASTTypePrinter;
 import de.dhbwstuttgart.typeinference.constraints.Constraint;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.constraints.Pair;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
 import de.dhbwstuttgart.typeinference.typeAlgo.TYPE;
+import de.dhbwstuttgart.typeinference.unify.RuleSet;
 import de.dhbwstuttgart.typeinference.unify.TypeUnify;
+import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
 import de.dhbwstuttgart.typeinference.unify.model.FiniteClosure;
+import de.dhbwstuttgart.typeinference.unify.model.PlaceholderType;
 import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;

-import java.io.File;
-import java.io.IOException;
-import java.util.*;
-import java.util.stream.Collectors;
-
 public class JavaTXCompiler {

 	final CompilationEnvironment environment;
-    public final Map<File, SourceFile> sourceFiles = new HashMap<>();
+	public final Map<File, SourceFile> sourceFiles = new HashMap<>();

-    public JavaTXCompiler(File sourceFile) throws IOException, ClassNotFoundException {
-        this(Arrays.asList(sourceFile));
-    }
+	public JavaTXCompiler(File sourceFile) throws IOException, ClassNotFoundException {
+		this(Arrays.asList(sourceFile));
+	}

-    public JavaTXCompiler(List<File> sources) throws IOException, ClassNotFoundException {
-        environment = new CompilationEnvironment(sources);
-        for(File s : sources){
-            sourceFiles.put(s,parse(s));
-        }
-    }
+	public JavaTXCompiler(List<File> sources) throws IOException, ClassNotFoundException {
+		environment = new CompilationEnvironment(sources);
+		for (File s : sources) {
+			sourceFiles.put(s, parse(s));
+		}
+	}

-    public List<ResultSet> typeInference() throws ClassNotFoundException {
-        List<ClassOrInterface> allClasses = new ArrayList<>();//environment.getAllAvailableClasses();
-        for(SourceFile sf : sourceFiles.values()){
-            allClasses.addAll(sf.getClasses());
-        }
-        List<ClassOrInterface> importedClasses = new ArrayList<>();
-        //Alle Importierten Klassen in allen geparsten Sourcefiles kommen ins FC
-        for(File forSourceFile : sourceFiles.keySet())
-            for(JavaClassName name : sourceFiles.get(forSourceFile).getImports()){
-                ClassOrInterface importedClass = ASTFactory.createClass(
-                        ClassLoader.getSystemClassLoader().loadClass(name.toString()));
-                importedClasses.add(importedClass);
-            }
-        allClasses.addAll(importedClasses);
-        FiniteClosure finiteClosure =  UnifyTypeFactory.generateFC(allClasses);
+	public ConstraintSet<Pair> getConstraints() throws ClassNotFoundException {
+		List<ClassOrInterface> allClasses = new ArrayList<>();// environment.getAllAvailableClasses();
+		for (SourceFile sf : sourceFiles.values()) {
+			allClasses.addAll(sf.getClasses());
+		}
+		List<ClassOrInterface> importedClasses = new ArrayList<>();
+		// Alle Importierten Klassen in allen geparsten Sourcefiles kommen ins
+		// FC
+		for (File forSourceFile : sourceFiles.keySet())
+			for (JavaClassName name : sourceFiles.get(forSourceFile).getImports()) {
+				// TODO: Hier werden imports von eigenen (.jav) Klassen nicht
+				// beachtet
+				ClassOrInterface importedClass = ASTFactory
+						.createClass(ClassLoader.getSystemClassLoader().loadClass(name.toString()));
+				importedClasses.add(importedClass);
+			}
+		allClasses.addAll(importedClasses);

-        final ConstraintSet<Pair> cons = new TYPE(sourceFiles.values(), allClasses).getConstraints();
-        ConstraintSet<UnifyPair> unifyCons = UnifyTypeFactory.convert(cons);
+		return new TYPE(sourceFiles.values(), allClasses).getConstraints();
+	}

-        TypeUnify unify = new TypeUnify();
-        Set<Set<UnifyPair>> results = new HashSet<>();
-        for(List<Constraint<UnifyPair>> xCons : unifyCons.cartesianProduct()){
-            Set<UnifyPair> xConsSet = new HashSet<>();
-            for(Constraint<UnifyPair> constraint : xCons){
-                xConsSet.addAll(constraint);
-            }
+	public List<ClassOrInterface> getAvailableClasses(SourceFile forSourceFile) throws ClassNotFoundException {
+		List<ClassOrInterface> allClasses = new ArrayList<>();// environment.getAllAvailableClasses();
+		for (SourceFile sf : sourceFiles.values()) {
+			allClasses.addAll(sf.getClasses());
+		}
+		List<ClassOrInterface> importedClasses = new ArrayList<>();
+		for (JavaClassName name : forSourceFile.getImports()) {
+			// TODO: Hier werden imports von eigenen (.jav) Klassen nicht
+			// beachtet
+			ClassOrInterface importedClass = ASTFactory
+					.createClass(ClassLoader.getSystemClassLoader().loadClass(name.toString()));
+			importedClasses.add(importedClass);
+			allClasses.addAll(importedClasses);
+		}
+		return allClasses;
+	}

-            //System.out.println(xConsSet);
-            Set<Set<UnifyPair>> result = unify.unify(xConsSet, finiteClosure);
-            //System.out.println("RESULT: " + result);
-            results.addAll(result);
-        }
-        return results.stream().map((unifyPairs ->
-                new ResultSet(UnifyTypeFactory.convert(unifyPairs, generateTPHMap(cons))))).collect(Collectors.toList());
-        }
+	public List<SolvedClass> strucTypeInference()
+			throws ImpossibleSubTypeException, ClassNotFoundException, InconsistentConstraintsException {
+		List<SolvedClass> solvedClasses = new ArrayList<>();
+		for (SourceFile sourceFile : sourceFiles.values()) {
+			ClassOrInterface clsA = sourceFile.getClasses().get(0);
+			
+			StrucTYPE strucTYPE = new StrucTYPE(clsA);
+			ConstraintsSet strucTypeConstraints = strucTYPE.getConstraints();
+			InferredTypes inferredTypes = strucTYPE.getInferredTypes();

-    private Map<String, TypePlaceholder> generateTPHMap(ConstraintSet<Pair> constraints){
-        HashMap<String, TypePlaceholder> ret = new HashMap<>();
-        constraints.map((Pair p)->{
-            if(p.TA1 instanceof TypePlaceholder){
-                ret.put(((TypePlaceholder)p.TA1).getName(), (TypePlaceholder) p.TA1);
-            }
-            if(p.TA2 instanceof TypePlaceholder){
-                ret.put(((TypePlaceholder)p.TA2).getName(), (TypePlaceholder) p.TA2);
-            }
-            return null;
-        });
-        return ret;
-    }
+			Construct construct = new Construct(strucTypeConstraints, inferredTypes);
+			List<ClassOrInterface> constructedInterfaces = construct.getConstructedInterfaces();
+			Set<SubTypeConstraint> subTypeConstraints = construct.getSubTypeConstraints();
+			inferredTypes = construct.getInferredTypes();

-    private SourceFile parse(File sourceFile) throws IOException, java.lang.ClassNotFoundException {
-        CompilationUnitContext tree = JavaTXParser.parse(sourceFile);
-        SyntaxTreeGenerator generator = new SyntaxTreeGenerator(environment.getRegistry(sourceFile), new GenericsRegistry(null));
-        SourceFile ret =  generator.convert(tree);
-        return ret;
-    }
-    
-}
+			IFiniteClosure fc = UnifyTypeFactory.generateFC(this.getAvailableClasses(sourceFile));
+			Solve solve = new Solve(subTypeConstraints, clsA, fc, inferredTypes, constructedInterfaces);
+			SolvedClass solvedClass = solve.getSolvedClass();
+			solvedClasses.add(solvedClass);
+		}
+		return solvedClasses;
+	}
+
+	public List<ResultSet> typeInference() throws ClassNotFoundException {
+		List<ClassOrInterface> allClasses = new ArrayList<>();// environment.getAllAvailableClasses();
+		// Alle Importierten Klassen in allen geparsten Sourcefiles kommen ins
+		// FC
+		for (SourceFile sf : this.sourceFiles.values()) {
+			allClasses.addAll(getAvailableClasses(sf));
+			allClasses.addAll(sf.getClasses());
+		}
+
+		final ConstraintSet<Pair> cons = getConstraints();
+
+		FiniteClosure finiteClosure = UnifyTypeFactory.generateFC(allClasses);
+		System.out.println(finiteClosure);
+		ConstraintSet<UnifyPair> unifyCons = UnifyTypeFactory.convert(cons);
+
+		TypeUnify unify = new TypeUnify();
+		Set<Set<UnifyPair>> results = new HashSet<>();
+		for (List<Constraint<UnifyPair>> xCons : unifyCons.cartesianProduct()) {
+			Set<UnifyPair> xConsSet = new HashSet<>();
+			for (Constraint<UnifyPair> constraint : xCons) {
+				xConsSet.addAll(constraint);
+			}
+
+			System.out.println(xConsSet);
+			Set<Set<UnifyPair>> result = unify.unify(xConsSet, finiteClosure);
+			System.out.println("RESULT: " + result.size());
+			results.addAll(result);
+		}
+		return results.stream()
+				.map((unifyPairs -> new ResultSet(UnifyTypeFactory.convert(unifyPairs, generateTPHMap(cons)))))
+				.collect(Collectors.toList());
+	}
+
+	private Map<String, TypePlaceholder> generateTPHMap(ConstraintSet<Pair> constraints) {
+		HashMap<String, TypePlaceholder> ret = new HashMap<>();
+		constraints.map((Pair p) -> {
+			if (p.TA1 instanceof TypePlaceholder) {
+				ret.put(((TypePlaceholder) p.TA1).getName(), (TypePlaceholder) p.TA1);
+			}
+			if (p.TA2 instanceof TypePlaceholder) {
+				ret.put(((TypePlaceholder) p.TA2).getName(), (TypePlaceholder) p.TA2);
+			}
+			return null;
+		});
+		return ret;
+	}
+
+	private SourceFile parse(File sourceFile) throws IOException, java.lang.ClassNotFoundException {
+		CompilationUnitContext tree = JavaTXParser.parse(sourceFile);
+		SyntaxTreeGenerator generator = new SyntaxTreeGenerator(environment.getRegistry(sourceFile),
+				new GenericsRegistry(null));
+		SourceFile ret = generator.convert(tree, environment.packageCrawler);
+		return ret;
+	}
+}
--- a/src/de/dhbwstuttgart/environment/CompilationEnvironment.java
+++ b/src/de/dhbwstuttgart/environment/CompilationEnvironment.java
@@ -5,10 +5,7 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;

 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
 import de.dhbwstuttgart.syntaxtree.SourceFile;
@@ -35,6 +32,7 @@ import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
 public class CompilationEnvironment {
 	private final List<URL> librarys;
 	private final List<File> sourceFiles;
+	public final PackageCrawler packageCrawler;

 	/**
 	 * Imitiert die Environment beim Aufruf des JavaCompilers auf einer Menge von java-Dateien
@@ -42,22 +40,46 @@ public class CompilationEnvironment {
 	 * @param sourceFiles die zu kompilierenden Dateien
 	 */
 	public CompilationEnvironment(List<File> sourceFiles) {
-		String bootClassPath = System.getProperty("sun.boot.class.path");
-        librarys = new ArrayList<>();
-        for(String path : bootClassPath.split(File.pathSeparator)) {
-        	try {
-        		librarys.add(new URL("file:"+path));
-			} catch (MalformedURLException e) {
-				new DebugException("Fehler im Classpath auf diesem System");
+		/**
+		 * Java 9 bringt einige Änderungen am Classloader
+		 * So funktioniert der BootClassLoader nicht mehr.
+		 * hier gibts ein paar Quellen zum nachlesen:
+		 * http://java9.wtf/class-loading/
+		 * https://stackoverflow.com/questions/46494112/classloaders-hierarchy-in-java-9
+		 *
+		 */
+		//String bootClassPath = System.getProperty("sun.boot.class.path");
+		//		ClassLoader cl = ClassLoader.getPlatformClassLoader();
+				ClassLoader cl = ClassLoader.getSystemClassLoader();
+				String bootClassPath = System.getProperty("java.class.path");
+		librarys = new ArrayList<>();
+		for(String path : bootClassPath.split(File.pathSeparator)) {
+				   try {
+							   librarys.add(new URL("file:"+path));
+							   } catch (MalformedURLException e) {
+									   new DebugException("Fehler im Classpath auf diesem System");
+							   }
 			}
-        }
+		//URLClassLoader loader = new URLClassLoader(new URL[0], cl);
+		//librarys = Arrays.asList(loader.getURLs());
+
 		this.sourceFiles = sourceFiles;
+        this.packageCrawler = new PackageCrawler(librarys);
 	}

 	public JavaClassRegistry getRegistry(File forSourceFile) throws ClassNotFoundException, IOException {
-		List<String> allNames;
+		Map<String, Integer> allNames;
 		CompilationUnitContext tree = JavaTXParser.parse(forSourceFile);
-		allNames = GatherNames.getNames(tree, new PackageCrawler(librarys));
+		allNames = GatherNames.getNames(tree, packageCrawler);
 		return new JavaClassRegistry(allNames);
 	}
+
+	public List<ClassOrInterface> getAllAvailableClasses() {
+		List<ClassOrInterface> ret = new ArrayList<>();
+		for(Class c : new PackageCrawler(librarys).getAllAvailableClasses()){
+			ret.add(ASTFactory.createClass(c));
+		}
+		return ret;
+	}
+
 }
--- a/src/de/dhbwstuttgart/environment/PackageCrawler.java
+++ b/src/de/dhbwstuttgart/environment/PackageCrawler.java
@@ -1,9 +1,7 @@
 package de.dhbwstuttgart.environment;

 import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;

 import org.reflections.Reflections;
 import org.reflections.scanners.ResourcesScanner;
@@ -12,6 +10,7 @@ import org.reflections.util.ConfigurationBuilder;
 import org.reflections.util.FilterBuilder;

 import de.dhbwstuttgart.parser.scope.JavaClassName;
+import org.reflections.vfs.SystemDir;

 /**
 * Hilft beim Durchsuchen von Packages
@@ -54,11 +53,24 @@ public class PackageCrawler {
        return classes;
    }

-  public List<String> getClassNames(String packageName){
-    List<String> nameList = new ArrayList();
+    public Set<Class<?>> getAllAvailableClasses(){
+        Reflections reflections = new Reflections(new ConfigurationBuilder()
+                .setScanners(new SubTypesScanner(false /* don't exclude Object.class */), new ResourcesScanner())
+                .setUrls(urls));
+
+        Set<Class<?>> classes = reflections.getSubTypesOf(Object.class);
+
+        return classes;
+    }
+
+  public Map<String, Integer> getClassNames(String packageName){
+      Map<String, Integer> nameList = new HashMap<>();
    Set<Class<?>> classes = getClassesInPackage(packageName);
+      if(packageName.equals("java.lang") && ! classes.contains(Object.class)) {
+        classes.add(Object.class);
+      }
    for(Class c : classes){
-      nameList.add(c.getName());
+      nameList.put(c.getName(), c.getTypeParameters().length);
    }
    return nameList;
  }
--- a/src/de/dhbwstuttgart/parser/JavaTXParser.java
+++ b/src/de/dhbwstuttgart/parser/JavaTXParser.java
@@ -29,7 +29,7 @@ public class JavaTXParser {
        */
    }
    
-    /* F<EFBFBD>r das Typsystem ist es notwendig, dass sich der Source in einer Datei befindet:
+    /* Für das Typsystem ist es notwendig, dass sich der Source in einer Datei befindet:
    public SourceFile parse(String fileContent) throws IOException, java.lang.ClassNotFoundException {
        return this.parse(new ByteArrayInputStream(fileContent.getBytes(StandardCharsets.UTF_8)));
    }
--- a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/AssignToLocal.java
+++ b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/AssignToLocal.java
@@ -1,5 +1,6 @@
 package de.dhbwstuttgart.parser.SyntaxTreeGenerator;

+import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor;
 import de.dhbwstuttgart.syntaxtree.StatementVisitor;
 import de.dhbwstuttgart.syntaxtree.statement.AssignLeftSide;
 import de.dhbwstuttgart.syntaxtree.statement.Expression;
@@ -17,4 +18,9 @@ public class AssignToLocal extends AssignLeftSide {
    public void accept(StatementVisitor visitor) {
        visitor.visit(this);
    }
+    
+    @Override
+	public AssignToLocal accept(ASTReturnVisitor visitor) {
+		return visitor.visit(this);
+	}
 }
--- a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/FCGenerator.java
+++ b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/FCGenerator.java
@@ -0,0 +1,168 @@
+package de.dhbwstuttgart.parser.SyntaxTreeGenerator;
+
+import de.dhbwstuttgart.exceptions.DebugException;
+import de.dhbwstuttgart.parser.NullToken;
+import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
+import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
+import de.dhbwstuttgart.syntaxtree.factory.UnifyTypeFactory;
+import de.dhbwstuttgart.syntaxtree.type.*;
+import de.dhbwstuttgart.typeinference.constraints.Pair;
+import de.dhbwstuttgart.typeinference.unify.model.*;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class FCGenerator {
+    /**
+     * Baut die FiniteClosure aus availableClasses.
+     * Klassen welche nicht in availableClasses vorkommen werden im Java Classpath nachgeschlagen.
+     *
+     * @param availableClasses - Alle geparsten Klassen
+     */
+    public static Set<UnifyPair> toUnifyFC(Collection<ClassOrInterface> availableClasses) throws ClassNotFoundException {
+        return toFC(availableClasses).stream().map(t -> UnifyTypeFactory.convert(t)).collect(Collectors.toSet());
+    }
+
+    public static Set<Pair> toFC(Collection<ClassOrInterface> availableClasses) throws ClassNotFoundException {
+        HashSet<Pair> pairs = new HashSet<>();
+        for(ClassOrInterface cly : availableClasses){
+            pairs.addAll(getSuperTypes(cly, availableClasses));
+        }
+        return pairs;
+    }
+
+    /**
+     * Bildet eine Kette vom übergebenen Typ bis hin zum höchsten bekannten Typ
+     * Als Generics werden TPHs benutzt, welche der Unifikationsalgorithmus korrekt interpretieren muss.
+     * Die verwendeten TPHs werden in der Kette nach oben gereicht, so erhält der selbe GTV immer den selben TPH
+     * @param forType
+     * @return
+     */
+    private static List<Pair> getSuperTypes(ClassOrInterface forType, Collection<ClassOrInterface> availableClasses) throws ClassNotFoundException {
+        return getSuperTypes(forType, availableClasses, new HashMap<>());
+    }
+
+    /**
+     *
+     * @param forType
+     * @param availableClasses
+     * @param gtvs
+     * @return
+     * @throws ClassNotFoundException
+     */
+    private static List<Pair> getSuperTypes(ClassOrInterface forType, Collection<ClassOrInterface> availableClasses,
+                                            HashMap<String, RefTypeOrTPHOrWildcardOrGeneric> gtvs) throws ClassNotFoundException {
+        List<RefTypeOrTPHOrWildcardOrGeneric> params = new ArrayList<>();
+        //Die GTVs, die in forType hinzukommen:
+        HashMap<String, RefTypeOrTPHOrWildcardOrGeneric> newGTVs = new HashMap<>();
+        //Generics mit gleichem Namen müssen den selben TPH bekommen
+        for(GenericTypeVar gtv : forType.getGenerics()){
+            if(!gtvs.containsKey(gtv.getName())){
+                TypePlaceholder replacePlaceholder = TypePlaceholder.fresh(new NullToken());
+                gtvs.put(gtv.getName(), replacePlaceholder);
+                newGTVs.put(gtv.getName(), replacePlaceholder);
+            }
+            params.add(gtvs.get(gtv.getName()));
+        }
+
+
+        List<RefType> superClasses = new ArrayList<>();
+        superClasses.add(forType.getSuperClass());
+        superClasses.addAll(forType.getSuperInterfaces());
+
+        List<Pair> retList = new ArrayList<>();
+        for(RefType superType : superClasses){
+            Optional<ClassOrInterface> hasSuperclass = availableClasses.stream().filter(cl -> superType.getName().equals(cl.getClassName())).findAny();
+            ClassOrInterface superClass;
+            if(!hasSuperclass.isPresent()) //Wenn es die Klasse in den available Klasses nicht gibt wird sie im Classpath gesucht. Ansonsten Exception
+            {
+                superClass = ASTFactory.createClass(ClassLoader.getSystemClassLoader().loadClass(superType.getName().toString()));
+            }else{
+                superClass = hasSuperclass.get();
+            }
+            /*
+            Die Parameter der superklasse müssen jetzt nach den Angaben in der Subklasse
+            modifiziert werden
+            Beispie: Matrix<A> extends Vector<Vector<A>>
+            Den ersten Parameter mit Vector<A> austauschen und dort alle Generics zu den Typplaceholdern in gtvs austauschen
+             */
+            //Hier vermerken, welche Typen in der Superklasse ausgetauscht werden müssen
+            Iterator<GenericTypeVar> itGenParams = superClass.getGenerics().iterator();
+            Iterator<RefTypeOrTPHOrWildcardOrGeneric> itSetParams = superType.getParaList().iterator();
+            while(itSetParams.hasNext()){
+                RefTypeOrTPHOrWildcardOrGeneric setType = itSetParams.next();
+                //In diesem Typ die GTVs durch TPHs und Einsetzungen austauschen:
+                RefTypeOrTPHOrWildcardOrGeneric setSetType = setType.acceptTV(new TypeExchanger(gtvs));
+                newGTVs.put(itGenParams.next().getName(), setSetType);
+            }
+
+            //Für den superType kann man nun zum Austauschen der Generics wieder die gtvs nehmen:
+            //Die newGTVs sind nur für den superClass ClassOrInterface welches möglicherweise per reflection geladen wurde abgestimmt
+            RefTypeOrTPHOrWildcardOrGeneric superRefType = superType.acceptTV(new TypeExchanger(gtvs));
+
+            RefTypeOrTPHOrWildcardOrGeneric t1 = new RefType(forType.getClassName(), params, new NullToken());
+            RefTypeOrTPHOrWildcardOrGeneric t2 = superRefType;
+
+            Pair ret = new Pair(t1, t2, PairOperator.SMALLER);
+
+            List<Pair> superTypes;
+            //Rekursiver Aufruf. Abbruchbedingung ist Object als Superklasse:
+            if(superClass.getClassName().equals(ASTFactory.createObjectClass().getClassName())){
+                superTypes = Arrays.asList(new Pair(ASTFactory.createObjectType(), ASTFactory.createObjectType(), PairOperator.SMALLER));
+            }else{
+                superTypes = getSuperTypes(superClass, availableClasses, newGTVs);
+            }
+
+            retList.add(ret);
+            retList.addAll(superTypes);
+        }
+
+        return retList;
+    }
+
+    /**
+     * Tauscht die GTVs in einem Typ gegen die entsprechenden Typen in der übergebenen Map aus.
+     */
+    private static class TypeExchanger implements TypeVisitor<RefTypeOrTPHOrWildcardOrGeneric>{
+
+        private final HashMap<String, RefTypeOrTPHOrWildcardOrGeneric> gtvs;
+
+        TypeExchanger(HashMap<String, RefTypeOrTPHOrWildcardOrGeneric> gtvs){
+            this.gtvs = gtvs;
+        }
+
+        @Override
+        public RefTypeOrTPHOrWildcardOrGeneric visit(RefType refType) {
+            List<RefTypeOrTPHOrWildcardOrGeneric> params = new ArrayList<>();
+            for(RefTypeOrTPHOrWildcardOrGeneric param : refType.getParaList()){
+                params.add(param.acceptTV(this));
+            }
+            RefTypeOrTPHOrWildcardOrGeneric ret = new RefType(refType.getName(), params, new NullToken());
+            return ret;
+        }
+
+        @Override
+        public RefTypeOrTPHOrWildcardOrGeneric visit(SuperWildcardType superWildcardType) {
+            throw new DebugException("Dieser Fall darf nicht auftreten");
+        }
+
+        @Override
+        public RefTypeOrTPHOrWildcardOrGeneric visit(TypePlaceholder typePlaceholder) {
+            throw new DebugException("Dieser Fall darf nicht auftreten");
+        }
+
+        @Override
+        public RefTypeOrTPHOrWildcardOrGeneric visit(ExtendsWildcardType extendsWildcardType) {
+            throw new DebugException("Dieser Fall darf nicht auftreten");
+        }
+
+        @Override
+        public RefTypeOrTPHOrWildcardOrGeneric visit(GenericRefType genericRefType) {
+            if(! gtvs.containsKey(genericRefType.getParsedName()))
+                throw new DebugException("Dieser Fall darf nicht auftreten");
+            return gtvs.get(genericRefType.getParsedName());
+        }
+
+    }
+}
--- a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/GenericContext.java
+++ b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/GenericContext.java
@@ -3,8 +3,8 @@ package de.dhbwstuttgart.parser.SyntaxTreeGenerator;
 import de.dhbwstuttgart.parser.scope.JavaClassName;

 public class GenericContext {
-    public final String parentMethod;
-    public final JavaClassName parentClass;
+    private final String parentMethod;
+    private final JavaClassName parentClass;

    public GenericContext(JavaClassName parentClass, String parentMethod) {
        if(parentMethod == null)parentMethod = "";
--- a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java
+++ b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java
@@ -7,7 +7,7 @@ import de.dhbwstuttgart.parser.scope.GenericsRegistry;
 import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
 import de.dhbwstuttgart.syntaxtree.*;
 import de.dhbwstuttgart.syntaxtree.statement.*;
-import de.dhbwstuttgart.syntaxtree.statement.literal.*;
+import de.dhbwstuttgart.syntaxtree.statement.UnaryExpr.Operation;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
@@ -95,7 +95,7 @@ public class StatementGenerator {

    private Statement convert(Java8Parser.StatementWithoutTrailingSubstatementContext stmt) {
        if(stmt.block() != null){
-            return convert(stmt.block());
+            return convert(stmt.block(), false);
        }else if(stmt.emptyStatement() != null){
            return new EmptyStmt(stmt.getStart());
        }else if(stmt.expressionStatement() != null){
@@ -121,14 +121,14 @@ public class StatementGenerator {
        }else throw new NotImplementedException();
    }

-    public Block convert(Java8Parser.BlockContext block) {
+    public Block convert(Java8Parser.BlockContext block, boolean addTrailingReturn) {
        List<Statement> statements = new ArrayList<>();
        if(block.blockStatements() != null)
            for(Java8Parser.BlockStatementContext statementContext : block.blockStatements().blockStatement()){
                List<Statement> stmt = convert(statementContext);
                statements.addAll(stmt);
            }
-        statements = SyntacticSugar.addTrailingReturn(statements);
+        if(addTrailingReturn)statements = SyntacticSugar.addTrailingReturn(statements);
        return new Block(statements, block.getStart());
    }

@@ -179,6 +179,14 @@ public class StatementGenerator {
        }else throw new NotImplementedException();
    }

+    public Receiver getReceiver(Expression expr){
+        if(expr instanceof StaticClassName){
+            return (Receiver) expr;
+        }else {
+            return new ExpressionReceiver(expr);
+        }
+    }
+
    private Statement convert(Java8Parser.MethodInvocationContext methodInvocationContext) {
        String name;
        if(methodInvocationContext.methodName()!=null){
@@ -200,7 +208,7 @@ public class StatementGenerator {
        }else throw new NotImplementedException();

        ArgumentList argumentList = convert(methodInvocationContext.argumentList());
-        MethodCall ret = new MethodCall(TypePlaceholder.fresh(methodInvocationContext.getStart()),new Receiver(receiver), name, argumentList, methodInvocationContext.getStart());
+        MethodCall ret = new MethodCall(TypePlaceholder.fresh(methodInvocationContext.getStart()), getReceiver(receiver), name, argumentList, methodInvocationContext.getStart());
        return ret;
    }

@@ -271,23 +279,24 @@ public class StatementGenerator {
    }

    private Statement convert(Java8Parser.PreIncrementExpressionContext stmt) {
-        //TODO
-        throw new NotImplementedException();
+    		Expression argument = convert(stmt.unaryExpression());
+    		Token offset = stmt.getStart();
+    		return new UnaryExpr(UnaryExpr.Operation.PREINCREMENT, argument, TypePlaceholder.fresh(offset), offset);
    }

-    private Statement convert(Java8Parser.PreDecrementExpressionContext stmt) {
-        //TODO
-        throw new NotImplementedException();
+	private Statement convert(Java8Parser.PreDecrementExpressionContext stmt) {
+		return new UnaryExpr(UnaryExpr.Operation.PREDECREMENT, convert(stmt.unaryExpression()),
+                TypePlaceholder.fresh(stmt.getStart()), stmt.getStart());
    }

    private Statement convert(Java8Parser.PostIncrementExpressionContext stmt) {
-        //TODO
-        throw new NotImplementedException();
+        return new UnaryExpr(UnaryExpr.Operation.POSTINCREMENT, convert(stmt.postfixExpression()),
+                TypePlaceholder.fresh(stmt.getStart()), stmt.getStart());
    }

    private Statement convert(Java8Parser.PostDecrementExpressionContext stmt) {
-        //TODO
-        throw new NotImplementedException();
+    		return new UnaryExpr(UnaryExpr.Operation.POSTDECREMENT, convert(stmt.postfixExpression()),
+                TypePlaceholder.fresh(stmt.getStart()), stmt.getStart());
    }

    private Statement convert(Java8Parser.AssignmentContext stmt) {
@@ -308,8 +317,10 @@ public class StatementGenerator {
    }

    private Statement convert(Java8Parser.IfThenElseStatementContext stmt){
-        //TODO
-        throw new NotImplementedException();
+        Expression expr = convert(stmt.expression());
+        Statement thenBlock = convert(stmt.statementNoShortIf());
+        Statement elseBlock = convert(stmt.statement());
+        return new IfStmt(TypePlaceholder.fresh(stmt.getStart()), expr, thenBlock, elseBlock, stmt.getStart());
    }

    private Statement convert(Java8Parser.IfThenElseStatementNoShortIfContext stmt){
@@ -533,8 +544,7 @@ public class StatementGenerator {
        if(expression.conditionalOrExpression() == null){
            return convert(expression.conditionalAndExpression());
        }else{
-            return new Binary(convert(expression.conditionalOrExpression()),
-                    convert(expression.conditionalAndExpression()), Binary.Operator.OR);
+            throw new NotImplementedException();
        }
    }

@@ -542,8 +552,7 @@ public class StatementGenerator {
        if(expression.conditionalAndExpression() == null){
            return convert(expression.inclusiveOrExpression());
        }else{
-            return new Binary(convert(expression.conditionalAndExpression()),
-                    convert(expression.inclusiveOrExpression()), Binary.Operator.AND);
+            throw new NotImplementedException();
        }
    }

@@ -580,11 +589,43 @@ public class StatementGenerator {
    }

    private Expression convert(Java8Parser.RelationalExpressionContext expression) {
-        if(expression.relationalExpression() == null){
+        if(expression.relationalExpression() == null) {
            return convert(expression.shiftExpression());
-        }else{
-            throw new NotImplementedException();
+        }else {
+            String operator = expression.getChild(1).getText();
+            return new BinaryExpr(convertBinaryOperator(operator), TypePlaceholder.fresh(expression.getStart()),
+                    convert(expression.relationalExpression()),
+                    convert(expression.shiftExpression()), expression.getStart());
        }
+            //}else throw new NotImplementedException();
+    }
+
+    private BinaryExpr.Operator convertBinaryOperator(String operator) {
+        //return BinaryExpr.Operator.ADD;
+    		if(operator.equals("+")) {
+    			return BinaryExpr.Operator.ADD;
+    		}else if(operator.equals("-")) {
+    			return BinaryExpr.Operator.SUB;
+    		}else if(operator.equals("*")) {
+    			return BinaryExpr.Operator.MUL;
+    		}else if(operator.equals("&")) {
+    			return BinaryExpr.Operator.AND;
+    		}else if(operator.equals("|")) {
+    			return BinaryExpr.Operator.OR;
+    		}else if(operator.equals("/")) {
+    			return BinaryExpr.Operator.DIV;
+    		}else if(operator.equals("<")) {
+    			return BinaryExpr.Operator.LESSTHAN;
+    		}else if(operator.equals(">")) {
+    			return BinaryExpr.Operator.BIGGERTHAN;
+    		}else if(operator.equals(">=")) {
+    			return BinaryExpr.Operator.BIGGEREQUAL;
+    		} else if(operator.equals("<=")) {
+    			return BinaryExpr.Operator.LESSEQUAL;
+    		} else {
+    			throw new NotImplementedException();
+    		}
+//    		throw new NotImplementedException();
    }

    private Expression convert(Java8Parser.ShiftExpressionContext expression) {
@@ -596,10 +637,15 @@ public class StatementGenerator {
    }

    private Expression convert(Java8Parser.AdditiveExpressionContext expression) {
+
        if(expression.additiveExpression() == null){
            return convert(expression.multiplicativeExpression());
-        }else{
-            throw new NotImplementedException();
+        }else {
+            Expression leftSide = convert(expression.additiveExpression());
+            Expression rightSide = convert(expression.multiplicativeExpression());
+            BinaryExpr.Operator op = convertBinaryOperator(expression.getChild(1).getText());
+            Token offset = expression.getStart();
+            return new BinaryExpr(op, TypePlaceholder.fresh(expression.getStart()), leftSide, rightSide, offset);
        }
    }

@@ -607,7 +653,11 @@ public class StatementGenerator {
        if(expression.multiplicativeExpression() == null){
            return convert(expression.unaryExpression());
        }else{
-            throw new NotImplementedException();
+        		Expression leftSide = convert(expression.multiplicativeExpression());
+        		Expression rightSide = convert(expression.unaryExpression());
+        		BinaryExpr.Operator op = convertBinaryOperator(expression.getChild(1).getText());
+        		Token offset = expression.getStart();
+        		return new BinaryExpr(op, TypePlaceholder.fresh(offset), leftSide, rightSide, offset);
        }
    }

@@ -619,9 +669,11 @@ public class StatementGenerator {
        }else if(expression.unaryExpressionNotPlusMinus() != null){
            return convert(expression.unaryExpressionNotPlusMinus());
        }else if(expression.getText().startsWith("+")){
-            return new UnaryPlus(convert(expression.unaryExpression()));
+            return new UnaryExpr(UnaryExpr.Operation.PLUS, convert(expression.unaryExpression()),
+                    TypePlaceholder.fresh(expression.getStart()), expression.getStart());
        }else if(expression.getText().startsWith("-")){
-            return new UnaryMinus(convert(expression.unaryExpression()));
+            return new UnaryExpr(UnaryExpr.Operation.MINUS, convert(expression.unaryExpression()),
+                    TypePlaceholder.fresh(expression.getStart()), expression.getStart());
        }else{
            //Diese Exceptions sollte nie geworfen werden.
            //Der Code wurde nur noch nicht getestet. Sollte zur Sicherheit drin bleiben.
@@ -664,10 +716,10 @@ public class StatementGenerator {
        }

        for(Java8Parser.PostIncrementExpression_lf_postfixExpressionContext inc : expression.postIncrementExpression_lf_postfixExpression()){
-            expr = new PostIncExpr(expr);
+            expr = new UnaryExpr(UnaryExpr.Operation.POSTINCREMENT, expr, TypePlaceholder.fresh(inc.getStart()), inc.getStart());
        }
        for(Java8Parser.PostDecrementExpression_lf_postfixExpressionContext dec : expression.postDecrementExpression_lf_postfixExpression()){
-            expr = new PostDecExpr(expr);
+            expr = new UnaryExpr(UnaryExpr.Operation.POSTDECREMENT, expr, TypePlaceholder.fresh(dec.getStart()), dec.getStart());
        }

        return expr;
@@ -701,7 +753,7 @@ public class StatementGenerator {
        }else {
            Java8Parser.MethodInvocation_lf_primaryContext ctxt = e.methodInvocation_lf_primary();
            String methodName = ctxt.Identifier().toString();
-            return new MethodCall(TypePlaceholder.fresh(e.getStart()), new Receiver(expr), methodName, convert(ctxt.argumentList()), e.getStart());
+            return new MethodCall(TypePlaceholder.fresh(e.getStart()), getReceiver(expr), methodName, convert(ctxt.argumentList()), e.getStart());
        }
    }

@@ -763,25 +815,27 @@ public class StatementGenerator {
    private Expression convert(Java8Parser.LiteralContext literal) {
        if(literal.IntegerLiteral() != null || literal.FloatingPointLiteral()!= null){
            Number value = Double.parseDouble(literal.IntegerLiteral().getText());
-            return new NumberLiteral(TypePlaceholder.fresh(literal.getStart()),
+            return new Literal(TypePlaceholder.fresh(literal.getStart()),
                    value, literal.getStart());
        }else if(literal.BooleanLiteral() != null){
            RefType type = new RefType(reg.getName("java.lang.Boolean"),literal.getStart());
-            return new BoolLiteral(type,
+            return new Literal(type,
                    Boolean.parseBoolean(literal.BooleanLiteral().getText()),
                    literal.getStart());
        }else if(literal.CharacterLiteral() != null){
            RefType type = new RefType(reg.getName("java.lang.Character"),literal.getStart());
-            return new CharLiteral(type,
-                    literal.CharacterLiteral().getText().charAt(0),
+            return new Literal(type,
+            			// das gibt immer ' zurück, der Char befindet sich in Position 1 
+        				//literal.CharacterLiteral().getText().charAt(0),
+                    literal.CharacterLiteral().getText().charAt(1),
                    literal.getStart());
        }else if(literal.StringLiteral()!=null){
            RefType type = new RefType(reg.getName("java.lang.String"),literal.getStart());
-            return new StringLiteral(type,
-                    literal.StringLiteral().getText(),
+            return new Literal(type,
+                    literal.StringLiteral().getText().substring(1,  literal.StringLiteral().getText().length()-1),
                    literal.getStart());
        }else  if(literal.NullLiteral() != null){
-            return new Null(TypePlaceholder.fresh(literal.getStart()),
+            return new Literal(TypePlaceholder.fresh(literal.getStart()), null,
                    literal.getStart());
        }else {
            throw new NotImplementedException();
@@ -809,7 +863,7 @@ public class StatementGenerator {
        }

        ArgumentList argumentList = convert(methodInvocationContext.argumentList());
-        MethodCall ret = new MethodCall(TypePlaceholder.fresh(methodInvocationContext.getStart()), new Receiver(receiver), name, argumentList, methodInvocationContext.getStart());
+        MethodCall ret = new MethodCall(TypePlaceholder.fresh(methodInvocationContext.getStart()), getReceiver(receiver), name, argumentList, methodInvocationContext.getStart());
        return ret;
    }

@@ -842,7 +896,7 @@ public class StatementGenerator {
                    expression.lambdaBody().expression().getStart()));
            block = new Block(statements, expression.lambdaBody().getStart());
        }else{
-            block = lambdaGenerator.convert(expression.lambdaBody().block());
+            block = lambdaGenerator.convert(expression.lambdaBody().block(), true);
        }
        List<RefTypeOrTPHOrWildcardOrGeneric> funNParams = new ArrayList<>();
        funNParams.add(TypePlaceholder.fresh(expression.getStart()));//ret-Type
@@ -850,7 +904,7 @@ public class StatementGenerator {
                funNParams.add(TypePlaceholder.fresh(expression.getStart())));
        RefTypeOrTPHOrWildcardOrGeneric lambdaType = TypePlaceholder.fresh(expression.getStart());
        //RefType lambdaType = new RefType(reg.getName("Fun"+params.getFormalparalist().size()),
-                //funNParams, name.getStart());
+        		//funNParams, name.getStart());
        return new LambdaExpression(lambdaType, params, block, expression.getStart());
    }
 }
--- a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntacticSugar.java
+++ b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntacticSugar.java
@@ -1,6 +1,9 @@
 package de.dhbwstuttgart.parser.SyntaxTreeGenerator;

+import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.parser.NullToken;
+import de.dhbwstuttgart.syntaxtree.AbstractASTWalker;
+import de.dhbwstuttgart.syntaxtree.Constructor;
 import de.dhbwstuttgart.syntaxtree.statement.*;

 import java.util.List;
@@ -10,22 +13,27 @@ public class SyntacticSugar {
    public static List<Statement> addTrailingReturn(List<Statement> statements){
        if(statements.size()!=0) {
            Statement lastStmt = statements.get(statements.size() - 1);
-            if (lastStmt instanceof Return) return statements;
-            if (lastStmt instanceof WhileStmt) {
-                //TODO
-                //if (hasReturn(((WhileStmt) lastStmt).loopBlock)) return statements;
-            } else if (lastStmt instanceof IfStmt) {
-                if (hasReturn(((IfStmt) lastStmt).then_block)
-                        && hasReturn(((IfStmt) lastStmt).else_block)) return statements;
-            } else if (lastStmt instanceof ForStmt) {
-                if (hasReturn(((ForStmt) lastStmt).body_Loop_block)) return statements;
-            } else {
-            }
+            ReturnFinder hasReturn = new ReturnFinder();
+            lastStmt.accept(hasReturn);
+            if(hasReturn.hasReturn)return statements;
        }
        statements.add(new ReturnVoid(new NullToken()));
        return statements;
    }

+    private static class ReturnFinder extends AbstractASTWalker{
+        public boolean hasReturn = false;
+        @Override
+        public void visit(Return aReturn) {
+            hasReturn = true;
+        }
+
+        @Override
+        public void visit(ReturnVoid aReturn) {
+            hasReturn = true;
+        }
+    }
+
    private static boolean hasReturn(Block block){
        for(Statement s : block.getStatements())
            if(s instanceof Return)return true;
--- a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java
+++ b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java
@@ -1,9 +1,12 @@
 package de.dhbwstuttgart.parser.SyntaxTreeGenerator;

+import de.dhbwstuttgart.environment.PackageCrawler;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
 import java.lang.ClassNotFoundException;

+import de.dhbwstuttgart.exceptions.TypeinferenceException;
 import de.dhbwstuttgart.parser.antlr.Java8Parser;
+import de.dhbwstuttgart.parser.scope.GatherNames;
 import de.dhbwstuttgart.parser.scope.GenericsRegistry;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
@@ -15,9 +18,9 @@ import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;

 import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+import java.sql.Ref;
+import java.util.*;
+import java.util.stream.Collectors;

 //import jdk.internal.dynalink.support.TypeConverterFactory;
 import org.antlr.v4.runtime.CommonToken;
@@ -28,7 +31,7 @@ public class SyntaxTreeGenerator{
  private JavaClassRegistry reg;
  private final GenericsRegistry globalGenerics;
  private String pkgName = "";
-  List<JavaClassName> imports = new ArrayList();
+  Set<JavaClassName> imports = new HashSet();

  List<Statement> fieldInitializations = new ArrayList<>();

@@ -69,56 +72,11 @@ public class SyntaxTreeGenerator{
    return ret;
  }
  
-  public void setImports(Java8Parser.CompilationUnitContext ctx) throws ClassNotFoundException {
-    List<JavaClassName> newImports = new ArrayList();
-    for(Java8Parser.ImportDeclarationContext importDeclCtx : ctx.importDeclaration()){
-      if(importDeclCtx.singleTypeImportDeclaration() != null){
-        newImports.add(convertSingleTypeImportDeclaration(importDeclCtx.singleTypeImportDeclaration()));
-      }
-      else if(importDeclCtx.typeImportOnDemandDeclaration() != null){
-        newImports.addAll(convertTypeImportOnDemandDeclaration(importDeclCtx.typeImportOnDemandDeclaration()));
-      }
-      else if(importDeclCtx.singleStaticImportDeclaration() != null){
-        newImports.add(convertSingleStaticImportDeclaration(importDeclCtx.singleStaticImportDeclaration()));
-      }
-      else{
-        newImports.addAll(convertStaticImportOnDemandDeclaration(importDeclCtx.staticImportOnDemandDeclaration()));
-      }
-    }
-    this.imports.addAll(newImports);
-  }
-  
-  private JavaClassName convertSingleTypeImportDeclaration(Java8Parser.SingleTypeImportDeclarationContext ctx) throws ClassNotFoundException{
-    String typeName = convertTypeName(ctx.typeName());
-	JavaClassName ret = reg.getName(typeName);
-	return ret;
-  }
-  
-  private List<JavaClassName> convertTypeImportOnDemandDeclaration(Java8Parser.TypeImportOnDemandDeclarationContext ctx){
-    return reg.getAllFromPackage(ctx.packageOrTypeName().getText());
-  }
-  
-  private JavaClassName convertSingleStaticImportDeclaration(Java8Parser.SingleStaticImportDeclarationContext ctx){
-    throw new NotImplementedException();
-  }
-  
-  private List<JavaClassName> convertStaticImportOnDemandDeclaration(Java8Parser.StaticImportOnDemandDeclarationContext ctx){
-    return reg.getAllFromPackage(ctx.typeName().getText());
-  }
-  
-  private String getPackageFromClass(String cls){
-    String ret = "";
-    String[] parts = cls.split("\\.");
-    for(int i = 0; i < parts.length - 1; i++){
-      ret = ret + "." + parts[i];
-    }
-    ret = ret.substring(1);
-    return ret;
-  }
-  
-  public SourceFile convert(Java8Parser.CompilationUnitContext ctx) throws ClassNotFoundException{
+  public SourceFile convert(Java8Parser.CompilationUnitContext ctx, PackageCrawler packageCrawler) throws ClassNotFoundException{
+    if(ctx.packageDeclaration()!=null)this.pkgName = convert(ctx.packageDeclaration());
    List<ClassOrInterface> classes = new ArrayList<>();
-    this.setImports(ctx);
+    Map<String, Integer> imports = GatherNames.getImports(ctx, packageCrawler);
+    this.imports = imports.keySet().stream().map(name -> reg.getName(name)).collect(Collectors.toSet());
    for(Java8Parser.TypeDeclarationContext typeDecl : ctx.typeDeclaration()){
      ClassOrInterface newClass;
      if(typeDecl.classDeclaration() != null){
@@ -132,6 +90,15 @@ public class SyntaxTreeGenerator{
    return new SourceFile(this.pkgName, classes, this.imports);
  }

+  private String convert(Java8Parser.PackageDeclarationContext packageDeclarationContext) {
+    String ret = "";
+    for(TerminalNode identifier : packageDeclarationContext.Identifier()){
+      ret += identifier.getText()+".";
+    }
+    ret = ret.substring(0, ret.length()-1);
+    return ret;
+  }
+
  public Method convert(Java8Parser.MethodDeclarationContext methodDeclarationContext, JavaClassName parentClass, RefType superClass, GenericsRegistry generics) {
    Java8Parser.MethodHeaderContext header = methodDeclarationContext.methodHeader();
    int modifiers = SyntaxTreeGenerator.convert(methodDeclarationContext.methodModifier());
@@ -179,16 +146,16 @@ public class SyntaxTreeGenerator{
        //TODO: Error! Abstrakte Methode ohne abstrakt Keyword
      }
    }else{
-      block = stmtGen.convert(body.block());
+      block = stmtGen.convert(body.block(),true);
    }
    if(parentClass.equals(new JavaClassName(name))){
-      return new Constructor(modifiers, name, retType, modifiers, parameterList, block, gtvDeclarations, header.getStart(), fieldInitializations, superClass);
+      return new Constructor(modifiers, name, retType, parameterList, block, gtvDeclarations, header.getStart(), fieldInitializations);
    }else{
-      return new Method(modifiers, name, retType, modifiers, parameterList,block, gtvDeclarations, header.getStart());
+      return new Method(modifiers, name, retType, parameterList,block, gtvDeclarations, header.getStart());
    }
  }

-  private ClassOrInterface convertClass(Java8Parser.ClassDeclarationContext ctx) {
+  private ClassOrInterface convertClass(Java8Parser.ClassDeclarationContext ctx)  {
    ClassOrInterface newClass;
    if(ctx.normalClassDeclaration() != null){
      newClass = convertNormal(ctx.normalClassDeclaration());
@@ -199,7 +166,7 @@ public class SyntaxTreeGenerator{
    return newClass;
  }
  
-  private ClassOrInterface convertNormal(Java8Parser.NormalClassDeclarationContext ctx){
+  private ClassOrInterface convertNormal(Java8Parser.NormalClassDeclarationContext ctx) {
    int modifiers = 0;
    if(ctx.classModifier() != null){
      for(Java8Parser.ClassModifierContext mod : ctx.classModifier()){
@@ -207,7 +174,12 @@ public class SyntaxTreeGenerator{
        modifiers += newModifier;
      }
    }
-    JavaClassName name = reg.getName(ctx.Identifier().getText());
+    String className = this.pkgName + (this.pkgName.length()>0?".":"") + ctx.Identifier().getText();
+    JavaClassName name = reg.getName(className); //Holt den Package Namen mit dazu
+    if(! name.toString().equals(className)){ //Kommt die Klasse schon in einem anderen Package vor?
+      throw new TypeinferenceException("Name " + className + " bereits vorhanden in " + reg.getName(className).toString()
+              ,ctx.getStart());
+    }
    GenericsRegistry generics = createGenerics(ctx.typeParameters(), name, "", reg, new GenericsRegistry(globalGenerics));
    Token offset = ctx.getStart();
    GenericDeclarationList genericClassParameters;
@@ -220,7 +192,7 @@ public class SyntaxTreeGenerator{
    if(ctx.superclass() != null){
      superClass = convert(ctx.superclass());
    }else{
-      superClass = ASTFactory.createObjectClass().getType();
+      superClass = new RefType(ASTFactory.createObjectClass().getClassName(), ctx.getStart());
    }
    List<Field> fielddecl = convertFields(ctx.classBody(), generics);
    List<Method> methods = convertMethods(ctx.classBody(), name, superClass, generics);
@@ -241,20 +213,20 @@ public class SyntaxTreeGenerator{
    }

    Boolean isInterface = false;
-    List<RefTypeOrTPHOrWildcardOrGeneric> implementedInterfaces = convert(ctx.superinterfaces(), generics);
+    List<RefType> implementedInterfaces = convert(ctx.superinterfaces(), generics);
    return new ClassOrInterface(modifiers, name, fielddecl, methods, konstruktoren, genericClassParameters, superClass,
            isInterface, implementedInterfaces, offset);
  }

-  private List<RefTypeOrTPHOrWildcardOrGeneric> convert(Java8Parser.SuperinterfacesContext ctx, GenericsRegistry generics) {
+  private List<RefType> convert(Java8Parser.SuperinterfacesContext ctx, GenericsRegistry generics) {
    if(ctx == null)return new ArrayList<>();
    return convert(ctx.interfaceTypeList(), generics);
  }

-  private List<RefTypeOrTPHOrWildcardOrGeneric> convert(Java8Parser.InterfaceTypeListContext ctx, GenericsRegistry generics) {
-    List<RefTypeOrTPHOrWildcardOrGeneric> ret = new ArrayList<>();
+  private List<RefType> convert(Java8Parser.InterfaceTypeListContext ctx, GenericsRegistry generics) {
+    List<RefType> ret = new ArrayList<>();
    for(Java8Parser.InterfaceTypeContext interfaceType : ctx.interfaceType()){
-      ret.add(TypeGenerator.convert(interfaceType.classType(), reg, generics));
+      ret.add((RefType) TypeGenerator.convert(interfaceType.classType(), reg, generics));
    }
    return ret;
  }
@@ -264,14 +236,23 @@ public class SyntaxTreeGenerator{
   */
  private Constructor generateStandardConstructor(String className, JavaClassName parentClass, RefType superClass, GenericDeclarationList classGenerics, Token offset){
    RefType classType = ClassOrInterface.generateTypeOfClass(reg.getName(className), classGenerics, offset);
-    int modifiers = 0;
    ParameterList params = new ParameterList(new ArrayList<>(), offset);
    Block block = new Block(new ArrayList<>(), offset);
-    return new Constructor(Modifier.PUBLIC, className, classType, modifiers, params, block, classGenerics, offset, fieldInitializations, superClass);
+    return new Constructor(Modifier.PUBLIC, className, classType, params, block, classGenerics, offset, fieldInitializations);
  }

  private RefType convert(Java8Parser.SuperclassContext superclass) {
-    throw new NotImplementedException();
+    if(superclass.classType().classOrInterfaceType() != null){
+      throw new NotImplementedException();
+    }else{
+      RefTypeOrTPHOrWildcardOrGeneric ret = TypeGenerator.convertTypeName(superclass.classType().Identifier().getText(), superclass.classType().typeArguments(),
+              superclass.getStart(), reg, globalGenerics);
+      if(ret instanceof RefType){
+        return (RefType) ret;
+      }else{
+        throw new TypeinferenceException(superclass.getText() + " ist kein gültiger Supertyp", superclass.getStart());
+      }
+    }
  }

  private List<Method> convertMethods(Java8Parser.ClassBodyContext classBodyContext,
@@ -412,6 +393,8 @@ public class SyntaxTreeGenerator{
        modifiers += newModifier;
      }
    }
+    if(!Modifier.isInterface(modifiers))modifiers += Modifier.INTERFACE;
+    
    JavaClassName name = reg.getName(ctx.Identifier().getText());

    GenericsRegistry generics = createGenerics(ctx.typeParameters(), name, "", reg, new GenericsRegistry(globalGenerics));
@@ -422,12 +405,12 @@ public class SyntaxTreeGenerator{
    }else{
      genericParams = createEmptyGenericDeclarationList(ctx.Identifier());
    }
-    RefType superClass = ASTFactory.createObjectClass().getType();
+    RefType superClass = ASTFactory.createObjectType();

    List<Field> fields = convertFields(ctx.interfaceBody());
    List<Method> methods = convertMethods(ctx.interfaceBody(), name, superClass, generics);

-    List<RefTypeOrTPHOrWildcardOrGeneric> extendedInterfaces = convert(ctx.extendsInterfaces(), generics);
+    List<RefType> extendedInterfaces = convert(ctx.extendsInterfaces(), generics);

    return new ClassOrInterface(modifiers, name, fields, methods, new ArrayList<>(),
            genericParams, superClass, true, extendedInterfaces, ctx.getStart());
@@ -444,13 +427,16 @@ public class SyntaxTreeGenerator{
    GenericsRegistry ret = new GenericsRegistry(this.globalGenerics);
    ret.putAll(generics);
    if(ctx == null || ctx.typeParameterList() == null)return ret;
+    for(Java8Parser.TypeParameterContext tp : ctx.typeParameterList().typeParameter()){
+      ret.put(tp.Identifier().getText(), new GenericContext(parentClass, parentMethod));
+    }
    for(Java8Parser.TypeParameterContext tp : ctx.typeParameterList().typeParameter()){
      TypeGenerator.convert(tp, parentClass, parentMethod, reg, ret);
    }
    return ret;
  }

-  private List<RefTypeOrTPHOrWildcardOrGeneric> convert(Java8Parser.ExtendsInterfacesContext extendsInterfacesContext, GenericsRegistry generics) {
+  private List<RefType> convert(Java8Parser.ExtendsInterfacesContext extendsInterfacesContext, GenericsRegistry generics) {
    if(extendsInterfacesContext == null)return new ArrayList<>();
    return convert(extendsInterfacesContext.interfaceTypeList(), generics);
  }
--- a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/TypeGenerator.java
+++ b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/TypeGenerator.java
@@ -3,7 +3,6 @@ package de.dhbwstuttgart.parser.SyntaxTreeGenerator;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.exceptions.TypeinferenceException;
 import de.dhbwstuttgart.parser.antlr.Java8Parser;
-import de.dhbwstuttgart.parser.scope.GenericTypeName;
 import de.dhbwstuttgart.parser.scope.GenericsRegistry;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
@@ -14,6 +13,7 @@ import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;

+import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 import org.antlr.v4.runtime.Token;

 import java.util.ArrayList;
@@ -22,27 +22,34 @@ import java.util.List;
 public class TypeGenerator {

    public static RefTypeOrTPHOrWildcardOrGeneric convert(Java8Parser.UnannClassOrInterfaceTypeContext unannClassOrInterfaceTypeContext, JavaClassRegistry reg, GenericsRegistry generics) {
-        String name;
-        if(unannClassOrInterfaceTypeContext.unannInterfaceType_lfno_unannClassOrInterfaceType() != null){
-            name = unannClassOrInterfaceTypeContext.unannInterfaceType_lfno_unannClassOrInterfaceType().unannClassType_lfno_unannClassOrInterfaceType().Identifier().getText();
-            }
        Java8Parser.TypeArgumentsContext arguments;
        if(unannClassOrInterfaceTypeContext.unannClassType_lfno_unannClassOrInterfaceType() != null){
-            name = unannClassOrInterfaceTypeContext.unannClassType_lfno_unannClassOrInterfaceType().Identifier().getText();
            arguments = unannClassOrInterfaceTypeContext.unannClassType_lfno_unannClassOrInterfaceType().typeArguments();
        }else{// if(unannClassOrInterfaceTypeContext.unannInterfaceType_lfno_unannClassOrInterfaceType() != null){
-            name = unannClassOrInterfaceTypeContext.unannInterfaceType_lfno_unannClassOrInterfaceType().unannClassType_lfno_unannClassOrInterfaceType().getText();
            arguments = unannClassOrInterfaceTypeContext.unannInterfaceType_lfno_unannClassOrInterfaceType().unannClassType_lfno_unannClassOrInterfaceType().typeArguments();
        }
+        /**
+         * Problem sind hier die verschachtelten Typen mit verschachtelten Typargumenten
+         * Beispiel: Typ<String>.InnererTyp<Integer>
+         */
+        String name = unannClassOrInterfaceTypeContext.getText();
+        if(name.contains("<")){
+            name = name.split("<")[0]; //Der Typ ist alles vor den ersten Argumenten
+        }
        return convertTypeName(name, arguments, unannClassOrInterfaceTypeContext.getStart(), reg, generics);
    }

    public static RefTypeOrTPHOrWildcardOrGeneric convert(Java8Parser.UnannTypeContext unannTypeContext, JavaClassRegistry reg, GenericsRegistry genericsRegistry) {
        if(unannTypeContext.unannPrimitiveType()!=null){
-            throw new NotImplementedException();
+            if(unannTypeContext.unannPrimitiveType().getText().equals("boolean")){
+                return new RefType(ASTFactory.createClass(Boolean.class).getClassName(), unannTypeContext.getStart());
+            }else{
+                Java8Parser.NumericTypeContext numericType = unannTypeContext.unannPrimitiveType().numericType();
+                throw new NotImplementedException();
+            }
        }else
        if(unannTypeContext.unannReferenceType().unannArrayType()!=null){
-            System.out.println(unannTypeContext.getText());
+            //System.out.println(unannTypeContext.getText());
            throw new NotImplementedException();
        }else
        if(unannTypeContext.unannReferenceType().unannTypeVariable()!=null){
@@ -69,15 +76,14 @@ public class TypeGenerator {
        //Problem <A extends B, B> ist erlaubt, würde aber bei den Bounds von A den Generic B nicht als solchen erkennen
        List<RefTypeOrTPHOrWildcardOrGeneric> bounds = TypeGenerator.convert(typeParameter.typeBound(),reg, generics);

-        GenericTypeVar ret = new GenericTypeVar(new GenericTypeName(new GenericContext(parentClass, parentMethod), name), bounds, typeParameter.getStart(), typeParameter.getStop());
-        generics.put(name, new GenericContext(parentClass, parentMethod));
+        GenericTypeVar ret = new GenericTypeVar(name, bounds, typeParameter.getStart(), typeParameter.getStop());
        return ret;
    }

    public static List<RefTypeOrTPHOrWildcardOrGeneric> convert(Java8Parser.TypeBoundContext typeBoundContext, JavaClassRegistry reg, GenericsRegistry generics) {
        List<RefTypeOrTPHOrWildcardOrGeneric> ret = new ArrayList<>();
        if(typeBoundContext == null){
-            ret.add(ASTFactory.createObjectClass().getType());
+            ret.add(ASTFactory.createObjectType());
            return ret;
        }
        if(typeBoundContext.typeVariable() != null){
@@ -85,7 +91,7 @@ public class TypeGenerator {
            return ret;
        }
        if(typeBoundContext.classOrInterfaceType() != null){
-            ret.add(convert(typeBoundContext.classOrInterfaceType()));
+            ret.add(convert(typeBoundContext.classOrInterfaceType(), reg, generics));
            if(typeBoundContext.additionalBound() != null)
                for(Java8Parser.AdditionalBoundContext addCtx : typeBoundContext.additionalBound()){
                    ret.add(convert(addCtx.interfaceType()));
@@ -96,8 +102,9 @@ public class TypeGenerator {
        }
    }

-    private static RefTypeOrTPHOrWildcardOrGeneric convert(Java8Parser.ClassOrInterfaceTypeContext classOrInterfaceTypeContext) {
-        throw new NotImplementedException();
+    private static RefTypeOrTPHOrWildcardOrGeneric convert(Java8Parser.ClassOrInterfaceTypeContext classOrInterfaceTypeContext, JavaClassRegistry reg, GenericsRegistry generics) {
+        Java8Parser.ClassType_lfno_classOrInterfaceTypeContext ctx = classOrInterfaceTypeContext.classType_lfno_classOrInterfaceType();
+        return convertTypeName(ctx.Identifier().toString(), ctx.typeArguments(),classOrInterfaceTypeContext.getStart(), reg, generics);
    }

    private static RefTypeOrTPHOrWildcardOrGeneric convert(Java8Parser.InterfaceTypeContext interfaceTypeContext) {
@@ -105,7 +112,15 @@ public class TypeGenerator {
    }

    public static RefTypeOrTPHOrWildcardOrGeneric convert(Java8Parser.ReferenceTypeContext referenceTypeContext, JavaClassRegistry reg, GenericsRegistry generics) {
-        return convertTypeName(referenceTypeContext.getText(), referenceTypeContext.getStart(), reg, generics);
+        if(referenceTypeContext.classOrInterfaceType() != null){
+            if(referenceTypeContext.classOrInterfaceType().classType_lfno_classOrInterfaceType()!= null){
+                return convert(referenceTypeContext.classOrInterfaceType(), reg, generics);//return convertTypeName(referenceTypeContext.getText(), ctx.typeArguments(),referenceTypeContext.getStart(), reg, generics);
+            }else{
+                throw new NotImplementedException();
+            }
+        }else{
+            throw new NotImplementedException();
+        }
    }

    public static RefTypeOrTPHOrWildcardOrGeneric convertTypeName(String name, Token offset, JavaClassRegistry reg, GenericsRegistry generics){
@@ -116,13 +131,17 @@ public class TypeGenerator {
            String name, Java8Parser.TypeArgumentsContext typeArguments, Token offset, JavaClassRegistry reg, GenericsRegistry generics){
        if(!reg.contains(name)){ //Dann könnte es ein Generische Type sein
            if(generics.contains(name)){
-                return new GenericRefType(new GenericTypeName(generics.get(name),name), offset);
+                return new GenericRefType(name, offset);
            }else{
                throw new TypeinferenceException("Der Typ "+ name + " ist nicht vorhanden",offset);
            }
        }
        if(typeArguments == null){
-            return new RefType(reg.getName(name), offset);
+            List<RefTypeOrTPHOrWildcardOrGeneric> params = new ArrayList<>();
+            for(int i = 0; i<reg.getNumberOfGenerics(name);i++){
+                params.add(TypePlaceholder.fresh(offset));
+            }
+            return new RefType(reg.getName(name), params, offset);
        }else{
            return new RefType(reg.getName(name), convert(typeArguments, reg, generics), offset);
        }
--- a/src/de/dhbwstuttgart/parser/scope/GatherNames.java
+++ b/src/de/dhbwstuttgart/parser/scope/GatherNames.java
@@ -1,7 +1,9 @@
 package de.dhbwstuttgart.parser.scope;

 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;

 import de.dhbwstuttgart.parser.antlr.Java8BaseListener;
 import de.dhbwstuttgart.syntaxtree.AbstractASTWalker;
@@ -13,8 +15,8 @@ import de.dhbwstuttgart.parser.antlr.Java8Parser;

 public class GatherNames {

-	  public static List<String> getNames(Java8Parser.CompilationUnitContext ctx, PackageCrawler packages) throws ClassNotFoundException{
-		  List<String> ret = new ArrayList<>();
+	  public static Map<String, Integer> getNames(Java8Parser.CompilationUnitContext ctx, PackageCrawler packages) throws ClassNotFoundException{
+		  Map<String, Integer> ret = new HashMap<>();
 	    String pkgName = getPackageName(ctx);
 	    String nameString = "";
 	    for (Java8Parser.TypeDeclarationContext typeDecl : ctx.typeDeclaration()){
@@ -26,6 +28,8 @@ public class GatherNames {
 	          else{
 	            nameString = typeDecl.interfaceDeclaration().normalInterfaceDeclaration().Identifier().toString();
 	          }
+				int numGenerics = typeDecl.interfaceDeclaration().normalInterfaceDeclaration().typeParameters()!=null?
+						typeDecl.interfaceDeclaration().normalInterfaceDeclaration().typeParameters().typeParameterList().typeParameter().size():0;
 	          //Die Generic TypeParameter Definitionen Nicht! an die JavaClassName-Registry anfügen:
 	          /* //Diese gelängen dadurch in den globalen Scope, was sie schließlich nicht sind
 	          if(typeDecl.classDeclaration().normalClassDeclaration().typeParameters() != null){
@@ -34,7 +38,7 @@ public class GatherNames {
 	            }
 	          }
 	          */
-	          ret.add(nameString);
+	          ret.put(nameString, numGenerics);
 	        }
 	      }
 	      else{
@@ -53,30 +57,36 @@ public class GatherNames {
 	            }
 	          }
 	          */
-	          ret.add(nameString);
+				int numGenerics = typeDecl.classDeclaration().normalClassDeclaration().typeParameters()!=null?
+						typeDecl.classDeclaration().normalClassDeclaration().typeParameters().typeParameterList().typeParameter().size():0;
+
+				ret.put(nameString, numGenerics);
 	        }
 	      }
 	    }
-	    ret.addAll(getImports(ctx, packages));
+	    ret.putAll(getImports(ctx, packages));
 	    return ret;
 	  }
 	  

-	  private static List<String> getImports(Java8Parser.CompilationUnitContext ctx, PackageCrawler packages) throws ClassNotFoundException {
-	    List<String> ret = new ArrayList();
-		  ret.addAll(packages.getClassNames("java.lang"));
-	    for(Java8Parser.ImportDeclarationContext importDeclCtx : ctx.importDeclaration()){
+	  public static Map<String, Integer> getImports(Java8Parser.CompilationUnitContext ctx, PackageCrawler packages) throws ClassNotFoundException {
+		  Map<String, Integer> ret = new HashMap<>();
+	    ClassLoader classLoader = ClassLoader.getSystemClassLoader();
+		  //ret.putAll(packages.getClassNames("java.lang"));
+		  for(Java8Parser.ImportDeclarationContext importDeclCtx : ctx.importDeclaration()){
 	      if(importDeclCtx.singleTypeImportDeclaration() != null){
-	    	  ret.add(importDeclCtx.singleTypeImportDeclaration().typeName().getText());
+	    	  Class cl = classLoader.loadClass(importDeclCtx.singleTypeImportDeclaration().typeName().getText());
+			  ret.put(cl.getName(), cl.getTypeParameters().length);
 	      }
 	      else if(importDeclCtx.typeImportOnDemandDeclaration() != null){
-	    	  ret.addAll(packages.getClassNames(importDeclCtx.typeImportOnDemandDeclaration().packageOrTypeName().getText()));
+	    	  ret.putAll(packages.getClassNames(importDeclCtx.typeImportOnDemandDeclaration().packageOrTypeName().getText()));
 	      }
 	      else if(importDeclCtx.singleStaticImportDeclaration() != null){
-	    	  ret.add(importDeclCtx.singleStaticImportDeclaration().typeName().getText()+"."+importDeclCtx.singleStaticImportDeclaration().Identifier().getText());
-	      }
+			  Class cl = classLoader.loadClass(importDeclCtx.singleStaticImportDeclaration().typeName().getText()+"."+importDeclCtx.singleStaticImportDeclaration().Identifier().getText());
+			  ret.put(cl.getName(), cl.getTypeParameters().length);
+		  }
 	      else{
-	    	  ret.addAll(packages.getClassNames(importDeclCtx.staticImportOnDemandDeclaration().typeName().getText()));
+	    	  ret.putAll(packages.getClassNames(importDeclCtx.staticImportOnDemandDeclaration().typeName().getText()));
 	      }
 	    }
 	    return ret;
--- a/src/de/dhbwstuttgart/parser/scope/GenericTypeName.java
+++ b/src/de/dhbwstuttgart/parser/scope/GenericTypeName.java
@@ -1,22 +0,0 @@
-package de.dhbwstuttgart.parser.scope;
-
-import de.dhbwstuttgart.parser.SyntaxTreeGenerator.GenericContext;
-
-public class GenericTypeName extends JavaClassName {
-    private final static String DELIMITER = "%";
-
-    private final JavaClassName parentClass;
-    private final String methodName;
-
-    public GenericTypeName(GenericContext genericContext, String name) {
-        super(name);
-        this.parentClass = genericContext.parentClass;
-        this.methodName = genericContext.parentMethod;
-    }
-
-    public String getUniqueIdentifier() {
-        return parentClass.toString()
-                + DELIMITER + methodName
-                + DELIMITER + super.toString();
-    }
-}
--- a/src/de/dhbwstuttgart/parser/scope/JavaClassName.java
+++ b/src/de/dhbwstuttgart/parser/scope/JavaClassName.java
@@ -49,8 +49,10 @@ public class JavaClassName {
 		final int prime = 31;
 		int result = 1;
 		result = prime * result + ((name == null) ? 0 : name.hashCode());
+		/*
 		result = prime * result
 				+ ((packageName == null) ? 0 : packageName.hashCode()); //PackageName does not infect hashCode
+		*/
 		return result;
 	}

--- a/src/de/dhbwstuttgart/parser/scope/JavaClassRegistry.java
+++ b/src/de/dhbwstuttgart/parser/scope/JavaClassRegistry.java
@@ -8,20 +8,16 @@ import java.util.*;
 * Speichert die Klassen f<>r einen bestimmten Projektscope
 */
 public class JavaClassRegistry {
-    final List<JavaClassName> existingClasses = new ArrayList<>();
+    final Map<JavaClassName, Integer> existingClasses = new HashMap<>();

-    public JavaClassRegistry(List<String> initialNames){
-        for(String name : initialNames){
-            existingClasses.add(new JavaClassName(name));
+    public JavaClassRegistry(Map<String, Integer> initialNames){
+        for(String name : initialNames.keySet()){
+            existingClasses.put(new JavaClassName(name), initialNames.get(name));
        }
    }
-    
-    public void add(String className){
-        existingClasses.add(new JavaClassName(className));
-    }

    public JavaClassName getName(String className) {
-        for(JavaClassName name : existingClasses){
+        for(JavaClassName name : existingClasses.keySet()){
            if(name.equals(new JavaClassName(className)))return name;
        }
        throw new NotImplementedException();
@@ -34,7 +30,7 @@ public class JavaClassRegistry {

    public List<JavaClassName> getAllFromPackage(String packageName) {
        List<JavaClassName> ret = new ArrayList<>();
-        for(JavaClassName className : this.existingClasses){
+        for(JavaClassName className : this.existingClasses.keySet()){
            JavaClassName toCompare = new JavaClassName(packageName + "." + JavaClassName.stripClassName(className.toString()));
            if(toCompare.toString().equals(className.toString())){
                ret.add(className);
@@ -44,6 +40,10 @@ public class JavaClassRegistry {
    }

    public boolean contains(String whole) {
-        return existingClasses.contains(new JavaClassName(whole));
+        return existingClasses.containsKey(new JavaClassName(whole));
+    }
+
+    public int getNumberOfGenerics(String name) {
+        return existingClasses.get(new JavaClassName(name));
    }
 }
--- a/src/de/dhbwstuttgart/sat/CNF/CNF.java
+++ b/src/de/dhbwstuttgart/sat/CNF/CNF.java
@@ -0,0 +1,8 @@
+package de.dhbwstuttgart.sat.CNF;
+
+public class CNF {
+    /*
+    Baut die CNF Datei.
+    Hier muss man überlegen, in welchem Form die Constraints gebaut werden
+     */
+}
--- a/src/de/dhbwstuttgart/sat/CNF/Writer.java
+++ b/src/de/dhbwstuttgart/sat/CNF/Writer.java
@@ -0,0 +1,12 @@
+package de.dhbwstuttgart.sat.CNF;
+
+import java.io.*;
+
+/**
+ * Schreibt CNFs in eine Datei im DIMACS CNF Format
+ */
+public class Writer {
+    public Writer(FileWriter output){
+
+    }
+}
--- a/src/de/dhbwstuttgart/sat/asp/ASPStringConverter.java
+++ b/src/de/dhbwstuttgart/sat/asp/ASPStringConverter.java
@@ -0,0 +1,40 @@
+package de.dhbwstuttgart.sat.asp;
+
+import de.dhbwstuttgart.parser.scope.JavaClassName;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ASPStringConverter {
+    private static final Map<String, String> replacements = new HashMap<>();
+    static{
+        replacements.put(".", "_DOT_");
+        replacements.put("$", "_DOLLAR_");
+    }
+
+    public static String toConstant(JavaClassName name){
+        return toConstant(name.toString());
+    }
+
+    public static String toConstant(String name){
+        return "c" + replace(name);
+    }
+
+    public static String fromConstant(String s){
+        return unReplace(s).substring(1);
+    }
+
+    private static String replace(String input){
+        for(String toReplace : replacements.keySet()){
+            input = input.replace(toReplace, replacements.get(toReplace));
+        }
+        return input;
+    }
+
+    private static String unReplace(String input){
+        for(String toReplace : replacements.keySet()){
+            input = input.replace(replacements.get(toReplace), toReplace);
+        }
+        return input;
+    }
+}
--- a/Show More
+++ b/Show More