Reflections

reflections entfernen
Added Junit
2017-10-12 15:01:12 +02:00 · 2017-10-12 14:56:23 +02:00 · 2017-10-12 14:49:47 +02:00 · 2017-10-12 14:43:42 +02:00 · 2017-10-12 14:39:25 +02:00 · 2017-10-12 14:38:43 +02:00
690 changed files with 24745 additions and 49328 deletions
@@ -7,7 +7,6 @@ bin
 .mtj.tmp/

 # Package Files #
-*.jar
 *.war
 *.ear

@@ -19,13 +18,4 @@ bin
 .DS_Store
 .project
 .settings/
-/target/

-#
-manually/
-
-logFiles/**
-!logFiles/.gitkeep
-
-src/main/java/de/dhbwstuttgart/parser/antlr/
-src/main/java/de/dhbwstuttgart/sat/asp/parser/antlr/
@@ -0,0 +1,3 @@
+[submodule "reflections"]
+	path = reflections
+	url = ./reflections
@@ -1,10 +0,0 @@
-Stand: 24.5.21
-  bigRefactoring: Master-Brach
-  bigRefactoringUnifyComment: Dokumentation Unify, Martin
-  bytecodeGenericsSecond: Generated Generics, Ali, Martin
-  inferWildcards, Wildcards, Till
-  master, derzeit nicht genutzt
-  plugin, eigemntlicher Branch fuer Plugin-Basis, derzeit nicht aktuelle (aktuelle Version in simplifyRes
-  simplifyRes, Basis fuer Plugin, sollte auf Plugin gemerged werden, noch keine Packages, Michael
-  strucTypesNew, Struturelle Typen, alte Basis, arbeite derzeit niemand
-
@@ -1,25 +0,0 @@
-\documentclass{article}
-
-\begin{document}
-
-\section{Generics sind notwendig}
-Generics können nicht ignoriert werden.
-Folgender Fall ist Typisierbar:
-
-\begin{program}
-<T> T m1(T x){
-	return m2(x);
-}
-
-m2(x){
-	m1(1);
-	m2("Test");
-	return m1(x);
-}
-\end{program}
-
-Beim weglassen des Generics T wäre es aber nicht mehr möglich.
-Dann erhält jeder Constraint, welcher in Verbindung mit der Methode m1 steht
-den selben TPH.
-
-\end{document}
@@ -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</a></li>
+<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>
 <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">
+<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.literal.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>
@@ -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</a></li>
+<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>
 <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">
+<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.literal.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>
@@ -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</a></li>
+<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>
 <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">
+<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.literal.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>
@@ -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</a></li>
+<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>
 <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">
+<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.literal.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>
@@ -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</a></li>
+<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>
 <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">
+<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.literal.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>
@@ -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</li>
+<li>de.dhbwstuttgart.syntaxtree.statement.literal.Literal</li>
 </ul>
 </li>
 </ul>
@@ -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</a></li>
+<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>
 <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">
+<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.literal.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>
@@ -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.javaInternal.NegativeExpr</li>
+<li>de.dhbwstuttgart.syntaxtree.statement.NegativeExpr</li>
 </ul>
 </li>
 </ul>
@@ -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.javaInternal.NotExpr</li>
+<li>de.dhbwstuttgart.syntaxtree.statement.NotExpr</li>
 </ul>
 </li>
 </ul>
@@ -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</a></li>
+<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>
 <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">
+<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.literal.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>
@@ -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.javaInternal.PositivExpr</li>
+<li>de.dhbwstuttgart.syntaxtree.statement.PositivExpr</li>
 </ul>
 </li>
 </ul>
@@ -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.javaInternal.PostDecExpr</li>
+<li>de.dhbwstuttgart.syntaxtree.statement.PostDecExpr</li>
 </ul>
 </li>
 </ul>
@@ -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.javaInternal.PostIncExpr</li>
+<li>de.dhbwstuttgart.syntaxtree.statement.PostIncExpr</li>
 </ul>
 </li>
 </ul>
@@ -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.javaInternal.PreDecExpr</li>
+<li>de.dhbwstuttgart.syntaxtree.statement.PreDecExpr</li>
 </ul>
 </li>
 </ul>
@@ -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.javaInternal.PreIncExpr</li>
+<li>de.dhbwstuttgart.syntaxtree.statement.PreIncExpr</li>
 </ul>
 </li>
 </ul>
@@ -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</a></li>
+<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>
 <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">
+<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.literal.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>
@@ -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</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.literal.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" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.Literal</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.literal.Literal" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.Literal</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
@@ -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.javaInternal.NegativeExpr</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.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.javaInternal.NegativeExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.NegativeExpr</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.NegativeExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.NegativeExpr</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.javaInternal.NegativeExpr</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.NegativeExpr</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
@@ -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.javaInternal.NotExpr</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.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.javaInternal.NotExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.NotExpr</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.NotExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.NotExpr</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.javaInternal.NotExpr</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.NotExpr</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
@@ -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.javaInternal.PositivExpr</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.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.javaInternal.PositivExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PositivExpr</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.PositivExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PositivExpr</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.javaInternal.PositivExpr</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.PositivExpr</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
@@ -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.javaInternal.PostDecExpr</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.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.javaInternal.PostDecExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PostDecExpr</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.PostDecExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PostDecExpr</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.javaInternal.PostDecExpr</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.PostDecExpr</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
@@ -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.javaInternal.PostIncExpr</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.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.javaInternal.PostIncExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PostIncExpr</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.PostIncExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PostIncExpr</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.javaInternal.PostIncExpr</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.PostIncExpr</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
@@ -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.javaInternal.PreDecExpr</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.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.javaInternal.PreDecExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PreDecExpr</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.PreDecExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PreDecExpr</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.javaInternal.PreDecExpr</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.PreDecExpr</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
@@ -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.javaInternal.PreIncExpr</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.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.javaInternal.PreIncExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PreIncExpr</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.PreIncExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PreIncExpr</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.javaInternal.PreIncExpr</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.PreIncExpr</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
@@ -1,24 +0,0 @@
-# Dateien
-* sämtliche Datein im Ordner de.dhbwstuttgart.parser gehören zum Parser
-* Auch zu beachten: pom.xml
-	* Ein Teil der pom.xml instruiert maven zur Kompilierung der Java8.g4 Datei
-	* VORSICHT! Wird nicht zwangsläufig von der IDE ausgeführt
-	* siehe Kapitel "Grammatik -> Parser"
-
-
-## Unterordner antlr
-* Java8.g4
-	* die eigentliche Java Grammatik
-	* hier wurden Anpassungen vorgenommen, damit sie auch typloses Java annimmt
-* alle anderen Dateien in diesem Ordner sind vom ANTLR-Parsergenerator autogeneriert
-
-## Unterordner SyntaxTreeGenerator
-* SyntaxTreeGenerator
-* TODO
-
-# Grammatik -> Parser
-* Die Antlr-Grammatik (Java8.g4) wandelt 
-* Folgende Stellen sind relevant
-	* TODO
-
-
@@ -1,155 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
-http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>de.dhbwstuttgart</groupId>
-	<artifactId>JavaTXcompiler</artifactId>
-	<packaging>jar</packaging>
-
-	<version>0.1</version>
-	<name>JavaTXcompiler</name>
-	<url>http://maven.apache.org</url>
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.11</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.antlr</groupId>
-			<artifactId>antlr4</artifactId>
-			<version>4.8-1</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>
-			<version>22.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.reflections</groupId>
-			<artifactId>reflections</artifactId>
-			<version>0.9.11</version>
-		</dependency>
-		<!-- https://mvnrepository.com/artifact/org.ow2.asm/asm -->
-		<dependency>
-			<groupId>org.ow2.asm</groupId>
-			<artifactId>asm</artifactId>
-			<version>7.0</version>
-		</dependency>
-		<!-- <dependency> <groupId>org.ow2.asm</groupId> <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>${project.artifactId}-${project.version}</finalName>
-		<testOutputDirectory>target/test-classes</testOutputDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.0.0-M3</version>
-				<configuration>
-					<skipTests>true</skipTests>
-				</configuration>
-			</plugin>
-			<!-- plugin>
-		        <groupId>org.apache.maven.plugins</groupId>
-		        <artifactId>maven-compiler-plugin</artifactId>
-		        <version>3.8.1</version>
-		        <configuration>
-		          <verbose>true</verbose>
-		          <fork>true</fork>
-		          <executable>/home/michael/programs/jdk/jdk8u232-b09/bin/javac</executable>
-		          <compilerVersion>1.8</compilerVersion>
-		          <source>1.8</source>
-		          <target>1.8</target>
-		        </configuration>
-		    </plugin -->	
-			<plugin>
-				<groupId>org.antlr</groupId>
-				<artifactId>antlr4-maven-plugin</artifactId>
-				<version>4.8-1</version>
-				<executions>
-					<execution>
-						<id>antlr</id>
-						<goals>
-							<goal>antlr4</goal>
-						</goals>
-						<configuration>
-							<sourceDirectory>src/main/antlr4/java8</sourceDirectory>
-							<outputDirectory>${project.basedir}/src/main/java/de/dhbwstuttgart/parser/antlr</outputDirectory>
-							<arguments>
-								<argument>-package</argument>
-								<argument>de.dhbwstuttgart.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>
-					<archive>
-						<manifest>
-							<mainClass>de.dhbwstuttgart.core.ConsoleInterface</mainClass>
-						</manifest>
-					</archive>
-					<descriptorRefs>
-						<descriptorRef>jar-with-dependencies</descriptorRef>
-					</descriptorRefs>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>17</source>
-					<target>17</target>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<repositories>
-		<repository>
-			<id>maven-repository</id>
-			<url>file:///${project.basedir}/target</url>
-		</repository>
-	</repositories>
-	<properties>
-	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<maven.compiler.source>17</maven.compiler.source>
-		<maven.compiler.target>17</maven.compiler.target>
-		<compilerArgs>
-			--enable-preview
-		</compilerArgs>
-		<tycho.version>0.23.0</tycho.version>
-		<mainClass>de.dhbwstuttgart.core.ConsoleInterface</mainClass>
-	</properties>
-	<distributionManagement>
-		<repository>
-			<id>maven-repository</id>
-			<name>MyCo Internal Repository</name>
-			<url>file:///${project.basedir}/maven-repository/</url>
-		</repository>
-	</distributionManagement>
-</project>
@@ -0,0 +1,24 @@
+#!/bin/bash
+# A basic script to compile the necessary packages and their subpackages to work with the parser.
+# Messages are logged to stderr.
+>&2 echo "Building de.dhbwstuttgart.typecheck..."
+javac -d ../bin ./de/dhbwstuttgart/typecheck/*.java
+>&2 echo "Building de.dhbwstuttgart.syntaxtree..."
+javac -d ../bin ./de/dhbwstuttgart/syntaxtree/*.java
+>&2 echo "Building de.dhbwstuttgart.syntaxtree.factory..."
+javac -d ../bin ./de/dhbwstuttgart/syntaxtree/factory/*.java
+>&2 echo "Building de.dhbwstuttgart.syntaxtree.operator..."
+javac -d ../bin ./de/dhbwstuttgart/syntaxtree/operator/*.java
+>&2 echo "Building de.dhbwstuttgart.syntaxtree.statement..."
+javac -d ../bin ./de/dhbwstuttgart/syntaxtree/statement/*.java
+>&2 echo "Building de.dhbwstuttgart.syntaxtree.statement.literal..."
+javac -d ../bin ./de/dhbwstuttgart/syntaxtree/statement/literal/*.java
+>&2 echo "Building de.dhbwstuttgart.syntaxtree.type..."
+javac -d ../bin ./de/dhbwstuttgart/syntaxtree/type/*.java
+>&2 echo "Building de.dhbwstuttgart.parser..."
+javac -d ../bin ./de/dhbwstuttgart/parser/*.java
+>&2 echo "Building de.dhbwstuttgart.parser.SyntaxTreeGenerator..."
+javac -d ../bin ./de/dhbwstuttgart/parser/SyntaxTreeGenerator/*.java
+>&2 echo "Building de.dhbwstuttgart.parser.antlr..."
+javac -d ../bin ./de/dhbwstuttgart/parser/antlr/*.java
+echo "Done. Now its your turn to debug:)."
@@ -0,0 +1,386 @@
+package de.dhbwstuttgart.bytecode;
+
+import java.awt.List;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+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.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;
+
+public class BytecodeGen implements ASTVisitor {
+	
+	ClassWriter cw =new ClassWriter(ClassWriter.COMPUTE_FRAMES|ClassWriter.COMPUTE_MAXS);
+//	String methDesc;
+	
+	String type;
+	
+	String className;
+	
+	// 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<>();
+	byte[] bytecode;
+	HashMap<String,byte[]> classFiles;
+	
+	public BytecodeGen(HashMap<String,byte[]> classFiles) {
+		this.classFiles = classFiles;
+		paramsAndLocals = new HashMap<>();
+	}
+	
+	@Override
+	public void visit(SourceFile sourceFile) {
+		for(ClassOrInterface cl : sourceFile.getClasses()) {
+			BytecodeGen classGen = new BytecodeGen(classFiles);
+			cl.accept(classGen);
+			classGen.writeClass(cl.getClassName().toString());
+		}
+	}
+
+	private void writeClass(String name) {
+		bytecode = cw.toByteArray();
+		classFiles.put(name, bytecode);
+		
+	}
+	
+	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
+		for(Field f : classOrInterface.getFieldDecl()) {
+			System.out.println("get Fields");
+			System.out.println(f.getName());
+			f.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); 
+		mv.visitCode();		
+		System.out.println("-----Constructor-----");
+		BytecodeGenMethod gen = new BytecodeGenMethod(className,field, mv,paramsAndLocals,desc.getDesc(),cw);
+
+		mv.visitInsn(Opcodes.RETURN);
+		mv.visitMaxs(0, 0);
+		mv.visitEnd();
+	}
+
+	@Override
+	public void visit(Method method) {
+		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();		
+		
+		BytecodeGenMethod gen = new BytecodeGenMethod(className,method, mv,paramsAndLocals,methDesc.getDesc(),cw);
+		mv.visitMaxs(0, 0);
+		mv.visitEnd();
+	}
+	
+	@Override
+	public void visit(ParameterList formalParameters) {
+		Iterator<FormalParameter> itr = formalParameters.iterator();
+		int i = 1;
+		while(itr.hasNext()) {
+			FormalParameter fp = itr.next();
+			paramsAndLocals.put(fp.getName(), i);
+			fp.accept(this);
+			i++;
+		}
+	}
+	
+	@Override
+	public void visit(FormalParameter formalParameter) {
+		formalParameter.getType().accept(this);
+	}
+	
+	@Override
+	public void visit(RefType refType) {
+		type = "L"+refType.toString()+";";
+	}
+
+	@Override
+	public void visit(SuperWildcardType superWildcardType) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(TypePlaceholder typePlaceholder) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(ExtendsWildcardType extendsWildcardType) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(GenericRefType genericRefType) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	// ??
+	@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();
+	}
+	
+	// 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();
+	}
+
+	@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(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(ArgumentList argumentList) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(GenericTypeVar genericTypeVar) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(GenericDeclarationList genericTypeVars) {
+		// 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
+		
+	}
+
+}
@@ -1,45 +1,48 @@
 package de.dhbwstuttgart.bytecode;

-import java.util.List;
+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.BinaryExpr;
+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.ExpressionReceiver;
 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.Literal;
 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.UnaryExpr;
+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;
 		
-public class ArgumentVisitor implements StatementVisitor {
-	private List<Boolean> argListMethCall;
-	private BytecodeGenMethod bytecodeGenMethod;
 		
-	public ArgumentVisitor(List<Boolean> argListMethCall, BytecodeGenMethod bytecodeGenMethod) {
-		this.argListMethCall = argListMethCall;
-		this.bytecodeGenMethod = bytecodeGenMethod;
 	}

 	@Override
@@ -50,31 +53,20 @@ public class ArgumentVisitor implements StatementVisitor {

 	@Override
 	public void visit(LambdaExpression lambdaExpression) {
-		lambdaExpression.accept(bytecodeGenMethod);
-		// Zieltype des Lambas ist Funktionale Interface
-		// kann nie primitiv sein => un-/boxing wird hier nicht gebraucht
-		argListMethCall.remove(0);
+		// TODO Auto-generated method stub
+		
 	}

 	@Override
 	public void visit(Assign assign) {
-		assign.accept(bytecodeGenMethod);
+		// TODO Auto-generated method stub
 		
-		if(argListMethCall.get(0))
-			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolver().getResolvedType(assign.getType()));
-		argListMethCall.remove(0);
 	}

 	@Override
-	public void visit(BinaryExpr binary) {
-		binary.accept(bytecodeGenMethod);
+	public void visit(Binary binary) {
+		// TODO Auto-generated method stub
 		
-		if(argListMethCall.get(0)) {
-			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolver().getResolvedType(binary.getType()));
-		} else {
-			bytecodeGenMethod.doBoxing(bytecodeGenMethod.getResolver().getResolvedType(binary.getType()));
-		}
-		argListMethCall.remove(0);
 	}

 	@Override
@@ -85,11 +77,8 @@ public class ArgumentVisitor implements StatementVisitor {

 	@Override
 	public void visit(CastExpr castExpr) {
-		castExpr.accept(bytecodeGenMethod);
+		// TODO Auto-generated method stub
 		
-		if(argListMethCall.get(0))
-			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolver().getResolvedType(castExpr.getType()));
-		argListMethCall.remove(0);
 	}

 	@Override
@@ -100,11 +89,8 @@ public class ArgumentVisitor implements StatementVisitor {

 	@Override
 	public void visit(FieldVar fieldVar) {
-		fieldVar.accept(bytecodeGenMethod);
+		// TODO Auto-generated method stub
 		
-		if(argListMethCall.get(0))
-			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolver().getResolvedType(fieldVar.getType()));
-		argListMethCall.remove(0);
 	}

 	@Override
@@ -121,21 +107,14 @@ public class ArgumentVisitor implements StatementVisitor {

 	@Override
 	public void visit(InstanceOf instanceOf) {
-		instanceOf.accept(bytecodeGenMethod);
+		// TODO Auto-generated method stub
 		
-		if(argListMethCall.get(0))
-			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolver().getResolvedType(instanceOf.getType()));
-		argListMethCall.remove(0);
 	}

 	@Override
 	public void visit(LocalVar localVar) {
-		localVar.accept(bytecodeGenMethod);
-		if(!bytecodeGenMethod.isBinaryExp) {
-			if(argListMethCall.get(0))
-				bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolver().getResolvedType(localVar.getType()));
-		}
-		argListMethCall.remove(0);
+		// TODO Auto-generated method stub
+		
 	}

 	@Override
@@ -146,20 +125,14 @@ public class ArgumentVisitor implements StatementVisitor {

 	@Override
 	public void visit(MethodCall methodCall) {
-		methodCall.accept(bytecodeGenMethod);
+		// TODO Auto-generated method stub
 		
-		if(argListMethCall.get(0))
-			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolver().getResolvedType(methodCall.getType()));
-		argListMethCall.remove(0);
 	}

 	@Override
 	public void visit(NewClass methodCall) {
-		methodCall.accept(bytecodeGenMethod);
+		// TODO Auto-generated method stub
 		
-		if(argListMethCall.get(0))
-			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolver().getResolvedType(methodCall.getType()));
-		argListMethCall.remove(0);
 	}

 	@Override
@@ -168,6 +141,12 @@ public class ArgumentVisitor implements StatementVisitor {
 		
 	}

+	@Override
+	public void visit(Receiver receiver) {
+		// TODO Auto-generated method stub
+		
+	}
+
 	@Override
 	public void visit(Return aReturn) {
 		// TODO Auto-generated method stub
@@ -194,11 +173,14 @@ public class ArgumentVisitor implements StatementVisitor {

 	@Override
 	public void visit(This aThis) {
-		aThis.accept(bytecodeGenMethod);
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(UnaryPlus unaryPlus) {
+		// TODO Auto-generated method stub
 		
-		if(argListMethCall.get(0))
-			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolver().getResolvedType(aThis.getType()));
-		argListMethCall.remove(0);
 	}

 	@Override
@@ -213,6 +195,18 @@ public class ArgumentVisitor implements StatementVisitor {
 		
 	}

+	@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
@@ -230,29 +224,4 @@ public class ArgumentVisitor implements StatementVisitor {
 		// TODO Auto-generated method stub
 		
 	}
-
-	@Override
-	public void visit(ExpressionReceiver expressionReceiver) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(UnaryExpr unaryExpr) {
-		unaryExpr.accept(bytecodeGenMethod);
-		
-		if(argListMethCall.get(0))
-			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolver().getResolvedType(unaryExpr.getType()));
-		argListMethCall.remove(0);
-	}
-
-	@Override
-	public void visit(Literal literal) {
-		literal.accept(bytecodeGenMethod);
-		
-		if(argListMethCall.get(0))
-			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolver().getResolvedType(literal.getType()));
-		argListMethCall.remove(0);
-	}
-
 }
@@ -0,0 +1,360 @@
+package de.dhbwstuttgart.bytecode;
+
+import java.io.PrintStream;
+import java.lang.invoke.CallSite;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.security.GeneralSecurityException;
+import java.util.HashMap;
+
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+
+import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
+import de.dhbwstuttgart.syntaxtree.Method;
+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.Expression;
+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.Statement;
+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.type.RefTypeOrTPHOrWildcardOrGeneric;
+
+public class BytecodeGenMethod implements StatementVisitor{
+	
+	private Method m;
+	private MethodVisitor mv;
+	private HashMap<String, Integer> paramsAndLocals = new HashMap<>(); 
+	private String desc;
+	private String className;
+	private int lamCounter;
+	private ClassWriter cw;
+	
+	//for tests **
+	private String fieldName;
+	private String fieldDesc;
+	private Expression rightSideTemp;
+	private String where;
+	
+	public BytecodeGenMethod(String className, Method m, MethodVisitor mv, HashMap<String, Integer> paramsAndLocals,
+			String desc, ClassWriter cw) {
+		
+		this.where = "NORMAL METHOD";
+		
+		this.className = className;
+		this.m = m;
+		this.mv = mv;
+		this.paramsAndLocals = paramsAndLocals;
+		this.desc = desc;
+		this.cw = cw;
+		this.lamCounter = -1;
+		
+		this.m.block.accept(this);
+		
+	}
+	
+	public BytecodeGenMethod(LambdaExpression lambdaExpression, MethodVisitor mv, 
+			HashMap<String, Integer> paramsAndLocals, String desc) {
+		System.out.println("++++++IN LAMBDA -------");
+		
+		this.where = "&&&&&&&& LAMBDA METHOD";
+		
+		this.mv = mv;
+		this.paramsAndLocals = paramsAndLocals;
+		this.desc = desc;
+		
+		this.lamCounter = -1;
+		
+		lambdaExpression.methodBody.accept(this);
+	}
+	
+	@Override
+	public void visit(Block block) {
+		for(Statement stmt : block.getStatements()) {
+			System.out.println(where);
+			System.out.println("Stmt : " + stmt.toString());
+			stmt.accept(this);
+			System.out.println("--------------------------\n");
+		}
+	}
+	
+	@Override
+	public void visit(SuperCall superCall) {
+		superCall.receiver.accept(this);
+		superCall.arglist.accept(this);
+//		mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/Object", superCall.name, desc,false);
+		mv.visitMethodInsn(Opcodes.INVOKESPECIAL, Type.getInternalName(Object.class), superCall.name, desc,false);
+	}
+	
+	// ??
+	@Override
+	public void visit(LocalVar localVar) {
+		System.out.println("in Local Var");
+	}
+	// ??
+	@Override
+	public void visit(LocalVarDecl localVarDecl) {
+//		Integer i;
+		paramsAndLocals.put(localVarDecl.getName(), paramsAndLocals.size()+1);
+		System.out.println("In localVarDecl");
+	}
+
+	@Override
+	public void visit(Assign assign) {
+		System.out.println("Assign : \nright = "+assign.rightSide + "\nLeft = " + assign.lefSide);
+		
+		if(assign.lefSide.getClass().equals(AssignToField.class)) {
+			// load_0, ldc or .. then putfield
+			this.rightSideTemp = assign.rightSide;
+			assign.lefSide.accept(this);
+		}else {
+			assign.rightSide.accept(this);
+			assign.lefSide.accept(this);
+		}
+		
+		
+		
+	}
+	
+	@Override
+	public void visit(Binary binary) {
+		System.out.println("++ In Binary: ");
+	}
+	
+	@Override
+	public void visit(LambdaExpression lambdaExpression) {
+		System.out.println("\n++ In Lambda: ");
+		this.lamCounter++;
+		//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(), false);
+		String methodName = "lambda$new$" + this.lamCounter;
+		// Type erasure
+		Type arg1 = Type.getMethodType("()V");
+		// real Type
+		Type arg3 = Type.getMethodType("()V");
+		Handle arg2 = new Handle(Opcodes.H_INVOKESTATIC, this.className, methodName, 
+				arg3.toString(),false);
+		mv.visitInvokeDynamicInsn("run", "()Ljava/lang/Runnable;", bootstrap, 
+				arg1, arg2,arg3);
+
+		MethodVisitor mvLambdaBody = cw.visitMethod(Opcodes.ACC_PRIVATE+ Opcodes.ACC_STATIC + Opcodes.ACC_SYNTHETIC, 
+				methodName, arg3.toString(), null, null);
+//		new BytecodeGenLambda(lambdaExpression, mvLambdaBody);
+		
+		new BytecodeGenMethod(lambdaExpression, mvLambdaBody, new HashMap<>(), arg3.toString());
+		mvLambdaBody.visitMaxs(0, 0);
+		mvLambdaBody.visitEnd();
+	}
+
+	@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) {
+		System.out.println("in fieldVar " + fieldVar.fieldVarName + " ** receiver: "+fieldVar.receiver);
+		
+		fieldName = fieldVar.fieldVarName;
+		fieldDesc = fieldVar.getType().toString();
+		
+		fieldVar.receiver.accept(this);
+		// test (if)
+		if(!fieldVar.receiver.getClass().equals(StaticClassName.class)) {
+			mv.visitFieldInsn(Opcodes.GETFIELD,fieldVar.getType().toString(),fieldName ,fieldDesc);
+		}
+		
+//		mv.visitFieldInsn(Opcodes.GETSTATIC, fieldVar.receiver.getType().toString().replace(".", "/"), 
+//				fieldVar.fieldVarName, fieldVar.getType().toString());
+	}
+
+	@Override
+	public void visit(ForStmt forStmt) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(IfStmt ifStmt) {
+		System.out.println("++ IF-Statment: ");
+	}
+
+	@Override
+	public void visit(InstanceOf instanceOf) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(MethodCall methodCall) {
+		System.out.println("	In Methodcall: (" +methodCall.name+")" );
+		System.out.println("		Method-Receiver: "+methodCall.receiver.expr);
+		
+		methodCall.receiver.accept(this);
+		methodCall.arglist.accept(this);
+		
+		Descriptor mDesc = new Descriptor(methodCall.arglist, methodCall.getType());
+		
+		mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, methodCall.receiver.expr.getType().toString(), 
+				methodCall.name, mDesc.getDesc(), false);
+		// test
+		if(!methodCall.getType().toString().equals("V")) {
+			mv.visitInsn(Opcodes.POP);
+		}
+	}
+
+	@Override
+	public void visit(NewClass methodCall) {
+		System.out.println("In NewClass: ");
+		System.out.println("name: " + methodCall.name + " *** " + "Receiver: " + methodCall.receiver);
+		
+		mv.visitTypeInsn(Opcodes.NEW, methodCall.name.replace(".", "/"));
+		mv.visitInsn(Opcodes.DUP);
+		// creates Descriptor
+		methodCall.arglist.accept(this);
+		String d = "(";
+		for(Expression e : methodCall.arglist.getArguments()) {
+			d = d + "L"+e.getType().toString().replace(".", "/") + ";";
+		}
+		d += ")V";
+		
+		mv.visitMethodInsn(Opcodes.INVOKESPECIAL, methodCall.name.replace(".", "/"), "<init>", d, false);
+	}
+
+	@Override
+	public void visit(NewArray newArray) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(Receiver receiver) {
+		System.out.println("	in Receiver");
+		System.out.println("		expr : " + receiver.expr);
+		receiver.expr.accept(this);
+	}
+
+	@Override
+	public void visit(Return aReturn) {
+		mv.visitInsn(Opcodes.ARETURN);
+	}
+
+	@Override
+	public void visit(ReturnVoid aReturn) {
+		mv.visitInsn(Opcodes.RETURN);
+	}
+
+	@Override
+	public void visit(StaticClassName staticClassName) {
+		System.out.println("In StaticClassName: ");
+//		mv.visitMethodInsn(Opcodes.INVOKESTATIC, staticClassName.getType().toString().replace(".", "/"), 
+//				staticClassName.toString(), staticClassName.getType().toString(), false);
+		mv.visitFieldInsn(Opcodes.GETSTATIC, staticClassName.getType().toString().replace(".", "/"), 
+				fieldName, fieldDesc);
+	}
+
+	@Override
+	public void visit(Super aSuper) {
+		System.out.println(">> In Super: ");
+	}
+
+	@Override
+	public void visit(This aThis) {
+		System.out.println("-> IN This");
+		mv.visitVarInsn(Opcodes.ALOAD, 0);
+	}
+
+	@Override
+	public void visit(UnaryPlus unaryPlus) {
+		System.out.println("++ In UnaryPlus: ");
+	}
+
+	@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) {
+		mv.visitInsn(Opcodes.ACONST_NULL);
+	}
+
+	@Override
+	public void visit(Literal literal) {
+		// value?
+		mv.visitLdcInsn(literal.getType().toString());
+	}
+
+	@Override
+	public void visit(ArgumentList argumentList) {
+		for(Expression al : argumentList.getArguments()) {
+			al.accept(this);
+		}
+	}
+
+	@Override
+	public void visit(AssignToField assignLeftSide) {
+		// Loads the an object reference from the local variable 
+		//			array slot onto the top of the operand stack.
+		assignLeftSide.field.receiver.accept(this);
+		this.rightSideTemp.accept(this);
+		mv.visitFieldInsn(Opcodes.PUTFIELD, assignLeftSide.field.receiver.getType().toString(), 
+				assignLeftSide.field.fieldVarName, assignLeftSide.field.getType().toString());
+	}
+
+	@Override
+	public void visit(AssignToLocal assignLeftSide) {
+		paramsAndLocals.put(assignLeftSide.localVar.name, paramsAndLocals.size()+1);
+		mv.visitVarInsn(Opcodes.ASTORE, paramsAndLocals.size());
+	}
+
+}
@@ -0,0 +1,14 @@
+package de.dhbwstuttgart.bytecode;
+
+public class ClassFile {
+	
+	String name;
+	byte[] bytecode;
+	
+	public ClassFile(String name, byte[] bytecode) {
+		this.name = name;
+		this.bytecode = bytecode;
+	}
+	
+
+}
@@ -0,0 +1,54 @@
+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;
+	}
+
+}
@@ -0,0 +1,150 @@
+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();
+		}
+
+	}
+}
@@ -0,0 +1,8 @@
+package de.dhbwstuttgart.bytecode;
+
+public class TestClass {
+	public TestClass() {
+		Runnable lam = () -> System.out.println("lambda");
+		lam.run();
+	}
+}
@@ -0,0 +1,59 @@
+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();
+		}
+	}
+
+}
@@ -0,0 +1,11 @@
+package de.dhbwstuttgart.bytecode;
+
+public class TestIf {
+	public TestIf(Boolean b) {
+		if(b) {
+			System.out.println("1");
+		}else {
+			System.out.println("0");
+		}
+	}
+}
@@ -0,0 +1,18 @@
+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;
+	}
+}
@@ -0,0 +1,6 @@
+package de.dhbwstuttgart.bytecode;
+
+public class TetsF {
+	private int z;
+	public String s = "";
+}
@@ -0,0 +1,16 @@
+package de.dhbwstuttgart.core;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class ConsoleInterface {
+	private static final String directory = System.getProperty("user.dir");
+
+	public static void main(String[] args) throws IOException, ClassNotFoundException {
+		List<File> input = Arrays.asList(args).stream().map((s -> new File(s))).collect(Collectors.toList());
+		JavaTXCompiler compiler = new JavaTXCompiler(input);
+		compiler.typeInference();
+	}
+}
@@ -0,0 +1,103 @@
+package de.dhbwstuttgart.core;
+
+
+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.JavaClassName;
+import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
+import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+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.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.TypeUnify;
+import de.dhbwstuttgart.typeinference.unify.model.FiniteClosure;
+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 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 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);
+
+        final ConstraintSet<Pair> cons = new TYPE(sourceFiles.values(), allClasses).getConstraints();
+        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);
+            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);
+        return ret;
+    }
+    
+}
@@ -0,0 +1,63 @@
+package de.dhbwstuttgart.environment;
+
+import java.io.File;
+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 de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+import de.dhbwstuttgart.syntaxtree.SourceFile;
+import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
+import org.reflections.Reflections;
+import org.reflections.scanners.ResourcesScanner;
+import org.reflections.scanners.SubTypesScanner;
+import org.reflections.util.ClasspathHelper;
+import org.reflections.util.ConfigurationBuilder;
+import org.reflections.util.FilterBuilder;
+
+import de.dhbwstuttgart.exceptions.DebugException;
+import de.dhbwstuttgart.parser.JavaTXParser;
+import de.dhbwstuttgart.parser.antlr.Java8Parser.CompilationUnitContext;
+import de.dhbwstuttgart.parser.scope.GatherNames;
+import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
+
+/**
+ * Stellt die Java-Environment dar und speichert alle Binarys, Librarys und Sourcefiles im zu kompilierenden Projekt
+ * Sie erstellt anhand dieser Informationen die JavaClassNameRegistry
+ * 
+ * TODO: Zur Initialisierung der CompilationEnvironment sollten alle SourceFiles mit ANTLR geparst werden und alle Klassen Generics und Typen herausgefunden werden
+ */
+public class CompilationEnvironment {
+	private final List<URL> librarys;
+	private final List<File> sourceFiles;
+
+	/**
+	 * Imitiert die Environment beim Aufruf des JavaCompilers auf einer Menge von java-Dateien
+	 * Die Environment enth�lt automatisch die Java Standard Library
+	 * @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");
+			}
+        }
+		this.sourceFiles = sourceFiles;
+	}
+
+	public JavaClassRegistry getRegistry(File forSourceFile) throws ClassNotFoundException, IOException {
+		List<String> allNames;
+		CompilationUnitContext tree = JavaTXParser.parse(forSourceFile);
+		allNames = GatherNames.getNames(tree, new PackageCrawler(librarys));
+		return new JavaClassRegistry(allNames);
+	}
+}
@@ -1,7 +1,9 @@
 package de.dhbwstuttgart.environment;

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

 import org.reflections.Reflections;
 import org.reflections.scanners.ResourcesScanner;
@@ -10,7 +12,6 @@ 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
@@ -26,11 +27,11 @@ public class PackageCrawler {
 	
    public Set<Class<?>> getClassesInPackage(String packageName){
    	/*
-        List<DirectoryClassLoader> classLoadersList = new LinkedList<DirectoryClassLoader>();
+        List<ClassLoader> classLoadersList = new LinkedList<ClassLoader>();
        classLoadersList.add(Thread.currentThread().getContextClassLoader());
        classLoadersList.add(ClasspathHelper.staticClassLoader());
        classLoadersList.add(Thread.currentThread().getContextClassLoader().getParent());
-        classLoadersList.add(DirectoryClassLoader.getSystemClassLoader());
+        classLoadersList.add(ClassLoader.getSystemClassLoader());
        String bootClassPath = System.getProperty("sun.boot.class.path");
        ArrayList<URL> urlList = new ArrayList<>();
        for(String path : bootClassPath.split(";")) {
@@ -41,7 +42,7 @@ public class PackageCrawler {
 			}
        }
        URL[] urls = urlList.toArray(new URL[0]);
-        classLoadersList.add(new URLClassLoader(urls, DirectoryClassLoader.getSystemClassLoader()));
+        classLoadersList.add(new URLClassLoader(urls, ClassLoader.getSystemClassLoader()));
        */
        Reflections reflections = new Reflections(new ConfigurationBuilder()
                .setScanners(new SubTypesScanner(false /* don't exclude Object.class */), new ResourcesScanner())
@@ -53,24 +54,11 @@ public class PackageCrawler {
        return classes;
    }

-    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<>();
+  public List<String> getClassNames(String packageName){
+    List<String> nameList = new ArrayList();
    Set<Class<?>> classes = getClassesInPackage(packageName);
-      if(packageName.equals("java.lang") && ! classes.contains(Object.class)) {
-        classes.add(Object.class);
-      }
    for(Class c : classes){
-      nameList.put(c.getName(), c.getTypeParameters().length);
+      nameList.add(c.getName());
    }
    return nameList;
  }
@@ -29,7 +29,7 @@ public class JavaTXParser {
        */
    }
    
-    /* Fü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)));
    }
@@ -3,8 +3,8 @@ package de.dhbwstuttgart.parser.SyntaxTreeGenerator;
 import de.dhbwstuttgart.parser.scope.JavaClassName;

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

    public GenericContext(JavaClassName parentClass, String parentMethod) {
        if(parentMethod == null)parentMethod = "";
@@ -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.UnaryExpr.Operation;
+import de.dhbwstuttgart.syntaxtree.statement.literal.*;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
@@ -17,19 +17,16 @@ import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.TerminalNode;

 import java.util.*;
-import java.util.stream.Collectors;

 public class StatementGenerator {

    private JavaClassRegistry reg;
-    private Map<String, RefTypeOrTPHOrWildcardOrGeneric> fields; //PL 2018-11-01 fields eingefuegt, damit die fields immer die gleiche TPH bekommen
    private Map<String, RefTypeOrTPHOrWildcardOrGeneric> localVars;
    private GenericsRegistry generics;

-    public StatementGenerator(JavaClassRegistry reg, GenericsRegistry generics, Map<String, RefTypeOrTPHOrWildcardOrGeneric> fields, Map<String, RefTypeOrTPHOrWildcardOrGeneric> localVars){
+    public StatementGenerator(JavaClassRegistry reg, GenericsRegistry generics, Map<String, RefTypeOrTPHOrWildcardOrGeneric> localVars){
        this.reg = reg;
        this.generics = generics;
-        this.fields = fields;
        this.localVars = localVars;
    }

@@ -97,7 +94,7 @@ public class StatementGenerator {

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

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

@@ -181,14 +178,6 @@ 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){
@@ -210,13 +199,7 @@ public class StatementGenerator {
        }else throw new NotImplementedException();

        ArgumentList argumentList = convert(methodInvocationContext.argumentList());
-        ArrayList<RefTypeOrTPHOrWildcardOrGeneric> argTypes = argumentList.getArguments().stream()
-        		.map(x -> TypePlaceholder.fresh(methodInvocationContext.getStart()))
-        		.collect(Collectors.toCollection(ArrayList::new));
-        MethodCall ret = new MethodCall(TypePlaceholder.fresh(methodInvocationContext.getStart()), 
-        		getReceiver(receiver), name, argumentList, TypePlaceholder.fresh(methodInvocationContext.getStart()), 
-        		argTypes, methodInvocationContext.getStart());
-        ret.setStatement();
+        MethodCall ret = new MethodCall(TypePlaceholder.fresh(methodInvocationContext.getStart()),new Receiver(receiver), name, argumentList, methodInvocationContext.getStart());
        return ret;
    }

@@ -247,14 +230,9 @@ public class StatementGenerator {
            if(localVars.get(expression) != null){
                return new LocalVar(expression, localVars.get(expression), offset);
            }else{
-            if(fields.get(expression) != null){//PL 2018-11-01 fields eingefuegt, damit die fields immer die gleiche TPH bekommen
-            	return new FieldVar(new This(offset), expression, fields.get(expression), offset);
-                
-            } else {
-            	//kann eigentlich nicht vorkommen
                //Dann Muss es ein Feld sein!
                return new FieldVar(new This(offset), expression, TypePlaceholder.fresh(offset), offset);
-            }}
+            }
        }
        return generateFieldVarOrClassname(expression, offset);
    }
@@ -272,10 +250,8 @@ public class StatementGenerator {
            whole+=".";
        }

-        if(parts.length < 2 || parts[0].contentEquals("this") ){
+        if(parts.length < 2){
            receiver = new This(offset);
-        } else if (parts[0].contentEquals("super")) {
-        	receiver = new Super(offset);
        }else if(receiver == null){ //Handelt es sich um keinen Statischen Klassennamen:
            String part = expression.substring(0,expression.length() - (1 + parts[parts.length-1].length()));
            receiver = generateLocalOrFieldVarOrClassName(part, offset);
@@ -288,62 +264,34 @@ public class StatementGenerator {
    }


-    private Statement convert(Java8Parser.ClassInstanceCreationExpressionContext newExpression) {
-        Java8Parser.TypeArgumentsContext genericArgs = null;
-        if(newExpression.expressionName()!= null)throw new NotImplementedException();
-        if(newExpression.typeArgumentsOrDiamond()!= null){
-            if(newExpression.typeArgumentsOrDiamond().typeArguments()!=null){
-                genericArgs = newExpression.typeArgumentsOrDiamond().typeArguments();
-            }
-        }
-        if(newExpression.typeArguments()!= null)throw new NotImplementedException();
-
-        TerminalNode identifier = newExpression.Identifier(0);
-        RefType newClass = (RefType) TypeGenerator.convertTypeName(identifier.getText(),genericArgs,identifier.getSymbol(),reg,generics);
-
-        ArgumentList args = convert(newExpression.argumentList());
-        ArrayList<RefTypeOrTPHOrWildcardOrGeneric> argTypes = args.getArguments().stream()
-        		.map(x -> TypePlaceholder.fresh(newExpression.getStart()))
-        		.collect(Collectors.toCollection(ArrayList::new));
-        Statement ret = new NewClass(newClass, args, null, argTypes, newExpression.getStart());
-        ret.setStatement();
-        return ret;
+    private Statement convert(Java8Parser.ClassInstanceCreationExpressionContext stmt) {
+        //TODO
+        throw new NotImplementedException();
    }

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

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

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

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

    private Statement convert(Java8Parser.AssignmentContext stmt) {
        AssignLeftSide leftHandSide = convert(stmt.leftHandSide());
-        Statement ret = new Assign(leftHandSide, convert(stmt.expression()), stmt.getStart());
-        ret.setStatement();
-        return ret;
+        return new Assign(leftHandSide, convert(stmt.expression()), stmt.getStart());
    }

    private AssignLeftSide convert(Java8Parser.LeftHandSideContext leftHandSide) {
@@ -359,10 +307,8 @@ public class StatementGenerator {
    }

    private Statement convert(Java8Parser.IfThenElseStatementContext stmt){
-        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());
+        //TODO
+        throw new NotImplementedException();
    }

    private Statement convert(Java8Parser.IfThenElseStatementNoShortIfContext stmt){
@@ -488,7 +434,7 @@ public class StatementGenerator {
        }
        return (new Assign(new AssignToField(
                new FieldVar(new This(varDecl.getStart()), name.getText(),
-                        type, varDecl.getStart())),
+                        new Void(varDecl.getStart()), varDecl.getStart())),
                initValue, name.getSymbol()));
    }

@@ -586,7 +532,8 @@ public class StatementGenerator {
        if(expression.conditionalOrExpression() == null){
            return convert(expression.conditionalAndExpression());
        }else{
-            throw new NotImplementedException();
+            return new Binary(convert(expression.conditionalOrExpression()),
+                    convert(expression.conditionalAndExpression()), Binary.Operator.OR);
        }
    }

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

@@ -626,55 +574,16 @@ public class StatementGenerator {
        if(expression.equalityExpression() == null){
            return convert(expression.relationalExpression());
        }else{
-            String operator = expression.getChild(1).getText();
-            Expression leftSide = convert(expression.equalityExpression());
-            Expression rightSide = convert(expression.relationalExpression());
-            return new BinaryExpr(convertBinaryOperator(operator), TypePlaceholder.fresh(expression.getStart()), leftSide, rightSide, expression.getStart());
+            throw new NotImplementedException();
        }
    }

    private Expression convert(Java8Parser.RelationalExpressionContext expression) {
        if(expression.relationalExpression() == null){
            return convert(expression.shiftExpression());
-        }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 if(operator.equals("==")) {
-                return BinaryExpr.Operator.EQUAL;
-    		} else if(operator.equals("!=")) {
-                return BinaryExpr.Operator.NOTEQUAL;
        }else{
            throw new NotImplementedException();
        }
-//    		throw new NotImplementedException();
    }

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

    private Expression convert(Java8Parser.AdditiveExpressionContext expression) {
-
        if(expression.additiveExpression() == null){
            return convert(expression.multiplicativeExpression());
        }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);
+            throw new NotImplementedException();
        }
    }

@@ -702,11 +606,7 @@ public class StatementGenerator {
        if(expression.multiplicativeExpression() == null){
            return convert(expression.unaryExpression());
        }else{
-        		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);
+            throw new NotImplementedException();
        }
    }

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

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

        return expr;
@@ -794,7 +692,6 @@ public class StatementGenerator {
        if(e.classInstanceCreationExpression_lf_primary() != null){
            throw new NotImplementedException();
        }else if(e.fieldAccess_lf_primary() != null){
-            
            throw new NotImplementedException();
        }else if(e.arrayAccess_lf_primary() != null){
            throw new NotImplementedException();
@@ -803,11 +700,7 @@ public class StatementGenerator {
        }else {
            Java8Parser.MethodInvocation_lf_primaryContext ctxt = e.methodInvocation_lf_primary();
            String methodName = ctxt.Identifier().toString();
-            ArrayList<RefTypeOrTPHOrWildcardOrGeneric> argTypes = ctxt.argumentList().expression().stream()
-            		.map(x -> TypePlaceholder.fresh(e.getStart()))
-            		.collect(Collectors.toCollection(ArrayList::new));
-            return new MethodCall(TypePlaceholder.fresh(e.getStart()), getReceiver(expr), methodName, 
-            		convert(ctxt.argumentList()), TypePlaceholder.fresh(e.getStart()), argTypes, e.getStart());
+            return new MethodCall(TypePlaceholder.fresh(e.getStart()), new Receiver(expr), methodName, convert(ctxt.argumentList()), e.getStart());
        }
    }

@@ -853,6 +746,8 @@ public class StatementGenerator {
        if(newExpression.typeArgumentsOrDiamond()!= null){
            if(newExpression.typeArgumentsOrDiamond().typeArguments()!=null){
                genericArgs = newExpression.typeArgumentsOrDiamond().typeArguments();
+            }else {
+                throw new NotImplementedException();
            }
        }
        if(newExpression.typeArguments()!= null)throw new NotImplementedException();
@@ -861,40 +756,31 @@ public class StatementGenerator {
        RefType newClass = (RefType) TypeGenerator.convertTypeName(identifier.getText(),genericArgs,identifier.getSymbol(),reg,generics);

        ArgumentList args = convert(newExpression.argumentList());
-        ArrayList<RefTypeOrTPHOrWildcardOrGeneric> argTypes = args.getArguments().stream()
-        		.map(x -> TypePlaceholder.fresh(newExpression.getStart()))
-        		.collect(Collectors.toCollection(ArrayList::new));
-        return new NewClass(newClass, args, null, argTypes, newExpression.getStart());
+        return new NewClass(newClass, args, newExpression.getStart());
    }

    private Expression convert(Java8Parser.LiteralContext literal) {
-        if(literal.IntegerLiteral() != null){
-            Number value = Integer.parseInt(literal.IntegerLiteral().getText());
-            return new Literal(TypePlaceholder.fresh(literal.getStart()),
-                    value, literal.getStart());
-        } else if(literal.FloatingPointLiteral()!= null){
-            Number value = Double.parseDouble(literal.FloatingPointLiteral().getText());
-            return new Literal(TypePlaceholder.fresh(literal.getStart()),
+        if(literal.IntegerLiteral() != null || literal.FloatingPointLiteral()!= null){
+            Number value = Double.parseDouble(literal.IntegerLiteral().getText());
+            return new NumberLiteral(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 Literal(type,
+            return new BoolLiteral(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 Literal(type,
-            			// das gibt immer ' zurück, der Char befindet sich in Position 1 
-        				//literal.CharacterLiteral().getText().charAt(0),
-                    literal.CharacterLiteral().getText().charAt(1),
+            return new CharLiteral(type,
+                    literal.CharacterLiteral().getText().charAt(0),
                    literal.getStart());
        }else if(literal.StringLiteral()!=null){
            RefType type = new RefType(reg.getName("java.lang.String"),literal.getStart());
-            return new Literal(type,
-                    literal.StringLiteral().getText().substring(1,  literal.StringLiteral().getText().length()-1),
+            return new StringLiteral(type,
+                    literal.StringLiteral().getText(),
                    literal.getStart());
        }else  if(literal.NullLiteral() != null){
-            return new Literal(TypePlaceholder.fresh(literal.getStart()), null,
+            return new Null(TypePlaceholder.fresh(literal.getStart()),
                    literal.getStart());
        }else {
            throw new NotImplementedException();
@@ -922,12 +808,7 @@ public class StatementGenerator {
        }

        ArgumentList argumentList = convert(methodInvocationContext.argumentList());
-        ArrayList<RefTypeOrTPHOrWildcardOrGeneric> argTypes = argumentList.getArguments().stream()
-        		.map(x -> TypePlaceholder.fresh(methodInvocationContext.getStart()))
-        		.collect(Collectors.toCollection(ArrayList::new));
-        MethodCall ret = new MethodCall(TypePlaceholder.fresh(methodInvocationContext.getStart()), 
-        		getReceiver(receiver), name, argumentList, TypePlaceholder.fresh(methodInvocationContext.getStart()),
-        		argTypes, methodInvocationContext.getStart());
+        MethodCall ret = new MethodCall(TypePlaceholder.fresh(methodInvocationContext.getStart()), new Receiver(receiver), name, argumentList, methodInvocationContext.getStart());
        return ret;
    }

@@ -951,7 +832,7 @@ public class StatementGenerator {
        for(FormalParameter param : params.getFormalparalist()){
            lambdaLocals.put(param.getName(), param.getType());
        }
-        StatementGenerator lambdaGenerator = new StatementGenerator(reg, generics, fields, lambdaLocals);
+        StatementGenerator lambdaGenerator = new StatementGenerator(reg, generics, lambdaLocals);

        Block block;
        if(expression.lambdaBody().expression() != null){
@@ -960,7 +841,7 @@ public class StatementGenerator {
                    expression.lambdaBody().expression().getStart()));
            block = new Block(statements, expression.lambdaBody().getStart());
        }else{
-            block = lambdaGenerator.convert(expression.lambdaBody().block(), true);
+            block = lambdaGenerator.convert(expression.lambdaBody().block());
        }
        List<RefTypeOrTPHOrWildcardOrGeneric> funNParams = new ArrayList<>();
        funNParams.add(TypePlaceholder.fresh(expression.getStart()));//ret-Type
@@ -1,9 +1,6 @@
 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;
@@ -13,27 +10,22 @@ public class SyntacticSugar {
    public static List<Statement> addTrailingReturn(List<Statement> statements){
        if(statements.size()!=0) {
            Statement lastStmt = statements.get(statements.size() - 1);
-            ReturnFinder hasReturn = new ReturnFinder();
-            lastStmt.accept(hasReturn);
-            if(hasReturn.hasReturn)return statements;
+            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 {
+            }
        }
        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;
@@ -1,13 +1,9 @@
 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.NullToken;
 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;
@@ -19,10 +15,9 @@ import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;

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

 //import jdk.internal.dynalink.support.TypeConverterFactory;
 import org.antlr.v4.runtime.CommonToken;
@@ -33,10 +28,9 @@ public class SyntaxTreeGenerator{
  private JavaClassRegistry reg;
  private final GenericsRegistry globalGenerics;
  private String pkgName = "";
-  Set<JavaClassName> imports = new HashSet();
-  private Map<String, RefTypeOrTPHOrWildcardOrGeneric> fields = new HashMap<>(); //PL 2018-11-01 fields eingefuegt, damit die fields immer die gleiche TPH bekommen
+  List<JavaClassName> imports = new ArrayList();

-  List<Statement> fieldInitializations = new ArrayList<>(); //PL 2019-10-23: Muss für jede Klasse neu initilisiert werden
+  List<Statement> fieldInitializations = new ArrayList<>();

  public SyntaxTreeGenerator(JavaClassRegistry reg, GenericsRegistry globalGenerics){
    //Die Generics müssen während des Bauens des AST erstellt werden,
@@ -75,11 +69,56 @@ public class SyntaxTreeGenerator{
    return ret;
  }
  
-  public SourceFile convert(Java8Parser.CompilationUnitContext ctx, PackageCrawler packageCrawler, ClassLoader classLoader) throws ClassNotFoundException{
-    if(ctx.packageDeclaration()!=null)this.pkgName = convert(ctx.packageDeclaration());
+  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{
    List<ClassOrInterface> classes = new ArrayList<>();
-    Map<String, Integer> imports = GatherNames.getImports(ctx, packageCrawler, classLoader);
-    this.imports = imports.keySet().stream().map(name -> reg.getName(name)).collect(Collectors.toSet());
+    this.setImports(ctx);
    for(Java8Parser.TypeDeclarationContext typeDecl : ctx.typeDeclaration()){
      ClassOrInterface newClass;
      if(typeDecl.classDeclaration() != null){
@@ -93,15 +132,6 @@ 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());
@@ -124,7 +154,7 @@ public class SyntaxTreeGenerator{
  private Method convert(int modifiers, Java8Parser.MethodHeaderContext header, Java8Parser.MethodBodyContext body,
                         JavaClassName parentClass, RefType superClass, GenericsRegistry localGenerics) {

-    StatementGenerator stmtGen = new StatementGenerator(reg, localGenerics, fields, new HashMap<>());
+    StatementGenerator stmtGen = new StatementGenerator(reg, localGenerics, new HashMap<>());

    String name = header.methodDeclarator().Identifier().getText();
    GenericDeclarationList gtvDeclarations = new GenericDeclarationList(new ArrayList<>(), header.getStart());
@@ -149,18 +179,17 @@ public class SyntaxTreeGenerator{
        //TODO: Error! Abstrakte Methode ohne abstrakt Keyword
      }
    }else{
-      block = stmtGen.convert(body.block(),true);
+      block = stmtGen.convert(body.block());
    }
    if(parentClass.equals(new JavaClassName(name))){
-      return new Constructor(modifiers, name, retType, parameterList, block, gtvDeclarations, header.getStart() /*, fieldInitializations geloescht PL 2018-11-24 */);
+      return new Constructor(modifiers, name, retType, modifiers, parameterList, block, gtvDeclarations, header.getStart(), fieldInitializations, superClass);
    }else{
-      return new Method(modifiers, name, retType, parameterList,block, gtvDeclarations, header.getStart());
+      return new Method(modifiers, name, retType, modifiers, parameterList,block, gtvDeclarations, header.getStart());
    }
  }

  private ClassOrInterface convertClass(Java8Parser.ClassDeclarationContext ctx) {
    ClassOrInterface newClass;
-    fieldInitializations = new ArrayList<>(); //PL 2019-10-22: muss für jede Klasse neu initilisiert werden
    if(ctx.normalClassDeclaration() != null){
      newClass = convertNormal(ctx.normalClassDeclaration());
    }
@@ -178,12 +207,7 @@ public class SyntaxTreeGenerator{
        modifiers += newModifier;
      }
    }
-    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());
-    }
+    JavaClassName name = reg.getName(ctx.Identifier().getText());
    GenericsRegistry generics = createGenerics(ctx.typeParameters(), name, "", reg, new GenericsRegistry(globalGenerics));
    Token offset = ctx.getStart();
    GenericDeclarationList genericClassParameters;
@@ -196,22 +220,17 @@ public class SyntaxTreeGenerator{
    if(ctx.superclass() != null){
      superClass = convert(ctx.superclass());
    }else{
-      superClass = new RefType(ASTFactory.createObjectClass().getClassName(), ctx.getStart());
+      superClass = ASTFactory.createObjectClass().getType();
    }
    List<Field> fielddecl = convertFields(ctx.classBody(), generics);
-    //fieldInitializations = generateFieldInitializations(ctx.classBody(), generics);
-    List<Method> methodsAndConstructors = convertMethods(ctx.classBody(), name, superClass, generics);
-    List<Method> methods = new ArrayList<>();
+    List<Method> methods = convertMethods(ctx.classBody(), name, superClass, generics);
    List<Constructor> konstruktoren = new ArrayList<>();
-    //int noOfMethods = methods.size();
-    for(int i = 0; i < methodsAndConstructors.size(); i++){
-      Method m = methodsAndConstructors.get(i);
+    for(int i = 0; i<methods.size();i++){
+      Method m = methods.get(i);
      if(m instanceof Constructor){
+        methods.remove(i);
        konstruktoren.add((Constructor) m);
      }
-      else {
-    	  methods.add(m);
-      }
    }
    if(konstruktoren.size()<1){//Standardkonstruktor anfügen:
      konstruktoren.add(
@@ -222,49 +241,20 @@ public class SyntaxTreeGenerator{
    }

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

-  /*
-  private List<Statement> generateFieldInitializations(Java8Parser.ClassBodyContext classBodyContext, GenericsRegistry generics) {
-    List<Statement> ret = new ArrayList<>();
-    for(Java8Parser.ClassBodyDeclarationContext classMember : classBodyContext.classBodyDeclaration()){
-      if(classMember.classMemberDeclaration() != null){
-        Java8Parser.ClassMemberDeclarationContext classMemberDeclarationContext = classMember.classMemberDeclaration();
-        if(classMemberDeclarationContext.fieldDeclaration() != null
-                && classMemberDeclarationContext.fieldDeclaration().variableDeclaratorList() != null){
-          for(Java8Parser.VariableDeclaratorContext ctx : classMemberDeclarationContext.fieldDeclaration().variableDeclaratorList().variableDeclarator()) {
-            String fieldName = ctx.variableDeclaratorId().Identifier().getText();
-            if(ctx.variableDeclaratorId().dims() != null)throw new NotImplementedException();
-            Token offset = ctx.getStart();
-            RefTypeOrTPHOrWildcardOrGeneric fieldType;
-            for(Field f : fields)
-            AssignToField leftSide = new AssignToField(new FieldVar(new This(offset), fieldName, ));
-            ret.addAll();
-          }
-        }else if(classMemberDeclarationContext.methodDeclaration()!= null){
-          //Do nothing!
-        }
-      }
-    }
-    return ret;
-  }
-*/
-
-  private List<RefType> convert(Java8Parser.SuperinterfacesContext ctx, GenericsRegistry generics) {
+  private List<RefTypeOrTPHOrWildcardOrGeneric> convert(Java8Parser.SuperinterfacesContext ctx, GenericsRegistry generics) {
    if(ctx == null)return new ArrayList<>();
    return convert(ctx.interfaceTypeList(), generics);
  }

-  private List<RefType> convert(Java8Parser.InterfaceTypeListContext ctx, GenericsRegistry generics) {
-    List<RefType> ret = new ArrayList<>();
+  private List<RefTypeOrTPHOrWildcardOrGeneric> convert(Java8Parser.InterfaceTypeListContext ctx, GenericsRegistry generics) {
+    List<RefTypeOrTPHOrWildcardOrGeneric> ret = new ArrayList<>();
    for(Java8Parser.InterfaceTypeContext interfaceType : ctx.interfaceType()){
-      ret.add((RefType) TypeGenerator.convert(interfaceType.classType(), reg, generics));
+      ret.add(TypeGenerator.convert(interfaceType.classType(), reg, generics));
    }
    return ret;
  }
@@ -274,31 +264,14 @@ 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, params, block, classGenerics, offset /*, fieldInitializations geloescht PL 2018-11-24 */);
-  }
-  
-  /* fieldInitializations werden in einem Psedokonstruktor in der abstrakten Syntax gespeichert */
-  private Constructor generatePseudoConstructor(String className, JavaClassName parentClass, RefType superClass, GenericDeclarationList classGenerics, Token offset){
-	    RefType classType = ClassOrInterface.generateTypeOfClass(reg.getName(className), classGenerics, offset);
-	    ParameterList params = new ParameterList(new ArrayList<>(), offset); 
-	    Block block = new Block(new ArrayList<>(fieldInitializations), offset);
-	    return new Constructor(Modifier.PUBLIC, className, classType, params, block, classGenerics, offset /*, fieldInitializations geloescht PL 2018-11-24 */);
+    return new Constructor(Modifier.PUBLIC, className, classType, modifiers, params, block, classGenerics, offset, fieldInitializations, superClass);
  }

  private RefType convert(Java8Parser.SuperclassContext superclass) {
-    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,
@@ -356,20 +329,20 @@ public class SyntaxTreeGenerator{
      modifiers+=(convert(fieldModifierContext));
    }
    RefTypeOrTPHOrWildcardOrGeneric fieldType;
-    if(fieldDeclarationContext.unannTypeOrAuto() != null
-            && fieldDeclarationContext.unannTypeOrAuto().unannType() != null){
-      fieldType = TypeGenerator.convert(fieldDeclarationContext.unannTypeOrAuto().unannType(), reg, generics);
+    if(fieldDeclarationContext.unannType() != null){
+      fieldType = TypeGenerator.convert(fieldDeclarationContext.unannType(), reg, generics);
    }else{
-      fieldType = TypePlaceholder.fresh(fieldDeclarationContext.variableDeclaratorList().getStart()); //PL 2019-12-06: variableDeclaratorList() eingefuegt, um als Token nicht die Modifier zu bekommen
+      fieldType = TypePlaceholder.fresh(fieldDeclarationContext.getStart());
    }
    for(Java8Parser.VariableDeclaratorContext varCtx : fieldDeclarationContext.variableDeclaratorList().variableDeclarator()){
      String fieldName = convert(varCtx.variableDeclaratorId());
-      fields.put(fieldName, fieldType);
      if(varCtx.variableInitializer() != null){
        initializeField(varCtx, fieldType, generics);
      }
+      else{
        ret.add(new Field(fieldName,fieldType,modifiers,varCtx.getStart()));
      }
+    }
    return ret;
  }

@@ -379,7 +352,7 @@ public class SyntaxTreeGenerator{

  // Initialize a field by creating implicit constructor.
  private void initializeField(Java8Parser.VariableDeclaratorContext ctx, RefTypeOrTPHOrWildcardOrGeneric typeOfField, GenericsRegistry generics){
-    StatementGenerator statementGenerator = new StatementGenerator(reg, generics, fields, new HashMap<>());
+    StatementGenerator statementGenerator = new StatementGenerator(reg, generics, new HashMap<>());
    fieldInitializations.add(statementGenerator.generateFieldAssignment(ctx, typeOfField));
  }

@@ -439,8 +412,6 @@ 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));
@@ -451,14 +422,14 @@ public class SyntaxTreeGenerator{
    }else{
      genericParams = createEmptyGenericDeclarationList(ctx.Identifier());
    }
-    RefType superClass = ASTFactory.createObjectType();
+    RefType superClass = ASTFactory.createObjectClass().getType();

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

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

-    return new ClassOrInterface(modifiers, name, fields, Optional.empty(), methods, new ArrayList<>(),
+    return new ClassOrInterface(modifiers, name, fields, methods, new ArrayList<>(),
            genericParams, superClass, true, extendedInterfaces, ctx.getStart());
  }

@@ -473,16 +444,13 @@ 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<RefType> convert(Java8Parser.ExtendsInterfacesContext extendsInterfacesContext, GenericsRegistry generics) {
+  private List<RefTypeOrTPHOrWildcardOrGeneric> convert(Java8Parser.ExtendsInterfacesContext extendsInterfacesContext, GenericsRegistry generics) {
    if(extendsInterfacesContext == null)return new ArrayList<>();
    return convert(extendsInterfacesContext.interfaceTypeList(), generics);
  }
@@ -3,81 +3,46 @@ 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.antlr.Java8Parser.UnannClassType_lfno_unannClassOrInterfaceTypeContext;
+import de.dhbwstuttgart.parser.scope.GenericTypeName;
 import de.dhbwstuttgart.parser.scope.GenericsRegistry;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
 import de.dhbwstuttgart.syntaxtree.GenericDeclarationList;
 import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
 import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
-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 org.antlr.v4.runtime.Token;

 import java.util.ArrayList;
 import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;

 public class TypeGenerator {

    public static RefTypeOrTPHOrWildcardOrGeneric convert(Java8Parser.UnannClassOrInterfaceTypeContext unannClassOrInterfaceTypeContext, JavaClassRegistry reg, GenericsRegistry generics) {
-        Java8Parser.TypeArgumentsContext arguments=null;
-        /* PL 2019-03-19 auskommentiert ANFANG
+        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();
-        }
-         PL 2019-03-19 auskommentiert ENDE */
-        /**
-         * 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
-            /* Fuer Debug-Zwecke
-            unannClassOrInterfaceTypeContext.unannInterfaceType_lfno_unannClassOrInterfaceType();
-            unannClassOrInterfaceTypeContext.unannClassType_lfno_unannClassOrInterfaceType().getText();
-            //unannClassOrInterfaceTypeContext.unannInterfaceType_lfno_unannClassOrInterfaceType().unannClassType_lfno_unannClassOrInterfaceType().typeArguments();
-            //UnannClassType_lfno_unannClassOrInterfaceTypeContext
-            unannClassOrInterfaceTypeContext.unannClassType_lf_unannClassOrInterfaceType(0);
-            unannClassOrInterfaceTypeContext.unannClassType_lf_unannClassOrInterfaceType(0).getText();
-            unannClassOrInterfaceTypeContext.unannClassType_lf_unannClassOrInterfaceType(1);
-            unannClassOrInterfaceTypeContext.unannClassType_lf_unannClassOrInterfaceType(1).getText();
-            unannClassOrInterfaceTypeContext.unannClassType_lfno_unannClassOrInterfaceType().getText();
-            //unannClassOrInterfaceTypeContext.unannInterfaceType_lf_unannClassOrInterfaceType();
-            //unannClassOrInterfaceTypeContext.unannInterfaceType_lf_unannClassOrInterfaceType(0).getText();
-            //unannClassOrInterfaceTypeContext.unannInterfaceType_lf_unannClassOrInterfaceType(1).getText();
-            //unannClassOrInterfaceTypeContext.unannInterfaceType_lfno_unannClassOrInterfaceType().getText();
-             */
-            int lastElement = new ArrayList<>(unannClassOrInterfaceTypeContext.unannClassType_lf_unannClassOrInterfaceType()).size()-1;
-            if (lastElement >=0) {//qualifizierter Name z.B.: java.util.Vector
-            	arguments = unannClassOrInterfaceTypeContext.unannClassType_lf_unannClassOrInterfaceType(lastElement).typeArguments();
-            }
-            else { //unqualifizierter Name z.B.: Vector
-            	arguments = unannClassOrInterfaceTypeContext.unannClassType_lfno_unannClassOrInterfaceType().typeArguments();
-            }
        }
        return convertTypeName(name, arguments, unannClassOrInterfaceTypeContext.getStart(), reg, generics);
    }

    public static RefTypeOrTPHOrWildcardOrGeneric convert(Java8Parser.UnannTypeContext unannTypeContext, JavaClassRegistry reg, GenericsRegistry genericsRegistry) {
        if(unannTypeContext.unannPrimitiveType()!=null){
-            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){
@@ -104,14 +69,15 @@ 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(name, bounds, typeParameter.getStart(), typeParameter.getStop());
+        GenericTypeVar ret = new GenericTypeVar(new GenericTypeName(new GenericContext(parentClass, parentMethod), name), bounds, typeParameter.getStart(), typeParameter.getStop());
+        generics.put(name, new GenericContext(parentClass, parentMethod));
        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.createObjectType());
+            ret.add(ASTFactory.createObjectClass().getType());
            return ret;
        }
        if(typeBoundContext.typeVariable() != null){
@@ -119,7 +85,7 @@ public class TypeGenerator {
            return ret;
        }
        if(typeBoundContext.classOrInterfaceType() != null){
-            ret.add(convert(typeBoundContext.classOrInterfaceType(), reg, generics));
+            ret.add(convert(typeBoundContext.classOrInterfaceType()));
            if(typeBoundContext.additionalBound() != null)
                for(Java8Parser.AdditionalBoundContext addCtx : typeBoundContext.additionalBound()){
                    ret.add(convert(addCtx.interfaceType()));
@@ -130,19 +96,8 @@ public class TypeGenerator {
        }
    }

-    private static RefTypeOrTPHOrWildcardOrGeneric convert(Java8Parser.ClassOrInterfaceTypeContext classOrInterfaceTypeContext, JavaClassRegistry reg, GenericsRegistry generics) {
-        Java8Parser.ClassType_lfno_classOrInterfaceTypeContext ctx = classOrInterfaceTypeContext.classType_lfno_classOrInterfaceType();
-        if(ctx.typeArguments() != null &&
-                classOrInterfaceTypeContext.classType_lf_classOrInterfaceType().size() > 0)
+    private static RefTypeOrTPHOrWildcardOrGeneric convert(Java8Parser.ClassOrInterfaceTypeContext classOrInterfaceTypeContext) {
        throw new NotImplementedException();
-        String typeName = ctx.Identifier().toString();
-        Java8Parser.ClassType_lf_classOrInterfaceTypeContext nextCtx = null;
-        for(Java8Parser.ClassType_lf_classOrInterfaceTypeContext forEachCtx : classOrInterfaceTypeContext.classType_lf_classOrInterfaceType()){
-            nextCtx = forEachCtx;
-            typeName += "." + forEachCtx.Identifier().toString();
-        }
-        Java8Parser.TypeArgumentsContext arguments = nextCtx!=null?nextCtx.typeArguments():ctx.typeArguments();
-        return convertTypeName(typeName, arguments, classOrInterfaceTypeContext.getStart(), reg, generics);
    }

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

    public static RefTypeOrTPHOrWildcardOrGeneric convert(Java8Parser.ReferenceTypeContext referenceTypeContext, JavaClassRegistry reg, GenericsRegistry 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 convert(Java8Parser.WildcardContext wildcardContext, JavaClassRegistry reg, GenericsRegistry generics) {
-        if(wildcardContext.wildcardBounds() != null){
-            if(wildcardContext.wildcardBounds().getText().substring(0, 7).equals("extends")){
-                return new ExtendsWildcardType(convert(wildcardContext.wildcardBounds().referenceType(), reg, generics), wildcardContext.getStart());
-            }else{
-            	return new SuperWildcardType(convert(wildcardContext.wildcardBounds().referenceType(), reg, generics), wildcardContext.getStart());
-            }
-        }else{
-            throw new NotImplementedException(); //Wildcard ohne Bound
-        }
+        return convertTypeName(referenceTypeContext.getText(), referenceTypeContext.getStart(), reg, generics);
    }

    public static RefTypeOrTPHOrWildcardOrGeneric convertTypeName(String name, Token offset, JavaClassRegistry reg, GenericsRegistry generics){
@@ -179,24 +114,15 @@ public class TypeGenerator {

    public static RefTypeOrTPHOrWildcardOrGeneric convertTypeName(
            String name, Java8Parser.TypeArgumentsContext typeArguments, Token offset, JavaClassRegistry reg, GenericsRegistry generics){
-        if(!reg.contains(name)){ //Dann könnte es ein generischer Type oder ein FunN$$-Type sein
+        if(!reg.contains(name)){ //Dann könnte es ein Generische Type sein
            if(generics.contains(name)){
-                return new GenericRefType(name, offset);
-            }else{
-            Pattern p = Pattern.compile("Fun(\\d+)[$][$]");
-            Matcher m = p.matcher(name);
-            if (m.matches()) {//es ist FunN$$-Type 
-                return new RefType(new JavaClassName(name), convert(typeArguments, reg, generics), offset);
+                return new GenericRefType(new GenericTypeName(generics.get(name),name), offset);
            }else{
                throw new TypeinferenceException("Der Typ "+ name + " ist nicht vorhanden",offset);
-            }}
+            }
        }
        if(typeArguments == null){
-            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);
+            return new RefType(reg.getName(name), offset);
        }else{
            return new RefType(reg.getName(name), convert(typeArguments, reg, generics), offset);
        }
@@ -207,7 +133,7 @@ public class TypeGenerator {
        List<RefTypeOrTPHOrWildcardOrGeneric> ret = new ArrayList<>();
        for(Java8Parser.TypeArgumentContext arg : typeArguments.typeArgumentList().typeArgument()){
            if(arg.wildcard() != null){
-            	ret.add(convert(arg.wildcard(), reg, generics));
+                throw new NotImplementedException();
            }else{
                ret.add(convert(arg.referenceType(), reg, generics));
            }
@@ -109,6 +109,7 @@ classOrInterfaceType
 		|	interfaceType_lfno_classOrInterfaceType
 		)
 		(	classType_lf_classOrInterfaceType
+		|	interfaceType_lf_classOrInterfaceType
 		)*
 	;

@@ -332,7 +333,7 @@ classMemberDeclaration
 	;

 fieldDeclaration
-	:	fieldModifier* unannTypeOrAuto? variableDeclaratorList ';'
+	:	fieldModifier* unannType? variableDeclaratorList ';'
 	;

 fieldModifier
@@ -1738,7 +1739,6 @@ Identifier
 	:	JavaLetter JavaLetterOrDigit*
 	;

-
 fragment
 JavaLetter
 	:	[a-zA-Z$_] // these are the "java letters" below 0x7F
@@ -1,13 +1,11 @@
 package de.dhbwstuttgart.parser.scope;

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

 import de.dhbwstuttgart.parser.antlr.Java8BaseListener;
 import de.dhbwstuttgart.syntaxtree.AbstractASTWalker;
 import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
-import org.antlr.v4.runtime.tree.ParseTreeWalker;
 import org.antlr.v4.runtime.tree.TerminalNode;

 import de.dhbwstuttgart.environment.PackageCrawler;
@@ -15,8 +13,8 @@ import de.dhbwstuttgart.parser.antlr.Java8Parser;

 public class GatherNames {

-	  public static Map<String, Integer> getNames(Java8Parser.CompilationUnitContext ctx, PackageCrawler packages, ClassLoader classLoader) throws ClassNotFoundException{
-		  Map<String, Integer> ret = new HashMap<>();
+	  public static List<String> getNames(Java8Parser.CompilationUnitContext ctx, PackageCrawler packages) throws ClassNotFoundException{
+		  List<String> ret = new ArrayList<>();
 	    String pkgName = getPackageName(ctx);
 	    String nameString = "";
 	    for (Java8Parser.TypeDeclarationContext typeDecl : ctx.typeDeclaration()){
@@ -28,8 +26,6 @@ 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){
@@ -38,12 +34,12 @@ public class GatherNames {
 	            }
 	          }
 	          */
-	          ret.put(nameString, numGenerics);
+	          ret.add(nameString);
 	        }
 	      }
 	      else{
 	        if(typeDecl.classDeclaration().normalClassDeclaration() != null){
-	          if(!pkgName.isEmpty()){
+	          if(pkgName != ""){
 	            nameString = pkgName + "." + typeDecl.classDeclaration().normalClassDeclaration().Identifier().toString();
 	          }
 	          else{
@@ -57,34 +53,30 @@ public class GatherNames {
 	            }
 	          }
 	          */
-				int numGenerics = typeDecl.classDeclaration().normalClassDeclaration().typeParameters()!=null?
-						typeDecl.classDeclaration().normalClassDeclaration().typeParameters().typeParameterList().typeParameter().size():0;
-
-				ret.put(nameString, numGenerics);
+	          ret.add(nameString);
 	        }
 	      }
 	    }
-		  ret.putAll(getImports(ctx, packages, classLoader));
+	    ret.addAll(getImports(ctx, packages));
 	    return ret;
 	  }
 	  
-	public static Map<String, Integer> getImports(Java8Parser.CompilationUnitContext ctx, PackageCrawler packages, ClassLoader classLoader) throws ClassNotFoundException {
-		  Map<String, Integer> ret = new HashMap<>();
-		  //ret.putAll(packages.getClassNames("java.lang"));
+
+	  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()){
 	      if(importDeclCtx.singleTypeImportDeclaration() != null){
-	    	  Class cl = classLoader.loadClass(importDeclCtx.singleTypeImportDeclaration().typeName().getText());
-			  ret.put(cl.getName(), cl.getTypeParameters().length);
+	    	  ret.add(importDeclCtx.singleTypeImportDeclaration().typeName().getText());
 	      }
 	      else if(importDeclCtx.typeImportOnDemandDeclaration() != null){
-	    	  ret.putAll(packages.getClassNames(importDeclCtx.typeImportOnDemandDeclaration().packageOrTypeName().getText()));
+	    	  ret.addAll(packages.getClassNames(importDeclCtx.typeImportOnDemandDeclaration().packageOrTypeName().getText()));
 	      }
 	      else if(importDeclCtx.singleStaticImportDeclaration() != null){
-			  Class cl = classLoader.loadClass(importDeclCtx.singleStaticImportDeclaration().typeName().getText()+"."+importDeclCtx.singleStaticImportDeclaration().Identifier().getText());
-			  ret.put(cl.getName(), cl.getTypeParameters().length);
+	    	  ret.add(importDeclCtx.singleStaticImportDeclaration().typeName().getText()+"."+importDeclCtx.singleStaticImportDeclaration().Identifier().getText());
 	      }
 	      else{
-	    	  ret.putAll(packages.getClassNames(importDeclCtx.staticImportOnDemandDeclaration().typeName().getText()));
+	    	  ret.addAll(packages.getClassNames(importDeclCtx.staticImportOnDemandDeclaration().typeName().getText()));
 	      }
 	    }
 	    return ret;
@@ -0,0 +1,22 @@
+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();
+    }
+}
@@ -49,10 +49,8 @@ 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;
 	}

@@ -84,15 +82,7 @@ public class JavaClassName {

 	@Override
 	public String toString() {
-		return (packageName!=null ? packageName.toString() + "." : "") + name;
-	}
-
-	public String getPackageName() {
-		return (packageName!=null ? packageName.toString() : "");
-	}
-
-	public String getClassName(){
-		return name;
+		return (packageName!=null ? packageName.toString() : "") + name;
 	}
 }

@@ -138,9 +128,6 @@ class PackageName{
 		String ret = "";
 		if(names == null)return "";
 		for(String n : names)ret+=n+".";
-		if (ret != null && ret.length() > 0 && ret.charAt(ret.length() - 1) == '.') {
-			ret = ret.substring(0, ret.length() - 1);
-		}
 		return ret;
 	}
 }
@@ -8,16 +8,20 @@ import java.util.*;
 * Speichert die Klassen f�r einen bestimmten Projektscope
 */
 public class JavaClassRegistry {
-    final Map<JavaClassName, Integer> existingClasses = new HashMap<>();
+    final List<JavaClassName> existingClasses = new ArrayList<>();

-    public JavaClassRegistry(Map<String, Integer> initialNames){
-        for(String name : initialNames.keySet()){
-            existingClasses.put(new JavaClassName(name), initialNames.get(name));
+    public JavaClassRegistry(List<String> initialNames){
+        for(String name : initialNames){
+            existingClasses.add(new JavaClassName(name));
        }
    }
    
+    public void add(String className){
+        existingClasses.add(new JavaClassName(className));
+    }
+
    public JavaClassName getName(String className) {
-        for(JavaClassName name : existingClasses.keySet()){
+        for(JavaClassName name : existingClasses){
            if(name.equals(new JavaClassName(className)))return name;
        }
        throw new NotImplementedException();
@@ -30,7 +34,7 @@ public class JavaClassRegistry {

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

    public boolean contains(String whole) {
-        return existingClasses.containsKey(new JavaClassName(whole));
-    }
-
-    public int getNumberOfGenerics(String name) {
-        return existingClasses.get(new JavaClassName(name));
+        return existingClasses.contains(new JavaClassName(whole));
    }
 }
@@ -1,6 +1,10 @@
 package de.dhbwstuttgart.syntaxtree;

+import de.dhbwstuttgart.syntaxtree.statement.*;
+import de.dhbwstuttgart.syntaxtree.statement.literal.Literal;
+import de.dhbwstuttgart.syntaxtree.statement.literal.Null;
 import de.dhbwstuttgart.syntaxtree.type.*;
+import de.dhbwstuttgart.typeinference.constraints.Constraint;

 public interface ASTVisitor extends StatementVisitor{

@@ -1,10 +1,13 @@
 package de.dhbwstuttgart.syntaxtree;

+import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
 import de.dhbwstuttgart.syntaxtree.statement.*;
-import de.dhbwstuttgart.syntaxtree.statement.Literal;
+import de.dhbwstuttgart.syntaxtree.statement.literal.Literal;
+import de.dhbwstuttgart.syntaxtree.statement.literal.Null;
 import de.dhbwstuttgart.syntaxtree.type.*;

+import java.lang.reflect.Modifier;
 import java.util.Iterator;

 public abstract class AbstractASTWalker implements ASTVisitor{
@@ -34,7 +37,7 @@ public abstract class AbstractASTWalker implements ASTVisitor{

    @Override
    public void visit(FormalParameter formalParameter) {
-        formalParameter.getType().accept((ASTVisitor) this);
+        formalParameter.getType().accept(this);
    }

    @Override
@@ -58,7 +61,7 @@ public abstract class AbstractASTWalker implements ASTVisitor{
    }

    private void visitMethod(Method method){
-        method.getReturnType().accept(this);
+        method.getType().accept(this);
        method.getParameterList().accept(this);
        if(method.block != null)
            method.block.accept(this);
@@ -66,10 +69,10 @@ public abstract class AbstractASTWalker implements ASTVisitor{

    @Override
    public void visit(ParameterList formalParameters) {
-        Iterator<FormalParameter> it = formalParameters.getFormalparalist().iterator();
-        if(it.hasNext()){
-            while(it.hasNext()){
-                it.next().accept(this);
+        Iterator<FormalParameter> genericIterator = formalParameters.getFormalparalist().iterator();
+        if(genericIterator.hasNext()){
+            while(genericIterator.hasNext()){
+                genericIterator.next().accept(this);
            }
        }
    }
@@ -80,9 +83,6 @@ public abstract class AbstractASTWalker implements ASTVisitor{
        for(Field f : classOrInterface.getFieldDecl()){
            f.accept(this);
        }
-        for(Constructor c : classOrInterface.getConstructors()){
-            c.accept(this);
-        }
        for(Method m : classOrInterface.getMethods()){
            m.accept(this);
        }
@@ -105,6 +105,7 @@ public abstract class AbstractASTWalker implements ASTVisitor{

    @Override
    public void visit(TypePlaceholder typePlaceholder) {
+
    }

    @Override
@@ -114,6 +115,7 @@ public abstract class AbstractASTWalker implements ASTVisitor{

    @Override
    public void visit(GenericRefType genericRefType) {
+
    }

    @Override
@@ -126,11 +128,10 @@ public abstract class AbstractASTWalker implements ASTVisitor{
    public void visit(Assign assign) {
        assign.lefSide.accept(this);
        assign.rightSide.accept(this);
-        assign.rightSide.getType().accept((ASTVisitor) this);
    }

    @Override
-    public void visit(BinaryExpr binary) {
+    public void visit(Binary binary) {

    }

@@ -158,13 +159,12 @@ public abstract class AbstractASTWalker implements ASTVisitor{

    @Override
    public void visit(ForStmt forStmt) {
-        forStmt.body_Loop_block.accept(this);
+
    }

    @Override
    public void visit(IfStmt ifStmt) {
-        ifStmt.then_block.accept(this);
-        ifStmt.else_block.accept(this);
+
    }

    @Override
@@ -187,10 +187,8 @@ public abstract class AbstractASTWalker implements ASTVisitor{
    public void visit(MethodCall methodCall) {
        methodCall.receiver.accept(this);
        methodCall.getArgumentList().accept(this);
-        methodCall.getArgumentList().getArguments().forEach(a -> a.getType().accept((ASTVisitor) this));
    }

-    
    @Override
    public void visit(NewClass methodCall) {
        visit((MethodCall) methodCall);
@@ -202,19 +200,13 @@ public abstract class AbstractASTWalker implements ASTVisitor{
    }

    @Override
-    public void visit(ExpressionReceiver receiver) {
+    public void visit(Receiver receiver) {
        receiver.expr.accept(this);
    }

-    @Override
-    public void visit(UnaryExpr unaryExpr) {
-        unaryExpr.expr.accept(this);
-    }
-
    @Override
    public void visit(Return aReturn) {
        aReturn.retexpr.accept(this);
-        aReturn.getType().accept((ASTVisitor) this);
    }

    @Override
@@ -237,14 +229,24 @@ public abstract class AbstractASTWalker implements ASTVisitor{

    }

+    @Override
+    public void visit(UnaryPlus unaryPlus) {
+
+    }
+
    @Override
    public void visit(WhileStmt whileStmt) {
-        whileStmt.loopBlock.accept(this);
+
    }

    @Override
    public void visit(DoStmt whileStmt) {
-        whileStmt.loopBlock.accept(this);
+
+    }
+
+    @Override
+    public void visit(Null aNull) {
+
    }

    @Override
@@ -3,7 +3,6 @@ package de.dhbwstuttgart.syntaxtree;
 import de.dhbwstuttgart.core.IItemWithOffset;
 import de.dhbwstuttgart.exceptions.DebugException;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
-import de.dhbwstuttgart.syntaxtree.statement.Statement;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 import de.dhbwstuttgart.syntaxtree.visual.ASTPrinter;
@@ -13,37 +12,29 @@ import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;
 import org.antlr.v4.runtime.Token;

-import java.lang.reflect.Modifier;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
-import java.util.Optional;

 /**
 * Stellt jede Art von Klasse dar. Auch abstrakte Klassen und Interfaces
 */
 public class ClassOrInterface extends SyntaxTreeNode implements TypeScope{
-  private Boolean methodAdded = false; //wird benoetigt bei in JavaTXCompiler.getConstraints()
  protected int modifiers;
  protected JavaClassName name;
  private List<Field> fields = new ArrayList<>();
-  private Optional<Constructor> fieldInitializations; //PL 2018-11-24: Noetig, um Bytecode fuer initializators nur einmal zu erzeugen
  private List<Method> methods = new ArrayList<>();
  private GenericDeclarationList genericClassParameters;
  private RefType superClass;
  protected boolean isInterface;
-  private List<RefType> implementedInterfaces;
+  private List<? extends RefTypeOrTPHOrWildcardOrGeneric> implementedInterfaces;
  private List<Constructor> constructors;

-  
-  public ClassOrInterface(int modifiers, JavaClassName name, List<Field> fielddecl, Optional<Constructor> fieldInitializations, List<Method> methods, List<Constructor> constructors, GenericDeclarationList genericClassParameters,
-                          RefType superClass, Boolean isInterface, List<RefType> implementedInterfaces, Token offset){
+  public ClassOrInterface(int modifiers, JavaClassName name, List<Field> fielddecl, List<Method> methods, List<Constructor> constructors, GenericDeclarationList genericClassParameters,
+                          RefType superClass, Boolean isInterface, List<? extends RefTypeOrTPHOrWildcardOrGeneric> implementedInterfaces, Token offset){
    super(offset);
-    if(isInterface && !Modifier.isInterface(modifiers))modifiers += Modifier.INTERFACE;
      this.modifiers = modifiers;
      this.name = name;
      this.fields = fielddecl;
-      this.fieldInitializations= fieldInitializations;
    this.genericClassParameters = genericClassParameters;
      this.superClass = superClass;
    this.isInterface = isInterface;
@@ -52,33 +43,6 @@ public class ClassOrInterface extends SyntaxTreeNode implements TypeScope{
    this.constructors = constructors;
  }
  
-  /* erzeugt fuer Fields, Konstruktoren und Methoden neue ArrayList-Objekte 
-   * alle anderen Datenobjekte werden nur kopiert.
-   */
-  public ClassOrInterface(ClassOrInterface cl){
-	  super(cl.getOffset());
-	  this.modifiers = cl.modifiers;
-	  this.name = cl.name;
-	  this.fields = new ArrayList<>(cl.fields);
-	  this.fieldInitializations= cl.fieldInitializations;
-	  this.genericClassParameters = cl.genericClassParameters;
-	  this.superClass = cl.superClass;
-	  this.isInterface = cl.isInterface;
-	  this.implementedInterfaces = cl.implementedInterfaces;
-	  this.methods = new ArrayList<>(cl.methods);
-	  this.constructors = new ArrayList<>(cl.constructors);
-  }
-  
-  //Gets if it is added
-  public Boolean areMethodsAdded() {
-	  return methodAdded;
-  }
-  
-  //Sets that it is added
-  public void setMethodsAdded() {
-	methodAdded = true;	
-  }
-  
  // Gets class name
  public JavaClassName getClassName(){
    return this.name;
@@ -92,21 +56,14 @@ public class ClassOrInterface extends SyntaxTreeNode implements TypeScope{
  public List<Field> getFieldDecl(){
    return this.fields;
  }
-  
-  public Optional<Constructor> getfieldInitializations(){
-	    return this.fieldInitializations;
-	  }
-  
  public List<Method> getMethods(){
    return this.methods;
  }

-  /*
  public RefType getType() {
    return generateTypeOfClass(this.getClassName(), this.getGenerics(), this.getOffset());
  }
-  */
-  //TODO: Das hier ist ein Problem. Je nach Kontext wird hier ein anderer Typ benötigt
+
  public static RefType generateTypeOfClass(JavaClassName name, GenericDeclarationList genericsOfClass ,Token offset){
    //Hier wird immer ein generischer Typ generiert, also mit Type placeholdern
    List<RefTypeOrTPHOrWildcardOrGeneric> params = new ArrayList<>();
@@ -117,10 +74,6 @@ public class ClassOrInterface extends SyntaxTreeNode implements TypeScope{
    return new RefType(name, params, offset);
  }

-  /**
-   * Die Superklasse im Kontext dieser ClassOrInterface
-   * Das bedeutet, dass generische Variablen als GenericRefTypes dargestellt sind
-     */
  public RefType getSuperClass() {
    return superClass;
  }
@@ -142,12 +95,4 @@ public class ClassOrInterface extends SyntaxTreeNode implements TypeScope{
  public void accept(ASTVisitor visitor) {
    visitor.visit(this);
  }
-
-  public Collection<RefType> getSuperInterfaces() {
-    return implementedInterfaces;
-  }
-  
-  public String toString() {
-	  return this.name.toString() + this.genericClassParameters.toString();
-  }
 }
@@ -14,9 +14,9 @@ public class Constructor extends Method {


 	//TODO: Constructor braucht ein super-Statement
-	public Constructor(int modifier, String name, RefTypeOrTPHOrWildcardOrGeneric returnType, ParameterList parameterList, Block codeInsideConstructor,
-					   GenericDeclarationList gtvDeclarations, Token offset /*, List<Statement> fieldInitializations geloescht PL 2018-11-24 */) {
-		super(modifier, name, returnType, parameterList, /*codeInsideConstructor,*/ prepareBlock(codeInsideConstructor ) /*,fieldInitializations )geloescht PL 2018-11-24 )*/, gtvDeclarations, offset);
+	public Constructor(int modifier, String name, RefTypeOrTPHOrWildcardOrGeneric returnType, int modifiers, ParameterList parameterList, Block codeInsideConstructor,
+					   GenericDeclarationList gtvDeclarations, Token offset, List<Statement> fieldInitializations, RefType superClass) {
+		super(modifier, name, returnType, modifiers, parameterList, prepareBlock(codeInsideConstructor,fieldInitializations, superClass), gtvDeclarations, offset);

 	}

@@ -25,10 +25,9 @@ public class Constructor extends Method {
 	 *                                welche die Felder der zugehörigen Klasse dieses
 	 *                                Konstruktor initialisieren
 	 */
-	protected static Block prepareBlock(Block constructorBlock /*, List<Statement> fieldInitializations new ArrayList<>() geloescht PL 2018-11-24 */){
+	protected static Block prepareBlock(Block constructorBlock, List<Statement> fieldInitializations, RefType superClass){
 		List<Statement> statements = constructorBlock.getStatements();
-		statements.add(0, new SuperCall(null, null, constructorBlock.getOffset()));
-		/* statements.addAll(fieldInitializations); geloescht PL 2018-11-24 */
+		statements.add(0, new SuperCall(constructorBlock.getOffset()));
 		return new Block(statements, constructorBlock.getOffset());
 	}

@@ -7,7 +7,6 @@ import java.util.ArrayList;

 public class Field extends SyntaxTreeNode implements TypeScope{
 	
-	public final int modifier;
 	private String name;
 	private RefTypeOrTPHOrWildcardOrGeneric type;
    
@@ -15,7 +14,6 @@ public class Field extends SyntaxTreeNode implements TypeScope{
 		super(offset);
 		this.name = name;
 		this.type = type;
-		this.modifier = modifier;
 	}

  	public String getName(){
@@ -6,7 +6,7 @@ import org.antlr.v4.runtime.Token;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;

 /**
- * Eine Feldinitialisation steht für eine Felddeklaration mit gleichzeitiger Wertzuweisung
+ * Eine Feldinitialisation steht fÃ¼r eine Felddeklaration mit gleichzeitiger Wertzuweisung
 * Beispiel: 'public Feld FeldVar = FeldWert;'
 * @author janulrich
 *
@@ -17,7 +17,7 @@ public class FieldDeclaration extends Field{
 	
    /**
     * Dieser Konstruktor der FieldDeclaration erstellt den Syntaxknoten vollstÃ¤ndig.
-     * Kein nachträgliches hinzfügen von Informationen oder aufrufen von parserPostProcessing ist notwendig.
+     * Kein nachtrÃ¤gliches hinzfÃ¼gen von Informationen oder aufrufen von parserPostProcessing ist notwendig.
     */
    public FieldDeclaration(String name, RefTypeOrTPHOrWildcardOrGeneric typ, int modifier, Expression value, Token offset){
    	super(name, typ, modifier, offset);//Dieser Deklarator wird nicht vom Parser aufgerufen. Dadurch gibt es auch keinen Offset
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
JanUlrich	ed5cdd58d9	Reflections	2017-10-12 15:01:12 +02:00
JanUlrich	93a97984b5	reflections entfernen	2017-10-12 14:56:23 +02:00
JanUlrich	4b2a6f99bc	Added Junit	2017-10-12 14:49:47 +02:00
JanUlrich	72b5b01990	reflections source anfügen	2017-10-12 14:43:42 +02:00
Fayez Abu Alia	a5800382c2	Merge branch 'ohneMaven' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into ohneMaven	2017-10-12 14:39:25 +02:00
Fayez Abu Alia	a019eab6b2	asm and guava libraries	2017-10-12 14:38:43 +02:00
JanUlrich	611dc4b36b	ASM Library adden	2017-10-12 14:36:17 +02:00
JanUlrich	0830458ee2	Debug. Kein Maven, Librarys manuell anfügen	2017-10-12 14:33:08 +02:00