geändert: S2017_Jan-Elric_Neumann.pdf

neue Datei: S2017_Jan-Elric_Neumann.pdf
neue Datei: ../../git_pull_origin_bigRefactoring geändert: ../../test/typeinference/JavaTXCompilerTest.java
2017-09-04 09:28:53 +02:00 · 2017-09-04 09:26:02 +02:00 · 2017-06-30 13:49:53 +02:00 · 2017-06-30 13:09:59 +02:00 · 2017-06-30 13:04:56 +02:00
293 changed files with 18160 additions and 6733 deletions
--- a/.classpath
+++ b/.classpath
@@ -0,0 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<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/guava-15.0.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"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
--- a/.gitignore
+++ b/.gitignore
@@ -7,15 +7,6 @@ bin
 .mtj.tmp/
 # Package Files #
 *.jar
 *.war
 *.ear
 # IDEs
 .classpath
 *.iml
 .idea/
 /target/
 .DS_Store
 .project
 .settings/
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
 [submodule "reflections"]
 	path = reflections
 	url = ./reflections
--- a/.project
+++ b/.project
@@ -0,0 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>JavaCompilerCore</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.8
--- 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.result.ResultSet</li>
+<li>de.dhbwstuttgart.typeinference.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.result.ResultSet</title>
+<title>Uses of Class de.dhbwstuttgart.typeinference.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.result.ResultSet" class="title">Uses of Class<br>de.dhbwstuttgart.typeinference.ResultSet</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.typeinference.ResultSet" class="title">Uses of Class<br>de.dhbwstuttgart.typeinference.ResultSet</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
--- a/0
+++ b/0
--- a/lib/annotations-2.0.1.jar
+++ b/lib/annotations-2.0.1.jar
--- a/lib/antlr-4.7-complete.jar
+++ b/lib/antlr-4.7-complete.jar
--- a/lib/antlr-complete.jar
+++ b/lib/antlr-complete.jar
--- a/lib/asm-6.0.jar
+++ b/lib/asm-6.0.jar
--- a/lib/asm-6.0_BETA.jar
+++ b/lib/asm-6.0_BETA.jar
--- a/lib/asm-analysis-6.0.jar
+++ b/lib/asm-analysis-6.0.jar
--- a/lib/asm-commons-6.0.jar
+++ b/lib/asm-commons-6.0.jar
--- a/lib/asm-tree-6.0.jar
+++ b/lib/asm-tree-6.0.jar
--- a/lib/asm-util-6.0.jar
+++ b/lib/asm-util-6.0.jar
--- a/lib/asm-xml-6.0.jar
+++ b/lib/asm-xml-6.0.jar
--- a/lib/bcel-6.1-SNAPSHOT-sources.jar
+++ b/lib/bcel-6.1-SNAPSHOT-sources.jar
--- a/lib/bcel-6.1-SNAPSHOT.jar
+++ b/lib/bcel-6.1-SNAPSHOT.jar
--- a/lib/cloning.jar
+++ b/lib/cloning.jar
--- a/lib/commons-bcel6-6.0-SNAPSHOT.jar
+++ b/lib/commons-bcel6-6.0-SNAPSHOT.jar
--- a/lib/guava-10.0.1.jar
+++ b/lib/guava-10.0.1.jar
--- a/lib/guava-15.0.jar
+++ b/lib/guava-15.0.jar
--- a/lib/guava-19.0.jar
+++ b/lib/guava-19.0.jar
--- a/lib/guava-22.0.jar
+++ b/lib/guava-22.0.jar
--- a/lib/hamcrest-core-1.3.jar
+++ b/lib/hamcrest-core-1.3.jar
--- a/lib/javassist-3.19.0-GA.jar
+++ b/lib/javassist-3.19.0-GA.jar
--- a/lib/junit-4.0.jar
+++ b/lib/junit-4.0.jar
--- a/lib/junit-4.12.jar
+++ b/lib/junit-4.12.jar
--- a/lib/log4j-1.2.12.jar
+++ b/lib/log4j-1.2.12.jar
--- a/lib/reflections-0.9.10-javadoc.jar
+++ b/lib/reflections-0.9.10-javadoc.jar
--- a/lib/reflections-0.9.10-sources.jar
+++ b/lib/reflections-0.9.10-sources.jar
--- a/lib/reflections-0.9.10.jar
+++ b/lib/reflections-0.9.10.jar
--- a/lib/reflections-0.9.12-SNAPSHOT.jar
+++ b/lib/reflections-0.9.12-SNAPSHOT.jar
--- a/lib/src.zip
+++ b/lib/src.zip
--- a/src/de/dhbwstuttgart/.DS_Store
+++ b/src/de/dhbwstuttgart/.DS_Store
--- a/src/de/dhbwstuttgart/bytecode/BytecodeGen.java
+++ b/src/de/dhbwstuttgart/bytecode/BytecodeGen.java
@@ -1,386 +0,0 @@
 package de.dhbwstuttgart.bytecode;
 import java.awt.List;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.FieldVisitor;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
 import de.dhbwstuttgart.syntaxtree.*;
 import de.dhbwstuttgart.syntaxtree.statement.ArgumentList;
 import de.dhbwstuttgart.syntaxtree.statement.Assign;
 import de.dhbwstuttgart.syntaxtree.statement.AssignToField;
 import de.dhbwstuttgart.syntaxtree.statement.Binary;
 import de.dhbwstuttgart.syntaxtree.statement.Block;
 import de.dhbwstuttgart.syntaxtree.statement.CastExpr;
 import de.dhbwstuttgart.syntaxtree.statement.DoStmt;
 import de.dhbwstuttgart.syntaxtree.statement.EmptyStmt;
 import de.dhbwstuttgart.syntaxtree.statement.FieldVar;
 import de.dhbwstuttgart.syntaxtree.statement.ForStmt;
 import de.dhbwstuttgart.syntaxtree.statement.IfStmt;
 import de.dhbwstuttgart.syntaxtree.statement.InstanceOf;
 import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
 import de.dhbwstuttgart.syntaxtree.statement.LocalVar;
 import de.dhbwstuttgart.syntaxtree.statement.LocalVarDecl;
 import de.dhbwstuttgart.syntaxtree.statement.MethodCall;
 import de.dhbwstuttgart.syntaxtree.statement.NewArray;
 import de.dhbwstuttgart.syntaxtree.statement.NewClass;
 import de.dhbwstuttgart.syntaxtree.statement.Receiver;
 import de.dhbwstuttgart.syntaxtree.statement.Return;
 import de.dhbwstuttgart.syntaxtree.statement.ReturnVoid;
 import de.dhbwstuttgart.syntaxtree.statement.StaticClassName;
 import de.dhbwstuttgart.syntaxtree.statement.Super;
 import de.dhbwstuttgart.syntaxtree.statement.SuperCall;
 import de.dhbwstuttgart.syntaxtree.statement.This;
 import de.dhbwstuttgart.syntaxtree.statement.UnaryPlus;
 import de.dhbwstuttgart.syntaxtree.statement.WhileStmt;
 import de.dhbwstuttgart.syntaxtree.statement.literal.Literal;
 import de.dhbwstuttgart.syntaxtree.statement.literal.Null;
 import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
 import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 public class BytecodeGen implements ASTVisitor {
 	ClassWriter cw =new ClassWriter(ClassWriter.COMPUTE_FRAMES|ClassWriter.COMPUTE_MAXS);
 //	String methDesc;
 	String type;
 	String className;
 	// stores parameter, local vars and the next index on the local variable table, which use for aload_i, astore_i,...
 	HashMap<String, Integer> paramsAndLocals;// = new HashMap<>();
 	byte[] bytecode;
 	HashMap<String,byte[]> classFiles;
 	public BytecodeGen(HashMap<String,byte[]> classFiles) {
 		this.classFiles = classFiles;
 		paramsAndLocals = new HashMap<>();
 	}
 	@Override
 	public void visit(SourceFile sourceFile) {
 		for(ClassOrInterface cl : sourceFile.getClasses()) {
 			BytecodeGen classGen = new BytecodeGen(classFiles);
 			cl.accept(classGen);
 			classGen.writeClass(cl.getClassName().toString());
 		}
 	}
 	private void writeClass(String name) {
 		bytecode = cw.toByteArray();
 		classFiles.put(name, bytecode);
 	}
 	public HashMap<String,byte[]> getClassFiles() {
 		return classFiles;
 	}
 	@Override
 	public void visit(ClassOrInterface classOrInterface) {
 		className = classOrInterface.getClassName().toString();
 		// access flages??
 		cw.visit(Opcodes.V1_8, classOrInterface.getModifiers()+Opcodes.ACC_SUPER, classOrInterface.getClassName().toString()
 				, null, classOrInterface.getSuperClass().toString(), null);
 		// for each field in the class
 		for(Field f : classOrInterface.getFieldDecl()) {
 			System.out.println("get Fields");
 			System.out.println(f.getName());
 			f.accept(this);
 		}
 		for(Constructor c : classOrInterface.getConstructors()) {
 			c.accept(this);
 		}
 		for(Method m : classOrInterface.getMethods()) {
 			m.accept(this);
 		}
 		cw.visitSource(classOrInterface.getClassName().toString()+".jav", null);
 	}
 	@Override
 	public void visit(Constructor field) {
 		Descriptor desc = new Descriptor(field);
 		MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", desc.getDesc(), null, null); 
 		mv.visitCode();		
 		System.out.println("-----Constructor-----");
 		BytecodeGenMethod gen = new BytecodeGenMethod(className,field, mv,paramsAndLocals,desc.getDesc(),cw);
 		mv.visitInsn(Opcodes.RETURN);
 		mv.visitMaxs(0, 0);
 		mv.visitEnd();
 	}
 	@Override
 	public void visit(Method method) {
 		method.getParameterList().accept(this);
 		Descriptor methDesc = new Descriptor(method);
 		System.out.println("-----Method-----");
 		MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, method.getName(), methDesc.getDesc(), null, null); 
 		mv.visitCode();		
 		BytecodeGenMethod gen = new BytecodeGenMethod(className,method, mv,paramsAndLocals,methDesc.getDesc(),cw);
 		mv.visitMaxs(0, 0);
 		mv.visitEnd();
 	}
 	@Override
 	public void visit(ParameterList formalParameters) {
 		Iterator<FormalParameter> itr = formalParameters.iterator();
 		int i = 1;
 		while(itr.hasNext()) {
 			FormalParameter fp = itr.next();
 			paramsAndLocals.put(fp.getName(), i);
 			fp.accept(this);
 			i++;
 		}
 	}
 	@Override
 	public void visit(FormalParameter formalParameter) {
 		formalParameter.getType().accept(this);
 	}
 	@Override
 	public void visit(RefType refType) {
 		type = "L"+refType.toString()+";";
 	}
 	@Override
 	public void visit(SuperWildcardType superWildcardType) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(TypePlaceholder typePlaceholder) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(ExtendsWildcardType extendsWildcardType) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(GenericRefType genericRefType) {
 		// TODO Auto-generated method stub
 	}
 	// ??
 	@Override
 	public void visit(FieldVar fieldVar) {
 		System.out.println("in fieldvar");
 //		cw.newField(fieldVar.receiver.toString(), fieldVar.fieldVarName.toString(), fieldVar.getType().toString());
 		FieldVisitor fv = cw.visitField(Opcodes.ACC_PRIVATE, fieldVar.fieldVarName, "L"+fieldVar.getType()+";", null, null);
 		fv.visitEnd();
 	}
 	// access flages?? modifiers
 	@Override
 	public void visit(Field field) {
 		System.out.println("in field");
 		FieldVisitor fv = cw.visitField(Opcodes.ACC_PRIVATE, field.getName(), "L"+field.getType().toString().replace(".", "/")+";", null, null);
 		fv.visitEnd();
 	}
 	@Override
 	public void visit(LambdaExpression lambdaExpression) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(Assign assign) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(Binary binary) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(Block block) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(CastExpr castExpr) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(EmptyStmt emptyStmt) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(ForStmt forStmt) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(IfStmt ifStmt) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(InstanceOf instanceOf) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(LocalVar localVar) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(LocalVarDecl localVarDecl) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(MethodCall methodCall) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(NewClass methodCall) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(NewArray newArray) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(Receiver receiver) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(Return aReturn) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(ReturnVoid aReturn) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(StaticClassName staticClassName) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(Super aSuper) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(This aThis) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(UnaryPlus unaryPlus) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(WhileStmt whileStmt) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(DoStmt whileStmt) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(Null aNull) {
 		// TODO Auto-generated method stub
 	}
 	// ???
 	@Override
 	public void visit(Literal literal) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(ArgumentList argumentList) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(GenericTypeVar genericTypeVar) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(GenericDeclarationList genericTypeVars) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(AssignToField assignLeftSide) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(AssignToLocal assignLeftSide) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(SuperCall superCall) {
 		// TODO Auto-generated method stub
 	}
 }
--- a/src/de/dhbwstuttgart/bytecode/BytecodeGenLambda.java
+++ b/src/de/dhbwstuttgart/bytecode/BytecodeGenLambda.java
@@ -1,227 +0,0 @@
 package de.dhbwstuttgart.bytecode;
 import org.objectweb.asm.MethodVisitor;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
 import de.dhbwstuttgart.syntaxtree.StatementVisitor;
 import de.dhbwstuttgart.syntaxtree.statement.ArgumentList;
 import de.dhbwstuttgart.syntaxtree.statement.Assign;
 import de.dhbwstuttgart.syntaxtree.statement.AssignToField;
 import de.dhbwstuttgart.syntaxtree.statement.Binary;
 import de.dhbwstuttgart.syntaxtree.statement.Block;
 import de.dhbwstuttgart.syntaxtree.statement.CastExpr;
 import de.dhbwstuttgart.syntaxtree.statement.DoStmt;
 import de.dhbwstuttgart.syntaxtree.statement.EmptyStmt;
 import de.dhbwstuttgart.syntaxtree.statement.FieldVar;
 import de.dhbwstuttgart.syntaxtree.statement.ForStmt;
 import de.dhbwstuttgart.syntaxtree.statement.IfStmt;
 import de.dhbwstuttgart.syntaxtree.statement.InstanceOf;
 import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
 import de.dhbwstuttgart.syntaxtree.statement.LocalVar;
 import de.dhbwstuttgart.syntaxtree.statement.LocalVarDecl;
 import de.dhbwstuttgart.syntaxtree.statement.MethodCall;
 import de.dhbwstuttgart.syntaxtree.statement.NewArray;
 import de.dhbwstuttgart.syntaxtree.statement.NewClass;
 import de.dhbwstuttgart.syntaxtree.statement.Receiver;
 import de.dhbwstuttgart.syntaxtree.statement.Return;
 import de.dhbwstuttgart.syntaxtree.statement.ReturnVoid;
 import de.dhbwstuttgart.syntaxtree.statement.StaticClassName;
 import de.dhbwstuttgart.syntaxtree.statement.Super;
 import de.dhbwstuttgart.syntaxtree.statement.SuperCall;
 import de.dhbwstuttgart.syntaxtree.statement.This;
 import de.dhbwstuttgart.syntaxtree.statement.UnaryPlus;
 import de.dhbwstuttgart.syntaxtree.statement.WhileStmt;
 import de.dhbwstuttgart.syntaxtree.statement.literal.Literal;
 import de.dhbwstuttgart.syntaxtree.statement.literal.Null;
 public class BytecodeGenLambda implements StatementVisitor{
 	private LambdaExpression lambdaExpression;
 	private MethodVisitor mv;
 	public BytecodeGenLambda(LambdaExpression lambdaExpression, MethodVisitor mv) {
 		this.lambdaExpression = lambdaExpression;
 		this.mv = mv;
 	}
 	@Override
 	public void visit(ArgumentList argumentList) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(LambdaExpression lambdaExpression) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(Assign assign) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(Binary binary) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(Block block) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(CastExpr castExpr) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(EmptyStmt emptyStmt) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(FieldVar fieldVar) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(ForStmt forStmt) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(IfStmt ifStmt) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(InstanceOf instanceOf) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(LocalVar localVar) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(LocalVarDecl localVarDecl) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(MethodCall methodCall) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(NewClass methodCall) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(NewArray newArray) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(Receiver receiver) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(Return aReturn) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(ReturnVoid aReturn) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(StaticClassName staticClassName) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(Super aSuper) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(This aThis) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(UnaryPlus unaryPlus) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(WhileStmt whileStmt) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(DoStmt whileStmt) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(Null aNull) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(Literal literal) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(AssignToField assignLeftSide) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(AssignToLocal assignLeftSide) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(SuperCall superCall) {
 		// TODO Auto-generated method stub
 	}
 }
--- a/src/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
+++ b/src/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
@@ -1,360 +0,0 @@
 package de.dhbwstuttgart.bytecode;
 import java.io.PrintStream;
 import java.lang.invoke.CallSite;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.security.GeneralSecurityException;
 import java.util.HashMap;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Handle;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
 import de.dhbwstuttgart.syntaxtree.Method;
 import de.dhbwstuttgart.syntaxtree.StatementVisitor;
 import de.dhbwstuttgart.syntaxtree.statement.ArgumentList;
 import de.dhbwstuttgart.syntaxtree.statement.Assign;
 import de.dhbwstuttgart.syntaxtree.statement.AssignToField;
 import de.dhbwstuttgart.syntaxtree.statement.Binary;
 import de.dhbwstuttgart.syntaxtree.statement.Block;
 import de.dhbwstuttgart.syntaxtree.statement.CastExpr;
 import de.dhbwstuttgart.syntaxtree.statement.DoStmt;
 import de.dhbwstuttgart.syntaxtree.statement.EmptyStmt;
 import de.dhbwstuttgart.syntaxtree.statement.Expression;
 import de.dhbwstuttgart.syntaxtree.statement.FieldVar;
 import de.dhbwstuttgart.syntaxtree.statement.ForStmt;
 import de.dhbwstuttgart.syntaxtree.statement.IfStmt;
 import de.dhbwstuttgart.syntaxtree.statement.InstanceOf;
 import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
 import de.dhbwstuttgart.syntaxtree.statement.LocalVar;
 import de.dhbwstuttgart.syntaxtree.statement.LocalVarDecl;
 import de.dhbwstuttgart.syntaxtree.statement.MethodCall;
 import de.dhbwstuttgart.syntaxtree.statement.NewArray;
 import de.dhbwstuttgart.syntaxtree.statement.NewClass;
 import de.dhbwstuttgart.syntaxtree.statement.Receiver;
 import de.dhbwstuttgart.syntaxtree.statement.Return;
 import de.dhbwstuttgart.syntaxtree.statement.ReturnVoid;
 import de.dhbwstuttgart.syntaxtree.statement.Statement;
 import de.dhbwstuttgart.syntaxtree.statement.StaticClassName;
 import de.dhbwstuttgart.syntaxtree.statement.Super;
 import de.dhbwstuttgart.syntaxtree.statement.SuperCall;
 import de.dhbwstuttgart.syntaxtree.statement.This;
 import de.dhbwstuttgart.syntaxtree.statement.UnaryPlus;
 import de.dhbwstuttgart.syntaxtree.statement.WhileStmt;
 import de.dhbwstuttgart.syntaxtree.statement.literal.Literal;
 import de.dhbwstuttgart.syntaxtree.statement.literal.Null;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 public class BytecodeGenMethod implements StatementVisitor{
 	private Method m;
 	private MethodVisitor mv;
 	private HashMap<String, Integer> paramsAndLocals = new HashMap<>(); 
 	private String desc;
 	private String className;
 	private int lamCounter;
 	private ClassWriter cw;
 	//for tests **
 	private String fieldName;
 	private String fieldDesc;
 	private Expression rightSideTemp;
 	private String where;
 	public BytecodeGenMethod(String className, Method m, MethodVisitor mv, HashMap<String, Integer> paramsAndLocals,
 			String desc, ClassWriter cw) {
 		this.where = "NORMAL METHOD";
 		this.className = className;
 		this.m = m;
 		this.mv = mv;
 		this.paramsAndLocals = paramsAndLocals;
 		this.desc = desc;
 		this.cw = cw;
 		this.lamCounter = -1;
 		this.m.block.accept(this);
 	}
 	public BytecodeGenMethod(LambdaExpression lambdaExpression, MethodVisitor mv, 
 			HashMap<String, Integer> paramsAndLocals, String desc) {
 		System.out.println("++++++IN LAMBDA -------");
 		this.where = "&&&&&&&& LAMBDA METHOD";
 		this.mv = mv;
 		this.paramsAndLocals = paramsAndLocals;
 		this.desc = desc;
 		this.lamCounter = -1;
 		lambdaExpression.methodBody.accept(this);
 	}
 	@Override
 	public void visit(Block block) {
 		for(Statement stmt : block.getStatements()) {
 			System.out.println(where);
 			System.out.println("Stmt : " + stmt.toString());
 			stmt.accept(this);
 			System.out.println("--------------------------\n");
 		}
 	}
 	@Override
 	public void visit(SuperCall superCall) {
 		superCall.receiver.accept(this);
 		superCall.arglist.accept(this);
 //		mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/Object", superCall.name, desc,false);
 		mv.visitMethodInsn(Opcodes.INVOKESPECIAL, Type.getInternalName(Object.class), superCall.name, desc,false);
 	}
 	// ??
 	@Override
 	public void visit(LocalVar localVar) {
 		System.out.println("in Local Var");
 	}
 	// ??
 	@Override
 	public void visit(LocalVarDecl localVarDecl) {
 //		Integer i;
 		paramsAndLocals.put(localVarDecl.getName(), paramsAndLocals.size()+1);
 		System.out.println("In localVarDecl");
 	}
 	@Override
 	public void visit(Assign assign) {
 		System.out.println("Assign : \nright = "+assign.rightSide + "\nLeft = " + assign.lefSide);
 		if(assign.lefSide.getClass().equals(AssignToField.class)) {
 			// load_0, ldc or .. then putfield
 			this.rightSideTemp = assign.rightSide;
 			assign.lefSide.accept(this);
 		}else {
 			assign.rightSide.accept(this);
 			assign.lefSide.accept(this);
 		}
 	}
 	@Override
 	public void visit(Binary binary) {
 		System.out.println("++ In Binary: ");
 	}
 	@Override
 	public void visit(LambdaExpression lambdaExpression) {
 		System.out.println("\n++ In Lambda: ");
 		this.lamCounter++;
 		//Call site, which, when invoked, returns an instance of the functional interface to which
 		//the lambda is being converted
 		MethodType mt = MethodType.methodType(CallSite.class, MethodHandles.Lookup.class, String.class,
 						MethodType.class, MethodType.class, MethodHandle.class, MethodType.class);
 		Handle bootstrap = new Handle(Opcodes.H_INVOKESTATIC, "java/lang/invoke/LambdaMetafactory", 
 				"metafactory", mt.toMethodDescriptorString(), false);
 		String methodName = "lambda$new$" + this.lamCounter;
 		// Type erasure
 		Type arg1 = Type.getMethodType("()V");
 		// real Type
 		Type arg3 = Type.getMethodType("()V");
 		Handle arg2 = new Handle(Opcodes.H_INVOKESTATIC, this.className, methodName, 
 				arg3.toString(),false);
 		mv.visitInvokeDynamicInsn("run", "()Ljava/lang/Runnable;", bootstrap, 
 				arg1, arg2,arg3);
 		MethodVisitor mvLambdaBody = cw.visitMethod(Opcodes.ACC_PRIVATE+ Opcodes.ACC_STATIC + Opcodes.ACC_SYNTHETIC, 
 				methodName, arg3.toString(), null, null);
 //		new BytecodeGenLambda(lambdaExpression, mvLambdaBody);
 		new BytecodeGenMethod(lambdaExpression, mvLambdaBody, new HashMap<>(), arg3.toString());
 		mvLambdaBody.visitMaxs(0, 0);
 		mvLambdaBody.visitEnd();
 	}
 	@Override
 	public void visit(CastExpr castExpr) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(EmptyStmt emptyStmt) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(FieldVar fieldVar) {
 		System.out.println("in fieldVar " + fieldVar.fieldVarName + " ** receiver: "+fieldVar.receiver);
 		fieldName = fieldVar.fieldVarName;
 		fieldDesc = fieldVar.getType().toString();
 		fieldVar.receiver.accept(this);
 		// test (if)
 		if(!fieldVar.receiver.getClass().equals(StaticClassName.class)) {
 			mv.visitFieldInsn(Opcodes.GETFIELD,fieldVar.getType().toString(),fieldName ,fieldDesc);
 		}
 //		mv.visitFieldInsn(Opcodes.GETSTATIC, fieldVar.receiver.getType().toString().replace(".", "/"), 
 //				fieldVar.fieldVarName, fieldVar.getType().toString());
 	}
 	@Override
 	public void visit(ForStmt forStmt) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(IfStmt ifStmt) {
 		System.out.println("++ IF-Statment: ");
 	}
 	@Override
 	public void visit(InstanceOf instanceOf) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(MethodCall methodCall) {
 		System.out.println("	In Methodcall: (" +methodCall.name+")" );
 		System.out.println("		Method-Receiver: "+methodCall.receiver.expr);
 		methodCall.receiver.accept(this);
 		methodCall.arglist.accept(this);
 		Descriptor mDesc = new Descriptor(methodCall.arglist, methodCall.getType());
 		mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, methodCall.receiver.expr.getType().toString(), 
 				methodCall.name, mDesc.getDesc(), false);
 		// test
 		if(!methodCall.getType().toString().equals("V")) {
 			mv.visitInsn(Opcodes.POP);
 		}
 	}
 	@Override
 	public void visit(NewClass methodCall) {
 		System.out.println("In NewClass: ");
 		System.out.println("name: " + methodCall.name + " *** " + "Receiver: " + methodCall.receiver);
 		mv.visitTypeInsn(Opcodes.NEW, methodCall.name.replace(".", "/"));
 		mv.visitInsn(Opcodes.DUP);
 		// creates Descriptor
 		methodCall.arglist.accept(this);
 		String d = "(";
 		for(Expression e : methodCall.arglist.getArguments()) {
 			d = d + "L"+e.getType().toString().replace(".", "/") + ";";
 		}
 		d += ")V";
 		mv.visitMethodInsn(Opcodes.INVOKESPECIAL, methodCall.name.replace(".", "/"), "<init>", d, false);
 	}
 	@Override
 	public void visit(NewArray newArray) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(Receiver receiver) {
 		System.out.println("	in Receiver");
 		System.out.println("		expr : " + receiver.expr);
 		receiver.expr.accept(this);
 	}
 	@Override
 	public void visit(Return aReturn) {
 		mv.visitInsn(Opcodes.ARETURN);
 	}
 	@Override
 	public void visit(ReturnVoid aReturn) {
 		mv.visitInsn(Opcodes.RETURN);
 	}
 	@Override
 	public void visit(StaticClassName staticClassName) {
 		System.out.println("In StaticClassName: ");
 //		mv.visitMethodInsn(Opcodes.INVOKESTATIC, staticClassName.getType().toString().replace(".", "/"), 
 //				staticClassName.toString(), staticClassName.getType().toString(), false);
 		mv.visitFieldInsn(Opcodes.GETSTATIC, staticClassName.getType().toString().replace(".", "/"), 
 				fieldName, fieldDesc);
 	}
 	@Override
 	public void visit(Super aSuper) {
 		System.out.println(">> In Super: ");
 	}
 	@Override
 	public void visit(This aThis) {
 		System.out.println("-> IN This");
 		mv.visitVarInsn(Opcodes.ALOAD, 0);
 	}
 	@Override
 	public void visit(UnaryPlus unaryPlus) {
 		System.out.println("++ In UnaryPlus: ");
 	}
 	@Override
 	public void visit(WhileStmt whileStmt) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(DoStmt whileStmt) {
 		// TODO Auto-generated method stub
 	}
 	@Override
 	public void visit(Null aNull) {
 		mv.visitInsn(Opcodes.ACONST_NULL);
 	}
 	@Override
 	public void visit(Literal literal) {
 		// value?
 		mv.visitLdcInsn(literal.getType().toString());
 	}
 	@Override
 	public void visit(ArgumentList argumentList) {
 		for(Expression al : argumentList.getArguments()) {
 			al.accept(this);
 		}
 	}
 	@Override
 	public void visit(AssignToField assignLeftSide) {
 		// Loads the an object reference from the local variable 
 		//			array slot onto the top of the operand stack.
 		assignLeftSide.field.receiver.accept(this);
 		this.rightSideTemp.accept(this);
 		mv.visitFieldInsn(Opcodes.PUTFIELD, assignLeftSide.field.receiver.getType().toString(), 
 				assignLeftSide.field.fieldVarName, assignLeftSide.field.getType().toString());
 	}
 	@Override
 	public void visit(AssignToLocal assignLeftSide) {
 		paramsAndLocals.put(assignLeftSide.localVar.name, paramsAndLocals.size()+1);
 		mv.visitVarInsn(Opcodes.ASTORE, paramsAndLocals.size());
 	}
 }
--- a/src/de/dhbwstuttgart/bytecode/ClassFile.java
+++ b/src/de/dhbwstuttgart/bytecode/ClassFile.java
@@ -1,14 +0,0 @@
 package de.dhbwstuttgart.bytecode;
 public class ClassFile {
 	String name;
 	byte[] bytecode;
 	public ClassFile(String name, byte[] bytecode) {
 		this.name = name;
 		this.bytecode = bytecode;
 	}
 }
--- a/src/de/dhbwstuttgart/bytecode/Descriptor.java
+++ b/src/de/dhbwstuttgart/bytecode/Descriptor.java
@@ -1,54 +0,0 @@
 package de.dhbwstuttgart.bytecode;
 import java.awt.List;
 import java.util.Iterator;
 import de.dhbwstuttgart.syntaxtree.Constructor;
 import de.dhbwstuttgart.syntaxtree.FormalParameter;
 import de.dhbwstuttgart.syntaxtree.Method;
 import de.dhbwstuttgart.syntaxtree.statement.ArgumentList;
 import de.dhbwstuttgart.syntaxtree.statement.Expression;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 public class Descriptor {
 	String desc;
 	public Descriptor(Method method) {
 		desc = "(";
 		Iterator<FormalParameter> itr = method.getParameterList().iterator();
 		while(itr.hasNext()) {
 			FormalParameter fp = itr.next();
 			desc = desc + "L"+fp.getType().toString().replace(".", "/") + ";";
 		}
 		if(method.getReturnType().toString().equals("void")){
 			desc = desc + ")V";
 		}else {
 			desc = desc + ")" + "L"+method.getReturnType().toString().replace(".", "/")+";";
 		}
 	}
 	public Descriptor(Constructor constructor) {
 		desc = "(";
 		Iterator<FormalParameter> itr = constructor.getParameterList().iterator();
 		while(itr.hasNext()) {
 			FormalParameter fp = itr.next();
 			desc = desc + "L"+fp.getType().toString().replace(".", "/") + ";";
 		}
 		desc = desc + ")V";
 	}
 	public Descriptor(ArgumentList argList, RefTypeOrTPHOrWildcardOrGeneric returnType) {
 		desc = "(";
 		for(Expression e : argList.getArguments()) {
 			desc = desc + "L"+e.getType().toString().replace(".", "/") + ";";
 		}
 		desc = desc + ")"+returnType.toString();
 	}
 	public String getDesc() {
 		return this.desc;
 	}
 }
--- a/src/de/dhbwstuttgart/bytecode/Test.java
+++ b/src/de/dhbwstuttgart/bytecode/Test.java
@@ -1,150 +0,0 @@
 package de.dhbwstuttgart.bytecode;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.lang.invoke.CallSite;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Handle;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 public class Test {
 	private static final String rootDirectory = System.getProperty("user.dir") + "/bin/de/dhbwstuttgart/bytecode/";
 	protected static ClassLoader getClassLoader() throws Exception {
 		File file = new File(rootDirectory);
 		URL url = file.toURI().toURL();
 		URL[] urls = new URL[] { url };
 		System.out.println(urls[0]);
 		return new URLClassLoader(urls);
 	}
 	public static void main(String[] args) {
 		// Test Lambda
 		ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
 		cw.visit(Opcodes.V1_8, Opcodes.ACC_PUBLIC + Opcodes.ACC_SUPER, "TestClass", null, "java/lang/Object", null);
 		cw.visitSource("TestClass.java", null);
 		// Create Constructor
 		MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", "()V", null, null);
 		mv.visitVarInsn(Opcodes.ALOAD, 0);
 		mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/Object", "<init>", "()V");
 		// mv.visitMethodInsn(INVOKEDYNAMIC, "#0", "run", "()Ljava/lang/Runnable");
 		//Call site, which, when invoked, returns an instance of the functional interface to which
 		//the lambda is being converted
 		MethodType mt = MethodType.methodType(CallSite.class, MethodHandles.Lookup.class, String.class,
 				MethodType.class, MethodType.class, MethodHandle.class, MethodType.class);
 		Handle bootstrap = new Handle(Opcodes.H_INVOKESTATIC, "java/lang/invoke/LambdaMetafactory", "metafactory",
 				mt.toMethodDescriptorString());
 		Handle arg2 = new Handle(Opcodes.H_INVOKESTATIC, "TestClass", "lambda$0", "()V");
 		mv.visitInvokeDynamicInsn("run", "()Ljava/lang/Runnable;", bootstrap, 
 				Type.getMethodType("()V"), arg2,
 				Type.getMethodType("()V"));
 		mv.visitVarInsn(Opcodes.ASTORE, 1);
 		mv.visitVarInsn(Opcodes.ALOAD, 1);
 		mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/lang/Runnable", "run", "()V");
 		mv.visitInsn(Opcodes.RETURN);
 		// creates bridge method, contains lambdas body
 				MethodVisitor mvl = cw.visitMethod(Opcodes.ACC_PRIVATE + Opcodes.ACC_STATIC + Opcodes.ACC_SYNTHETIC, "lambda$0",
 						"()V", null, null);
 				mvl.visitCode();
 				mvl.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/System", "out", "Ljava/io/PrintStream;");
 				mvl.visitLdcInsn("lambda");
 				mvl.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/io/PrintStream", "println", "(Ljava/lang/String;)V");
 				mvl.visitInsn(Opcodes.RETURN);
 				mvl.visitMaxs(2, 0);
 				mvl.visitEnd();
 		mv.visitMaxs(1, 2);
 		mv.visitEnd();
 		cw.visitInnerClass("java/lang/invoke/MethodHandles$Lookup", "java/lang/invoke/MethodHandles", "Lookup",
 				Opcodes.ACC_PUBLIC + Opcodes.ACC_STATIC + Opcodes.ACC_FINAL);
 		cw.visitEnd();
 		byte[] b = cw.toByteArray();
 		// Test if statement
 		/*
 		 * ClassWriter cw = new
 		 * ClassWriter(ClassWriter.COMPUTE_FRAMES|ClassWriter.COMPUTE_MAXS);
 		 * 
 		 * cw.visit(Opcodes.V1_8, Opcodes.ACC_PUBLIC+Opcodes.ACC_SUPER, "TestIf", null,
 		 * "java/lang/Object", null); MethodVisitor mv =
 		 * cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", "(Ljava/lang/Boolean;)V", null,
 		 * null); mv.visitCode();
 		 * 
 		 * // Label l0 = new Label(); // mv.visitLabel(l0);
 		 * 
 		 * mv.visitVarInsn(Opcodes.ALOAD, 0);
 		 * 
 		 * mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/Object", "<init>",
 		 * "()V");
 		 * 
 		 * // Label l1 = new Label(); // mv.visitLabel(l1);
 		 * mv.visitVarInsn(Opcodes.ALOAD, 1); mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL,
 		 * "java/lang/Boolean", "booleanValue", "()Z");
 		 * 
 		 * Label label = new Label(); mv.visitJumpInsn(Opcodes.IFEQ, label);
 		 * 
 		 * mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/System", "out",
 		 * "Ljava/io/PrintStream;"); mv.visitLdcInsn("1");
 		 * mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/io/PrintStream", "println",
 		 * "(Ljava/lang/String;)V");
 		 * 
 		 * Label endLabel = new Label(); mv.visitJumpInsn(Opcodes.GOTO, endLabel);
 		 * 
 		 * mv.visitLabel(label); mv.visitFieldInsn(Opcodes.GETSTATIC,
 		 * "java/lang/System", "out", "Ljava/io/PrintStream;"); mv.visitLdcInsn("0");
 		 * mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/io/PrintStream", "println",
 		 * "(Ljava/lang/String;)V");
 		 * 
 		 * 
 		 * 
 		 * mv.visitLabel(endLabel); mv.visitInsn(Opcodes.RETURN);
 		 * 
 		 * // Label l2 = new Label(); // mv.visitLabel(l2);
 		 * 
 		 * // mv.visitLocalVariable("this", "LTestIf;", null, l0, l2, 0); //
 		 * mv.visitLocalVariable("b", "Ljava/lang/Boolean;", null, l0, l2, 1);
 		 * mv.visitMaxs(2, 2); mv.visitEnd();
 		 * 
 		 * cw.visitEnd(); byte[] b = cw.toByteArray();
 		 */
 		FileOutputStream output;
 		try {
 			output = new FileOutputStream(new File(System.getProperty("user.dir") + "/testBytecode/TestClass.class"));
 			output.write(b);
 			output.close();
 		} catch (FileNotFoundException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 	}
 }
--- a/src/de/dhbwstuttgart/bytecode/TestClass.java
+++ b/src/de/dhbwstuttgart/bytecode/TestClass.java
@@ -1,8 +0,0 @@
 package de.dhbwstuttgart.bytecode;
 public class TestClass {
 	public TestClass() {
 		Runnable lam = () -> System.out.println("lambda");
 		lam.run();
 	}
 }
--- a/src/de/dhbwstuttgart/bytecode/TestFields.java
+++ b/src/de/dhbwstuttgart/bytecode/TestFields.java
@@ -1,59 +0,0 @@
 package de.dhbwstuttgart.bytecode;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.FieldVisitor;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 public class TestFields {
 	private static final String rootDirectory = System.getProperty("user.dir") + "/bin/de/dhbwstuttgart/bytecode/";
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub
 		ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES|ClassWriter.COMPUTE_MAXS);
 		cw.visit(Opcodes.V1_8, Opcodes.ACC_PUBLIC + Opcodes.ACC_SUPER, "TetsF", null, "java/lang/Object", null);
 		cw.visitSource("TetsF.java", null);
 		FieldVisitor fv = cw.visitField(Opcodes.ACC_PRIVATE, "z", Type.INT_TYPE.getDescriptor(), null, null);
 		fv.visitEnd();
 		FieldVisitor fvS = cw.visitField(Opcodes.ACC_PUBLIC, "s", "Ljava/lang/String;", null, null);
 		fvS.visitEnd();
 		// Create Constructor
 		MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", "()V", null, null);
 		mv.visitCode();
 		mv.visitVarInsn(Opcodes.ALOAD, 0);
 		mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/Object", "<init>", "()V");
 		mv.visitVarInsn(Opcodes.ALOAD, 0);
 		mv.visitLdcInsn("");
 		mv.visitFieldInsn(Opcodes.PUTFIELD, "TetsF", "s", "Ljava/lang/String;");
 		mv.visitInsn(Opcodes.RETURN);
 		mv.visitMaxs(2, 1);
 		mv.visitEnd();
 		byte[] b = cw.toByteArray();
 		FileOutputStream output;
 		try {
 			output = new FileOutputStream(new File(System.getProperty("user.dir") + "/testBytecode/TetsF.class"));
 			output.write(b);
 			output.close();
 		} catch (FileNotFoundException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 	}
 }
--- a/src/de/dhbwstuttgart/bytecode/TestIf.java
+++ b/src/de/dhbwstuttgart/bytecode/TestIf.java
@@ -1,11 +0,0 @@
 package de.dhbwstuttgart.bytecode;
 public class TestIf {
 	public TestIf(Boolean b) {
 		if(b) {
 			System.out.println("1");
 		}else {
 			System.out.println("0");
 		}
 	}
 }
--- a/src/de/dhbwstuttgart/bytecode/TestMeth.java
+++ b/src/de/dhbwstuttgart/bytecode/TestMeth.java
@@ -1,18 +0,0 @@
 package de.dhbwstuttgart.bytecode;
 public class TestMeth {
 	private int z;
 	public String s;
 	public TestMeth(int temp) {
 		this.z = temp;
 	}
 	public void m1(int a, int b) {
 		int y = m2(1,2,3,4);
 	}
 	public int m2(int a, int b, int x, int y) {
 		Integer c = 55;
 		Integer g;
 		return a+b+y+c;
 	}
 }
--- a/src/de/dhbwstuttgart/bytecode/TetsF.java
+++ b/src/de/dhbwstuttgart/bytecode/TetsF.java
@@ -1,6 +0,0 @@
 package de.dhbwstuttgart.bytecode;
 public class TetsF {
 	private int z;
 	public String s = "";
 }
--- a/src/de/dhbwstuttgart/core/ConsoleInterface.java
+++ b/src/de/dhbwstuttgart/core/ConsoleInterface.java
@@ -1,16 +1,21 @@
 package de.dhbwstuttgart.core;
 import de.dhbwstuttgart.parser.ClassNotFoundException;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
 public class ConsoleInterface {
 	private static final String directory = System.getProperty("user.dir");
 	public static void main(String[] args) throws IOException, ClassNotFoundException {
-		List<File> input = Arrays.asList(args).stream().map((s -> new File(s))).collect(Collectors.toList());
+
-		JavaTXCompiler compiler = new JavaTXCompiler(input);
+		JavaTXCompiler compiler = new JavaTXCompiler();
 		for(String arg : Arrays.asList(args)){
 			compiler.parse(new File(arg));
 		}
 		compiler.typeInference();
 	}
 }
--- a/src/de/dhbwstuttgart/core/IItemWithOffset.java
+++ b/src/de/dhbwstuttgart/core/IItemWithOffset.java
--- a/src/de/dhbwstuttgart/core/JavaTXCompiler.java
+++ b/src/de/dhbwstuttgart/core/JavaTXCompiler.java
@@ -1,65 +1,54 @@
 package de.dhbwstuttgart.core;
-
+import de.dhbwstuttgart.exceptions.DebugException;
-import de.dhbwstuttgart.environment.CompilationEnvironment;
+import de.dhbwstuttgart.parser.ClassNotFoundException;
 import de.dhbwstuttgart.parser.JavaTXParser;
 import de.dhbwstuttgart.parser.scope.GenericsRegistry;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.SyntaxTreeGenerator;
 import de.dhbwstuttgart.parser.antlr.Java8Parser.CompilationUnitContext;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
 import de.dhbwstuttgart.syntaxtree.SourceFile;
-import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
+import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
 import de.dhbwstuttgart.syntaxtree.factory.UnifyTypeFactory;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 import de.dhbwstuttgart.typedeployment.TypeInsert;
 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 {
-	final CompilationEnvironment environment;
+    protected List<SourceFile> sourceFiles = new ArrayList<>();
    public final Map<File, SourceFile> sourceFiles = new HashMap<>();
-    public JavaTXCompiler(File sourceFile) throws IOException, ClassNotFoundException {
+    public List<TypeInsert> getTypeInserts(File forFile){
-        this(Arrays.asList(sourceFile));
+        ResultSet result = typeInference();
-    }
+        for(SourceFile sf : sourceFiles){
-
+            if(sf.getFile().equals(forFile)){
-    public JavaTXCompiler(List<File> sources) throws IOException, ClassNotFoundException {
+                return TypeInsertFactory.createTypeInsertPoints(sf, result);
-        environment = new CompilationEnvironment(sources);
+            }
        for(File s : sources){
            sourceFiles.put(s,parse(s));
        }
        throw new DebugException("Die Datei "+forFile+" wurde nicht geparst");
    }
-    public List<ResultSet> typeInference() throws ClassNotFoundException {
+    public ResultSet typeInference(){
-        List<ClassOrInterface> allClasses = new ArrayList<>();//environment.getAllAvailableClasses();
+        ConstraintSet<Pair> cons = new ConstraintSet<>();
-        for(SourceFile sf : sourceFiles.values()){
+        List<ClassOrInterface> allClasses = new ArrayList<>();
        for(SourceFile sf : sourceFiles){
            allClasses.addAll(sf.getClasses());
        }
-        List<ClassOrInterface> importedClasses = new ArrayList<>();
+        FiniteClosure finiteClosure = UnifyTypeFactory.generateFC(allClasses);
-        //Alle Importierten Klassen in allen geparsten Sourcefiles kommen ins FC
+        for(SourceFile sf : sourceFiles){
-        for(File forSourceFile : sourceFiles.keySet())
+            cons.addAll(sf.getConstraints(sf.getTypeInferenceInformation(sourceFiles)));
-            for(JavaClassName name : sourceFiles.get(forSourceFile).getImports()){
+        }
                ClassOrInterface importedClass = ASTFactory.createClass(
                        ClassLoader.getSystemClassLoader().loadClass(name.toString()));
                importedClasses.add(importedClass);
            }
        allClasses.addAll(importedClasses);
        FiniteClosure finiteClosure =  UnifyTypeFactory.generateFC(allClasses);
        final ConstraintSet<Pair> cons = new TYPE(sourceFiles.values(), allClasses).getConstraints();
        ConstraintSet<UnifyPair> unifyCons = UnifyTypeFactory.convert(cons);
        TypeUnify unify = new TypeUnify();
@@ -70,14 +59,14 @@ public class JavaTXCompiler {
                xConsSet.addAll(constraint);
            }
-            //System.out.println(xConsSet);
+            System.out.println(xConsSet);
            Set<Set<UnifyPair>> result = unify.unify(xConsSet, finiteClosure);
-            //System.out.println("RESULT: " + result);
+            System.out.println("RESULT: " + result);
            results.addAll(result);
        }
-        return results.stream().map((unifyPairs ->
+        return new ResultSet(UnifyTypeFactory.convert(results, generateTPHMap(cons)));
-                new ResultSet(UnifyTypeFactory.convert(unifyPairs, generateTPHMap(cons))))).collect(Collectors.toList());
+        //return new ResultSet(new HashSet<>(Arrays.asList(UnifyTypeFactory.convert(results, generateTPHMap(cons)).iterator().next())));
-        }
+    }
    private Map<String, TypePlaceholder> generateTPHMap(ConstraintSet<Pair> constraints){
        HashMap<String, TypePlaceholder> ret = new HashMap<>();
@@ -93,11 +82,8 @@ public class JavaTXCompiler {
        return ret;
    }
-    private SourceFile parse(File sourceFile) throws IOException, java.lang.ClassNotFoundException {
+    public void parse(File sourceFile) throws IOException, ClassNotFoundException {
-        CompilationUnitContext tree = JavaTXParser.parse(sourceFile);
+        sourceFiles.add(new JavaTXParser().parse(sourceFile));
        SyntaxTreeGenerator generator = new SyntaxTreeGenerator(environment.getRegistry(sourceFile), new GenericsRegistry(null));
        SourceFile ret =  generator.convert(tree);
        return ret;
    }
-    
+
 }
--- a/src/de/dhbwstuttgart/environment/CompilationEnvironment.java
+++ b/src/de/dhbwstuttgart/environment/CompilationEnvironment.java
@@ -1,63 +0,0 @@
 package de.dhbwstuttgart.environment;
 import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
 import de.dhbwstuttgart.syntaxtree.SourceFile;
 import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
 import org.reflections.Reflections;
 import org.reflections.scanners.ResourcesScanner;
 import org.reflections.scanners.SubTypesScanner;
 import org.reflections.util.ClasspathHelper;
 import org.reflections.util.ConfigurationBuilder;
 import org.reflections.util.FilterBuilder;
 import de.dhbwstuttgart.exceptions.DebugException;
 import de.dhbwstuttgart.parser.JavaTXParser;
 import de.dhbwstuttgart.parser.antlr.Java8Parser.CompilationUnitContext;
 import de.dhbwstuttgart.parser.scope.GatherNames;
 import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
 /**
 * Stellt die Java-Environment dar und speichert alle Binarys, Librarys und Sourcefiles im zu kompilierenden Projekt
 * Sie erstellt anhand dieser Informationen die JavaClassNameRegistry
 * 
 * TODO: Zur Initialisierung der CompilationEnvironment sollten alle SourceFiles mit ANTLR geparst werden und alle Klassen Generics und Typen herausgefunden werden
 */
 public class CompilationEnvironment {
 	private final List<URL> librarys;
 	private final List<File> sourceFiles;
 	/**
 	 * Imitiert die Environment beim Aufruf des JavaCompilers auf einer Menge von java-Dateien
 	 * Die Environment enth<74>lt automatisch die Java Standard Library
 	 * @param sourceFiles die zu kompilierenden Dateien
 	 */
 	public CompilationEnvironment(List<File> sourceFiles) {
 		String bootClassPath = System.getProperty("sun.boot.class.path");
        librarys = new ArrayList<>();
        for(String path : bootClassPath.split(File.pathSeparator)) {
        	try {
        		librarys.add(new URL("file:"+path));
 			} catch (MalformedURLException e) {
 				new DebugException("Fehler im Classpath auf diesem System");
 			}
        }
 		this.sourceFiles = sourceFiles;
 	}
 	public JavaClassRegistry getRegistry(File forSourceFile) throws ClassNotFoundException, IOException {
 		List<String> allNames;
 		CompilationUnitContext tree = JavaTXParser.parse(forSourceFile);
 		allNames = GatherNames.getNames(tree, new PackageCrawler(librarys));
 		return new JavaClassRegistry(allNames);
 	}
 }
--- a/src/de/dhbwstuttgart/exceptions/TypeinferenceException.java
+++ b/src/de/dhbwstuttgart/exceptions/TypeinferenceException.java
--- a/src/de/dhbwstuttgart/parser/ClassNotFoundException.java
+++ b/src/de/dhbwstuttgart/parser/ClassNotFoundException.java
@@ -0,0 +1,4 @@
 package de.dhbwstuttgart.parser;
 public class ClassNotFoundException extends Exception{
 }
--- a/src/de/dhbwstuttgart/parser/JavaTXParser.java
+++ b/src/de/dhbwstuttgart/parser/JavaTXParser.java
@@ -1,37 +1,43 @@
 package de.dhbwstuttgart.parser;
 import de.dhbwstuttgart.environment.CompilationEnvironment;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.SyntaxTreeGenerator;
 import de.dhbwstuttgart.parser.antlr.Java8Lexer;
 import de.dhbwstuttgart.parser.antlr.Java8Parser;
 import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
 import de.dhbwstuttgart.syntaxtree.SourceFile;
-
+import de.dhbwstuttgart.typecheck.JavaClassRegistry;
 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 class JavaTXParser {
-    public static Java8Parser.CompilationUnitContext parse(File source) throws IOException, java.lang.ClassNotFoundException {
+    public SourceFile parse(File sourceFile) throws IOException, ClassNotFoundException {
-        InputStream stream = new FileInputStream(source);
+        InputStream stream = new FileInputStream(sourceFile);
        ANTLRInputStream input = new ANTLRInputStream(stream);
        Java8Lexer lexer = new Java8Lexer(input);
        CommonTokenStream tokens = new CommonTokenStream(lexer);
        Java8Parser parser = new Java8Parser(tokens);
-        return parser.compilationUnit();
+        Java8Parser.CompilationUnitContext tree = parser.compilationUnit();
-        /*
+
-        SyntaxTreeGenerator generator = new SyntaxTreeGenerator(environment.getRegistry(source));
+        SyntaxTreeGenerator generator = new SyntaxTreeGenerator(new JavaClassRegistry(generateJavaLangNames()));
-        return generator.convert(tree);
+        return generator.convert(tree, sourceFile);
        */
    }
-    
+
-    /* F<>r das Typsystem ist es notwendig, dass sich der Source in einer Datei befindet:
+    private List<String> generateJavaLangNames() throws IOException, ClassNotFoundException {
-    public SourceFile parse(String fileContent) throws IOException, java.lang.ClassNotFoundException {
+        List<String> ret = new ArrayList<>();
-        return this.parse(new ByteArrayInputStream(fileContent.getBytes(StandardCharsets.UTF_8)));
+
        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");
        ret.add("java.lang.Long");
        ret.add("java.lang.Integer");
        ret.add("java.lang.Boolean");
        ret.add("java.lang.String");
        ret.add("java.lang.Class");
        return ret;
    }
    */
 }
--- a/src/de/dhbwstuttgart/environment/PackageCrawler.java
+++ b/src/de/dhbwstuttgart/environment/PackageCrawler.java
@@ -1,18 +1,18 @@
-package de.dhbwstuttgart.environment;
+package de.dhbwstuttgart.parser;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 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 de.dhbwstuttgart.parser.scope.JavaClassName;
+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)
@@ -20,45 +20,28 @@ import de.dhbwstuttgart.parser.scope.JavaClassName;
 */
 public class PackageCrawler {
-	final URL[] urls;
+    public static Set<Class<?>> getClassesInPackage(String packageName){
 	public PackageCrawler(List<URL> urlList) {
 		urls = urlList.toArray(new URL[0]);
 	}
    public 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());
-        classLoadersList.add(ClassLoader.getSystemClassLoader());
+
        String bootClassPath = System.getProperty("sun.boot.class.path");
        ArrayList<URL> urlList = new ArrayList<>();
        for(String path : bootClassPath.split(";")) {
        	try {
 				urlList.add(new URL("file:"+path));
 			} catch (MalformedURLException e) {
 				new DebugException("Fehler im Classpath auf diesem System");
 			}
        }
        URL[] urls = urlList.toArray(new URL[0]);
        classLoadersList.add(new URLClassLoader(urls, ClassLoader.getSystemClassLoader()));
        */
        Reflections reflections = new Reflections(new ConfigurationBuilder()
                .setScanners(new SubTypesScanner(false /* don't exclude Object.class */), new ResourcesScanner())
-                .setUrls(urls)
+                .setUrls(ClasspathHelper.forClassLoader(classLoadersList.toArray(new ClassLoader[0])))
                .filterInputsBy(new FilterBuilder().include(FilterBuilder.prefix(packageName))));
        Set<Class<?>> classes = reflections.getSubTypesOf(Object.class);
        return classes;
    }
-
+    
-  public List<String> getClassNames(String packageName){
+  // Returns a list of JavaClassNames.
-    List<String> nameList = new ArrayList();
+  public static List<JavaClassName> getClassNames(String packageName){
    List<JavaClassName> nameList = new ArrayList();
    Set<Class<?>> classes = getClassesInPackage(packageName);
    for(Class c : classes){
-      nameList.add(c.getName());
+      nameList.add(new JavaClassName(c.getName()));
    }
    return nameList;
  }
--- a/src/de/dhbwstuttgart/parser/RunTXParser.java
+++ b/src/de/dhbwstuttgart/parser/RunTXParser.java
@@ -0,0 +1,57 @@
 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
@@ -1,20 +0,0 @@
 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/GenericContext.java
+++ b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/GenericContext.java
@@ -1,6 +1,6 @@
 package de.dhbwstuttgart.parser.SyntaxTreeGenerator;
-import de.dhbwstuttgart.parser.scope.JavaClassName;
+import de.dhbwstuttgart.typecheck.JavaClassName;
 public class GenericContext {
    public final String parentMethod;
--- a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/GenericsRegistry.java
+++ b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/GenericsRegistry.java
@@ -0,0 +1,7 @@
 package de.dhbwstuttgart.parser.SyntaxTreeGenerator;
 import java.util.HashMap;
 public class GenericsRegistry extends HashMap<String, GenericContext> {
 }
--- a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java
+++ b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java
@@ -3,19 +3,18 @@ package de.dhbwstuttgart.parser.SyntaxTreeGenerator;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.parser.antlr.Java8Parser;
 import de.dhbwstuttgart.parser.scope.GenericsRegistry;
 import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
 import de.dhbwstuttgart.syntaxtree.*;
 import de.dhbwstuttgart.syntaxtree.statement.*;
 import de.dhbwstuttgart.syntaxtree.statement.literal.*;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.syntaxtree.type.Void;
+import de.dhbwstuttgart.typecheck.JavaClassName;
-
+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 {
@@ -290,15 +289,12 @@ public class StatementGenerator {
    }
    private Statement convert(Java8Parser.AssignmentContext stmt) {
-        AssignLeftSide leftHandSide = convert(stmt.leftHandSide());
+        Expression leftHandSide = convert(stmt.leftHandSide());
        return new Assign(leftHandSide, convert(stmt.expression()), stmt.getStart());
    }
-    private AssignLeftSide convert(Java8Parser.LeftHandSideContext leftHandSide) {
+    private Expression convert(Java8Parser.LeftHandSideContext leftHandSide) {
-        Expression leftSide = generateLocalOrFieldVarOrClassName(leftHandSide.getText(), leftHandSide.getStart());
+        return 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();
    }
    private Statement convert(Java8Parser.IfThenStatementContext stmt){
@@ -337,9 +333,8 @@ public class StatementGenerator {
    }
    private Statement convert(Java8Parser.WhileStatementContext stmt){
-        Expression expr = convert(stmt.expression());
+        //TODO
-        Statement block = convert(stmt.statement());
+        throw new NotImplementedException();
        return new WhileStmt(expr, block,stmt.getStart());
    }
    private Statement convert(Java8Parser.WhileStatementNoShortIfContext stmt){
@@ -348,9 +343,8 @@ public class StatementGenerator {
    }
    private Statement convert(Java8Parser.DoStatementContext stmt){
-        Statement block = convert(stmt.statement());
+        //TODO
-        Expression expr = convert(stmt.expression());
+        throw new NotImplementedException();
        return new DoStmt(expr,block,stmt.getStart());
    }
    private Statement convert(Java8Parser.ForStatementContext stmt){
@@ -399,13 +393,7 @@ public class StatementGenerator {
        }else{
            type = TypeGenerator.convert(declaration.unannTypeOrAuto().unannType(), reg, generics);
        }
-        ret.addAll(generateLocalVariableAssignments(declaration.variableDeclaratorList().variableDeclarator(), type));
+        for(Java8Parser.VariableDeclaratorContext varDecl : declaration.variableDeclaratorList().variableDeclarator()){
        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()));
@@ -417,27 +405,12 @@ public class StatementGenerator {
                }else{
                    initValue = convert(varDecl.variableInitializer().expression());
                }
-                ret.add(new Assign(new AssignToLocal(new LocalVar(name.getText(), type, name.getSymbol()))
+                ret.add(new Assign(new LocalVar(name.getText(), type, name.getSymbol()), initValue, 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());
    }
@@ -468,11 +441,8 @@ public class StatementGenerator {
    }
    private Statement convert(Java8Parser.ReturnStatementContext stmt){
-        if(stmt.expression() != null){
+        return new Return(convert(stmt.expression()),stmt.getStart());
-            return new Return( convert(stmt.expression()),stmt.getStart() );
+        //throw new NotImplementedException();
        }else{
            return new ReturnVoid(stmt.getStart());
        }
    }
    private Statement convert(Java8Parser.ThrowStatementContext stmt){
--- a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntacticSugar.java
+++ b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntacticSugar.java
@@ -12,8 +12,7 @@ public class SyntacticSugar {
            Statement lastStmt = statements.get(statements.size() - 1);
            if (lastStmt instanceof Return) return statements;
            if (lastStmt instanceof WhileStmt) {
-                //TODO
+                if (hasReturn(((WhileStmt) lastStmt).loop_block)) return statements;
                //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;
--- a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java
+++ b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java
@@ -1,19 +1,19 @@
 package de.dhbwstuttgart.parser.SyntaxTreeGenerator;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
-import java.lang.ClassNotFoundException;
+import de.dhbwstuttgart.parser.ClassNotFoundException;
-
+import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.parser.PackageCrawler;
 import de.dhbwstuttgart.parser.antlr.Java8Parser;
 import de.dhbwstuttgart.parser.scope.GenericsRegistry;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
 import de.dhbwstuttgart.syntaxtree.*;
 import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
 import de.dhbwstuttgart.syntaxtree.statement.*;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 import de.dhbwstuttgart.typecheck.*;
 import java.io.File;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -26,20 +26,66 @@ import org.antlr.v4.runtime.tree.TerminalNode;
 public class SyntaxTreeGenerator{
  private JavaClassRegistry reg;
  private final GenericsRegistry globalGenerics;
  private String pkgName = "";
  List<JavaClassName> imports = new ArrayList();
-  List<Statement> fieldInitializations = new ArrayList<>();
+  public SyntaxTreeGenerator(JavaClassRegistry reg){
  public SyntaxTreeGenerator(JavaClassRegistry reg, GenericsRegistry globalGenerics){
    //Die Generics müssen während des Bauens des AST erstellt werden,
    // da diese mit der Methode oder Klasse, in welcher sie deklariert werden
    // verknüpft sein müssen. Dennoch werden die Namen aller Generics in einer globalen Datenbank benötigt.
    this.globalGenerics = globalGenerics;
    this.reg = reg;
  }
  public void setPackageName(Java8Parser.CompilationUnitContext ctx){
    if(ctx.packageDeclaration() != null){
      for(TerminalNode t : ctx.packageDeclaration().Identifier()){
        this.pkgName = this.pkgName + "." + t.toString();
      }
      this.pkgName = this.pkgName.substring(1);
    }
  }
  public void getNames(Java8Parser.CompilationUnitContext ctx){
    if(this.pkgName == "") this.setPackageName(ctx);
    String nameString = "";
    for (Java8Parser.TypeDeclarationContext typeDecl : ctx.typeDeclaration()){
      if(typeDecl.interfaceDeclaration() != null){
        if(typeDecl.interfaceDeclaration().normalInterfaceDeclaration() != null){
          if(this.pkgName != ""){
            nameString = this.pkgName + "." + typeDecl.interfaceDeclaration().normalInterfaceDeclaration().Identifier().toString();
          }
          else{
            nameString = typeDecl.interfaceDeclaration().normalInterfaceDeclaration().Identifier().toString();
          }
          //Die Generic TypeParameter Definitionen Nicht! an die JavaClassName-Registry anfügen:
          /* //Diese gelängen dadurch in den globalen Scope, was sie schließlich nicht sind
          if(typeDecl.classDeclaration().normalClassDeclaration().typeParameters() != null){
            for(Java8Parser.TypeParameterContext tp : typeDecl.classDeclaration().normalClassDeclaration().typeParameters().typeParameterList().typeParameter()){
              //this.reg.add(tp.Identifier().toString());
            }
          }
          */
          this.reg.add(nameString);
        }
      }
      else{
        if(typeDecl.classDeclaration().normalClassDeclaration() != null){
          if(this.pkgName != ""){
            nameString = this.pkgName + "." + typeDecl.classDeclaration().normalClassDeclaration().Identifier().toString();
          }
          else{
            nameString = typeDecl.classDeclaration().normalClassDeclaration().Identifier().toString();
          }
          //Die Generic TypeParameter Definitionen Nicht! an die JavaClassName-Registry anfügen:
          /* //Diese gelängen dadurch in den globalen Scope, was sie schließlich nicht sind
          if(typeDecl.classDeclaration().normalClassDeclaration().typeParameters() != null){
            for(Java8Parser.TypeParameterContext tp : typeDecl.classDeclaration().normalClassDeclaration().typeParameters().typeParameterList().typeParameter()){
              this.reg.add(tp.Identifier().toString());
            }
          }
          */
          this.reg.add(nameString);
        }
      }
    }
  }
  public JavaClassRegistry getReg(){
    return this.reg;
@@ -76,13 +122,13 @@ public class SyntaxTreeGenerator{
        newImports.add(convertSingleTypeImportDeclaration(importDeclCtx.singleTypeImportDeclaration()));
      }
      else if(importDeclCtx.typeImportOnDemandDeclaration() != null){
-        newImports.addAll(convertTypeImportOnDemandDeclaration(importDeclCtx.typeImportOnDemandDeclaration()));
+        newImports.add(convertTypeImportOnDemandDeclaration(importDeclCtx.typeImportOnDemandDeclaration()));
      }
      else if(importDeclCtx.singleStaticImportDeclaration() != null){
        newImports.add(convertSingleStaticImportDeclaration(importDeclCtx.singleStaticImportDeclaration()));
      }
      else{
-        newImports.addAll(convertStaticImportOnDemandDeclaration(importDeclCtx.staticImportOnDemandDeclaration()));
+        newImports.add(convertStaticImportOnDemandDeclaration(importDeclCtx.staticImportOnDemandDeclaration()));
      }
    }
    this.imports.addAll(newImports);
@@ -90,20 +136,28 @@ public class SyntaxTreeGenerator{
  private JavaClassName convertSingleTypeImportDeclaration(Java8Parser.SingleTypeImportDeclarationContext ctx) throws ClassNotFoundException{
    String typeName = convertTypeName(ctx.typeName());
-	JavaClassName ret = reg.getName(typeName);
+    String packageName = getPackageFromClass(typeName);
-	return ret;
+    List<JavaClassName> classes = PackageCrawler.getClassNames(packageName);
    reg.add(typeName);
    JavaClassName ret = reg.getName(typeName);
    if(classes.contains(ret)){
      return ret;
    }
    else{
      throw new ClassNotFoundException();
    }
  }
-  private List<JavaClassName> convertTypeImportOnDemandDeclaration(Java8Parser.TypeImportOnDemandDeclarationContext ctx){
+  private JavaClassName convertTypeImportOnDemandDeclaration(Java8Parser.TypeImportOnDemandDeclarationContext ctx){
-    return reg.getAllFromPackage(ctx.packageOrTypeName().getText());
+    return null;
  }
  private JavaClassName convertSingleStaticImportDeclaration(Java8Parser.SingleStaticImportDeclarationContext ctx){
-    throw new NotImplementedException();
+    return null;
  }
-  private List<JavaClassName> convertStaticImportOnDemandDeclaration(Java8Parser.StaticImportOnDemandDeclarationContext ctx){
+  private JavaClassName convertStaticImportOnDemandDeclaration(Java8Parser.StaticImportOnDemandDeclarationContext ctx){
-    return reg.getAllFromPackage(ctx.typeName().getText());
+    return null;
  }
  private String getPackageFromClass(String cls){
@@ -116,8 +170,9 @@ public class SyntaxTreeGenerator{
    return ret;
  }
-  public SourceFile convert(Java8Parser.CompilationUnitContext ctx) throws ClassNotFoundException{
+  public SourceFile convert(Java8Parser.CompilationUnitContext ctx, File parsedFile) throws ClassNotFoundException{
    List<ClassOrInterface> classes = new ArrayList<>();
    this.getNames(ctx);
    this.setImports(ctx);
    for(Java8Parser.TypeDeclarationContext typeDecl : ctx.typeDeclaration()){
      ClassOrInterface newClass;
@@ -129,37 +184,37 @@ public class SyntaxTreeGenerator{
      }
      classes.add(newClass);
    }
-    return new SourceFile(this.pkgName, classes, this.imports);
+    return new SourceFile(parsedFile, this.pkgName, classes, this.imports);
  }
-  public Method convert(Java8Parser.MethodDeclarationContext methodDeclarationContext, JavaClassName parentClass, RefType superClass, GenericsRegistry generics) {
+  public Method convert(Java8Parser.MethodDeclarationContext methodDeclarationContext, JavaClassName parentClass, GenericsRegistry generics) {
    Java8Parser.MethodHeaderContext header = methodDeclarationContext.methodHeader();
    int modifiers = SyntaxTreeGenerator.convert(methodDeclarationContext.methodModifier());
    GenericsRegistry localGenerics = createGenerics(methodDeclarationContext.methodHeader().typeParameters(),
-            parentClass, header.methodDeclarator().Identifier().getText(), reg, generics);
+            parentClass, header.methodDeclarator().Identifier().getText());
    localGenerics.putAll(generics);
-    return convert(modifiers, header, methodDeclarationContext.methodBody(),parentClass, superClass, localGenerics);
+    return convert(modifiers, header, methodDeclarationContext.methodBody(),parentClass, localGenerics);
  }
-  public Method convert(Java8Parser.InterfaceMethodDeclarationContext ctx, JavaClassName parentClass, RefType superClass, GenericsRegistry generics) {
+  public Method convert(Java8Parser.InterfaceMethodDeclarationContext ctx, JavaClassName parentClass, GenericsRegistry generics) {
    Java8Parser.MethodHeaderContext header = ctx.methodHeader();
    int modifiers = SyntaxTreeGenerator.convertInterfaceModifier(ctx.interfaceMethodModifier());
-    GenericsRegistry localGenerics = createGenerics(header.typeParameters(), parentClass, header.methodDeclarator().Identifier().getText(), reg, generics);
+    GenericsRegistry localGenerics = createGenerics(header.typeParameters(), parentClass, header.methodDeclarator().Identifier().getText());
    localGenerics.putAll(generics);
-    return convert(modifiers, header, ctx.methodBody(),parentClass, superClass, localGenerics);
+    return convert(modifiers, header, ctx.methodBody(),parentClass, localGenerics);
  }
  private Method convert(int modifiers, Java8Parser.MethodHeaderContext header, Java8Parser.MethodBodyContext body,
-                         JavaClassName parentClass, RefType superClass, GenericsRegistry localGenerics) {
+                         JavaClassName parentClass, GenericsRegistry 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);
+      gtvDeclarations = TypeGenerator.convert(header.typeParameters(), parentClass, name,reg, localGenerics);
    }else{
      gtvDeclarations = new GenericDeclarationList(new ArrayList<>(), header.getStart());
    }
@@ -182,9 +237,11 @@ public class SyntaxTreeGenerator{
      block = stmtGen.convert(body.block());
    }
    if(parentClass.equals(new JavaClassName(name))){
-      return new Constructor(modifiers, name, retType, modifiers, parameterList, block, gtvDeclarations, header.getStart(), fieldInitializations, superClass);
+      //TODO: Constructor darf nicht Rückgabetyp void bekommen: Hier als Rückgabetyp die Klasse inklusive generische Variablen
      //retType = TypeGenerator.convertTypeName(name, gtvDeclarations, header.getStart(), reg, localGenerics);
      return new Constructor(name, retType, modifiers, parameterList, block, gtvDeclarations, header.getStart());
    }else{
-      return new Method(modifiers, name, retType, modifiers, parameterList,block, gtvDeclarations, header.getStart());
+      return new Method(name, retType, modifiers, parameterList,block, gtvDeclarations, header.getStart());
    }
  }
@@ -208,7 +265,7 @@ public class SyntaxTreeGenerator{
      }
    }
    JavaClassName name = reg.getName(ctx.Identifier().getText());
-    GenericsRegistry generics = createGenerics(ctx.typeParameters(), name, "", reg, new GenericsRegistry(globalGenerics));
+    GenericsRegistry generics = createGenerics(ctx.typeParameters(), name, "");
    Token offset = ctx.getStart();
    GenericDeclarationList genericClassParameters;
    if(ctx.typeParameters() == null){
@@ -216,14 +273,8 @@ public class SyntaxTreeGenerator{
    }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, superClass, generics);
+    List<Method> methods = convertMethods(ctx.classBody(), name, generics);
    List<Constructor> konstruktoren = new ArrayList<>();
    for(int i = 0; i<methods.size();i++){
      Method m = methods.get(i);
@@ -235,11 +286,17 @@ public class SyntaxTreeGenerator{
    if(konstruktoren.size()<1){//Standardkonstruktor anfügen:
      konstruktoren.add(
              generateStandardConstructor(
-                      ctx.Identifier().getText(), name, superClass,
+                      ctx.Identifier().getText(),
                      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,
@@ -259,15 +316,13 @@ public class SyntaxTreeGenerator{
    return ret;
  }
-  /**
+  private Constructor generateStandardConstructor(String className, GenericDeclarationList classGenerics, Token offset){
   * http://docs.oracle.com/javase/specs/jls/se7/html/jls-8.html#jls-8.8.9
   */
  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(Modifier.PUBLIC, className, classType, modifiers, params, block, classGenerics, offset, fieldInitializations, superClass);
+    return new Constructor(className, classType, modifiers, params, block, classGenerics, offset);
  }
  private RefType convert(Java8Parser.SuperclassContext superclass) {
@@ -275,7 +330,7 @@ public class SyntaxTreeGenerator{
  }
  private List<Method> convertMethods(Java8Parser.ClassBodyContext classBodyContext,
-                                      JavaClassName parentClass, RefType superClass, GenericsRegistry generics) {
+                                      JavaClassName parentClass, GenericsRegistry generics) {
    List<Method> ret = new ArrayList<>();
    for(Java8Parser.ClassBodyDeclarationContext classMember : classBodyContext.classBodyDeclaration()){
      if(classMember.classMemberDeclaration() != null){
@@ -284,7 +339,7 @@ public class SyntaxTreeGenerator{
          //Do nothing!
        }else if(classMemberDeclarationContext.methodDeclaration()!= null){
-          ret.add(this.convert(classMemberDeclarationContext.methodDeclaration(), parentClass, superClass, generics));
+          ret.add(this.convert(classMemberDeclarationContext.methodDeclaration(), parentClass, generics));
        }
      }
    }
@@ -337,7 +392,7 @@ public class SyntaxTreeGenerator{
    for(Java8Parser.VariableDeclaratorContext varCtx : fieldDeclarationContext.variableDeclaratorList().variableDeclarator()){
      String fieldName = convert(varCtx.variableDeclaratorId());
      if(varCtx.variableInitializer() != null){
-        initializeField(varCtx, fieldType, generics);
+        initializeField(fieldDeclarationContext);
      }
      else{
        ret.add(new Field(fieldName,fieldType,modifiers,varCtx.getStart()));
@@ -351,9 +406,9 @@ public class SyntaxTreeGenerator{
  }
  // Initialize a field by creating implicit constructor.
-  private void initializeField(Java8Parser.VariableDeclaratorContext ctx, RefTypeOrTPHOrWildcardOrGeneric typeOfField, GenericsRegistry generics){
+  private void initializeField(Java8Parser.FieldDeclarationContext ctx){
-    StatementGenerator statementGenerator = new StatementGenerator(reg, generics, new HashMap<>());
+    //TODO
-    fieldInitializations.add(statementGenerator.generateFieldAssignment(ctx, typeOfField));
+    throw new NotImplementedException();
  }
  public static int convertModifier(String modifier){
@@ -414,18 +469,17 @@ public class SyntaxTreeGenerator{
    }
    JavaClassName name = reg.getName(ctx.Identifier().getText());
-    GenericsRegistry generics = createGenerics(ctx.typeParameters(), name, "", reg, new GenericsRegistry(globalGenerics));
+    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();
+    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);
@@ -440,9 +494,8 @@ public class SyntaxTreeGenerator{
    return new GenericDeclarationList(new ArrayList<>(), gtvOffset);
  }
-  private GenericsRegistry createGenerics(Java8Parser.TypeParametersContext ctx, JavaClassName parentClass, String parentMethod, JavaClassRegistry reg, GenericsRegistry generics) {
+  private GenericsRegistry createGenerics(Java8Parser.TypeParametersContext ctx, JavaClassName parentClass, String parentMethod) {
-    GenericsRegistry ret = new GenericsRegistry(this.globalGenerics);
+    GenericsRegistry ret = new GenericsRegistry();
    ret.putAll(generics);
    if(ctx == null || ctx.typeParameterList() == null)return ret;
    for(Java8Parser.TypeParameterContext tp : ctx.typeParameterList().typeParameter()){
      TypeGenerator.convert(tp, parentClass, parentMethod, reg, ret);
@@ -456,11 +509,11 @@ public class SyntaxTreeGenerator{
  }
  private List<Method> convertMethods(Java8Parser.InterfaceBodyContext interfaceBodyContext,
-                                      JavaClassName parentClass, RefType superClass, GenericsRegistry generics) {
+                                      JavaClassName parentClass, GenericsRegistry generics) {
    List<Method> ret = new ArrayList<>();
    for(Java8Parser.InterfaceMemberDeclarationContext member : interfaceBodyContext.interfaceMemberDeclaration()){
      if(member.interfaceMethodDeclaration() != null){
-        ret.add(this.convert(member.interfaceMethodDeclaration(), parentClass, superClass, generics));
+        ret.add(this.convert(member.interfaceMethodDeclaration(), parentClass, 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
@@ -2,18 +2,19 @@ package de.dhbwstuttgart.parser.SyntaxTreeGenerator;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.exceptions.TypeinferenceException;
 import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.parser.antlr.Java8Parser;
 import de.dhbwstuttgart.parser.scope.GenericTypeName;
 import de.dhbwstuttgart.parser.scope.GenericsRegistry;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
 import de.dhbwstuttgart.syntaxtree.GenericDeclarationList;
 import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
 import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
 import de.dhbwstuttgart.syntaxtree.statement.ArgumentList;
 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.typecheck.GenericTypeName;
 import de.dhbwstuttgart.typecheck.JavaClassName;
 import de.dhbwstuttgart.typecheck.JavaClassRegistry;
 import org.antlr.v4.runtime.Token;
 import java.util.ArrayList;
@@ -52,8 +53,7 @@ public class TypeGenerator {
        return TypeGenerator.convert(unannTypeContext.unannReferenceType().unannClassOrInterfaceType(), reg, genericsRegistry);
    }
-    public static GenericDeclarationList convert(Java8Parser.TypeParametersContext typeParametersContext,
+    public static GenericDeclarationList convert(Java8Parser.TypeParametersContext typeParametersContext, JavaClassName parentClass, String parentMethod, JavaClassRegistry reg, GenericsRegistry generics) {
                                                 JavaClassName parentClass, String parentMethod, JavaClassRegistry reg, GenericsRegistry generics) {
        Token endOffset = typeParametersContext.getStop();
        List<GenericTypeVar> typeVars = new ArrayList<>();
        for(Java8Parser.TypeParameterContext typeParameter : typeParametersContext.typeParameterList().typeParameter()){
@@ -65,8 +65,6 @@ public class TypeGenerator {
    public static GenericTypeVar convert(Java8Parser.TypeParameterContext typeParameter, JavaClassName parentClass, String parentMethod, JavaClassRegistry reg, GenericsRegistry generics) {
        String name = typeParameter.Identifier().getText();
        //TODO: Es müssen erst alle GenericTypeVars generiert werden, dann können die bounds dieser Generics ermittelt werden
        //Problem <A extends B, B> ist erlaubt, würde aber bei den Bounds von A den Generic B nicht als solchen erkennen
        List<RefTypeOrTPHOrWildcardOrGeneric> bounds = TypeGenerator.convert(typeParameter.typeBound(),reg, generics);
        GenericTypeVar ret = new GenericTypeVar(new GenericTypeName(new GenericContext(parentClass, parentMethod), name), bounds, typeParameter.getStart(), typeParameter.getStop());
@@ -75,33 +73,13 @@ public class TypeGenerator {
    }
    public static List<RefTypeOrTPHOrWildcardOrGeneric> convert(Java8Parser.TypeBoundContext typeBoundContext, JavaClassRegistry reg, GenericsRegistry generics) {
        List<RefTypeOrTPHOrWildcardOrGeneric> ret = new ArrayList<>();
        if(typeBoundContext == null){
-            ret.add(ASTFactory.createObjectClass().getType());
+            List<RefTypeOrTPHOrWildcardOrGeneric> ret = new ArrayList<>();
            ret.add(new ASTFactory(reg).createObjectClass().getType());
            return ret;
        }
        if(typeBoundContext.typeVariable() != null){
            ret.add(convertTypeName(typeBoundContext.typeVariable().Identifier().getText(), null, typeBoundContext.typeVariable().getStart(), reg, generics));
            return ret;
        }
        if(typeBoundContext.classOrInterfaceType() != null){
            ret.add(convert(typeBoundContext.classOrInterfaceType()));
            if(typeBoundContext.additionalBound() != null)
                for(Java8Parser.AdditionalBoundContext addCtx : typeBoundContext.additionalBound()){
                    ret.add(convert(addCtx.interfaceType()));
                }
            return ret;
        }else{
            throw new NotImplementedException();
        }
    }
-    private static RefTypeOrTPHOrWildcardOrGeneric convert(Java8Parser.ClassOrInterfaceTypeContext classOrInterfaceTypeContext) {
+        throw new de.dhbwstuttgart.exceptions.NotImplementedException();
        throw new NotImplementedException();
    }
    private static RefTypeOrTPHOrWildcardOrGeneric convert(Java8Parser.InterfaceTypeContext interfaceTypeContext) {
        throw new NotImplementedException();
    }
    public static RefTypeOrTPHOrWildcardOrGeneric convert(Java8Parser.ReferenceTypeContext referenceTypeContext, JavaClassRegistry reg, GenericsRegistry generics) {
@@ -114,8 +92,8 @@ 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.contains(name)){
+            if(generics.keySet().contains(name)){
                return new GenericRefType(new GenericTypeName(generics.get(name),name), offset);
            }else{
                throw new TypeinferenceException("Der Typ "+ name + " ist nicht vorhanden",offset);
--- a/src/de/dhbwstuttgart/parser/antlr/Java8.g4
+++ b/src/de/dhbwstuttgart/parser/antlr/Java8.g4
@@ -732,7 +732,7 @@ localVariableDeclarationStatement
 unannTypeOrAuto
    : unannType
-    | 'var'
+    | 'auto'
    ;
 localVariableDeclaration
--- a/src/de/dhbwstuttgart/parser/antlr/Java8.tokens
+++ b/src/de/dhbwstuttgart/parser/antlr/Java8.tokens
@@ -106,7 +106,7 @@ ELLIPSIS=105
 WS=106
 COMMENT=107
 LINE_COMMENT=108
-'var'=1
+'auto'=1
 'abstract'=2
 'assert'=3
 'boolean'=4
--- a/src/de/dhbwstuttgart/parser/antlr/Java8BaseListener.java
+++ b/src/de/dhbwstuttgart/parser/antlr/Java8BaseListener.java
@@ -1,4 +1,4 @@
-// Generated from Java8.g4 by ANTLR 4.7
+// Generated from Java8.g4 by ANTLR 4.5.3
 package de.dhbwstuttgart.parser.antlr;
 import org.antlr.v4.runtime.ParserRuleContext;
@@ -1571,18 +1571,6 @@ public class Java8BaseListener implements Java8Listener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitLocalVariableDeclarationStatement(Java8Parser.LocalVariableDeclarationStatementContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void enterUnannTypeOrAuto(Java8Parser.UnannTypeOrAutoContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitUnannTypeOrAuto(Java8Parser.UnannTypeOrAutoContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
--- a/src/de/dhbwstuttgart/parser/antlr/Java8Lexer.java
+++ b/src/de/dhbwstuttgart/parser/antlr/Java8Lexer.java
@@ -1,4 +1,4 @@
-// Generated from Java8.g4 by ANTLR 4.7
+// Generated from /home/janulrich/Development/intellijworkspace/JavaCompilerCore/src/de/dhbwstuttgart/parser/antlr/Java8.g4 by ANTLR 4.5.1
 package de.dhbwstuttgart.parser.antlr;
 import org.antlr.v4.runtime.Lexer;
 import org.antlr.v4.runtime.CharStream;
@@ -11,7 +11,7 @@ import org.antlr.v4.runtime.misc.*;
@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
 public class Java8Lexer extends Lexer {
-	static { RuntimeMetaData.checkVersion("4.7", RuntimeMetaData.VERSION); }
+	static { RuntimeMetaData.checkVersion("4.5.1", RuntimeMetaData.VERSION); }
 	protected static final DFA[] _decisionToDFA;
 	protected static final PredictionContextCache _sharedContextCache =
@@ -34,10 +34,6 @@ public class Java8Lexer extends Lexer {
 		OR_ASSIGN=97, XOR_ASSIGN=98, MOD_ASSIGN=99, LSHIFT_ASSIGN=100, RSHIFT_ASSIGN=101, 
 		URSHIFT_ASSIGN=102, Identifier=103, AT=104, ELLIPSIS=105, WS=106, COMMENT=107, 
 		LINE_COMMENT=108;
 	public static String[] channelNames = {
 		"DEFAULT_TOKEN_CHANNEL", "HIDDEN"
 	};
 	public static String[] modeNames = {
 		"DEFAULT_MODE"
 	};
@@ -72,7 +68,7 @@ public class Java8Lexer extends Lexer {
 	};
 	private static final String[] _LITERAL_NAMES = {
-		null, "'var'", "'abstract'", "'assert'", "'boolean'", "'break'", "'byte'", 
+		null, "'auto'", "'abstract'", "'assert'", "'boolean'", "'break'", "'byte'", 
 		"'case'", "'catch'", "'char'", "'class'", "'const'", "'continue'", "'default'", 
 		"'do'", "'double'", "'else'", "'enum'", "'extends'", "'final'", "'finally'", 
 		"'float'", "'for'", "'if'", "'goto'", "'implements'", "'import'", "'instanceof'", 
@@ -152,9 +148,6 @@ public class Java8Lexer extends Lexer {
 	@Override
 	public String getSerializedATN() { return _serializedATN; }
 	@Override
 	public String[] getChannelNames() { return channelNames; }
 	@Override
 	public String[] getModeNames() { return modeNames; }
@@ -191,7 +184,7 @@ public class Java8Lexer extends Lexer {
 	}
 	public static final String _serializedATN =
-		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2n\u044e\b\1\4\2\t"+
+		"\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\2n\u044f\b\1\4\2\t"+
 		"\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13"+
 		"\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"+
 		"\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"+
@@ -211,88 +204,88 @@ public class Java8Lexer extends Lexer {
 		"\t\u008e\4\u008f\t\u008f\4\u0090\t\u0090\4\u0091\t\u0091\4\u0092\t\u0092"+
 		"\4\u0093\t\u0093\4\u0094\t\u0094\4\u0095\t\u0095\4\u0096\t\u0096\4\u0097"+
 		"\t\u0097\4\u0098\t\u0098\4\u0099\t\u0099\4\u009a\t\u009a\4\u009b\t\u009b"+
-		"\3\2\3\2\3\2\3\2\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\4\3\4\3\4\3\4\3"+
+		"\3\2\3\2\3\2\3\2\3\2\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\4\3\4\3\4\3"+
-		"\4\3\4\3\4\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\6\3\6\3\6\3\6\3\6\3\6\3\7"+
+		"\4\3\4\3\4\3\4\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\6\3\6\3\6\3\6\3\6\3\6"+
-		"\3\7\3\7\3\7\3\7\3\b\3\b\3\b\3\b\3\b\3\t\3\t\3\t\3\t\3\t\3\t\3\n\3\n\3"+
+		"\3\7\3\7\3\7\3\7\3\7\3\b\3\b\3\b\3\b\3\b\3\t\3\t\3\t\3\t\3\t\3\t\3\n\3"+
-		"\n\3\n\3\n\3\13\3\13\3\13\3\13\3\13\3\13\3\f\3\f\3\f\3\f\3\f\3\f\3\r\3"+
+		"\n\3\n\3\n\3\n\3\13\3\13\3\13\3\13\3\13\3\13\3\f\3\f\3\f\3\f\3\f\3\f\3"+
-		"\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\16\3\16\3\16\3\16\3\16\3\16\3\16\3\16"+
+		"\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\16\3\16\3\16\3\16\3\16\3\16\3\16"+
-		"\3\17\3\17\3\17\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\21\3\21\3\21\3\21"+
+		"\3\16\3\17\3\17\3\17\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\21\3\21\3\21"+
-		"\3\21\3\22\3\22\3\22\3\22\3\22\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\23"+
+		"\3\21\3\21\3\22\3\22\3\22\3\22\3\22\3\23\3\23\3\23\3\23\3\23\3\23\3\23"+
-		"\3\24\3\24\3\24\3\24\3\24\3\24\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25"+
+		"\3\23\3\24\3\24\3\24\3\24\3\24\3\24\3\25\3\25\3\25\3\25\3\25\3\25\3\25"+
-		"\3\26\3\26\3\26\3\26\3\26\3\26\3\27\3\27\3\27\3\27\3\30\3\30\3\30\3\31"+
+		"\3\25\3\26\3\26\3\26\3\26\3\26\3\26\3\27\3\27\3\27\3\27\3\30\3\30\3\30"+
-		"\3\31\3\31\3\31\3\31\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3\32"+
+		"\3\31\3\31\3\31\3\31\3\31\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3\32"+
-		"\3\32\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\34\3\34\3\34\3\34\3\34\3\34"+
+		"\3\32\3\32\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\34\3\34\3\34\3\34\3\34"+
-		"\3\34\3\34\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\36\3\36\3\36\3\36\3\36"+
+		"\3\34\3\34\3\34\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\36\3\36\3\36\3\36"+
-		"\3\36\3\36\3\36\3\36\3\36\3\37\3\37\3\37\3\37\3\37\3 \3 \3 \3 \3 \3 \3"+
+		"\3\36\3\36\3\36\3\36\3\36\3\36\3\37\3\37\3\37\3\37\3\37\3 \3 \3 \3 \3"+
-		" \3!\3!\3!\3!\3\"\3\"\3\"\3\"\3\"\3\"\3\"\3\"\3#\3#\3#\3#\3#\3#\3#\3#"+
+		" \3 \3 \3!\3!\3!\3!\3\"\3\"\3\"\3\"\3\"\3\"\3\"\3\"\3#\3#\3#\3#\3#\3#"+
-		"\3$\3$\3$\3$\3$\3$\3$\3$\3$\3$\3%\3%\3%\3%\3%\3%\3%\3&\3&\3&\3&\3&\3&"+
+		"\3#\3#\3$\3$\3$\3$\3$\3$\3$\3$\3$\3$\3%\3%\3%\3%\3%\3%\3%\3&\3&\3&\3&"+
-		"\3&\3\'\3\'\3\'\3\'\3\'\3\'\3(\3(\3(\3(\3(\3(\3(\3)\3)\3)\3)\3)\3)\3)"+
+		"\3&\3&\3&\3\'\3\'\3\'\3\'\3\'\3\'\3(\3(\3(\3(\3(\3(\3(\3)\3)\3)\3)\3)"+
-		"\3)\3)\3*\3*\3*\3*\3*\3*\3+\3+\3+\3+\3+\3+\3+\3,\3,\3,\3,\3,\3,\3,\3,"+
+		"\3)\3)\3)\3)\3*\3*\3*\3*\3*\3*\3+\3+\3+\3+\3+\3+\3+\3,\3,\3,\3,\3,\3,"+
-		"\3,\3,\3,\3,\3,\3-\3-\3-\3-\3-\3.\3.\3.\3.\3.\3.\3/\3/\3/\3/\3/\3/\3/"+
+		"\3,\3,\3,\3,\3,\3,\3,\3-\3-\3-\3-\3-\3.\3.\3.\3.\3.\3.\3/\3/\3/\3/\3/"+
-		"\3\60\3\60\3\60\3\60\3\60\3\60\3\60\3\60\3\60\3\60\3\61\3\61\3\61\3\61"+
+		"\3/\3/\3\60\3\60\3\60\3\60\3\60\3\60\3\60\3\60\3\60\3\60\3\61\3\61\3\61"+
-		"\3\62\3\62\3\62\3\62\3\62\3\63\3\63\3\63\3\63\3\63\3\63\3\63\3\63\3\63"+
+		"\3\61\3\62\3\62\3\62\3\62\3\62\3\63\3\63\3\63\3\63\3\63\3\63\3\63\3\63"+
-		"\3\64\3\64\3\64\3\64\3\64\3\64\3\65\3\65\3\65\3\65\5\65\u0293\n\65\3\66"+
+		"\3\63\3\64\3\64\3\64\3\64\3\64\3\64\3\65\3\65\3\65\3\65\5\65\u0294\n\65"+
-		"\3\66\5\66\u0297\n\66\3\67\3\67\5\67\u029b\n\67\38\38\58\u029f\n8\39\3"+
+		"\3\66\3\66\5\66\u0298\n\66\3\67\3\67\5\67\u029c\n\67\38\38\58\u02a0\n"+
-		"9\59\u02a3\n9\3:\3:\3;\3;\3;\5;\u02aa\n;\3;\3;\3;\5;\u02af\n;\5;\u02b1"+
+		"8\39\39\59\u02a4\n9\3:\3:\3;\3;\3;\5;\u02ab\n;\3;\3;\3;\5;\u02b0\n;\5"+
-		"\n;\3<\3<\5<\u02b5\n<\3<\5<\u02b8\n<\3=\3=\5=\u02bc\n=\3>\3>\3?\6?\u02c1"+
+		";\u02b2\n;\3<\3<\5<\u02b6\n<\3<\5<\u02b9\n<\3=\3=\5=\u02bd\n=\3>\3>\3"+
-		"\n?\r?\16?\u02c2\3@\3@\5@\u02c7\n@\3A\6A\u02ca\nA\rA\16A\u02cb\3B\3B\3"+
+		"?\6?\u02c2\n?\r?\16?\u02c3\3@\3@\5@\u02c8\n@\3A\6A\u02cb\nA\rA\16A\u02cc"+
-		"B\3B\3C\3C\5C\u02d4\nC\3C\5C\u02d7\nC\3D\3D\3E\6E\u02dc\nE\rE\16E\u02dd"+
+		"\3B\3B\3B\3B\3C\3C\5C\u02d5\nC\3C\5C\u02d8\nC\3D\3D\3E\6E\u02dd\nE\rE"+
-		"\3F\3F\5F\u02e2\nF\3G\3G\5G\u02e6\nG\3G\3G\3H\3H\5H\u02ec\nH\3H\5H\u02ef"+
+		"\16E\u02de\3F\3F\5F\u02e3\nF\3G\3G\5G\u02e7\nG\3G\3G\3H\3H\5H\u02ed\n"+
-		"\nH\3I\3I\3J\6J\u02f4\nJ\rJ\16J\u02f5\3K\3K\5K\u02fa\nK\3L\3L\3L\3L\3"+
+		"H\3H\5H\u02f0\nH\3I\3I\3J\6J\u02f5\nJ\rJ\16J\u02f6\3K\3K\5K\u02fb\nK\3"+
-		"M\3M\5M\u0302\nM\3M\5M\u0305\nM\3N\3N\3O\6O\u030a\nO\rO\16O\u030b\3P\3"+
+		"L\3L\3L\3L\3M\3M\5M\u0303\nM\3M\5M\u0306\nM\3N\3N\3O\6O\u030b\nO\rO\16"+
-		"P\5P\u0310\nP\3Q\3Q\5Q\u0314\nQ\3R\3R\3R\5R\u0319\nR\3R\5R\u031c\nR\3"+
+		"O\u030c\3P\3P\5P\u0311\nP\3Q\3Q\5Q\u0315\nQ\3R\3R\3R\5R\u031a\nR\3R\5"+
-		"R\5R\u031f\nR\3R\3R\3R\5R\u0324\nR\3R\5R\u0327\nR\3R\3R\3R\5R\u032c\n"+
+		"R\u031d\nR\3R\5R\u0320\nR\3R\3R\3R\5R\u0325\nR\3R\5R\u0328\nR\3R\3R\3"+
-		"R\3R\3R\3R\5R\u0331\nR\3S\3S\3S\3T\3T\3U\5U\u0339\nU\3U\3U\3V\3V\3W\3"+
+		"R\5R\u032d\nR\3R\3R\3R\5R\u0332\nR\3S\3S\3S\3T\3T\3U\5U\u033a\nU\3U\3"+
-		"W\3X\3X\3X\5X\u0344\nX\3Y\3Y\5Y\u0348\nY\3Y\3Y\3Y\5Y\u034d\nY\3Y\3Y\5"+
+		"U\3V\3V\3W\3W\3X\3X\3X\5X\u0345\nX\3Y\3Y\5Y\u0349\nY\3Y\3Y\3Y\5Y\u034e"+
-		"Y\u0351\nY\3Z\3Z\3Z\3[\3[\3\\\3\\\3\\\3\\\3\\\3\\\3\\\3\\\3\\\5\\\u0361"+
+		"\nY\3Y\3Y\5Y\u0352\nY\3Z\3Z\3Z\3[\3[\3\\\3\\\3\\\3\\\3\\\3\\\3\\\3\\\3"+
-		"\n\\\3]\3]\3]\3]\3]\3]\3]\3]\5]\u036b\n]\3^\3^\3_\3_\5_\u0371\n_\3_\3"+
+		"\\\5\\\u0362\n\\\3]\3]\3]\3]\3]\3]\3]\3]\5]\u036c\n]\3^\3^\3_\3_\5_\u0372"+
-		"_\3`\6`\u0376\n`\r`\16`\u0377\3a\3a\5a\u037c\na\3b\3b\3b\3b\5b\u0382\n"+
+		"\n_\3_\3_\3`\6`\u0377\n`\r`\16`\u0378\3a\3a\5a\u037d\na\3b\3b\3b\3b\5"+
-		"b\3c\3c\3c\3c\3c\3c\3c\3c\3c\3c\3c\5c\u038f\nc\3d\3d\3e\3e\3e\3e\3e\3"+
+		"b\u0383\nb\3c\3c\3c\3c\3c\3c\3c\3c\3c\3c\3c\5c\u0390\nc\3d\3d\3e\3e\3"+
-		"e\3e\3f\3f\3f\3f\3f\3g\3g\3h\3h\3i\3i\3j\3j\3k\3k\3l\3l\3m\3m\3n\3n\3"+
+		"e\3e\3e\3e\3e\3f\3f\3f\3f\3f\3g\3g\3h\3h\3i\3i\3j\3j\3k\3k\3l\3l\3m\3"+
-		"o\3o\3p\3p\3q\3q\3r\3r\3s\3s\3t\3t\3u\3u\3v\3v\3w\3w\3w\3x\3x\3x\3y\3"+
+		"m\3n\3n\3o\3o\3p\3p\3q\3q\3r\3r\3s\3s\3t\3t\3u\3u\3v\3v\3w\3w\3w\3x\3"+
-		"y\3y\3z\3z\3z\3{\3{\3{\3|\3|\3|\3}\3}\3}\3~\3~\3~\3\177\3\177\3\u0080"+
+		"x\3x\3y\3y\3y\3z\3z\3z\3{\3{\3{\3|\3|\3|\3}\3}\3}\3~\3~\3~\3\177\3\177"+
-		"\3\u0080\3\u0081\3\u0081\3\u0082\3\u0082\3\u0083\3\u0083\3\u0084\3\u0084"+
+		"\3\u0080\3\u0080\3\u0081\3\u0081\3\u0082\3\u0082\3\u0083\3\u0083\3\u0084"+
-		"\3\u0085\3\u0085\3\u0086\3\u0086\3\u0087\3\u0087\3\u0087\3\u0088\3\u0088"+
+		"\3\u0084\3\u0085\3\u0085\3\u0086\3\u0086\3\u0087\3\u0087\3\u0087\3\u0088"+
-		"\3\u0088\3\u0089\3\u0089\3\u0089\3\u008a\3\u008a\3\u008a\3\u008b\3\u008b"+
+		"\3\u0088\3\u0088\3\u0089\3\u0089\3\u0089\3\u008a\3\u008a\3\u008a\3\u008b"+
-		"\3\u008b\3\u008c\3\u008c\3\u008c\3\u008d\3\u008d\3\u008d\3\u008e\3\u008e"+
+		"\3\u008b\3\u008b\3\u008c\3\u008c\3\u008c\3\u008d\3\u008d\3\u008d\3\u008e"+
-		"\3\u008e\3\u008f\3\u008f\3\u008f\3\u0090\3\u0090\3\u0090\3\u0091\3\u0091"+
+		"\3\u008e\3\u008e\3\u008f\3\u008f\3\u008f\3\u0090\3\u0090\3\u0090\3\u0091"+
-		"\3\u0091\3\u0091\3\u0092\3\u0092\3\u0092\3\u0092\3\u0093\3\u0093\3\u0093"+
+		"\3\u0091\3\u0091\3\u0091\3\u0092\3\u0092\3\u0092\3\u0092\3\u0093\3\u0093"+
-		"\3\u0093\3\u0093\3\u0094\3\u0094\7\u0094\u0414\n\u0094\f\u0094\16\u0094"+
+		"\3\u0093\3\u0093\3\u0093\3\u0094\3\u0094\7\u0094\u0415\n\u0094\f\u0094"+
-		"\u0417\13\u0094\3\u0095\3\u0095\3\u0095\3\u0095\3\u0095\3\u0095\5\u0095"+
+		"\16\u0094\u0418\13\u0094\3\u0095\3\u0095\3\u0095\3\u0095\3\u0095\3\u0095"+
-		"\u041f\n\u0095\3\u0096\3\u0096\3\u0096\3\u0096\3\u0096\3\u0096\5\u0096"+
+		"\5\u0095\u0420\n\u0095\3\u0096\3\u0096\3\u0096\3\u0096\3\u0096\3\u0096"+
-		"\u0427\n\u0096\3\u0097\3\u0097\3\u0098\3\u0098\3\u0098\3\u0098\3\u0099"+
+		"\5\u0096\u0428\n\u0096\3\u0097\3\u0097\3\u0098\3\u0098\3\u0098\3\u0098"+
-		"\6\u0099\u0430\n\u0099\r\u0099\16\u0099\u0431\3\u0099\3\u0099\3\u009a"+
+		"\3\u0099\6\u0099\u0431\n\u0099\r\u0099\16\u0099\u0432\3\u0099\3\u0099"+
-		"\3\u009a\3\u009a\3\u009a\7\u009a\u043a\n\u009a\f\u009a\16\u009a\u043d"+
+		"\3\u009a\3\u009a\3\u009a\3\u009a\7\u009a\u043b\n\u009a\f\u009a\16\u009a"+
-		"\13\u009a\3\u009a\3\u009a\3\u009a\3\u009a\3\u009a\3\u009b\3\u009b\3\u009b"+
+		"\u043e\13\u009a\3\u009a\3\u009a\3\u009a\3\u009a\3\u009a\3\u009b\3\u009b"+
-		"\3\u009b\7\u009b\u0448\n\u009b\f\u009b\16\u009b\u044b\13\u009b\3\u009b"+
+		"\3\u009b\3\u009b\7\u009b\u0449\n\u009b\f\u009b\16\u009b\u044c\13\u009b"+
-		"\3\u009b\3\u043b\2\u009c\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n\23\13\25\f"+
+		"\3\u009b\3\u009b\3\u043c\2\u009c\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n\23"+
-		"\27\r\31\16\33\17\35\20\37\21!\22#\23%\24\'\25)\26+\27-\30/\31\61\32\63"+
+		"\13\25\f\27\r\31\16\33\17\35\20\37\21!\22#\23%\24\'\25)\26+\27-\30/\31"+
-		"\33\65\34\67\359\36;\37= ?!A\"C#E$G%I&K\'M(O)Q*S+U,W-Y.[/]\60_\61a\62"+
+		"\61\32\63\33\65\34\67\359\36;\37= ?!A\"C#E$G%I&K\'M(O)Q*S+U,W-Y.[/]\60"+
-		"c\63e\64g\65i\66k\2m\2o\2q\2s\2u\2w\2y\2{\2}\2\177\2\u0081\2\u0083\2\u0085"+
+		"_\61a\62c\63e\64g\65i\66k\2m\2o\2q\2s\2u\2w\2y\2{\2}\2\177\2\u0081\2\u0083"+
-		"\2\u0087\2\u0089\2\u008b\2\u008d\2\u008f\2\u0091\2\u0093\2\u0095\2\u0097"+
+		"\2\u0085\2\u0087\2\u0089\2\u008b\2\u008d\2\u008f\2\u0091\2\u0093\2\u0095"+
-		"\2\u0099\2\u009b\2\u009d\2\u009f\2\u00a1\67\u00a3\2\u00a5\2\u00a7\2\u00a9"+
+		"\2\u0097\2\u0099\2\u009b\2\u009d\2\u009f\2\u00a1\67\u00a3\2\u00a5\2\u00a7"+
-		"\2\u00ab\2\u00ad\2\u00af\2\u00b1\2\u00b3\2\u00b5\2\u00b78\u00b99\u00bb"+
+		"\2\u00a9\2\u00ab\2\u00ad\2\u00af\2\u00b1\2\u00b3\2\u00b5\2\u00b78\u00b9"+
-		"\2\u00bd:\u00bf\2\u00c1\2\u00c3\2\u00c5\2\u00c7\2\u00c9\2\u00cb;\u00cd"+
+		"9\u00bb\2\u00bd:\u00bf\2\u00c1\2\u00c3\2\u00c5\2\u00c7\2\u00c9\2\u00cb"+
-		"<\u00cf=\u00d1>\u00d3?\u00d5@\u00d7A\u00d9B\u00dbC\u00ddD\u00dfE\u00e1"+
+		";\u00cd<\u00cf=\u00d1>\u00d3?\u00d5@\u00d7A\u00d9B\u00dbC\u00ddD\u00df"+
-		"F\u00e3G\u00e5H\u00e7I\u00e9J\u00ebK\u00edL\u00efM\u00f1N\u00f3O\u00f5"+
+		"E\u00e1F\u00e3G\u00e5H\u00e7I\u00e9J\u00ebK\u00edL\u00efM\u00f1N\u00f3"+
-		"P\u00f7Q\u00f9R\u00fbS\u00fdT\u00ffU\u0101V\u0103W\u0105X\u0107Y\u0109"+
+		"O\u00f5P\u00f7Q\u00f9R\u00fbS\u00fdT\u00ffU\u0101V\u0103W\u0105X\u0107"+
-		"Z\u010b[\u010d\\\u010f]\u0111^\u0113_\u0115`\u0117a\u0119b\u011bc\u011d"+
+		"Y\u0109Z\u010b[\u010d\\\u010f]\u0111^\u0113_\u0115`\u0117a\u0119b\u011b"+
-		"d\u011fe\u0121f\u0123g\u0125h\u0127i\u0129\2\u012b\2\u012dj\u012fk\u0131"+
+		"c\u011dd\u011fe\u0121f\u0123g\u0125h\u0127i\u0129\2\u012b\2\u012dj\u012f"+
-		"l\u0133m\u0135n\3\2\30\4\2NNnn\3\2\63;\4\2ZZzz\5\2\62;CHch\3\2\629\4\2"+
+		"k\u0131l\u0133m\u0135n\3\2\30\4\2NNnn\3\2\63;\4\2ZZzz\5\2\62;CHch\3\2"+
-		"DDdd\3\2\62\63\4\2GGgg\4\2--//\6\2FFHHffhh\4\2RRrr\4\2))^^\4\2$$^^\n\2"+
+		"\629\4\2DDdd\3\2\62\63\4\2GGgg\4\2--//\6\2FFHHffhh\4\2RRrr\4\2))^^\4\2"+
-		"$$))^^ddhhppttvv\3\2\62\65\6\2&&C\\aac|\4\2\2\u0081\ud802\udc01\3\2\ud802"+
+		"$$^^\n\2$$))^^ddhhppttvv\3\2\62\65\6\2&&C\\aac|\4\2\2\u0081\ud802\udc01"+
-		"\udc01\3\2\udc02\ue001\7\2&&\62;C\\aac|\5\2\13\f\16\17\"\"\4\2\f\f\17"+
+		"\3\2\ud802\udc01\3\2\udc02\ue001\7\2&&\62;C\\aac|\5\2\13\f\16\17\"\"\4"+
-		"\17\2\u045c\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2"+
+		"\2\f\f\17\17\u045d\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13"+
-		"\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27"+
+		"\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2"+
-		"\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3\2\2"+
+		"\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2"+
-		"\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2\2\2"+
+		"!\3\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3"+
-		"\2/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2\29\3\2"+
+		"\2\2\2\2/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2"+
-		"\2\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E\3\2\2\2"+
+		"\29\3\2\2\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E"+
-		"\2G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2\2\2\2S"+
+		"\3\2\2\2\2G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2"+
-		"\3\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2\2_\3\2"+
+		"\2\2\2S\3\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2"+
-		"\2\2\2a\3\2\2\2\2c\3\2\2\2\2e\3\2\2\2\2g\3\2\2\2\2i\3\2\2\2\2\u00a1\3"+
+		"\2_\3\2\2\2\2a\3\2\2\2\2c\3\2\2\2\2e\3\2\2\2\2g\3\2\2\2\2i\3\2\2\2\2\u00a1"+
-		"\2\2\2\2\u00b7\3\2\2\2\2\u00b9\3\2\2\2\2\u00bd\3\2\2\2\2\u00cb\3\2\2\2"+
+		"\3\2\2\2\2\u00b7\3\2\2\2\2\u00b9\3\2\2\2\2\u00bd\3\2\2\2\2\u00cb\3\2\2"+
-		"\2\u00cd\3\2\2\2\2\u00cf\3\2\2\2\2\u00d1\3\2\2\2\2\u00d3\3\2\2\2\2\u00d5"+
+		"\2\2\u00cd\3\2\2\2\2\u00cf\3\2\2\2\2\u00d1\3\2\2\2\2\u00d3\3\2\2\2\2\u00d5"+
 		"\3\2\2\2\2\u00d7\3\2\2\2\2\u00d9\3\2\2\2\2\u00db\3\2\2\2\2\u00dd\3\2\2"+
 		"\2\2\u00df\3\2\2\2\2\u00e1\3\2\2\2\2\u00e3\3\2\2\2\2\u00e5\3\2\2\2\2\u00e7"+
 		"\3\2\2\2\2\u00e9\3\2\2\2\2\u00eb\3\2\2\2\2\u00ed\3\2\2\2\2\u00ef\3\2\2"+
@@ -303,285 +296,285 @@ public class Java8Lexer extends Lexer {
 		"\2\2\u0115\3\2\2\2\2\u0117\3\2\2\2\2\u0119\3\2\2\2\2\u011b\3\2\2\2\2\u011d"+
 		"\3\2\2\2\2\u011f\3\2\2\2\2\u0121\3\2\2\2\2\u0123\3\2\2\2\2\u0125\3\2\2"+
 		"\2\2\u0127\3\2\2\2\2\u012d\3\2\2\2\2\u012f\3\2\2\2\2\u0131\3\2\2\2\2\u0133"+
-		"\3\2\2\2\2\u0135\3\2\2\2\3\u0137\3\2\2\2\5\u013b\3\2\2\2\7\u0144\3\2\2"+
+		"\3\2\2\2\2\u0135\3\2\2\2\3\u0137\3\2\2\2\5\u013c\3\2\2\2\7\u0145\3\2\2"+
-		"\2\t\u014b\3\2\2\2\13\u0153\3\2\2\2\r\u0159\3\2\2\2\17\u015e\3\2\2\2\21"+
+		"\2\t\u014c\3\2\2\2\13\u0154\3\2\2\2\r\u015a\3\2\2\2\17\u015f\3\2\2\2\21"+
-		"\u0163\3\2\2\2\23\u0169\3\2\2\2\25\u016e\3\2\2\2\27\u0174\3\2\2\2\31\u017a"+
+		"\u0164\3\2\2\2\23\u016a\3\2\2\2\25\u016f\3\2\2\2\27\u0175\3\2\2\2\31\u017b"+
-		"\3\2\2\2\33\u0183\3\2\2\2\35\u018b\3\2\2\2\37\u018e\3\2\2\2!\u0195\3\2"+
+		"\3\2\2\2\33\u0184\3\2\2\2\35\u018c\3\2\2\2\37\u018f\3\2\2\2!\u0196\3\2"+
-		"\2\2#\u019a\3\2\2\2%\u019f\3\2\2\2\'\u01a7\3\2\2\2)\u01ad\3\2\2\2+\u01b5"+
+		"\2\2#\u019b\3\2\2\2%\u01a0\3\2\2\2\'\u01a8\3\2\2\2)\u01ae\3\2\2\2+\u01b6"+
-		"\3\2\2\2-\u01bb\3\2\2\2/\u01bf\3\2\2\2\61\u01c2\3\2\2\2\63\u01c7\3\2\2"+
+		"\3\2\2\2-\u01bc\3\2\2\2/\u01c0\3\2\2\2\61\u01c3\3\2\2\2\63\u01c8\3\2\2"+
-		"\2\65\u01d2\3\2\2\2\67\u01d9\3\2\2\29\u01e4\3\2\2\2;\u01e8\3\2\2\2=\u01f2"+
+		"\2\65\u01d3\3\2\2\2\67\u01da\3\2\2\29\u01e5\3\2\2\2;\u01e9\3\2\2\2=\u01f3"+
-		"\3\2\2\2?\u01f7\3\2\2\2A\u01fe\3\2\2\2C\u0202\3\2\2\2E\u020a\3\2\2\2G"+
+		"\3\2\2\2?\u01f8\3\2\2\2A\u01ff\3\2\2\2C\u0203\3\2\2\2E\u020b\3\2\2\2G"+
-		"\u0212\3\2\2\2I\u021c\3\2\2\2K\u0223\3\2\2\2M\u022a\3\2\2\2O\u0230\3\2"+
+		"\u0213\3\2\2\2I\u021d\3\2\2\2K\u0224\3\2\2\2M\u022b\3\2\2\2O\u0231\3\2"+
-		"\2\2Q\u0237\3\2\2\2S\u0240\3\2\2\2U\u0246\3\2\2\2W\u024d\3\2\2\2Y\u025a"+
+		"\2\2Q\u0238\3\2\2\2S\u0241\3\2\2\2U\u0247\3\2\2\2W\u024e\3\2\2\2Y\u025b"+
-		"\3\2\2\2[\u025f\3\2\2\2]\u0265\3\2\2\2_\u026c\3\2\2\2a\u0276\3\2\2\2c"+
+		"\3\2\2\2[\u0260\3\2\2\2]\u0266\3\2\2\2_\u026d\3\2\2\2a\u0277\3\2\2\2c"+
-		"\u027a\3\2\2\2e\u027f\3\2\2\2g\u0288\3\2\2\2i\u0292\3\2\2\2k\u0294\3\2"+
+		"\u027b\3\2\2\2e\u0280\3\2\2\2g\u0289\3\2\2\2i\u0293\3\2\2\2k\u0295\3\2"+
-		"\2\2m\u0298\3\2\2\2o\u029c\3\2\2\2q\u02a0\3\2\2\2s\u02a4\3\2\2\2u\u02b0"+
+		"\2\2m\u0299\3\2\2\2o\u029d\3\2\2\2q\u02a1\3\2\2\2s\u02a5\3\2\2\2u\u02b1"+
-		"\3\2\2\2w\u02b2\3\2\2\2y\u02bb\3\2\2\2{\u02bd\3\2\2\2}\u02c0\3\2\2\2\177"+
+		"\3\2\2\2w\u02b3\3\2\2\2y\u02bc\3\2\2\2{\u02be\3\2\2\2}\u02c1\3\2\2\2\177"+
-		"\u02c6\3\2\2\2\u0081\u02c9\3\2\2\2\u0083\u02cd\3\2\2\2\u0085\u02d1\3\2"+
+		"\u02c7\3\2\2\2\u0081\u02ca\3\2\2\2\u0083\u02ce\3\2\2\2\u0085\u02d2\3\2"+
-		"\2\2\u0087\u02d8\3\2\2\2\u0089\u02db\3\2\2\2\u008b\u02e1\3\2\2\2\u008d"+
+		"\2\2\u0087\u02d9\3\2\2\2\u0089\u02dc\3\2\2\2\u008b\u02e2\3\2\2\2\u008d"+
-		"\u02e3\3\2\2\2\u008f\u02e9\3\2\2\2\u0091\u02f0\3\2\2\2\u0093\u02f3\3\2"+
+		"\u02e4\3\2\2\2\u008f\u02ea\3\2\2\2\u0091\u02f1\3\2\2\2\u0093\u02f4\3\2"+
-		"\2\2\u0095\u02f9\3\2\2\2\u0097\u02fb\3\2\2\2\u0099\u02ff\3\2\2\2\u009b"+
+		"\2\2\u0095\u02fa\3\2\2\2\u0097\u02fc\3\2\2\2\u0099\u0300\3\2\2\2\u009b"+
-		"\u0306\3\2\2\2\u009d\u0309\3\2\2\2\u009f\u030f\3\2\2\2\u00a1\u0313\3\2"+
+		"\u0307\3\2\2\2\u009d\u030a\3\2\2\2\u009f\u0310\3\2\2\2\u00a1\u0314\3\2"+
-		"\2\2\u00a3\u0330\3\2\2\2\u00a5\u0332\3\2\2\2\u00a7\u0335\3\2\2\2\u00a9"+
+		"\2\2\u00a3\u0331\3\2\2\2\u00a5\u0333\3\2\2\2\u00a7\u0336\3\2\2\2\u00a9"+
-		"\u0338\3\2\2\2\u00ab\u033c\3\2\2\2\u00ad\u033e\3\2\2\2\u00af\u0340\3\2"+
+		"\u0339\3\2\2\2\u00ab\u033d\3\2\2\2\u00ad\u033f\3\2\2\2\u00af\u0341\3\2"+
-		"\2\2\u00b1\u0350\3\2\2\2\u00b3\u0352\3\2\2\2\u00b5\u0355\3\2\2\2\u00b7"+
+		"\2\2\u00b1\u0351\3\2\2\2\u00b3\u0353\3\2\2\2\u00b5\u0356\3\2\2\2\u00b7"+
-		"\u0360\3\2\2\2\u00b9\u036a\3\2\2\2\u00bb\u036c\3\2\2\2\u00bd\u036e\3\2"+
+		"\u0361\3\2\2\2\u00b9\u036b\3\2\2\2\u00bb\u036d\3\2\2\2\u00bd\u036f\3\2"+
-		"\2\2\u00bf\u0375\3\2\2\2\u00c1\u037b\3\2\2\2\u00c3\u0381\3\2\2\2\u00c5"+
+		"\2\2\u00bf\u0376\3\2\2\2\u00c1\u037c\3\2\2\2\u00c3\u0382\3\2\2\2\u00c5"+
-		"\u038e\3\2\2\2\u00c7\u0390\3\2\2\2\u00c9\u0392\3\2\2\2\u00cb\u0399\3\2"+
+		"\u038f\3\2\2\2\u00c7\u0391\3\2\2\2\u00c9\u0393\3\2\2\2\u00cb\u039a\3\2"+
-		"\2\2\u00cd\u039e\3\2\2\2\u00cf\u03a0\3\2\2\2\u00d1\u03a2\3\2\2\2\u00d3"+
+		"\2\2\u00cd\u039f\3\2\2\2\u00cf\u03a1\3\2\2\2\u00d1\u03a3\3\2\2\2\u00d3"+
-		"\u03a4\3\2\2\2\u00d5\u03a6\3\2\2\2\u00d7\u03a8\3\2\2\2\u00d9\u03aa\3\2"+
+		"\u03a5\3\2\2\2\u00d5\u03a7\3\2\2\2\u00d7\u03a9\3\2\2\2\u00d9\u03ab\3\2"+
-		"\2\2\u00db\u03ac\3\2\2\2\u00dd\u03ae\3\2\2\2\u00df\u03b0\3\2\2\2\u00e1"+
+		"\2\2\u00db\u03ad\3\2\2\2\u00dd\u03af\3\2\2\2\u00df\u03b1\3\2\2\2\u00e1"+
-		"\u03b2\3\2\2\2\u00e3\u03b4\3\2\2\2\u00e5\u03b6\3\2\2\2\u00e7\u03b8\3\2"+
+		"\u03b3\3\2\2\2\u00e3\u03b5\3\2\2\2\u00e5\u03b7\3\2\2\2\u00e7\u03b9\3\2"+
-		"\2\2\u00e9\u03ba\3\2\2\2\u00eb\u03bc\3\2\2\2\u00ed\u03be\3\2\2\2\u00ef"+
+		"\2\2\u00e9\u03bb\3\2\2\2\u00eb\u03bd\3\2\2\2\u00ed\u03bf\3\2\2\2\u00ef"+
-		"\u03c1\3\2\2\2\u00f1\u03c4\3\2\2\2\u00f3\u03c7\3\2\2\2\u00f5\u03ca\3\2"+
+		"\u03c2\3\2\2\2\u00f1\u03c5\3\2\2\2\u00f3\u03c8\3\2\2\2\u00f5\u03cb\3\2"+
-		"\2\2\u00f7\u03cd\3\2\2\2\u00f9\u03d0\3\2\2\2\u00fb\u03d3\3\2\2\2\u00fd"+
+		"\2\2\u00f7\u03ce\3\2\2\2\u00f9\u03d1\3\2\2\2\u00fb\u03d4\3\2\2\2\u00fd"+
-		"\u03d6\3\2\2\2\u00ff\u03d8\3\2\2\2\u0101\u03da\3\2\2\2\u0103\u03dc\3\2"+
+		"\u03d7\3\2\2\2\u00ff\u03d9\3\2\2\2\u0101\u03db\3\2\2\2\u0103\u03dd\3\2"+
-		"\2\2\u0105\u03de\3\2\2\2\u0107\u03e0\3\2\2\2\u0109\u03e2\3\2\2\2\u010b"+
+		"\2\2\u0105\u03df\3\2\2\2\u0107\u03e1\3\2\2\2\u0109\u03e3\3\2\2\2\u010b"+
-		"\u03e4\3\2\2\2\u010d\u03e6\3\2\2\2\u010f\u03e9\3\2\2\2\u0111\u03ec\3\2"+
+		"\u03e5\3\2\2\2\u010d\u03e7\3\2\2\2\u010f\u03ea\3\2\2\2\u0111\u03ed\3\2"+
-		"\2\2\u0113\u03ef\3\2\2\2\u0115\u03f2\3\2\2\2\u0117\u03f5\3\2\2\2\u0119"+
+		"\2\2\u0113\u03f0\3\2\2\2\u0115\u03f3\3\2\2\2\u0117\u03f6\3\2\2\2\u0119"+
-		"\u03f8\3\2\2\2\u011b\u03fb\3\2\2\2\u011d\u03fe\3\2\2\2\u011f\u0401\3\2"+
+		"\u03f9\3\2\2\2\u011b\u03fc\3\2\2\2\u011d\u03ff\3\2\2\2\u011f\u0402\3\2"+
-		"\2\2\u0121\u0404\3\2\2\2\u0123\u0408\3\2\2\2\u0125\u040c\3\2\2\2\u0127"+
+		"\2\2\u0121\u0405\3\2\2\2\u0123\u0409\3\2\2\2\u0125\u040d\3\2\2\2\u0127"+
-		"\u0411\3\2\2\2\u0129\u041e\3\2\2\2\u012b\u0426\3\2\2\2\u012d\u0428\3\2"+
+		"\u0412\3\2\2\2\u0129\u041f\3\2\2\2\u012b\u0427\3\2\2\2\u012d\u0429\3\2"+
-		"\2\2\u012f\u042a\3\2\2\2\u0131\u042f\3\2\2\2\u0133\u0435\3\2\2\2\u0135"+
+		"\2\2\u012f\u042b\3\2\2\2\u0131\u0430\3\2\2\2\u0133\u0436\3\2\2\2\u0135"+
-		"\u0443\3\2\2\2\u0137\u0138\7x\2\2\u0138\u0139\7c\2\2\u0139\u013a\7t\2"+
+		"\u0444\3\2\2\2\u0137\u0138\7c\2\2\u0138\u0139\7w\2\2\u0139\u013a\7v\2"+
-		"\2\u013a\4\3\2\2\2\u013b\u013c\7c\2\2\u013c\u013d\7d\2\2\u013d\u013e\7"+
+		"\2\u013a\u013b\7q\2\2\u013b\4\3\2\2\2\u013c\u013d\7c\2\2\u013d\u013e\7"+
-		"u\2\2\u013e\u013f\7v\2\2\u013f\u0140\7t\2\2\u0140\u0141\7c\2\2\u0141\u0142"+
+		"d\2\2\u013e\u013f\7u\2\2\u013f\u0140\7v\2\2\u0140\u0141\7t\2\2\u0141\u0142"+
-		"\7e\2\2\u0142\u0143\7v\2\2\u0143\6\3\2\2\2\u0144\u0145\7c\2\2\u0145\u0146"+
+		"\7c\2\2\u0142\u0143\7e\2\2\u0143\u0144\7v\2\2\u0144\6\3\2\2\2\u0145\u0146"+
-		"\7u\2\2\u0146\u0147\7u\2\2\u0147\u0148\7g\2\2\u0148\u0149\7t\2\2\u0149"+
+		"\7c\2\2\u0146\u0147\7u\2\2\u0147\u0148\7u\2\2\u0148\u0149\7g\2\2\u0149"+
-		"\u014a\7v\2\2\u014a\b\3\2\2\2\u014b\u014c\7d\2\2\u014c\u014d\7q\2\2\u014d"+
+		"\u014a\7t\2\2\u014a\u014b\7v\2\2\u014b\b\3\2\2\2\u014c\u014d\7d\2\2\u014d"+
-		"\u014e\7q\2\2\u014e\u014f\7n\2\2\u014f\u0150\7g\2\2\u0150\u0151\7c\2\2"+
+		"\u014e\7q\2\2\u014e\u014f\7q\2\2\u014f\u0150\7n\2\2\u0150\u0151\7g\2\2"+
-		"\u0151\u0152\7p\2\2\u0152\n\3\2\2\2\u0153\u0154\7d\2\2\u0154\u0155\7t"+
+		"\u0151\u0152\7c\2\2\u0152\u0153\7p\2\2\u0153\n\3\2\2\2\u0154\u0155\7d"+
-		"\2\2\u0155\u0156\7g\2\2\u0156\u0157\7c\2\2\u0157\u0158\7m\2\2\u0158\f"+
+		"\2\2\u0155\u0156\7t\2\2\u0156\u0157\7g\2\2\u0157\u0158\7c\2\2\u0158\u0159"+
-		"\3\2\2\2\u0159\u015a\7d\2\2\u015a\u015b\7{\2\2\u015b\u015c\7v\2\2\u015c"+
+		"\7m\2\2\u0159\f\3\2\2\2\u015a\u015b\7d\2\2\u015b\u015c\7{\2\2\u015c\u015d"+
-		"\u015d\7g\2\2\u015d\16\3\2\2\2\u015e\u015f\7e\2\2\u015f\u0160\7c\2\2\u0160"+
+		"\7v\2\2\u015d\u015e\7g\2\2\u015e\16\3\2\2\2\u015f\u0160\7e\2\2\u0160\u0161"+
-		"\u0161\7u\2\2\u0161\u0162\7g\2\2\u0162\20\3\2\2\2\u0163\u0164\7e\2\2\u0164"+
+		"\7c\2\2\u0161\u0162\7u\2\2\u0162\u0163\7g\2\2\u0163\20\3\2\2\2\u0164\u0165"+
-		"\u0165\7c\2\2\u0165\u0166\7v\2\2\u0166\u0167\7e\2\2\u0167\u0168\7j\2\2"+
+		"\7e\2\2\u0165\u0166\7c\2\2\u0166\u0167\7v\2\2\u0167\u0168\7e\2\2\u0168"+
-		"\u0168\22\3\2\2\2\u0169\u016a\7e\2\2\u016a\u016b\7j\2\2\u016b\u016c\7"+
+		"\u0169\7j\2\2\u0169\22\3\2\2\2\u016a\u016b\7e\2\2\u016b\u016c\7j\2\2\u016c"+
-		"c\2\2\u016c\u016d\7t\2\2\u016d\24\3\2\2\2\u016e\u016f\7e\2\2\u016f\u0170"+
+		"\u016d\7c\2\2\u016d\u016e\7t\2\2\u016e\24\3\2\2\2\u016f\u0170\7e\2\2\u0170"+
-		"\7n\2\2\u0170\u0171\7c\2\2\u0171\u0172\7u\2\2\u0172\u0173\7u\2\2\u0173"+
+		"\u0171\7n\2\2\u0171\u0172\7c\2\2\u0172\u0173\7u\2\2\u0173\u0174\7u\2\2"+
-		"\26\3\2\2\2\u0174\u0175\7e\2\2\u0175\u0176\7q\2\2\u0176\u0177\7p\2\2\u0177"+
+		"\u0174\26\3\2\2\2\u0175\u0176\7e\2\2\u0176\u0177\7q\2\2\u0177\u0178\7"+
-		"\u0178\7u\2\2\u0178\u0179\7v\2\2\u0179\30\3\2\2\2\u017a\u017b\7e\2\2\u017b"+
+		"p\2\2\u0178\u0179\7u\2\2\u0179\u017a\7v\2\2\u017a\30\3\2\2\2\u017b\u017c"+
-		"\u017c\7q\2\2\u017c\u017d\7p\2\2\u017d\u017e\7v\2\2\u017e\u017f\7k\2\2"+
+		"\7e\2\2\u017c\u017d\7q\2\2\u017d\u017e\7p\2\2\u017e\u017f\7v\2\2\u017f"+
-		"\u017f\u0180\7p\2\2\u0180\u0181\7w\2\2\u0181\u0182\7g\2\2\u0182\32\3\2"+
+		"\u0180\7k\2\2\u0180\u0181\7p\2\2\u0181\u0182\7w\2\2\u0182\u0183\7g\2\2"+
-		"\2\2\u0183\u0184\7f\2\2\u0184\u0185\7g\2\2\u0185\u0186\7h\2\2\u0186\u0187"+
+		"\u0183\32\3\2\2\2\u0184\u0185\7f\2\2\u0185\u0186\7g\2\2\u0186\u0187\7"+
-		"\7c\2\2\u0187\u0188\7w\2\2\u0188\u0189\7n\2\2\u0189\u018a\7v\2\2\u018a"+
+		"h\2\2\u0187\u0188\7c\2\2\u0188\u0189\7w\2\2\u0189\u018a\7n\2\2\u018a\u018b"+
-		"\34\3\2\2\2\u018b\u018c\7f\2\2\u018c\u018d\7q\2\2\u018d\36\3\2\2\2\u018e"+
+		"\7v\2\2\u018b\34\3\2\2\2\u018c\u018d\7f\2\2\u018d\u018e\7q\2\2\u018e\36"+
-		"\u018f\7f\2\2\u018f\u0190\7q\2\2\u0190\u0191\7w\2\2\u0191\u0192\7d\2\2"+
+		"\3\2\2\2\u018f\u0190\7f\2\2\u0190\u0191\7q\2\2\u0191\u0192\7w\2\2\u0192"+
-		"\u0192\u0193\7n\2\2\u0193\u0194\7g\2\2\u0194 \3\2\2\2\u0195\u0196\7g\2"+
+		"\u0193\7d\2\2\u0193\u0194\7n\2\2\u0194\u0195\7g\2\2\u0195 \3\2\2\2\u0196"+
-		"\2\u0196\u0197\7n\2\2\u0197\u0198\7u\2\2\u0198\u0199\7g\2\2\u0199\"\3"+
+		"\u0197\7g\2\2\u0197\u0198\7n\2\2\u0198\u0199\7u\2\2\u0199\u019a\7g\2\2"+
-		"\2\2\2\u019a\u019b\7g\2\2\u019b\u019c\7p\2\2\u019c\u019d\7w\2\2\u019d"+
+		"\u019a\"\3\2\2\2\u019b\u019c\7g\2\2\u019c\u019d\7p\2\2\u019d\u019e\7w"+
-		"\u019e\7o\2\2\u019e$\3\2\2\2\u019f\u01a0\7g\2\2\u01a0\u01a1\7z\2\2\u01a1"+
+		"\2\2\u019e\u019f\7o\2\2\u019f$\3\2\2\2\u01a0\u01a1\7g\2\2\u01a1\u01a2"+
-		"\u01a2\7v\2\2\u01a2\u01a3\7g\2\2\u01a3\u01a4\7p\2\2\u01a4\u01a5\7f\2\2"+
+		"\7z\2\2\u01a2\u01a3\7v\2\2\u01a3\u01a4\7g\2\2\u01a4\u01a5\7p\2\2\u01a5"+
-		"\u01a5\u01a6\7u\2\2\u01a6&\3\2\2\2\u01a7\u01a8\7h\2\2\u01a8\u01a9\7k\2"+
+		"\u01a6\7f\2\2\u01a6\u01a7\7u\2\2\u01a7&\3\2\2\2\u01a8\u01a9\7h\2\2\u01a9"+
-		"\2\u01a9\u01aa\7p\2\2\u01aa\u01ab\7c\2\2\u01ab\u01ac\7n\2\2\u01ac(\3\2"+
+		"\u01aa\7k\2\2\u01aa\u01ab\7p\2\2\u01ab\u01ac\7c\2\2\u01ac\u01ad\7n\2\2"+
-		"\2\2\u01ad\u01ae\7h\2\2\u01ae\u01af\7k\2\2\u01af\u01b0\7p\2\2\u01b0\u01b1"+
+		"\u01ad(\3\2\2\2\u01ae\u01af\7h\2\2\u01af\u01b0\7k\2\2\u01b0\u01b1\7p\2"+
-		"\7c\2\2\u01b1\u01b2\7n\2\2\u01b2\u01b3\7n\2\2\u01b3\u01b4\7{\2\2\u01b4"+
+		"\2\u01b1\u01b2\7c\2\2\u01b2\u01b3\7n\2\2\u01b3\u01b4\7n\2\2\u01b4\u01b5"+
-		"*\3\2\2\2\u01b5\u01b6\7h\2\2\u01b6\u01b7\7n\2\2\u01b7\u01b8\7q\2\2\u01b8"+
+		"\7{\2\2\u01b5*\3\2\2\2\u01b6\u01b7\7h\2\2\u01b7\u01b8\7n\2\2\u01b8\u01b9"+
-		"\u01b9\7c\2\2\u01b9\u01ba\7v\2\2\u01ba,\3\2\2\2\u01bb\u01bc\7h\2\2\u01bc"+
+		"\7q\2\2\u01b9\u01ba\7c\2\2\u01ba\u01bb\7v\2\2\u01bb,\3\2\2\2\u01bc\u01bd"+
-		"\u01bd\7q\2\2\u01bd\u01be\7t\2\2\u01be.\3\2\2\2\u01bf\u01c0\7k\2\2\u01c0"+
+		"\7h\2\2\u01bd\u01be\7q\2\2\u01be\u01bf\7t\2\2\u01bf.\3\2\2\2\u01c0\u01c1"+
-		"\u01c1\7h\2\2\u01c1\60\3\2\2\2\u01c2\u01c3\7i\2\2\u01c3\u01c4\7q\2\2\u01c4"+
+		"\7k\2\2\u01c1\u01c2\7h\2\2\u01c2\60\3\2\2\2\u01c3\u01c4\7i\2\2\u01c4\u01c5"+
-		"\u01c5\7v\2\2\u01c5\u01c6\7q\2\2\u01c6\62\3\2\2\2\u01c7\u01c8\7k\2\2\u01c8"+
+		"\7q\2\2\u01c5\u01c6\7v\2\2\u01c6\u01c7\7q\2\2\u01c7\62\3\2\2\2\u01c8\u01c9"+
-		"\u01c9\7o\2\2\u01c9\u01ca\7r\2\2\u01ca\u01cb\7n\2\2\u01cb\u01cc\7g\2\2"+
+		"\7k\2\2\u01c9\u01ca\7o\2\2\u01ca\u01cb\7r\2\2\u01cb\u01cc\7n\2\2\u01cc"+
-		"\u01cc\u01cd\7o\2\2\u01cd\u01ce\7g\2\2\u01ce\u01cf\7p\2\2\u01cf\u01d0"+
+		"\u01cd\7g\2\2\u01cd\u01ce\7o\2\2\u01ce\u01cf\7g\2\2\u01cf\u01d0\7p\2\2"+
-		"\7v\2\2\u01d0\u01d1\7u\2\2\u01d1\64\3\2\2\2\u01d2\u01d3\7k\2\2\u01d3\u01d4"+
+		"\u01d0\u01d1\7v\2\2\u01d1\u01d2\7u\2\2\u01d2\64\3\2\2\2\u01d3\u01d4\7"+
-		"\7o\2\2\u01d4\u01d5\7r\2\2\u01d5\u01d6\7q\2\2\u01d6\u01d7\7t\2\2\u01d7"+
+		"k\2\2\u01d4\u01d5\7o\2\2\u01d5\u01d6\7r\2\2\u01d6\u01d7\7q\2\2\u01d7\u01d8"+
-		"\u01d8\7v\2\2\u01d8\66\3\2\2\2\u01d9\u01da\7k\2\2\u01da\u01db\7p\2\2\u01db"+
+		"\7t\2\2\u01d8\u01d9\7v\2\2\u01d9\66\3\2\2\2\u01da\u01db\7k\2\2\u01db\u01dc"+
-		"\u01dc\7u\2\2\u01dc\u01dd\7v\2\2\u01dd\u01de\7c\2\2\u01de\u01df\7p\2\2"+
+		"\7p\2\2\u01dc\u01dd\7u\2\2\u01dd\u01de\7v\2\2\u01de\u01df\7c\2\2\u01df"+
-		"\u01df\u01e0\7e\2\2\u01e0\u01e1\7g\2\2\u01e1\u01e2\7q\2\2\u01e2\u01e3"+
+		"\u01e0\7p\2\2\u01e0\u01e1\7e\2\2\u01e1\u01e2\7g\2\2\u01e2\u01e3\7q\2\2"+
-		"\7h\2\2\u01e38\3\2\2\2\u01e4\u01e5\7k\2\2\u01e5\u01e6\7p\2\2\u01e6\u01e7"+
+		"\u01e3\u01e4\7h\2\2\u01e48\3\2\2\2\u01e5\u01e6\7k\2\2\u01e6\u01e7\7p\2"+
-		"\7v\2\2\u01e7:\3\2\2\2\u01e8\u01e9\7k\2\2\u01e9\u01ea\7p\2\2\u01ea\u01eb"+
+		"\2\u01e7\u01e8\7v\2\2\u01e8:\3\2\2\2\u01e9\u01ea\7k\2\2\u01ea\u01eb\7"+
-		"\7v\2\2\u01eb\u01ec\7g\2\2\u01ec\u01ed\7t\2\2\u01ed\u01ee\7h\2\2\u01ee"+
+		"p\2\2\u01eb\u01ec\7v\2\2\u01ec\u01ed\7g\2\2\u01ed\u01ee\7t\2\2\u01ee\u01ef"+
-		"\u01ef\7c\2\2\u01ef\u01f0\7e\2\2\u01f0\u01f1\7g\2\2\u01f1<\3\2\2\2\u01f2"+
+		"\7h\2\2\u01ef\u01f0\7c\2\2\u01f0\u01f1\7e\2\2\u01f1\u01f2\7g\2\2\u01f2"+
-		"\u01f3\7n\2\2\u01f3\u01f4\7q\2\2\u01f4\u01f5\7p\2\2\u01f5\u01f6\7i\2\2"+
+		"<\3\2\2\2\u01f3\u01f4\7n\2\2\u01f4\u01f5\7q\2\2\u01f5\u01f6\7p\2\2\u01f6"+
-		"\u01f6>\3\2\2\2\u01f7\u01f8\7p\2\2\u01f8\u01f9\7c\2\2\u01f9\u01fa\7v\2"+
+		"\u01f7\7i\2\2\u01f7>\3\2\2\2\u01f8\u01f9\7p\2\2\u01f9\u01fa\7c\2\2\u01fa"+
-		"\2\u01fa\u01fb\7k\2\2\u01fb\u01fc\7x\2\2\u01fc\u01fd\7g\2\2\u01fd@\3\2"+
+		"\u01fb\7v\2\2\u01fb\u01fc\7k\2\2\u01fc\u01fd\7x\2\2\u01fd\u01fe\7g\2\2"+
-		"\2\2\u01fe\u01ff\7p\2\2\u01ff\u0200\7g\2\2\u0200\u0201\7y\2\2\u0201B\3"+
+		"\u01fe@\3\2\2\2\u01ff\u0200\7p\2\2\u0200\u0201\7g\2\2\u0201\u0202\7y\2"+
-		"\2\2\2\u0202\u0203\7r\2\2\u0203\u0204\7c\2\2\u0204\u0205\7e\2\2\u0205"+
+		"\2\u0202B\3\2\2\2\u0203\u0204\7r\2\2\u0204\u0205\7c\2\2\u0205\u0206\7"+
-		"\u0206\7m\2\2\u0206\u0207\7c\2\2\u0207\u0208\7i\2\2\u0208\u0209\7g\2\2"+
+		"e\2\2\u0206\u0207\7m\2\2\u0207\u0208\7c\2\2\u0208\u0209\7i\2\2\u0209\u020a"+
-		"\u0209D\3\2\2\2\u020a\u020b\7r\2\2\u020b\u020c\7t\2\2\u020c\u020d\7k\2"+
+		"\7g\2\2\u020aD\3\2\2\2\u020b\u020c\7r\2\2\u020c\u020d\7t\2\2\u020d\u020e"+
-		"\2\u020d\u020e\7x\2\2\u020e\u020f\7c\2\2\u020f\u0210\7v\2\2\u0210\u0211"+
+		"\7k\2\2\u020e\u020f\7x\2\2\u020f\u0210\7c\2\2\u0210\u0211\7v\2\2\u0211"+
-		"\7g\2\2\u0211F\3\2\2\2\u0212\u0213\7r\2\2\u0213\u0214\7t\2\2\u0214\u0215"+
+		"\u0212\7g\2\2\u0212F\3\2\2\2\u0213\u0214\7r\2\2\u0214\u0215\7t\2\2\u0215"+
-		"\7q\2\2\u0215\u0216\7v\2\2\u0216\u0217\7g\2\2\u0217\u0218\7e\2\2\u0218"+
+		"\u0216\7q\2\2\u0216\u0217\7v\2\2\u0217\u0218\7g\2\2\u0218\u0219\7e\2\2"+
-		"\u0219\7v\2\2\u0219\u021a\7g\2\2\u021a\u021b\7f\2\2\u021bH\3\2\2\2\u021c"+
+		"\u0219\u021a\7v\2\2\u021a\u021b\7g\2\2\u021b\u021c\7f\2\2\u021cH\3\2\2"+
-		"\u021d\7r\2\2\u021d\u021e\7w\2\2\u021e\u021f\7d\2\2\u021f\u0220\7n\2\2"+
+		"\2\u021d\u021e\7r\2\2\u021e\u021f\7w\2\2\u021f\u0220\7d\2\2\u0220\u0221"+
-		"\u0220\u0221\7k\2\2\u0221\u0222\7e\2\2\u0222J\3\2\2\2\u0223\u0224\7t\2"+
+		"\7n\2\2\u0221\u0222\7k\2\2\u0222\u0223\7e\2\2\u0223J\3\2\2\2\u0224\u0225"+
-		"\2\u0224\u0225\7g\2\2\u0225\u0226\7v\2\2\u0226\u0227\7w\2\2\u0227\u0228"+
+		"\7t\2\2\u0225\u0226\7g\2\2\u0226\u0227\7v\2\2\u0227\u0228\7w\2\2\u0228"+
-		"\7t\2\2\u0228\u0229\7p\2\2\u0229L\3\2\2\2\u022a\u022b\7u\2\2\u022b\u022c"+
+		"\u0229\7t\2\2\u0229\u022a\7p\2\2\u022aL\3\2\2\2\u022b\u022c\7u\2\2\u022c"+
-		"\7j\2\2\u022c\u022d\7q\2\2\u022d\u022e\7t\2\2\u022e\u022f\7v\2\2\u022f"+
+		"\u022d\7j\2\2\u022d\u022e\7q\2\2\u022e\u022f\7t\2\2\u022f\u0230\7v\2\2"+
-		"N\3\2\2\2\u0230\u0231\7u\2\2\u0231\u0232\7v\2\2\u0232\u0233\7c\2\2\u0233"+
+		"\u0230N\3\2\2\2\u0231\u0232\7u\2\2\u0232\u0233\7v\2\2\u0233\u0234\7c\2"+
-		"\u0234\7v\2\2\u0234\u0235\7k\2\2\u0235\u0236\7e\2\2\u0236P\3\2\2\2\u0237"+
+		"\2\u0234\u0235\7v\2\2\u0235\u0236\7k\2\2\u0236\u0237\7e\2\2\u0237P\3\2"+
-		"\u0238\7u\2\2\u0238\u0239\7v\2\2\u0239\u023a\7t\2\2\u023a\u023b\7k\2\2"+
+		"\2\2\u0238\u0239\7u\2\2\u0239\u023a\7v\2\2\u023a\u023b\7t\2\2\u023b\u023c"+
-		"\u023b\u023c\7e\2\2\u023c\u023d\7v\2\2\u023d\u023e\7h\2\2\u023e\u023f"+
+		"\7k\2\2\u023c\u023d\7e\2\2\u023d\u023e\7v\2\2\u023e\u023f\7h\2\2\u023f"+
-		"\7r\2\2\u023fR\3\2\2\2\u0240\u0241\7u\2\2\u0241\u0242\7w\2\2\u0242\u0243"+
+		"\u0240\7r\2\2\u0240R\3\2\2\2\u0241\u0242\7u\2\2\u0242\u0243\7w\2\2\u0243"+
-		"\7r\2\2\u0243\u0244\7g\2\2\u0244\u0245\7t\2\2\u0245T\3\2\2\2\u0246\u0247"+
+		"\u0244\7r\2\2\u0244\u0245\7g\2\2\u0245\u0246\7t\2\2\u0246T\3\2\2\2\u0247"+
-		"\7u\2\2\u0247\u0248\7y\2\2\u0248\u0249\7k\2\2\u0249\u024a\7v\2\2\u024a"+
+		"\u0248\7u\2\2\u0248\u0249\7y\2\2\u0249\u024a\7k\2\2\u024a\u024b\7v\2\2"+
-		"\u024b\7e\2\2\u024b\u024c\7j\2\2\u024cV\3\2\2\2\u024d\u024e\7u\2\2\u024e"+
+		"\u024b\u024c\7e\2\2\u024c\u024d\7j\2\2\u024dV\3\2\2\2\u024e\u024f\7u\2"+
-		"\u024f\7{\2\2\u024f\u0250\7p\2\2\u0250\u0251\7e\2\2\u0251\u0252\7j\2\2"+
+		"\2\u024f\u0250\7{\2\2\u0250\u0251\7p\2\2\u0251\u0252\7e\2\2\u0252\u0253"+
-		"\u0252\u0253\7t\2\2\u0253\u0254\7q\2\2\u0254\u0255\7p\2\2\u0255\u0256"+
+		"\7j\2\2\u0253\u0254\7t\2\2\u0254\u0255\7q\2\2\u0255\u0256\7p\2\2\u0256"+
-		"\7k\2\2\u0256\u0257\7|\2\2\u0257\u0258\7g\2\2\u0258\u0259\7f\2\2\u0259"+
+		"\u0257\7k\2\2\u0257\u0258\7|\2\2\u0258\u0259\7g\2\2\u0259\u025a\7f\2\2"+
-		"X\3\2\2\2\u025a\u025b\7v\2\2\u025b\u025c\7j\2\2\u025c\u025d\7k\2\2\u025d"+
+		"\u025aX\3\2\2\2\u025b\u025c\7v\2\2\u025c\u025d\7j\2\2\u025d\u025e\7k\2"+
-		"\u025e\7u\2\2\u025eZ\3\2\2\2\u025f\u0260\7v\2\2\u0260\u0261\7j\2\2\u0261"+
+		"\2\u025e\u025f\7u\2\2\u025fZ\3\2\2\2\u0260\u0261\7v\2\2\u0261\u0262\7"+
-		"\u0262\7t\2\2\u0262\u0263\7q\2\2\u0263\u0264\7y\2\2\u0264\\\3\2\2\2\u0265"+
+		"j\2\2\u0262\u0263\7t\2\2\u0263\u0264\7q\2\2\u0264\u0265\7y\2\2\u0265\\"+
-		"\u0266\7v\2\2\u0266\u0267\7j\2\2\u0267\u0268\7t\2\2\u0268\u0269\7q\2\2"+
+		"\3\2\2\2\u0266\u0267\7v\2\2\u0267\u0268\7j\2\2\u0268\u0269\7t\2\2\u0269"+
-		"\u0269\u026a\7y\2\2\u026a\u026b\7u\2\2\u026b^\3\2\2\2\u026c\u026d\7v\2"+
+		"\u026a\7q\2\2\u026a\u026b\7y\2\2\u026b\u026c\7u\2\2\u026c^\3\2\2\2\u026d"+
-		"\2\u026d\u026e\7t\2\2\u026e\u026f\7c\2\2\u026f\u0270\7p\2\2\u0270\u0271"+
+		"\u026e\7v\2\2\u026e\u026f\7t\2\2\u026f\u0270\7c\2\2\u0270\u0271\7p\2\2"+
-		"\7u\2\2\u0271\u0272\7k\2\2\u0272\u0273\7g\2\2\u0273\u0274\7p\2\2\u0274"+
+		"\u0271\u0272\7u\2\2\u0272\u0273\7k\2\2\u0273\u0274\7g\2\2\u0274\u0275"+
-		"\u0275\7v\2\2\u0275`\3\2\2\2\u0276\u0277\7v\2\2\u0277\u0278\7t\2\2\u0278"+
+		"\7p\2\2\u0275\u0276\7v\2\2\u0276`\3\2\2\2\u0277\u0278\7v\2\2\u0278\u0279"+
-		"\u0279\7{\2\2\u0279b\3\2\2\2\u027a\u027b\7x\2\2\u027b\u027c\7q\2\2\u027c"+
+		"\7t\2\2\u0279\u027a\7{\2\2\u027ab\3\2\2\2\u027b\u027c\7x\2\2\u027c\u027d"+
-		"\u027d\7k\2\2\u027d\u027e\7f\2\2\u027ed\3\2\2\2\u027f\u0280\7x\2\2\u0280"+
+		"\7q\2\2\u027d\u027e\7k\2\2\u027e\u027f\7f\2\2\u027fd\3\2\2\2\u0280\u0281"+
-		"\u0281\7q\2\2\u0281\u0282\7n\2\2\u0282\u0283\7c\2\2\u0283\u0284\7v\2\2"+
+		"\7x\2\2\u0281\u0282\7q\2\2\u0282\u0283\7n\2\2\u0283\u0284\7c\2\2\u0284"+
-		"\u0284\u0285\7k\2\2\u0285\u0286\7n\2\2\u0286\u0287\7g\2\2\u0287f\3\2\2"+
+		"\u0285\7v\2\2\u0285\u0286\7k\2\2\u0286\u0287\7n\2\2\u0287\u0288\7g\2\2"+
-		"\2\u0288\u0289\7y\2\2\u0289\u028a\7j\2\2\u028a\u028b\7k\2\2\u028b\u028c"+
+		"\u0288f\3\2\2\2\u0289\u028a\7y\2\2\u028a\u028b\7j\2\2\u028b\u028c\7k\2"+
-		"\7n\2\2\u028c\u028d\7g\2\2\u028dh\3\2\2\2\u028e\u0293\5k\66\2\u028f\u0293"+
+		"\2\u028c\u028d\7n\2\2\u028d\u028e\7g\2\2\u028eh\3\2\2\2\u028f\u0294\5"+
-		"\5m\67\2\u0290\u0293\5o8\2\u0291\u0293\5q9\2\u0292\u028e\3\2\2\2\u0292"+
+		"k\66\2\u0290\u0294\5m\67\2\u0291\u0294\5o8\2\u0292\u0294\5q9\2\u0293\u028f"+
-		"\u028f\3\2\2\2\u0292\u0290\3\2\2\2\u0292\u0291\3\2\2\2\u0293j\3\2\2\2"+
+		"\3\2\2\2\u0293\u0290\3\2\2\2\u0293\u0291\3\2\2\2\u0293\u0292\3\2\2\2\u0294"+
-		"\u0294\u0296\5u;\2\u0295\u0297\5s:\2\u0296\u0295\3\2\2\2\u0296\u0297\3"+
+		"j\3\2\2\2\u0295\u0297\5u;\2\u0296\u0298\5s:\2\u0297\u0296\3\2\2\2\u0297"+
-		"\2\2\2\u0297l\3\2\2\2\u0298\u029a\5\u0083B\2\u0299\u029b\5s:\2\u029a\u0299"+
+		"\u0298\3\2\2\2\u0298l\3\2\2\2\u0299\u029b\5\u0083B\2\u029a\u029c\5s:\2"+
-		"\3\2\2\2\u029a\u029b\3\2\2\2\u029bn\3\2\2\2\u029c\u029e\5\u008dG\2\u029d"+
+		"\u029b\u029a\3\2\2\2\u029b\u029c\3\2\2\2\u029cn\3\2\2\2\u029d\u029f\5"+
-		"\u029f\5s:\2\u029e\u029d\3\2\2\2\u029e\u029f\3\2\2\2\u029fp\3\2\2\2\u02a0"+
+		"\u008dG\2\u029e\u02a0\5s:\2\u029f\u029e\3\2\2\2\u029f\u02a0\3\2\2\2\u02a0"+
-		"\u02a2\5\u0097L\2\u02a1\u02a3\5s:\2\u02a2\u02a1\3\2\2\2\u02a2\u02a3\3"+
+		"p\3\2\2\2\u02a1\u02a3\5\u0097L\2\u02a2\u02a4\5s:\2\u02a3\u02a2\3\2\2\2"+
-		"\2\2\2\u02a3r\3\2\2\2\u02a4\u02a5\t\2\2\2\u02a5t\3\2\2\2\u02a6\u02b1\7"+
+		"\u02a3\u02a4\3\2\2\2\u02a4r\3\2\2\2\u02a5\u02a6\t\2\2\2\u02a6t\3\2\2\2"+
-		"\62\2\2\u02a7\u02ae\5{>\2\u02a8\u02aa\5w<\2\u02a9\u02a8\3\2\2\2\u02a9"+
+		"\u02a7\u02b2\7\62\2\2\u02a8\u02af\5{>\2\u02a9\u02ab\5w<\2\u02aa\u02a9"+
-		"\u02aa\3\2\2\2\u02aa\u02af\3\2\2\2\u02ab\u02ac\5\u0081A\2\u02ac\u02ad"+
+		"\3\2\2\2\u02aa\u02ab\3\2\2\2\u02ab\u02b0\3\2\2\2\u02ac\u02ad\5\u0081A"+
-		"\5w<\2\u02ad\u02af\3\2\2\2\u02ae\u02a9\3\2\2\2\u02ae\u02ab\3\2\2\2\u02af"+
+		"\2\u02ad\u02ae\5w<\2\u02ae\u02b0\3\2\2\2\u02af\u02aa\3\2\2\2\u02af\u02ac"+
-		"\u02b1\3\2\2\2\u02b0\u02a6\3\2\2\2\u02b0\u02a7\3\2\2\2\u02b1v\3\2\2\2"+
+		"\3\2\2\2\u02b0\u02b2\3\2\2\2\u02b1\u02a7\3\2\2\2\u02b1\u02a8\3\2\2\2\u02b2"+
-		"\u02b2\u02b7\5y=\2\u02b3\u02b5\5}?\2\u02b4\u02b3\3\2\2\2\u02b4\u02b5\3"+
+		"v\3\2\2\2\u02b3\u02b8\5y=\2\u02b4\u02b6\5}?\2\u02b5\u02b4\3\2\2\2\u02b5"+
-		"\2\2\2\u02b5\u02b6\3\2\2\2\u02b6\u02b8\5y=\2\u02b7\u02b4\3\2\2\2\u02b7"+
+		"\u02b6\3\2\2\2\u02b6\u02b7\3\2\2\2\u02b7\u02b9\5y=\2\u02b8\u02b5\3\2\2"+
-		"\u02b8\3\2\2\2\u02b8x\3\2\2\2\u02b9\u02bc\7\62\2\2\u02ba\u02bc\5{>\2\u02bb"+
+		"\2\u02b8\u02b9\3\2\2\2\u02b9x\3\2\2\2\u02ba\u02bd\7\62\2\2\u02bb\u02bd"+
-		"\u02b9\3\2\2\2\u02bb\u02ba\3\2\2\2\u02bcz\3\2\2\2\u02bd\u02be\t\3\2\2"+
+		"\5{>\2\u02bc\u02ba\3\2\2\2\u02bc\u02bb\3\2\2\2\u02bdz\3\2\2\2\u02be\u02bf"+
-		"\u02be|\3\2\2\2\u02bf\u02c1\5\177@\2\u02c0\u02bf\3\2\2\2\u02c1\u02c2\3"+
+		"\t\3\2\2\u02bf|\3\2\2\2\u02c0\u02c2\5\177@\2\u02c1\u02c0\3\2\2\2\u02c2"+
-		"\2\2\2\u02c2\u02c0\3\2\2\2\u02c2\u02c3\3\2\2\2\u02c3~\3\2\2\2\u02c4\u02c7"+
+		"\u02c3\3\2\2\2\u02c3\u02c1\3\2\2\2\u02c3\u02c4\3\2\2\2\u02c4~\3\2\2\2"+
-		"\5y=\2\u02c5\u02c7\7a\2\2\u02c6\u02c4\3\2\2\2\u02c6\u02c5\3\2\2\2\u02c7"+
+		"\u02c5\u02c8\5y=\2\u02c6\u02c8\7a\2\2\u02c7\u02c5\3\2\2\2\u02c7\u02c6"+
-		"\u0080\3\2\2\2\u02c8\u02ca\7a\2\2\u02c9\u02c8\3\2\2\2\u02ca\u02cb\3\2"+
+		"\3\2\2\2\u02c8\u0080\3\2\2\2\u02c9\u02cb\7a\2\2\u02ca\u02c9\3\2\2\2\u02cb"+
-		"\2\2\u02cb\u02c9\3\2\2\2\u02cb\u02cc\3\2\2\2\u02cc\u0082\3\2\2\2\u02cd"+
+		"\u02cc\3\2\2\2\u02cc\u02ca\3\2\2\2\u02cc\u02cd\3\2\2\2\u02cd\u0082\3\2"+
-		"\u02ce\7\62\2\2\u02ce\u02cf\t\4\2\2\u02cf\u02d0\5\u0085C\2\u02d0\u0084"+
+		"\2\2\u02ce\u02cf\7\62\2\2\u02cf\u02d0\t\4\2\2\u02d0\u02d1\5\u0085C\2\u02d1"+
-		"\3\2\2\2\u02d1\u02d6\5\u0087D\2\u02d2\u02d4\5\u0089E\2\u02d3\u02d2\3\2"+
+		"\u0084\3\2\2\2\u02d2\u02d7\5\u0087D\2\u02d3\u02d5\5\u0089E\2\u02d4\u02d3"+
-		"\2\2\u02d3\u02d4\3\2\2\2\u02d4\u02d5\3\2\2\2\u02d5\u02d7\5\u0087D\2\u02d6"+
+		"\3\2\2\2\u02d4\u02d5\3\2\2\2\u02d5\u02d6\3\2\2\2\u02d6\u02d8\5\u0087D"+
-		"\u02d3\3\2\2\2\u02d6\u02d7\3\2\2\2\u02d7\u0086\3\2\2\2\u02d8\u02d9\t\5"+
+		"\2\u02d7\u02d4\3\2\2\2\u02d7\u02d8\3\2\2\2\u02d8\u0086\3\2\2\2\u02d9\u02da"+
-		"\2\2\u02d9\u0088\3\2\2\2\u02da\u02dc\5\u008bF\2\u02db\u02da\3\2\2\2\u02dc"+
+		"\t\5\2\2\u02da\u0088\3\2\2\2\u02db\u02dd\5\u008bF\2\u02dc\u02db\3\2\2"+
-		"\u02dd\3\2\2\2\u02dd\u02db\3\2\2\2\u02dd\u02de\3\2\2\2\u02de\u008a\3\2"+
+		"\2\u02dd\u02de\3\2\2\2\u02de\u02dc\3\2\2\2\u02de\u02df\3\2\2\2\u02df\u008a"+
-		"\2\2\u02df\u02e2\5\u0087D\2\u02e0\u02e2\7a\2\2\u02e1\u02df\3\2\2\2\u02e1"+
+		"\3\2\2\2\u02e0\u02e3\5\u0087D\2\u02e1\u02e3\7a\2\2\u02e2\u02e0\3\2\2\2"+
-		"\u02e0\3\2\2\2\u02e2\u008c\3\2\2\2\u02e3\u02e5\7\62\2\2\u02e4\u02e6\5"+
+		"\u02e2\u02e1\3\2\2\2\u02e3\u008c\3\2\2\2\u02e4\u02e6\7\62\2\2\u02e5\u02e7"+
-		"\u0081A\2\u02e5\u02e4\3\2\2\2\u02e5\u02e6\3\2\2\2\u02e6\u02e7\3\2\2\2"+
+		"\5\u0081A\2\u02e6\u02e5\3\2\2\2\u02e6\u02e7\3\2\2\2\u02e7\u02e8\3\2\2"+
-		"\u02e7\u02e8\5\u008fH\2\u02e8\u008e\3\2\2\2\u02e9\u02ee\5\u0091I\2\u02ea"+
+		"\2\u02e8\u02e9\5\u008fH\2\u02e9\u008e\3\2\2\2\u02ea\u02ef\5\u0091I\2\u02eb"+
-		"\u02ec\5\u0093J\2\u02eb\u02ea\3\2\2\2\u02eb\u02ec\3\2\2\2\u02ec\u02ed"+
+		"\u02ed\5\u0093J\2\u02ec\u02eb\3\2\2\2\u02ec\u02ed\3\2\2\2\u02ed\u02ee"+
-		"\3\2\2\2\u02ed\u02ef\5\u0091I\2\u02ee\u02eb\3\2\2\2\u02ee\u02ef\3\2\2"+
+		"\3\2\2\2\u02ee\u02f0\5\u0091I\2\u02ef\u02ec\3\2\2\2\u02ef\u02f0\3\2\2"+
-		"\2\u02ef\u0090\3\2\2\2\u02f0\u02f1\t\6\2\2\u02f1\u0092\3\2\2\2\u02f2\u02f4"+
+		"\2\u02f0\u0090\3\2\2\2\u02f1\u02f2\t\6\2\2\u02f2\u0092\3\2\2\2\u02f3\u02f5"+
-		"\5\u0095K\2\u02f3\u02f2\3\2\2\2\u02f4\u02f5\3\2\2\2\u02f5\u02f3\3\2\2"+
+		"\5\u0095K\2\u02f4\u02f3\3\2\2\2\u02f5\u02f6\3\2\2\2\u02f6\u02f4\3\2\2"+
-		"\2\u02f5\u02f6\3\2\2\2\u02f6\u0094\3\2\2\2\u02f7\u02fa\5\u0091I\2\u02f8"+
+		"\2\u02f6\u02f7\3\2\2\2\u02f7\u0094\3\2\2\2\u02f8\u02fb\5\u0091I\2\u02f9"+
-		"\u02fa\7a\2\2\u02f9\u02f7\3\2\2\2\u02f9\u02f8\3\2\2\2\u02fa\u0096\3\2"+
+		"\u02fb\7a\2\2\u02fa\u02f8\3\2\2\2\u02fa\u02f9\3\2\2\2\u02fb\u0096\3\2"+
-		"\2\2\u02fb\u02fc\7\62\2\2\u02fc\u02fd\t\7\2\2\u02fd\u02fe\5\u0099M\2\u02fe"+
+		"\2\2\u02fc\u02fd\7\62\2\2\u02fd\u02fe\t\7\2\2\u02fe\u02ff\5\u0099M\2\u02ff"+
-		"\u0098\3\2\2\2\u02ff\u0304\5\u009bN\2\u0300\u0302\5\u009dO\2\u0301\u0300"+
+		"\u0098\3\2\2\2\u0300\u0305\5\u009bN\2\u0301\u0303\5\u009dO\2\u0302\u0301"+
-		"\3\2\2\2\u0301\u0302\3\2\2\2\u0302\u0303\3\2\2\2\u0303\u0305\5\u009bN"+
+		"\3\2\2\2\u0302\u0303\3\2\2\2\u0303\u0304\3\2\2\2\u0304\u0306\5\u009bN"+
-		"\2\u0304\u0301\3\2\2\2\u0304\u0305\3\2\2\2\u0305\u009a\3\2\2\2\u0306\u0307"+
+		"\2\u0305\u0302\3\2\2\2\u0305\u0306\3\2\2\2\u0306\u009a\3\2\2\2\u0307\u0308"+
-		"\t\b\2\2\u0307\u009c\3\2\2\2\u0308\u030a\5\u009fP\2\u0309\u0308\3\2\2"+
+		"\t\b\2\2\u0308\u009c\3\2\2\2\u0309\u030b\5\u009fP\2\u030a\u0309\3\2\2"+
-		"\2\u030a\u030b\3\2\2\2\u030b\u0309\3\2\2\2\u030b\u030c\3\2\2\2\u030c\u009e"+
+		"\2\u030b\u030c\3\2\2\2\u030c\u030a\3\2\2\2\u030c\u030d\3\2\2\2\u030d\u009e"+
-		"\3\2\2\2\u030d\u0310\5\u009bN\2\u030e\u0310\7a\2\2\u030f\u030d\3\2\2\2"+
+		"\3\2\2\2\u030e\u0311\5\u009bN\2\u030f\u0311\7a\2\2\u0310\u030e\3\2\2\2"+
-		"\u030f\u030e\3\2\2\2\u0310\u00a0\3\2\2\2\u0311\u0314\5\u00a3R\2\u0312"+
+		"\u0310\u030f\3\2\2\2\u0311\u00a0\3\2\2\2\u0312\u0315\5\u00a3R\2\u0313"+
-		"\u0314\5\u00afX\2\u0313\u0311\3\2\2\2\u0313\u0312\3\2\2\2\u0314\u00a2"+
+		"\u0315\5\u00afX\2\u0314\u0312\3\2\2\2\u0314\u0313\3\2\2\2\u0315\u00a2"+
-		"\3\2\2\2\u0315\u0316\5w<\2\u0316\u0318\7\60\2\2\u0317\u0319\5w<\2\u0318"+
+		"\3\2\2\2\u0316\u0317\5w<\2\u0317\u0319\7\60\2\2\u0318\u031a\5w<\2\u0319"+
-		"\u0317\3\2\2\2\u0318\u0319\3\2\2\2\u0319\u031b\3\2\2\2\u031a\u031c\5\u00a5"+
+		"\u0318\3\2\2\2\u0319\u031a\3\2\2\2\u031a\u031c\3\2\2\2\u031b\u031d\5\u00a5"+
-		"S\2\u031b\u031a\3\2\2\2\u031b\u031c\3\2\2\2\u031c\u031e\3\2\2\2\u031d"+
+		"S\2\u031c\u031b\3\2\2\2\u031c\u031d\3\2\2\2\u031d\u031f\3\2\2\2\u031e"+
-		"\u031f\5\u00adW\2\u031e\u031d\3\2\2\2\u031e\u031f\3\2\2\2\u031f\u0331"+
+		"\u0320\5\u00adW\2\u031f\u031e\3\2\2\2\u031f\u0320\3\2\2\2\u0320\u0332"+
-		"\3\2\2\2\u0320\u0321\7\60\2\2\u0321\u0323\5w<\2\u0322\u0324\5\u00a5S\2"+
+		"\3\2\2\2\u0321\u0322\7\60\2\2\u0322\u0324\5w<\2\u0323\u0325\5\u00a5S\2"+
-		"\u0323\u0322\3\2\2\2\u0323\u0324\3\2\2\2\u0324\u0326\3\2\2\2\u0325\u0327"+
+		"\u0324\u0323\3\2\2\2\u0324\u0325\3\2\2\2\u0325\u0327\3\2\2\2\u0326\u0328"+
-		"\5\u00adW\2\u0326\u0325\3\2\2\2\u0326\u0327\3\2\2\2\u0327\u0331\3\2\2"+
+		"\5\u00adW\2\u0327\u0326\3\2\2\2\u0327\u0328\3\2\2\2\u0328\u0332\3\2\2"+
-		"\2\u0328\u0329\5w<\2\u0329\u032b\5\u00a5S\2\u032a\u032c\5\u00adW\2\u032b"+
+		"\2\u0329\u032a\5w<\2\u032a\u032c\5\u00a5S\2\u032b\u032d\5\u00adW\2\u032c"+
-		"\u032a\3\2\2\2\u032b\u032c\3\2\2\2\u032c\u0331\3\2\2\2\u032d\u032e\5w"+
+		"\u032b\3\2\2\2\u032c\u032d\3\2\2\2\u032d\u0332\3\2\2\2\u032e\u032f\5w"+
-		"<\2\u032e\u032f\5\u00adW\2\u032f\u0331\3\2\2\2\u0330\u0315\3\2\2\2\u0330"+
+		"<\2\u032f\u0330\5\u00adW\2\u0330\u0332\3\2\2\2\u0331\u0316\3\2\2\2\u0331"+
-		"\u0320\3\2\2\2\u0330\u0328\3\2\2\2\u0330\u032d\3\2\2\2\u0331\u00a4\3\2"+
+		"\u0321\3\2\2\2\u0331\u0329\3\2\2\2\u0331\u032e\3\2\2\2\u0332\u00a4\3\2"+
-		"\2\2\u0332\u0333\5\u00a7T\2\u0333\u0334\5\u00a9U\2\u0334\u00a6\3\2\2\2"+
+		"\2\2\u0333\u0334\5\u00a7T\2\u0334\u0335\5\u00a9U\2\u0335\u00a6\3\2\2\2"+
-		"\u0335\u0336\t\t\2\2\u0336\u00a8\3\2\2\2\u0337\u0339\5\u00abV\2\u0338"+
+		"\u0336\u0337\t\t\2\2\u0337\u00a8\3\2\2\2\u0338\u033a\5\u00abV\2\u0339"+
-		"\u0337\3\2\2\2\u0338\u0339\3\2\2\2\u0339\u033a\3\2\2\2\u033a\u033b\5w"+
+		"\u0338\3\2\2\2\u0339\u033a\3\2\2\2\u033a\u033b\3\2\2\2\u033b\u033c\5w"+
-		"<\2\u033b\u00aa\3\2\2\2\u033c\u033d\t\n\2\2\u033d\u00ac\3\2\2\2\u033e"+
+		"<\2\u033c\u00aa\3\2\2\2\u033d\u033e\t\n\2\2\u033e\u00ac\3\2\2\2\u033f"+
-		"\u033f\t\13\2\2\u033f\u00ae\3\2\2\2\u0340\u0341\5\u00b1Y\2\u0341\u0343"+
+		"\u0340\t\13\2\2\u0340\u00ae\3\2\2\2\u0341\u0342\5\u00b1Y\2\u0342\u0344"+
-		"\5\u00b3Z\2\u0342\u0344\5\u00adW\2\u0343\u0342\3\2\2\2\u0343\u0344\3\2"+
+		"\5\u00b3Z\2\u0343\u0345\5\u00adW\2\u0344\u0343\3\2\2\2\u0344\u0345\3\2"+
-		"\2\2\u0344\u00b0\3\2\2\2\u0345\u0347\5\u0083B\2\u0346\u0348\7\60\2\2\u0347"+
+		"\2\2\u0345\u00b0\3\2\2\2\u0346\u0348\5\u0083B\2\u0347\u0349\7\60\2\2\u0348"+
-		"\u0346\3\2\2\2\u0347\u0348\3\2\2\2\u0348\u0351\3\2\2\2\u0349\u034a\7\62"+
+		"\u0347\3\2\2\2\u0348\u0349\3\2\2\2\u0349\u0352\3\2\2\2\u034a\u034b\7\62"+
-		"\2\2\u034a\u034c\t\4\2\2\u034b\u034d\5\u0085C\2\u034c\u034b\3\2\2\2\u034c"+
+		"\2\2\u034b\u034d\t\4\2\2\u034c\u034e\5\u0085C\2\u034d\u034c\3\2\2\2\u034d"+
-		"\u034d\3\2\2\2\u034d\u034e\3\2\2\2\u034e\u034f\7\60\2\2\u034f\u0351\5"+
+		"\u034e\3\2\2\2\u034e\u034f\3\2\2\2\u034f\u0350\7\60\2\2\u0350\u0352\5"+
-		"\u0085C\2\u0350\u0345\3\2\2\2\u0350\u0349\3\2\2\2\u0351\u00b2\3\2\2\2"+
+		"\u0085C\2\u0351\u0346\3\2\2\2\u0351\u034a\3\2\2\2\u0352\u00b2\3\2\2\2"+
-		"\u0352\u0353\5\u00b5[\2\u0353\u0354\5\u00a9U\2\u0354\u00b4\3\2\2\2\u0355"+
+		"\u0353\u0354\5\u00b5[\2\u0354\u0355\5\u00a9U\2\u0355\u00b4\3\2\2\2\u0356"+
-		"\u0356\t\f\2\2\u0356\u00b6\3\2\2\2\u0357\u0358\7v\2\2\u0358\u0359\7t\2"+
+		"\u0357\t\f\2\2\u0357\u00b6\3\2\2\2\u0358\u0359\7v\2\2\u0359\u035a\7t\2"+
-		"\2\u0359\u035a\7w\2\2\u035a\u0361\7g\2\2\u035b\u035c\7h\2\2\u035c\u035d"+
+		"\2\u035a\u035b\7w\2\2\u035b\u0362\7g\2\2\u035c\u035d\7h\2\2\u035d\u035e"+
-		"\7c\2\2\u035d\u035e\7n\2\2\u035e\u035f\7u\2\2\u035f\u0361\7g\2\2\u0360"+
+		"\7c\2\2\u035e\u035f\7n\2\2\u035f\u0360\7u\2\2\u0360\u0362\7g\2\2\u0361"+
-		"\u0357\3\2\2\2\u0360\u035b\3\2\2\2\u0361\u00b8\3\2\2\2\u0362\u0363\7)"+
+		"\u0358\3\2\2\2\u0361\u035c\3\2\2\2\u0362\u00b8\3\2\2\2\u0363\u0364\7)"+
-		"\2\2\u0363\u0364\5\u00bb^\2\u0364\u0365\7)\2\2\u0365\u036b\3\2\2\2\u0366"+
+		"\2\2\u0364\u0365\5\u00bb^\2\u0365\u0366\7)\2\2\u0366\u036c\3\2\2\2\u0367"+
-		"\u0367\7)\2\2\u0367\u0368\5\u00c3b\2\u0368\u0369\7)\2\2\u0369\u036b\3"+
+		"\u0368\7)\2\2\u0368\u0369\5\u00c3b\2\u0369\u036a\7)\2\2\u036a\u036c\3"+
-		"\2\2\2\u036a\u0362\3\2\2\2\u036a\u0366\3\2\2\2\u036b\u00ba\3\2\2\2\u036c"+
+		"\2\2\2\u036b\u0363\3\2\2\2\u036b\u0367\3\2\2\2\u036c\u00ba\3\2\2\2\u036d"+
-		"\u036d\n\r\2\2\u036d\u00bc\3\2\2\2\u036e\u0370\7$\2\2\u036f\u0371\5\u00bf"+
+		"\u036e\n\r\2\2\u036e\u00bc\3\2\2\2\u036f\u0371\7$\2\2\u0370\u0372\5\u00bf"+
-		"`\2\u0370\u036f\3\2\2\2\u0370\u0371\3\2\2\2\u0371\u0372\3\2\2\2\u0372"+
+		"`\2\u0371\u0370\3\2\2\2\u0371\u0372\3\2\2\2\u0372\u0373\3\2\2\2\u0373"+
-		"\u0373\7$\2\2\u0373\u00be\3\2\2\2\u0374\u0376\5\u00c1a\2\u0375\u0374\3"+
+		"\u0374\7$\2\2\u0374\u00be\3\2\2\2\u0375\u0377\5\u00c1a\2\u0376\u0375\3"+
-		"\2\2\2\u0376\u0377\3\2\2\2\u0377\u0375\3\2\2\2\u0377\u0378\3\2\2\2\u0378"+
+		"\2\2\2\u0377\u0378\3\2\2\2\u0378\u0376\3\2\2\2\u0378\u0379\3\2\2\2\u0379"+
-		"\u00c0\3\2\2\2\u0379\u037c\n\16\2\2\u037a\u037c\5\u00c3b\2\u037b\u0379"+
+		"\u00c0\3\2\2\2\u037a\u037d\n\16\2\2\u037b\u037d\5\u00c3b\2\u037c\u037a"+
-		"\3\2\2\2\u037b\u037a\3\2\2\2\u037c\u00c2\3\2\2\2\u037d\u037e\7^\2\2\u037e"+
+		"\3\2\2\2\u037c\u037b\3\2\2\2\u037d\u00c2\3\2\2\2\u037e\u037f\7^\2\2\u037f"+
-		"\u0382\t\17\2\2\u037f\u0382\5\u00c5c\2\u0380\u0382\5\u00c9e\2\u0381\u037d"+
+		"\u0383\t\17\2\2\u0380\u0383\5\u00c5c\2\u0381\u0383\5\u00c9e\2\u0382\u037e"+
-		"\3\2\2\2\u0381\u037f\3\2\2\2\u0381\u0380\3\2\2\2\u0382\u00c4\3\2\2\2\u0383"+
+		"\3\2\2\2\u0382\u0380\3\2\2\2\u0382\u0381\3\2\2\2\u0383\u00c4\3\2\2\2\u0384"+
-		"\u0384\7^\2\2\u0384\u038f\5\u0091I\2\u0385\u0386\7^\2\2\u0386\u0387\5"+
+		"\u0385\7^\2\2\u0385\u0390\5\u0091I\2\u0386\u0387\7^\2\2\u0387\u0388\5"+
-		"\u0091I\2\u0387\u0388\5\u0091I\2\u0388\u038f\3\2\2\2\u0389\u038a\7^\2"+
+		"\u0091I\2\u0388\u0389\5\u0091I\2\u0389\u0390\3\2\2\2\u038a\u038b\7^\2"+
-		"\2\u038a\u038b\5\u00c7d\2\u038b\u038c\5\u0091I\2\u038c\u038d\5\u0091I"+
+		"\2\u038b\u038c\5\u00c7d\2\u038c\u038d\5\u0091I\2\u038d\u038e\5\u0091I"+
-		"\2\u038d\u038f\3\2\2\2\u038e\u0383\3\2\2\2\u038e\u0385\3\2\2\2\u038e\u0389"+
+		"\2\u038e\u0390\3\2\2\2\u038f\u0384\3\2\2\2\u038f\u0386\3\2\2\2\u038f\u038a"+
-		"\3\2\2\2\u038f\u00c6\3\2\2\2\u0390\u0391\t\20\2\2\u0391\u00c8\3\2\2\2"+
+		"\3\2\2\2\u0390\u00c6\3\2\2\2\u0391\u0392\t\20\2\2\u0392\u00c8\3\2\2\2"+
-		"\u0392\u0393\7^\2\2\u0393\u0394\7w\2\2\u0394\u0395\5\u0087D\2\u0395\u0396"+
+		"\u0393\u0394\7^\2\2\u0394\u0395\7w\2\2\u0395\u0396\5\u0087D\2\u0396\u0397"+
-		"\5\u0087D\2\u0396\u0397\5\u0087D\2\u0397\u0398\5\u0087D\2\u0398\u00ca"+
+		"\5\u0087D\2\u0397\u0398\5\u0087D\2\u0398\u0399\5\u0087D\2\u0399\u00ca"+
-		"\3\2\2\2\u0399\u039a\7p\2\2\u039a\u039b\7w\2\2\u039b\u039c\7n\2\2\u039c"+
+		"\3\2\2\2\u039a\u039b\7p\2\2\u039b\u039c\7w\2\2\u039c\u039d\7n\2\2\u039d"+
-		"\u039d\7n\2\2\u039d\u00cc\3\2\2\2\u039e\u039f\7*\2\2\u039f\u00ce\3\2\2"+
+		"\u039e\7n\2\2\u039e\u00cc\3\2\2\2\u039f\u03a0\7*\2\2\u03a0\u00ce\3\2\2"+
-		"\2\u03a0\u03a1\7+\2\2\u03a1\u00d0\3\2\2\2\u03a2\u03a3\7}\2\2\u03a3\u00d2"+
+		"\2\u03a1\u03a2\7+\2\2\u03a2\u00d0\3\2\2\2\u03a3\u03a4\7}\2\2\u03a4\u00d2"+
-		"\3\2\2\2\u03a4\u03a5\7\177\2\2\u03a5\u00d4\3\2\2\2\u03a6\u03a7\7]\2\2"+
+		"\3\2\2\2\u03a5\u03a6\7\177\2\2\u03a6\u00d4\3\2\2\2\u03a7\u03a8\7]\2\2"+
-		"\u03a7\u00d6\3\2\2\2\u03a8\u03a9\7_\2\2\u03a9\u00d8\3\2\2\2\u03aa\u03ab"+
+		"\u03a8\u00d6\3\2\2\2\u03a9\u03aa\7_\2\2\u03aa\u00d8\3\2\2\2\u03ab\u03ac"+
-		"\7=\2\2\u03ab\u00da\3\2\2\2\u03ac\u03ad\7.\2\2\u03ad\u00dc\3\2\2\2\u03ae"+
+		"\7=\2\2\u03ac\u00da\3\2\2\2\u03ad\u03ae\7.\2\2\u03ae\u00dc\3\2\2\2\u03af"+
-		"\u03af\7\60\2\2\u03af\u00de\3\2\2\2\u03b0\u03b1\7?\2\2\u03b1\u00e0\3\2"+
+		"\u03b0\7\60\2\2\u03b0\u00de\3\2\2\2\u03b1\u03b2\7?\2\2\u03b2\u00e0\3\2"+
-		"\2\2\u03b2\u03b3\7@\2\2\u03b3\u00e2\3\2\2\2\u03b4\u03b5\7>\2\2\u03b5\u00e4"+
+		"\2\2\u03b3\u03b4\7@\2\2\u03b4\u00e2\3\2\2\2\u03b5\u03b6\7>\2\2\u03b6\u00e4"+
-		"\3\2\2\2\u03b6\u03b7\7#\2\2\u03b7\u00e6\3\2\2\2\u03b8\u03b9\7\u0080\2"+
+		"\3\2\2\2\u03b7\u03b8\7#\2\2\u03b8\u00e6\3\2\2\2\u03b9\u03ba\7\u0080\2"+
-		"\2\u03b9\u00e8\3\2\2\2\u03ba\u03bb\7A\2\2\u03bb\u00ea\3\2\2\2\u03bc\u03bd"+
+		"\2\u03ba\u00e8\3\2\2\2\u03bb\u03bc\7A\2\2\u03bc\u00ea\3\2\2\2\u03bd\u03be"+
-		"\7<\2\2\u03bd\u00ec\3\2\2\2\u03be\u03bf\7?\2\2\u03bf\u03c0\7?\2\2\u03c0"+
+		"\7<\2\2\u03be\u00ec\3\2\2\2\u03bf\u03c0\7?\2\2\u03c0\u03c1\7?\2\2\u03c1"+
-		"\u00ee\3\2\2\2\u03c1\u03c2\7>\2\2\u03c2\u03c3\7?\2\2\u03c3\u00f0\3\2\2"+
+		"\u00ee\3\2\2\2\u03c2\u03c3\7>\2\2\u03c3\u03c4\7?\2\2\u03c4\u00f0\3\2\2"+
-		"\2\u03c4\u03c5\7@\2\2\u03c5\u03c6\7?\2\2\u03c6\u00f2\3\2\2\2\u03c7\u03c8"+
+		"\2\u03c5\u03c6\7@\2\2\u03c6\u03c7\7?\2\2\u03c7\u00f2\3\2\2\2\u03c8\u03c9"+
-		"\7#\2\2\u03c8\u03c9\7?\2\2\u03c9\u00f4\3\2\2\2\u03ca\u03cb\7(\2\2\u03cb"+
+		"\7#\2\2\u03c9\u03ca\7?\2\2\u03ca\u00f4\3\2\2\2\u03cb\u03cc\7(\2\2\u03cc"+
-		"\u03cc\7(\2\2\u03cc\u00f6\3\2\2\2\u03cd\u03ce\7~\2\2\u03ce\u03cf\7~\2"+
+		"\u03cd\7(\2\2\u03cd\u00f6\3\2\2\2\u03ce\u03cf\7~\2\2\u03cf\u03d0\7~\2"+
-		"\2\u03cf\u00f8\3\2\2\2\u03d0\u03d1\7-\2\2\u03d1\u03d2\7-\2\2\u03d2\u00fa"+
+		"\2\u03d0\u00f8\3\2\2\2\u03d1\u03d2\7-\2\2\u03d2\u03d3\7-\2\2\u03d3\u00fa"+
-		"\3\2\2\2\u03d3\u03d4\7/\2\2\u03d4\u03d5\7/\2\2\u03d5\u00fc\3\2\2\2\u03d6"+
+		"\3\2\2\2\u03d4\u03d5\7/\2\2\u03d5\u03d6\7/\2\2\u03d6\u00fc\3\2\2\2\u03d7"+
-		"\u03d7\7-\2\2\u03d7\u00fe\3\2\2\2\u03d8\u03d9\7/\2\2\u03d9\u0100\3\2\2"+
+		"\u03d8\7-\2\2\u03d8\u00fe\3\2\2\2\u03d9\u03da\7/\2\2\u03da\u0100\3\2\2"+
-		"\2\u03da\u03db\7,\2\2\u03db\u0102\3\2\2\2\u03dc\u03dd\7\61\2\2\u03dd\u0104"+
+		"\2\u03db\u03dc\7,\2\2\u03dc\u0102\3\2\2\2\u03dd\u03de\7\61\2\2\u03de\u0104"+
-		"\3\2\2\2\u03de\u03df\7(\2\2\u03df\u0106\3\2\2\2\u03e0\u03e1\7~\2\2\u03e1"+
+		"\3\2\2\2\u03df\u03e0\7(\2\2\u03e0\u0106\3\2\2\2\u03e1\u03e2\7~\2\2\u03e2"+
-		"\u0108\3\2\2\2\u03e2\u03e3\7`\2\2\u03e3\u010a\3\2\2\2\u03e4\u03e5\7\'"+
+		"\u0108\3\2\2\2\u03e3\u03e4\7`\2\2\u03e4\u010a\3\2\2\2\u03e5\u03e6\7\'"+
-		"\2\2\u03e5\u010c\3\2\2\2\u03e6\u03e7\7/\2\2\u03e7\u03e8\7@\2\2\u03e8\u010e"+
+		"\2\2\u03e6\u010c\3\2\2\2\u03e7\u03e8\7/\2\2\u03e8\u03e9\7@\2\2\u03e9\u010e"+
-		"\3\2\2\2\u03e9\u03ea\7<\2\2\u03ea\u03eb\7<\2\2\u03eb\u0110\3\2\2\2\u03ec"+
+		"\3\2\2\2\u03ea\u03eb\7<\2\2\u03eb\u03ec\7<\2\2\u03ec\u0110\3\2\2\2\u03ed"+
-		"\u03ed\7-\2\2\u03ed\u03ee\7?\2\2\u03ee\u0112\3\2\2\2\u03ef\u03f0\7/\2"+
+		"\u03ee\7-\2\2\u03ee\u03ef\7?\2\2\u03ef\u0112\3\2\2\2\u03f0\u03f1\7/\2"+
-		"\2\u03f0\u03f1\7?\2\2\u03f1\u0114\3\2\2\2\u03f2\u03f3\7,\2\2\u03f3\u03f4"+
+		"\2\u03f1\u03f2\7?\2\2\u03f2\u0114\3\2\2\2\u03f3\u03f4\7,\2\2\u03f4\u03f5"+
-		"\7?\2\2\u03f4\u0116\3\2\2\2\u03f5\u03f6\7\61\2\2\u03f6\u03f7\7?\2\2\u03f7"+
+		"\7?\2\2\u03f5\u0116\3\2\2\2\u03f6\u03f7\7\61\2\2\u03f7\u03f8\7?\2\2\u03f8"+
-		"\u0118\3\2\2\2\u03f8\u03f9\7(\2\2\u03f9\u03fa\7?\2\2\u03fa\u011a\3\2\2"+
+		"\u0118\3\2\2\2\u03f9\u03fa\7(\2\2\u03fa\u03fb\7?\2\2\u03fb\u011a\3\2\2"+
-		"\2\u03fb\u03fc\7~\2\2\u03fc\u03fd\7?\2\2\u03fd\u011c\3\2\2\2\u03fe\u03ff"+
+		"\2\u03fc\u03fd\7~\2\2\u03fd\u03fe\7?\2\2\u03fe\u011c\3\2\2\2\u03ff\u0400"+
-		"\7`\2\2\u03ff\u0400\7?\2\2\u0400\u011e\3\2\2\2\u0401\u0402\7\'\2\2\u0402"+
+		"\7`\2\2\u0400\u0401\7?\2\2\u0401\u011e\3\2\2\2\u0402\u0403\7\'\2\2\u0403"+
-		"\u0403\7?\2\2\u0403\u0120\3\2\2\2\u0404\u0405\7>\2\2\u0405\u0406\7>\2"+
+		"\u0404\7?\2\2\u0404\u0120\3\2\2\2\u0405\u0406\7>\2\2\u0406\u0407\7>\2"+
-		"\2\u0406\u0407\7?\2\2\u0407\u0122\3\2\2\2\u0408\u0409\7@\2\2\u0409\u040a"+
+		"\2\u0407\u0408\7?\2\2\u0408\u0122\3\2\2\2\u0409\u040a\7@\2\2\u040a\u040b"+
-		"\7@\2\2\u040a\u040b\7?\2\2\u040b\u0124\3\2\2\2\u040c\u040d\7@\2\2\u040d"+
+		"\7@\2\2\u040b\u040c\7?\2\2\u040c\u0124\3\2\2\2\u040d\u040e\7@\2\2\u040e"+
-		"\u040e\7@\2\2\u040e\u040f\7@\2\2\u040f\u0410\7?\2\2\u0410\u0126\3\2\2"+
+		"\u040f\7@\2\2\u040f\u0410\7@\2\2\u0410\u0411\7?\2\2\u0411\u0126\3\2\2"+
-		"\2\u0411\u0415\5\u0129\u0095\2\u0412\u0414\5\u012b\u0096\2\u0413\u0412"+
+		"\2\u0412\u0416\5\u0129\u0095\2\u0413\u0415\5\u012b\u0096\2\u0414\u0413"+
-		"\3\2\2\2\u0414\u0417\3\2\2\2\u0415\u0413\3\2\2\2\u0415\u0416\3\2\2\2\u0416"+
+		"\3\2\2\2\u0415\u0418\3\2\2\2\u0416\u0414\3\2\2\2\u0416\u0417\3\2\2\2\u0417"+
-		"\u0128\3\2\2\2\u0417\u0415\3\2\2\2\u0418\u041f\t\21\2\2\u0419\u041a\n"+
+		"\u0128\3\2\2\2\u0418\u0416\3\2\2\2\u0419\u0420\t\21\2\2\u041a\u041b\n"+
-		"\22\2\2\u041a\u041f\6\u0095\2\2\u041b\u041c\t\23\2\2\u041c\u041d\t\24"+
+		"\22\2\2\u041b\u0420\6\u0095\2\2\u041c\u041d\t\23\2\2\u041d\u041e\t\24"+
-		"\2\2\u041d\u041f\6\u0095\3\2\u041e\u0418\3\2\2\2\u041e\u0419\3\2\2\2\u041e"+
+		"\2\2\u041e\u0420\6\u0095\3\2\u041f\u0419\3\2\2\2\u041f\u041a\3\2\2\2\u041f"+
-		"\u041b\3\2\2\2\u041f\u012a\3\2\2\2\u0420\u0427\t\25\2\2\u0421\u0422\n"+
+		"\u041c\3\2\2\2\u0420\u012a\3\2\2\2\u0421\u0428\t\25\2\2\u0422\u0423\n"+
-		"\22\2\2\u0422\u0427\6\u0096\4\2\u0423\u0424\t\23\2\2\u0424\u0425\t\24"+
+		"\22\2\2\u0423\u0428\6\u0096\4\2\u0424\u0425\t\23\2\2\u0425\u0426\t\24"+
-		"\2\2\u0425\u0427\6\u0096\5\2\u0426\u0420\3\2\2\2\u0426\u0421\3\2\2\2\u0426"+
+		"\2\2\u0426\u0428\6\u0096\5\2\u0427\u0421\3\2\2\2\u0427\u0422\3\2\2\2\u0427"+
-		"\u0423\3\2\2\2\u0427\u012c\3\2\2\2\u0428\u0429\7B\2\2\u0429\u012e\3\2"+
+		"\u0424\3\2\2\2\u0428\u012c\3\2\2\2\u0429\u042a\7B\2\2\u042a\u012e\3\2"+
-		"\2\2\u042a\u042b\7\60\2\2\u042b\u042c\7\60\2\2\u042c\u042d\7\60\2\2\u042d"+
+		"\2\2\u042b\u042c\7\60\2\2\u042c\u042d\7\60\2\2\u042d\u042e\7\60\2\2\u042e"+
-		"\u0130\3\2\2\2\u042e\u0430\t\26\2\2\u042f\u042e\3\2\2\2\u0430\u0431\3"+
+		"\u0130\3\2\2\2\u042f\u0431\t\26\2\2\u0430\u042f\3\2\2\2\u0431\u0432\3"+
-		"\2\2\2\u0431\u042f\3\2\2\2\u0431\u0432\3\2\2\2\u0432\u0433\3\2\2\2\u0433"+
+		"\2\2\2\u0432\u0430\3\2\2\2\u0432\u0433\3\2\2\2\u0433\u0434\3\2\2\2\u0434"+
-		"\u0434\b\u0099\2\2\u0434\u0132\3\2\2\2\u0435\u0436\7\61\2\2\u0436\u0437"+
+		"\u0435\b\u0099\2\2\u0435\u0132\3\2\2\2\u0436\u0437\7\61\2\2\u0437\u0438"+
-		"\7,\2\2\u0437\u043b\3\2\2\2\u0438\u043a\13\2\2\2\u0439\u0438\3\2\2\2\u043a"+
+		"\7,\2\2\u0438\u043c\3\2\2\2\u0439\u043b\13\2\2\2\u043a\u0439\3\2\2\2\u043b"+
-		"\u043d\3\2\2\2\u043b\u043c\3\2\2\2\u043b\u0439\3\2\2\2\u043c\u043e\3\2"+
+		"\u043e\3\2\2\2\u043c\u043d\3\2\2\2\u043c\u043a\3\2\2\2\u043d\u043f\3\2"+
-		"\2\2\u043d\u043b\3\2\2\2\u043e\u043f\7,\2\2\u043f\u0440\7\61\2\2\u0440"+
+		"\2\2\u043e\u043c\3\2\2\2\u043f\u0440\7,\2\2\u0440\u0441\7\61\2\2\u0441"+
-		"\u0441\3\2\2\2\u0441\u0442\b\u009a\2\2\u0442\u0134\3\2\2\2\u0443\u0444"+
+		"\u0442\3\2\2\2\u0442\u0443\b\u009a\2\2\u0443\u0134\3\2\2\2\u0444\u0445"+
-		"\7\61\2\2\u0444\u0445\7\61\2\2\u0445\u0449\3\2\2\2\u0446\u0448\n\27\2"+
+		"\7\61\2\2\u0445\u0446\7\61\2\2\u0446\u044a\3\2\2\2\u0447\u0449\n\27\2"+
-		"\2\u0447\u0446\3\2\2\2\u0448\u044b\3\2\2\2\u0449\u0447\3\2\2\2\u0449\u044a"+
+		"\2\u0448\u0447\3\2\2\2\u0449\u044c\3\2\2\2\u044a\u0448\3\2\2\2\u044a\u044b"+
-		"\3\2\2\2\u044a\u044c\3\2\2\2\u044b\u0449\3\2\2\2\u044c\u044d\b\u009b\2"+
+		"\3\2\2\2\u044b\u044d\3\2\2\2\u044c\u044a\3\2\2\2\u044d\u044e\b\u009b\2"+
-		"\2\u044d\u0136\3\2\2\28\2\u0292\u0296\u029a\u029e\u02a2\u02a9\u02ae\u02b0"+
+		"\2\u044e\u0136\3\2\2\28\2\u0293\u0297\u029b\u029f\u02a3\u02aa\u02af\u02b1"+
-		"\u02b4\u02b7\u02bb\u02c2\u02c6\u02cb\u02d3\u02d6\u02dd\u02e1\u02e5\u02eb"+
+		"\u02b5\u02b8\u02bc\u02c3\u02c7\u02cc\u02d4\u02d7\u02de\u02e2\u02e6\u02ec"+
-		"\u02ee\u02f5\u02f9\u0301\u0304\u030b\u030f\u0313\u0318\u031b\u031e\u0323"+
+		"\u02ef\u02f6\u02fa\u0302\u0305\u030c\u0310\u0314\u0319\u031c\u031f\u0324"+
-		"\u0326\u032b\u0330\u0338\u0343\u0347\u034c\u0350\u0360\u036a\u0370\u0377"+
+		"\u0327\u032c\u0331\u0339\u0344\u0348\u034d\u0351\u0361\u036b\u0371\u0378"+
-		"\u037b\u0381\u038e\u0415\u041e\u0426\u0431\u043b\u0449\3\b\2\2";
+		"\u037c\u0382\u038f\u0416\u041f\u0427\u0432\u043c\u044a\3\b\2\2";
 	public static final ATN _ATN =
 		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {
--- a/src/de/dhbwstuttgart/parser/antlr/Java8Lexer.tokens
+++ b/src/de/dhbwstuttgart/parser/antlr/Java8Lexer.tokens
@@ -106,7 +106,7 @@ ELLIPSIS=105
 WS=106
 COMMENT=107
 LINE_COMMENT=108
-'var'=1
+'auto'=1
 'abstract'=2
 'assert'=3
 'boolean'=4
--- a/src/de/dhbwstuttgart/parser/antlr/Java8Listener.java
+++ b/src/de/dhbwstuttgart/parser/antlr/Java8Listener.java
@@ -1,4 +1,4 @@
-// Generated from Java8.g4 by ANTLR 4.7
+// Generated from Java8.g4 by ANTLR 4.5.3
 package de.dhbwstuttgart.parser.antlr;
 import org.antlr.v4.runtime.tree.ParseTreeListener;
@@ -1307,16 +1307,6 @@ public interface Java8Listener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitLocalVariableDeclarationStatement(Java8Parser.LocalVariableDeclarationStatementContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link Java8Parser#unannTypeOrAuto}.
 	 * @param ctx the parse tree
 	 */
 	void enterUnannTypeOrAuto(Java8Parser.UnannTypeOrAutoContext ctx);
 	/**
 	 * Exit a parse tree produced by {@link Java8Parser#unannTypeOrAuto}.
 	 * @param ctx the parse tree
 	 */
 	void exitUnannTypeOrAuto(Java8Parser.UnannTypeOrAutoContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link Java8Parser#localVariableDeclaration}.
 	 * @param ctx the parse tree
--- a/src/de/dhbwstuttgart/parser/antlr/Java8Parser.java
+++ b/src/de/dhbwstuttgart/parser/antlr/Java8Parser.java
--- a/src/de/dhbwstuttgart/parser/scope/GatherNames.java
+++ b/src/de/dhbwstuttgart/parser/scope/GatherNames.java
@@ -1,95 +0,0 @@
 package de.dhbwstuttgart.parser.scope;
 import java.util.ArrayList;
 import java.util.List;
 import de.dhbwstuttgart.parser.antlr.Java8BaseListener;
 import de.dhbwstuttgart.syntaxtree.AbstractASTWalker;
 import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
 import org.antlr.v4.runtime.tree.TerminalNode;
 import de.dhbwstuttgart.environment.PackageCrawler;
 import de.dhbwstuttgart.parser.antlr.Java8Parser;
 public class GatherNames {
 	  public static List<String> getNames(Java8Parser.CompilationUnitContext ctx, PackageCrawler packages) throws ClassNotFoundException{
 		  List<String> ret = new ArrayList<>();
 	    String pkgName = getPackageName(ctx);
 	    String nameString = "";
 	    for (Java8Parser.TypeDeclarationContext typeDecl : ctx.typeDeclaration()){
 	      if(typeDecl.interfaceDeclaration() != null){
 	        if(typeDecl.interfaceDeclaration().normalInterfaceDeclaration() != null){
 	          if(pkgName != ""){
 	            nameString = pkgName + "." + typeDecl.interfaceDeclaration().normalInterfaceDeclaration().Identifier().toString();
 	          }
 	          else{
 	            nameString = typeDecl.interfaceDeclaration().normalInterfaceDeclaration().Identifier().toString();
 	          }
 	          //Die Generic TypeParameter Definitionen Nicht! an die JavaClassName-Registry anfügen:
 	          /* //Diese gelängen dadurch in den globalen Scope, was sie schließlich nicht sind
 	          if(typeDecl.classDeclaration().normalClassDeclaration().typeParameters() != null){
 	            for(Java8Parser.TypeParameterContext tp : typeDecl.classDeclaration().normalClassDeclaration().typeParameters().typeParameterList().typeParameter()){
 	              //this.reg.add(tp.Identifier().toString());
 	            }
 	          }
 	          */
 	          ret.add(nameString);
 	        }
 	      }
 	      else{
 	        if(typeDecl.classDeclaration().normalClassDeclaration() != null){
 	          if(pkgName != ""){
 	            nameString = pkgName + "." + typeDecl.classDeclaration().normalClassDeclaration().Identifier().toString();
 	          }
 	          else{
 	            nameString = typeDecl.classDeclaration().normalClassDeclaration().Identifier().toString();
 	          }
 	          //Die Generic TypeParameter Definitionen Nicht! an die JavaClassName-Registry anfügen:
 	          /* //Diese gelängen dadurch in den globalen Scope, was sie schließlich nicht sind
 	          if(typeDecl.classDeclaration().normalClassDeclaration().typeParameters() != null){
 	            for(Java8Parser.TypeParameterContext tp : typeDecl.classDeclaration().normalClassDeclaration().typeParameters().typeParameterList().typeParameter()){
 	              this.reg.add(tp.Identifier().toString());
 	            }
 	          }
 	          */
 	          ret.add(nameString);
 	        }
 	      }
 	    }
 	    ret.addAll(getImports(ctx, packages));
 	    return ret;
 	  }
 	  private static List<String> getImports(Java8Parser.CompilationUnitContext ctx, PackageCrawler packages) throws ClassNotFoundException {
 	    List<String> ret = new ArrayList();
 		  ret.addAll(packages.getClassNames("java.lang"));
 	    for(Java8Parser.ImportDeclarationContext importDeclCtx : ctx.importDeclaration()){
 	      if(importDeclCtx.singleTypeImportDeclaration() != null){
 	    	  ret.add(importDeclCtx.singleTypeImportDeclaration().typeName().getText());
 	      }
 	      else if(importDeclCtx.typeImportOnDemandDeclaration() != null){
 	    	  ret.addAll(packages.getClassNames(importDeclCtx.typeImportOnDemandDeclaration().packageOrTypeName().getText()));
 	      }
 	      else if(importDeclCtx.singleStaticImportDeclaration() != null){
 	    	  ret.add(importDeclCtx.singleStaticImportDeclaration().typeName().getText()+"."+importDeclCtx.singleStaticImportDeclaration().Identifier().getText());
 	      }
 	      else{
 	    	  ret.addAll(packages.getClassNames(importDeclCtx.staticImportOnDemandDeclaration().typeName().getText()));
 	      }
 	    }
 	    return ret;
 	  }
 	private static String getPackageName(Java8Parser.CompilationUnitContext ctx){
 		String pkgName = "";
 		if(ctx.packageDeclaration() != null){
 			for(TerminalNode t : ctx.packageDeclaration().Identifier()){
 				pkgName = pkgName + "." + t.toString();
 			}
 			pkgName = pkgName.substring(1);
 		}
 		return pkgName;
 	}
 }
--- a/src/de/dhbwstuttgart/parser/scope/GenericsRegistry.java
+++ b/src/de/dhbwstuttgart/parser/scope/GenericsRegistry.java
@@ -1,50 +0,0 @@
 package de.dhbwstuttgart.parser.scope;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.GenericContext;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 public class GenericsRegistry  {
    private final List<GenericVariable> registry = new ArrayList<>();
    public final GenericsRegistry globalRegistry;
    public GenericsRegistry(GenericsRegistry globalRegistry){
        this.globalRegistry = globalRegistry;
    }
    public void put(String name, GenericContext genericContext){
        registry.add(new GenericVariable(genericContext,name));
        if(globalRegistry != null)globalRegistry.put(name, genericContext);
    }
    public boolean contains(String name) {
        Optional<Boolean> ret = registry.stream().<Boolean>map(((GenericVariable genericVariable) -> genericVariable.name.equals(name)))
                .reduce(((a, b) -> a || b));
        if(ret.isPresent())
            return ret.get();
        return false;
    }
    public GenericContext get(String name) {
        return registry.stream()
                .filter((genericVariable -> genericVariable.name.equals(name))).findAny().get().context;
    }
    public void putAll(GenericsRegistry generics) {
        for(GenericVariable generic : generics.registry){
            this.put(generic.name, generic.context);
        }
    }
 }
 class GenericVariable{
    final GenericContext context;
    final String name;
    GenericVariable(GenericContext context, String name){
        this.context = context;
        this.name = name;
    }
 }
--- a/src/de/dhbwstuttgart/parser/scope/JavaClassRegistry.java
+++ b/src/de/dhbwstuttgart/parser/scope/JavaClassRegistry.java
@@ -1,49 +0,0 @@
 package de.dhbwstuttgart.parser.scope;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
 import java.util.*;
 /**
 * Speichert die Klassen f<>r einen bestimmten Projektscope
 */
 public class JavaClassRegistry {
    final List<JavaClassName> existingClasses = new ArrayList<>();
    public JavaClassRegistry(List<String> initialNames){
        for(String name : initialNames){
            existingClasses.add(new JavaClassName(name));
        }
    }
    public void add(String className){
        existingClasses.add(new JavaClassName(className));
    }
    public JavaClassName getName(String className) {
        for(JavaClassName name : existingClasses){
            if(name.equals(new JavaClassName(className)))return name;
        }
        throw new NotImplementedException();
    }
    @Override
    public String toString(){
        return existingClasses.toString();
    }
    public List<JavaClassName> getAllFromPackage(String packageName) {
        List<JavaClassName> ret = new ArrayList<>();
        for(JavaClassName className : this.existingClasses){
            JavaClassName toCompare = new JavaClassName(packageName + "." + JavaClassName.stripClassName(className.toString()));
            if(toCompare.toString().equals(className.toString())){
                ret.add(className);
            }
        }
        return ret;
    }
    public boolean contains(String whole) {
        return existingClasses.contains(new JavaClassName(whole));
    }
 }
--- a/src/de/dhbwstuttgart/syntaxtree/ASTVisitor.java
+++ b/src/de/dhbwstuttgart/syntaxtree/ASTVisitor.java
@@ -4,12 +4,13 @@ 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(ArgumentList argumentList);
    void visit(GenericTypeVar genericTypeVar);
    void visit(FormalParameter formalParameter);
@@ -20,8 +21,6 @@ public interface ASTVisitor extends StatementVisitor{
    void visit(Method field);
    void visit(Constructor field);
    void visit(ParameterList formalParameters);
    void visit(ClassOrInterface classOrInterface);
--- a/src/de/dhbwstuttgart/syntaxtree/AbstractASTWalker.java
+++ b/src/de/dhbwstuttgart/syntaxtree/AbstractASTWalker.java
@@ -1,7 +1,5 @@
 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;
@@ -11,10 +9,6 @@ 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) {
@@ -30,11 +24,6 @@ public abstract class AbstractASTWalker implements ASTVisitor{
        }
    }
    @Override
    public void visit(GenericTypeVar genericTypeVar) {
    }
    @Override
    public void visit(FormalParameter formalParameter) {
        formalParameter.getType().accept(this);
@@ -57,14 +46,9 @@ public abstract class AbstractASTWalker implements ASTVisitor{
    @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);
            method.block.accept(this);
    }
    @Override
@@ -103,21 +87,11 @@ public abstract class AbstractASTWalker implements ASTVisitor{
        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);
@@ -130,11 +104,6 @@ public abstract class AbstractASTWalker implements ASTVisitor{
        assign.rightSide.accept(this);
    }
    @Override
    public void visit(Binary binary) {
    }
    @Override
    public void visit(Block block) {
        for(Statement stmt : block.getStatements()){
@@ -142,41 +111,11 @@ public abstract class AbstractASTWalker implements ASTVisitor{
        }
    }
    @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) {
@@ -194,11 +133,6 @@ public abstract class AbstractASTWalker implements ASTVisitor{
        visit((MethodCall) methodCall);
    }
    @Override
    public void visit(NewArray newArray) {
    }
    @Override
    public void visit(Receiver receiver) {
        receiver.expr.accept(this);
@@ -208,64 +142,4 @@ public abstract class AbstractASTWalker implements ASTVisitor{
    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);
    }
 }
--- a/src/de/dhbwstuttgart/syntaxtree/ClassOrInterface.java
+++ b/src/de/dhbwstuttgart/syntaxtree/ClassOrInterface.java
@@ -1,11 +1,9 @@
 package de.dhbwstuttgart.syntaxtree;
 import de.dhbwstuttgart.core.IItemWithOffset;
 import de.dhbwstuttgart.exceptions.DebugException;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 import de.dhbwstuttgart.syntaxtree.visual.ASTPrinter;
 import de.dhbwstuttgart.typecheck.JavaClassName;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.typeinference.constraints.Constraint;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
@@ -18,19 +16,19 @@ import java.util.List;
 /**
 * Stellt jede Art von Klasse dar. Auch abstrakte Klassen und Interfaces
 */
-public class ClassOrInterface extends SyntaxTreeNode implements TypeScope{
+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 RefType superClass;
+  private RefTypeOrTPHOrWildcardOrGeneric superClass;
  protected boolean isInterface;
  private List<? extends RefTypeOrTPHOrWildcardOrGeneric> implementedInterfaces;
  private List<Constructor> constructors;
  public ClassOrInterface(int modifiers, JavaClassName name, List<Field> fielddecl, List<Method> methods, List<Constructor> constructors, GenericDeclarationList genericClassParameters,
-                          RefType superClass, Boolean isInterface, List<? extends RefTypeOrTPHOrWildcardOrGeneric> implementedInterfaces, Token offset){
+                          RefTypeOrTPHOrWildcardOrGeneric superClass, Boolean isInterface, List<? extends RefTypeOrTPHOrWildcardOrGeneric> implementedInterfaces, Token offset){
    super(offset);
      this.modifiers = modifiers;
      this.name = name;
@@ -60,21 +58,23 @@ public class ClassOrInterface extends SyntaxTreeNode implements TypeScope{
    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());
  }
  public static RefType generateTypeOfClass(JavaClassName name, GenericDeclarationList genericsOfClass ,Token offset){
-    //Hier wird immer ein generischer Typ generiert, also mit Type placeholdern
+    return new RefType(name, offset);
    List<RefTypeOrTPHOrWildcardOrGeneric> params = new ArrayList<>();
    for(GenericTypeVar genericTypeVar : genericsOfClass){
      //params.add(genericTypeVar.getTypePlaceholder());
      params.add(TypePlaceholder.fresh(offset));
    }
    return new RefType(name, params, offset);
  }
-  public RefType getSuperClass() {
+  public RefTypeOrTPHOrWildcardOrGeneric getSuperClass() {
    return superClass;
  }
@@ -82,12 +82,7 @@ public class ClassOrInterface extends SyntaxTreeNode implements TypeScope{
    return this.genericClassParameters;
  }
-  @Override
+  public List<? extends Method> getConstructors() {
  public RefTypeOrTPHOrWildcardOrGeneric getReturnType() {
    return null;
  }
  public List<Constructor> getConstructors() {
    return constructors;
  }
--- a/src/de/dhbwstuttgart/syntaxtree/Constructor.java
+++ b/src/de/dhbwstuttgart/syntaxtree/Constructor.java
@@ -1,38 +1,14 @@
 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 {
-	//TODO: Constructor braucht ein super-Statement
+	public Constructor(String name, RefTypeOrTPHOrWildcardOrGeneric returnType, int modifiers, ParameterList parameterList, Block block, GenericDeclarationList gtvDeclarations, Token offset) {
-	public Constructor(int modifier, String name, RefTypeOrTPHOrWildcardOrGeneric returnType, int modifiers, ParameterList parameterList, Block codeInsideConstructor,
+		super(name, returnType, modifiers, parameterList, block, gtvDeclarations, offset);
 					   GenericDeclarationList gtvDeclarations, Token offset, List<Statement> fieldInitializations, RefType superClass) {
 		super(modifier, 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/ExceptionList.java
+++ b/src/de/dhbwstuttgart/syntaxtree/ExceptionList.java
--- a/src/de/dhbwstuttgart/syntaxtree/Field.java
+++ b/src/de/dhbwstuttgart/syntaxtree/Field.java
@@ -3,12 +3,13 @@ package de.dhbwstuttgart.syntaxtree;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import org.antlr.v4.runtime.Token;
-import java.util.ArrayList;
+public class Field extends SyntaxTreeNode{
 public class Field extends SyntaxTreeNode implements TypeScope{
 	private String name;
 	private RefTypeOrTPHOrWildcardOrGeneric type;
 	private GenericDeclarationList genericParameters;
 	public Field(String name, RefTypeOrTPHOrWildcardOrGeneric type, int modifier, Token offset){
 		super(offset);
@@ -28,15 +29,5 @@ public class Field extends SyntaxTreeNode implements TypeScope{
 	public void accept(ASTVisitor visitor) {
 		visitor.visit(this);
 	}
 	@Override
 	public Iterable<? extends GenericTypeVar> getGenerics() {
 		return new ArrayList<>();
 	}
 	@Override
 	public RefTypeOrTPHOrWildcardOrGeneric getReturnType() {
 		return type;
 	}
 }
--- a/src/de/dhbwstuttgart/syntaxtree/FormalParameter.java
+++ b/src/de/dhbwstuttgart/syntaxtree/FormalParameter.java
--- a/src/de/dhbwstuttgart/syntaxtree/GenericTypeVar.java
+++ b/src/de/dhbwstuttgart/syntaxtree/GenericTypeVar.java
@@ -1,8 +1,7 @@
 package de.dhbwstuttgart.syntaxtree;
 import de.dhbwstuttgart.parser.scope.GenericTypeName;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-
+import de.dhbwstuttgart.typecheck.GenericTypeName;
 import org.antlr.v4.runtime.Token;
 import java.util.ArrayList;
--- a/src/de/dhbwstuttgart/syntaxtree/Method.java
+++ b/src/de/dhbwstuttgart/syntaxtree/Method.java
@@ -8,7 +8,6 @@ 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;
@@ -22,14 +21,14 @@ import de.dhbwstuttgart.syntaxtree.statement.Block;
 * @author janulrich
 *
 */
-public class Method extends Field implements IItemWithOffset
+public class Method extends Field implements IItemWithOffset, TypeScope
 {
 	public final Block block;
 	private ParameterList parameterlist = new ParameterList(new ArrayList<>(), new NullToken());
 	private ExceptionList exceptionlist;
 	private GenericDeclarationList generics;
-	public Method(int modifier, String name, RefTypeOrTPHOrWildcardOrGeneric returnType, int modifiers, ParameterList parameterList, Block block,
+	public Method(String name, RefTypeOrTPHOrWildcardOrGeneric returnType, int modifiers, ParameterList parameterList, Block block,
 				  GenericDeclarationList gtvDeclarations, Token offset) {
 		super(name, returnType, modifiers, offset);
 		this.parameterlist = parameterList;
@@ -37,6 +36,14 @@ public class Method extends Field implements IItemWithOffset
 		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;
 	}
--- a/src/de/dhbwstuttgart/syntaxtree/ParameterList.java
+++ b/src/de/dhbwstuttgart/syntaxtree/ParameterList.java
--- a/src/de/dhbwstuttgart/syntaxtree/SourceFile.java
+++ b/src/de/dhbwstuttgart/syntaxtree/SourceFile.java
@@ -2,8 +2,9 @@ package de.dhbwstuttgart.syntaxtree;
 import java.io.File;
 import java.util.*;
 import de.dhbwstuttgart.parser.NullToken;
-import de.dhbwstuttgart.parser.scope.JavaClassName;
+import de.dhbwstuttgart.typecheck.JavaClassName;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;
 //import sun.security.x509.X509CertInfo;
@@ -12,18 +13,20 @@ import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;
 public class SourceFile extends SyntaxTreeNode{
  private String pkgName;
-  public final List<ClassOrInterface> KlassenVektor;
+  private final List<ClassOrInterface> KlassenVektor;
-  public final List<JavaClassName> imports;
+  private final List<JavaClassName> imports;
  private final File file;
  /**
     * Die SourceFile reprÃ¤sntiert eine zu einem Syntaxbaum eingelesene Java-Datei.
     * SourceFile stellt dabei den Wurzelknoten des Syntaxbaumes dar.
     */
-  public SourceFile(String pkgName, List<ClassOrInterface> classDefinitions, List<JavaClassName> imports){
+  public SourceFile(File file, 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(){
@@ -35,10 +38,31 @@ 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,6 +1,5 @@
 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;
@@ -8,8 +7,6 @@ import de.dhbwstuttgart.syntaxtree.statement.literal.StringLiteral;
 public interface StatementVisitor {
    void visit(ArgumentList argumentList);
    void visit(LambdaExpression lambdaExpression);
    void visit(Assign assign);
@@ -56,15 +53,7 @@ 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;
--- a/src/de/dhbwstuttgart/syntaxtree/factory/ASTFactory.java
+++ b/src/de/dhbwstuttgart/syntaxtree/factory/ASTFactory.java
@@ -7,13 +7,13 @@ import java.util.List;
 import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.GenericContext;
 import de.dhbwstuttgart.parser.scope.GenericTypeName;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
 import de.dhbwstuttgart.syntaxtree.Field;
 import de.dhbwstuttgart.syntaxtree.Method;
 import de.dhbwstuttgart.syntaxtree.type.*;
 import de.dhbwstuttgart.syntaxtree.type.Void;
 import de.dhbwstuttgart.typecheck.GenericTypeName;
 import de.dhbwstuttgart.typecheck.JavaClassName;
 import de.dhbwstuttgart.typecheck.JavaClassRegistry;
 import de.dhbwstuttgart.syntaxtree.*;
 import de.dhbwstuttgart.syntaxtree.statement.Block;
 import de.dhbwstuttgart.syntaxtree.statement.Statement;
@@ -25,9 +25,15 @@ 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 static ClassOrInterface createClass(java.lang.Class jreClass){
+
-		JavaClassName name = new JavaClassName(jreClass.getName());
+	public ASTFactory(JavaClassRegistry scope){
 		names = scope;
 	}
 	public ClassOrInterface createClass(java.lang.Class jreClass){
 		JavaClassName name = names.getName(jreClass.getName());
 		List<Method> methoden = new ArrayList<>();
 		List<de.dhbwstuttgart.syntaxtree.Constructor> konstruktoren = new ArrayList<>();
 		for(java.lang.reflect.Constructor constructor : jreClass.getConstructors()){
@@ -37,9 +43,6 @@ 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();
@@ -60,17 +63,13 @@ public class ASTFactory {
 		return new ClassOrInterface(modifier, name, felder, methoden, konstruktoren, genericDeclarationList, superClass,isInterface, implementedInterfaces, offset);
 	}
-	private static Field createField(java.lang.reflect.Field field, JavaClassName jreClass) {
+    private de.dhbwstuttgart.syntaxtree.Constructor createConstructor(Constructor constructor, Class inClass) {
 		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, new JavaClassName(inClass.getName()), name);
+		RefTypeOrTPHOrWildcardOrGeneric returnType = createType(inClass, names.getName(inClass.getName()), name);
 		Parameter[] jreParams = constructor.getParameters();
 		List<FormalParameter> params = new ArrayList<>();
 		for(Parameter jreParam : jreParams){
-			RefTypeOrTPHOrWildcardOrGeneric paramType = createType(jreParam.getType(),new JavaClassName(inClass.getName()), name);
+			RefTypeOrTPHOrWildcardOrGeneric paramType = createType(jreParam.getType(),names.getName(inClass.getName()), name);
 			params.add(new FormalParameter(jreParam.getName(),paramType, new NullToken()));
 		}
 		ParameterList parameterList = new ParameterList(params, new NullToken());
@@ -79,26 +78,17 @@ public class ASTFactory {
 		Token offset = new NullToken();
 		int modifier = constructor.getModifiers();
-		if(inClass.equals(java.lang.Object.class)){
+		return new de.dhbwstuttgart.syntaxtree.Constructor(name,returnType, modifier, parameterList, block, gtvDeclarations, offset);
 			return null;
 		}
 		return new de.dhbwstuttgart.syntaxtree.Constructor(constructor.getModifiers(), name,returnType, modifier, parameterList, block, gtvDeclarations, offset, new ArrayList<>(),
 				createType(inClass.getSuperclass()));
    }
-	private static RefType createType(Class classType) {
+    public Method createMethod(java.lang.reflect.Method jreMethod, java.lang.Class inClass){
 		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(),new JavaClassName(inClass.getName()), name);
+			returnType = createType(jreMethod.getReturnType(),names.getName(inClass.getName()), name);
 		Parameter[] jreParams = jreMethod.getParameters();
 		List<FormalParameter> params = new ArrayList<>();
 		for(Parameter jreParam : jreParams){
-			RefTypeOrTPHOrWildcardOrGeneric paramType = createType(jreParam.getType(),new JavaClassName(inClass.getName()), name);
+			RefTypeOrTPHOrWildcardOrGeneric paramType = createType(jreParam.getType(),names.getName(inClass.getName()), name);
 			params.add(new FormalParameter(jreParam.getName(),paramType, new NullToken()));
 		}
 		ParameterList parameterList = new ParameterList(params, new NullToken());
@@ -107,10 +97,10 @@ public class ASTFactory {
 		Token offset = new NullToken();
 		int modifier = jreMethod.getModifiers();
-		return new Method(jreMethod.getModifiers(), name,returnType, modifier, parameterList, block, gtvDeclarations, offset);
+		return new Method(name,returnType, modifier, parameterList, block, gtvDeclarations, offset);
 	}
-	public static GenericDeclarationList createGenerics(TypeVariable[] typeParameters, Class context, String methodName){
+	public 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);
@@ -130,23 +120,23 @@ public class ASTFactory {
 	}
 	*/
-	public static RefTypeOrTPHOrWildcardOrGeneric createType(java.lang.reflect.Type type, JavaClassName parentClass, String parentMethod){
+	public 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(new JavaClassName("java.lang.Integer"), new ArrayList<>(), new NullToken());
+			return new RefType(this.names.getName("java.lang.Integer"), new ArrayList<>(), new NullToken());
 		}else if(type.getTypeName().equals("byte")){
-			return new RefType(new JavaClassName("java.lang.Byte"), new ArrayList<>(), new NullToken());
+			return new RefType(this.names.getName("java.lang.Byte"), new ArrayList<>(), new NullToken());
 		}else if(type.getTypeName().equals("boolean")){
-			return new RefType(new JavaClassName("java.lang.Boolean"), new ArrayList<>(), new NullToken());
+			return new RefType(this.names.getName("java.lang.Boolean"), new ArrayList<>(), new NullToken());
 		}else if(type.getTypeName().equals("char")){
-			return new RefType(new JavaClassName("java.lang.Char"), new ArrayList<>(), new NullToken());
+			return new RefType(this.names.getName("java.lang.Char"), new ArrayList<>(), new NullToken());
 		}else if(type.getTypeName().equals("short")){
-			return new RefType(new JavaClassName("java.lang.Short"), new ArrayList<>(), new NullToken());
+			return new RefType(this.names.getName("java.lang.Short"), new ArrayList<>(), new NullToken());
 		}else if(type.getTypeName().equals("double")){
-			return new RefType(new JavaClassName("java.lang.Double"), new ArrayList<>(), new NullToken());
+			return new RefType(this.names.getName("java.lang.Double"), new ArrayList<>(), new NullToken());
 		}else if(type.getTypeName().equals("long")){
-			return new RefType(new JavaClassName("java.lang.Long"), new ArrayList<>(), new NullToken());
+			return new RefType(this.names.getName("java.lang.Long"), new ArrayList<>(), new NullToken());
 		}else{
 			if(type instanceof TypeVariable){
 				//GTVDeclarationContext via "(TypeVariable) type).getGenericDeclaration()"
@@ -160,13 +150,13 @@ public class ASTFactory {
 					params.add(createType(t, parentClass, parentMethod));
 				}
 			}
-			RefType ret = new RefType(new JavaClassName(type.getTypeName()), params, new NullToken());
+			RefType ret = new RefType(this.names.getName(type.getTypeName()), params, new NullToken());
 			return ret;
 		}
 	}
-	public static de.dhbwstuttgart.syntaxtree.GenericTypeVar createGeneric(TypeVariable jreTypeVar, String jreTVName, Class context, String parentMethod){
+	public de.dhbwstuttgart.syntaxtree.GenericTypeVar createGeneric(TypeVariable jreTypeVar, String jreTVName, Class context, String parentMethod){
-		JavaClassName parentClass = new JavaClassName(context.getName());
+		JavaClassName parentClass = names.getName(context.getName());
 		List<RefType> genericBounds = new ArrayList<>();
 		java.lang.reflect.Type[] bounds = jreTypeVar.getBounds();
 		if(bounds.length > 0){
@@ -179,8 +169,8 @@ public class ASTFactory {
 				, genericBounds, new NullToken(), new NullToken());
 	}
-	public static ClassOrInterface createObjectClass() {
+	public ClassOrInterface createObjectClass() {
-		return createClass(Object.class);
+		return this.createClass(Object.class);
 	}
 	/*
--- a/src/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java
+++ b/src/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java
@@ -5,15 +5,12 @@ import java.util.stream.Collectors;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
 import de.dhbwstuttgart.syntaxtree.type.*;
 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;
@@ -136,24 +133,18 @@ public class UnifyTypeFactory {
     * Convert from
     * UnifyType -> ASTType
     */
-    public static Set<ResultPair> convert(Set<UnifyPair> unifyPairSet, Map<String,TypePlaceholder> tphs) {
+    public static Set<Set<Pair>> convert(Set<Set<UnifyPair>> unifyPairSet, Map<String,TypePlaceholder> tphs) {
        return unifyPairSet.stream().map(
-                unifyPair -> convert(unifyPair, tphs))
+                set -> set.stream().map(
-                        .collect(Collectors.toSet());
+                        unifyPair -> convert(unifyPair, tphs))
                        .collect(Collectors.toSet()))
                .collect(Collectors.toSet());
    }
-    public static ResultPair convert(UnifyPair mp, Map<String,TypePlaceholder> tphs) {
+    public static Pair convert(UnifyPair mp, Map<String,TypePlaceholder> tphs) {
        RefTypeOrTPHOrWildcardOrGeneric tl = UnifyTypeFactory.convert(mp.getLhsType(), tphs);
        RefTypeOrTPHOrWildcardOrGeneric tr = UnifyTypeFactory.convert(mp.getRhsType(), tphs);
-        if(tl instanceof TypePlaceholder){
+        return new Pair(tl, tr, mp.getPairOp());
            if(tr instanceof TypePlaceholder) {
                if(mp.getPairOp().equals(PairOperator.EQUALSDOT))
                    return new PairTPHequalRefType((TypePlaceholder)tl, tr);
                else
                    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) {
@@ -168,12 +159,12 @@ public class UnifyTypeFactory {
    }
    public static RefTypeOrTPHOrWildcardOrGeneric convert(SuperType t, Map<String,TypePlaceholder> tphs) {
-        RefTypeOrTPHOrWildcardOrGeneric innerType = convert(t.getSuperedType(), tphs);
+        RefType innerType = new RefType(new JavaClassName(t.getSuperedType().getName()), new NullToken());
        return new SuperWildcardType(innerType, new NullToken());
    }
    public static RefTypeOrTPHOrWildcardOrGeneric convert(ExtendsType t, Map<String,TypePlaceholder> tphs) {
-        RefTypeOrTPHOrWildcardOrGeneric innerType = convert(t.getExtendedType(), tphs);
+        RefType innerType = new RefType(new JavaClassName(t.getExtendedType().getName()), new NullToken());
        return new ExtendsWildcardType(innerType, new NullToken());
    }
--- a/src/de/dhbwstuttgart/syntaxtree/statement/ArgumentList.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/ArgumentList.java
@@ -2,7 +2,6 @@ package de.dhbwstuttgart.syntaxtree.statement;
 import de.dhbwstuttgart.syntaxtree.ASTVisitor;
 import de.dhbwstuttgart.syntaxtree.StatementVisitor;
 import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
 import org.antlr.v4.runtime.Token;
@@ -21,13 +20,8 @@ public class ArgumentList extends SyntaxTreeNode
 		return expr;
 	}
 	@Override
 	public void accept(ASTVisitor visitor) {
 		visitor.visit(this);
 	}
 	public void accept(StatementVisitor visitor) {
 		visitor.visit(this);
 	}
 }
--- a/src/de/dhbwstuttgart/syntaxtree/statement/Assign.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/Assign.java
@@ -8,16 +8,13 @@ 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 AssignLeftSide lefSide;
+    public final Expression lefSide;
-    public Assign(AssignLeftSide leftHandSide, Expression value, Token offset) {
+    public Assign(Expression 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
@@ -1,12 +0,0 @@
 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
@@ -1,16 +0,0 @@
 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
--- a/src/de/dhbwstuttgart/syntaxtree/statement/BinaryExpr.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/BinaryExpr.java
--- a/src/de/dhbwstuttgart/syntaxtree/statement/Block.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/Block.java
--- a/src/de/dhbwstuttgart/syntaxtree/statement/CastExpr.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/CastExpr.java
--- a/src/de/dhbwstuttgart/syntaxtree/statement/DoStmt.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/DoStmt.java
@@ -1,18 +0,0 @@
 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/EmptyStmt.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/EmptyStmt.java
--- a/src/de/dhbwstuttgart/syntaxtree/statement/Expression.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/Expression.java
@@ -9,9 +9,27 @@ import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import org.antlr.v4.runtime.Token;
-public abstract class Expression extends TypableStatement
+public abstract class Expression extends SyntaxTreeNode
 {
    private RefTypeOrTPHOrWildcardOrGeneric type;
    public Expression(RefTypeOrTPHOrWildcardOrGeneric type, Token offset){
-        super(type, 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);
    }
    public String toString() { return this.getClass().getName() + ":" + type.toString(); }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Pluemicke Martin	9dd6c1610a	geändert: S2017_Jan-Elric_Neumann.pdf	2017-09-04 09:28:53 +02:00
Pluemicke Martin	66bbf9d52d	neue Datei: S2017_Jan-Elric_Neumann.pdf neue Datei: ../../git_pull_origin_bigRefactoring geändert: ../../test/typeinference/JavaTXCompilerTest.java	2017-09-04 09:26:02 +02:00
JanUlrich	8bff427c5c	merge	2017-06-30 13:49:53 +02:00
Pluemicke Martin	bd1cfe4e7a	Merge	2017-06-30 13:09:59 +02:00
Martin Plümicke	05e4968adb	new bransch	2017-06-30 13:04:56 +02:00