Final

Refactoring
2017-10-02 17:11:55 +02:00 · 2017-10-01 09:58:56 +02:00 · 2017-09-25 08:24:08 +02:00 · 2017-09-25 08:17:36 +02:00 · 2017-09-23 18:33:48 +02:00 · 2017-09-22 18:19:34 +02:00
132 changed files with 3071 additions and 1164 deletions
--- a/.classpath
+++ b/.classpath
@ -4,8 +4,18 @@
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="lib" path="lib/bcel-6.1-SNAPSHOT.jar" sourcepath="lib/bcel-6.1-SNAPSHOT-sources.jar"/>
-	<classpathentry kind="lib" path="lib/guava-10.0.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="lib/antlr-complete.jar"/>
+	<classpathentry kind="lib" path="lib/annotations-2.0.1.jar"/>
+	<classpathentry kind="lib" path="lib/bcel-6.1-SNAPSHOT-sources.jar"/>
+	<classpathentry kind="lib" path="lib/cloning.jar"/>
+	<classpathentry kind="lib" path="lib/commons-bcel6-6.0-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="lib/javassist-3.19.0-GA.jar"/>
+	<classpathentry kind="lib" path="lib/junit-4.0.jar"/>
+	<classpathentry kind="lib" path="lib/log4j-1.2.12.jar"/>
+	<classpathentry kind="lib" path="lib/reflections-0.9.10-javadoc.jar"/>
+	<classpathentry kind="lib" path="lib/reflections-0.9.10-sources.jar"/>
+	<classpathentry kind="lib" path="lib/reflections-0.9.10.jar" sourcepath="/reflections/src"/>
+	<classpathentry kind="lib" path="lib/guava-22.0.jar" sourcepath="lib/guava-22.0-sources.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
--- a/.idea/libraries/lib.xml
+++ b/.idea/libraries/lib.xml
@ -0,0 +1,22 @@
+<component name="libraryTable">
+  <library name="lib">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/log4j-1.2.12.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/guava-10.0.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/bcel-6.1-SNAPSHOT.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/bcel-6.1-SNAPSHOT-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/annotations-2.0.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/guava-15.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/junit-4.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/commons-bcel6-6.0-SNAPSHOT.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/reflections-0.9.10-javadoc.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/reflections-0.9.10.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/cloning.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javassist-3.19.0-GA.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/reflections-0.9.10-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/antlr-complete.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
--- a/classes/classes.iml
+++ b/classes/classes.iml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/typeinference/ResultSet.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/typeinference/ResultSet.html
@ -100,7 +100,7 @@ var activeTableTab = "activeTableTab";
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.typeinference.ResultSet</li>
+<li>de.dhbwstuttgart.typeinference.result.ResultSet</li>
 </ul>
 </li>
 </ul>
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/typeinference/class-use/ResultSet.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/typeinference/class-use/ResultSet.html
@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.typeinference.ResultSet</title>
+<title>Uses of Class de.dhbwstuttgart.typeinference.result.ResultSet</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.typeinference.ResultSet" class="title">Uses of Class<br>de.dhbwstuttgart.typeinference.ResultSet</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.typeinference.result.ResultSet" class="title">Uses of Class<br>de.dhbwstuttgart.typeinference.ResultSet</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
--- a/doc/Studienarbeiten/S2017_Jan-Elric_Neumann.pdf
+++ b/doc/Studienarbeiten/S2017_Jan-Elric_Neumann.pdf
--- a/doc/doc.iml
+++ b/doc/doc.iml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
--- a/src/JavaCompilerCore1.iml
+++ b/src/JavaCompilerCore1.iml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
--- a/src/de/dhbwstuttgart/core/ConsoleInterface.java
+++ b/src/de/dhbwstuttgart/core/ConsoleInterface.java
@ -1,8 +1,18 @@
 package de.dhbwstuttgart.core;

-
+import java.io.File;
+import java.io.IOException;
 import java.util.*;

 public class ConsoleInterface {
 	private static final String directory = System.getProperty("user.dir");
+
+	public static void main(String[] args) throws IOException, ClassNotFoundException {
+
+		JavaTXCompiler compiler = new JavaTXCompiler();
+		for(String arg : Arrays.asList(args)){
+			compiler.parse(new File(arg));
+		}
+		compiler.typeInference();
+	}
 }
--- a/src/de/dhbwstuttgart/core/JavaTXCompiler.java
+++ b/src/de/dhbwstuttgart/core/JavaTXCompiler.java
@ -1,53 +1,35 @@
 package de.dhbwstuttgart.core;

-import de.dhbwstuttgart.exceptions.DebugException;
-import de.dhbwstuttgart.parser.ClassNotFoundException;
 import de.dhbwstuttgart.parser.JavaTXParser;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
 import de.dhbwstuttgart.syntaxtree.SourceFile;
-import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
 import de.dhbwstuttgart.syntaxtree.factory.UnifyTypeFactory;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.typedeployment.TypeInsertFactory;
-import de.dhbwstuttgart.typedeployment.TypeInsertPoint;
-import de.dhbwstuttgart.typeinference.ResultSet;
 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.interfaces.IFiniteClosure;
 import de.dhbwstuttgart.typeinference.unify.model.FiniteClosure;
 import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
-import de.dhbwstuttgart.typeinference.unify.model.UnifyType;

 import java.io.File;
 import java.io.IOException;
 import java.util.*;
+import java.util.stream.Collectors;

 public class JavaTXCompiler {

-    private List<SourceFile> sourceFiles = new ArrayList<>();
+    protected List<SourceFile> sourceFiles = new ArrayList<>();

-    public List<TypeInsertPoint> getTypeInserts(File forFile){
-        ResultSet result = typeInference();
-        for(SourceFile sf : sourceFiles){
-            if(sf.getFile().equals(forFile)){
-                return TypeInsertFactory.createTypeInsertPoints(sf, result);
-            }
-        }
-        throw new DebugException("Die Datei "+forFile+" wurde nicht geparst");
-    }
-
-    public ResultSet typeInference(){
-        ConstraintSet<Pair> cons = new ConstraintSet<>();
+    public List<ResultSet> typeInference(){
        List<ClassOrInterface> allClasses = new ArrayList<>();
        for(SourceFile sf : sourceFiles){
            allClasses.addAll(sf.getClasses());
        }
        FiniteClosure finiteClosure = UnifyTypeFactory.generateFC(allClasses);
-        for(SourceFile sf : sourceFiles){
-            cons.addAll(sf.getConstraints(sf.getTypeInferenceInformation(sourceFiles)));
-        }
+        final ConstraintSet<Pair> cons = new TYPE(sourceFiles).getConstraints();
        ConstraintSet<UnifyPair> unifyCons = UnifyTypeFactory.convert(cons);

        TypeUnify unify = new TypeUnify();
@ -63,8 +45,9 @@ public class JavaTXCompiler {
            System.out.println("RESULT: " + result);
            results.addAll(result);
        }
-        return new ResultSet(UnifyTypeFactory.convert(results, generateTPHMap(cons)));
-    }
+        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<>();
@ -80,8 +63,16 @@ public class JavaTXCompiler {
        return ret;
    }

-    public void parse(File sourceFile) throws IOException, ClassNotFoundException {
-        sourceFiles.add(new JavaTXParser().parse(sourceFile));
+    public SourceFile parse(File sourceFile) throws IOException, java.lang.ClassNotFoundException {
+        SourceFile ret = new JavaTXParser().parse(sourceFile);
+        sourceFiles.add(ret);
+        return ret;
+    }
+
+    public SourceFile parse(String source) throws IOException, java.lang.ClassNotFoundException {
+        SourceFile ret = new JavaTXParser().parse(source);
+        sourceFiles.add(ret);
+        return ret;
    }

 }
--- a/src/de/dhbwstuttgart/parser/ClassNotFoundException.java
+++ b/src/de/dhbwstuttgart/parser/ClassNotFoundException.java
@ -1,4 +0,0 @@
-package de.dhbwstuttgart.parser;
-public class ClassNotFoundException extends Exception{
-  
-}
--- a/src/de/dhbwstuttgart/parser/JavaTXParser.java
+++ b/src/de/dhbwstuttgart/parser/JavaTXParser.java
@ -9,31 +9,30 @@ import org.antlr.v4.runtime.ANTLRInputStream;
 import org.antlr.v4.runtime.CommonTokenStream;

 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;

 public class JavaTXParser {
-    public SourceFile parse(File sourceFile) throws IOException, ClassNotFoundException {
-        InputStream stream = new FileInputStream(sourceFile);
+    public SourceFile parse(InputStream source) throws IOException, java.lang.ClassNotFoundException {
+        InputStream stream = source;//new FileInputStream(sourceFile);
        ANTLRInputStream input = new ANTLRInputStream(stream);
        Java8Lexer lexer = new Java8Lexer(input);
        CommonTokenStream tokens = new CommonTokenStream(lexer);
        Java8Parser parser = new Java8Parser(tokens);
        Java8Parser.CompilationUnitContext tree = parser.compilationUnit();
-
-        SyntaxTreeGenerator generator = new SyntaxTreeGenerator(new JavaClassRegistry(generateJavaLangNames()));
-        return generator.convert(tree, sourceFile);
+        
+        JavaClassRegistry reg = new JavaClassRegistry(new ArrayList<>());
+        reg.addPackage("java.lang");
+        SyntaxTreeGenerator generator = new SyntaxTreeGenerator(reg);
+        return generator.convert(tree);
    }

-    private List<String> generateJavaLangNames() throws IOException, ClassNotFoundException {
-        List<String> ret = new ArrayList<>();
+    public SourceFile parse(File file) throws IOException, java.lang.ClassNotFoundException {
+        return this.parse(new FileInputStream(file));
+    }

-        for(Class cl : PackageCrawler.getClassesInPackage("java.lang")){
-            ret.add(cl.getName());
-        }
-        //TODO: Wieso muss man das händisch anhängen?
-        ret.add("java.lang.Object");
-
-        return ret;
+    public SourceFile parse(String fileContent) throws IOException, java.lang.ClassNotFoundException {
+        return this.parse(new ByteArrayInputStream(fileContent.getBytes(StandardCharsets.UTF_8)));
    }
 }
--- a/src/de/dhbwstuttgart/parser/PackageCrawler.java
+++ b/src/de/dhbwstuttgart/parser/PackageCrawler.java
@ -1,48 +0,0 @@
-package de.dhbwstuttgart.parser;
-
-import de.dhbwstuttgart.typecheck.JavaClassName;
-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 java.util.LinkedList;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Set;
-import java.lang.InterruptedException;
-/**
- * Hilft beim Durchsuchen von Packages
- * Benutzt die Reflections-Library (https://github.com/ronmamo/reflections)
- * Hilfe dazu: http://stackoverflow.com/a/9571146
- */
-public class PackageCrawler {
-
-    public static Set<Class<?>> getClassesInPackage(String packageName){
-        List<ClassLoader> classLoadersList = new LinkedList<ClassLoader>();
-        classLoadersList.add(Thread.currentThread().getContextClassLoader());
-        classLoadersList.add(ClasspathHelper.staticClassLoader());
-        classLoadersList.add(Thread.currentThread().getContextClassLoader().getParent());
-
-        Reflections reflections = new Reflections(new ConfigurationBuilder()
-                .setScanners(new SubTypesScanner(false /* don't exclude Object.class */), new ResourcesScanner())
-                .setUrls(ClasspathHelper.forClassLoader(classLoadersList.toArray(new ClassLoader[0])))
-                .filterInputsBy(new FilterBuilder().include(FilterBuilder.prefix(packageName))));
-
-        Set<Class<?>> classes = reflections.getSubTypesOf(Object.class);
-
-        return classes;
-    }
-    
-  // Returns a list of JavaClassNames.
-  public static List<JavaClassName> getClassNames(String packageName){
-    List<JavaClassName> nameList = new ArrayList();
-    Set<Class<?>> classes = getClassesInPackage(packageName);
-    for(Class c : classes){
-      nameList.add(new JavaClassName(c.getName()));
-    }
-    return nameList;
-  }
-}
--- a/src/de/dhbwstuttgart/parser/RunTXParser.java
+++ b/src/de/dhbwstuttgart/parser/RunTXParser.java
@ -1,57 +0,0 @@
-package de.dhbwstuttgart.parser;
-import de.dhbwstuttgart.parser.SyntaxTreeGenerator.SyntaxTreeGenerator;
-import de.dhbwstuttgart.parser.antlr.Java8Lexer;
-import de.dhbwstuttgart.parser.antlr.Java8Parser;
-import de.dhbwstuttgart.typecheck.JavaClassName;
-import de.dhbwstuttgart.typecheck.JavaClassRegistry;
-import org.antlr.v4.runtime.ANTLRInputStream;
-import org.antlr.v4.runtime.CommonTokenStream;
-import de.dhbwstuttgart.syntaxtree.*;
-
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Scanner;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-public class RunTXParser{
-  public static void main(String[] args){
-    try{
-      JavaTXParser parser = new JavaTXParser();
-      SourceFile f = parser.parse(new File(args[0]));
-      String pkgName = f.getPkgName();
-      System.out.println("package: " + pkgName);
-      System.out.println("Imports:");
-      for(JavaClassName c : f.getImports()){
-        System.out.println(c.toString());
-      }
-      System.out.println("classes:");
-      for(ClassOrInterface c : f.getClasses()){
-        int mod = c.getModifiers();
-        System.out.println(Modifier.toString(mod));
-        System.out.println(c.getClassName().toString());
-        System.out.println("{");
-        for(Field field : c.getFieldDecl()){
-          System.out.println(field.getName());
-        }
-        System.out.println("}");
-      }
-    }
-    catch(java.util.NoSuchElementException e){
-      System.out.println("Error: Source seems to be empty.");
-    }
-    catch(ClassNotFoundException e){
-      System.out.println("Class not found.");
-    }
-    catch(FileNotFoundException e){
-      System.out.println("File not found.");
-    }
-    catch(IOException e){
-      System.out.println("An exception occured which is on our TODO list.");
-      e.printStackTrace();
-    }
-  }
-}
--- a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/AssignToLocal.java
+++ b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/AssignToLocal.java
@ -0,0 +1,20 @@
+package de.dhbwstuttgart.parser.SyntaxTreeGenerator;
+
+import de.dhbwstuttgart.syntaxtree.StatementVisitor;
+import de.dhbwstuttgart.syntaxtree.statement.AssignLeftSide;
+import de.dhbwstuttgart.syntaxtree.statement.Expression;
+import de.dhbwstuttgart.syntaxtree.statement.LocalVar;
+
+public class AssignToLocal extends AssignLeftSide {
+    public final LocalVar localVar;
+
+    public AssignToLocal(LocalVar leftSide) {
+        super(leftSide.getType(), leftSide.getOffset());
+        localVar = leftSide;
+    }
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+}
--- a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java
+++ b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java
@ -1,33 +1,32 @@
 package de.dhbwstuttgart.parser.SyntaxTreeGenerator;

+import com.sun.javafx.fxml.expression.UnaryExpression;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.parser.antlr.Java8Parser;
 import de.dhbwstuttgart.syntaxtree.*;
-import de.dhbwstuttgart.syntaxtree.operator.AndOp;
-import de.dhbwstuttgart.syntaxtree.operator.OrOp;
 import de.dhbwstuttgart.syntaxtree.statement.*;
 import de.dhbwstuttgart.syntaxtree.statement.literal.*;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.typecheck.JavaClassName;
+import de.dhbwstuttgart.syntaxtree.type.Void;
 import de.dhbwstuttgart.typecheck.JavaClassRegistry;
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.TerminalNode;

-import java.lang.reflect.Modifier;
 import java.util.*;

 public class StatementGenerator {

    private JavaClassRegistry reg;
-    private Map<String, RefTypeOrTPHOrWildcardOrGeneric> localVars = new HashMap<>();
+    private Map<String, RefTypeOrTPHOrWildcardOrGeneric> localVars;
    private GenericsRegistry generics;

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

    public ParameterList convert(Java8Parser.FormalParameterListContext formalParameterListContext) {
@ -268,64 +267,78 @@ public class StatementGenerator {
        //TODO
        throw new NotImplementedException();
    }
-
+    //TODO Felix_K
    private Statement convert(Java8Parser.PreIncrementExpressionContext stmt) {
-        //TODO
-        throw new NotImplementedException();
+        return new PreIncExpr(convert(stmt.unaryExpression()),stmt.getStart());
    }
-
+    //TODO Felix_K
    private Statement convert(Java8Parser.PreDecrementExpressionContext stmt) {
-        //TODO
-        throw new NotImplementedException();
+        return new PreDecExpr(convert(stmt.unaryExpression()),stmt.getStart());
    }
-
+    //TODO Felix_K
    private Statement convert(Java8Parser.PostIncrementExpressionContext stmt) {
-        //TODO
-        throw new NotImplementedException();
+        return new PostIncExpr(convert(stmt.postfixExpression()));
    }
-
+    //TODO Felix_K
    private Statement convert(Java8Parser.PostDecrementExpressionContext stmt) {
-        //TODO
-        throw new NotImplementedException();
+        return new PostDecExpr(convert(stmt.postfixExpression()));
    }

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

-    private Expression convert(Java8Parser.LeftHandSideContext leftHandSide) {
-        return generateLocalOrFieldVarOrClassName(leftHandSide.getText(), leftHandSide.getStart());
+    private AssignLeftSide convert(Java8Parser.LeftHandSideContext leftHandSide) {
+        Expression leftSide = generateLocalOrFieldVarOrClassName(leftHandSide.getText(), leftHandSide.getStart());
+        if(leftSide instanceof FieldVar)return new AssignToField((FieldVar) leftSide);
+        else if (leftSide instanceof LocalVar)return new AssignToLocal((LocalVar) leftSide);
+        else throw new NotImplementedException();
    }
-
+    //TODO Felix_K
    private Statement convert(Java8Parser.IfThenStatementContext stmt){
-        //TODO
-        throw new NotImplementedException();
+        Expression expr = convert(stmt.expression());
+        Statement thenBlock = convert(stmt.statement());
+        Statement elseBlock = new EmptyStmt(stmt.getStart());
+        return new IfStmt(TypePlaceholder.fresh(stmt.getStart()),expr,thenBlock,elseBlock,stmt.getStart());
    }
-
+    //TODO Felix_K
    private Statement convert(Java8Parser.IfThenElseStatementContext stmt){
-        //TODO
-        throw new NotImplementedException();
+        Expression expr = convert(stmt.expression());
+        Statement thenBlock = convert(stmt.statementNoShortIf());
+        Statement elseBlock = convert(stmt.statement());
+        return new IfStmt(TypePlaceholder.fresh(stmt.getStart()),expr,thenBlock,elseBlock,stmt.getStart());
    }
-
+    //TODO Felix_K
    private Statement convert(Java8Parser.IfThenElseStatementNoShortIfContext stmt){
-        //TODO
-        throw new NotImplementedException();
+        Expression expr = convert(stmt.expression());
+        Statement thenBlock = convert(stmt.statementNoShortIf().get(0));
+        Statement elseBlock = convert(stmt.statementNoShortIf().get(1));
+        return new IfStmt(TypePlaceholder.fresh(stmt.getStart()),expr,thenBlock,elseBlock,stmt.getStart());
    }
-
-    private Statement convert(Java8Parser.AssertStatementContext stmt){
-        //TODO
-        throw new NotImplementedException();
+    //TODO Felix_K
+    private Statement convert(Java8Parser.AssertStatementContext stmt)
+    {
+        List<Expression> exprList= new ArrayList<Expression>();
+        for (int i =0; i<stmt.expression().size();i++){
+            exprList.add(convert(stmt.expression(i)));
+        }
+        return new AssertStmt(TypePlaceholder.fresh(stmt.getStart()),exprList,stmt.getStart());
    }
-
+    //TODO Felix_K
    private Statement convert(Java8Parser.SwitchStatementContext stmt){
-        //TODO
-        throw new NotImplementedException();
+        Expression expr = convert(stmt.expression());
+        List<Statement> statementList = new ArrayList<Statement>();
+        statementList.add( convert(stmt.switchBlock()));
+        statementList.add(new BreakStmt(TypePlaceholder.fresh(stmt.getStart()),"",stmt.getStart()));
+        Block block = new Block(statementList, stmt.getStart());
+        return new SwitchStmt(TypePlaceholder.fresh(stmt.getStart()),expr,block,stmt.getStart());
+
    }

    private Statement convert(Java8Parser.SwitchBlockContext stmt){
        //TODO
-        throw new NotImplementedException();
+        throw new  NotImplementedException();
    }

    private Statement convert(Java8Parser.SwitchBlockStatementGroupContext stmt){
@ -334,18 +347,21 @@ public class StatementGenerator {
    }

    private Statement convert(Java8Parser.WhileStatementContext stmt){
-        //TODO
-        throw new NotImplementedException();
+        Expression expr = convert(stmt.expression());
+        Statement block = convert(stmt.statement());
+        return new WhileStmt(expr, block,stmt.getStart());
    }
-
+    //TODO Felix_K
    private Statement convert(Java8Parser.WhileStatementNoShortIfContext stmt){
-        //TODO
-        throw new NotImplementedException();
+        Expression expr = convert(stmt.expression());
+        Statement block = convert(stmt.statementNoShortIf());
+        return new WhileStmt(expr, block, stmt.getStart());
    }
-
+    //TODO Felix_K
    private Statement convert(Java8Parser.DoStatementContext stmt){
-        //TODO
-        throw new NotImplementedException();
+        Statement block = convert(stmt.statement());
+        Expression expr = convert(stmt.expression());
+        return new DoStmt(expr,block,stmt.getStart());
    }

    private Statement convert(Java8Parser.ForStatementContext stmt){
@ -363,15 +379,43 @@ public class StatementGenerator {
            return convert(stmt.enhancedForStatementNoShortIf());
        }else throw new NotImplementedException();
    }
-
+    //TODO Felix_K
    private Statement convert(Java8Parser.BasicForStatementContext stmt){
-        //TODO
-        throw new NotImplementedException();
+        List<Statement> stateList = new ArrayList<>();
+        List<Statement> whileList = new ArrayList<>();
+        if (stmt.forInit().localVariableDeclaration()==null)
+        {
+            whileList.addAll(convert(stmt.forInit().localVariableDeclaration()));
+        }
+        else
+        {
+            whileList.add(convert(stmt.forInit().statementExpressionList()));
+        }
+        Expression expr = convert(stmt.expression());
+        stateList.add(convert(stmt.statement()));
+        stateList.add(convert(stmt.forUpdate()));
+        Block forBlock = new Block(stateList,stmt.getStart());
+        whileList.add(new WhileStmt(expr,forBlock,stmt.getStart()));
+        return new Block(whileList,stmt.getStart());
    }
-
+    //TODO Felix_K
    private Statement convert(Java8Parser.BasicForStatementNoShortIfContext stmt){
-        //TODO
-        throw new NotImplementedException();
+        List<Statement> stateList = new ArrayList<>();
+        List<Statement> whileList = new ArrayList<>();
+        if (stmt.forInit().localVariableDeclaration()==null)
+        {
+            whileList.addAll(convert(stmt.forInit().localVariableDeclaration()));
+        }
+        else
+        {
+            whileList.add(convert(stmt.forInit().statementExpressionList()));
+        }
+        Expression expr = convert(stmt.expression());
+        stateList.add(convert(stmt.statementNoShortIf()));
+        stateList.add(convert(stmt.forUpdate()));
+        Block forBlock = new Block(stateList,stmt.getStart());
+        whileList.add(new WhileStmt(expr,forBlock,stmt.getStart()));
+        return new Block(whileList,stmt.getStart());
    }

    private List<Statement> convert(Java8Parser.ForInitContext stmt){
@ -381,7 +425,7 @@ public class StatementGenerator {
            return convert(stmt.localVariableDeclaration());
        }else throw new NotImplementedException();
    }
-
+    //TODO Felix_K
    private List<Statement> convert(Java8Parser.LocalVariableDeclarationContext declaration) {
        List<Statement> ret = new ArrayList<>();
        if(declaration.variableModifier() != null && declaration.variableModifier().size() > 0){
@ -394,7 +438,13 @@ public class StatementGenerator {
        }else{
            type = TypeGenerator.convert(declaration.unannTypeOrAuto().unannType(), reg, generics);
        }
-        for(Java8Parser.VariableDeclaratorContext varDecl : declaration.variableDeclaratorList().variableDeclarator()){
+        ret.addAll(generateLocalVariableAssignments(declaration.variableDeclaratorList().variableDeclarator(), type));
+        return ret;
+    }
+
+    private List<Statement> generateLocalVariableAssignments(List<Java8Parser.VariableDeclaratorContext> varDeclarators, RefTypeOrTPHOrWildcardOrGeneric type){
+        List<Statement> ret = new ArrayList<>();
+        for(Java8Parser.VariableDeclaratorContext varDecl : varDeclarators){
            TerminalNode name = varDecl.variableDeclaratorId().Identifier();

            ret.add(new LocalVarDecl(name.getText(), type, name.getSymbol()));
@ -406,12 +456,27 @@ public class StatementGenerator {
                }else{
                    initValue = convert(varDecl.variableInitializer().expression());
                }
-                ret.add(new Assign(new LocalVar(name.getText(), type, name.getSymbol()), initValue, name.getSymbol()));
+                ret.add(new Assign(new AssignToLocal(new LocalVar(name.getText(), type, name.getSymbol()))
+                        , initValue, name.getSymbol()));
            }
        }
        return ret;
    }

+    public Statement generateFieldAssignment(Java8Parser.VariableDeclaratorContext varDecl, RefTypeOrTPHOrWildcardOrGeneric type){
+        TerminalNode name = varDecl.variableDeclaratorId().Identifier();
+        Expression initValue;
+        if(varDecl.variableInitializer().arrayInitializer() != null){
+            throw new NotImplementedException();
+        }else{
+            initValue = convert(varDecl.variableInitializer().expression());
+        }
+        return (new Assign(new AssignToField(
+                new FieldVar(new This(varDecl.getStart()), name.getText(),
+                        new Void(varDecl.getStart()), varDecl.getStart())),
+                initValue, name.getSymbol()));
+    }
+
    private Statement convert(Java8Parser.ForUpdateContext stmt){
        return convert(stmt.statementExpressionList());
    }
@ -430,20 +495,30 @@ public class StatementGenerator {
        //TODO
        throw new NotImplementedException();
    }
-
+    //TODO Felix_K
    private Statement convert(Java8Parser.BreakStatementContext stmt){
-        //TODO
-        throw new NotImplementedException();
+        if (stmt.Identifier()==null)
+        {
+            String indentifier = "";
+            return new BreakStmt(TypePlaceholder.fresh(stmt.getStart()),indentifier,stmt.getStart());
+        }
+        return new BreakStmt(TypePlaceholder.fresh(stmt.getStart()),stmt.Identifier().getText(),stmt.getStart());
    }
-
+    //TODO Felix_K
    private Statement convert(Java8Parser.ContinueStatementContext stmt){
-        //TODO
-        throw new NotImplementedException();
+        if (stmt.Identifier()==null){
+            String indentifier = "";
+            return new ContinueStmt(TypePlaceholder.fresh(stmt.getStart()),indentifier, stmt.getStart());
+        }
+        return new BreakStmt(TypePlaceholder.fresh(stmt.getStart()),stmt.Identifier().getText(),stmt.getStart());
    }

    private Statement convert(Java8Parser.ReturnStatementContext stmt){
-        return new Return(convert(stmt.expression()),stmt.getStart());
-        //throw new NotImplementedException();
+        if(stmt.expression() != null){
+            return new Return( convert(stmt.expression()),stmt.getStart() );
+        }else{
+            return new ReturnVoid(stmt.getStart());
+        }
    }

    private Statement convert(Java8Parser.ThrowStatementContext stmt){
@ -461,7 +536,8 @@ public class StatementGenerator {
        throw new NotImplementedException();
    }

-    private Statement convert(Java8Parser.CatchesContext stmt){
+    private Statement convert(Java8Parser.CatchesContext stmt)
+    {
        //TODO
        throw new NotImplementedException();
    }
@ -504,7 +580,7 @@ public class StatementGenerator {
            return convert(expression.conditionalAndExpression());
        }else{
            return new Binary(convert(expression.conditionalOrExpression()),
-                    convert(expression.conditionalAndExpression()), new OrOp(null));
+                    convert(expression.conditionalAndExpression()), Binary.Operator.OR);
        }
    }

@ -513,7 +589,7 @@ public class StatementGenerator {
            return convert(expression.inclusiveOrExpression());
        }else{
            return new Binary(convert(expression.conditionalAndExpression()),
-                    convert(expression.inclusiveOrExpression()), new AndOp(null));
+                    convert(expression.inclusiveOrExpression()), Binary.Operator.AND);
        }
    }

@ -798,14 +874,21 @@ public class StatementGenerator {
            params = new ParameterList(new ArrayList<>(), expression.getStart());
        }

+        HashMap<String,RefTypeOrTPHOrWildcardOrGeneric> lambdaLocals = new HashMap<>();
+        lambdaLocals.putAll(localVars);
+        for(FormalParameter param : params.getFormalparalist()){
+            lambdaLocals.put(param.getName(), param.getType());
+        }
+        StatementGenerator lambdaGenerator = new StatementGenerator(reg, generics, lambdaLocals);
+
        Block block;
        if(expression.lambdaBody().expression() != null){
            List<Statement> statements = new ArrayList<>();
-            statements.add(new Return(convert(expression.lambdaBody().expression()),
+            statements.add(new Return(lambdaGenerator.convert(expression.lambdaBody().expression()),
                    expression.lambdaBody().expression().getStart()));
            block = new Block(statements, expression.lambdaBody().getStart());
        }else{
-            block = convert(expression.lambdaBody().block());
+            block = lambdaGenerator.convert(expression.lambdaBody().block());
        }
        List<RefTypeOrTPHOrWildcardOrGeneric> funNParams = new ArrayList<>();
        funNParams.add(TypePlaceholder.fresh(expression.getStart()));//ret-Type
@ -813,7 +896,7 @@ public class StatementGenerator {
                funNParams.add(TypePlaceholder.fresh(expression.getStart())));
        RefTypeOrTPHOrWildcardOrGeneric lambdaType = TypePlaceholder.fresh(expression.getStart());
        //RefType lambdaType = new RefType(reg.getName("Fun"+params.getFormalparalist().size()),
-                //funNParams, expression.getStart());
+                //funNParams, name.getStart());
        return new LambdaExpression(lambdaType, params, block, expression.getStart());
    }
 }
--- a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntacticSugar.java
+++ b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntacticSugar.java
@ -12,10 +12,11 @@ public class SyntacticSugar {
            Statement lastStmt = statements.get(statements.size() - 1);
            if (lastStmt instanceof Return) return statements;
            if (lastStmt instanceof WhileStmt) {
-                if (hasReturn(((WhileStmt) lastStmt).loop_block)) return statements;
+                //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;
+                //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 {
--- a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java
+++ b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java
@ -1,8 +1,8 @@
 package de.dhbwstuttgart.parser.SyntaxTreeGenerator;

 import de.dhbwstuttgart.exceptions.NotImplementedException;
-import de.dhbwstuttgart.parser.ClassNotFoundException;
-import de.dhbwstuttgart.parser.PackageCrawler;
+import java.lang.ClassNotFoundException;
+import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.parser.antlr.Java8Parser;
 import de.dhbwstuttgart.syntaxtree.*;
 import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
@ -14,11 +14,13 @@ import de.dhbwstuttgart.typecheck.*;

 import java.io.File;
 import java.lang.reflect.Modifier;
+import java.sql.Ref;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

-import jdk.internal.dynalink.support.TypeConverterFactory;
+//import jdk.internal.dynalink.support.TypeConverterFactory;
+import org.antlr.v4.runtime.CommonToken;
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.TerminalNode;

@ -27,6 +29,8 @@ public class SyntaxTreeGenerator{
  private String pkgName = "";
  List<JavaClassName> imports = new ArrayList();

+  List<Statement> fieldInitializations = new ArrayList<>();
+
  public SyntaxTreeGenerator(JavaClassRegistry reg){
    this.reg = reg;
  }
@ -134,16 +138,10 @@ public class SyntaxTreeGenerator{
  
  private JavaClassName convertSingleTypeImportDeclaration(Java8Parser.SingleTypeImportDeclarationContext ctx) throws ClassNotFoundException{
    String typeName = convertTypeName(ctx.typeName());
-    String packageName = getPackageFromClass(typeName);
-    List<JavaClassName> classes = PackageCrawler.getClassNames(packageName);
-    reg.add(typeName);
-    JavaClassName ret = reg.getName(typeName);
-    if(classes.contains(ret)){
-      return ret;
-    }
-    else{
-      throw new ClassNotFoundException();
-    }
+	Thread.currentThread().getContextClassLoader().loadClass(typeName);
+	reg.add(typeName);
+	JavaClassName ret = reg.getName(typeName);
+	return ret;
  }
  
  private JavaClassName convertTypeImportOnDemandDeclaration(Java8Parser.TypeImportOnDemandDeclarationContext ctx){
@ -168,7 +166,7 @@ public class SyntaxTreeGenerator{
    return ret;
  }
  
-  public SourceFile convert(Java8Parser.CompilationUnitContext ctx, File parsedFile) throws ClassNotFoundException{
+  public SourceFile convert(Java8Parser.CompilationUnitContext ctx) throws ClassNotFoundException{
    List<ClassOrInterface> classes = new ArrayList<>();
    this.getNames(ctx);
    this.setImports(ctx);
@ -182,37 +180,39 @@ public class SyntaxTreeGenerator{
      }
      classes.add(newClass);
    }
-    return new SourceFile(parsedFile, this.pkgName, classes, this.imports);
+    return new SourceFile(this.pkgName, classes, this.imports);
  }

-  public Method convert(Java8Parser.MethodDeclarationContext methodDeclarationContext, JavaClassName parentClass, GenericsRegistry generics) {
+  public Method convert(Java8Parser.MethodDeclarationContext methodDeclarationContext, JavaClassName parentClass, RefType superClass, GenericsRegistry generics) {
    Java8Parser.MethodHeaderContext header = methodDeclarationContext.methodHeader();
    int modifiers = SyntaxTreeGenerator.convert(methodDeclarationContext.methodModifier());
    GenericsRegistry localGenerics = createGenerics(methodDeclarationContext.methodHeader().typeParameters(),
            parentClass, header.methodDeclarator().Identifier().getText());
    localGenerics.putAll(generics);
-    return convert(modifiers, header, methodDeclarationContext.methodBody(),parentClass, localGenerics);
+    return convert(modifiers, header, methodDeclarationContext.methodBody(),parentClass, superClass, localGenerics);
  }

-  public Method convert(Java8Parser.InterfaceMethodDeclarationContext ctx, JavaClassName parentClass, GenericsRegistry generics) {
+  public Method convert(Java8Parser.InterfaceMethodDeclarationContext ctx, JavaClassName parentClass, RefType superClass, GenericsRegistry generics) {
    Java8Parser.MethodHeaderContext header = ctx.methodHeader();
    int modifiers = SyntaxTreeGenerator.convertInterfaceModifier(ctx.interfaceMethodModifier());

    GenericsRegistry localGenerics = createGenerics(header.typeParameters(), parentClass, header.methodDeclarator().Identifier().getText());
    localGenerics.putAll(generics);

-    return convert(modifiers, header, ctx.methodBody(),parentClass, localGenerics);
+    return convert(modifiers, header, ctx.methodBody(),parentClass, superClass, localGenerics);
  }

  private Method convert(int modifiers, Java8Parser.MethodHeaderContext header, Java8Parser.MethodBodyContext body,
-                         JavaClassName parentClass, GenericsRegistry localGenerics) {
+                         JavaClassName parentClass, RefType superClass, GenericsRegistry localGenerics) {

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

    String name = header.methodDeclarator().Identifier().getText();
    GenericDeclarationList gtvDeclarations = new GenericDeclarationList(new ArrayList<>(), header.getStart());
    if(header.typeParameters() != null){
      gtvDeclarations = TypeGenerator.convert(header.typeParameters(), parentClass, name,reg, localGenerics);
+    }else{
+      gtvDeclarations = new GenericDeclarationList(new ArrayList<>(), header.getStart());
    }
    RefTypeOrTPHOrWildcardOrGeneric retType;
    if(header.result() != null){
@ -233,7 +233,7 @@ public class SyntaxTreeGenerator{
      block = stmtGen.convert(body.block());
    }
    if(parentClass.equals(new JavaClassName(name))){
-      return new Constructor(name, retType, modifiers, parameterList, block, gtvDeclarations, header.getStart());
+      return new Constructor(name, retType, modifiers, parameterList, block, gtvDeclarations, header.getStart(), fieldInitializations, superClass);
    }else{
      return new Method(name, retType, modifiers, parameterList,block, gtvDeclarations, header.getStart());
    }
@ -261,9 +261,20 @@ public class SyntaxTreeGenerator{
    JavaClassName name = reg.getName(ctx.Identifier().getText());
    GenericsRegistry generics = createGenerics(ctx.typeParameters(), name, "");
    Token offset = ctx.getStart();
-    GenericDeclarationList genericClassParameters = TypeGenerator.convert(ctx.typeParameters(), name, "",reg, generics);
+    GenericDeclarationList genericClassParameters;
+    if(ctx.typeParameters() == null){
+      genericClassParameters = createEmptyGenericDeclarationList(ctx.Identifier());
+    }else{
+      genericClassParameters = TypeGenerator.convert(ctx.typeParameters(), name, "",reg, generics);
+    }
+    RefType superClass ;
+    if(ctx.superclass() != null){
+      superClass = convert(ctx.superclass());
+    }else{
+      superClass = ASTFactory.createObjectClass().getType();
+    }
    List<Field> fielddecl = convertFields(ctx.classBody(), generics);
-    List<Method> methods = convertMethods(ctx.classBody(), name, generics);
+    List<Method> methods = convertMethods(ctx.classBody(), name, superClass, generics);
    List<Constructor> konstruktoren = new ArrayList<>();
    for(int i = 0; i<methods.size();i++){
      Method m = methods.get(i);
@ -275,17 +286,11 @@ public class SyntaxTreeGenerator{
    if(konstruktoren.size()<1){//Standardkonstruktor anfügen:
      konstruktoren.add(
              generateStandardConstructor(
-                      ctx.Identifier().getText(),
+                      ctx.Identifier().getText(), name, superClass,
                      genericClassParameters, offset)
          );
    }

-    RefType superClass ;
-    if(ctx.superclass() != null){
-      superClass = convert(ctx.superclass());
-    }else{
-      superClass = new ASTFactory(reg).createObjectClass().getType();
-    }
    Boolean isInterface = false;
    List<RefTypeOrTPHOrWildcardOrGeneric> implementedInterfaces = convert(ctx.superinterfaces(), generics);
    return new ClassOrInterface(modifiers, name, fielddecl, methods, konstruktoren, genericClassParameters, superClass,
@ -305,13 +310,12 @@ public class SyntaxTreeGenerator{
    return ret;
  }

-  private Constructor generateStandardConstructor(String className, GenericDeclarationList classGenerics, Token offset){
+  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);
-    //TODO: Konstruktor muss Felder initialisieren:
    Block block = new Block(new ArrayList<>(), offset);
-    return new Constructor(className, classType, modifiers, params, block, classGenerics, offset);
+    return new Constructor(className, classType, modifiers, params, block, classGenerics, offset, fieldInitializations, superClass);
  }

  private RefType convert(Java8Parser.SuperclassContext superclass) {
@ -319,7 +323,7 @@ public class SyntaxTreeGenerator{
  }

  private List<Method> convertMethods(Java8Parser.ClassBodyContext classBodyContext,
-                                      JavaClassName parentClass, GenericsRegistry generics) {
+                                      JavaClassName parentClass, RefType superClass, GenericsRegistry generics) {
    List<Method> ret = new ArrayList<>();
    for(Java8Parser.ClassBodyDeclarationContext classMember : classBodyContext.classBodyDeclaration()){
      if(classMember.classMemberDeclaration() != null){
@ -328,7 +332,7 @@ public class SyntaxTreeGenerator{
          //Do nothing!
        }else if(classMemberDeclarationContext.methodDeclaration()!= null){

-          ret.add(this.convert(classMemberDeclarationContext.methodDeclaration(), parentClass, generics));
+          ret.add(this.convert(classMemberDeclarationContext.methodDeclaration(), parentClass, superClass, generics));
        }
      }
    }
@ -381,7 +385,7 @@ public class SyntaxTreeGenerator{
    for(Java8Parser.VariableDeclaratorContext varCtx : fieldDeclarationContext.variableDeclaratorList().variableDeclarator()){
      String fieldName = convert(varCtx.variableDeclaratorId());
      if(varCtx.variableInitializer() != null){
-        initializeField(fieldDeclarationContext);
+        initializeField(varCtx, fieldType, generics);
      }
      else{
        ret.add(new Field(fieldName,fieldType,modifiers,varCtx.getStart()));
@ -395,9 +399,9 @@ public class SyntaxTreeGenerator{
  }

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

  public static int convertModifier(String modifier){
@ -460,11 +464,16 @@ public class SyntaxTreeGenerator{

    GenericsRegistry generics = createGenerics(ctx.typeParameters(), name, "");

-    List<Field> fields = convertFields(ctx.interfaceBody());
-    List<Method> methods = convertMethods(ctx.interfaceBody(), name, generics);
+    GenericDeclarationList genericParams;
+    if(ctx.typeParameters() != null){
+      genericParams = TypeGenerator.convert(ctx.typeParameters(), name, "",reg, generics);
+    }else{
+      genericParams = createEmptyGenericDeclarationList(ctx.Identifier());
+    }
+    RefType superClass = ASTFactory.createObjectClass().getType();

-    GenericDeclarationList genericParams = TypeGenerator.convert(ctx.typeParameters(), name, "",reg, generics);
-    RefType superClass = new ASTFactory(reg).createObjectClass().getType();
+    List<Field> fields = convertFields(ctx.interfaceBody());
+    List<Method> methods = convertMethods(ctx.interfaceBody(), name, superClass, generics);

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

@ -472,6 +481,13 @@ public class SyntaxTreeGenerator{
            genericParams, superClass, true, extendedInterfaces, ctx.getStart());
  }

+  private GenericDeclarationList createEmptyGenericDeclarationList(TerminalNode classNameIdentifier) {
+    CommonToken gtvOffset = new CommonToken(classNameIdentifier.getSymbol());
+    gtvOffset.setCharPositionInLine(gtvOffset.getCharPositionInLine()+classNameIdentifier.getText().length());
+    gtvOffset.setStartIndex(gtvOffset.getStopIndex()+1);
+    return new GenericDeclarationList(new ArrayList<>(), gtvOffset);
+  }
+
  private GenericsRegistry createGenerics(Java8Parser.TypeParametersContext ctx, JavaClassName parentClass, String parentMethod) {
    GenericsRegistry ret = new GenericsRegistry();
    if(ctx == null || ctx.typeParameterList() == null)return ret;
@ -487,11 +503,11 @@ public class SyntaxTreeGenerator{
  }

  private List<Method> convertMethods(Java8Parser.InterfaceBodyContext interfaceBodyContext,
-                                      JavaClassName parentClass, GenericsRegistry generics) {
+                                      JavaClassName parentClass, RefType superClass, GenericsRegistry generics) {
    List<Method> ret = new ArrayList<>();
    for(Java8Parser.InterfaceMemberDeclarationContext member : interfaceBodyContext.interfaceMemberDeclaration()){
      if(member.interfaceMethodDeclaration() != null){
-        ret.add(this.convert(member.interfaceMethodDeclaration(), parentClass, generics));
+        ret.add(this.convert(member.interfaceMethodDeclaration(), parentClass, superClass, generics));
        //new Method(name, type, modifier, params, null, genericDecls, member.interfaceMethodDeclaration().getStart());
      }else{
        throw new NotImplementedException();
--- a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/TypeGenerator.java
+++ b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/TypeGenerator.java
@ -4,7 +4,6 @@ import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.exceptions.TypeinferenceException;
 import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.parser.antlr.Java8Parser;
-import de.dhbwstuttgart.syntaxtree.GTVDeclarationContext;
 import de.dhbwstuttgart.syntaxtree.GenericDeclarationList;
 import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
 import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
@ -19,6 +18,7 @@ import de.dhbwstuttgart.typecheck.JavaClassRegistry;
 import org.antlr.v4.runtime.Token;

 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;

 public class TypeGenerator {
@ -54,10 +54,8 @@ public class TypeGenerator {
        return TypeGenerator.convert(unannTypeContext.unannReferenceType().unannClassOrInterfaceType(), reg, genericsRegistry);
    }

-    public static GenericDeclarationList convert(Java8Parser.TypeParametersContext typeParametersContext, JavaClassName parentClass, String parentMethod, JavaClassRegistry reg, GenericsRegistry generics) {
-        if(typeParametersContext == null){
-            return new GenericDeclarationList(new ArrayList<>(), new NullToken());
-        }
+    public static GenericDeclarationList convert(Java8Parser.TypeParametersContext typeParametersContext,
+                                                 JavaClassName parentClass, String parentMethod, JavaClassRegistry reg, GenericsRegistry generics) {
        Token endOffset = typeParametersContext.getStop();
        List<GenericTypeVar> typeVars = new ArrayList<>();
        for(Java8Parser.TypeParameterContext typeParameter : typeParametersContext.typeParameterList().typeParameter()){
@ -79,7 +77,7 @@ public class TypeGenerator {
    public static List<RefTypeOrTPHOrWildcardOrGeneric> convert(Java8Parser.TypeBoundContext typeBoundContext, JavaClassRegistry reg, GenericsRegistry generics) {
        if(typeBoundContext == null){
            List<RefTypeOrTPHOrWildcardOrGeneric> ret = new ArrayList<>();
-            ret.add(new ASTFactory(reg).createObjectClass().getType());
+            ret.add(ASTFactory.createObjectClass().getType());
            return ret;
        }

@ -96,7 +94,7 @@ 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 Generische Type sein:
+        if(!reg.contains(name)){ //Dann könnte es ein Generische Type sein
            if(generics.keySet().contains(name)){
                return new GenericRefType(new GenericTypeName(generics.get(name),name), offset);
            }else{
--- a/src/de/dhbwstuttgart/parser/antlr/Java8Parser.java
+++ b/src/de/dhbwstuttgart/parser/antlr/Java8Parser.java
@ -180,7 +180,7 @@ public class Java8Parser extends Parser {
 		"methodInvocation_lf_primary", "methodInvocation_lfno_primary", "argumentList", 
 		"methodReference", "methodReference_lf_primary", "methodReference_lfno_primary", 
 		"arrayCreationExpression", "dimExprs", "dimExpr", "constantExpression", 
-		"expression", "lambdaExpression", "lambdaParameters", "inferredFormalParameterList", 
+		"name", "lambdaExpression", "lambdaParameters", "inferredFormalParameterList",
 		"lambdaBody", "assignmentExpression", "assignment", "leftHandSide", "assignmentOperator", 
 		"conditionalExpression", "conditionalOrExpression", "conditionalAndExpression", 
 		"inclusiveOrExpression", "exclusiveOrExpression", "andExpression", "equalityExpression", 
--- a/src/de/dhbwstuttgart/syntaxtree/ASTVisitor.java
+++ b/src/de/dhbwstuttgart/syntaxtree/ASTVisitor.java
@ -0,0 +1,40 @@
+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{
+
+    void visit(SourceFile sourceFile);
+
+    void visit(GenericTypeVar genericTypeVar);
+
+    void visit(FormalParameter formalParameter);
+
+    void visit(GenericDeclarationList genericTypeVars);
+
+    void visit(Field field);
+
+    void visit(Method field);
+
+    void visit(Constructor field);
+
+    void visit(ParameterList formalParameters);
+
+    void visit(ClassOrInterface classOrInterface);
+
+    void visit(RefType refType);
+
+    void visit(SuperWildcardType superWildcardType);
+
+    void visit(TypePlaceholder typePlaceholder);
+
+    void visit(ExtendsWildcardType extendsWildcardType);
+
+    void visit(GenericRefType genericRefType);
+
+    void visit(BreakStmt breakStmt);
+}
--- a/src/de/dhbwstuttgart/syntaxtree/AbstractASTWalker.java
+++ b/src/de/dhbwstuttgart/syntaxtree/AbstractASTWalker.java
@ -0,0 +1,275 @@
+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.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{
+    @Override
+    public void visit(Constructor cons) {
+        visitMethod(cons);
+    }
+
+    @Override
+    public void visit(SourceFile sourceFile) {
+        for(ClassOrInterface cl : sourceFile.getClasses()){
+            cl.accept(this);
+        }
+    }
+
+    @Override
+    public void visit(ArgumentList argumentList) {
+        for(Expression expr : argumentList.getArguments()){
+            expr.accept(this);
+        }
+    }
+
+    @Override
+    public void visit(GenericTypeVar genericTypeVar) {
+
+    }
+
+    @Override
+    public void visit(FormalParameter formalParameter) {
+        formalParameter.getType().accept(this);
+    }
+
+    @Override
+    public void visit(GenericDeclarationList genericTypeVars) {
+        Iterator<GenericTypeVar> genericIterator = genericTypeVars.iterator();
+        if(genericIterator.hasNext()){
+            while(genericIterator.hasNext()){
+                genericIterator.next().accept(this);
+            }
+        }
+    }
+
+    @Override
+    public void visit(Field field) {
+        field.getType().accept(this);
+    }
+
+    @Override
+    public void visit(Method method) {
+        visitMethod(method);
+    }
+
+    private void visitMethod(Method method){
+        method.getType().accept(this);
+        method.getParameterList().accept(this);
+        if(method.block != null)
+            method.block.accept(this);
+    }
+
+    @Override
+    public void visit(ParameterList formalParameters) {
+        Iterator<FormalParameter> genericIterator = formalParameters.getFormalparalist().iterator();
+        if(genericIterator.hasNext()){
+            while(genericIterator.hasNext()){
+                genericIterator.next().accept(this);
+            }
+        }
+    }
+
+    @Override
+    public void visit(ClassOrInterface classOrInterface) {
+        classOrInterface.getGenerics().accept(this);
+        for(Field f : classOrInterface.getFieldDecl()){
+            f.accept(this);
+        }
+        for(Method m : classOrInterface.getMethods()){
+            m.accept(this);
+        }
+    }
+
+    @Override
+    public void visit(RefType refType) {
+        Iterator<RefTypeOrTPHOrWildcardOrGeneric> genericIterator = refType.getParaList().iterator();
+        if(genericIterator.hasNext()){
+            while(genericIterator.hasNext()){
+                genericIterator.next().accept(this);
+            }
+        }
+    }
+
+    @Override
+    public void visit(SuperWildcardType superWildcardType) {
+        superWildcardType.getInnerType().accept(this);
+    }
+
+    @Override
+    public void visit(TypePlaceholder typePlaceholder) {
+
+    }
+
+    @Override
+    public void visit(ExtendsWildcardType extendsWildcardType) {
+        extendsWildcardType.getInnerType().accept(this);
+    }
+
+    @Override
+    public void visit(GenericRefType genericRefType) {
+
+    }
+
+    @Override
+    public void visit(LambdaExpression lambdaExpression) {
+        lambdaExpression.params.accept(this);
+        lambdaExpression.methodBody.accept(this);
+    }
+
+    @Override
+    public void visit(Assign assign) {
+        assign.lefSide.accept(this);
+        assign.rightSide.accept(this);
+    }
+
+    @Override
+    public void visit(Binary binary) {
+
+    }
+
+    @Override
+    public void visit(Block block) {
+        for(Statement stmt : block.getStatements()){
+            stmt.accept(this);
+        }
+    }
+
+    @Override
+    public void visit(CastExpr castExpr) {
+
+    }
+
+    @Override
+    public void visit(EmptyStmt emptyStmt) {
+
+    }
+
+    @Override
+    public void visit(FieldVar fieldVar) {
+        fieldVar.receiver.accept(this);
+    }
+
+    @Override
+    public void visit(ForStmt forStmt) {
+
+    }
+
+    @Override
+    public void visit(IfStmt ifStmt) {
+
+    }
+
+    @Override
+    public void visit(InstanceOf instanceOf) {
+
+    }
+
+    @Override
+    public void visit(LocalVar localVar) {
+
+    }
+
+
+    @Override
+    public void visit(LocalVarDecl localVarDecl) {
+        localVarDecl.getType().accept(this);
+    }
+
+    @Override
+    public void visit(MethodCall methodCall) {
+        methodCall.receiver.accept(this);
+        methodCall.getArgumentList().accept(this);
+    }
+
+    @Override
+    public void visit(NewClass methodCall) {
+        visit((MethodCall) methodCall);
+    }
+
+    @Override
+    public void visit(NewArray newArray) {
+
+    }
+
+    @Override
+    public void visit(Receiver receiver) {
+        receiver.expr.accept(this);
+    }
+
+    @Override
+    public void visit(Return aReturn) {
+        aReturn.retexpr.accept(this);
+    }
+
+    @Override
+    public void visit(ReturnVoid aReturn) {
+
+    }
+
+    @Override
+    public void visit(StaticClassName staticClassName) {
+
+    }
+
+    @Override
+    public void visit(Super aSuper) {
+
+    }
+
+    @Override
+    public void visit(This aThis) {
+
+    }
+
+    @Override
+    public void visit(UnaryPlus unaryPlus) {
+
+    }
+
+    @Override
+    public void visit(WhileStmt whileStmt) {
+
+    }
+
+    @Override
+    public void visit(DoStmt whileStmt) {
+
+    }
+
+    @Override
+    public void visit(Null aNull) {
+
+    }
+
+    @Override
+    public void visit(Literal literal) {
+
+    }
+
+    @Override
+    public void visit(AssignToField assignLeftSide) {
+        assignLeftSide.field.accept(this);
+    }
+
+    @Override
+    public void visit(AssignToLocal assignLeftSide) {
+        assignLeftSide.localVar.accept(this);
+    }
+
+    @Override
+    public void visit(SuperCall superCall) {
+        this.visit((MethodCall)superCall);
+    }
+
+    @Override
+    public void visit(BreakStmt breakStmt) {
+    }
+}
--- a/src/de/dhbwstuttgart/syntaxtree/ClassOrInterface.java
+++ b/src/de/dhbwstuttgart/syntaxtree/ClassOrInterface.java
@ -2,6 +2,7 @@ package de.dhbwstuttgart.syntaxtree;

 import de.dhbwstuttgart.core.IItemWithOffset;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.visual.ASTPrinter;
 import de.dhbwstuttgart.typecheck.JavaClassName;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.typeinference.constraints.Constraint;
@ -15,13 +16,12 @@ import java.util.List;
 /**
 * Stellt jede Art von Klasse dar. Auch abstrakte Klassen und Interfaces
 */
-public class ClassOrInterface extends GTVDeclarationContext implements IItemWithOffset, Generic{
+public class ClassOrInterface extends SyntaxTreeNode {
  protected int modifiers;
  protected JavaClassName name;
  private List<Field> fields = new ArrayList<>();
  private List<Method> methods = new ArrayList<>();
  private GenericDeclarationList genericClassParameters;
-  private Token offset;
  private RefTypeOrTPHOrWildcardOrGeneric superClass;
  protected boolean isInterface;
  private List<? extends RefTypeOrTPHOrWildcardOrGeneric> implementedInterfaces;
@ -31,23 +31,12 @@ public class ClassOrInterface extends GTVDeclarationContext implements IItemWith
                          RefTypeOrTPHOrWildcardOrGeneric superClass, Boolean isInterface, List<? extends RefTypeOrTPHOrWildcardOrGeneric> implementedInterfaces, Token offset){
    super(offset);
      this.modifiers = modifiers;
-    if(name != null){
      this.name = name;
-    }
-    if(fielddecl != null){
      this.fields = fielddecl;
-    }
-    if(genericClassParameters != null){
-      this.genericClassParameters = genericClassParameters;
-    }
-    this.offset = offset;
-    if(superClass != null){
+    this.genericClassParameters = genericClassParameters;
      this.superClass = superClass;
-    }
    this.isInterface = isInterface;
-    if(implementedInterfaces != null){
      this.implementedInterfaces = implementedInterfaces;
-    }
    this.methods = methods;
    this.constructors = constructors;
  }
@ -69,14 +58,6 @@ public class ClassOrInterface extends GTVDeclarationContext implements IItemWith
    return this.methods;
  }

-  public ConstraintSet getConstraints(TypeInferenceInformation info) {
-    ConstraintSet ret = new ConstraintSet();
-    for(Method m : this.getMethods()){
-      ret.addAll(m.getConstraints(info, this));
-    }
-    return ret;
-  }
-
  public RefType getType() {
    return generateTypeOfClass(this.getClassName(), this.getGenerics(), this.getOffset());
  }
@ -93,7 +74,12 @@ public class ClassOrInterface extends GTVDeclarationContext implements IItemWith
    return this.genericClassParameters;
  }

-  public List<? extends Method> getConstructors() {
+  public List<Constructor> getConstructors() {
    return constructors;
  }
+
+  @Override
+  public void accept(ASTVisitor visitor) {
+    visitor.visit(this);
+  }
 }
--- a/src/de/dhbwstuttgart/syntaxtree/Constructor.java
+++ b/src/de/dhbwstuttgart/syntaxtree/Constructor.java
@ -1,14 +1,38 @@
 package de.dhbwstuttgart.syntaxtree;

+import de.dhbwstuttgart.syntaxtree.statement.Statement;
+import de.dhbwstuttgart.syntaxtree.statement.SuperCall;
+import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import org.antlr.v4.runtime.Token;

 import de.dhbwstuttgart.syntaxtree.statement.Block;

+import java.util.List;
+
 public class Constructor extends Method {


-	public Constructor(String name, RefTypeOrTPHOrWildcardOrGeneric returnType, int modifiers, ParameterList parameterList, Block block, GenericDeclarationList gtvDeclarations, Token offset) {
-		super(name, returnType, modifiers, parameterList, block, gtvDeclarations, offset);
+	//TODO: Constructor braucht ein super-Statement
+	public Constructor(String name, RefTypeOrTPHOrWildcardOrGeneric returnType, int modifiers, ParameterList parameterList, Block codeInsideConstructor,
+					   GenericDeclarationList gtvDeclarations, Token offset, List<Statement> fieldInitializations, RefType superClass) {
+		super(name, returnType, modifiers, parameterList, prepareBlock(codeInsideConstructor,fieldInitializations, superClass), gtvDeclarations, offset);
+
+	}
+
+	/**
+	 * @param fieldInitializations - Das sind die Statements,
+	 *                                welche die Felder der zugehörigen Klasse dieses
+	 *                                Konstruktor initialisieren
+	 */
+	protected static Block prepareBlock(Block constructorBlock, List<Statement> fieldInitializations, RefType superClass){
+		List<Statement> statements = constructorBlock.getStatements();
+		statements.add(0, new SuperCall(constructorBlock.getOffset()));
+		return new Block(statements, constructorBlock.getOffset());
+	}
+
+	@Override
+	public void accept(ASTVisitor visitor) {
+		visitor.visit(this);
 	}
 }
--- a/src/de/dhbwstuttgart/syntaxtree/Field.java
+++ b/src/de/dhbwstuttgart/syntaxtree/Field.java
@ -3,7 +3,7 @@ package de.dhbwstuttgart.syntaxtree;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import org.antlr.v4.runtime.Token;

-public class Field extends GTVDeclarationContext implements Generic {
+public class Field extends SyntaxTreeNode{
 	
 	private String name;
 	private RefTypeOrTPHOrWildcardOrGeneric type;
@ -24,5 +24,10 @@ public class Field extends GTVDeclarationContext implements Generic {
 	public RefTypeOrTPHOrWildcardOrGeneric getType() {
 		return type;
 	}
+
+	@Override
+	public void accept(ASTVisitor visitor) {
+		visitor.visit(this);
+	}
 }

--- a/src/de/dhbwstuttgart/syntaxtree/FormalParameter.java
+++ b/src/de/dhbwstuttgart/syntaxtree/FormalParameter.java
@ -17,4 +17,13 @@ public class FormalParameter extends SyntaxTreeNode
    public RefTypeOrTPHOrWildcardOrGeneric getType() {
        return type;
    }
+
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+        visitor.visit(this);
+    }
 }
--- a/src/de/dhbwstuttgart/syntaxtree/GTVDeclarationContext.java
+++ b/src/de/dhbwstuttgart/syntaxtree/GTVDeclarationContext.java
@ -1,13 +0,0 @@
-package de.dhbwstuttgart.syntaxtree;
-
-import org.antlr.v4.runtime.Token;
-
-/**
- * Beischreibt eine SyntaxTreeNode, welcher die Eigenschaft besitzt,
- * dass bei seiner Deklaration auch Generische Typvariablen deklariert wurden.
- */
-public abstract class GTVDeclarationContext extends SyntaxTreeNode {
-    public GTVDeclarationContext(Token offset) {
-        super(offset);
-    }
-}
--- a/src/de/dhbwstuttgart/syntaxtree/Generic.java
+++ b/src/de/dhbwstuttgart/syntaxtree/Generic.java
@ -1,9 +0,0 @@
-package de.dhbwstuttgart.syntaxtree;
-
-/**
- * Wird von allen Klassen implementiert, welche generische Parameter halten kÃ¶nnen. (Class, Method und Field)
- * @author janulrich
- *
- */
-public interface Generic {
-}
--- a/src/de/dhbwstuttgart/syntaxtree/GenericDeclarationList.java
+++ b/src/de/dhbwstuttgart/syntaxtree/GenericDeclarationList.java
@ -26,4 +26,9 @@ public class GenericDeclarationList extends SyntaxTreeNode implements Iterable<G
 	public Iterator<GenericTypeVar> iterator() {
 		return gtvs.iterator();
 	}
+
+	@Override
+	public void accept(ASTVisitor visitor) {
+		visitor.visit(this);
+	}
 }
--- a/src/de/dhbwstuttgart/syntaxtree/GenericTypeVar.java
+++ b/src/de/dhbwstuttgart/syntaxtree/GenericTypeVar.java
@ -51,4 +51,9 @@ public class GenericTypeVar extends SyntaxTreeNode
    public GenericTypeName getName() {
        return name;
    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+        visitor.visit(this);
+    }
 }
--- a/src/de/dhbwstuttgart/syntaxtree/Method.java
+++ b/src/de/dhbwstuttgart/syntaxtree/Method.java
@ -8,6 +8,7 @@ import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;
 import de.dhbwstuttgart.typeinference.typeAlgo.TYPE;
+import de.dhbwstuttgart.typeinference.typeAlgo.TYPEStmt;
 import org.antlr.v4.runtime.Token;

 import de.dhbwstuttgart.core.IItemWithOffset;
@ -23,7 +24,7 @@ import de.dhbwstuttgart.syntaxtree.statement.Block;
 */
 public class Method extends Field implements IItemWithOffset, TypeScope
 {
-	private Block block;
+	public final Block block;
 	private ParameterList parameterlist = new ParameterList(new ArrayList<>(), new NullToken());
 	private ExceptionList exceptionlist;
 	private GenericDeclarationList generics;
@ -36,14 +37,6 @@ public class Method extends Field implements IItemWithOffset, TypeScope
 		this.generics = gtvDeclarations;
 	}

-	public ConstraintSet getConstraints(TypeInferenceInformation info, ClassOrInterface currentClass) {
-		if(block == null)return new ConstraintSet(); //Abstrakte Methoden generieren keine Constraints
-		TypeInferenceBlockInformation blockInfo = new TypeInferenceBlockInformation(info.getAvailableClasses(), currentClass, this);
-		TYPE methodScope = new TYPE(blockInfo);
-		block.accept(methodScope);
-		return methodScope.getConstraints();
-	}
-
 	public ParameterList getParameterList() {
 		return parameterlist;
 	}
@ -56,4 +49,9 @@ public class Method extends Field implements IItemWithOffset, TypeScope
 	public RefTypeOrTPHOrWildcardOrGeneric getReturnType() {
 		return this.getType();
 	}
+
+	@Override
+	public void accept(ASTVisitor visitor) {
+		visitor.visit(this);
+	}
 }
--- a/src/de/dhbwstuttgart/syntaxtree/ParameterList.java
+++ b/src/de/dhbwstuttgart/syntaxtree/ParameterList.java
@ -32,6 +32,11 @@ public class ParameterList extends SyntaxTreeNode implements Iterable<FormalPara

 	@Override
 	public Iterator<FormalParameter> iterator() {
-		return null;
+		return formalparameter.iterator();
 	}
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+        visitor.visit(this);
+    }
 }
--- a/src/de/dhbwstuttgart/syntaxtree/SourceFile.java
+++ b/src/de/dhbwstuttgart/syntaxtree/SourceFile.java
@ -7,26 +7,24 @@ import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.typecheck.JavaClassName;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;
-import sun.security.x509.X509CertInfo;
+//import sun.security.x509.X509CertInfo;


 public class SourceFile extends SyntaxTreeNode{
  private String pkgName;

-  private final List<ClassOrInterface> KlassenVektor;
-  private final List<JavaClassName> imports;
-  private final File file;
+  public final List<ClassOrInterface> KlassenVektor;
+  public final List<JavaClassName> imports;

  /**
     * Die SourceFile reprÃ¤sntiert eine zu einem Syntaxbaum eingelesene Java-Datei.
     * SourceFile stellt dabei den Wurzelknoten des Syntaxbaumes dar.
     */
-  public SourceFile(File file, String pkgName, List<ClassOrInterface> classDefinitions, List<JavaClassName> imports){
+  public SourceFile(String pkgName, List<ClassOrInterface> classDefinitions, List<JavaClassName> imports){
    super(new NullToken());
    this.KlassenVektor = classDefinitions;
    this.pkgName = pkgName;
    this.imports = imports;
-    this.file = file;
  }
  
  public String getPkgName(){
@ -38,28 +36,12 @@ public class SourceFile extends SyntaxTreeNode{
    return this.imports;
  }

-  public ConstraintSet getConstraints(TypeInferenceInformation info) {
-    ConstraintSet ret = new ConstraintSet();
-    for (ClassOrInterface cl : this.KlassenVektor) {
-      ret.addAll(cl.getConstraints(info));
-    }
-    return ret;
-  }
-
-  public TypeInferenceInformation getTypeInferenceInformation(List<SourceFile> sourceFiles){
-    Set<ClassOrInterface> classes = new HashSet<>();
-    for(SourceFile sourceFile : sourceFiles){
-      classes.addAll(sourceFile.KlassenVektor);
-    }
-
-    return new TypeInferenceInformation(classes);
-  }
-
  public List<ClassOrInterface> getClasses() {
    return KlassenVektor;
  }

-  public File getFile() {
-    return file;
+  @Override
+  public void accept(ASTVisitor visitor) {
+    visitor.visit(this);
  }
 }
--- a/src/de/dhbwstuttgart/syntaxtree/StatementVisitor.java
+++ b/src/de/dhbwstuttgart/syntaxtree/StatementVisitor.java
@ -1,5 +1,6 @@
 package de.dhbwstuttgart.syntaxtree;

+import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
 import de.dhbwstuttgart.syntaxtree.statement.*;
 import de.dhbwstuttgart.syntaxtree.statement.literal.Literal;
 import de.dhbwstuttgart.syntaxtree.statement.literal.Null;
@ -7,6 +8,8 @@ import de.dhbwstuttgart.syntaxtree.statement.literal.StringLiteral;

 public interface StatementVisitor {

+    void visit(ArgumentList argumentList);
+
    void visit(LambdaExpression lambdaExpression);

    void visit(Assign assign);
@ -15,6 +18,8 @@ public interface StatementVisitor {

    void visit(Block block);

+    void visit(BreakStmt breakStmt);
+
    void visit(CastExpr castExpr);

    void visit(EmptyStmt emptyStmt);
@ -27,8 +32,6 @@ public interface StatementVisitor {

    void visit(InstanceOf instanceOf);

-    void visit(InstVar instVar);
-
    void visit(LocalVar localVar);

    void visit(LocalVarDecl localVarDecl);
@ -55,7 +58,15 @@ public interface StatementVisitor {

    void visit(WhileStmt whileStmt);

+    void visit(DoStmt whileStmt);
+
    void visit(Null aNull);

    void visit(Literal literal);
+
+    void visit(AssignToField assignLeftSide);
+
+    void visit(AssignToLocal assignLeftSide);
+
+    void visit(SuperCall superCall);
 }
--- a/src/de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.java
+++ b/src/de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.java
@ -6,7 +6,7 @@ import java.util.List;
 import de.dhbwstuttgart.core.IItemWithOffset;
 import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;
 import org.antlr.v4.runtime.Token;
-import org.antlr.v4.runtime.misc.Pair;
+//import org.antlr.v4.runtime.misc.Pair;

 public abstract class SyntaxTreeNode implements IItemWithOffset{
    private final Token offset;
@ -19,4 +19,5 @@ public abstract class SyntaxTreeNode implements IItemWithOffset{
        return offset;
    }

+    public abstract void accept(ASTVisitor visitor);
 }
--- a/src/de/dhbwstuttgart/syntaxtree/factory/ASTFactory.java
+++ b/src/de/dhbwstuttgart/syntaxtree/factory/ASTFactory.java
@ -25,15 +25,9 @@ import org.antlr.v4.runtime.Token;
 * dass alle Imports und Typnamen korrekt sind und müssen diese nicht überprüfen.
 */
 public class ASTFactory {
-	private final JavaClassRegistry names;

-
-	public ASTFactory(JavaClassRegistry scope){
-		names = scope;
-	}
-
-	public ClassOrInterface createClass(java.lang.Class jreClass){
-		JavaClassName name = names.getName(jreClass.getName());
+	public static ClassOrInterface createClass(java.lang.Class jreClass){
+		JavaClassName name = new JavaClassName(jreClass.getName());
 		List<Method> methoden = new ArrayList<>();
 		List<de.dhbwstuttgart.syntaxtree.Constructor> konstruktoren = new ArrayList<>();
 		for(java.lang.reflect.Constructor constructor : jreClass.getConstructors()){
@ -43,6 +37,9 @@ public class ASTFactory {
 			methoden.add(createMethod(method, jreClass));
 		}
 		List<Field> felder = new ArrayList<>();
+		for(java.lang.reflect.Field field : jreClass.getFields()){
+			felder.add(createField(field, name));
+		}
 		int modifier = jreClass.getModifiers();
 		boolean isInterface = jreClass.isInterface();
 		java.lang.Class superjreClass = jreClass.getSuperclass();
@ -63,13 +60,17 @@ public class ASTFactory {
 		return new ClassOrInterface(modifier, name, felder, methoden, konstruktoren, genericDeclarationList, superClass,isInterface, implementedInterfaces, offset);
 	}

-    private de.dhbwstuttgart.syntaxtree.Constructor createConstructor(Constructor constructor, Class inClass) {
+	private static Field createField(java.lang.reflect.Field field, JavaClassName jreClass) {
+		return new Field(field.getName(), createType(field.getType(), jreClass, null), field.getModifiers(), new NullToken());
+	}
+
+	private static de.dhbwstuttgart.syntaxtree.Constructor createConstructor(Constructor constructor, Class inClass) {
 		String name = constructor.getName();
-		RefTypeOrTPHOrWildcardOrGeneric returnType = createType(inClass, names.getName(inClass.getName()), name);
+		RefTypeOrTPHOrWildcardOrGeneric returnType = createType(inClass, new JavaClassName(inClass.getName()), name);
 		Parameter[] jreParams = constructor.getParameters();
 		List<FormalParameter> params = new ArrayList<>();
 		for(Parameter jreParam : jreParams){
-			RefTypeOrTPHOrWildcardOrGeneric paramType = createType(jreParam.getType(),names.getName(inClass.getName()), name);
+			RefTypeOrTPHOrWildcardOrGeneric paramType = createType(jreParam.getType(),new JavaClassName(inClass.getName()), name);
 			params.add(new FormalParameter(jreParam.getName(),paramType, new NullToken()));
 		}
 		ParameterList parameterList = new ParameterList(params, new NullToken());
@ -78,17 +79,26 @@ public class ASTFactory {
 		Token offset = new NullToken();
 		int modifier = constructor.getModifiers();

-		return new de.dhbwstuttgart.syntaxtree.Constructor(name,returnType, modifier, parameterList, block, gtvDeclarations, offset);
+		if(inClass.equals(java.lang.Object.class)){
+			return null;
+		}
+
+		return new de.dhbwstuttgart.syntaxtree.Constructor(name,returnType, modifier, parameterList, block, gtvDeclarations, offset, new ArrayList<>(),
+				createType(inClass.getSuperclass()));
    }

-    public Method createMethod(java.lang.reflect.Method jreMethod, java.lang.Class inClass){
+	private static RefType createType(Class classType) {
+		return createClass(classType).getType();
+	}
+
+	public static Method createMethod(java.lang.reflect.Method jreMethod, java.lang.Class inClass){
 		String name = jreMethod.getName();
 		RefTypeOrTPHOrWildcardOrGeneric returnType;
-			returnType = createType(jreMethod.getReturnType(),names.getName(inClass.getName()), name);
+			returnType = createType(jreMethod.getReturnType(),new JavaClassName(inClass.getName()), name);
 		Parameter[] jreParams = jreMethod.getParameters();
 		List<FormalParameter> params = new ArrayList<>();
 		for(Parameter jreParam : jreParams){
-			RefTypeOrTPHOrWildcardOrGeneric paramType = createType(jreParam.getType(),names.getName(inClass.getName()), name);
+			RefTypeOrTPHOrWildcardOrGeneric paramType = createType(jreParam.getType(),new JavaClassName(inClass.getName()), name);
 			params.add(new FormalParameter(jreParam.getName(),paramType, new NullToken()));
 		}
 		ParameterList parameterList = new ParameterList(params, new NullToken());
@ -100,7 +110,7 @@ public class ASTFactory {
 		return new Method(name,returnType, modifier, parameterList, block, gtvDeclarations, offset);
 	}

-	public GenericDeclarationList createGenerics(TypeVariable[] typeParameters, Class context, String methodName){
+	public static GenericDeclarationList createGenerics(TypeVariable[] typeParameters, Class context, String methodName){
 		List<de.dhbwstuttgart.syntaxtree.GenericTypeVar> gtvs = new ArrayList<>();
 		for(TypeVariable jreTV : typeParameters){
 			de.dhbwstuttgart.syntaxtree.GenericTypeVar gtv = createGeneric(jreTV, jreTV.getName(), context, methodName);
@ -120,23 +130,23 @@ public class ASTFactory {
 	}
 	*/

-	public RefTypeOrTPHOrWildcardOrGeneric createType(java.lang.reflect.Type type, JavaClassName parentClass, String parentMethod){
+	public static RefTypeOrTPHOrWildcardOrGeneric createType(java.lang.reflect.Type type, JavaClassName parentClass, String parentMethod){
 		if(type.getTypeName().equals("void")){
 			return new Void(new NullToken());
 		}else if(type.getTypeName().equals("int")){
-			return new RefType(this.names.getName("java.lang.Integer"), new ArrayList<>(), new NullToken());
+			return new RefType(new JavaClassName("java.lang.Integer"), new ArrayList<>(), new NullToken());
 		}else if(type.getTypeName().equals("byte")){
-			return new RefType(this.names.getName("java.lang.Byte"), new ArrayList<>(), new NullToken());
+			return new RefType(new JavaClassName("java.lang.Byte"), new ArrayList<>(), new NullToken());
 		}else if(type.getTypeName().equals("boolean")){
-			return new RefType(this.names.getName("java.lang.Boolean"), new ArrayList<>(), new NullToken());
+			return new RefType(new JavaClassName("java.lang.Boolean"), new ArrayList<>(), new NullToken());
 		}else if(type.getTypeName().equals("char")){
-			return new RefType(this.names.getName("java.lang.Char"), new ArrayList<>(), new NullToken());
+			return new RefType(new JavaClassName("java.lang.Char"), new ArrayList<>(), new NullToken());
 		}else if(type.getTypeName().equals("short")){
-			return new RefType(this.names.getName("java.lang.Short"), new ArrayList<>(), new NullToken());
+			return new RefType(new JavaClassName("java.lang.Short"), new ArrayList<>(), new NullToken());
 		}else if(type.getTypeName().equals("double")){
-			return new RefType(this.names.getName("java.lang.Double"), new ArrayList<>(), new NullToken());
+			return new RefType(new JavaClassName("java.lang.Double"), new ArrayList<>(), new NullToken());
 		}else if(type.getTypeName().equals("long")){
-			return new RefType(this.names.getName("java.lang.Long"), new ArrayList<>(), new NullToken());
+			return new RefType(new JavaClassName("java.lang.Long"), new ArrayList<>(), new NullToken());
 		}else{
 			if(type instanceof TypeVariable){
 				//GTVDeclarationContext via "(TypeVariable) type).getGenericDeclaration()"
@ -150,13 +160,13 @@ public class ASTFactory {
 					params.add(createType(t, parentClass, parentMethod));
 				}
 			}
-			RefType ret = new RefType(this.names.getName(type.getTypeName()), params, new NullToken());
+			RefType ret = new RefType(new JavaClassName(type.getTypeName()), params, new NullToken());
 			return ret;
 		}
 	}

-	public de.dhbwstuttgart.syntaxtree.GenericTypeVar createGeneric(TypeVariable jreTypeVar, String jreTVName, Class context, String parentMethod){
-		JavaClassName parentClass = names.getName(context.getName());
+	public static de.dhbwstuttgart.syntaxtree.GenericTypeVar createGeneric(TypeVariable jreTypeVar, String jreTVName, Class context, String parentMethod){
+		JavaClassName parentClass = new JavaClassName(context.getName());
 		List<RefType> genericBounds = new ArrayList<>();
 		java.lang.reflect.Type[] bounds = jreTypeVar.getBounds();
 		if(bounds.length > 0){
@ -169,8 +179,8 @@ public class ASTFactory {
 				, genericBounds, new NullToken(), new NullToken());
 	}

-	public ClassOrInterface createObjectClass() {
-		return this.createClass(Object.class);
+	public static ClassOrInterface createObjectClass() {
+		return createClass(Object.class);
 	}

 	/*
--- a/src/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java
+++ b/src/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java
@ -11,6 +11,9 @@ import de.dhbwstuttgart.syntaxtree.type.Void;
 import de.dhbwstuttgart.typecheck.JavaClassName;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.constraints.Pair;
+import de.dhbwstuttgart.typeinference.result.PairTPHequalRefType;
+import de.dhbwstuttgart.typeinference.result.PairTPHsmallerTPH;
+import de.dhbwstuttgart.typeinference.result.ResultPair;
 import de.dhbwstuttgart.typeinference.unify.model.ExtendsType;
 import de.dhbwstuttgart.typeinference.unify.model.FiniteClosure;
 import de.dhbwstuttgart.typeinference.unify.model.FunNType;
@ -118,39 +121,39 @@ public class UnifyTypeFactory {
    }

    public static UnifyPair convert(Pair p) {
-        if(p.OperatorSmaller()) {
+        if(p.GetOperator().equals(PairOperator.SMALLERDOT)) {
            UnifyPair ret = generateSmallerDotPair(UnifyTypeFactory.convert(p.TA1)
                    , UnifyTypeFactory.convert(p.TA2));
            return ret;
-        }else if(p.OperatorEqual()){
+        }else if(p.GetOperator().equals(PairOperator.EQUALSDOT)){
            UnifyPair ret = generateEqualDotPair(UnifyTypeFactory.convert(p.TA1)
                    , UnifyTypeFactory.convert(p.TA2));
            return ret;
-        }else throw new NotImplementedException();
-
+        }else            throw new NotImplementedException();
    }

    /**
     * Convert from
     * UnifyType -> ASTType
     */
-    public static Set<Set<Pair>> convert(Set<Set<UnifyPair>> unifyPairSet, Map<String,TypePlaceholder> tphs) {
+    public static Set<ResultPair> convert(Set<UnifyPair> unifyPairSet, Map<String,TypePlaceholder> tphs) {
        return unifyPairSet.stream().map(
-                set -> set.stream().map(
-                        unifyPair -> convert(unifyPair, tphs))
-                        .collect(Collectors.toSet()))
-                .collect(Collectors.toSet());
+                unifyPair -> convert(unifyPair, tphs))
+                        .collect(Collectors.toSet());
    }

-    public static Pair convert(UnifyPair mp, Map<String,TypePlaceholder> tphs) {
+    public static ResultPair convert(UnifyPair mp, Map<String,TypePlaceholder> tphs) {
        RefTypeOrTPHOrWildcardOrGeneric tl = UnifyTypeFactory.convert(mp.getLhsType(), tphs);
        RefTypeOrTPHOrWildcardOrGeneric tr = UnifyTypeFactory.convert(mp.getRhsType(), tphs);
-        return new Pair(tl, tr, mp.getPairOp());
+        if(tl instanceof TypePlaceholder){
+            if(tr instanceof TypePlaceholder) return new PairTPHsmallerTPH((TypePlaceholder)tl, (TypePlaceholder)tr);
+            return new PairTPHequalRefType((TypePlaceholder)tl, tr);
+        }else throw new NotImplementedException();
    }

    public static RefTypeOrTPHOrWildcardOrGeneric convert(ReferenceType t, Map<String,TypePlaceholder> tphs) {
        if(JavaClassName.Void.equals(t.getName()))return new Void(new NullToken());
-        RefType ret = new RefType(JavaClassName.Void,convert(t.getTypeParams(), tphs),new NullToken());
+        RefType ret = new RefType(new JavaClassName(t.getName()),convert(t.getTypeParams(), tphs),new NullToken());
        return ret;
    }

@ -160,12 +163,12 @@ public class UnifyTypeFactory {
    }

    public static RefTypeOrTPHOrWildcardOrGeneric convert(SuperType t, Map<String,TypePlaceholder> tphs) {
-        RefType innerType = new RefType(new JavaClassName(t.getSuperedType().getName()), new NullToken());
+        RefTypeOrTPHOrWildcardOrGeneric innerType = convert(t.getSuperedType(), tphs);
        return new SuperWildcardType(innerType, new NullToken());
    }

    public static RefTypeOrTPHOrWildcardOrGeneric convert(ExtendsType t, Map<String,TypePlaceholder> tphs) {
-        RefType innerType = new RefType(new JavaClassName(t.getExtendedType().getName()), new NullToken());
+        RefTypeOrTPHOrWildcardOrGeneric innerType = convert(t.getExtendedType(), tphs);
        return new ExtendsWildcardType(innerType, new NullToken());
    }

@ -173,6 +176,7 @@ public class UnifyTypeFactory {
        TypePlaceholder ret = tphs.get(t.getName());
        if(ret == null){ //Dieser TPH wurde vom Unifikationsalgorithmus erstellt
            ret = TypePlaceholder.fresh(new NullToken());
+            tphs.put(t.getName(), ret);
        }
        return ret;
    }
--- a/src/de/dhbwstuttgart/syntaxtree/operator/AddOp.java
+++ b/src/de/dhbwstuttgart/syntaxtree/operator/AddOp.java
@ -1,23 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.operator;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.antlr.v4.runtime.Token;
-import org.apache.bcel.Constants;
-import org.apache.bcel.generic.ArithmeticInstruction;
-import org.apache.bcel.generic.DUP;
-import org.apache.bcel.generic.IADD;
-import org.apache.bcel.generic.InstructionList;
-import org.apache.bcel.generic.InvokeInstruction;
-import org.apache.bcel.generic.ObjectType;
-
-
-
-public abstract class AddOp extends Operator
-{
-    public AddOp(Token offset) {
-            super(offset);
-    }
-
-}
--- a/src/de/dhbwstuttgart/syntaxtree/operator/AndOp.java
+++ b/src/de/dhbwstuttgart/syntaxtree/operator/AndOp.java
@ -1,18 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.operator;
-
-import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
-import de.dhbwstuttgart.syntaxtree.statement.Binary;
-import org.antlr.v4.runtime.Token;
-import org.apache.bcel.generic.InstructionList;
-
-public class AndOp extends LogOp
-{
-
-    public AndOp(Token offset)
-    {
-        super(offset);
-    }
-
-
-    
-}
--- a/src/de/dhbwstuttgart/syntaxtree/operator/DivideOp.java
+++ b/src/de/dhbwstuttgart/syntaxtree/operator/DivideOp.java
@ -1,12 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.operator;
-
-import org.antlr.v4.runtime.Token;
-
-
-
-public class DivideOp extends MulOp
-{
-    public DivideOp(Token offset) {
-        super(offset);
-    }
-}
--- a/src/de/dhbwstuttgart/syntaxtree/operator/EqualOp.java
+++ b/src/de/dhbwstuttgart/syntaxtree/operator/EqualOp.java
@ -1,15 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.operator;
-
-import org.antlr.v4.runtime.Token;
-import org.apache.bcel.generic.BranchInstruction;
-import org.apache.bcel.generic.IF_ICMPNE;
-
-
-public class EqualOp extends RelOp
-{
-
-
-    public EqualOp(Token offset) {
-        super(offset);
-    }
-}
--- a/src/de/dhbwstuttgart/syntaxtree/operator/GreaterEquOp.java
+++ b/src/de/dhbwstuttgart/syntaxtree/operator/GreaterEquOp.java
@ -1,13 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.operator;
-
-import org.antlr.v4.runtime.Token;
-
-
-
-public class GreaterEquOp extends RelOp
-{
-
-    public GreaterEquOp(Token offset) {
-        super(offset);
-    }
-}
--- a/src/de/dhbwstuttgart/syntaxtree/operator/GreaterOp.java
+++ b/src/de/dhbwstuttgart/syntaxtree/operator/GreaterOp.java
@ -1,14 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.operator;
-import org.antlr.v4.runtime.Token;
-
-
-
-
-public class GreaterOp extends RelOp
-{
-
-
-    public GreaterOp(Token offset) {
-        super(offset);
-    }
-}
--- a/src/de/dhbwstuttgart/syntaxtree/operator/LessEquOp.java
+++ b/src/de/dhbwstuttgart/syntaxtree/operator/LessEquOp.java
@ -1,15 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.operator;
-
-import org.antlr.v4.runtime.Token;
-
-
-
-
-public class LessEquOp extends RelOp
-{
-
-
-    public LessEquOp(Token offset) {
-        super(offset);
-    }
-}
--- a/src/de/dhbwstuttgart/syntaxtree/operator/LessOp.java
+++ b/src/de/dhbwstuttgart/syntaxtree/operator/LessOp.java
@ -1,14 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.operator;
-import org.antlr.v4.runtime.Token;
-
-
-
-
-public class LessOp extends RelOp
-{
-    public LessOp(Token offset)
-    {
-        super(offset);
-    }
-
-}
--- a/src/de/dhbwstuttgart/syntaxtree/operator/LogOp.java
+++ b/src/de/dhbwstuttgart/syntaxtree/operator/LogOp.java
@ -1,18 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.operator;
-import org.antlr.v4.runtime.Token;
-
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-
-
-public abstract class LogOp extends Operator
-{
-    
-    public LogOp(Token offset)
-    {
-        super(offset);
-    }
-
-}
--- a/src/de/dhbwstuttgart/syntaxtree/operator/MinusOp.java
+++ b/src/de/dhbwstuttgart/syntaxtree/operator/MinusOp.java
@ -1,11 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.operator;
-
-
-import org.antlr.v4.runtime.Token;
-
-public class MinusOp extends AddOp
-{
-    public MinusOp(Token offset) {
-        super(offset);
-    }
-}
--- a/src/de/dhbwstuttgart/syntaxtree/operator/ModuloOp.java
+++ b/src/de/dhbwstuttgart/syntaxtree/operator/ModuloOp.java
@ -1,15 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.operator;
-
-import org.antlr.v4.runtime.Token;
-
-
-
-
-public class ModuloOp extends MulOp
-{
-    public ModuloOp(Token offset)
-    {
-        super(offset);
-    }
-
-}
--- a/src/de/dhbwstuttgart/syntaxtree/operator/MulOp.java
+++ b/src/de/dhbwstuttgart/syntaxtree/operator/MulOp.java
@ -1,10 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.operator;
-
-import org.antlr.v4.runtime.Token;
-
-public abstract class MulOp extends Operator
-{
-    public MulOp(Token offset) {
-        super(offset);
-    }
-}
--- a/src/de/dhbwstuttgart/syntaxtree/operator/NotEqualOp.java
+++ b/src/de/dhbwstuttgart/syntaxtree/operator/NotEqualOp.java
@ -1,11 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.operator;
-
-import org.antlr.v4.runtime.Token;
-
-public class NotEqualOp extends RelOp
-{
-
-    public NotEqualOp(Token offset) {
-        super(offset);
-    }
-}
--- a/src/de/dhbwstuttgart/syntaxtree/operator/Operator.java
+++ b/src/de/dhbwstuttgart/syntaxtree/operator/Operator.java
@ -1,13 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.operator;
-
-
-import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
-import org.antlr.v4.runtime.Token;
-
-public abstract class Operator extends SyntaxTreeNode
-{
-
-    public Operator(Token offset) {
-        super(offset);
-    }
-}
--- a/src/de/dhbwstuttgart/syntaxtree/operator/OrOp.java
+++ b/src/de/dhbwstuttgart/syntaxtree/operator/OrOp.java
@ -1,15 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.operator;
-
-import org.antlr.v4.runtime.Token;
-
-
-public class OrOp extends LogOp
-{
-
-    public OrOp(Token offset)
-    {
-        super(offset);
-    }
-
-    
-}
--- a/src/de/dhbwstuttgart/syntaxtree/operator/PlusOp.java
+++ b/src/de/dhbwstuttgart/syntaxtree/operator/PlusOp.java
@ -1,12 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.operator;
-
-
-import org.antlr.v4.runtime.Token;
-
-public class PlusOp extends AddOp
-{
-    public PlusOp(Token offset)
-    {
-        super(offset);
-    }
-}
--- a/src/de/dhbwstuttgart/syntaxtree/operator/RelOp.java
+++ b/src/de/dhbwstuttgart/syntaxtree/operator/RelOp.java
@ -1,11 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.operator;
-
-import org.antlr.v4.runtime.Token;
-
-public abstract class RelOp extends Operator
-{
-
-    public RelOp(Token offset) {
-        super(offset);
-    }
-}
--- a/src/de/dhbwstuttgart/syntaxtree/operator/TimesOp.java
+++ b/src/de/dhbwstuttgart/syntaxtree/operator/TimesOp.java
@ -1,11 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.operator;
-
-import org.antlr.v4.runtime.Token;
-
-public class TimesOp extends MulOp
-{
-    public TimesOp(Token offset)
-    {
-        super(offset);
-    }
-}
--- a/src/de/dhbwstuttgart/syntaxtree/statement/ArgumentList.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/ArgumentList.java
@ -1,6 +1,7 @@
 package de.dhbwstuttgart.syntaxtree.statement;


+import de.dhbwstuttgart.syntaxtree.ASTVisitor;
 import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
 import org.antlr.v4.runtime.Token;

@ -19,4 +20,8 @@ public class ArgumentList extends SyntaxTreeNode
 		return expr;
 	}

+	@Override
+	public void accept(ASTVisitor visitor) {
+		visitor.visit(this);
+	}
 }
--- a/src/de/dhbwstuttgart/syntaxtree/statement/AssertStmt.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/AssertStmt.java
@ -0,0 +1,24 @@
+package de.dhbwstuttgart.syntaxtree.statement;
+
+import de.dhbwstuttgart.syntaxtree.StatementVisitor;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import org.antlr.v4.runtime.Token;
+
+import java.util.List;
+
+/**
+ * Created by Felix_K on 21.09.2017.
+ */
+public class AssertStmt extends Statement
+{
+    public final List<Expression> expr;
+    public AssertStmt(RefTypeOrTPHOrWildcardOrGeneric type, List<Expression> expr, Token offset){
+        super(type, offset);
+        this.expr=expr;
+    }
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+
+    }
+}
--- a/src/de/dhbwstuttgart/syntaxtree/statement/Assign.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/Assign.java
@ -8,13 +8,16 @@ import de.dhbwstuttgart.typeinference.constraints.ConstraintsFactory;
 import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
 import org.antlr.v4.runtime.Token;

-
+/*
+Aufbau:
+rightSide = leftSide
+ */
 public class Assign extends Statement
 {
    public final Expression rightSide;
-    public final Expression lefSide;
+    public final AssignLeftSide lefSide;

-    public Assign(Expression leftHandSide, Expression value, Token offset) {
+    public Assign(AssignLeftSide leftHandSide, Expression value, Token offset) {
 		super(leftHandSide.getType(), offset);
        this.rightSide = value;
        this.lefSide = leftHandSide;
--- a/src/de/dhbwstuttgart/syntaxtree/statement/AssignLeftSide.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/AssignLeftSide.java
@ -0,0 +1,12 @@
+package de.dhbwstuttgart.syntaxtree.statement;
+
+import de.dhbwstuttgart.syntaxtree.StatementVisitor;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import org.antlr.v4.runtime.Token;
+
+public abstract class AssignLeftSide extends TypableStatement{
+
+    public AssignLeftSide(RefTypeOrTPHOrWildcardOrGeneric type, Token offset) {
+        super(type, offset);
+    }
+}
--- a/src/de/dhbwstuttgart/syntaxtree/statement/AssignToField.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/AssignToField.java
@ -0,0 +1,16 @@
+package de.dhbwstuttgart.syntaxtree.statement;
+
+import de.dhbwstuttgart.syntaxtree.StatementVisitor;
+
+public class AssignToField extends AssignLeftSide{
+    public final FieldVar field;
+    public AssignToField(FieldVar fieldVar) {
+        super(fieldVar.getType(), fieldVar.getOffset());
+        field = fieldVar;
+    }
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+}
--- a/src/de/dhbwstuttgart/syntaxtree/statement/Binary.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/Binary.java
@ -6,12 +6,16 @@ import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;

-import de.dhbwstuttgart.syntaxtree.operator.Operator;
-

 // neu von Felix
 public class Binary extends Expression
 {
+    public enum Operator{
+        ADD,
+        SUB,
+        MUL,
+        AND, OR, DIV
+    }
    public Binary(Expression expr1, Expression expr2, Operator op){
        super(null, null);
    }
--- a/src/de/dhbwstuttgart/syntaxtree/statement/BreakStmt.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/BreakStmt.java
@ -0,0 +1,25 @@
+package de.dhbwstuttgart.syntaxtree.statement;
+
+import com.sun.scenario.effect.Offset;
+import de.dhbwstuttgart.syntaxtree.StatementVisitor;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.tree.TerminalNode;
+
+/**
+ * Created by Felix_K on 20.09.2017.
+ */
+public class BreakStmt extends Statement
+{
+    public final String indentifier;
+
+    public BreakStmt(RefTypeOrTPHOrWildcardOrGeneric type, String Indentifier, Token offset)
+    {
+    super(type, offset);
+    this.indentifier=Indentifier;
+    }
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+}
--- a/src/de/dhbwstuttgart/syntaxtree/statement/CatchesStatement.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/CatchesStatement.java
@ -0,0 +1,15 @@
+package de.dhbwstuttgart.syntaxtree.statement;
+
+import java.util.List;
+
+/**
+ * Created by Felix_K on 21.09.2017.
+ */
+public class CatchesStatement
+{
+    final List<Statement> catchClauses;
+    public CatchesStatement(List<Statement> catches)
+    {
+        catchClauses = catches;
+    }
+}
--- a/src/de/dhbwstuttgart/syntaxtree/statement/ContinueStmt.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/ContinueStmt.java
@ -0,0 +1,14 @@
+package de.dhbwstuttgart.syntaxtree.statement;
+
+import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import org.antlr.v4.runtime.Token;
+
+/**
+ * Created by Felix_K on 22.09.2017.
+ */
+public class ContinueStmt extends BreakStmt {
+    public ContinueStmt(RefTypeOrTPHOrWildcardOrGeneric type, String indent, Token offset){
+        super(type, indent, offset);
+    }
+}
--- a/src/de/dhbwstuttgart/syntaxtree/statement/DoStmt.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/DoStmt.java
@ -0,0 +1,18 @@
+package de.dhbwstuttgart.syntaxtree.statement;
+
+import de.dhbwstuttgart.syntaxtree.StatementVisitor;
+import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import org.antlr.v4.runtime.Token;
+
+public class DoStmt extends WhileStmt
+{
+    public DoStmt(Expression expr, Statement loopBlock, Token offset)
+    {
+        super(expr, loopBlock, offset);
+    }
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+}
--- a/src/de/dhbwstuttgart/syntaxtree/statement/Expression.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/Expression.java
@ -1,6 +1,7 @@

 package de.dhbwstuttgart.syntaxtree.statement;

+import de.dhbwstuttgart.syntaxtree.ASTVisitor;
 import de.dhbwstuttgart.syntaxtree.StatementVisitor;
 import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
@ -8,19 +9,9 @@ import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import org.antlr.v4.runtime.Token;

-public abstract class Expression extends SyntaxTreeNode
+public abstract class Expression extends TypableStatement
 {
-    private RefTypeOrTPHOrWildcardOrGeneric type;
-
    public Expression(RefTypeOrTPHOrWildcardOrGeneric type, Token offset){
-        super(offset);
-        if(type == null)throw new NullPointerException();
-        this.type = type;
+        super(type, offset);
    }
-
-    public RefTypeOrTPHOrWildcardOrGeneric getType(){
-        return type;
-    }
-
-    public abstract void accept(StatementVisitor visitor);
 }
--- a/src/de/dhbwstuttgart/syntaxtree/statement/IfStmt.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/IfStmt.java
@ -1,22 +1,28 @@
 package de.dhbwstuttgart.syntaxtree.statement;

 import de.dhbwstuttgart.syntaxtree.StatementVisitor;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;
+import org.antlr.v4.runtime.Token;


 public class IfStmt extends Statement
 {
-    public IfStmt(int offset, int variableLength)
+    public final Expression expr;
+    public final Statement then_block;
+    public final Statement else_block;
+
+       public IfStmt(RefTypeOrTPHOrWildcardOrGeneric type,
+                  Expression expr, Statement thenBlock, Statement elseBlock, Token offset)
    {
-        super(null,null);
+        super(type,offset);
+        this.expr = expr;
+        this.then_block = thenBlock;
+        this.else_block = elseBlock;
    }
-    
-    public boolean hamaDebug = true;    //hama: Debug Ausgaben von mir ein- bzw. ausschalten
-    public Expression expr;
-    public Block then_block;
-    public Block else_block;
+

    @Override
    public void accept(StatementVisitor visitor) {
--- a/src/de/dhbwstuttgart/syntaxtree/statement/InstVar.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/InstVar.java
@ -1,24 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.exceptions.NotImplementedException;
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;
-import org.antlr.v4.runtime.Token;
-
-
-public class InstVar extends Expression
-{
-    private Expression expr;
-    public InstVar(Expression instanz, String name, Token offset)
-    {
-        super(instanz.getType(),offset);
-        expr = instanz;
-    }
-
-    @Override
-    public void accept(StatementVisitor visitor) {
-        visitor.visit(this);
-    }
-}
--- a/src/de/dhbwstuttgart/syntaxtree/statement/LambdaExpression.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/LambdaExpression.java
@ -8,7 +8,7 @@ import de.dhbwstuttgart.typeinference.constraints.Constraint;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.constraints.Pair;
 import org.antlr.v4.runtime.Token;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
+//import sun.reflect.generics.reflectiveObjects.NotImplementedException;

 import java.util.ArrayList;

--- a/src/de/dhbwstuttgart/syntaxtree/statement/LambdaParameter.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/LambdaParameter.java
@ -1,17 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.syntaxtree.FormalParameter;
-
-/**
- * Der FormalParameter einer LambdaExpression hat gesonderte Eigenschaften.
- * @author janulrich
- *
- */
-public class LambdaParameter extends FormalParameter {
-
-	public LambdaParameter(FormalParameter fp) {
-		super(null,null,null);
-	}
-
-
-}
--- a/src/de/dhbwstuttgart/syntaxtree/statement/LocalVar.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/LocalVar.java
@ -1,28 +1,23 @@
 package de.dhbwstuttgart.syntaxtree.statement;

-import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.syntaxtree.StatementVisitor;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;
 import org.antlr.v4.runtime.Token;

 public class LocalVar extends Statement{

-    protected final String expression;
+    public final String name;

    public LocalVar(String n, RefTypeOrTPHOrWildcardOrGeneric type, Token offset)
    {
        super(type,offset);
-        this.expression = n;
+        this.name = n;
    }

    public LocalVar(Expression e1, RefTypeOrTPHOrWildcardOrGeneric type, String access)
    {
        super(type,e1.getOffset());
-        this.expression = access;
+        this.name = access;
    }

    @Override
--- a/src/de/dhbwstuttgart/syntaxtree/statement/NewClass.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/NewClass.java
@ -31,7 +31,7 @@ public class NewClass extends MethodCall
     * @param start
     */
    public NewClass(RefType newClass, ArgumentList args, Token start) {
-        super(newClass, new Receiver(new EmptyStmt(start)), "new "+newClass.getName().toString(), args, start);
+        super(newClass, new Receiver(new EmptyStmt(start)), newClass.getName().toString(), args, start);
    }

    @Override
--- a/src/de/dhbwstuttgart/syntaxtree/statement/PostDecExpr.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/PostDecExpr.java
@ -3,6 +3,7 @@ import java.util.Hashtable;
 import java.util.Iterator;

 import de.dhbwstuttgart.parser.antlr.Java8Parser;
+import org.antlr.v4.runtime.Token;
 import  org.apache.bcel.generic.ClassGen;
 import org.apache.bcel.generic.InstructionList;

--- a/src/de/dhbwstuttgart/syntaxtree/statement/PostIncExpr.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/PostIncExpr.java
@ -4,12 +4,15 @@ import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
+import org.antlr.v4.runtime.Token;


 public class PostIncExpr extends UnaryExpr
 {
+    final Expression expr;
    public PostIncExpr(Expression expr) {
        super(null);
+        this.expr=expr;
    }

 }
--- a/src/de/dhbwstuttgart/syntaxtree/statement/PreDecExpr.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/PreDecExpr.java
@ -12,8 +12,10 @@ import org.apache.bcel.generic.InstructionList;

 public class PreDecExpr extends UnaryExpr
 {
-    public PreDecExpr(Token offset)
+    Expression expr;
+    public PreDecExpr(Expression expr, Token offset)
    {
        super(offset);
+        this.expr=expr;
    }
 }
--- a/src/de/dhbwstuttgart/syntaxtree/statement/PreIncExpr.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/PreIncExpr.java
@ -5,8 +5,10 @@ import org.antlr.v4.runtime.Token;

 public class PreIncExpr extends UnaryExpr
 {
-    public PreIncExpr(Token offset)
+    final Expression expr;
+    public PreIncExpr(Expression expr,Token offset)
    {
        super(offset);
+        this.expr=expr;
    }
 }
--- a/src/de/dhbwstuttgart/syntaxtree/statement/SuperCall.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/SuperCall.java
@ -1,5 +1,9 @@
 package de.dhbwstuttgart.syntaxtree.statement;

+import de.dhbwstuttgart.syntaxtree.StatementVisitor;
+import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.type.Void;
+import org.antlr.v4.runtime.Token;
 import  org.apache.bcel.Constants;
 import  org.apache.bcel.generic.InstructionFactory;
 import  org.apache.bcel.generic.InstructionHandle;
@ -7,18 +11,22 @@ import  org.apache.bcel.generic.InstructionList;

 import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;

+import java.util.ArrayList;


-public class SuperCall extends ThisCall
+public class SuperCall extends MethodCall
 {
-    public SuperCall(int offset,int variableLength)
-    {
-        super(null,null,variableLength);
+    public SuperCall(Token offset){
+        this(new ArgumentList(new ArrayList<Expression>(), offset),offset);
    }

-    public SuperCall(SyntaxTreeNode parent){
-    	this(0,0);
+    public SuperCall(ArgumentList argumentList, Token offset){
+        super(new Void(offset), new Receiver(new This(offset)), "<init>", argumentList, offset);
    }

-	
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
 }
--- a/src/de/dhbwstuttgart/syntaxtree/statement/SwitchStmt.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/SwitchStmt.java
@ -0,0 +1,24 @@
+package de.dhbwstuttgart.syntaxtree.statement;
+
+import de.dhbwstuttgart.syntaxtree.StatementVisitor;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import org.antlr.v4.runtime.Token;
+
+/**
+ * Created by Felix_K on 23.09.2017.
+ */
+public class SwitchStmt extends Statement
+{
+    public final Expression expr;
+    public final Block switchBlock;
+
+    public SwitchStmt(RefTypeOrTPHOrWildcardOrGeneric type,Expression expr, Block block, Token offset){
+        super(type,offset);
+        this.expr=expr;
+        this.switchBlock=block;
+    }
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+    }
+}
--- a/src/de/dhbwstuttgart/syntaxtree/statement/This.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/This.java
@ -1,7 +1,6 @@
 package de.dhbwstuttgart.syntaxtree.statement;

 import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.operator.Operator;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
--- a/src/de/dhbwstuttgart/syntaxtree/statement/TypableStatement.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/TypableStatement.java
@ -0,0 +1,28 @@
+package de.dhbwstuttgart.syntaxtree.statement;
+
+import de.dhbwstuttgart.syntaxtree.ASTVisitor;
+import de.dhbwstuttgart.syntaxtree.StatementVisitor;
+import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import org.antlr.v4.runtime.Token;
+
+public abstract class TypableStatement extends SyntaxTreeNode{
+    private RefTypeOrTPHOrWildcardOrGeneric type;
+
+    public TypableStatement(RefTypeOrTPHOrWildcardOrGeneric type, Token offset){
+        super(offset);
+        if(type == null)throw new NullPointerException();
+        this.type = type;
+    }
+
+    public RefTypeOrTPHOrWildcardOrGeneric getType(){
+        return type;
+    }
+
+    public abstract void accept(StatementVisitor visitor);
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+        this.accept((StatementVisitor)visitor);
+    }
+}
--- a/src/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.java
@ -2,28 +2,23 @@ package de.dhbwstuttgart.syntaxtree.statement;


 import de.dhbwstuttgart.syntaxtree.StatementVisitor;
+import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
+import org.antlr.v4.runtime.Token;

 public class WhileStmt extends Statement
 {
-    public WhileStmt(int offset, int variableLength)
-    {
-        super(null,null);
-    }
+    public final Expression expr;
+    public final Statement loopBlock;

-    public Expression expr;
-    public Block loop_block;
-
-    /**
-     * <br/>Author: Martin PlÃ¯Â¿Â½micke
-     * @return
-     */
-    public String toString()
+    public WhileStmt(Expression expr, Statement loopBlock, Token offset)
    {
-        return "WHILE " + loop_block.toString();
+        super(TypePlaceholder.fresh(offset), offset);
+        this.expr = expr;
+        this.loopBlock = loopBlock;
    }

    @Override
--- a/src/de/dhbwstuttgart/syntaxtree/type/ExtendsWildcardType.java
+++ b/src/de/dhbwstuttgart/syntaxtree/type/ExtendsWildcardType.java
@ -1,6 +1,8 @@
 package de.dhbwstuttgart.syntaxtree.type;


+import de.dhbwstuttgart.syntaxtree.ASTVisitor;
+import de.dhbwstuttgart.typeinference.result.ResultSetVisitor;
 import org.antlr.v4.runtime.Token;

 /**
@ -17,7 +19,7 @@ public class ExtendsWildcardType extends WildcardType{
 	* Author: Arne LÃ¼dtke<br/>
 	* Standard Konstruktor fÃ¼r eine ExtendsWildcard
 	*/
-	public ExtendsWildcardType (RefType extendsType, Token offset)
+	public ExtendsWildcardType (RefTypeOrTPHOrWildcardOrGeneric extendsType, Token offset)
 	{
 		super(extendsType, offset);
 	}
@ -33,4 +35,13 @@ public class ExtendsWildcardType extends WildcardType{
 	}


+	@Override
+	public void accept(ASTVisitor visitor) {
+		visitor.visit(this);
+	}
+
+	@Override
+	public void accept(ResultSetVisitor visitor) {
+		visitor.visit(this);
+	}
 }
--- a/src/de/dhbwstuttgart/syntaxtree/type/FunN.java
+++ b/src/de/dhbwstuttgart/syntaxtree/type/FunN.java
@ -1,6 +1,9 @@
 package de.dhbwstuttgart.syntaxtree.type;


+import de.dhbwstuttgart.parser.NullToken;
+import de.dhbwstuttgart.typecheck.JavaClassName;
+
 import java.util.List;

 /**
@ -13,22 +16,17 @@ import java.util.List;
 * 
 */
 public class FunN extends RefType {
-	
-	private RefTypeOrTPHOrWildcardOrGeneric R;
-	private List<? extends RefTypeOrTPHOrWildcardOrGeneric> T;
-	
 	/**
 	 * @author Andreas Stadelmeier,  a10023
 	 * BenÃ¶tigt fÃ¼r den Typinferenzalgorithmus fÃ¼r Java 8
 	 * Generiert einen RefType auf eine FunN<R,T1,...,TN> - Klasse.
-	 * @param R
-	 * @param T
+	 * @param params
 	 * @return
 	 */
-	public FunN(RefTypeOrTPHOrWildcardOrGeneric R, List<? extends RefTypeOrTPHOrWildcardOrGeneric> T) {
-		super(null,null);
+	public FunN(List<RefTypeOrTPHOrWildcardOrGeneric> params) {
+		super(new JavaClassName("Fun"+params.size()), params, new NullToken());
 	}
-	
+
 	/**
 	 * Spezieller Konstruktor um eine FunN ohne Returntype zu generieren
 	 
--- a/src/de/dhbwstuttgart/syntaxtree/type/GenericRefType.java
+++ b/src/de/dhbwstuttgart/syntaxtree/type/GenericRefType.java
@ -1,7 +1,9 @@
 package de.dhbwstuttgart.syntaxtree.type;

+import de.dhbwstuttgart.syntaxtree.ASTVisitor;
 import de.dhbwstuttgart.typecheck.GenericTypeName;
 import de.dhbwstuttgart.typecheck.JavaClassName;
+import de.dhbwstuttgart.typeinference.result.ResultSetVisitor;
 import org.antlr.v4.runtime.Token;

 public class GenericRefType extends RefTypeOrTPHOrWildcardOrGeneric
@ -20,5 +22,15 @@ public class GenericRefType extends RefTypeOrTPHOrWildcardOrGeneric
    public String getUniqueIdentifier(){
        return name.toString();
    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public void accept(ResultSetVisitor visitor) {
+        visitor.visit(this);
+    }
 }

--- a/src/de/dhbwstuttgart/syntaxtree/type/RefType.java
+++ b/src/de/dhbwstuttgart/syntaxtree/type/RefType.java
@ -1,6 +1,8 @@
 package de.dhbwstuttgart.syntaxtree.type;

+import de.dhbwstuttgart.syntaxtree.ASTVisitor;
 import de.dhbwstuttgart.typecheck.JavaClassName;
+import de.dhbwstuttgart.typeinference.result.ResultSetVisitor;
 import org.antlr.v4.runtime.Token;

 import java.util.ArrayList;
@ -100,5 +102,14 @@ public class RefType extends RefTypeOrTPHOrWildcardOrGeneric
    }


+    @Override
+    public void accept(ASTVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public void accept(ResultSetVisitor visitor) {
+        visitor.visit(this);
+    }
 }

--- a/src/de/dhbwstuttgart/syntaxtree/type/RefTypeOrTPHOrWildcardOrGeneric.java
+++ b/src/de/dhbwstuttgart/syntaxtree/type/RefTypeOrTPHOrWildcardOrGeneric.java
@ -1,10 +1,17 @@
 package de.dhbwstuttgart.syntaxtree.type;

+import de.dhbwstuttgart.syntaxtree.ASTVisitor;
 import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
+import de.dhbwstuttgart.typeinference.result.ResultSetVisitor;
 import org.antlr.v4.runtime.Token;

-public class RefTypeOrTPHOrWildcardOrGeneric extends SyntaxTreeNode{
+public abstract class RefTypeOrTPHOrWildcardOrGeneric extends SyntaxTreeNode{
    public RefTypeOrTPHOrWildcardOrGeneric(Token offset) {
        super(offset);
    }
+
+    @Override
+    public abstract void accept(ASTVisitor visitor);
+
+    public abstract void accept(ResultSetVisitor visitor);
 }
--- a/src/de/dhbwstuttgart/syntaxtree/type/SuperWildcardType.java
+++ b/src/de/dhbwstuttgart/syntaxtree/type/SuperWildcardType.java
@ -1,6 +1,8 @@
 package de.dhbwstuttgart.syntaxtree.type;


+import de.dhbwstuttgart.syntaxtree.ASTVisitor;
+import de.dhbwstuttgart.typeinference.result.ResultSetVisitor;
 import org.antlr.v4.runtime.Token;

 /**
@ -17,7 +19,7 @@ public class SuperWildcardType extends WildcardType{
 	* Author: Arne LÃ¼dtke<br/>
 	* Standard Konstruktor fÃ¼r eine SuperWildcard
 	*/
-	public SuperWildcardType( RefType innerType, Token offset)
+	public SuperWildcardType( RefTypeOrTPHOrWildcardOrGeneric innerType, Token offset)
 	{
 		super(innerType, offset);
 	}
@ -42,4 +44,14 @@ public class SuperWildcardType extends WildcardType{
 	public boolean isSuper() {
 		return true;
 	}
+
+	@Override
+	public void accept(ASTVisitor visitor) {
+		visitor.visit(this);
+	}
+
+	@Override
+	public void accept(ResultSetVisitor visitor) {
+		visitor.visit(this);
+	}
 }
--- a/src/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.java
+++ b/src/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.java
@ -1,8 +1,10 @@
 package de.dhbwstuttgart.syntaxtree.type;
 import java.util.Hashtable;

+import de.dhbwstuttgart.syntaxtree.ASTVisitor;
 import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
 import de.dhbwstuttgart.syntaxtree.factory.NameGenerator;
+import de.dhbwstuttgart.typeinference.result.ResultSetVisitor;
 import org.antlr.v4.runtime.Token;

 /**
@ -65,4 +67,14 @@ public class TypePlaceholder extends RefTypeOrTPHOrWildcardOrGeneric
    public String getName() {
        return name;
    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public void accept(ResultSetVisitor visitor) {
+        visitor.visit(this);
+    }
 }
--- a/src/de/dhbwstuttgart/syntaxtree/type/WildcardType.java
+++ b/src/de/dhbwstuttgart/syntaxtree/type/WildcardType.java
@ -11,19 +11,19 @@ import org.antlr.v4.runtime.Token;

 public abstract class WildcardType extends RefTypeOrTPHOrWildcardOrGeneric {
 	
-	protected RefType innerType = null;
+	protected RefTypeOrTPHOrWildcardOrGeneric innerType = null;
 	
 	/**
 	* Author: Arne LÃ¼dtke<br/>
 	* Standard Konstruktor fÃ¼r eine Wildcard
 	*/
-	public WildcardType(RefType innerType, Token offset)
+	public WildcardType(RefTypeOrTPHOrWildcardOrGeneric innerType, Token offset)
 	{
 		super(offset);
 		this.innerType = innerType;
 	}

-	public RefType getInnerType(){
+	public RefTypeOrTPHOrWildcardOrGeneric getInnerType(){
 		return innerType;
 	}
 	
--- a/src/de/dhbwstuttgart/syntaxtree/visual/ASTPrinter.java
+++ b/src/de/dhbwstuttgart/syntaxtree/visual/ASTPrinter.java
@ -0,0 +1,13 @@
+package de.dhbwstuttgart.syntaxtree.visual;
+
+import de.dhbwstuttgart.syntaxtree.*;
+
+public class ASTPrinter {
+
+    public static String print(SourceFile toPrint){
+        StringBuilder output = new StringBuilder();
+        new OutputGenerator(output).visit(toPrint);
+        return output.toString();
+    }
+
+}
--- a/src/de/dhbwstuttgart/syntaxtree/visual/ASTTypePrinter.java
+++ b/src/de/dhbwstuttgart/syntaxtree/visual/ASTTypePrinter.java
@ -0,0 +1,20 @@
+package de.dhbwstuttgart.syntaxtree.visual;
+
+import 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 java.lang.reflect.Modifier;
+import java.util.Iterator;
+
+public class ASTTypePrinter extends ASTPrinter{
+
+    public static String print(SourceFile toPrint){
+        StringBuilder output = new StringBuilder();
+        new TypeOutputGenerator(output).visit(toPrint);
+        return output.toString();
+    }
+
+}
--- a/src/de/dhbwstuttgart/syntaxtree/visual/OutputGenerator.java
+++ b/src/de/dhbwstuttgart/syntaxtree/visual/OutputGenerator.java
@ -0,0 +1,366 @@
+package de.dhbwstuttgart.syntaxtree.visual;
+
+import de.dhbwstuttgart.exceptions.NotImplementedException;
+import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
+import 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 java.lang.reflect.Modifier;
+import java.util.Iterator;
+
+public class OutputGenerator implements ASTVisitor {
+    private static final String TAB = "  ";
+    String tabs = "";
+    protected final StringBuilder out;
+
+    public OutputGenerator(StringBuilder out){
+        this.out = out;
+    }
+
+    public void tab() {
+        tabs += TAB;
+    }
+
+    public void untab() {
+        tabs = tabs.substring(0,tabs.length()-TAB.length());
+    }
+
+    @Override
+    public void visit(SourceFile sourceFile) {
+        for(ClassOrInterface cl : sourceFile.getClasses()){
+            cl.accept(this);
+        }
+    }
+
+    @Override
+    public void visit(ArgumentList argumentList) {
+        out.append("(");
+        Iterator<Expression> expressionIterator = argumentList.getArguments().iterator();
+        while(expressionIterator.hasNext()){
+            expressionIterator.next().accept(this);
+            if(expressionIterator.hasNext())out.append(", ");
+        }
+        out.append(")");
+    }
+
+    @Override
+    public void visit(GenericTypeVar genericTypeVar) {
+        out.append(genericTypeVar.getName().toString());
+    }
+
+    @Override
+    public void visit(FormalParameter formalParameter) {
+        formalParameter.getType().accept(this);
+        out.append(" ");
+        out.append(formalParameter.getName());
+    }
+
+    @Override
+    public void visit(GenericDeclarationList genericTypeVars) {
+        Iterator<GenericTypeVar> genericIterator = genericTypeVars.iterator();
+        if(genericIterator.hasNext()){
+            out.append("<");
+            while(genericIterator.hasNext()){
+                genericIterator.next().accept(this);
+                if(genericIterator.hasNext())out.append(", ");
+            }
+            out.append(">");
+        }
+    }
+
+    @Override
+    public void visit(Field field) {
+        field.getType().accept(this);
+        out.append(" ");
+        out.append(field.getName());
+        out.append(";");
+    }
+
+    @Override
+    public void visit(Method method) {
+        method.getType().accept(this);
+        out.append(" " + method.getName());
+        method.getParameterList().accept(this);
+        if(method.block != null)
+            method.block.accept(this);
+        out.append("\n");
+    }
+
+    @Override
+    public void visit(Constructor method) {
+        out.append(method.getName());
+        method.getParameterList().accept(this);
+        method.block.accept(this);
+        out.append("\n");
+    }
+
+    @Override
+    public void visit(ParameterList formalParameters) {
+        out.append("(");
+        Iterator<FormalParameter> genericIterator = formalParameters.getFormalparalist().iterator();
+        if(genericIterator.hasNext()){
+            while(genericIterator.hasNext()){
+                genericIterator.next().accept(this);
+                if(genericIterator.hasNext())out.append(", ");
+            }
+        }
+        out.append(")");
+    }
+
+    @Override
+    public void visit(ClassOrInterface classOrInterface) {
+        if((Modifier.INTERFACE & classOrInterface.getModifiers()) == 1){
+            out.append("interface ");
+        }else{
+            out.append("class ");
+        }
+        out.append(classOrInterface.getClassName().toString());
+        classOrInterface.getGenerics().accept(this);
+        out.append(" {\n\n");
+        tab();
+        for(Field f : classOrInterface.getFieldDecl()){
+            out.append(tabs);
+            f.accept(this);
+            out.append("\n");
+        }
+        for(Method m : classOrInterface.getMethods()){
+            out.append(tabs);
+            m.accept(this);
+            out.append("\n");
+        }
+        for(Constructor m : classOrInterface.getConstructors()){
+            out.append(tabs);
+            m.accept(this);
+            out.append("\n");
+        }
+        untab();
+        out.append("}");
+    }
+
+    @Override
+    public void visit(RefType refType) {
+        out.append(refType.getName().toString());
+        Iterator<RefTypeOrTPHOrWildcardOrGeneric> genericIterator = refType.getParaList().iterator();
+        if(genericIterator.hasNext()){
+            out.append("<");
+            while(genericIterator.hasNext()){
+                genericIterator.next().accept(this);
+                if(genericIterator.hasNext())out.append(", ");
+            }
+            out.append(">");
+        }
+    }
+
+    @Override
+    public void visit(SuperWildcardType superWildcardType) {
+        out.append("? super ");
+        superWildcardType.getInnerType().accept(this);
+    }
+
+    @Override
+    public void visit(TypePlaceholder typePlaceholder) {
+        out.append("TPH "+ typePlaceholder.getName());
+    }
+
+    @Override
+    public void visit(ExtendsWildcardType extendsWildcardType) {
+        out.append("? extends ");
+        extendsWildcardType.getInnerType().accept(this);
+    }
+
+    @Override
+    public void visit(GenericRefType genericRefType) {
+        out.append(genericRefType.getName().toString());
+    }
+
+    @Override
+    public void visit(LambdaExpression lambdaExpression) {
+        lambdaExpression.params.accept(this);
+        out.append(" -> ");
+        lambdaExpression.methodBody.accept(this);
+    }
+
+    @Override
+    public void visit(Assign assign) {
+        assign.lefSide.accept(this);
+        out.append(" = ");
+        assign.rightSide.accept(this);
+    }
+
+    @Override
+    public void visit(Binary binary) {
+
+    }
+
+    @Override
+    public void visit(Block block) {
+        tab();
+        out.append("{\n");
+        for(Statement stmt : block.getStatements()){
+            out.append(tabs);
+            stmt.accept(this);
+            out.append(";\n");
+        }
+        untab();
+        out.append(tabs);
+        out.append("}");
+    }
+
+    @Override
+    public void visit(BreakStmt breakStmt)
+    {
+        out.append("break"+ " " + breakStmt.indentifier);
+    }
+
+    @Override
+    public void visit(CastExpr castExpr) {
+
+    }
+
+    @Override
+    public void visit(EmptyStmt emptyStmt) {
+
+    }
+
+    @Override
+    public void visit(FieldVar fieldVar) {
+        fieldVar.receiver.accept(this);
+        out.append("." + fieldVar.fieldVarName);
+    }
+
+    @Override
+    public void visit(ForStmt forStmt) {
+
+    }
+
+    @Override
+    public void visit(IfStmt ifStmt) {
+        out.append("if (");
+        ifStmt.expr.accept(this);
+        out.append(")");
+        //TODO implement to set ; if then block is empty
+        ifStmt.then_block.accept(this);
+        out.append("else");
+        ifStmt.else_block.accept(this);
+
+        //TODO Felix_K
+    }
+
+    @Override
+    public void visit(InstanceOf instanceOf) {
+
+    }
+
+    @Override
+    public void visit(LocalVar localVar) {
+        out.append(localVar.name);
+    }
+
+    @Override
+    public void visit(LocalVarDecl localVarDecl) {
+        localVarDecl.getType().accept(this);
+        out.append(" " + localVarDecl.getName());
+    }
+
+    @Override
+    public void visit(MethodCall methodCall) {
+        methodCall.receiver.accept(this);
+        out.append("."+methodCall.name);
+        methodCall.getArgumentList().accept(this);
+    }
+
+    @Override
+    public void visit(NewClass methodCall) {
+        out.append("new ");
+        out.append(methodCall.name);
+        methodCall.getArgumentList().accept(this);
+    }
+
+    @Override
+    public void visit(NewArray newArray) {
+
+    }
+
+    @Override
+    public void visit(Receiver receiver) {
+        receiver.expr.accept(this);
+    }
+
+    @Override
+    public void visit(Return aReturn) {
+        out.append("return ");
+        aReturn.retexpr.accept(this);
+    }
+
+    @Override
+    public void visit(ReturnVoid aReturn) {
+        out.append("return");
+    }
+
+    @Override
+    public void visit(StaticClassName staticClassName) {
+
+    }
+
+    @Override
+    public void visit(Super aSuper) {
+
+    }
+
+    @Override
+    public void visit(This aThis) {
+        out.append("this");
+    }
+
+    @Override
+    public void visit(UnaryPlus unaryPlus) {
+
+    }
+
+    @Override
+    public void visit(WhileStmt whileStmt) {
+        out.append("while(");
+        whileStmt.expr.accept(this);
+        out.append(")");
+        whileStmt.loopBlock.accept(this);
+    }
+
+    @Override
+    public void visit(DoStmt whileStmt) {
+        out.append("do ");
+        whileStmt.loopBlock.accept(this);
+        out.append("while(");
+        whileStmt.expr.accept(this);
+        out.append(");");
+    }
+
+    @Override
+    public void visit(Null aNull) {
+
+    }
+
+    @Override
+    public void visit(Literal literal) {
+
+    }
+
+    @Override
+    public void visit(AssignToField assignLeftSide) {
+        assignLeftSide.field.accept(this);
+    }
+
+    @Override
+    public void visit(AssignToLocal assignLeftSide) {
+        assignLeftSide.localVar.accept(this);
+    }
+
+    @Override
+    public void visit(SuperCall superCall) {
+        out.append("super(");
+        superCall.arglist.accept(this);
+        out.append(")");
+    }
+}
--- a/src/de/dhbwstuttgart/syntaxtree/visual/TypeOutputGenerator.java
+++ b/src/de/dhbwstuttgart/syntaxtree/visual/TypeOutputGenerator.java
@ -0,0 +1,236 @@
+package de.dhbwstuttgart.syntaxtree.visual;
+
+import 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 java.lang.reflect.Modifier;
+import java.util.Iterator;
+
+public class TypeOutputGenerator extends OutputGenerator {
+
+    TypeOutputGenerator(StringBuilder out){
+        super(out);
+    }
+
+    @Override
+    public void visit(SourceFile sourceFile) {
+        super.visit(sourceFile);
+    }
+
+    @Override
+    public void visit(ArgumentList argumentList) {
+        super.visit(argumentList);
+    }
+
+    @Override
+    public void visit(GenericTypeVar genericTypeVar) {
+        super.visit(genericTypeVar);
+    }
+
+    @Override
+    public void visit(FormalParameter formalParameter) {
+        super.visit(formalParameter);
+    }
+
+    @Override
+    public void visit(GenericDeclarationList genericTypeVars) {
+        super.visit(genericTypeVars);
+    }
+
+    @Override
+    public void visit(Field field) {
+        super.visit(field);
+    }
+
+    @Override
+    public void visit(Method method) {
+        super.visit(method);
+    }
+
+    @Override
+    public void visit(ParameterList formalParameters) {
+        super.visit(formalParameters);
+    }
+
+    @Override
+    public void visit(ClassOrInterface classOrInterface) {
+        super.visit(classOrInterface);
+    }
+
+    @Override
+    public void visit(RefType refType) {
+        super.visit(refType);
+    }
+
+    @Override
+    public void visit(SuperWildcardType superWildcardType) {
+        super.visit(superWildcardType);
+    }
+
+    @Override
+    public void visit(TypePlaceholder typePlaceholder) {
+        super.visit(typePlaceholder);
+    }
+
+    @Override
+    public void visit(ExtendsWildcardType extendsWildcardType) {
+        super.visit(extendsWildcardType);
+    }
+
+    @Override
+    public void visit(GenericRefType genericRefType) {
+        super.visit(genericRefType);
+    }
+
+    @Override
+    public void visit(LambdaExpression lambdaExpression) {
+        out.append("(");
+        super.visit(lambdaExpression);
+        out.append(")");
+        this.out.append("::");
+        lambdaExpression.getType().accept(this);
+    }
+
+    @Override
+    public void visit(Assign assign) {
+        super.visit(assign);
+    }
+
+    @Override
+    public void visit(Binary binary) {
+        super.visit(binary);
+    }
+
+    @Override
+    public void visit(Block block) {
+        out.append("(");
+        super.visit(block);
+        out.append(")");
+        this.out.append("::");
+        block.getType().accept(this);
+    }
+
+    @Override
+    public void visit(CastExpr castExpr) {
+        super.visit(castExpr);
+    }
+
+    @Override
+    public void visit(EmptyStmt emptyStmt) {
+        super.visit(emptyStmt);
+    }
+
+    @Override
+    public void visit(FieldVar fieldVar) {
+        out.append("(");
+        super.visit(fieldVar);
+        out.append(")");
+        this.out.append("::");
+        fieldVar.getType().accept(this);
+    }
+
+    @Override
+    public void visit(ForStmt forStmt) {
+        super.visit(forStmt);
+    }
+
+    @Override
+    public void visit(IfStmt ifStmt) {
+        super.visit(ifStmt);
+    }
+
+    @Override
+    public void visit(InstanceOf instanceOf) {
+        super.visit(instanceOf);
+    }
+
+    @Override
+    public void visit(LocalVar localVar) {
+        out.append("(");
+        super.visit(localVar);
+        out.append(")");
+        this.out.append("::");
+        localVar.getType().accept(this);
+    }
+
+    @Override
+    public void visit(LocalVarDecl localVarDecl) {
+        super.visit(localVarDecl);
+    }
+
+    @Override
+    public void visit(MethodCall methodCall) {
+        out.append("(");
+        super.visit(methodCall);
+        out.append(")");
+        this.out.append("::");
+        methodCall.getType().accept(this);
+    }
+
+    @Override
+    public void visit(NewClass methodCall) {
+        super.visit(methodCall);
+    }
+
+    @Override
+    public void visit(NewArray newArray) {
+        super.visit(newArray);
+    }
+
+    @Override
+    public void visit(Receiver receiver) {
+        super.visit(receiver);
+    }
+
+    @Override
+    public void visit(Return aReturn) {
+        super.visit(aReturn);
+    }
+
+    @Override
+    public void visit(ReturnVoid aReturn) {
+        super.visit(aReturn);
+    }
+
+    @Override
+    public void visit(StaticClassName staticClassName) {
+        super.visit(staticClassName);
+    }
+
+    @Override
+    public void visit(Super aSuper) {
+        super.visit(aSuper);
+    }
+
+    @Override
+    public void visit(This aThis) {
+        out.append("(");
+        super.visit(aThis);
+        out.append(")");
+        this.out.append("::");
+        aThis.getType().accept(this);
+    }
+
+    @Override
+    public void visit(UnaryPlus unaryPlus) {
+        super.visit(unaryPlus);
+    }
+
+    @Override
+    public void visit(WhileStmt whileStmt) {
+        super.visit(whileStmt);
+    }
+
+    @Override
+    public void visit(Null aNull) {
+        super.visit(aNull);
+    }
+
+    @Override
+    public void visit(Literal literal) {
+        super.visit(literal);
+    }
+}
--- a/src/de/dhbwstuttgart/typecheck/GenericTypeName.java
+++ b/src/de/dhbwstuttgart/typecheck/GenericTypeName.java
@ -1,7 +1,7 @@
 package de.dhbwstuttgart.typecheck;

 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.GenericContext;
-import jdk.nashorn.internal.ir.Node;
+//import jdk.nashorn.internal.ir.Node;

 public class GenericTypeName extends JavaClassName {
    private final static String DELIMITER = "%";
@ -15,13 +15,9 @@ public class GenericTypeName extends JavaClassName {
        this.methodName = genericContext.parentMethod;
    }

-    public String toString(){
+    public String getUniqueIdentifier() {
        return parentClass.toString()
                + DELIMITER + methodName
                + DELIMITER + super.toString();
    }
-
-    public String getShortName() {
-        return super.toString();
-    }
 }
--- a/src/de/dhbwstuttgart/typecheck/JavaClassName.java
+++ b/src/de/dhbwstuttgart/typecheck/JavaClassName.java
@ -34,6 +34,15 @@ public class JavaClassName {
 		}
 	}

+	/**
+	 * Gibt von einem Klassennamen nur den Namen der Klasse zur<75>ck
+	 * Beispiel:
+	 * java.lang.Object wird zu: Object
+	 */
+	public static String stripClassName(String className) {
+		return new JavaClassName(className).name;
+	}
+	
 	@Override
 	public int hashCode() {
 		final int prime = 31;
--- a/src/de/dhbwstuttgart/typecheck/JavaClassRegistry.java
+++ b/src/de/dhbwstuttgart/typecheck/JavaClassRegistry.java
@ -1,13 +1,13 @@
 package de.dhbwstuttgart.typecheck;

-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;

 /**
 * Speichert die Klassen im aktuellen Projektscope
 */
 public class JavaClassRegistry {
-    public List<JavaClassName> existingClasses = new ArrayList<>();
+    final List<JavaClassName> existingClasses = new ArrayList<>();
+    final List<String> importedPackages = new ArrayList<>();

    public JavaClassRegistry(List<String> initialNames){
        for(String name : initialNames){
@ -15,6 +15,15 @@ public class JavaClassRegistry {
        }
    }

+    /**
+     * F<>gt ein gesamtes Package der ClassRegistry hinzu.
+     * Dies geschieht beispielsweise, wenn der Benutzer ein "import package.*;" statement verwendet
+     * @param packageName
+     */
+    public void addPackage(String packageName) {
+    	importedPackages.add(packageName);
+    }
+    
    public void add(String className){
        existingClasses.add(new JavaClassName(className));
    }
@ -23,7 +32,13 @@ public class JavaClassRegistry {
        for(JavaClassName name : existingClasses){
            if(name.equals(new JavaClassName(className)))return name;
        }
-        throw new TypeNotPresentException(className, new Throwable());
+        //Jetzt noch alle importierten Packages durchsuchen:
+        JavaClassName ret = getClassFromImportedPackages(className);
+        if(ret == null){
+            throw new TypeNotPresentException(className, new Throwable());
+        }else{
+            return ret;
+        }
    }

    @Override
@ -32,6 +47,34 @@ public class JavaClassRegistry {
    }

    public boolean contains(String whole) {
-        return existingClasses.contains(new JavaClassName(whole));
+        boolean ret = existingClasses.contains(new JavaClassName(whole));
+        if(ret == false){
+            JavaClassName imported = getClassFromImportedPackages(whole);
+            if(imported != null){
+                existingClasses.add(imported);
+                return true;
+            }else {
+                return false;
+            }
+        }else {
+            return true;
+        }
    }
+
+    private JavaClassName getClassFromImportedPackages(String className){
+        ClassLoader loader = Thread.currentThread().getContextClassLoader();
+        String shortName = JavaClassName.stripClassName(className);
+        for(String packageName : importedPackages) {
+            try {
+                loader.loadClass(packageName+"."+shortName);
+                //Keine Exception! Die Klasse existiert:
+                JavaClassName ret = new JavaClassName(packageName+"."+shortName);
+                if(ret.equals(new JavaClassName(className)))return ret;
+            } catch (ClassNotFoundException e) {
+                //Die Klasse wurde nicht gefunden!
+            }
+        }
+        return null;
+    }
+
 }
--- a/src/de/dhbwstuttgart/typedeployment/TypeInsert.java
+++ b/src/de/dhbwstuttgart/typedeployment/TypeInsert.java
@ -0,0 +1,36 @@
+package de.dhbwstuttgart.typedeployment;
+
+import org.antlr.v4.runtime.Token;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class TypeInsert {
+    /**
+     * point wird hauptsächlich zur Anzeige einer Annotation im Eclipse-plugin benutzt.
+     */
+    public final TypeInsertPoint point;
+    Set<TypeInsertPoint> inserts;
+
+    public TypeInsert(TypeInsertPoint point, Set<TypeInsertPoint> additionalPoints){
+        this.point = point;
+        inserts = additionalPoints;
+    }
+
+    public String insert(String intoSource){
+        List<TypeInsertPoint> offsets = new ArrayList<>();
+        String ret = point.insert(intoSource, offsets);
+        offsets.add(point);
+        for(TypeInsertPoint insertPoint : inserts){
+            ret = insertPoint.insert(ret, offsets);
+            offsets.add(insertPoint);
+        }
+        return ret;
+    }
+
+    public String getInsertString(){
+        return point.getInsertString();
+    }
+}
--- a/src/de/dhbwstuttgart/typedeployment/TypeInsertFactory.java
+++ b/src/de/dhbwstuttgart/typedeployment/TypeInsertFactory.java
@ -1,54 +1,142 @@
 package de.dhbwstuttgart.typedeployment;

-import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.syntaxtree.*;
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.typeinference.ResultSet;
+import de.dhbwstuttgart.syntaxtree.type.*;
+import de.dhbwstuttgart.typeinference.result.*;
+import org.antlr.v4.runtime.Token;

-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;

+/**
+ * TODO:
+ * Falls in Feldern Generics entstehen, dann werden diese als Klassenparameter eingesetzt
+ * Für die Instanzierung von Klassen kann man dann beispielsweise nur noch den Diamond-Operator verwenden
+ *
+ * Es müssen zu einem TPH alle in Beziehung stehenden Constraints gefunden werden
+ *
+ * Anmekung: Es wird nur ein RefType gleichzeitug eingesetzt.
+ * Steht dieser mit anderen Typen in Verbindung, so müssen diese nicht eingesetzt werden
+ * im Result set können nur TPHs mit <. Beziehung stehen
+ * Steht ein Typ A über TPHs mit anderen Typen B in Verbindung, so lassen sich diese auch im nächsten Durchgang
+ * inferieren, wenn A bereits eingesetzt wurde. Es werden dann eben zusätzliche Generics entstehen
+ */
 public class TypeInsertFactory {
-    public static List<TypeInsertPoint> createTypeInsertPoints(SourceFile forSourcefile, ResultSet withResults){
-        List<TypeInsertPoint> ret = new ArrayList<>();
-        for(ClassOrInterface cl : forSourcefile.getClasses()){
-            //Felder:
-            for(Field field : cl.getFieldDecl()){
-                if(field.getType() instanceof TypePlaceholder){
-                    RefTypeOrTPHOrWildcardOrGeneric resolved = withResults.resolveType(field.getType());
-                    String toInsert = getString(resolved) + " ";
-                    ret.add(new TypeInsertPoint(field.getType().getOffset(), toInsert));
-                }
-            }

-            for(Method m : cl.getMethods()){
-                RefTypeOrTPHOrWildcardOrGeneric resolved = withResults.resolveType(m.getReturnType());
-                String toInsert = getString(resolved) + " ";
-                ret.add(new TypeInsertPoint(m.getReturnType().getOffset(), toInsert));

-                for(FormalParameter param : m.getParameterList().getFormalparalist()){
-                    resolved = withResults.resolveType(param.getType());
-                    toInsert = getString(resolved) + " ";
-                    ret.add(new TypeInsertPoint(param.getType().getOffset(), toInsert));
-
-                }
-            }
-        }
-        return ret;
+    public static Set<TypeInsert> createTypeInsertPoints(SourceFile forSourcefile, ResultSet withResults){
+        return new TypeInsertPlacer().getTypeInserts(forSourcefile, withResults);
    }

-    private static String getString(RefTypeOrTPHOrWildcardOrGeneric resolved) {
-        if(resolved instanceof RefType){
-            return ((RefType) resolved).getName().toString();
-        }else if(resolved instanceof TypePlaceholder){
-            return ((TypePlaceholder) resolved).getName();
-        }else if(resolved instanceof GenericRefType){
-            return ((GenericRefType)resolved).getName().getShortName().toString();
+    public static TypeInsert createInsertPoints(RefTypeOrTPHOrWildcardOrGeneric type, Token offset, ClassOrInterface cl, Method m,
+                                                ResultSet resultSet) {
+        Set<TypeInsertPoint> ret = new HashSet<>();
+        ResolvedType resolvedType = resultSet.resolveType(type);
+        TypeInsertPoint insertPoint = new TypeInsertPoint(offset,
+                    new TypeToInsertString(resolvedType.resolvedType).insert);
+        return new TypeInsert(insertPoint, new HashSet<>(Arrays.asList(createGenericInsert(resolvedType.additionalGenerics, cl, m))));
+    }
+
+    private static TypeInsertPoint createGenericInsert(Set<GenericInsertPair> toInsert, ClassOrInterface cl, Method m){
+        //Momentan wird Methode ignoriert. Parameter werden immer als Klassenparameter angefügt:
+        //Offset zum Einstzen bestimmen:
+        Token offset;
+        String insert = "";
+        String end;
+        if(cl.getGenerics().iterator().hasNext()){
+            //offset = cl.getGenerics().iterator().next().getOffset();
+            offset = cl.getGenerics().getOffset();
+            end=",";
        }else{
-            throw new NotImplementedException();
+            offset = cl.getGenerics().getOffset();
+            insert += "<";
+            end = ">";
        }
+
+        //Alle einzusetzenden Generics und deren Bounds bestimmen:
+        HashMap<TypePlaceholder, HashSet<TypePlaceholder>> genericsAndBounds = new HashMap<>();
+        for(GenericInsertPair p : toInsert){
+            if(!genericsAndBounds.containsKey(p.TA1)){
+                genericsAndBounds.put((TypePlaceholder) p.TA1, new HashSet<>());
+            }
+            if(p.TA2 != null){
+                genericsAndBounds.get(p.TA1).add((TypePlaceholder) p.TA2);
+                if(!genericsAndBounds.containsKey(p.TA2)){
+                    genericsAndBounds.put((TypePlaceholder) p.TA2, new HashSet<>());
+                }
+            }
+        }
+
+        //String zum Einsetzen (Generics mit bounds) generieren:
+        Iterator<TypePlaceholder> it = genericsAndBounds.keySet().iterator();
+        if(! it.hasNext())return new TypeInsertPoint(offset, "");
+        while(it.hasNext()){
+            TypePlaceholder tph = it.next();
+            insert += tph.getName();
+            Set<TypePlaceholder> bounds = genericsAndBounds.get(tph);
+            if(bounds.size() > 0){
+                insert += " extends ";
+                Iterator<TypePlaceholder> boundIt = bounds.iterator();
+                while(boundIt.hasNext()){
+                    TypePlaceholder bound = boundIt.next();
+                    insert += bound.getName();
+                    if(boundIt.hasNext())insert += " & ";
+                }
+            }
+            if(it.hasNext())insert+=",";
+        }
+        return new TypeInsertPoint(offset, insert + end);
    }
 }
+
+class TypeToInsertString implements ResultSetVisitor{
+    String insert = "";
+
+    TypeToInsertString(RefTypeOrTPHOrWildcardOrGeneric type){
+        type.accept(this);
+    }
+
+    @Override
+    public void visit(PairTPHsmallerTPH p) {
+
+    }
+
+    @Override
+    public void visit(PairTPHequalRefType p) {
+
+    }
+
+    @Override
+    public void visit(RefType resolved) {
+        insert = resolved.getName().toString();
+        if(resolved.getParaList().size() > 0){
+            insert += "<";
+            Iterator<RefTypeOrTPHOrWildcardOrGeneric> iterator = resolved.getParaList().iterator();
+            while(iterator.hasNext()){
+                RefTypeOrTPHOrWildcardOrGeneric typeParam = iterator.next();
+                insert += new TypeToInsertString(typeParam).insert;
+                if(iterator.hasNext())insert += ", ";
+            }
+            insert += ">";
+        }
+    }
+
+    @Override
+    public void visit(GenericRefType genericRefType) {
+        insert += genericRefType.getName();
+    }
+
+    @Override
+    public void visit(SuperWildcardType superWildcardType) {
+        insert += "? super " + new TypeToInsertString(superWildcardType.getInnerType()).insert;
+    }
+
+    @Override
+    public void visit(TypePlaceholder typePlaceholder) {
+        insert += typePlaceholder.getName();
+    }
+
+    @Override
+    public void visit(ExtendsWildcardType extendsWildcardType) {
+        insert += "? extends " + new TypeToInsertString(extendsWildcardType.getInnerType()).insert;
+    }
+}
--- a/src/de/dhbwstuttgart/typedeployment/TypeInsertPlacer.java
+++ b/src/de/dhbwstuttgart/typedeployment/TypeInsertPlacer.java
@ -0,0 +1,76 @@
+package de.dhbwstuttgart.typedeployment;
+
+import de.dhbwstuttgart.exceptions.NotImplementedException;
+import de.dhbwstuttgart.syntaxtree.*;
+import de.dhbwstuttgart.syntaxtree.statement.BreakStmt;
+import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
+import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.typeinference.result.ResultSet;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class TypeInsertPlacer extends AbstractASTWalker{
+    Set<TypeInsert> inserts = new HashSet<>();
+    private ResultSet withResults;
+
+    public Set<TypeInsert> getTypeInserts(SourceFile forSourceFile, ResultSet withResults){
+        this.withResults = withResults;
+        forSourceFile.accept(this);
+        return inserts;
+    }
+
+    @Override
+    public void visit(ClassOrInterface classOrInterface) {
+        TypeInsertPlacerClass cl = new TypeInsertPlacerClass(classOrInterface, withResults);
+        this.inserts.addAll(cl.inserts);
+    }
+}
+
+class TypeInsertPlacerClass extends AbstractASTWalker{
+    protected final ResultSet results;
+    protected final ClassOrInterface cl;
+    public final Set<TypeInsert> inserts = new HashSet<>();
+    private Method method;
+
+    TypeInsertPlacerClass(ClassOrInterface forClass, ResultSet withResults){
+        this.cl = forClass;
+        this.method = null;
+        this.results = withResults;
+        forClass.accept(this);
+    }
+
+    @Override
+    public void visit(Method method) {
+        this.method = method;
+        if(method.getReturnType() instanceof TypePlaceholder)
+            inserts.add(TypeInsertFactory.createInsertPoints(
+                    method.getReturnType(), method.getReturnType().getOffset(), cl, method, results));
+        super.visit(method);
+    }
+
+    @Override
+    public void visit(Field field) {
+        if(field.getType() instanceof TypePlaceholder){
+                inserts.add(TypeInsertFactory.createInsertPoints(
+                        field.getType(), field.getType().getOffset(), cl, method, results));
+        }
+        super.visit(field);
+    }
+
+    @Override
+    public void visit(ParameterList params) {
+        for(FormalParameter param : params){
+            if(param.getType() instanceof TypePlaceholder)
+                inserts.add(TypeInsertFactory.createInsertPoints(
+                        param.getType(), param.getType().getOffset(), cl, method, results));
+        }
+        super.visit(params);
+    }
+
+    @Override
+    public void visit(LambdaExpression lambdaExpression) {
+        //Lambda-Ausdrücke brauchen keine Typeinsetzungen
+    }
+
+}
--- a/src/de/dhbwstuttgart/typedeployment/TypeInsertPoint.java
+++ b/src/de/dhbwstuttgart/typedeployment/TypeInsertPoint.java
@ -2,16 +2,27 @@ package de.dhbwstuttgart.typedeployment;

 import org.antlr.v4.runtime.Token;

+import java.util.List;
+import java.util.stream.Collectors;
+
 public class TypeInsertPoint {
-    Token point;
+    public final Token point;
    private String insertString;

    public TypeInsertPoint(Token point, String toInsert){
        this.point = point;
-        this.insertString = toInsert;
+        this.insertString = (toInsert.endsWith(" ")) ? toInsert : toInsert + " " ;
    }

-    public String insert(String intoSource){
-        return new StringBuilder(intoSource).insert(point.getStartIndex(), insertString).toString();
+    public String insert(String intoSource, List<TypeInsertPoint> additionalOffset){
+        int offset = additionalOffset.stream().filter((token ->
+                //token.point.getLine() != point.getLine() && token.point.getCharPositionInLine() <= point.getCharPositionInLine()))
+                token.point.getStartIndex() <= point.getStartIndex()))
+                .mapToInt((typeInsertPoint -> typeInsertPoint.insertString.length())).sum();
+        return new StringBuilder(intoSource).insert(point.getStartIndex()+offset, insertString).toString();
+    }
+
+    public String getInsertString() {
+        return insertString;
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
FelixKrespach	998c146f4b	Final	2017-10-02 17:11:55 +02:00
FelixKrespach	88c78342d5	Final	2017-10-01 09:58:56 +02:00
FelixKrespach	86b2118770	Refactoring	2017-09-25 08:24:08 +02:00
FelixKrespach	03080c43cb	Refactoring	2017-09-25 08:17:36 +02:00
FelixKrespach	df1c19e60d	Tests added	2017-09-23 18:33:48 +02:00
FelixKrespach	07303ffa71	Implemented Continue, Catches, Break visit ...	2017-09-22 18:19:34 +02:00
FelixKrespach	881830235a	Break Class + Test	2017-09-22 14:49:43 +02:00
FelixKrespach	b88b9e2534	methods in statementgenerator implemented Tests + visit	2017-09-21 22:36:13 +02:00
FelixKrespach	8e1c1765ff	Many methods in statementgenerator implemented	2017-09-20 17:36:16 +02:00
JanUlrich	201a0978bc	Constructor für IfStmt	2017-09-18 13:56:27 +02:00
JanUlrich	98331af3c0	Fehler in UnifyTypeConvert beheben	2017-09-07 19:52:05 +02:00
JanUlrich	a355fe7786	fehler beheben	2017-09-07 18:37:56 +02:00
JanUlrich	ea1e81bb95	Merge branch 'bigRefactoring' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bigRefactoring	2017-09-07 17:03:15 +02:00
JanUlrich	b6f62b48eb	ResultSet um resolveType erweitern	2017-09-07 17:02:49 +02:00
Pluemicke Martin	5c66212afb	neue Datei: S2017_Jan-Elric_Neumann.pdf	2017-09-04 09:30:59 +02:00
JanUlrich	7c3181c3f0	Super-Statement an Constructor angefügt	2017-08-30 17:06:42 +02:00
JanUlrich	b251a646ca	System.out.println Statement schein halbwegs zu funktionieren ^^	2017-08-30 15:29:34 +02:00
JanUlrich	4b21f03a5a	Refactoring	2017-08-30 14:36:40 +02:00
JanUlrich	a7e1a5e2c2	Fehler beheben	2017-08-28 18:36:26 +02:00
JanUlrich	932b277dcc	Imports implementieren	2017-08-28 17:36:51 +02:00
JanUlrich	45c85b7686	Type refactoring	2017-08-28 15:42:51 +02:00
JanUlrich	ff59b585bd	TypeInsert ausbessern	2017-08-25 03:39:54 +02:00
JanUlrich	397ac3cd58	TypeInsert ausbessern	2017-08-25 02:59:16 +02:00
JanUlrich	77c59de0f0	Assign ändern. Es gibt jetzt eine AssignLeftSide	2017-08-23 18:28:26 +02:00
JanUlrich	9a7e717c25	Constructor um fieldInits erweitern, auch der TYPE algo	2017-08-23 16:24:25 +02:00
JanUlrich	6b98bf6a58	Feld initialisierungen werden an Konstruktoren angehängt	2017-08-23 03:52:24 +02:00
JanUlrich	bbc61c67a9	TypeInsert Fehler beheben	2017-08-23 01:43:20 +02:00
JanUlrich	1023ed8557	Generics einsetzen	2017-08-22 18:31:07 +02:00
JanUlrich	3274f12922	Fehler in TypeInsert beheben	2017-08-22 16:45:28 +02:00
JanUlrich	52f562b570	DoStmt zu ASTPrinter hinzufügen	2017-08-17 15:58:56 +02:00
FelixKrespach	a9c49676a9	do statement implemented	2017-08-17 15:30:57 +02:00
FelixKrespach	856f9b059d	while Statement implemented	2017-08-17 15:08:30 +02:00
JanUlrich	0cf8f82283	Remove ClassNotFoundException	2017-08-07 23:51:22 +02:00
Andreas Stadelmeier	1e6f046eff	Merge branch 'bigRefactoring' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bigRefactoring	2017-07-14 17:48:04 +02:00
Andreas Stadelmeier	841ac5fcbf	PackageCrawler durch ClassLoader ersetzen	2017-07-14 17:47:02 +02:00
Administrator Java Compiler Core	3b95cdd76f	Merge (auweioiwae)	2017-07-14 15:39:16 +02:00
JanUlrich	057df7c702	TypeInsert API anpassen	2017-07-10 21:23:48 +02:00
JanUlrich	86f29f1396	TypeInsert API anpassen	2017-07-09 16:35:33 +02:00
JanUlrich	0f6381f30b	TypeInsert anpassen	2017-07-05 20:09:09 +02:00
JanUlrich	adda1db195	Add parse(String) to Compiler	2017-07-05 18:46:08 +02:00
JanUlrich	2167a4288e	Add possibility to parse a String to parser	2017-07-05 17:52:23 +02:00
JanUlrich	0ad97251ca	Change Parser FileInput to InputStream	2017-07-05 17:50:38 +02:00
JanUlrich	87d2edaaa6	Change TIP creation	2017-07-05 17:42:41 +02:00
JanUlrich	fc6040da39	Fehler in TYPE beseitigen	2017-06-30 13:48:59 +02:00
JanUlrich	d64823ea30	Fehler bei GenericInsertPoints beheben	2017-06-30 12:14:07 +02:00
JanUlrich	3b8ef58222	ASTTypePrinter anfügen	2017-06-30 11:13:15 +02:00
JanUlrich	0aa18c74ba	ASTPrinter verbessern	2017-06-29 01:19:13 +02:00
JanUlrich	726eb60eb3	ASTPrinter einführen	2017-06-28 21:10:28 +02:00
JanUlrich	afd3f32f23	ASTVisitor implementieren	2017-06-28 17:20:26 +02:00
JanUlrich	3173cccefa	Typen einsetzen um Wildcards erweitern	2017-06-26 18:19:56 +02:00
JanUlrich	e6c58d44c2	Type für Return fixen	2017-06-26 16:59:10 +02:00
JanUlrich	1be1bb83ca	FunN-Typen erstellen bei Methodenaufrufen	2017-06-23 21:33:27 +02:00
JanUlrich	2c25e56a76	Einsetzen von Generics korrigieren	2017-06-20 14:50:27 +02:00
JanUlrich	c272688b2d	Fehler beim Ausrechnen zusammenhängender Constraints beheben	2017-06-20 01:14:04 +02:00
JanUlrich	cf6d9880e3	Generische Parameter einsetzen (nur Test, nicht korrekt eingesetzt)	2017-06-15 04:48:53 +02:00
JanUlrich	920eea43ad	Lambda Test angepasst	2017-06-15 02:57:49 +02:00
JanUlrich	70ca62202d	Typeinsetzen erweitert	2017-06-15 02:17:46 +02:00
JanUlrich	44481b4140	Merge branch 'bigRefactoring' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bigRefactoring	2017-06-14 04:07:43 +02:00
JanUlrich	7a337843e6	Lambda-TYPE anpassen. Beginnen mit TypeInsert	2017-06-14 04:07:27 +02:00
Martin Plümicke	fcca50ed78	modified: .classpath modified: src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java modified: src/de/dhbwstuttgart/syntaxtree/SourceFile.java modified: src/de/dhbwstuttgart/syntaxtree/statement/LambdaExpression.java modified: src/de/dhbwstuttgart/typecheck/GenericTypeName.java modified: src/de/dhbwstuttgart/typeinference/typeAlgo/TYPE.java modified: test/astfactory/ASTFactoryTest.java imports auskommentiert	2017-06-13 17:38:43 +02:00
JanUlrich	5f31150dc8	TYPE-Algo für LambdaExpression implementieren	2017-06-12 18:57:12 +02:00
Jan-Elric Neumann	a48cbae5a5	Removed faulty (and unused import), which prevented ObjectiF from parsing SyntaxTreeNode	2017-05-30 19:40:51 +02:00
Jan-Elric Neumann	b395f6e137	Fixed return type to make code parsable for ObjectiF	2017-05-30 19:38:03 +02:00