Final

Tests + visit

.classpath

@@ -0,0 +1,21 @@
+<?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="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="lib" path="lib/antlr-complete.jar"/>
+	<classpathentry kind="lib" path="lib/annotations-2.0.1.jar"/>
+	<classpathentry kind="lib" path="lib/bcel-6.1-SNAPSHOT-sources.jar"/>
+	<classpathentry kind="lib" path="lib/cloning.jar"/>
+	<classpathentry kind="lib" path="lib/commons-bcel6-6.0-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="lib/javassist-3.19.0-GA.jar"/>
+	<classpathentry kind="lib" path="lib/junit-4.0.jar"/>
+	<classpathentry kind="lib" path="lib/log4j-1.2.12.jar"/>
+	<classpathentry kind="lib" path="lib/reflections-0.9.10-javadoc.jar"/>
+	<classpathentry kind="lib" path="lib/reflections-0.9.10-sources.jar"/>
+	<classpathentry kind="lib" path="lib/reflections-0.9.10.jar" sourcepath="/reflections/src"/>
+	<classpathentry kind="lib" path="lib/guava-22.0.jar" sourcepath="lib/guava-22.0-sources.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

.gitignore

@@ -10,16 +10,3 @@ bin
 *.jar
 *.war
 *.ear
-
-# IDEs
-.classpath
-*.iml
-.idea/
-/target/
-.DS_Store
-.project
-.settings/
-/target/
-
-#
-manually/

.idea/libraries/lib.xml

@@ -0,0 +1,22 @@
+<component name="libraryTable">
+  <library name="lib">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/log4j-1.2.12.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/guava-10.0.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/bcel-6.1-SNAPSHOT.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/bcel-6.1-SNAPSHOT-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/annotations-2.0.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/guava-15.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/junit-4.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/commons-bcel6-6.0-SNAPSHOT.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/reflections-0.9.10-javadoc.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/reflections-0.9.10.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/cloning.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javassist-3.19.0-GA.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/reflections-0.9.10-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/antlr-complete.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.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>

.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

README.md

@@ -1,19 +0,0 @@
-
-
-# plugin site erstellen
-* die JAvaTXCOmpiler DAtei in ein plugin umwandeln und deployen.
-* siehe: http://www.vogella.com/tutorials/EclipseJarToPlugin/article.html#convert-jar-files-to-osgi-bundles-with-the-p2-maven-plugin
-* AUsführung:
-	* mvn deploy #erstellt die JAR-Datei und steckt sie in ein lokales Repo (maven-repository)
-	* mvn p2:site
-	* mvn package # hier wird die ZIP-Filf zum Einbinden in Eclipse erstellt
-
-# Einbinden in Eclipse
-* In Eclipse kann die Zip-FIle wie ein Plugin installiert werden
-* Hier tritt FEhler auf. Reflections-Library kann nicht installiert werden. Möglicherweise wird sie auch nicht gebraucht
-* Nach dem installieren de.dhbwstuttagrt.JavaTXcompiler zu den DEpendencies des plugins hinzufügen
-* Anschließend unter "Overview" auf "Updata Classpath" klicken
-
-# Windows
-* JAVA_HOME setzen:
-	* export JAVA_HOME=/c/Program\ Files/Java/jdk1.8.0_102/

classes/classes.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/BoolLiteral.html

@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Literal</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.literal.Literal</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.literal.BoolLiteral</li>
@@ -253,7 +253,7 @@ extends <a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html"
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.Literal">
+<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.literal.Literal">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;de.dhbwstuttgart.syntaxtree.statement.<a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">Literal</a></h3>

doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/CharLiteral.html

@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Literal</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.literal.Literal</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.literal.CharLiteral</li>
@@ -253,7 +253,7 @@ extends <a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html"
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.Literal">
+<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.literal.Literal">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;de.dhbwstuttgart.syntaxtree.statement.<a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">Literal</a></h3>

doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.html

@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Literal</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.literal.Literal</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.literal.DoubleLiteral</li>
@@ -263,7 +263,7 @@ extends <a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html"
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.Literal">
+<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.literal.Literal">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;de.dhbwstuttgart.syntaxtree.statement.<a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">Literal</a></h3>

doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/FloatLiteral.html

@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Literal</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.literal.Literal</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.literal.FloatLiteral</li>
@@ -263,7 +263,7 @@ extends <a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html"
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.Literal">
+<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.literal.Literal">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;de.dhbwstuttgart.syntaxtree.statement.<a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">Literal</a></h3>

doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/IntLiteral.html

@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Literal</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.literal.Literal</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.literal.NumberLiteral</li>
@@ -263,7 +263,7 @@ extends <a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html"
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.Literal">
+<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.literal.Literal">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;de.dhbwstuttgart.syntaxtree.statement.<a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">Literal</a></h3>

doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Literal.html

@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.Literal</li>
+<li>de.dhbwstuttgart.syntaxtree.statement.literal.Literal</li>
 </ul>
 </li>
 </ul>

doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/LongLiteral.html

@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Literal</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.literal.Literal</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.LongLiteral</li>
@@ -263,7 +263,7 @@ extends <a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html"
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.Literal">
+<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.literal.Literal">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;de.dhbwstuttgart.syntaxtree.statement.<a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">Literal</a></h3>

doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/NegativeExpr.html

@@ -115,7 +115,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.UnaryExpr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.javaInternal.NegativeExpr</li>
+<li>de.dhbwstuttgart.syntaxtree.statement.NegativeExpr</li>
 </ul>
 </li>
 </ul>

doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/NotExpr.html

@@ -115,7 +115,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.UnaryExpr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.javaInternal.NotExpr</li>
+<li>de.dhbwstuttgart.syntaxtree.statement.NotExpr</li>
 </ul>
 </li>
 </ul>

doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Null.html

@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Literal</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.literal.Literal</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.literal.Null</li>
@@ -245,7 +245,7 @@ extends <a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html"
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.Literal">
+<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.literal.Literal">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;de.dhbwstuttgart.syntaxtree.statement.<a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">Literal</a></h3>

doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PositivExpr.html

@@ -115,7 +115,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.UnaryExpr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.javaInternal.PositivExpr</li>
+<li>de.dhbwstuttgart.syntaxtree.statement.PositivExpr</li>
 </ul>
 </li>
 </ul>

doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PostDecExpr.html

@@ -115,7 +115,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.UnaryExpr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.javaInternal.PostDecExpr</li>
+<li>de.dhbwstuttgart.syntaxtree.statement.PostDecExpr</li>
 </ul>
 </li>
 </ul>

doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PostIncExpr.html

@@ -115,7 +115,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.UnaryExpr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.javaInternal.PostIncExpr</li>
+<li>de.dhbwstuttgart.syntaxtree.statement.PostIncExpr</li>
 </ul>
 </li>
 </ul>

doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PreDecExpr.html

@@ -115,7 +115,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.UnaryExpr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.javaInternal.PreDecExpr</li>
+<li>de.dhbwstuttgart.syntaxtree.statement.PreDecExpr</li>
 </ul>
 </li>
 </ul>

doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PreIncExpr.html

@@ -115,7 +115,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.UnaryExpr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.javaInternal.PreIncExpr</li>
+<li>de.dhbwstuttgart.syntaxtree.statement.PreIncExpr</li>
 </ul>
 </li>
 </ul>

doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/StringLiteral.html

@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Literal</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.literal.Literal</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.literal.StringLiteral</li>
@@ -253,7 +253,7 @@ extends <a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html"
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.Literal">
+<li class="blockList"><a name="methods.inherited.from.class.de.dhbwstuttgart.syntaxtree.statement.literal.Literal">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;de.dhbwstuttgart.syntaxtree.statement.<a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">Literal</a></h3>

doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Literal.html

@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.Literal</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.literal.Literal</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,7 +70,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.Literal" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.Literal</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.literal.Literal" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.Literal</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">

doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/NegativeExpr.html

@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.NegativeExpr</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.NegativeExpr</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.NegativeExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.NegativeExpr</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.NegativeExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.NegativeExpr</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.javaInternal.NegativeExpr</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.NegativeExpr</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->

doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/NotExpr.html

@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.NotExpr</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.NotExpr</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.NotExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.NotExpr</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.NotExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.NotExpr</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.javaInternal.NotExpr</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.NotExpr</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->

doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/PositivExpr.html

@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.PositivExpr</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.PositivExpr</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.PositivExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PositivExpr</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.PositivExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PositivExpr</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.javaInternal.PositivExpr</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.PositivExpr</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->

doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/PostDecExpr.html

@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.PostDecExpr</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.PostDecExpr</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.PostDecExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PostDecExpr</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.PostDecExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PostDecExpr</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.javaInternal.PostDecExpr</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.PostDecExpr</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->

doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/PostIncExpr.html

@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.PostIncExpr</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.PostIncExpr</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.PostIncExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PostIncExpr</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.PostIncExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PostIncExpr</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.javaInternal.PostIncExpr</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.PostIncExpr</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->

doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/PreDecExpr.html

@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.PreDecExpr</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.PreDecExpr</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.PreDecExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PreDecExpr</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.PreDecExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PreDecExpr</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.javaInternal.PreDecExpr</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.PreDecExpr</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->

doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/PreIncExpr.html

@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.PreIncExpr</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.PreIncExpr</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.javaInternal.PreIncExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PreIncExpr</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.PreIncExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.PreIncExpr</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.javaInternal.PreIncExpr</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.PreIncExpr</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->

doc/doc.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

pom.xml

@@ -1,181 +0,0 @@
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" 
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
-	http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>de.dhbwstuttgart</groupId>
-  <artifactId>JavaTXcompiler</artifactId>
-  <packaging>jar</packaging>
-   
-  <version>0.1</version>
-  <name>JavaTXcompiler</name>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.0</version>
-      <scope>test</scope>
-      </dependency>
-      <dependency>
-  	  <groupId>org.antlr</groupId>
-   	 <artifactId>antlr4</artifactId>
-   	 <version>4.7</version>
-	</dependency>
-<dependency>
-    <groupId>commons-io</groupId>
-    <artifactId>commons-io</artifactId>
-    <version>2.6</version>
-</dependency>
-<dependency>
-<groupId>com.google.guava</groupId>
-    <artifactId>guava</artifactId>
-    <version>22.0</version>
-</dependency>
-<dependency>
-    <groupId>org.reflections</groupId>
-    <artifactId>reflections</artifactId>
-    <version>0.9.11</version>
-</dependency>
-<dependency>
-    <groupId>org.ow2.asm</groupId>
-    <artifactId>asm-all</artifactId>
-    <version>[4.0.0,)</version>
-</dependency>
-<!--
-<dependency>
-    <groupId>org.bitbucket.mstrobel</groupId>
-    <artifactId>procyon-reflection</artifactId>
-    <version>[0.5.32,)</version>
-</dependency> -->
-  </dependencies>
-
-  <build>
-    <directory>target</directory>
-    <outputDirectory>target/classes</outputDirectory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
-    <testOutputDirectory>target/test-classes</testOutputDirectory>
-    <sourceDirectory>src/</sourceDirectory>
-    <testSourceDirectory>test/</testSourceDirectory>
-    <plugins>
-      <plugin>
-        <groupId>org.antlr</groupId>
-        <artifactId>antlr4-maven-plugin</artifactId>
-        <version>4.7</version>
-        <executions>
-          <execution>
-            <id>antlr</id>
-            <goals>
-		    <goal>antlr4</goal>
-	    </goals>
-	    <configuration>
-		    <sourceDirectory>src/de/dhbwstuttgart/parser/antlr/</sourceDirectory>
-		    <outputDirectory>src/de/dhbwstuttgart/parser/antlr/</outputDirectory>
-		    <arguments> <argument>-package</argument> <argument>de.dhbwstuttgart.parser.antlr</argument> </arguments>
-	    </configuration>
-	    </execution>
-	    <execution>
-            <id>aspParser</id>
-            <goals>
-		    <goal>antlr4</goal>
-	    </goals>
-	    <configuration>
-		    <sourceDirectory>src/de/dhbwstuttgart/sat/asp/parser/antlr/</sourceDirectory>
-		    <outputDirectory>src/de/dhbwstuttgart/sat/asp/parser/antlr/</outputDirectory>
-		    <arguments>
-			    <argument>-package</argument>
-			   <argument>de.dhbwstuttgart.sat.asp.parser.antlr</argument>
-	  	    </arguments>
-	    </configuration>
-          </execution>
-
-        </executions>
-</plugin>
- <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <descriptorRefs>
-            <descriptorRef>jar-with-dependencies</descriptorRef>
-          </descriptorRefs>
-        </configuration>
-      </plugin>
-<plugin>
-    <groupId>org.reficio</groupId>
-    <artifactId>p2-maven-plugin</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
-    <executions>
-     <execution>
-      <id>default-cli</id>
-      <configuration>
-       <artifacts>
-        <!-- specify your depencies here -->
-	<!-- groupId:artifactId:version -->
-        <artifact>
-		<id>de.dhbwstuttgart:JavaTXcompiler:0.1</id>
-        </artifact>
-		<artifact><id>org.reflections:reflections:0.9.11</id></artifact>
-		<artifact><id>com.google.guava:guava:22.0</id></artifact>
-		<artifact><id>javax.annotation:javax.annotation-api:1.3.1</id></artifact>
-		<artifact><id>org.glassfish:javax.annotation:3.1.1</id></artifact>
-       </artifacts>
-      </configuration>
-     </execution>
-    </executions>
-   </plugin>
-   <plugin>
-    <groupId>org.eclipse.tycho</groupId>
-    <artifactId>tycho-p2-repository-plugin</artifactId>
-    <version>${tycho.version}</version>
-    <executions>
-     <execution>
-      <phase>package</phase>
-      <goals>
-       <goal>archive-repository</goal>
-      </goals>
-     </execution>
-    </executions>
-   </plugin>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-                <source>9</source>
-                <target>9</target>
-            </configuration>
-        </plugin>
-    </plugins>
-       </build>
-        <pluginRepositories>
-  <pluginRepository>
-   <id>reficio</id>
-   <url>http://repo.reficio.org/maven/</url>
-  </pluginRepository>
- </pluginRepositories>
- <repositories>
-	 <repository>
-        <id>maven-repository</id>
-	<url>file:///${project.basedir}/target</url>
-</repository>
-</repositories>
-   <properties>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <tycho.version>0.23.0</tycho.version>
-  </properties>
-  <distributionManagement>
-    <repository>
-	    <id>maven-repository</id>
-      <name>MyCo Internal Repository</name>
-      <url>file:///${project.basedir}/maven-repository/</url>
-    </repository>
-  </distributionManagement>
-</project>

src/JavaCompilerCore1.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

src/de/dhbwstuttgart/bytecode/AStatement.java

@@ -1,30 +0,0 @@
-package de.dhbwstuttgart.bytecode;
-
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-
-import de.dhbwstuttgart.syntaxtree.statement.BinaryExpr;
-import de.dhbwstuttgart.syntaxtree.statement.Expression;
-
-public abstract class AStatement implements IStatement {
-	protected Expression expr;
-	
-	public AStatement(Expression expr) {
-		this.expr = expr;
-	}
-	
-	@Override
-	public boolean isExprBinary() {
-		return (expr instanceof BinaryExpr);
-	}
-	
-	@Override
-	public void genBCForRelOp(MethodVisitor mv,Label branchLabel, Label endLabel, BytecodeGenMethod bytecodeGenMethod) {
-		mv.visitInsn(Opcodes.ICONST_1);
-		mv.visitJumpInsn(Opcodes.GOTO, endLabel);
-		mv.visitLabel(branchLabel);
-		mv.visitInsn(Opcodes.ICONST_0);
-		mv.visitLabel(endLabel);
-	}
-}

src/de/dhbwstuttgart/bytecode/ArgumentExpr.java

@@ -1,11 +0,0 @@
-package de.dhbwstuttgart.bytecode;
-
-import de.dhbwstuttgart.syntaxtree.statement.Expression;
-
-public class ArgumentExpr extends AStatement {
-	
-	public ArgumentExpr(Expression expr) {
-		super(expr);
-	}
-	
-}

src/de/dhbwstuttgart/bytecode/AssignStmt.java

@@ -1,11 +0,0 @@
-package de.dhbwstuttgart.bytecode;
-
-import de.dhbwstuttgart.syntaxtree.statement.Expression;
-
-public class AssignStmt extends AStatement {
-	
-	public AssignStmt(Expression rightSide) {
-		super(rightSide);
-	}
-
-}

src/de/dhbwstuttgart/bytecode/BytecodeGen.java

@@ -1,654 +0,0 @@
-package de.dhbwstuttgart.bytecode;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import de.dhbwstuttgart.exceptions.NotImplementedException;
-import de.dhbwstuttgart.syntaxtree.statement.*;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
-
-import de.dhbwstuttgart.bytecode.descriptor.DescriptorToString;
-import de.dhbwstuttgart.bytecode.descriptor.TypeToDescriptor;
-import de.dhbwstuttgart.bytecode.signature.Signature;
-import de.dhbwstuttgart.bytecode.signature.TypeToString;
-import de.dhbwstuttgart.bytecode.utilities.MethodAndTPH;
-import de.dhbwstuttgart.bytecode.utilities.NormalConstructor;
-import de.dhbwstuttgart.bytecode.utilities.NormalMethod;
-import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
-import de.dhbwstuttgart.syntaxtree.*;
-import de.dhbwstuttgart.syntaxtree.statement.Literal;
-import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.typeinference.result.GenericInsertPair;
-import de.dhbwstuttgart.typeinference.result.ResolvedType;
-import de.dhbwstuttgart.typeinference.result.ResultPair;
-import de.dhbwstuttgart.typeinference.result.ResultSet;
-
-public class BytecodeGen implements ASTVisitor {
-	
-	ClassWriter cw =new ClassWriter(ClassWriter.COMPUTE_FRAMES|ClassWriter.COMPUTE_MAXS);
-	
-	String type;
-
-	String className;
-	private boolean isInterface;
-	private List<ResultSet> listOfResultSets;
-	private ResultSet resultSet;
-	
-	private String path;
-	
-	private int indexOfFirstParam = 0;
-	
-	private String superClass;
-	
-	// 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<>();
-	// stores generics and their bounds of class
-	HashMap<String, String> genericsAndBounds = new HashMap<>();
-	// stores generics and their bounds of method
-	HashMap<String, String> genericsAndBoundsMethod = new HashMap<>();
-	
-	private final TPHExtractor tphExtractor = new TPHExtractor();
-	private final ArrayList<GenericInsertPair> commonPairs = new ArrayList<>();
-	
-	HashMap<String,RefTypeOrTPHOrWildcardOrGeneric> methodParamsAndTypes = new HashMap<>();
-	byte[] bytecode;
-	HashMap<String,byte[]> classFiles;
-	
-	ArrayList<String> methodNameAndParamsT = new ArrayList<>();
-	
-	public BytecodeGen(HashMap<String,byte[]> classFiles, List<ResultSet> listOfResultSets, String path) {
-		this.classFiles = classFiles;
-		this.listOfResultSets = listOfResultSets;
-		this.path = path;
-	}
-	
-	@Override
-	public void visit(SourceFile sourceFile) {
-		for(ClassOrInterface cl : sourceFile.getClasses()) {
-			System.out.println("in Class: " + cl.getClassName().toString());
-			BytecodeGen classGen = new BytecodeGen(classFiles, listOfResultSets,path);
-			cl.accept(classGen);
-			classGen.writeClass(cl.getClassName().toString());
-		}
-	}
-	
-	/**
-	 * Associates the bytecode of the class that was build with the classWriter {@link #cw}
-	 * with the class name in the map {@link #classFiles}
-	 * 
-	 * @param name name of the class with which the the bytecode is to be associated
-	 */
-	private void writeClass(String name) {
-		bytecode = cw.toByteArray();
-		classFiles.put(name, bytecode);
-		
-	}
-	
-	public HashMap<String,byte[]> getClassFiles() {
-		return classFiles;
-	}
-	
-	
-	@Override
-	public void visit(ClassOrInterface classOrInterface) {
-		
-		className = classOrInterface.getClassName().toString();
-		
-		cw.visitSource(className +".jav", null);
-		
-		isInterface = (classOrInterface.getModifiers()&512)==512;
-
-		int acc = isInterface?classOrInterface.getModifiers()+Opcodes.ACC_ABSTRACT:classOrInterface.getModifiers()+Opcodes.ACC_SUPER;
-		
-		
-//		resultSet = listOfResultSets.get(0);
-		boolean isConsWithNoParamsVisited = false;
-		boolean isVisited = false;
-		for(ResultSet rs : listOfResultSets) {
-			superClass = classOrInterface.getSuperClass().acceptTV(new TypeToDescriptor());
-			resultSet = rs;
-			// Nur einmal ausführen!!
-			if(!isVisited) {
-				classOrInterface.accept(tphExtractor);
-
-				getCommonTPHS(tphExtractor);
-
-				String sig = null;
-				/* if class has generics then creates signature
-				 * Signature looks like:
-				 * <E:Ljava/...>Superclass 
-				 */
-				if(classOrInterface.getGenerics().iterator().hasNext() || !commonPairs.isEmpty()) {
-					Signature signature = new Signature(classOrInterface, genericsAndBounds,commonPairs);
-					sig = signature.toString();
-					System.out.println("Signature: => " + sig);
-				}
-				
-				cw.visit(Opcodes.V1_8, acc, classOrInterface.getClassName().toString()
-						, sig, classOrInterface.getSuperClass().acceptTV(new TypeToDescriptor()), null);
-				
-				isVisited = true;
-			}
-			
-			for(Field f : classOrInterface.getFieldDecl()) {
-				f.accept(this);
-			}
-			
-			for(Constructor c : classOrInterface.getConstructors()) {
-				if(!isConsWithNoParamsVisited)
-					c.accept(this);
-				if(!c.getParameterList().iterator().hasNext())
-					isConsWithNoParamsVisited = true;
-			}
-			
-			for(Method m : classOrInterface.getMethods()) {
-				m.accept(this);
-			}
-		
-		}
-		
-	}
-
-	private void getCommonTPHS(TPHExtractor tphExtractor) {
-		// Gemeinsame TPHs
-		ArrayList<TypePlaceholder> cTPHs = new ArrayList<>();
-		// Alle TPHs der Felder speichern
-		for(TypePlaceholder tph : tphExtractor.allTPHS.keySet()) {
-			if(!tphExtractor.allTPHS.get(tph))
-				cTPHs.add(tph);
-		}
-	}
-
-	@Override
-	public void visit(Constructor field) {
-		field.getParameterList().accept(this);
-		
-		String desc = null;
-		boolean hasGen = false;
-		
-		for(String paramName : methodParamsAndTypes.keySet()) {
-			String typeOfParam = methodParamsAndTypes.get(paramName).acceptTV(new TypeToDescriptor());
-			if(genericsAndBounds.containsKey(typeOfParam)) {
-				hasGen = true;
-				break;
-			}
-		}
-		String sig = null;
-		if(hasGen) {
-			Signature signature = new Signature(field, genericsAndBounds,methodParamsAndTypes);
-			sig = signature.toString();
-		}
-		NormalConstructor constructor = new NormalConstructor(field,genericsAndBounds,hasGen);
-		desc = constructor.accept(new DescriptorToString(resultSet));
-		MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", desc, sig, null);
-		mv.visitCode();		
-		BytecodeGenMethod gen = new BytecodeGenMethod(className,superClass,resultSet,field, mv,paramsAndLocals,cw,
-				genericsAndBoundsMethod,genericsAndBounds,isInterface,classFiles, path);
-		if(!field.getParameterList().iterator().hasNext()) {
-			mv.visitInsn(Opcodes.RETURN);
-		}
-		mv.visitMaxs(0, 0);
-		mv.visitEnd();
-	}
-	
-	@Override
-	public void visit(Method method) {
-		// TODO: check if the method is static => if static then the first param will be stored in pos 0
-		// else it will be stored in pos 1 and this will be stored in pos 0
-		String retType = resultSet.resolveType(method.getReturnType()).resolvedType.acceptTV(new TypeToDescriptor());
-		String methParamTypes = retType+method.name+"%%";
-		method.getParameterList().accept(this);
-
-		Iterator<FormalParameter> itr = method.getParameterList().iterator();
-		while(itr.hasNext()) {
-			FormalParameter fp = itr.next();
-			methParamTypes += resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor())+";";
-		}
-		
-		if(methodNameAndParamsT.contains(methParamTypes)) {
-			return;
-		}
-		methodNameAndParamsT.add(methParamTypes);
-		System.out.println("Method: "+method.name +" , paramsType: "+methParamTypes);
-		String methDesc = null;
-		
-		// Method getModifiers() ?
-		int acc = isInterface?Opcodes.ACC_ABSTRACT:method.modifier;
-		System.out.println(acc);
-		
-		/*Prüfe, ob die Rückgabe-Type der Methode eine Type-Variable ist*/
-		boolean hasGenInParameterList = genericsAndBounds.containsKey(retType) || retType.subSequence(0, 4).equals("TPH ");
-		/*Wenn die Rückgabe-Type eine Typ-variable ist, erzeuge direkt die Signature, wenn nicht,
-		 * prüfe, ob einer der Parameter Typ-Variable als Typ hat*/
-		if(!hasGenInParameterList) {
-			for(String paramName : methodParamsAndTypes.keySet()) {
-				String typeOfParam = methodParamsAndTypes.get(paramName).acceptTV(new TypeToDescriptor());
-				if(genericsAndBounds.containsKey(typeOfParam)||typeOfParam.substring(0, 4).equals("TPH ")) {
-					hasGenInParameterList = true;
-					break;
-				}
-			}
-		}
-		
-		//TODO: Test if the return-type or any of the parameter is a parameterized type. (VP)
-		//then create the descriptor with the new syntax.
-		
-		String sig = null;
-		/* method.getGenerics: <....> RT method(..) 
-		 * */
-		boolean hasGen = method.getGenerics().iterator().hasNext() || hasGenInParameterList;
-		
-		/* if method has generics or return type is TPH, create signature */
-		// zwite operand muss weggelassen werden
-		if(hasGen||method.getReturnType().acceptTV(new TypeToString()).equals("TPH")) {
-			
-			ArrayList<GenericInsertPair> pairs = simplifyPairs(method.name,tphExtractor.allPairs);
-			System.out.println(method.name + " => Simplified Pairs: ");
-			pairs.forEach(p->System.out.println(p.TA1.getName() + " -> "+p.TA2.getName()));
-			Signature signature = new Signature(method, genericsAndBoundsMethod, genericsAndBounds,methodParamsAndTypes,resultSet, pairs);
-			sig = signature.toString();
-		}
-		System.out.println(method.getName()+" ==> "+sig);
-		NormalMethod meth = new NormalMethod(method,genericsAndBounds,genericsAndBoundsMethod,hasGen);
-		methDesc = meth.accept(new DescriptorToString(resultSet));
-		
-//		System.out.println(methDesc);
-		MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC+acc, method.getName(), methDesc, sig, null);
-
-		mv.visitCode();		
-		BytecodeGenMethod gen = new BytecodeGenMethod(className,superClass,resultSet,method, mv,paramsAndLocals,cw,
-				genericsAndBoundsMethod,genericsAndBounds,isInterface,classFiles, path);
-		
-		mv.visitMaxs(0, 0);
-		mv.visitEnd();
-	}
-	
-	private ArrayList<GenericInsertPair> simplifyPairs(String methodName, ArrayList<GenericInsertPair> allPairs) {
-		allPairs.forEach(p->System.out.print(p.TA1 + " < "+ p.TA2+ " ; "));
-		
-		if(allPairs.size() < 2)
-			return allPairs;
-		
-		ArrayList<GenericInsertPair> simplifiedPairs = new ArrayList<>();
-		
-		MethodAndTPH method;
-		ArrayList<TypePlaceholder> methodTphs = new ArrayList<>();
-		ArrayList<GenericInsertPair> methodPairs = new ArrayList<>();
-		for(MethodAndTPH m : tphExtractor.ListOfMethodsAndTph) {
-			if(m.getName().equals(methodName)) {
-				methodTphs = m.getTphs();
-				methodPairs = m.getPairs();
-				break;
-			}
-		}
-
-		HashMap<TypePlaceholder, TypePlaceholder> subAndSuperTph = new HashMap<>();
-		for(GenericInsertPair p : allPairs) {
-			// Tph2.jav
-			if(subAndSuperTph.containsKey(p.TA1)) {
-				if(methodTphs.contains(subAndSuperTph.get(p.TA1)))
-					continue;
-			}
-			subAndSuperTph.put(p.TA1, p.TA2);
-		}
-		int numOfVisitedPairs = 0;
-		for(TypePlaceholder subTph: subAndSuperTph.keySet()) {
-			
-			if(numOfVisitedPairs>=subAndSuperTph.size())
-				break;
-			
-			if(!methodTphs.contains(subTph))
-				continue;
-			
-			HashMap<Integer, TypePlaceholder> tphsInRel= new HashMap<>();
-			
-			tphsInRel.put(tphsInRel.size(), subTph);
-			TypePlaceholder superTph = subAndSuperTph.get(subTph);
-			tphsInRel.put(tphsInRel.size(), superTph);
-			
-			numOfVisitedPairs++;
-			
-			while(subAndSuperTph.containsKey(superTph)) {
-				superTph = subAndSuperTph.get(superTph);
-				tphsInRel.put(tphsInRel.size(), superTph);
-				numOfVisitedPairs++;
-			}
-			
-			// Subtype
-			TypePlaceholder subTphRes = tphsInRel.get(0);
-			// Die größte Supertype
-			TypePlaceholder superTphRes = tphsInRel.get(tphsInRel.size()-1);
-			
-			while(subAndSuperTph.containsValue(subTphRes)) {
-				for(TypePlaceholder tph : subAndSuperTph.keySet()) {
-					if(methodTphs.contains(tph) && subAndSuperTph.get(tph).equals(subTphRes)) {
-						subTphRes = tph;
-						break;
-					}
-				}
-				if(subTphRes.equals(tphsInRel.get(0))) {
-					break;
-				}
-				tphsInRel.put(0, subTphRes);
-				numOfVisitedPairs++;
-			}
-			
-			subTphRes = tphsInRel.get(0);
-			
-			int i = 2;
-			while(!methodTphs.contains(superTphRes) && (tphsInRel.size()-i) >0) {
-				superTphRes = tphsInRel.get(tphsInRel.size()-i);
-				i++;
-			}
-			// teste noch den Fall X < Y und Y nicht in TPHS der Methode
-			// 		 Dann hat man nach der While-Schleife X < Y
-			//		 Y muss durch Object ersetzt.
-			
-			// Zweite Operand für die Fälle wie in Lambda.jav (Paramtrisierte Typen) 
-			if(methodTphs.contains(superTphRes) || !tphExtractor.allTPHS.containsKey(superTphRes)) {
-				GenericInsertPair sPair = new GenericInsertPair(subTphRes, superTphRes);
-				simplifiedPairs.add(sPair);
-			}
-		}
-		return simplifiedPairs;
-	}
-
-	@Override
-	public void visit(ParameterList formalParameters) {
-		paramsAndLocals = new HashMap<>();
-		methodParamsAndTypes = new HashMap<>();
-		Iterator<FormalParameter> itr = formalParameters.iterator();
-		int i = 1;
-		while(itr.hasNext()) {
-			FormalParameter fp = itr.next();
-			paramsAndLocals.put(fp.getName(), i);
-			methodParamsAndTypes.put(fp.getName(), resultSet.resolveType(fp.getType()).resolvedType);
-			fp.accept(this);
-			i++;
-		}
-	}
-	
-	@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) {
-//		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) {
-		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(BinaryExpr binary) {
-
-	}
-
-	@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(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(WhileStmt whileStmt) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(DoStmt whileStmt) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	// ???
-	@Override
-	public void visit(Literal literal) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(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) {
-		
-	}
-
-	@Override
-	public void visit(ExpressionReceiver expressionReceiver) {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public void visit(UnaryExpr unaryExpr) {
-		throw new NotImplementedException();
-	}
-	
-	private class TPHExtractor extends AbstractASTWalker{
-		// Alle TPHs der Felder werden iKopf der Klasse definiert
-		// alle TPHs der Klasse: (TPH, is in Method?)
-		final HashMap<TypePlaceholder,Boolean> allTPHS = new HashMap<>();
-		MethodAndTPH methodAndTph;
-		Boolean inMethod = false;
-		final ArrayList<MethodAndTPH> ListOfMethodsAndTph = new ArrayList<>();
-		final ArrayList<GenericInsertPair> allPairs = new ArrayList<>();
-		
-		@Override
-		public void visit(TypePlaceholder tph) {
-			if(resultSet.resolveType(tph).resolvedType instanceof TypePlaceholder) {
-				TypePlaceholder resolvedTPH = (TypePlaceholder) resultSet.resolveType(tph).resolvedType;
-				if(inMethod)
-					methodAndTph.getTphs().add(resolvedTPH);
-				
-				allTPHS.put(resolvedTPH,inMethod);
-				resultSet.resolveType(tph).additionalGenerics.forEach(ag ->{
-					if(ag.contains(resolvedTPH)&&ag.TA1.equals(resolvedTPH)&&!contains(allPairs,ag)) {
-						if(inMethod)
-							methodAndTph.getPairs().add(ag);
-						allPairs.add(ag);
-					}
-				});
-			}
-		}
-		private boolean contains(ArrayList<GenericInsertPair> pairs, GenericInsertPair genPair) {
-			for(int i=0; i<pairs.size();++i) {
-				GenericInsertPair p = pairs.get(i);
-				if(p.TA1.equals(genPair.TA1) && p.TA2.equals(genPair.TA2))
-					return true;
-			}
-			return false;
-		}
-		@Override
-		public void visit(Method method) {
-			inMethod = true;
-			methodAndTph = new MethodAndTPH(method.name);
-			super.visit(method);
-			inMethod = false;
-			ListOfMethodsAndTph.add(methodAndTph);
-		}
-		
-	}
-
-}

src/de/dhbwstuttgart/bytecode/IStatement.java

@@ -1,9 +0,0 @@
-package de.dhbwstuttgart.bytecode;
-
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-
-public interface IStatement {
-	public boolean isExprBinary();
-	public void genBCForRelOp(MethodVisitor mv, Label branchLabel, Label endLabel, BytecodeGenMethod bytecodeGenMethod);
-}

src/de/dhbwstuttgart/bytecode/LoopStmt.java

@@ -1,26 +0,0 @@
-package de.dhbwstuttgart.bytecode;
-
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-
-import de.dhbwstuttgart.syntaxtree.statement.Expression;
-import de.dhbwstuttgart.syntaxtree.statement.Statement;
-
-public class LoopStmt extends AStatement {
-	
-    private Statement loopBlock;
-    
-    public LoopStmt(Expression expr, Statement loopBlock) {
-    		super(expr);
-    		this.loopBlock = loopBlock;
-    }
-
-	@Override
-	public void genBCForRelOp(MethodVisitor mv,Label branchLabel, Label endLabel, BytecodeGenMethod bytecodeGenMethod) {
-		bytecodeGenMethod.isBinary(false);
-		this.loopBlock.accept(bytecodeGenMethod);
-		mv.visitJumpInsn(Opcodes.GOTO, endLabel);
-		mv.visitLabel(branchLabel);
-	}
-}

src/de/dhbwstuttgart/bytecode/ReturnStmt.java

@@ -1,14 +0,0 @@
-package de.dhbwstuttgart.bytecode;
-
-import org.objectweb.asm.MethodVisitor;
-
-import de.dhbwstuttgart.syntaxtree.statement.BinaryExpr;
-import de.dhbwstuttgart.syntaxtree.statement.Expression;
-
-public class ReturnStmt extends AStatement {
-	
-	public ReturnStmt(Expression retexpr) {
-		super(retexpr);
-	}
-	
-}

src/de/dhbwstuttgart/bytecode/descriptor/DescriptorToString.java

@@ -1,207 +0,0 @@
-package de.dhbwstuttgart.bytecode.descriptor;
-
-import java.util.Iterator;
-
-import org.objectweb.asm.Type;
-
-import de.dhbwstuttgart.bytecode.signature.TypeToSignature;
-import de.dhbwstuttgart.bytecode.utilities.Lambda;
-import de.dhbwstuttgart.bytecode.utilities.MethodFromMethodCall;
-import de.dhbwstuttgart.bytecode.utilities.NormalConstructor;
-import de.dhbwstuttgart.bytecode.utilities.NormalMethod;
-import de.dhbwstuttgart.bytecode.utilities.SamMethod;
-import de.dhbwstuttgart.syntaxtree.FormalParameter;
-import de.dhbwstuttgart.syntaxtree.statement.Expression;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.typeinference.result.ResultSet;
-
-public class DescriptorToString implements DescriptorVisitor{
-	ResultSet resultSet;
-	
-	public DescriptorToString(ResultSet resultSet) {
-		this.resultSet = resultSet;
-	}
-	
-	private String addReturnType(String desc, RefTypeOrTPHOrWildcardOrGeneric returnType, ResultSet resultSet) {
-		if(resultSet.resolveType(returnType).resolvedType.toString().equals("void")){
-			desc = desc + ")V";
-		}else {
-			desc = desc + ")" + "L"+resultSet.resolveType(returnType).resolvedType.acceptTV(new TypeToDescriptor())+ ";";
-		}
-		return desc;
-	}
-	
-	@Override
-	public String visit(NormalMethod method) {
-		
-		String desc = "(";
-		Iterator<FormalParameter> itr = method.getParameterList().iterator();
-		while(itr.hasNext()) {
-			FormalParameter fp = itr.next();
-//			System.out.println(resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToSignature()));
-//			System.out.println("Parmetrisierte typ ? "+ ((RefType) fp.getType()).getParaList().size());
-			if(method.hasGen()) {
-				String fpDesc = fp.getType().acceptTV(new TypeToDescriptor());
-				if(method.getGenericsAndBoundsMethod().containsKey(fpDesc)) {
-					desc += "L"+method.getGenericsAndBoundsMethod().get(fpDesc)+ ";";
-				}else if(method.getGenericsAndBounds().containsKey(fpDesc)){
-					desc += "L"+method.getGenericsAndBounds().get(fpDesc)+ ";";
-				}else {
-//					desc += "L"+resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor())+ ";";
-					String resType = resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor());
-					if(resType.subSequence(0, 4).equals("TPH ")) {
-						// Bound ist immer Object
-						desc += "L"+Type.getInternalName(Object.class)+ ";";
-					} else {
-						desc += "L"+resType+ ";";
-					}
-				}
-			}
-			//TODO: generate a class java%% ... %%
-			else if(resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor()).contains("<")){
-				desc += "L"+resultSet.resolveType(fp.getType()).resolvedType.toString().replace(".", "$$").replace("<", "$$$").replace(">", "$$$")+ ";";
-			}
-			else {
-				desc += "L"+resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor())+ ";";
-			}
-		}
-		
-		if(resultSet.resolveType(method.getReturnType()).resolvedType.toString().equals("void")) {
-			desc += ")V";
-		}else {
-			if(method.hasGen()) {
-				String ret = method.getReturnType().acceptTV(new TypeToDescriptor());
-				if(method.getGenericsAndBoundsMethod().containsKey(ret)) {
-					desc += ")L"+method.getGenericsAndBoundsMethod().get(ret)+ ";";
-				}else if(method.getGenericsAndBounds().containsKey(ret)){
-					desc += ")L"+method.getGenericsAndBounds().get(ret)+ ";";
-				}else {
-					String resType = resultSet.resolveType(method.getReturnType()).resolvedType.acceptTV(new TypeToDescriptor());
-					if(resType.subSequence(0, 4).equals("TPH ")) {
-//						desc += ")" + "L"+method.getGenericsAndBoundsMethod().get(resType.substring(4)+"$")+ ";";
-						desc += ")" + "L"+Type.getInternalName(Object.class)+ ";";
-					} else {
-						desc += ")" + "L"+resType+ ";";
-					}
-				}
-			}else {
-				desc += ")" + "L"+resultSet.resolveType(method.getReturnType()).resolvedType.acceptTV(new TypeToDescriptor())+ ";";
-			}
-		}
-//		desc = addReturnType(desc,method.getReturnType(), resultSet);
-		return desc;
-	}
-
-	@Override
-	public String visit(NormalConstructor constructor) {
-		String desc = "(";
-		Iterator<FormalParameter> itr = constructor.getParameterList().iterator();
-		while(itr.hasNext()) {
-			FormalParameter fp = itr.next();
-			if(constructor.hasGen()) {
-//				System.out.println("Cons has Gens");
-				String fpDesc = fp.getType().acceptTV(new TypeToDescriptor());
-//				System.out.println(fpDesc);
-				if(constructor.getGenericsAndBounds().containsKey(fpDesc)){
-					desc += "L"+constructor.getGenericsAndBounds().get(fpDesc)+ ";";
-				}else {
-					desc += "L"+resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor())+ ";";
-				}
-			}else {
-//				System.out.println("Cons has NOT Gens");
-				desc += "L"+resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor())+ ";";
-			}
-		}
-		desc = desc + ")V";
-		return desc;
-	}
-
-	@Override
-	public String visit(Lambda lambdaExpression) {
-		String desc = "(";
-		Iterator<FormalParameter> itr = lambdaExpression.getParams().iterator();
-		while(itr.hasNext()) {
-			FormalParameter fp = itr.next();
-			String d = resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor());
-			if(d.substring(0, 4).equals("TPH ") ||d.contains("<")) {
-				desc += "L"+Type.getInternalName(Object.class)+ ";";
-			}else {
-				desc = desc + "L"+ d + ";";
-			}
-		}
-		
-		String retType = resultSet.resolveType(lambdaExpression.getReturnType()).resolvedType.acceptTV(new TypeToDescriptor());
-		
-		if(retType.substring(0, 4).equals("TPH ")|| retType.contains("<")){
-			desc += ")L"+Type.getInternalName(Object.class)+ ";";
-		}else {
-			desc = desc + ")"+"L"+retType+";";
-		}
-		return desc;
-	}
-
-	@Override
-	public String visit(SamMethod samMethod) {
-		String desc = "(";
-		Iterator<RefTypeOrTPHOrWildcardOrGeneric> itr = samMethod.getArgumentList().iterator();
-		while(itr.hasNext()) {
-			RefTypeOrTPHOrWildcardOrGeneric rt = itr.next();
-			String d = resultSet.resolveType(rt).resolvedType.acceptTV(new TypeToDescriptor());
-			
-			if(d.substring(0, 4).equals("TPH ") ||d.contains("<")) {
-				desc += "L"+Type.getInternalName(Object.class)+ ";";
-			}else {
-				desc += "L"+ d + ";";
-				
-			}
-		}
-		String retType = resultSet.resolveType(samMethod.getReturnType()).resolvedType.acceptTV(new TypeToDescriptor());
-		
-		if(retType.substring(0, 4).equals("TPH ")|| retType.contains("<")){
-			desc += ")L"+Type.getInternalName(Object.class)+ ";";
-		}else {
-			desc = desc + ")"+"L"+retType+";";
-		}
-		return desc;
-	}
-
-	@Override
-	public String visit(MethodFromMethodCall methodFromMethodCall) {
-		String desc = "(";
-		for(Expression e : methodFromMethodCall.getArgList().getArguments()) {
-			String d = resultSet.resolveType(e.getType()).resolvedType.acceptTV(new TypeToDescriptor());
-			
-			if(d.substring(0, 4).equals("TPH ") ||d.contains("<")) {
-				desc += "L"+Type.getInternalName(Object.class)+ ";";
-			}else {
-				if(methodFromMethodCall.getGenericsAndBoundsMethod().containsKey(d)) {
-					desc += "L"+methodFromMethodCall.getGenericsAndBoundsMethod().get(d)+ ";";
-				}else if(methodFromMethodCall.getGenericsAndBounds().containsKey(d)) {
-					desc += "L"+methodFromMethodCall.getGenericsAndBounds().get(d)+ ";";
-				}else {
-					desc += "L"+resultSet.resolveType(e.getType()).resolvedType.acceptTV(new TypeToDescriptor())+ ";";
-				}
-			}
-			
-		}
-		String retType = resultSet.resolveType(methodFromMethodCall.getReturnType()).resolvedType.acceptTV(new TypeToDescriptor());
-		System.out.println("DescriptorToString retType = " + retType);
-		if(retType.equals("void")) {
-			desc += ")V";
-		}else if(retType.substring(0, 4).equals("TPH ")|| retType.contains("<")){
-			desc += ")L"+Type.getInternalName(Object.class)+ ";";
-		}else {
-			if(methodFromMethodCall.getGenericsAndBoundsMethod().containsKey(retType)) {
-				desc += ")L"+methodFromMethodCall.getGenericsAndBoundsMethod().get(retType)+ ";";
-			}else if(methodFromMethodCall.getGenericsAndBounds().containsKey(retType)){
-				desc += ")L"+methodFromMethodCall.getGenericsAndBounds().get(retType)+ ";";
-			}else {
-				desc += ")" + "L"+retType+ ";";
-			}
-		}
-//		desc = addReturnType(desc, methodFromMethodCall.getReturnType(), resultSet);
-		return desc;
-	}
-	
-}

src/de/dhbwstuttgart/bytecode/descriptor/DescriptorVisitor.java

@@ -1,15 +0,0 @@
-package de.dhbwstuttgart.bytecode.descriptor;
-
-import de.dhbwstuttgart.bytecode.utilities.Lambda;
-import de.dhbwstuttgart.bytecode.utilities.MethodFromMethodCall;
-import de.dhbwstuttgart.bytecode.utilities.NormalConstructor;
-import de.dhbwstuttgart.bytecode.utilities.NormalMethod;
-import de.dhbwstuttgart.bytecode.utilities.SamMethod;
-
-public interface DescriptorVisitor {
-	public String visit(NormalMethod method);
-	public String visit(NormalConstructor constructor);
-	public String visit(Lambda lambdaExpression);
-	public String visit(SamMethod samMethod);
-	public String visit(MethodFromMethodCall methodFromMethodCall);
-}

src/de/dhbwstuttgart/bytecode/descriptor/TypeToDescriptor.java

@@ -1,43 +0,0 @@
-package de.dhbwstuttgart.bytecode.descriptor;
-
-import de.dhbwstuttgart.exceptions.NotImplementedException;
-import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.syntaxtree.type.TypeVisitor;
-
-public class TypeToDescriptor implements TypeVisitor<String>{
-
-	@Override
-	public String visit(RefType refType) {
-		return refType.getName().toString().replace(".", "/");
-//		String t = refType.getName().toString().replace(".", "/");
-//		return t.equals("Fun1")?(t+"$$"):t;
-	}
-
-	@Override
-	public String visit(SuperWildcardType superWildcardType) {
-		System.out.println("\nWILDCARD ="+superWildcardType.getInnerType().toString().replace(".", "/"));
-		return superWildcardType.getInnerType().toString().replace(".", "/");
-		//throw new NotImplementedException();
-	}
-
-	@Override
-	public String visit(TypePlaceholder typePlaceholder) {
-		return typePlaceholder.toString().replace(".", "/");
-	}
-
-	@Override
-	public String visit(ExtendsWildcardType extendsWildcardType) {
-		System.out.println("\nWILDCARD extends ="+extendsWildcardType.getInnerType().toString().replace(".", "/"));
-		return extendsWildcardType.getInnerType().toString().replace(".", "/");
-		//throw new NotImplementedException();
-	}
-
-	@Override
-	public String visit(GenericRefType genericRefType) {
-		return genericRefType.getParsedName().replace(".", "/");
-	}
-}

src/de/dhbwstuttgart/bytecode/signature/Signature.java

@@ -1,456 +0,0 @@
-package de.dhbwstuttgart.bytecode.signature;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.objectweb.asm.Type;
-import org.objectweb.asm.signature.SignatureVisitor;
-import org.objectweb.asm.signature.SignatureWriter;
-
-import de.dhbwstuttgart.bytecode.descriptor.TypeToDescriptor;
-import de.dhbwstuttgart.bytecode.utilities.MethodAndTPH;
-import de.dhbwstuttgart.syntaxtree.AbstractASTWalker;
-import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
-import de.dhbwstuttgart.syntaxtree.Constructor;
-import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
-import de.dhbwstuttgart.syntaxtree.Method;
-import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.typeinference.result.GenericInsertPair;
-import de.dhbwstuttgart.typeinference.result.ResolvedType;
-import de.dhbwstuttgart.typeinference.result.ResultSet;
-
-public class Signature {
-	private ClassOrInterface classOrInterface;
-	private HashMap<String, String> genericsAndBounds;
-	private HashMap<String, String> genericsAndBoundsMethod;
-	private SignatureWriter sw;
-	private Constructor constructor;
-	private Method method;
-	private HashMap<String,RefTypeOrTPHOrWildcardOrGeneric> methodParamsAndTypes;
-	private ResultSet resultSet;
-	private ArrayList<GenericInsertPair> commonPairs;
-	private ArrayList<GenericInsertPair> methodPairs;
-	
-	public Signature(ClassOrInterface classOrInterface, HashMap<String, String> genericsAndBounds,ArrayList<GenericInsertPair> commonPairs) {
-		this.classOrInterface = classOrInterface;
-		this.genericsAndBounds = genericsAndBounds;
-		this.commonPairs = commonPairs;
-		sw = new SignatureWriter();
-		createSignatureForClassOrInterface();
-	}
-
-	public Signature(Constructor constructor, HashMap<String, String> genericsAndBounds, HashMap<String,RefTypeOrTPHOrWildcardOrGeneric> methodParamsAndTypes) {
-		this.constructor = constructor;
-		this.genericsAndBounds = genericsAndBounds;
-		this.methodParamsAndTypes = methodParamsAndTypes;
-		sw = new SignatureWriter();
-		createSignatureForConsOrMethod(this.constructor,true);
-	}
-
-	public Signature(Method method, HashMap<String, String> genericsAndBoundsMethod,HashMap<String, String> genericsAndBounds,
-			HashMap<String, RefTypeOrTPHOrWildcardOrGeneric> methodParamsAndTypes, ResultSet resultSet, ArrayList<GenericInsertPair> methodPairs) {
-		this.method = method;
-		this.genericsAndBoundsMethod = genericsAndBoundsMethod;
-		this.genericsAndBounds = genericsAndBounds;
-		this.methodParamsAndTypes = methodParamsAndTypes;
-		this.resultSet = resultSet;
-		this.methodPairs = methodPairs;
-		sw = new SignatureWriter();
-		createSignatureForConsOrMethod(this.method,false);
-	}
-	
-	public Signature(LambdaExpression lambdaExpression,int numberOfParams) {
-		sw = new SignatureWriter();
-		createSignatureForFunN(lambdaExpression, numberOfParams);
-	}
-
-	private void createSignatureForFunN(LambdaExpression lambdaExpression, int numberOfParams) {
-		
-//		sw.visitClassBound().visitEnd();
-		for(int i = 0;i<numberOfParams;i++) {
-			int j = i+1;
-			sw.visitFormalTypeParameter("T"+ j);
-			// getBounds von Params
-			sw.visitClassBound().visitClassType(Type.getInternalName(Object.class));
-			sw.visitClassBound().visitEnd();
-		}
-
-		sw.visitFormalTypeParameter("R");
-		// getBounds vom Return-Type
-		sw.visitClassBound().visitClassType(Type.getInternalName(Object.class));
-		sw.visitClassBound().visitEnd();
-		// TODO: prüfe ob Return-Type = void,
-		sw.visitSuperclass().visitClassType(Type.getInternalName(Object.class));;
-		sw.visitEnd();
-	}
-
-	/**
-	 * Creates signature for a method or constructor with @see {@link SignatureWriter}
-	 * Signature looks like: 
-	 * <typevaliables (K:Ljava/lang/Object "Bounds")>(params L.. OR T.. Or basistape)ReturnType
-	 * 
-	 * @param method method or constructor
-	 * @param isConstructor true if constructor
-	 */
-	private void createSignatureForConsOrMethod(Method method, boolean isConstructor) {
-		Iterator<? extends GenericTypeVar> itr = method.getGenerics().iterator();
-		// visits all formal type parameter and visits their bounds <T:...;B:...;...>
-		while(itr.hasNext()) {
-			GenericTypeVar g = itr.next();
-			getBoundsOfTypeVar(g,genericsAndBoundsMethod);
-		}
-		
-		// Wenn die RückgabeType eine TPH ist, wird als generic behandelt
-		// z.B: Type = TPH K => wird eine Formal Type Parameter K$ erzeugt und Bound = Object
-		String ret = resultSet.resolveType(method.getReturnType()).resolvedType.acceptTV(new TypeToSignature());
-		if(ret.substring(0,4).equals("TPH ")) {
-			String g = ret.substring(4,ret.length())+"$";
-			if(genericsAndBounds.containsKey(g)) {
-				genericsAndBoundsMethod.put(g, genericsAndBounds.get(g));
-			}else {
-				sw.visitFormalTypeParameter(g);
-				sw.visitClassBound().visitClassType(Type.getInternalName(Object.class));
-				genericsAndBoundsMethod.put(g, Type.getInternalName(Object.class));
-				sw.visitClassBound().visitEnd();
-			}
-		}
-		
-		if(ret.contains("<")) {
-			RefType ref = (RefType) resultSet.resolveType(method.getReturnType()).resolvedType;
-			if(hasTPHs(ref)) {
-				createSignatureForParameterizedType(ref);
-			}
-			
-		}
-		
-		// Parameters
-		for(String paramName : methodParamsAndTypes.keySet()) {
-			RefTypeOrTPHOrWildcardOrGeneric t = methodParamsAndTypes.get(paramName);
-			String pT = t.acceptTV(new TypeToSignature()); 
-			// S.o
-			if(pT.substring(0,4).equals("TPH ")) {
-				String gP = pT.substring(4,pT.length())+"$";
-				if(!genericsAndBounds.containsKey(gP) && !genericsAndBoundsMethod.containsKey(gP)) {
-					sw.visitFormalTypeParameter(gP);
-					String bound = Type.getInternalName(Object.class);
-					boolean isTypeVar = false;
-					for(GenericInsertPair pair : methodPairs) {
-						if(pT.substring(4).equals(pair.TA1.getName())) {
-							bound = pair.TA2.getName()+"$";
-							isTypeVar = true;
-							break;
-						}
-					}
-					
-					if(isTypeVar) {
-						sw.visitClassBound().visitTypeVariable(bound);
-					}else {
-						sw.visitClassBound().visitClassType(bound);
-						sw.visitClassBound().visitEnd();
-					}
-					
-					genericsAndBoundsMethod.put(gP, bound);
-				}
-			}
-			
-			if(pT.contains("<")) {
-				RefType ref = (RefType) methodParamsAndTypes.get(paramName);
-				if(hasTPHs(ref))
-					createSignatureForParameterizedType(ref);
-			}
-			
-			for(GenericInsertPair p:methodPairs) {
-				String name = p.TA1.getName()+"$";
-				if(!genericsAndBoundsMethod.containsKey(name)) {
-					sw.visitFormalTypeParameter(name);
-					sw.visitClassBound().visitTypeVariable(p.TA2.getName()+"$");
-					genericsAndBoundsMethod.put(name, p.TA2.getName()+"$");
-				}
-			}
-			
-			ArrayList<TypePlaceholder> types = new ArrayList<>();
-			ArrayList<TypePlaceholder> superTypes = new ArrayList<>();
-			
-			for(GenericInsertPair p : methodPairs) {
-				types.add(p.TA1);
-				superTypes.add(p.TA2);
-			}
-			
-			for(GenericInsertPair p : methodPairs) {
-				String name = p.TA2.getName()+"$";
-				if(!types.contains(p.TA2) && !genericsAndBoundsMethod.containsKey(name)) {
-					String bound = Type.getInternalName(Object.class);
-					sw.visitFormalTypeParameter(name);
-					sw.visitClassBound().visitClassType(bound);
-					genericsAndBoundsMethod.put(name, bound);
-					sw.visitClassBound().visitEnd();
-				}
-			}
-		}
-		
-		// visit each method-parameter to create the signature 
-		for(String paramName : methodParamsAndTypes.keySet()) {
-			RefTypeOrTPHOrWildcardOrGeneric t = methodParamsAndTypes.get(paramName);
-			// parameter type deswegen ist true
-			doVisitParamsOrReturn(t,true);
-		}
-		if(isConstructor) {
-			sw.visitReturnType().visitBaseType('V');
-		}else {
-			RefTypeOrTPHOrWildcardOrGeneric returnType = method.getReturnType();
-			// return type deswegen ist false
-			doVisitParamsOrReturn(returnType, false);
-		}
-//		sw.visitEnd();
-	}
-	
-	private void createSignatureForParameterizedType(RefType ref) {
-		ArrayList<GenericInsertPair> allPairs = getAllPairs(ref);
-		allPairs.addAll(methodPairs);
-		ArrayList<GenericInsertPair> simplifiedPairs = simplifyPairs(allPairs);
-		
-		HashMap<String, String> names = new HashMap<>();
-		
-		for(GenericInsertPair pair : simplifiedPairs) {
-			if(ref.getParaList().contains(pair.TA1)) {
-				String sub = pair.TA1.getName()+"$";
-				String superT = pair.TA2.getName()+"$";
-				names.put(sub, superT);
-			}
-		}
-		
-		for(String sub : names.keySet()) {
-			if(!genericsAndBoundsMethod.containsKey(sub) && !genericsAndBounds.containsKey(sub)) {
-				sw.visitFormalTypeParameter(sub);
-				String bound = names.get(sub);
-				sw.visitClassBound().visitTypeVariable(bound);
-				genericsAndBoundsMethod.put(sub, bound);
-			}
-		}
-		
-		for(String superT : names.values()) {
-			if(!names.containsKey(superT)) {
-				if(!genericsAndBoundsMethod.containsKey(superT) && !genericsAndBounds.containsKey(superT)) {
-					sw.visitFormalTypeParameter(superT);
-					sw.visitClassBound().visitClassType(Type.getInternalName(Object.class));
-					sw.visitClassBound().visitEnd();
-					genericsAndBoundsMethod.put(superT, Type.getInternalName(Object.class));
-				}
-			}
-		}
-		
-		for(RefTypeOrTPHOrWildcardOrGeneric p: ref.getParaList()) {
-			if(p instanceof TypePlaceholder) {
-				String name = ((TypePlaceholder) p).getName() + "$";
-				if(!genericsAndBoundsMethod.containsKey(name) && !genericsAndBounds.containsKey(name)) {
-					sw.visitFormalTypeParameter(name);
-					sw.visitClassBound().visitClassType(Type.getInternalName(Object.class));
-					sw.visitClassBound().visitEnd();
-					genericsAndBoundsMethod.put(name, Type.getInternalName(Object.class));
-				}
-			}
-		}
-	}
-
-	private ArrayList<GenericInsertPair> getAllPairs(RefType ref) {
-		final ArrayList<GenericInsertPair> res = new ArrayList<>();
-		for(RefTypeOrTPHOrWildcardOrGeneric p : ref.getParaList()) {
-			RefTypeOrTPHOrWildcardOrGeneric resolved = resultSet.resolveType(p).resolvedType;
-			if(resolved instanceof TypePlaceholder) {
-				resultSet.resolveType(p).additionalGenerics.forEach(ag ->{
-					if(!contains(res,ag)) {
-						res.add(ag);
-					}
-				});
-			}
-				
-		}
-		return res;
-	}
-	
-	private boolean contains(ArrayList<GenericInsertPair> pairs, GenericInsertPair genPair) {
-		for(int i=0; i<pairs.size();++i) {
-			GenericInsertPair p = pairs.get(i);
-			if(p.TA1.equals(genPair.TA1) && p.TA2.equals(genPair.TA2))
-				return true;
-		}
-		return false;
-	}
-	
-	private ArrayList<GenericInsertPair> simplifyPairs(ArrayList<GenericInsertPair> allPairs) {
-		ArrayList<GenericInsertPair> simplifiedPairs = new ArrayList<>();
-		
-		HashMap<TypePlaceholder, TypePlaceholder> subAndSuperTph = new HashMap<>();
-		for(GenericInsertPair p : allPairs) {
-			subAndSuperTph.put(p.TA1, p.TA2);
-		}
-		
-		subAndSuperTph.forEach((k,v)->System.out.println(k.getName() + " || " + v.getName()));
-		
-		int numOfVisitedPairs = 0;
-		for(TypePlaceholder subTph: subAndSuperTph.keySet()) {
-			
-			if(numOfVisitedPairs>=subAndSuperTph.size())
-				break;
-			
-			HashMap<Integer, TypePlaceholder> tphsInRel= new HashMap<>();
-			
-			tphsInRel.put(tphsInRel.size(), subTph);
-			TypePlaceholder superTph = subAndSuperTph.get(subTph);
-			tphsInRel.put(tphsInRel.size(), superTph);
-			
-			numOfVisitedPairs++;
-			
-			while(subAndSuperTph.containsKey(superTph)) {
-				superTph = subAndSuperTph.get(superTph);
-				tphsInRel.put(tphsInRel.size(), superTph);
-				numOfVisitedPairs++;
-			}
-			
-			// Subtype
-			TypePlaceholder subTphRes = tphsInRel.get(0);
-			// Die größte Supertype
-			TypePlaceholder superTphRes = tphsInRel.get(tphsInRel.size()-1);
-			
-			
-			while(subAndSuperTph.containsValue(subTphRes)) {
-				for(TypePlaceholder tph : subAndSuperTph.keySet()) {
-					if(subAndSuperTph.get(tph).equals(subTphRes)) {
-						subTphRes = tph;
-						break;
-					}
-				}
-				tphsInRel.put(0, subTphRes);
-				numOfVisitedPairs++;
-			}
-			
-			subTphRes = tphsInRel.get(0);
-			GenericInsertPair sPair = new GenericInsertPair(subTphRes, superTphRes);
-			simplifiedPairs.add(sPair);
-		}
-		return simplifiedPairs;
-	}
-	
-	private boolean hasTPHs(RefType ref) {
-		for(RefTypeOrTPHOrWildcardOrGeneric p : ref.getParaList()) {
-			if(resultSet.resolveType(p).resolvedType instanceof TypePlaceholder)
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Visits parameter type or return type with {@link SignatureVisitor} to create
-	 * the method signature
-	 * @param t type of parameter or return type
-	 * @param isParameterType true if t is type of parameter
-	 */
-	private void doVisitParamsOrReturn(RefTypeOrTPHOrWildcardOrGeneric t, boolean isParameterType) {
-		String type = t.acceptTV(new TypeToString());
-		SignatureVisitor sv;
-		if(isParameterType) {
-			 sv = sw.visitParameterType();
-		}
-		else {
-			sv = sw.visitReturnType();
-		}
-		switch (type) {
-		case "RT":
-			sv.visitClassType(t.acceptTV(new TypeToSignature()));
-			break;
-		case "GRT":
-			GenericRefType g = (GenericRefType) t;
-			sv.visitTypeVariable(g.acceptTV(new TypeToSignature()));
-			break;
-		case "TPH":
-			RefTypeOrTPHOrWildcardOrGeneric r = resultSet.resolveType(t).resolvedType;
-			// der Fall wenn die Type eine Interface ist, muss betrachtet werden
-			// Deswegen muss in ResutSet noch enthalten werden, ob die Type eine
-			// Interface oder eine Klasse ist.
-			if(!r.acceptTV(new TypeToSignature()).substring(0, 4).equals("TPH ")) {
-//				sv.visitInterface().visitClassType(r.acceptTV(new TypeToSignature()));
-				sv.visitClassType(r.acceptTV(new TypeToSignature()));
-			} else {
-				System.out.println(r.getClass()+" Signature TPH: "+r.acceptTV(new TypeToSignature()));
-				sv.visitTypeVariable(r.acceptTV(new TypeToSignature()).substring(4)+"$");
-			}
-			break;
-		default:
-			if(!isParameterType)
-				sv.visitBaseType('V');
-			break;
-		}
-	}
-	/**
-	 * Creates signature for class or interface with {@link SignatureWriter}
-	 * Signature looks like: 
-	 * <typevaliables (K:Ljava/lang/Object "Bounds")>superclass
-	 */
-	private void createSignatureForClassOrInterface() {
-		Iterator<GenericTypeVar> itr = classOrInterface.getGenerics().iterator();
-
-		while(itr.hasNext()) {
-			GenericTypeVar g = itr.next();
-			getBoundsOfTypeVar(g,genericsAndBounds);
-		}
-		if(!commonPairs.isEmpty()) {
-			ArrayList<TypePlaceholder> types = new ArrayList<>();
-			ArrayList<TypePlaceholder> superTypes = new ArrayList<>();
-			
-			for(GenericInsertPair p : commonPairs) {
-				types.add(p.TA1);
-				superTypes.add(p.TA2);
-			}
-			
-			for(GenericInsertPair p : commonPairs) {
-				String t = p.TA1.getName()+"$";
-				String bound = p.TA2.getName()+"$";
-				sw.visitFormalTypeParameter(t);
-				sw.visitClassBound().visitTypeVariable(bound);
-				genericsAndBounds.put(t, bound);
-			}
-			
-			for(GenericInsertPair p : commonPairs) {
-				if(!types.contains(p.TA2)) {
-					String t = p.TA2.getName()+"$";
-					String bound = Type.getInternalName(Object.class);
-					sw.visitFormalTypeParameter(t);
-					sw.visitClassBound().visitClassType(bound);
-					genericsAndBounds.put(t, bound);
-					sw.visitClassBound().visitEnd();
-				}
-			}
-		}
-		sw.visitSuperclass().visitClassType(classOrInterface.getSuperClass().acceptTV(new TypeToDescriptor()));;
-		sw.visitEnd();
-	}
-	/**
-	 * Get bounds of type variable
-	 * @param g type variable
-	 * @param genAndBounds 
-	 */
-	private void getBoundsOfTypeVar(GenericTypeVar g, HashMap<String, String> genAndBounds) {
-		sw.visitFormalTypeParameter(g.getName());
-		
-		Iterator<? extends RefTypeOrTPHOrWildcardOrGeneric> bItr = g.getBounds().iterator(); 
-		while(bItr.hasNext()) {
-			RefTypeOrTPHOrWildcardOrGeneric b =bItr.next();
-			String boundDesc = b.acceptTV(new TypeToDescriptor());
-//			System.out.println("GetBounds: " + boundDesc);
-			// Ensure that <...> extends java.lang.Object OR ...
-			sw.visitClassBound().visitClassType(boundDesc);
-			genAndBounds.put(g.getName(), boundDesc);
-		}
-		sw.visitClassBound().visitEnd();
-	}
-	
-	public String toString() {
-		return sw.toString();
-	}
-	
-}

src/de/dhbwstuttgart/bytecode/signature/TypeToSignature.java

@@ -1,60 +0,0 @@
-package de.dhbwstuttgart.bytecode.signature;
-
-import java.util.Iterator;
-
-import de.dhbwstuttgart.exceptions.NotImplementedException;
-import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.syntaxtree.type.TypeVisitor;
-
-public class TypeToSignature implements TypeVisitor<String> {
-
-	@Override
-	public String visit(RefType refType) {
-//		return refType.toString().replace(".", "/");
-		String params = "";
-        if(refType.getParaList().size()>0){
-            params += "<";
-            Iterator<RefTypeOrTPHOrWildcardOrGeneric> it = refType.getParaList().iterator();
-            while(it.hasNext()){
-                RefTypeOrTPHOrWildcardOrGeneric param = it.next();
-                if(param instanceof TypePlaceholder) {
-                		params += "T" + ((TypePlaceholder) param).getName() + "$";
-                } else {
-                		params += "L"+param.toString().replace(".", "/");
-                }
-                
-                if(it.hasNext())params += ";";
-            }
-            params += ";>";
-        }
-//        		String t = refType.getName().toString().replace(".", "/");
-//        		return t.equals("Fun1")?t+"$$"+params+";":t+params+";";
-        return refType.getName().toString().replace(".", "/") + params+";";
-	}
-
-	@Override
-	public String visit(SuperWildcardType superWildcardType) {
-		throw new NotImplementedException();
-	}
-
-	@Override
-	public String visit(TypePlaceholder typePlaceholder) {
-		return typePlaceholder.toString().replace(".", "/");
-	}
-
-	@Override
-	public String visit(ExtendsWildcardType extendsWildcardType) {
-		throw new NotImplementedException();
-	}
-
-	@Override
-	public String visit(GenericRefType genericRefType) {
-		return genericRefType.getParsedName().replace(".", "/");
-	}
-	
-}

src/de/dhbwstuttgart/bytecode/signature/TypeToString.java

@@ -1,38 +0,0 @@
-package de.dhbwstuttgart.bytecode.signature;
-
-import de.dhbwstuttgart.exceptions.NotImplementedException;
-import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.syntaxtree.type.TypeVisitor;
-
-public class TypeToString implements TypeVisitor<String>{
-
-	@Override
-	public String visit(RefType refType) {
-		return "RT";
-	}
-
-	@Override
-	public String visit(SuperWildcardType superWildcardType) {
-		throw new NotImplementedException();
-	}
-
-	@Override
-	public String visit(TypePlaceholder typePlaceholder) {
-		return "TPH";
-	}
-
-	@Override
-	public String visit(ExtendsWildcardType extendsWildcardType) {
-		throw new NotImplementedException();
-	}
-
-	@Override
-	public String visit(GenericRefType genericRefType) {
-		return "GRT";
-	}
-
-}

src/de/dhbwstuttgart/bytecode/utilities/KindOfLambda.java

@@ -1,198 +0,0 @@
-package de.dhbwstuttgart.bytecode.utilities;
-
-import de.dhbwstuttgart.exceptions.NotImplementedException;
-import de.dhbwstuttgart.syntaxtree.statement.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.statement.Literal;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-
-public class KindOfLambda implements StatementVisitor{
-	private boolean isInstanceCapturingLambda = false;
-	private List<RefTypeOrTPHOrWildcardOrGeneric> argumentList = new ArrayList<>();
-	
-	public KindOfLambda(LambdaExpression lambdaExpression) {
-		lambdaExpression.methodBody.accept(this);
-		
-	}
-	
-	public boolean isInstanceCapturingLambda() {
-		return this.isInstanceCapturingLambda;
-	}
-	
-	public List<RefTypeOrTPHOrWildcardOrGeneric> getArgumentList() {
-		return argumentList;
-	}
-	
-	@Override
-	public void visit(ArgumentList argumentList) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(LambdaExpression lambdaExpression) {
-		
-	}
-
-	@Override
-	public void visit(Assign assign) {
-		assign.rightSide.accept(this);
-	}
-
-	@Override
-	public void visit(BinaryExpr binary) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(Block block) {
-		for(Statement stmt : block.getStatements()) {
-			stmt.accept(this);
-		}
-	}
-
-	@Override
-	public void visit(CastExpr castExpr) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(EmptyStmt emptyStmt) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(FieldVar fieldVar) {
-		fieldVar.receiver.accept(this);
-	}
-
-	@Override
-	public void visit(ForStmt forStmt) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(IfStmt ifStmt) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(InstanceOf instanceOf) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(LocalVar localVar) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(LocalVarDecl localVarDecl) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(MethodCall methodCall) {
-		methodCall.receiver.accept(this);
-	}
-
-	@Override
-	public void visit(NewClass methodCall) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(NewArray newArray) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(ExpressionReceiver receiver) {
-		receiver.expr.accept(this);
-	}
-
-	@Override
-	public void visit(UnaryExpr unaryExpr) {
-		throw new NotImplementedException();
-	}
-
-	@Override
-	public void visit(Return aReturn) {
-		aReturn.retexpr.accept(this);
-	}
-
-	@Override
-	public void visit(ReturnVoid aReturn) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(StaticClassName staticClassName) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(Super aSuper) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(This aThis) {
-		this.isInstanceCapturingLambda = true;
-		this.argumentList.add(aThis.getType());
-	}
-
-	@Override
-	public void visit(WhileStmt whileStmt) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(DoStmt whileStmt) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(Literal literal) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(AssignToField assignLeftSide) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(AssignToLocal assignLeftSide) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void visit(SuperCall superCall) {
-		// TODO Auto-generated method stub
-		
-	}
-}

src/de/dhbwstuttgart/bytecode/utilities/Lambda.java

@@ -1,26 +0,0 @@
-package de.dhbwstuttgart.bytecode.utilities;
-
-import de.dhbwstuttgart.bytecode.descriptor.DescriptorVisitor;
-import de.dhbwstuttgart.syntaxtree.ParameterList;
-import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-
-public class Lambda {
-	private LambdaExpression lambdaExpression;
-	
-	public Lambda(LambdaExpression lambdaExpression) {
-		this.lambdaExpression = lambdaExpression;
-	}
-	
-	public ParameterList getParams() {
-		return lambdaExpression.params;
-	}
-	
-	public RefTypeOrTPHOrWildcardOrGeneric getReturnType() {
-		return lambdaExpression.getReturnType();
-	}
-	
-	public String accept(DescriptorVisitor descVisitor) {
-		return descVisitor.visit(this);
-	}
-}

src/de/dhbwstuttgart/bytecode/utilities/MethodAndTPH.java

@@ -1,29 +0,0 @@
-package de.dhbwstuttgart.bytecode.utilities;
-
-import java.util.ArrayList;
-
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.typeinference.result.GenericInsertPair;
-
-public class MethodAndTPH {
-	
-	private String name;
-	private final ArrayList<TypePlaceholder> tphs = new ArrayList<>();
-	private final ArrayList<GenericInsertPair> pairs = new ArrayList<>();
-
-	public MethodAndTPH(String name) {
-		this.name = name;
-	}
-
-	public ArrayList<TypePlaceholder> getTphs() {
-		return tphs;
-	}
-	
-	public ArrayList<GenericInsertPair> getPairs(){
-		return pairs;
-	}
-	
-	public String getName() {
-		return name;
-	}
-}

src/de/dhbwstuttgart/bytecode/utilities/MethodFromMethodCall.java

@@ -1,42 +0,0 @@
-package de.dhbwstuttgart.bytecode.utilities;
-
-import java.util.HashMap;
-
-import de.dhbwstuttgart.bytecode.descriptor.DescriptorVisitor;
-import de.dhbwstuttgart.syntaxtree.statement.ArgumentList;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-
-public class MethodFromMethodCall {
-	private ArgumentList argList;
-	private RefTypeOrTPHOrWildcardOrGeneric returnType;
-	private HashMap<String, String> genericsAndBoundsMethod;
-	private HashMap<String,String> genericsAndBounds;
-	
-	public MethodFromMethodCall(ArgumentList argList,RefTypeOrTPHOrWildcardOrGeneric returnType,
-			HashMap<String, String> genericsAndBoundsMethod,HashMap<String,String> genericsAndBounds) {
-		this.argList = argList;
-		this.returnType = returnType;
-		this.genericsAndBoundsMethod = genericsAndBoundsMethod;
-		this.genericsAndBounds = genericsAndBounds;
-	}
-	
-	public ArgumentList getArgList() {
-		return argList;
-	}
-
-	public RefTypeOrTPHOrWildcardOrGeneric getReturnType() {
-		return returnType;
-	}
-	
-	public HashMap<String, String> getGenericsAndBoundsMethod(){
-		return genericsAndBoundsMethod;
-	}
-	
-	public HashMap<String,String> getGenericsAndBounds(){
-		return genericsAndBounds;
-	}
-	
-	public String accept(DescriptorVisitor descVisitor) {
-		return descVisitor.visit(this);
-	}
-}

src/de/dhbwstuttgart/bytecode/utilities/NormalConstructor.java

@@ -1,40 +0,0 @@
-package de.dhbwstuttgart.bytecode.utilities;
-
-import java.util.HashMap;
-
-import de.dhbwstuttgart.bytecode.descriptor.DescriptorVisitor;
-import de.dhbwstuttgart.syntaxtree.Constructor;
-import de.dhbwstuttgart.syntaxtree.ParameterList;
-
-public class NormalConstructor {
-	private Constructor constructor;
-	private HashMap<String, String> genericsAndBounds;
-	private boolean hasGenerics;
-	
-	public NormalConstructor(Constructor constructor, boolean hasGenerics) {
-		this.constructor = constructor;
-		this.hasGenerics = hasGenerics;
-	}
-	
-	public NormalConstructor(Constructor constructor, HashMap<String, String> genericsAndBounds, boolean hasGenerics) {
-		this.constructor = constructor;
-		this.genericsAndBounds = genericsAndBounds;
-		this.hasGenerics = hasGenerics;
-	}
-
-	public HashMap<String, String> getGenericsAndBounds() {
-		return genericsAndBounds;
-	}
-
-	public boolean hasGen() {
-		return hasGenerics;
-	}
-
-	public ParameterList getParameterList() {
-		return constructor.getParameterList();
-	}
-	
-	public String accept(DescriptorVisitor descVisitor) {
-		return descVisitor.visit(this);
-	}
-}

src/de/dhbwstuttgart/bytecode/utilities/NormalMethod.java

@@ -1,56 +0,0 @@
-package de.dhbwstuttgart.bytecode.utilities;
-
-import java.util.HashMap;
-
-import de.dhbwstuttgart.bytecode.descriptor.DescriptorVisitor;
-import de.dhbwstuttgart.syntaxtree.Method;
-import de.dhbwstuttgart.syntaxtree.ParameterList;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-
-public class NormalMethod {
-	private Method method;
-	private HashMap<String, String> genericsAndBounds;
-	private HashMap<String, String> genericsAndBoundsMethod;
-	private boolean hasGenerics;
-	
-	public NormalMethod(Method method, boolean hasGenerics) {
-		this.method = method;
-		this.hasGenerics = hasGenerics;
-	}
-
-	public NormalMethod(Method method, HashMap<String, String> genericsAndBounds,
-			HashMap<String, String> genericsAndBoundsMethod,boolean hasGenerics) {
-		this.method = method;
-		this.genericsAndBounds = genericsAndBounds;
-		this.genericsAndBoundsMethod = genericsAndBoundsMethod;
-		this.hasGenerics = hasGenerics;
-	}
-
-	public Method getMethod() {
-		return method;
-	}
-	
-	public ParameterList getParameterList() {
-		return method.getParameterList();
-	}
-	
-	public HashMap<String, String> getGenericsAndBounds(){
-		return genericsAndBounds;
-	}
-	
-	public HashMap<String, String> getGenericsAndBoundsMethod(){
-		return genericsAndBoundsMethod;
-	}
-	
-	public RefTypeOrTPHOrWildcardOrGeneric getReturnType() {
-		return method.getReturnType();
-	}
-	
-	public boolean hasGen() {
-		return this.hasGenerics;
-	}
-	
-	public String accept(DescriptorVisitor descVisitor) {
-		return descVisitor.visit(this);
-	}
-}

src/de/dhbwstuttgart/bytecode/utilities/SamMethod.java

@@ -1,32 +0,0 @@
-package de.dhbwstuttgart.bytecode.utilities;
-
-import java.util.List;
-
-import de.dhbwstuttgart.bytecode.descriptor.DescriptorVisitor;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-
-public class SamMethod {
-	private List<RefTypeOrTPHOrWildcardOrGeneric> argumentList;
-	private RefTypeOrTPHOrWildcardOrGeneric returnType;
-	
-	public SamMethod(List<RefTypeOrTPHOrWildcardOrGeneric> argumentList, RefTypeOrTPHOrWildcardOrGeneric returnType) {
-		this.argumentList = argumentList;
-		this.returnType = returnType;
-	}
-	
-	public List<RefTypeOrTPHOrWildcardOrGeneric> getArgumentList() {
-		return argumentList;
-	}
-
-
-
-	public RefTypeOrTPHOrWildcardOrGeneric getReturnType() {
-		return returnType;
-	}
-
-
-
-	public String accept(DescriptorVisitor descVisitor) {
-		return descVisitor.visit(this);
-	}
-}

src/de/dhbwstuttgart/core/ConsoleInterface.java

@@ -3,14 +3,16 @@ package de.dhbwstuttgart.core;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
-import java.util.stream.Collectors;
 
 public class ConsoleInterface {
 	private static final String directory = System.getProperty("user.dir");
 
 	public static void main(String[] args) throws IOException, ClassNotFoundException {
-		List<File> input = Arrays.asList(args).stream().map((s -> new File(s))).collect(Collectors.toList());
-		JavaTXCompiler compiler = new JavaTXCompiler(input);
+
+		JavaTXCompiler compiler = new JavaTXCompiler();
+		for(String arg : Arrays.asList(args)){
+			compiler.parse(new File(arg));
+		}
 		compiler.typeInference();
 	}
 }

src/de/dhbwstuttgart/core/JavaTXCompiler.java

@@ -1,268 +1,78 @@
 package de.dhbwstuttgart.core;
 
-
-import de.dhbwstuttgart.bytecode.BytecodeGen;
-import de.dhbwstuttgart.environment.CompilationEnvironment;
 import de.dhbwstuttgart.parser.JavaTXParser;
-import de.dhbwstuttgart.parser.NullToken;
-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.ParameterList;
 import de.dhbwstuttgart.syntaxtree.SourceFile;
-import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
 import de.dhbwstuttgart.syntaxtree.factory.UnifyTypeFactory;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.syntaxtree.visual.ASTTypePrinter;
 import de.dhbwstuttgart.typeinference.constraints.Constraint;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.constraints.Pair;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
 import de.dhbwstuttgart.typeinference.typeAlgo.TYPE;
-import de.dhbwstuttgart.typeinference.unify.RuleSet;
 import de.dhbwstuttgart.typeinference.unify.TypeUnify;
-import de.dhbwstuttgart.typeinference.unify.distributeVariance;
 import de.dhbwstuttgart.typeinference.unify.model.FiniteClosure;
-import de.dhbwstuttgart.typeinference.unify.model.PlaceholderType;
 import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
 
 import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 public class JavaTXCompiler {
 
-    final CompilationEnvironment environment;
-    public final Map<File, SourceFile> sourceFiles = new HashMap<>();
-    Boolean log = true; //gibt an ob ein Log-File nach System.getProperty("user.dir")+"/test/logFiles/log" geschrieben werden soll?
+    protected List<SourceFile> sourceFiles = new ArrayList<>();
 
-    public JavaTXCompiler(File sourceFile) throws IOException, ClassNotFoundException {
-        this(Arrays.asList(sourceFile));
-    }
-
-    public JavaTXCompiler(File sourceFile, Boolean log) throws IOException, ClassNotFoundException {
-    	this(sourceFile);
-    	this.log = log;
-    }
-    
-    public JavaTXCompiler(List<File> sources) throws IOException, ClassNotFoundException {
-        environment = new CompilationEnvironment(sources);
-        for (File s : sources) {
-            sourceFiles.put(s, parse(s));
-        }
-    }
-
-    public ConstraintSet<Pair> getConstraints() throws ClassNotFoundException {
-        List<ClassOrInterface> allClasses = new ArrayList<>();//environment.getAllAvailableClasses();
-        for (SourceFile sf : sourceFiles.values()) {
+    public List<ResultSet> typeInference(){
+        List<ClassOrInterface> allClasses = new ArrayList<>();
+        for(SourceFile sf : sourceFiles){
             allClasses.addAll(sf.getClasses());
         }
-        List<ClassOrInterface> importedClasses = new ArrayList<>();
-        //Alle Importierten Klassen in allen geparsten Sourcefiles kommen ins FC
-        for (File forSourceFile : sourceFiles.keySet())
-            for (JavaClassName name : sourceFiles.get(forSourceFile).getImports()) {
-                //TODO: Hier werden imports von eigenen (.jav) Klassen nicht beachtet
-                ClassOrInterface importedClass = ASTFactory.createClass(
-                        ClassLoader.getSystemClassLoader().loadClass(name.toString()));
-                importedClasses.add(importedClass);
-            }
-        allClasses.addAll(importedClasses);
-
-        return new TYPE(sourceFiles.values(), allClasses).getConstraints();
-    }
-
-    public List<ClassOrInterface> getAvailableClasses(SourceFile forSourceFile) throws ClassNotFoundException {
-        List<ClassOrInterface> allClasses = new ArrayList<>();//environment.getAllAvailableClasses();
-        for (SourceFile sf : sourceFiles.values()) {
-            allClasses.addAll(sf.getClasses());
-        }
-        List<ClassOrInterface> importedClasses = new ArrayList<>();
-        for (JavaClassName name : forSourceFile.getImports()) {
-            //TODO: Hier werden imports von eigenen (.jav) Klassen nicht beachtet
-            ClassOrInterface importedClass = ASTFactory.createClass(
-                    ClassLoader.getSystemClassLoader().loadClass(name.toString()));
-            importedClasses.add(importedClass);
-            allClasses.addAll(importedClasses);
-        }
-        return allClasses;
-    }
-
-    public List<ResultSet> typeInference() throws ClassNotFoundException {
-        List<ClassOrInterface> allClasses = new ArrayList<>();//environment.getAllAvailableClasses();
-        //Alle Importierten Klassen in allen geparsten Sourcefiles kommen ins FC
-        for(SourceFile sf : this.sourceFiles.values()) {
-            allClasses.addAll(getAvailableClasses(sf));
-            allClasses.addAll(sf.getClasses());
-        }
-
-        final ConstraintSet<Pair> cons = getConstraints();
-
         FiniteClosure finiteClosure = UnifyTypeFactory.generateFC(allClasses);
-        System.out.println(finiteClosure);
+        final ConstraintSet<Pair> cons = new TYPE(sourceFiles).getConstraints();
         ConstraintSet<UnifyPair> unifyCons = UnifyTypeFactory.convert(cons);
 
         TypeUnify unify = new TypeUnify();
         Set<Set<UnifyPair>> results = new HashSet<>();
-        try {
-			FileWriter logFile = new FileWriter(new File(System.getProperty("user.dir")+"/test/logFiles/"+"log"));
-			logFile.write("FC:\\" + finiteClosure.toString()+"\n");
-			for(SourceFile sf : this.sourceFiles.values()) {
-				logFile.write(ASTTypePrinter.print(sf));
-			}
-			logFile.flush();
-			Set<List<Constraint<UnifyPair>>> cardProd = unifyCons.cartesianProduct(); 
-			for (List<Constraint<UnifyPair>> xCons : cardProd ){
-				Set<UnifyPair> xConsSet = new HashSet<>();
-				for (Constraint<UnifyPair> constraint : xCons) {
-					xConsSet.addAll(constraint);
-				}
-				//.collect(Collectors.toCollection(ArrayList::new))))
-				System.out.println(xConsSet);
-				Set<String> paraTypeVarNames = allClasses.stream().map(x -> x.getMethods().stream().map(y -> y.getParameterList().getFormalparalist()
-						.stream().filter(z -> z.getType() instanceof TypePlaceholder)
-						.map(z -> ((TypePlaceholder)z.getType()).getName()).collect(Collectors.toCollection(HashSet::new)))
-						.reduce(new HashSet<String>(), (a,b) -> { a.addAll(b); return a;}, (a,b) -> { a.addAll(b); return a;} )  )
-						.reduce(new HashSet<String>(), (a,b) -> { a.addAll(b); return a;} );
-				
-				Set<String> returnTypeVarNames = allClasses.stream().map(x -> x.getMethods().stream().filter(y -> y.getReturnType() instanceof TypePlaceholder)
-						.map(z -> ((TypePlaceholder)z.getReturnType()).getName()).collect(Collectors.toCollection(HashSet::new))).reduce((a,b) -> { a.addAll(b); return a;} ).get();
-				
-				
-				xConsSet = xConsSet.stream().map(x -> { 
-					//Hier muss ueberlegt werden, ob
-					//1. alle Argument- und Retuntyp-Variablen in allen UnifyPairs 
-					//   mit disableWildcardtable() werden.
-					//2. alle Typvariablen mit Argument- oder Retuntyp-Variablen 
-					//in Beziehung auch auf disableWildcardtable() gesetzt werden muessen
-					//PL 2018-04-23
-					if ((x.getLhsType() instanceof PlaceholderType)) {
-						if (paraTypeVarNames.contains(x.getLhsType().getName())) { 
-							((PlaceholderType)x.getLhsType()).setVariance((byte)1);
-							((PlaceholderType)x.getLhsType()).disableWildcardtable();
-						}
-						if (returnTypeVarNames.contains(x.getLhsType().getName())) {
-							((PlaceholderType)x.getLhsType()).setVariance((byte)-1);
-							((PlaceholderType)x.getLhsType()).disableWildcardtable();
-						}
-					}
-					if ((x.getRhsType() instanceof PlaceholderType)) {
-						if (paraTypeVarNames.contains(x.getRhsType().getName())) {
-							((PlaceholderType)x.getRhsType()).setVariance((byte)1);
-							((PlaceholderType)x.getRhsType()).disableWildcardtable();
-						}
-						if (returnTypeVarNames.contains(x.getRhsType().getName())) {
-							((PlaceholderType)x.getRhsType()).setVariance((byte)-1);
-							((PlaceholderType)x.getRhsType()).disableWildcardtable();
-						}	
-					}
-					return x;//HIER DIE JEWEILS RECHT BZW. LINKE SEITE AUF GLEICHE VARIANZ SETZEN WIE DIE JEWEILS ANDERE SEITE 
-				}).map( y -> { 
-						if ((y.getLhsType() instanceof PlaceholderType) && (y.getRhsType() instanceof PlaceholderType)) {
-							if (((PlaceholderType)y.getLhsType()).getVariance() != 0  && ((PlaceholderType)y.getRhsType()).getVariance() == 0) { 
-								((PlaceholderType)y.getRhsType()).setVariance(((PlaceholderType)y.getLhsType()).getVariance()); 
-							} 
-							if (((PlaceholderType)y.getLhsType()).getVariance() == 0  && ((PlaceholderType)y.getRhsType()).getVariance() != 0) { 
-								((PlaceholderType)y.getLhsType()).setVariance(((PlaceholderType)y.getRhsType()).getVariance()); 
-							} 
-						}
-					return y; } )
-				.collect(Collectors.toCollection(HashSet::new));
-					varianceInheritance(xConsSet);
-    				Set<Set<UnifyPair>> result = unify.unifySequential(xConsSet, finiteClosure, logFile, log);
-    				//Set<Set<UnifyPair>> result = unify.unify(xConsSet, finiteClosure);
-    				System.out.println("RESULT: " + result);
-    				logFile.write("RES: " + result.toString()+"\n");
-    				logFile.flush();
-    				results.addAll(result);
-            	}
-        	}
-    		catch (IOException e) { }
-			
-		return results.stream().map((unifyPairs ->
-               new ResultSet(UnifyTypeFactory.convert(unifyPairs, generateTPHMap(cons))))).collect(Collectors.toList());
-        }
-    
-    /**
-	 * Vererbt alle Variancen
-	 * @param eq The set of constraints
-	 */
-	private void varianceInheritance(Set<UnifyPair> eq) {
-		Set<PlaceholderType> usedTPH = new HashSet<>();
-		Set<PlaceholderType> phSet = eq.stream().map(x -> { 
-			Set<PlaceholderType> pair = new HashSet<>();
-			if (x.getLhsType() instanceof PlaceholderType) pair.add((PlaceholderType)x.getLhsType());
-			if (x.getRhsType() instanceof PlaceholderType) pair.add((PlaceholderType)x.getRhsType());
-			return pair;
-		}).reduce(new HashSet<>(), (a,b) -> { a.addAll(b); return a;} , (c,d) -> { c.addAll(d); return c;});
-		
-		ArrayList<PlaceholderType> phSetVariance =  new ArrayList<>(phSet);
-		phSetVariance.removeIf(x -> (x.getVariance() == 0));
-		while(!phSetVariance.isEmpty()) {
-			PlaceholderType a = phSetVariance.remove(0);
-			usedTPH.add(a);
-			//HashMap<PlaceholderType,Integer> ht = new HashMap<>();
-			//ht.put(a, a.getVariance());
-			Set<UnifyPair> eq1 = new HashSet<>(eq); 
-			eq1.removeIf(x -> !(x.getLhsType() instanceof PlaceholderType && ((PlaceholderType)x.getLhsType()).equals(a)));
-			eq1.stream().forEach(x -> { x.getRhsType().accept(new distributeVariance(), a.getVariance());});
-			eq1 = new HashSet<>(eq); 
-			eq1.removeIf(x -> !(x.getRhsType() instanceof PlaceholderType && ((PlaceholderType)x.getRhsType()).equals(a)));
-			eq1.stream().forEach(x -> { x.getLhsType().accept(new distributeVariance(), a.getVariance());});
-			phSetVariance =  new ArrayList<>(phSet);
-			phSetVariance.removeIf(x -> (x.getVariance() == 0 || usedTPH.contains(x)));
-		}		
-}
-
-    private Map<String, TypePlaceholder> generateTPHMap(ConstraintSet<Pair> constraints) {
-        HashMap<String, TypePlaceholder> ret = new HashMap<>();
-        constraints.map((Pair p) -> {
-            if (p.TA1 instanceof TypePlaceholder) {
-                ret.put(((TypePlaceholder) p.TA1).getName(), (TypePlaceholder) p.TA1);
+        for(List<Constraint<UnifyPair>> xCons : unifyCons.cartesianProduct()){
+            Set<UnifyPair> xConsSet = new HashSet<>();
+            for(Constraint<UnifyPair> constraint : xCons){
+                xConsSet.addAll(constraint);
             }
-            if (p.TA2 instanceof TypePlaceholder) {
-                ret.put(((TypePlaceholder) p.TA2).getName(), (TypePlaceholder) p.TA2);
+
+            System.out.println(xConsSet);
+            Set<Set<UnifyPair>> result = unify.unify(xConsSet, finiteClosure);
+            System.out.println("RESULT: " + result);
+            results.addAll(result);
+        }
+        return results.stream().map((unifyPairs ->
+                new ResultSet(UnifyTypeFactory.convert(unifyPairs, generateTPHMap(cons))))).collect(Collectors.toList());
+        }
+
+    private Map<String, TypePlaceholder> generateTPHMap(ConstraintSet<Pair> constraints){
+        HashMap<String, TypePlaceholder> ret = new HashMap<>();
+        constraints.map((Pair p)->{
+            if(p.TA1 instanceof TypePlaceholder){
+                ret.put(((TypePlaceholder)p.TA1).getName(), (TypePlaceholder) p.TA1);
+            }
+            if(p.TA2 instanceof TypePlaceholder){
+                ret.put(((TypePlaceholder)p.TA2).getName(), (TypePlaceholder) p.TA2);
             }
             return null;
         });
         return ret;
     }
 
-    private SourceFile parse(File sourceFile) throws IOException, java.lang.ClassNotFoundException {
-        CompilationUnitContext tree = JavaTXParser.parse(sourceFile);
-        SyntaxTreeGenerator generator = new SyntaxTreeGenerator(environment.getRegistry(sourceFile), new GenericsRegistry(null));
-        SourceFile ret = generator.convert(tree, environment.packageCrawler);
+    public SourceFile parse(File sourceFile) throws IOException, java.lang.ClassNotFoundException {
+        SourceFile ret = new JavaTXParser().parse(sourceFile);
+        sourceFiles.add(ret);
         return ret;
     }
-    // um pfad erweitern
-    public void generateBytecode(String path) throws ClassNotFoundException, IOException {
-    		for(File f : sourceFiles.keySet()) {
-    			HashMap<String,byte[]> classFiles = new HashMap<>();
-    			SourceFile sf = sourceFiles.get(f);
-    			List<ResultSet> typeinferenceResult = this.typeInference();
-    			BytecodeGen bytecodeGen = new BytecodeGen(classFiles,typeinferenceResult,path);
-//    			BytecodeGen bytecodeGen = new BytecodeGen(classFiles,typeinferenceResult.get(0));
-        		bytecodeGen.visit(sf);
-        		this.writeClassFile(bytecodeGen.getClassFiles(), path);
-    		}
+
+    public SourceFile parse(String source) throws IOException, java.lang.ClassNotFoundException {
+        SourceFile ret = new JavaTXParser().parse(source);
+        sourceFiles.add(ret);
+        return ret;
     }
 
-	private void writeClassFile(HashMap<String, byte[]> classFiles, String path) throws IOException {
-		FileOutputStream output;
-		for(String name : classFiles.keySet()) {
-			byte[] bytecode = classFiles.get(name);
-			System.out.println("generating "+name+ ".class file ...");
-			//output = new FileOutputStream(new File(System.getProperty("user.dir") + "/testBytecode/generatedBC/" +name+".class"));
-			output = new FileOutputStream(new File(path +name+".class"));
-			output.write(bytecode);
-			output.close();
-			System.out.println(name+".class file generated");
-		}
-	}
 }

src/de/dhbwstuttgart/environment/CompilationEnvironment.java

@@ -1,85 +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.*;
-
-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;
-	public final PackageCrawler packageCrawler;
-
-	/**
-	 * 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) {
-		/**
-		 * Java 9 bringt einige Änderungen am Classloader
-		 * So funktioniert der BootClassLoader nicht mehr.
-		 * hier gibts ein paar Quellen zum nachlesen:
-		 * http://java9.wtf/class-loading/
-		 * https://stackoverflow.com/questions/46494112/classloaders-hierarchy-in-java-9
-		 *
-		 */
-		//String bootClassPath = System.getProperty("sun.boot.class.path");
-		//		ClassLoader cl = ClassLoader.getPlatformClassLoader();
-				ClassLoader cl = ClassLoader.getSystemClassLoader();
-				String bootClassPath = System.getProperty("java.class.path");
-		librarys = new ArrayList<>();
-		for(String path : bootClassPath.split(File.pathSeparator)) {
-				   try {
-							   librarys.add(new URL("file:"+path));
-							   } catch (MalformedURLException e) {
-									   new DebugException("Fehler im Classpath auf diesem System");
-							   }
-			}
-		//URLClassLoader loader = new URLClassLoader(new URL[0], cl);
-		//librarys = Arrays.asList(loader.getURLs());
-
-		this.sourceFiles = sourceFiles;
-        this.packageCrawler = new PackageCrawler(librarys);
-	}
-
-	public JavaClassRegistry getRegistry(File forSourceFile) throws ClassNotFoundException, IOException {
-		Map<String, Integer> allNames;
-		CompilationUnitContext tree = JavaTXParser.parse(forSourceFile);
-		allNames = GatherNames.getNames(tree, packageCrawler);
-		return new JavaClassRegistry(allNames);
-	}
-
-	public List<ClassOrInterface> getAllAvailableClasses() {
-		List<ClassOrInterface> ret = new ArrayList<>();
-		for(Class c : new PackageCrawler(librarys).getAllAvailableClasses()){
-			ret.add(ASTFactory.createClass(c));
-		}
-		return ret;
-	}
-
-}

src/de/dhbwstuttgart/environment/PackageCrawler.java

@@ -1,77 +0,0 @@
-package de.dhbwstuttgart.environment;
-
-import java.net.URL;
-import java.util.*;
-
-import org.reflections.Reflections;
-import org.reflections.scanners.ResourcesScanner;
-import org.reflections.scanners.SubTypesScanner;
-import org.reflections.util.ConfigurationBuilder;
-import org.reflections.util.FilterBuilder;
-
-import de.dhbwstuttgart.parser.scope.JavaClassName;
-import org.reflections.vfs.SystemDir;
-
-/**
- * Hilft beim Durchsuchen von Packages
- * Benutzt die Reflections-Library (https://github.com/ronmamo/reflections)
- * Hilfe dazu: http://stackoverflow.com/a/9571146
- */
-public class PackageCrawler {
-
-	final URL[] urls;
-	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)
-                .filterInputsBy(new FilterBuilder().include(FilterBuilder.prefix(packageName))));
-
-        Set<Class<?>> classes = reflections.getSubTypesOf(Object.class);
-
-        return classes;
-    }
-
-    public Set<Class<?>> getAllAvailableClasses(){
-        Reflections reflections = new Reflections(new ConfigurationBuilder()
-                .setScanners(new SubTypesScanner(false /* don't exclude Object.class */), new ResourcesScanner())
-                .setUrls(urls));
-
-        Set<Class<?>> classes = reflections.getSubTypesOf(Object.class);
-
-        return classes;
-    }
-
-  public Map<String, Integer> getClassNames(String packageName){
-      Map<String, Integer> nameList = new HashMap<>();
-    Set<Class<?>> classes = getClassesInPackage(packageName);
-      if(packageName.equals("java.lang") && ! classes.contains(Object.class)) {
-        classes.add(Object.class);
-      }
-    for(Class c : classes){
-      nameList.put(c.getName(), c.getTypeParameters().length);
-    }
-    return nameList;
-  }
-}

src/de/dhbwstuttgart/parser/JavaTXParser.java

@@ -1,12 +1,10 @@
 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;
 
@@ -15,23 +13,26 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
-public class JavaTXParser {	
-    public static Java8Parser.CompilationUnitContext parse(File source) throws IOException, java.lang.ClassNotFoundException {
-        InputStream stream = new FileInputStream(source);
+public class JavaTXParser {
+    public SourceFile parse(InputStream source) throws IOException, java.lang.ClassNotFoundException {
+        InputStream stream = source;//new FileInputStream(sourceFile);
         ANTLRInputStream input = new ANTLRInputStream(stream);
         Java8Lexer lexer = new Java8Lexer(input);
         CommonTokenStream tokens = new CommonTokenStream(lexer);
         Java8Parser parser = new Java8Parser(tokens);
-        return parser.compilationUnit();
-        /*
-        SyntaxTreeGenerator generator = new SyntaxTreeGenerator(environment.getRegistry(source));
+        Java8Parser.CompilationUnitContext tree = parser.compilationUnit();
+        
+        JavaClassRegistry reg = new JavaClassRegistry(new ArrayList<>());
+        reg.addPackage("java.lang");
+        SyntaxTreeGenerator generator = new SyntaxTreeGenerator(reg);
         return generator.convert(tree);
-        */
     }
-    
-    /* Für das Typsystem ist es notwendig, dass sich der Source in einer Datei befindet:
+
+    public SourceFile parse(File file) throws IOException, java.lang.ClassNotFoundException {
+        return this.parse(new FileInputStream(file));
+    }
+
     public SourceFile parse(String fileContent) throws IOException, java.lang.ClassNotFoundException {
         return this.parse(new ByteArrayInputStream(fileContent.getBytes(StandardCharsets.UTF_8)));
     }
-    */
 }

src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/FCGenerator.java

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

src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/GenericContext.java

@@ -1,10 +1,10 @@
 package de.dhbwstuttgart.parser.SyntaxTreeGenerator;
 
-import de.dhbwstuttgart.parser.scope.JavaClassName;
+import de.dhbwstuttgart.typecheck.JavaClassName;
 
 public class GenericContext {
-    private final String parentMethod;
-    private final JavaClassName parentClass;
+    public final String parentMethod;
+    public final JavaClassName parentClass;
 
     public GenericContext(JavaClassName parentClass, String parentMethod) {
         if(parentMethod == null)parentMethod = "";

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> {
+
+}

src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java

@@ -1,18 +1,17 @@
 package de.dhbwstuttgart.parser.SyntaxTreeGenerator;
 
+import com.sun.javafx.fxml.expression.UnaryExpression;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.parser.antlr.Java8Parser;
-import de.dhbwstuttgart.parser.scope.GenericsRegistry;
-import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
 import de.dhbwstuttgart.syntaxtree.*;
 import de.dhbwstuttgart.syntaxtree.statement.*;
-import de.dhbwstuttgart.syntaxtree.statement.UnaryExpr.Operation;
+import de.dhbwstuttgart.syntaxtree.statement.literal.*;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 import de.dhbwstuttgart.syntaxtree.type.Void;
-
+import de.dhbwstuttgart.typecheck.JavaClassRegistry;
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
@@ -23,7 +22,6 @@ public class StatementGenerator {
     private JavaClassRegistry reg;
     private Map<String, RefTypeOrTPHOrWildcardOrGeneric> localVars;
     private GenericsRegistry generics;
-    private String VAR_KEYWORD = "var";
 
     public StatementGenerator(JavaClassRegistry reg, GenericsRegistry generics, Map<String, RefTypeOrTPHOrWildcardOrGeneric> localVars){
         this.reg = reg;
@@ -95,7 +93,7 @@ public class StatementGenerator {
 
     private Statement convert(Java8Parser.StatementWithoutTrailingSubstatementContext stmt) {
         if(stmt.block() != null){
-            return convert(stmt.block(), false);
+            return convert(stmt.block());
         }else if(stmt.emptyStatement() != null){
             return new EmptyStmt(stmt.getStart());
         }else if(stmt.expressionStatement() != null){
@@ -121,14 +119,14 @@ public class StatementGenerator {
         }else throw new NotImplementedException();
     }
 
-    public Block convert(Java8Parser.BlockContext block, boolean addTrailingReturn) {
+    public Block convert(Java8Parser.BlockContext block) {
         List<Statement> statements = new ArrayList<>();
         if(block.blockStatements() != null)
             for(Java8Parser.BlockStatementContext statementContext : block.blockStatements().blockStatement()){
                 List<Statement> stmt = convert(statementContext);
                 statements.addAll(stmt);
             }
-        if(addTrailingReturn)statements = SyntacticSugar.addTrailingReturn(statements);
+        statements = SyntacticSugar.addTrailingReturn(statements);
         return new Block(statements, block.getStart());
     }
 
@@ -179,14 +177,6 @@ public class StatementGenerator {
         }else throw new NotImplementedException();
     }
 
-    public Receiver getReceiver(Expression expr){
-        if(expr instanceof StaticClassName){
-            return (Receiver) expr;
-        }else {
-            return new ExpressionReceiver(expr);
-        }
-    }
-
     private Statement convert(Java8Parser.MethodInvocationContext methodInvocationContext) {
         String name;
         if(methodInvocationContext.methodName()!=null){
@@ -208,7 +198,7 @@ public class StatementGenerator {
         }else throw new NotImplementedException();
 
         ArgumentList argumentList = convert(methodInvocationContext.argumentList());
-        MethodCall ret = new MethodCall(TypePlaceholder.fresh(methodInvocationContext.getStart()), getReceiver(receiver), name, argumentList, methodInvocationContext.getStart());
+        MethodCall ret = new MethodCall(TypePlaceholder.fresh(methodInvocationContext.getStart()),new Receiver(receiver), name, argumentList, methodInvocationContext.getStart());
         return ret;
     }
 
@@ -277,26 +267,21 @@ public class StatementGenerator {
         //TODO
         throw new NotImplementedException();
     }
-
+    //TODO Felix_K
     private Statement convert(Java8Parser.PreIncrementExpressionContext stmt) {
-    		Expression argument = convert(stmt.unaryExpression());
-    		Token offset = stmt.getStart();
-    		return new UnaryExpr(UnaryExpr.Operation.PREINCREMENT, argument, TypePlaceholder.fresh(offset), offset);
+        return new PreIncExpr(convert(stmt.unaryExpression()),stmt.getStart());
     }
-
-	private Statement convert(Java8Parser.PreDecrementExpressionContext stmt) {
-		return new UnaryExpr(UnaryExpr.Operation.PREDECREMENT, convert(stmt.unaryExpression()),
-                TypePlaceholder.fresh(stmt.getStart()), stmt.getStart());
+    //TODO Felix_K
+    private Statement convert(Java8Parser.PreDecrementExpressionContext stmt) {
+        return new PreDecExpr(convert(stmt.unaryExpression()),stmt.getStart());
     }
-
+    //TODO Felix_K
     private Statement convert(Java8Parser.PostIncrementExpressionContext stmt) {
-        return new UnaryExpr(UnaryExpr.Operation.POSTINCREMENT, convert(stmt.postfixExpression()),
-                TypePlaceholder.fresh(stmt.getStart()), stmt.getStart());
+        return new PostIncExpr(convert(stmt.postfixExpression()));
     }
-
+    //TODO Felix_K
     private Statement convert(Java8Parser.PostDecrementExpressionContext stmt) {
-    		return new UnaryExpr(UnaryExpr.Operation.POSTDECREMENT, convert(stmt.postfixExpression()),
-                TypePlaceholder.fresh(stmt.getStart()), stmt.getStart());
+        return new PostDecExpr(convert(stmt.postfixExpression()));
     }
 
     private Statement convert(Java8Parser.AssignmentContext stmt) {
@@ -310,37 +295,50 @@ public class StatementGenerator {
         else if (leftSide instanceof LocalVar)return new AssignToLocal((LocalVar) leftSide);
         else throw new NotImplementedException();
     }
-
+    //TODO Felix_K
     private Statement convert(Java8Parser.IfThenStatementContext stmt){
-        //TODO
-        throw new NotImplementedException();
+        Expression expr = convert(stmt.expression());
+        Statement thenBlock = convert(stmt.statement());
+        Statement elseBlock = new EmptyStmt(stmt.getStart());
+        return new IfStmt(TypePlaceholder.fresh(stmt.getStart()),expr,thenBlock,elseBlock,stmt.getStart());
     }
-
+    //TODO Felix_K
     private Statement convert(Java8Parser.IfThenElseStatementContext stmt){
         Expression expr = convert(stmt.expression());
         Statement thenBlock = convert(stmt.statementNoShortIf());
         Statement elseBlock = convert(stmt.statement());
-        return new IfStmt(TypePlaceholder.fresh(stmt.getStart()), expr, thenBlock, elseBlock, stmt.getStart());
+        return new IfStmt(TypePlaceholder.fresh(stmt.getStart()),expr,thenBlock,elseBlock,stmt.getStart());
     }
-
+    //TODO Felix_K
     private Statement convert(Java8Parser.IfThenElseStatementNoShortIfContext stmt){
-        //TODO
-        throw new NotImplementedException();
+        Expression expr = convert(stmt.expression());
+        Statement thenBlock = convert(stmt.statementNoShortIf().get(0));
+        Statement elseBlock = convert(stmt.statementNoShortIf().get(1));
+        return new IfStmt(TypePlaceholder.fresh(stmt.getStart()),expr,thenBlock,elseBlock,stmt.getStart());
     }
-
-    private Statement convert(Java8Parser.AssertStatementContext stmt){
-        //TODO
-        throw new NotImplementedException();
+    //TODO Felix_K
+    private Statement convert(Java8Parser.AssertStatementContext stmt)
+    {
+        List<Expression> exprList= new ArrayList<Expression>();
+        for (int i =0; i<stmt.expression().size();i++){
+            exprList.add(convert(stmt.expression(i)));
+        }
+        return new AssertStmt(TypePlaceholder.fresh(stmt.getStart()),exprList,stmt.getStart());
     }
-
+    //TODO Felix_K
     private Statement convert(Java8Parser.SwitchStatementContext stmt){
-        //TODO
-        throw new NotImplementedException();
+        Expression expr = convert(stmt.expression());
+        List<Statement> statementList = new ArrayList<Statement>();
+        statementList.add( convert(stmt.switchBlock()));
+        statementList.add(new BreakStmt(TypePlaceholder.fresh(stmt.getStart()),"",stmt.getStart()));
+        Block block = new Block(statementList, stmt.getStart());
+        return new SwitchStmt(TypePlaceholder.fresh(stmt.getStart()),expr,block,stmt.getStart());
+
     }
 
     private Statement convert(Java8Parser.SwitchBlockContext stmt){
         //TODO
-        throw new NotImplementedException();
+        throw new  NotImplementedException();
     }
 
     private Statement convert(Java8Parser.SwitchBlockStatementGroupContext stmt){
@@ -353,12 +351,13 @@ public class StatementGenerator {
         Statement block = convert(stmt.statement());
         return new WhileStmt(expr, block,stmt.getStart());
     }
-
+    //TODO Felix_K
     private Statement convert(Java8Parser.WhileStatementNoShortIfContext stmt){
-        //TODO
-        throw new NotImplementedException();
+        Expression expr = convert(stmt.expression());
+        Statement block = convert(stmt.statementNoShortIf());
+        return new WhileStmt(expr, block, stmt.getStart());
     }
-
+    //TODO Felix_K
     private Statement convert(Java8Parser.DoStatementContext stmt){
         Statement block = convert(stmt.statement());
         Expression expr = convert(stmt.expression());
@@ -380,15 +379,43 @@ public class StatementGenerator {
             return convert(stmt.enhancedForStatementNoShortIf());
         }else throw new NotImplementedException();
     }
-
+    //TODO Felix_K
     private Statement convert(Java8Parser.BasicForStatementContext stmt){
-        //TODO
-        throw new NotImplementedException();
+        List<Statement> stateList = new ArrayList<>();
+        List<Statement> whileList = new ArrayList<>();
+        if (stmt.forInit().localVariableDeclaration()==null)
+        {
+            whileList.addAll(convert(stmt.forInit().localVariableDeclaration()));
+        }
+        else
+        {
+            whileList.add(convert(stmt.forInit().statementExpressionList()));
+        }
+        Expression expr = convert(stmt.expression());
+        stateList.add(convert(stmt.statement()));
+        stateList.add(convert(stmt.forUpdate()));
+        Block forBlock = new Block(stateList,stmt.getStart());
+        whileList.add(new WhileStmt(expr,forBlock,stmt.getStart()));
+        return new Block(whileList,stmt.getStart());
     }
-
+    //TODO Felix_K
     private Statement convert(Java8Parser.BasicForStatementNoShortIfContext stmt){
-        //TODO
-        throw new NotImplementedException();
+        List<Statement> stateList = new ArrayList<>();
+        List<Statement> whileList = new ArrayList<>();
+        if (stmt.forInit().localVariableDeclaration()==null)
+        {
+            whileList.addAll(convert(stmt.forInit().localVariableDeclaration()));
+        }
+        else
+        {
+            whileList.add(convert(stmt.forInit().statementExpressionList()));
+        }
+        Expression expr = convert(stmt.expression());
+        stateList.add(convert(stmt.statementNoShortIf()));
+        stateList.add(convert(stmt.forUpdate()));
+        Block forBlock = new Block(stateList,stmt.getStart());
+        whileList.add(new WhileStmt(expr,forBlock,stmt.getStart()));
+        return new Block(whileList,stmt.getStart());
     }
 
     private List<Statement> convert(Java8Parser.ForInitContext stmt){
@@ -398,7 +425,7 @@ public class StatementGenerator {
             return convert(stmt.localVariableDeclaration());
         }else throw new NotImplementedException();
     }
-
+    //TODO Felix_K
     private List<Statement> convert(Java8Parser.LocalVariableDeclarationContext declaration) {
         List<Statement> ret = new ArrayList<>();
         if(declaration.variableModifier() != null && declaration.variableModifier().size() > 0){
@@ -406,7 +433,7 @@ public class StatementGenerator {
             throw new NotImplementedException();
         }
         RefTypeOrTPHOrWildcardOrGeneric type;
-        if(declaration.unannTypeOrAuto().unannType().getText().equals(VAR_KEYWORD)){
+        if(declaration.unannTypeOrAuto().unannType()==null){
             type = TypePlaceholder.fresh(declaration.getStart());
         }else{
             type = TypeGenerator.convert(declaration.unannTypeOrAuto().unannType(), reg, generics);
@@ -468,15 +495,22 @@ public class StatementGenerator {
         //TODO
         throw new NotImplementedException();
     }
-
+    //TODO Felix_K
     private Statement convert(Java8Parser.BreakStatementContext stmt){
-        //TODO
-        throw new NotImplementedException();
+        if (stmt.Identifier()==null)
+        {
+            String indentifier = "";
+            return new BreakStmt(TypePlaceholder.fresh(stmt.getStart()),indentifier,stmt.getStart());
+        }
+        return new BreakStmt(TypePlaceholder.fresh(stmt.getStart()),stmt.Identifier().getText(),stmt.getStart());
     }
-
+    //TODO Felix_K
     private Statement convert(Java8Parser.ContinueStatementContext stmt){
-        //TODO
-        throw new NotImplementedException();
+        if (stmt.Identifier()==null){
+            String indentifier = "";
+            return new ContinueStmt(TypePlaceholder.fresh(stmt.getStart()),indentifier, stmt.getStart());
+        }
+        return new BreakStmt(TypePlaceholder.fresh(stmt.getStart()),stmt.Identifier().getText(),stmt.getStart());
     }
 
     private Statement convert(Java8Parser.ReturnStatementContext stmt){
@@ -502,7 +536,8 @@ public class StatementGenerator {
         throw new NotImplementedException();
     }
 
-    private Statement convert(Java8Parser.CatchesContext stmt){
+    private Statement convert(Java8Parser.CatchesContext stmt)
+    {
         //TODO
         throw new NotImplementedException();
     }
@@ -544,7 +579,8 @@ public class StatementGenerator {
         if(expression.conditionalOrExpression() == null){
             return convert(expression.conditionalAndExpression());
         }else{
-            throw new NotImplementedException();
+            return new Binary(convert(expression.conditionalOrExpression()),
+                    convert(expression.conditionalAndExpression()), Binary.Operator.OR);
         }
     }
 
@@ -552,7 +588,8 @@ public class StatementGenerator {
         if(expression.conditionalAndExpression() == null){
             return convert(expression.inclusiveOrExpression());
         }else{
-            throw new NotImplementedException();
+            return new Binary(convert(expression.conditionalAndExpression()),
+                    convert(expression.inclusiveOrExpression()), Binary.Operator.AND);
         }
     }
 
@@ -589,43 +626,11 @@ public class StatementGenerator {
     }
 
     private Expression convert(Java8Parser.RelationalExpressionContext expression) {
-        if(expression.relationalExpression() == null) {
+        if(expression.relationalExpression() == null){
             return convert(expression.shiftExpression());
-        }else {
-            String operator = expression.getChild(1).getText();
-            return new BinaryExpr(convertBinaryOperator(operator), TypePlaceholder.fresh(expression.getStart()),
-                    convert(expression.relationalExpression()),
-                    convert(expression.shiftExpression()), expression.getStart());
+        }else{
+            throw new NotImplementedException();
         }
-            //}else throw new NotImplementedException();
-    }
-
-    private BinaryExpr.Operator convertBinaryOperator(String operator) {
-        //return BinaryExpr.Operator.ADD;
-    		if(operator.equals("+")) {
-    			return BinaryExpr.Operator.ADD;
-    		}else if(operator.equals("-")) {
-    			return BinaryExpr.Operator.SUB;
-    		}else if(operator.equals("*")) {
-    			return BinaryExpr.Operator.MUL;
-    		}else if(operator.equals("&")) {
-    			return BinaryExpr.Operator.AND;
-    		}else if(operator.equals("|")) {
-    			return BinaryExpr.Operator.OR;
-    		}else if(operator.equals("/")) {
-    			return BinaryExpr.Operator.DIV;
-    		}else if(operator.equals("<")) {
-    			return BinaryExpr.Operator.LESSTHAN;
-    		}else if(operator.equals(">")) {
-    			return BinaryExpr.Operator.BIGGERTHAN;
-    		}else if(operator.equals(">=")) {
-    			return BinaryExpr.Operator.BIGGEREQUAL;
-    		} else if(operator.equals("<=")) {
-    			return BinaryExpr.Operator.LESSEQUAL;
-    		} else {
-    			throw new NotImplementedException();
-    		}
-//    		throw new NotImplementedException();
     }
 
     private Expression convert(Java8Parser.ShiftExpressionContext expression) {
@@ -637,15 +642,10 @@ public class StatementGenerator {
     }
 
     private Expression convert(Java8Parser.AdditiveExpressionContext expression) {
-
         if(expression.additiveExpression() == null){
             return convert(expression.multiplicativeExpression());
-        }else {
-            Expression leftSide = convert(expression.additiveExpression());
-            Expression rightSide = convert(expression.multiplicativeExpression());
-            BinaryExpr.Operator op = convertBinaryOperator(expression.getChild(1).getText());
-            Token offset = expression.getStart();
-            return new BinaryExpr(op, TypePlaceholder.fresh(expression.getStart()), leftSide, rightSide, offset);
+        }else{
+            throw new NotImplementedException();
         }
     }
 
@@ -653,11 +653,7 @@ public class StatementGenerator {
         if(expression.multiplicativeExpression() == null){
             return convert(expression.unaryExpression());
         }else{
-        		Expression leftSide = convert(expression.multiplicativeExpression());
-        		Expression rightSide = convert(expression.unaryExpression());
-        		BinaryExpr.Operator op = convertBinaryOperator(expression.getChild(1).getText());
-        		Token offset = expression.getStart();
-        		return new BinaryExpr(op, TypePlaceholder.fresh(offset), leftSide, rightSide, offset);
+            throw new NotImplementedException();
         }
     }
 
@@ -669,11 +665,9 @@ public class StatementGenerator {
         }else if(expression.unaryExpressionNotPlusMinus() != null){
             return convert(expression.unaryExpressionNotPlusMinus());
         }else if(expression.getText().startsWith("+")){
-            return new UnaryExpr(UnaryExpr.Operation.PLUS, convert(expression.unaryExpression()),
-                    TypePlaceholder.fresh(expression.getStart()), expression.getStart());
+            return new UnaryPlus(convert(expression.unaryExpression()));
         }else if(expression.getText().startsWith("-")){
-            return new UnaryExpr(UnaryExpr.Operation.MINUS, convert(expression.unaryExpression()),
-                    TypePlaceholder.fresh(expression.getStart()), expression.getStart());
+            return new UnaryMinus(convert(expression.unaryExpression()));
         }else{
             //Diese Exceptions sollte nie geworfen werden.
             //Der Code wurde nur noch nicht getestet. Sollte zur Sicherheit drin bleiben.
@@ -716,10 +710,10 @@ public class StatementGenerator {
         }
 
         for(Java8Parser.PostIncrementExpression_lf_postfixExpressionContext inc : expression.postIncrementExpression_lf_postfixExpression()){
-            expr = new UnaryExpr(UnaryExpr.Operation.POSTINCREMENT, expr, TypePlaceholder.fresh(inc.getStart()), inc.getStart());
+            expr = new PostIncExpr(expr);
         }
         for(Java8Parser.PostDecrementExpression_lf_postfixExpressionContext dec : expression.postDecrementExpression_lf_postfixExpression()){
-            expr = new UnaryExpr(UnaryExpr.Operation.POSTDECREMENT, expr, TypePlaceholder.fresh(dec.getStart()), dec.getStart());
+            expr = new PostDecExpr(expr);
         }
 
         return expr;
@@ -753,7 +747,7 @@ public class StatementGenerator {
         }else {
             Java8Parser.MethodInvocation_lf_primaryContext ctxt = e.methodInvocation_lf_primary();
             String methodName = ctxt.Identifier().toString();
-            return new MethodCall(TypePlaceholder.fresh(e.getStart()), getReceiver(expr), methodName, convert(ctxt.argumentList()), e.getStart());
+            return new MethodCall(TypePlaceholder.fresh(e.getStart()), new Receiver(expr), methodName, convert(ctxt.argumentList()), e.getStart());
         }
     }
 
@@ -815,27 +809,25 @@ public class StatementGenerator {
     private Expression convert(Java8Parser.LiteralContext literal) {
         if(literal.IntegerLiteral() != null || literal.FloatingPointLiteral()!= null){
             Number value = Double.parseDouble(literal.IntegerLiteral().getText());
-            return new Literal(TypePlaceholder.fresh(literal.getStart()),
+            return new NumberLiteral(TypePlaceholder.fresh(literal.getStart()),
                     value, literal.getStart());
         }else if(literal.BooleanLiteral() != null){
             RefType type = new RefType(reg.getName("java.lang.Boolean"),literal.getStart());
-            return new Literal(type,
+            return new BoolLiteral(type,
                     Boolean.parseBoolean(literal.BooleanLiteral().getText()),
                     literal.getStart());
         }else if(literal.CharacterLiteral() != null){
             RefType type = new RefType(reg.getName("java.lang.Character"),literal.getStart());
-            return new Literal(type,
-            			// das gibt immer ' zurück, der Char befindet sich in Position 1 
-        				//literal.CharacterLiteral().getText().charAt(0),
-                    literal.CharacterLiteral().getText().charAt(1),
+            return new CharLiteral(type,
+                    literal.CharacterLiteral().getText().charAt(0),
                     literal.getStart());
         }else if(literal.StringLiteral()!=null){
             RefType type = new RefType(reg.getName("java.lang.String"),literal.getStart());
-            return new Literal(type,
-                    literal.StringLiteral().getText().substring(1,  literal.StringLiteral().getText().length()-1),
+            return new StringLiteral(type,
+                    literal.StringLiteral().getText(),
                     literal.getStart());
         }else  if(literal.NullLiteral() != null){
-            return new Literal(TypePlaceholder.fresh(literal.getStart()), null,
+            return new Null(TypePlaceholder.fresh(literal.getStart()),
                     literal.getStart());
         }else {
             throw new NotImplementedException();
@@ -863,7 +855,7 @@ public class StatementGenerator {
         }
 
         ArgumentList argumentList = convert(methodInvocationContext.argumentList());
-        MethodCall ret = new MethodCall(TypePlaceholder.fresh(methodInvocationContext.getStart()), getReceiver(receiver), name, argumentList, methodInvocationContext.getStart());
+        MethodCall ret = new MethodCall(TypePlaceholder.fresh(methodInvocationContext.getStart()), new Receiver(receiver), name, argumentList, methodInvocationContext.getStart());
         return ret;
     }
 
@@ -896,7 +888,7 @@ public class StatementGenerator {
                     expression.lambdaBody().expression().getStart()));
             block = new Block(statements, expression.lambdaBody().getStart());
         }else{
-            block = lambdaGenerator.convert(expression.lambdaBody().block(), true);
+            block = lambdaGenerator.convert(expression.lambdaBody().block());
         }
         List<RefTypeOrTPHOrWildcardOrGeneric> funNParams = new ArrayList<>();
         funNParams.add(TypePlaceholder.fresh(expression.getStart()));//ret-Type
@@ -904,7 +896,7 @@ public class StatementGenerator {
                 funNParams.add(TypePlaceholder.fresh(expression.getStart())));
         RefTypeOrTPHOrWildcardOrGeneric lambdaType = TypePlaceholder.fresh(expression.getStart());
         //RefType lambdaType = new RefType(reg.getName("Fun"+params.getFormalparalist().size()),
-        		//funNParams, name.getStart());
+                //funNParams, name.getStart());
         return new LambdaExpression(lambdaType, params, block, expression.getStart());
     }
 }

src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntacticSugar.java

@@ -1,9 +1,6 @@
 package de.dhbwstuttgart.parser.SyntaxTreeGenerator;
 
-import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.parser.NullToken;
-import de.dhbwstuttgart.syntaxtree.AbstractASTWalker;
-import de.dhbwstuttgart.syntaxtree.Constructor;
 import de.dhbwstuttgart.syntaxtree.statement.*;
 
 import java.util.List;
@@ -13,27 +10,22 @@ public class SyntacticSugar {
     public static List<Statement> addTrailingReturn(List<Statement> statements){
         if(statements.size()!=0) {
             Statement lastStmt = statements.get(statements.size() - 1);
-            ReturnFinder hasReturn = new ReturnFinder();
-            lastStmt.accept(hasReturn);
-            if(hasReturn.hasReturn)return statements;
+            if (lastStmt instanceof Return) return statements;
+            if (lastStmt instanceof WhileStmt) {
+                //TODO
+                //if (hasReturn(((WhileStmt) lastStmt).loopBlock)) return statements;
+            } else if (lastStmt instanceof IfStmt) {
+                //if (hasReturn(((IfStmt) lastStmt).then_block)
+                        //&& hasReturn(((IfStmt) lastStmt).else_block)) return statements;
+            } else if (lastStmt instanceof ForStmt) {
+                if (hasReturn(((ForStmt) lastStmt).body_Loop_block)) return statements;
+            } else {
+            }
         }
         statements.add(new ReturnVoid(new NullToken()));
         return statements;
     }
 
-    private static class ReturnFinder extends AbstractASTWalker{
-        public boolean hasReturn = false;
-        @Override
-        public void visit(Return aReturn) {
-            hasReturn = true;
-        }
-
-        @Override
-        public void visit(ReturnVoid aReturn) {
-            hasReturn = true;
-        }
-    }
-
     private static boolean hasReturn(Block block){
         for(Statement s : block.getStatements())
             if(s instanceof Return)return true;

src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java

@@ -1,26 +1,23 @@
 package de.dhbwstuttgart.parser.SyntaxTreeGenerator;
 
-import de.dhbwstuttgart.environment.PackageCrawler;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
 import java.lang.ClassNotFoundException;
-
-import de.dhbwstuttgart.exceptions.TypeinferenceException;
+import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.parser.antlr.Java8Parser;
-import de.dhbwstuttgart.parser.scope.GatherNames;
-import de.dhbwstuttgart.parser.scope.GenericsRegistry;
-import de.dhbwstuttgart.parser.scope.JavaClassName;
-import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
 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.sql.Ref;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 
 //import jdk.internal.dynalink.support.TypeConverterFactory;
 import org.antlr.v4.runtime.CommonToken;
@@ -29,20 +26,68 @@ import org.antlr.v4.runtime.tree.TerminalNode;
 
 public class SyntaxTreeGenerator{
   private JavaClassRegistry reg;
-  private final GenericsRegistry globalGenerics;
   private String pkgName = "";
-  Set<JavaClassName> imports = new HashSet();
+  List<JavaClassName> imports = new ArrayList();
 
   List<Statement> fieldInitializations = new ArrayList<>();
 
-  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;
+  public SyntaxTreeGenerator(JavaClassRegistry reg){
     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;
@@ -72,11 +117,59 @@ public class SyntaxTreeGenerator{
     return ret;
   }
   
-  public SourceFile convert(Java8Parser.CompilationUnitContext ctx, PackageCrawler packageCrawler) throws ClassNotFoundException{
-    if(ctx.packageDeclaration()!=null)this.pkgName = convert(ctx.packageDeclaration());
+  public void setImports(Java8Parser.CompilationUnitContext ctx) throws ClassNotFoundException {
+    List<JavaClassName> newImports = new ArrayList();
+    for(Java8Parser.ImportDeclarationContext importDeclCtx : ctx.importDeclaration()){
+      if(importDeclCtx.singleTypeImportDeclaration() != null){
+        newImports.add(convertSingleTypeImportDeclaration(importDeclCtx.singleTypeImportDeclaration()));
+      }
+      else if(importDeclCtx.typeImportOnDemandDeclaration() != null){
+        newImports.add(convertTypeImportOnDemandDeclaration(importDeclCtx.typeImportOnDemandDeclaration()));
+      }
+      else if(importDeclCtx.singleStaticImportDeclaration() != null){
+        newImports.add(convertSingleStaticImportDeclaration(importDeclCtx.singleStaticImportDeclaration()));
+      }
+      else{
+        newImports.add(convertStaticImportOnDemandDeclaration(importDeclCtx.staticImportOnDemandDeclaration()));
+      }
+    }
+    this.imports.addAll(newImports);
+  }
+  
+  private JavaClassName convertSingleTypeImportDeclaration(Java8Parser.SingleTypeImportDeclarationContext ctx) throws ClassNotFoundException{
+    String typeName = convertTypeName(ctx.typeName());
+	Thread.currentThread().getContextClassLoader().loadClass(typeName);
+	reg.add(typeName);
+	JavaClassName ret = reg.getName(typeName);
+	return ret;
+  }
+  
+  private JavaClassName convertTypeImportOnDemandDeclaration(Java8Parser.TypeImportOnDemandDeclarationContext ctx){
+    return null;
+  }
+  
+  private JavaClassName convertSingleStaticImportDeclaration(Java8Parser.SingleStaticImportDeclarationContext ctx){
+    return null;
+  }
+  
+  private JavaClassName convertStaticImportOnDemandDeclaration(Java8Parser.StaticImportOnDemandDeclarationContext ctx){
+    return null;
+  }
+  
+  private String getPackageFromClass(String cls){
+    String ret = "";
+    String[] parts = cls.split("\\.");
+    for(int i = 0; i < parts.length - 1; i++){
+      ret = ret + "." + parts[i];
+    }
+    ret = ret.substring(1);
+    return ret;
+  }
+  
+  public SourceFile convert(Java8Parser.CompilationUnitContext ctx) throws ClassNotFoundException{
     List<ClassOrInterface> classes = new ArrayList<>();
-    Map<String, Integer> imports = GatherNames.getImports(ctx, packageCrawler);
-    this.imports = imports.keySet().stream().map(name -> reg.getName(name)).collect(Collectors.toSet());
+    this.getNames(ctx);
+    this.setImports(ctx);
     for(Java8Parser.TypeDeclarationContext typeDecl : ctx.typeDeclaration()){
       ClassOrInterface newClass;
       if(typeDecl.classDeclaration() != null){
@@ -90,20 +183,11 @@ public class SyntaxTreeGenerator{
     return new SourceFile(this.pkgName, classes, this.imports);
   }
 
-  private String convert(Java8Parser.PackageDeclarationContext packageDeclarationContext) {
-    String ret = "";
-    for(TerminalNode identifier : packageDeclarationContext.Identifier()){
-      ret += identifier.getText()+".";
-    }
-    ret = ret.substring(0, ret.length()-1);
-    return ret;
-  }
-
   public Method convert(Java8Parser.MethodDeclarationContext methodDeclarationContext, JavaClassName parentClass, RefType superClass, GenericsRegistry generics) {
     Java8Parser.MethodHeaderContext header = methodDeclarationContext.methodHeader();
     int modifiers = SyntaxTreeGenerator.convert(methodDeclarationContext.methodModifier());
     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);
   }
@@ -112,7 +196,7 @@ public class SyntaxTreeGenerator{
     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);
@@ -126,7 +210,7 @@ public class SyntaxTreeGenerator{
     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());
     }
@@ -146,16 +230,16 @@ public class SyntaxTreeGenerator{
         //TODO: Error! Abstrakte Methode ohne abstrakt Keyword
       }
     }else{
-      block = stmtGen.convert(body.block(),true);
+      block = stmtGen.convert(body.block());
     }
     if(parentClass.equals(new JavaClassName(name))){
-      return new Constructor(modifiers, name, retType, parameterList, block, gtvDeclarations, header.getStart(), fieldInitializations);
+      return new Constructor(name, retType, modifiers, parameterList, block, gtvDeclarations, header.getStart(), fieldInitializations, superClass);
     }else{
-      return new Method(modifiers, name, retType, parameterList,block, gtvDeclarations, header.getStart());
+      return new Method(name, retType, modifiers, parameterList,block, gtvDeclarations, header.getStart());
     }
   }
 
-  private ClassOrInterface convertClass(Java8Parser.ClassDeclarationContext ctx)  {
+  private ClassOrInterface convertClass(Java8Parser.ClassDeclarationContext ctx) {
     ClassOrInterface newClass;
     if(ctx.normalClassDeclaration() != null){
       newClass = convertNormal(ctx.normalClassDeclaration());
@@ -166,7 +250,7 @@ public class SyntaxTreeGenerator{
     return newClass;
   }
   
-  private ClassOrInterface convertNormal(Java8Parser.NormalClassDeclarationContext ctx) {
+  private ClassOrInterface convertNormal(Java8Parser.NormalClassDeclarationContext ctx){
     int modifiers = 0;
     if(ctx.classModifier() != null){
       for(Java8Parser.ClassModifierContext mod : ctx.classModifier()){
@@ -174,13 +258,8 @@ public class SyntaxTreeGenerator{
         modifiers += newModifier;
       }
     }
-    String className = this.pkgName + (this.pkgName.length()>0?".":"") + ctx.Identifier().getText();
-    JavaClassName name = reg.getName(className); //Holt den Package Namen mit dazu
-    if(! name.toString().equals(className)){ //Kommt die Klasse schon in einem anderen Package vor?
-      throw new TypeinferenceException("Name " + className + " bereits vorhanden in " + reg.getName(className).toString()
-              ,ctx.getStart());
-    }
-    GenericsRegistry generics = createGenerics(ctx.typeParameters(), name, "", reg, new GenericsRegistry(globalGenerics));
+    JavaClassName name = reg.getName(ctx.Identifier().getText());
+    GenericsRegistry generics = createGenerics(ctx.typeParameters(), name, "");
     Token offset = ctx.getStart();
     GenericDeclarationList genericClassParameters;
     if(ctx.typeParameters() == null){
@@ -192,7 +271,7 @@ public class SyntaxTreeGenerator{
     if(ctx.superclass() != null){
       superClass = convert(ctx.superclass());
     }else{
-      superClass = new RefType(ASTFactory.createObjectClass().getClassName(), ctx.getStart());
+      superClass = ASTFactory.createObjectClass().getType();
     }
     List<Field> fielddecl = convertFields(ctx.classBody(), generics);
     List<Method> methods = convertMethods(ctx.classBody(), name, superClass, generics);
@@ -213,46 +292,34 @@ public class SyntaxTreeGenerator{
     }
 
     Boolean isInterface = false;
-    List<RefType> implementedInterfaces = convert(ctx.superinterfaces(), generics);
+    List<RefTypeOrTPHOrWildcardOrGeneric> implementedInterfaces = convert(ctx.superinterfaces(), generics);
     return new ClassOrInterface(modifiers, name, fielddecl, methods, konstruktoren, genericClassParameters, superClass,
             isInterface, implementedInterfaces, offset);
   }
 
-  private List<RefType> convert(Java8Parser.SuperinterfacesContext ctx, GenericsRegistry generics) {
+  private List<RefTypeOrTPHOrWildcardOrGeneric> convert(Java8Parser.SuperinterfacesContext ctx, GenericsRegistry generics) {
     if(ctx == null)return new ArrayList<>();
     return convert(ctx.interfaceTypeList(), generics);
   }
 
-  private List<RefType> convert(Java8Parser.InterfaceTypeListContext ctx, GenericsRegistry generics) {
-    List<RefType> ret = new ArrayList<>();
+  private List<RefTypeOrTPHOrWildcardOrGeneric> convert(Java8Parser.InterfaceTypeListContext ctx, GenericsRegistry generics) {
+    List<RefTypeOrTPHOrWildcardOrGeneric> ret = new ArrayList<>();
     for(Java8Parser.InterfaceTypeContext interfaceType : ctx.interfaceType()){
-      ret.add((RefType) TypeGenerator.convert(interfaceType.classType(), reg, generics));
+      ret.add(TypeGenerator.convert(interfaceType.classType(), reg, generics));
     }
     return ret;
   }
 
-  /**
-   * 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);
     Block block = new Block(new ArrayList<>(), offset);
-    return new Constructor(Modifier.PUBLIC, className, classType, params, block, classGenerics, offset, fieldInitializations);
+    return new Constructor(className, classType, modifiers, params, block, classGenerics, offset, fieldInitializations, superClass);
   }
 
   private RefType convert(Java8Parser.SuperclassContext superclass) {
-    if(superclass.classType().classOrInterfaceType() != null){
-      throw new NotImplementedException();
-    }else{
-      RefTypeOrTPHOrWildcardOrGeneric ret = TypeGenerator.convertTypeName(superclass.classType().Identifier().getText(), superclass.classType().typeArguments(),
-              superclass.getStart(), reg, globalGenerics);
-      if(ret instanceof RefType){
-        return (RefType) ret;
-      }else{
-        throw new TypeinferenceException(superclass.getText() + " ist kein gültiger Supertyp", superclass.getStart());
-      }
-    }
+    throw new NotImplementedException();
   }
 
   private List<Method> convertMethods(Java8Parser.ClassBodyContext classBodyContext,
@@ -393,11 +460,9 @@ public class SyntaxTreeGenerator{
         modifiers += newModifier;
       }
     }
-    if(!Modifier.isInterface(modifiers))modifiers += Modifier.INTERFACE;
-    
     JavaClassName name = reg.getName(ctx.Identifier().getText());
 
-    GenericsRegistry generics = createGenerics(ctx.typeParameters(), name, "", reg, new GenericsRegistry(globalGenerics));
+    GenericsRegistry generics = createGenerics(ctx.typeParameters(), name, "");
 
     GenericDeclarationList genericParams;
     if(ctx.typeParameters() != null){
@@ -405,12 +470,12 @@ public class SyntaxTreeGenerator{
     }else{
       genericParams = createEmptyGenericDeclarationList(ctx.Identifier());
     }
-    RefType superClass = ASTFactory.createObjectType();
+    RefType superClass = ASTFactory.createObjectClass().getType();
 
     List<Field> fields = convertFields(ctx.interfaceBody());
     List<Method> methods = convertMethods(ctx.interfaceBody(), name, superClass, generics);
 
-    List<RefType> extendedInterfaces = convert(ctx.extendsInterfaces(), generics);
+    List<RefTypeOrTPHOrWildcardOrGeneric> extendedInterfaces = convert(ctx.extendsInterfaces(), generics);
 
     return new ClassOrInterface(modifiers, name, fields, methods, new ArrayList<>(),
             genericParams, superClass, true, extendedInterfaces, ctx.getStart());
@@ -423,9 +488,8 @@ public class SyntaxTreeGenerator{
     return new GenericDeclarationList(new ArrayList<>(), gtvOffset);
   }
 
-  private GenericsRegistry createGenerics(Java8Parser.TypeParametersContext ctx, JavaClassName parentClass, String parentMethod, JavaClassRegistry reg, GenericsRegistry generics) {
-    GenericsRegistry ret = new GenericsRegistry(this.globalGenerics);
-    ret.putAll(generics);
+  private GenericsRegistry createGenerics(Java8Parser.TypeParametersContext ctx, JavaClassName parentClass, String parentMethod) {
+    GenericsRegistry ret = new GenericsRegistry();
     if(ctx == null || ctx.typeParameterList() == null)return ret;
     for(Java8Parser.TypeParameterContext tp : ctx.typeParameterList().typeParameter()){
       TypeGenerator.convert(tp, parentClass, parentMethod, reg, ret);
@@ -433,7 +497,7 @@ public class SyntaxTreeGenerator{
     return ret;
   }
 
-  private List<RefType> convert(Java8Parser.ExtendsInterfacesContext extendsInterfacesContext, GenericsRegistry generics) {
+  private List<RefTypeOrTPHOrWildcardOrGeneric> convert(Java8Parser.ExtendsInterfacesContext extendsInterfacesContext, GenericsRegistry generics) {
     if(extendsInterfacesContext == null)return new ArrayList<>();
     return convert(extendsInterfacesContext.interfaceTypeList(), generics);
   }

src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/TypeGenerator.java

@@ -2,54 +2,49 @@ 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.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;
+import java.util.Arrays;
 import java.util.List;
 
 public class TypeGenerator {
 
     public static RefTypeOrTPHOrWildcardOrGeneric convert(Java8Parser.UnannClassOrInterfaceTypeContext unannClassOrInterfaceTypeContext, JavaClassRegistry reg, GenericsRegistry generics) {
+        String name;
+        if(unannClassOrInterfaceTypeContext.unannInterfaceType_lfno_unannClassOrInterfaceType() != null){
+            name = unannClassOrInterfaceTypeContext.unannInterfaceType_lfno_unannClassOrInterfaceType().unannClassType_lfno_unannClassOrInterfaceType().Identifier().getText();
+            }
         Java8Parser.TypeArgumentsContext arguments;
         if(unannClassOrInterfaceTypeContext.unannClassType_lfno_unannClassOrInterfaceType() != null){
+            name = unannClassOrInterfaceTypeContext.unannClassType_lfno_unannClassOrInterfaceType().Identifier().getText();
             arguments = unannClassOrInterfaceTypeContext.unannClassType_lfno_unannClassOrInterfaceType().typeArguments();
         }else{// if(unannClassOrInterfaceTypeContext.unannInterfaceType_lfno_unannClassOrInterfaceType() != null){
+            name = unannClassOrInterfaceTypeContext.unannInterfaceType_lfno_unannClassOrInterfaceType().unannClassType_lfno_unannClassOrInterfaceType().getText();
             arguments = unannClassOrInterfaceTypeContext.unannInterfaceType_lfno_unannClassOrInterfaceType().unannClassType_lfno_unannClassOrInterfaceType().typeArguments();
         }
-        /**
-         * Problem sind hier die verschachtelten Typen mit verschachtelten Typargumenten
-         * Beispiel: Typ<String>.InnererTyp<Integer>
-         */
-        String name = unannClassOrInterfaceTypeContext.getText();
-        if(name.contains("<")){
-            name = name.split("<")[0]; //Der Typ ist alles vor den ersten Argumenten
-        }
         return convertTypeName(name, arguments, unannClassOrInterfaceTypeContext.getStart(), reg, generics);
     }
 
     public static RefTypeOrTPHOrWildcardOrGeneric convert(Java8Parser.UnannTypeContext unannTypeContext, JavaClassRegistry reg, GenericsRegistry genericsRegistry) {
         if(unannTypeContext.unannPrimitiveType()!=null){
-            if(unannTypeContext.unannPrimitiveType().getText().equals("boolean")){
-                return new RefType(ASTFactory.createClass(Boolean.class).getClassName(), unannTypeContext.getStart());
-            }else{
-                Java8Parser.NumericTypeContext numericType = unannTypeContext.unannPrimitiveType().numericType();
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }else
         if(unannTypeContext.unannReferenceType().unannArrayType()!=null){
-            //System.out.println(unannTypeContext.getText());
+            System.out.println(unannTypeContext.getText());
             throw new NotImplementedException();
         }else
         if(unannTypeContext.unannReferenceType().unannTypeVariable()!=null){
@@ -72,56 +67,25 @@ 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(name, bounds, typeParameter.getStart(), typeParameter.getStop());
+        GenericTypeVar ret = new GenericTypeVar(new GenericTypeName(new GenericContext(parentClass, parentMethod), name), bounds, typeParameter.getStart(), typeParameter.getStop());
         generics.put(name, new GenericContext(parentClass, parentMethod));
         return ret;
     }
 
     public static List<RefTypeOrTPHOrWildcardOrGeneric> convert(Java8Parser.TypeBoundContext typeBoundContext, JavaClassRegistry reg, GenericsRegistry generics) {
-        List<RefTypeOrTPHOrWildcardOrGeneric> ret = new ArrayList<>();
         if(typeBoundContext == null){
-            ret.add(ASTFactory.createObjectType());
+            List<RefTypeOrTPHOrWildcardOrGeneric> ret = new ArrayList<>();
+            ret.add(ASTFactory.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 NotImplementedException();
-    }
-
-    private static RefTypeOrTPHOrWildcardOrGeneric convert(Java8Parser.InterfaceTypeContext interfaceTypeContext) {
-        throw new NotImplementedException();
+        throw new de.dhbwstuttgart.exceptions.NotImplementedException();
     }
 
     public static RefTypeOrTPHOrWildcardOrGeneric convert(Java8Parser.ReferenceTypeContext referenceTypeContext, JavaClassRegistry reg, GenericsRegistry generics) {
-        if(referenceTypeContext.classOrInterfaceType() != null){
-            if(referenceTypeContext.classOrInterfaceType().classType_lfno_classOrInterfaceType()!= null){
-                Java8Parser.ClassType_lfno_classOrInterfaceTypeContext ctx = referenceTypeContext.classOrInterfaceType().classType_lfno_classOrInterfaceType();
-                return convertTypeName(ctx.Identifier().toString(), ctx.typeArguments(),referenceTypeContext.getStart(), reg, generics);
-            }else{
-                throw new NotImplementedException();
-            }
-        }else{
-            throw new NotImplementedException();
-        }
+        return convertTypeName(referenceTypeContext.getText(), referenceTypeContext.getStart(), reg, generics);
     }
 
     public static RefTypeOrTPHOrWildcardOrGeneric convertTypeName(String name, Token offset, JavaClassRegistry reg, GenericsRegistry generics){
@@ -131,18 +95,14 @@ 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(generics.contains(name)){
-                return new GenericRefType(name, offset);
+            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);
             }
         }
         if(typeArguments == null){
-            List<RefTypeOrTPHOrWildcardOrGeneric> params = new ArrayList<>();
-            for(int i = 0; i<reg.getNumberOfGenerics(name);i++){
-                params.add(TypePlaceholder.fresh(offset));
-            }
-            return new RefType(reg.getName(name), params, offset);
+            return new RefType(reg.getName(name), offset);
         }else{
             return new RefType(reg.getName(name), convert(typeArguments, reg, generics), offset);
         }

src/de/dhbwstuttgart/parser/antlr/Java8.g4

@@ -732,6 +732,7 @@ localVariableDeclarationStatement
 
 unannTypeOrAuto
     : unannType
+    | 'auto'
     ;
 
 localVariableDeclaration
@@ -1738,7 +1739,6 @@ Identifier
 	:	JavaLetter JavaLetterOrDigit*
 	;
 
-
 fragment
 JavaLetter
 	:	[a-zA-Z$_] // these are the "java letters" below 0x7F

src/de/dhbwstuttgart/parser/antlr/Java8.tokens

@@ -1,205 +1,207 @@
-ABSTRACT=1
-ASSERT=2
-BOOLEAN=3
-BREAK=4
-BYTE=5
-CASE=6
-CATCH=7
-CHAR=8
-CLASS=9
-CONST=10
-CONTINUE=11
-DEFAULT=12
-DO=13
-DOUBLE=14
-ELSE=15
-ENUM=16
-EXTENDS=17
-FINAL=18
-FINALLY=19
-FLOAT=20
-FOR=21
-IF=22
-GOTO=23
-IMPLEMENTS=24
-IMPORT=25
-INSTANCEOF=26
-INT=27
-INTERFACE=28
-LONG=29
-NATIVE=30
-NEW=31
-PACKAGE=32
-PRIVATE=33
-PROTECTED=34
-PUBLIC=35
-RETURN=36
-SHORT=37
-STATIC=38
-STRICTFP=39
-SUPER=40
-SWITCH=41
-SYNCHRONIZED=42
-THIS=43
-THROW=44
-THROWS=45
-TRANSIENT=46
-TRY=47
-VOID=48
-VOLATILE=49
-WHILE=50
-IntegerLiteral=51
-FloatingPointLiteral=52
-BooleanLiteral=53
-CharacterLiteral=54
-StringLiteral=55
-NullLiteral=56
-LPAREN=57
-RPAREN=58
-LBRACE=59
-RBRACE=60
-LBRACK=61
-RBRACK=62
-SEMI=63
-COMMA=64
-DOT=65
-ASSIGN=66
-GT=67
-LT=68
-BANG=69
-TILDE=70
-QUESTION=71
-COLON=72
-EQUAL=73
-LE=74
-GE=75
-NOTEQUAL=76
-AND=77
-OR=78
-INC=79
-DEC=80
-ADD=81
-SUB=82
-MUL=83
-DIV=84
-BITAND=85
-BITOR=86
-CARET=87
-MOD=88
-ARROW=89
-COLONCOLON=90
-ADD_ASSIGN=91
-SUB_ASSIGN=92
-MUL_ASSIGN=93
-DIV_ASSIGN=94
-AND_ASSIGN=95
-OR_ASSIGN=96
-XOR_ASSIGN=97
-MOD_ASSIGN=98
-LSHIFT_ASSIGN=99
-RSHIFT_ASSIGN=100
-URSHIFT_ASSIGN=101
-Identifier=102
-AT=103
-ELLIPSIS=104
-WS=105
-COMMENT=106
-LINE_COMMENT=107
-'abstract'=1
-'assert'=2
-'boolean'=3
-'break'=4
-'byte'=5
-'case'=6
-'catch'=7
-'char'=8
-'class'=9
-'const'=10
-'continue'=11
-'default'=12
-'do'=13
-'double'=14
-'else'=15
-'enum'=16
-'extends'=17
-'final'=18
-'finally'=19
-'float'=20
-'for'=21
-'if'=22
-'goto'=23
-'implements'=24
-'import'=25
-'instanceof'=26
-'int'=27
-'interface'=28
-'long'=29
-'native'=30
-'new'=31
-'package'=32
-'private'=33
-'protected'=34
-'public'=35
-'return'=36
-'short'=37
-'static'=38
-'strictfp'=39
-'super'=40
-'switch'=41
-'synchronized'=42
-'this'=43
-'throw'=44
-'throws'=45
-'transient'=46
-'try'=47
-'void'=48
-'volatile'=49
-'while'=50
-'null'=56
-'('=57
-')'=58
-'{'=59
-'}'=60
-'['=61
-']'=62
-';'=63
-','=64
-'.'=65
-'='=66
-'>'=67
-'<'=68
-'!'=69
-'~'=70
-'?'=71
-':'=72
-'=='=73
-'<='=74
-'>='=75
-'!='=76
-'&&'=77
-'||'=78
-'++'=79
-'--'=80
-'+'=81
-'-'=82
-'*'=83
-'/'=84
-'&'=85
-'|'=86
-'^'=87
-'%'=88
-'->'=89
-'::'=90
-'+='=91
-'-='=92
-'*='=93
-'/='=94
-'&='=95
-'|='=96
-'^='=97
-'%='=98
-'<<='=99
-'>>='=100
-'>>>='=101
-'@'=103
-'...'=104
+T__0=1
+ABSTRACT=2
+ASSERT=3
+BOOLEAN=4
+BREAK=5
+BYTE=6
+CASE=7
+CATCH=8
+CHAR=9
+CLASS=10
+CONST=11
+CONTINUE=12
+DEFAULT=13
+DO=14
+DOUBLE=15
+ELSE=16
+ENUM=17
+EXTENDS=18
+FINAL=19
+FINALLY=20
+FLOAT=21
+FOR=22
+IF=23
+GOTO=24
+IMPLEMENTS=25
+IMPORT=26
+INSTANCEOF=27
+INT=28
+INTERFACE=29
+LONG=30
+NATIVE=31
+NEW=32
+PACKAGE=33
+PRIVATE=34
+PROTECTED=35
+PUBLIC=36
+RETURN=37
+SHORT=38
+STATIC=39
+STRICTFP=40
+SUPER=41
+SWITCH=42
+SYNCHRONIZED=43
+THIS=44
+THROW=45
+THROWS=46
+TRANSIENT=47
+TRY=48
+VOID=49
+VOLATILE=50
+WHILE=51
+IntegerLiteral=52
+FloatingPointLiteral=53
+BooleanLiteral=54
+CharacterLiteral=55
+StringLiteral=56
+NullLiteral=57
+LPAREN=58
+RPAREN=59
+LBRACE=60
+RBRACE=61
+LBRACK=62
+RBRACK=63
+SEMI=64
+COMMA=65
+DOT=66
+ASSIGN=67
+GT=68
+LT=69
+BANG=70
+TILDE=71
+QUESTION=72
+COLON=73
+EQUAL=74
+LE=75
+GE=76
+NOTEQUAL=77
+AND=78
+OR=79
+INC=80
+DEC=81
+ADD=82
+SUB=83
+MUL=84
+DIV=85
+BITAND=86
+BITOR=87
+CARET=88
+MOD=89
+ARROW=90
+COLONCOLON=91
+ADD_ASSIGN=92
+SUB_ASSIGN=93
+MUL_ASSIGN=94
+DIV_ASSIGN=95
+AND_ASSIGN=96
+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
+'auto'=1
+'abstract'=2
+'assert'=3
+'boolean'=4
+'break'=5
+'byte'=6
+'case'=7
+'catch'=8
+'char'=9
+'class'=10
+'const'=11
+'continue'=12
+'default'=13
+'do'=14
+'double'=15
+'else'=16
+'enum'=17
+'extends'=18
+'final'=19
+'finally'=20
+'float'=21
+'for'=22
+'if'=23
+'goto'=24
+'implements'=25
+'import'=26
+'instanceof'=27
+'int'=28
+'interface'=29
+'long'=30
+'native'=31
+'new'=32
+'package'=33
+'private'=34
+'protected'=35
+'public'=36
+'return'=37
+'short'=38
+'static'=39
+'strictfp'=40
+'super'=41
+'switch'=42
+'synchronized'=43
+'this'=44
+'throw'=45
+'throws'=46
+'transient'=47
+'try'=48
+'void'=49
+'volatile'=50
+'while'=51
+'null'=57
+'('=58
+')'=59
+'{'=60
+'}'=61
+'['=62
+']'=63
+';'=64
+','=65
+'.'=66
+'='=67
+'>'=68
+'<'=69
+'!'=70
+'~'=71
+'?'=72
+':'=73
+'=='=74
+'<='=75
+'>='=76
+'!='=77
+'&&'=78
+'||'=79
+'++'=80
+'--'=81
+'+'=82
+'-'=83
+'*'=84
+'/'=85
+'&'=86
+'|'=87
+'^'=88
+'%'=89
+'->'=90
+'::'=91
+'+='=92
+'-='=93
+'*='=94
+'/='=95
+'&='=96
+'|='=97
+'^='=98
+'%='=99
+'<<='=100
+'>>='=101
+'>>>='=102
+'@'=104
+'...'=105

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}
 	 *

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,41 +11,37 @@ 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 =
 		new PredictionContextCache();
 	public static final int
-		ABSTRACT=1, ASSERT=2, BOOLEAN=3, BREAK=4, BYTE=5, CASE=6, CATCH=7, CHAR=8, 
-		CLASS=9, CONST=10, CONTINUE=11, DEFAULT=12, DO=13, DOUBLE=14, ELSE=15, 
-		ENUM=16, EXTENDS=17, FINAL=18, FINALLY=19, FLOAT=20, FOR=21, IF=22, GOTO=23, 
-		IMPLEMENTS=24, IMPORT=25, INSTANCEOF=26, INT=27, INTERFACE=28, LONG=29, 
-		NATIVE=30, NEW=31, PACKAGE=32, PRIVATE=33, PROTECTED=34, PUBLIC=35, RETURN=36, 
-		SHORT=37, STATIC=38, STRICTFP=39, SUPER=40, SWITCH=41, SYNCHRONIZED=42, 
-		THIS=43, THROW=44, THROWS=45, TRANSIENT=46, TRY=47, VOID=48, VOLATILE=49, 
-		WHILE=50, IntegerLiteral=51, FloatingPointLiteral=52, BooleanLiteral=53, 
-		CharacterLiteral=54, StringLiteral=55, NullLiteral=56, LPAREN=57, RPAREN=58, 
-		LBRACE=59, RBRACE=60, LBRACK=61, RBRACK=62, SEMI=63, COMMA=64, DOT=65, 
-		ASSIGN=66, GT=67, LT=68, BANG=69, TILDE=70, QUESTION=71, COLON=72, EQUAL=73, 
-		LE=74, GE=75, NOTEQUAL=76, AND=77, OR=78, INC=79, DEC=80, ADD=81, SUB=82, 
-		MUL=83, DIV=84, BITAND=85, BITOR=86, CARET=87, MOD=88, ARROW=89, COLONCOLON=90, 
-		ADD_ASSIGN=91, SUB_ASSIGN=92, MUL_ASSIGN=93, DIV_ASSIGN=94, AND_ASSIGN=95, 
-		OR_ASSIGN=96, XOR_ASSIGN=97, MOD_ASSIGN=98, LSHIFT_ASSIGN=99, RSHIFT_ASSIGN=100, 
-		URSHIFT_ASSIGN=101, Identifier=102, AT=103, ELLIPSIS=104, WS=105, COMMENT=106, 
-		LINE_COMMENT=107;
-	public static String[] channelNames = {
-		"DEFAULT_TOKEN_CHANNEL", "HIDDEN"
-	};
-
+		T__0=1, ABSTRACT=2, ASSERT=3, BOOLEAN=4, BREAK=5, BYTE=6, CASE=7, CATCH=8, 
+		CHAR=9, CLASS=10, CONST=11, CONTINUE=12, DEFAULT=13, DO=14, DOUBLE=15, 
+		ELSE=16, ENUM=17, EXTENDS=18, FINAL=19, FINALLY=20, FLOAT=21, FOR=22, 
+		IF=23, GOTO=24, IMPLEMENTS=25, IMPORT=26, INSTANCEOF=27, INT=28, INTERFACE=29, 
+		LONG=30, NATIVE=31, NEW=32, PACKAGE=33, PRIVATE=34, PROTECTED=35, PUBLIC=36, 
+		RETURN=37, SHORT=38, STATIC=39, STRICTFP=40, SUPER=41, SWITCH=42, SYNCHRONIZED=43, 
+		THIS=44, THROW=45, THROWS=46, TRANSIENT=47, TRY=48, VOID=49, VOLATILE=50, 
+		WHILE=51, IntegerLiteral=52, FloatingPointLiteral=53, BooleanLiteral=54, 
+		CharacterLiteral=55, StringLiteral=56, NullLiteral=57, LPAREN=58, RPAREN=59, 
+		LBRACE=60, RBRACE=61, LBRACK=62, RBRACK=63, SEMI=64, COMMA=65, DOT=66, 
+		ASSIGN=67, GT=68, LT=69, BANG=70, TILDE=71, QUESTION=72, COLON=73, EQUAL=74, 
+		LE=75, GE=76, NOTEQUAL=77, AND=78, OR=79, INC=80, DEC=81, ADD=82, SUB=83, 
+		MUL=84, DIV=85, BITAND=86, BITOR=87, CARET=88, MOD=89, ARROW=90, COLONCOLON=91, 
+		ADD_ASSIGN=92, SUB_ASSIGN=93, MUL_ASSIGN=94, DIV_ASSIGN=95, AND_ASSIGN=96, 
+		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[] modeNames = {
 		"DEFAULT_MODE"
 	};
 
 	public static final String[] ruleNames = {
-		"ABSTRACT", "ASSERT", "BOOLEAN", "BREAK", "BYTE", "CASE", "CATCH", "CHAR", 
-		"CLASS", "CONST", "CONTINUE", "DEFAULT", "DO", "DOUBLE", "ELSE", "ENUM", 
-		"EXTENDS", "FINAL", "FINALLY", "FLOAT", "FOR", "IF", "GOTO", "IMPLEMENTS", 
+		"T__0", "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", "INT", "INTERFACE", "LONG", "NATIVE", "NEW", "PACKAGE", 
 		"PRIVATE", "PROTECTED", "PUBLIC", "RETURN", "SHORT", "STATIC", "STRICTFP", 
 		"SUPER", "SWITCH", "SYNCHRONIZED", "THIS", "THROW", "THROWS", "TRANSIENT", 
@@ -72,8 +68,8 @@ public class Java8Lexer extends Lexer {
 	};
 
 	private static final String[] _LITERAL_NAMES = {
-		null, "'abstract'", "'assert'", "'boolean'", "'break'", "'byte'", "'case'", 
-		"'catch'", "'char'", "'class'", "'const'", "'continue'", "'default'", 
+		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'", 
 		"'int'", "'interface'", "'long'", "'native'", "'new'", "'package'", "'private'", 
@@ -88,21 +84,21 @@ public class Java8Lexer extends Lexer {
 		"'>>>='", null, "'@'", "'...'"
 	};
 	private static final String[] _SYMBOLIC_NAMES = {
-		null, "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", "INT", "INTERFACE", "LONG", "NATIVE", "NEW", "PACKAGE", 
-		"PRIVATE", "PROTECTED", "PUBLIC", "RETURN", "SHORT", "STATIC", "STRICTFP", 
-		"SUPER", "SWITCH", "SYNCHRONIZED", "THIS", "THROW", "THROWS", "TRANSIENT", 
-		"TRY", "VOID", "VOLATILE", "WHILE", "IntegerLiteral", "FloatingPointLiteral", 
-		"BooleanLiteral", "CharacterLiteral", "StringLiteral", "NullLiteral", 
-		"LPAREN", "RPAREN", "LBRACE", "RBRACE", "LBRACK", "RBRACK", "SEMI", "COMMA", 
-		"DOT", "ASSIGN", "GT", "LT", "BANG", "TILDE", "QUESTION", "COLON", "EQUAL", 
-		"LE", "GE", "NOTEQUAL", "AND", "OR", "INC", "DEC", "ADD", "SUB", "MUL", 
-		"DIV", "BITAND", "BITOR", "CARET", "MOD", "ARROW", "COLONCOLON", "ADD_ASSIGN", 
-		"SUB_ASSIGN", "MUL_ASSIGN", "DIV_ASSIGN", "AND_ASSIGN", "OR_ASSIGN", "XOR_ASSIGN", 
-		"MOD_ASSIGN", "LSHIFT_ASSIGN", "RSHIFT_ASSIGN", "URSHIFT_ASSIGN", "Identifier", 
-		"AT", "ELLIPSIS", "WS", "COMMENT", "LINE_COMMENT"
+		null, null, "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", "INT", "INTERFACE", "LONG", "NATIVE", 
+		"NEW", "PACKAGE", "PRIVATE", "PROTECTED", "PUBLIC", "RETURN", "SHORT", 
+		"STATIC", "STRICTFP", "SUPER", "SWITCH", "SYNCHRONIZED", "THIS", "THROW", 
+		"THROWS", "TRANSIENT", "TRY", "VOID", "VOLATILE", "WHILE", "IntegerLiteral", 
+		"FloatingPointLiteral", "BooleanLiteral", "CharacterLiteral", "StringLiteral", 
+		"NullLiteral", "LPAREN", "RPAREN", "LBRACE", "RBRACE", "LBRACK", "RBRACK", 
+		"SEMI", "COMMA", "DOT", "ASSIGN", "GT", "LT", "BANG", "TILDE", "QUESTION", 
+		"COLON", "EQUAL", "LE", "GE", "NOTEQUAL", "AND", "OR", "INC", "DEC", "ADD", 
+		"SUB", "MUL", "DIV", "BITAND", "BITOR", "CARET", "MOD", "ARROW", "COLONCOLON", 
+		"ADD_ASSIGN", "SUB_ASSIGN", "MUL_ASSIGN", "DIV_ASSIGN", "AND_ASSIGN", 
+		"OR_ASSIGN", "XOR_ASSIGN", "MOD_ASSIGN", "LSHIFT_ASSIGN", "RSHIFT_ASSIGN", 
+		"URSHIFT_ASSIGN", "Identifier", "AT", "ELLIPSIS", "WS", "COMMENT", "LINE_COMMENT"
 	};
 	public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
 
@@ -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; }
 
@@ -164,9 +157,9 @@ public class Java8Lexer extends Lexer {
 	@Override
 	public boolean sempred(RuleContext _localctx, int ruleIndex, int predIndex) {
 		switch (ruleIndex) {
-		case 146:
-			return JavaLetter_sempred((RuleContext)_localctx, predIndex);
 		case 147:
+			return JavaLetter_sempred((RuleContext)_localctx, predIndex);
+		case 148:
 			return JavaLetterOrDigit_sempred((RuleContext)_localctx, predIndex);
 		}
 		return true;
@@ -191,7 +184,7 @@ public class Java8Lexer extends Lexer {
 	}
 
 	public static final String _serializedATN =
-		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2m\u0448\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"+
@@ -210,376 +203,378 @@ public class Java8Lexer extends Lexer {
 		"\4\u008a\t\u008a\4\u008b\t\u008b\4\u008c\t\u008c\4\u008d\t\u008d\4\u008e"+
 		"\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\3\2\3\2\3\2\3"+
-		"\2\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\4\3\4\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\6\3\6\3\6\3\6\3\6\3\7\3\7\3\7\3"+
-		"\7\3\7\3\b\3\b\3\b\3\b\3\b\3\b\3\t\3\t\3\t\3\t\3\t\3\n\3\n\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\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\17\3\17\3\17\3\17\3"+
-		"\17\3\17\3\17\3\20\3\20\3\20\3\20\3\20\3\21\3\21\3\21\3\21\3\21\3\22\3"+
-		"\22\3\22\3\22\3\22\3\22\3\22\3\22\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\24\3\24\3\25\3\25\3\25\3\25\3\25\3\25\3\26\3"+
-		"\26\3\26\3\26\3\27\3\27\3\27\3\30\3\30\3\30\3\30\3\30\3\31\3\31\3\31\3"+
-		"\31\3\31\3\31\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\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\34\3\34\3"+
-		"\34\3\34\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\36\3\36\3"+
-		"\36\3\36\3\36\3\37\3\37\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\60\3\60\3\60\3\60\3\61\3\61\3\61\3\61\3\61\3\62\3\62\3\62\3"+
-		"\62\3\62\3\62\3\62\3\62\3\62\3\63\3\63\3\63\3\63\3\63\3\63\3\64\3\64\3"+
-		"\64\3\64\5\64\u028d\n\64\3\65\3\65\5\65\u0291\n\65\3\66\3\66\5\66\u0295"+
-		"\n\66\3\67\3\67\5\67\u0299\n\67\38\38\58\u029d\n8\39\39\3:\3:\3:\5:\u02a4"+
-		"\n:\3:\3:\3:\5:\u02a9\n:\5:\u02ab\n:\3;\3;\5;\u02af\n;\3;\5;\u02b2\n;"+
-		"\3<\3<\5<\u02b6\n<\3=\3=\3>\6>\u02bb\n>\r>\16>\u02bc\3?\3?\5?\u02c1\n"+
-		"?\3@\6@\u02c4\n@\r@\16@\u02c5\3A\3A\3A\3A\3B\3B\5B\u02ce\nB\3B\5B\u02d1"+
-		"\nB\3C\3C\3D\6D\u02d6\nD\rD\16D\u02d7\3E\3E\5E\u02dc\nE\3F\3F\5F\u02e0"+
-		"\nF\3F\3F\3G\3G\5G\u02e6\nG\3G\5G\u02e9\nG\3H\3H\3I\6I\u02ee\nI\rI\16"+
-		"I\u02ef\3J\3J\5J\u02f4\nJ\3K\3K\3K\3K\3L\3L\5L\u02fc\nL\3L\5L\u02ff\n"+
-		"L\3M\3M\3N\6N\u0304\nN\rN\16N\u0305\3O\3O\5O\u030a\nO\3P\3P\5P\u030e\n"+
-		"P\3Q\3Q\3Q\5Q\u0313\nQ\3Q\5Q\u0316\nQ\3Q\5Q\u0319\nQ\3Q\3Q\3Q\5Q\u031e"+
-		"\nQ\3Q\5Q\u0321\nQ\3Q\3Q\3Q\5Q\u0326\nQ\3Q\3Q\3Q\5Q\u032b\nQ\3R\3R\3R"+
-		"\3S\3S\3T\5T\u0333\nT\3T\3T\3U\3U\3V\3V\3W\3W\3W\5W\u033e\nW\3X\3X\5X"+
-		"\u0342\nX\3X\3X\3X\5X\u0347\nX\3X\3X\5X\u034b\nX\3Y\3Y\3Y\3Z\3Z\3[\3["+
-		"\3[\3[\3[\3[\3[\3[\3[\5[\u035b\n[\3\\\3\\\3\\\3\\\3\\\3\\\3\\\3\\\5\\"+
-		"\u0365\n\\\3]\3]\3^\3^\5^\u036b\n^\3^\3^\3_\6_\u0370\n_\r_\16_\u0371\3"+
-		"`\3`\5`\u0376\n`\3a\3a\3a\3a\5a\u037c\na\3b\3b\3b\3b\3b\3b\3b\3b\3b\3"+
-		"b\3b\5b\u0389\nb\3c\3c\3d\3d\3d\3d\3d\3d\3d\3e\3e\3e\3e\3e\3f\3f\3g\3"+
-		"g\3h\3h\3i\3i\3j\3j\3k\3k\3l\3l\3m\3m\3n\3n\3o\3o\3p\3p\3q\3q\3r\3r\3"+
-		"s\3s\3t\3t\3u\3u\3v\3v\3v\3w\3w\3w\3x\3x\3x\3y\3y\3y\3z\3z\3z\3{\3{\3"+
-		"{\3|\3|\3|\3}\3}\3}\3~\3~\3\177\3\177\3\u0080\3\u0080\3\u0081\3\u0081"+
-		"\3\u0082\3\u0082\3\u0083\3\u0083\3\u0084\3\u0084\3\u0085\3\u0085\3\u0086"+
-		"\3\u0086\3\u0086\3\u0087\3\u0087\3\u0087\3\u0088\3\u0088\3\u0088\3\u0089"+
-		"\3\u0089\3\u0089\3\u008a\3\u008a\3\u008a\3\u008b\3\u008b\3\u008b\3\u008c"+
-		"\3\u008c\3\u008c\3\u008d\3\u008d\3\u008d\3\u008e\3\u008e\3\u008e\3\u008f"+
-		"\3\u008f\3\u008f\3\u0090\3\u0090\3\u0090\3\u0090\3\u0091\3\u0091\3\u0091"+
-		"\3\u0091\3\u0092\3\u0092\3\u0092\3\u0092\3\u0092\3\u0093\3\u0093\7\u0093"+
-		"\u040e\n\u0093\f\u0093\16\u0093\u0411\13\u0093\3\u0094\3\u0094\3\u0094"+
-		"\3\u0094\3\u0094\3\u0094\5\u0094\u0419\n\u0094\3\u0095\3\u0095\3\u0095"+
-		"\3\u0095\3\u0095\3\u0095\5\u0095\u0421\n\u0095\3\u0096\3\u0096\3\u0097"+
-		"\3\u0097\3\u0097\3\u0097\3\u0098\6\u0098\u042a\n\u0098\r\u0098\16\u0098"+
-		"\u042b\3\u0098\3\u0098\3\u0099\3\u0099\3\u0099\3\u0099\7\u0099\u0434\n"+
-		"\u0099\f\u0099\16\u0099\u0437\13\u0099\3\u0099\3\u0099\3\u0099\3\u0099"+
-		"\3\u0099\3\u009a\3\u009a\3\u009a\3\u009a\7\u009a\u0442\n\u009a\f\u009a"+
-		"\16\u009a\u0445\13\u009a\3\u009a\3\u009a\3\u0435\2\u009b\3\3\5\4\7\5\t"+
-		"\6\13\7\r\b\17\t\21\n\23\13\25\f\27\r\31\16\33\17\35\20\37\21!\22#\23"+
-		"%\24\'\25)\26+\27-\30/\31\61\32\63\33\65\34\67\359\36;\37= ?!A\"C#E$G"+
-		"%I&K\'M(O)Q*S+U,W-Y.[/]\60_\61a\62c\63e\64g\65i\2k\2m\2o\2q\2s\2u\2w\2"+
-		"y\2{\2}\2\177\2\u0081\2\u0083\2\u0085\2\u0087\2\u0089\2\u008b\2\u008d"+
-		"\2\u008f\2\u0091\2\u0093\2\u0095\2\u0097\2\u0099\2\u009b\2\u009d\2\u009f"+
-		"\66\u00a1\2\u00a3\2\u00a5\2\u00a7\2\u00a9\2\u00ab\2\u00ad\2\u00af\2\u00b1"+
-		"\2\u00b3\2\u00b5\67\u00b78\u00b9\2\u00bb9\u00bd\2\u00bf\2\u00c1\2\u00c3"+
-		"\2\u00c5\2\u00c7\2\u00c9:\u00cb;\u00cd<\u00cf=\u00d1>\u00d3?\u00d5@\u00d7"+
-		"A\u00d9B\u00dbC\u00ddD\u00dfE\u00e1F\u00e3G\u00e5H\u00e7I\u00e9J\u00eb"+
-		"K\u00edL\u00efM\u00f1N\u00f3O\u00f5P\u00f7Q\u00f9R\u00fbS\u00fdT\u00ff"+
-		"U\u0101V\u0103W\u0105X\u0107Y\u0109Z\u010b[\u010d\\\u010f]\u0111^\u0113"+
-		"_\u0115`\u0117a\u0119b\u011bc\u011dd\u011fe\u0121f\u0123g\u0125h\u0127"+
-		"\2\u0129\2\u012bi\u012dj\u012fk\u0131l\u0133m\3\2\30\4\2NNnn\3\2\63;\4"+
-		"\2ZZzz\5\2\62;CHch\3\2\629\4\2DDdd\3\2\62\63\4\2GGgg\4\2--//\6\2FFHHf"+
-		"fhh\4\2RRrr\4\2))^^\4\2$$^^\n\2$$))^^ddhhppttvv\3\2\62\65\6\2&&C\\aac"+
-		"|\4\2\2\u0081\ud802\udc01\3\2\ud802\udc01\3\2\udc02\ue001\7\2&&\62;C\\"+
-		"aac|\5\2\13\f\16\17\"\"\4\2\f\f\17\17\2\u0456\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\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\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#\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\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;\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\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\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\2a\3\2\2\2\2c\3\2\2\2\2e\3\2"+
-		"\2\2\2g\3\2\2\2\2\u009f\3\2\2\2\2\u00b5\3\2\2\2\2\u00b7\3\2\2\2\2\u00bb"+
-		"\3\2\2\2\2\u00c9\3\2\2\2\2\u00cb\3\2\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\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\2\2\u00f1\3\2\2\2\2\u00f3\3\2\2"+
-		"\2\2\u00f5\3\2\2\2\2\u00f7\3\2\2\2\2\u00f9\3\2\2\2\2\u00fb\3\2\2\2\2\u00fd"+
-		"\3\2\2\2\2\u00ff\3\2\2\2\2\u0101\3\2\2\2\2\u0103\3\2\2\2\2\u0105\3\2\2"+
-		"\2\2\u0107\3\2\2\2\2\u0109\3\2\2\2\2\u010b\3\2\2\2\2\u010d\3\2\2\2\2\u010f"+
-		"\3\2\2\2\2\u0111\3\2\2\2\2\u0113\3\2\2\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\u012b\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\3\u0135\3\2\2\2\5\u013e"+
-		"\3\2\2\2\7\u0145\3\2\2\2\t\u014d\3\2\2\2\13\u0153\3\2\2\2\r\u0158\3\2"+
-		"\2\2\17\u015d\3\2\2\2\21\u0163\3\2\2\2\23\u0168\3\2\2\2\25\u016e\3\2\2"+
-		"\2\27\u0174\3\2\2\2\31\u017d\3\2\2\2\33\u0185\3\2\2\2\35\u0188\3\2\2\2"+
-		"\37\u018f\3\2\2\2!\u0194\3\2\2\2#\u0199\3\2\2\2%\u01a1\3\2\2\2\'\u01a7"+
-		"\3\2\2\2)\u01af\3\2\2\2+\u01b5\3\2\2\2-\u01b9\3\2\2\2/\u01bc\3\2\2\2\61"+
-		"\u01c1\3\2\2\2\63\u01cc\3\2\2\2\65\u01d3\3\2\2\2\67\u01de\3\2\2\29\u01e2"+
-		"\3\2\2\2;\u01ec\3\2\2\2=\u01f1\3\2\2\2?\u01f8\3\2\2\2A\u01fc\3\2\2\2C"+
-		"\u0204\3\2\2\2E\u020c\3\2\2\2G\u0216\3\2\2\2I\u021d\3\2\2\2K\u0224\3\2"+
-		"\2\2M\u022a\3\2\2\2O\u0231\3\2\2\2Q\u023a\3\2\2\2S\u0240\3\2\2\2U\u0247"+
-		"\3\2\2\2W\u0254\3\2\2\2Y\u0259\3\2\2\2[\u025f\3\2\2\2]\u0266\3\2\2\2_"+
-		"\u0270\3\2\2\2a\u0274\3\2\2\2c\u0279\3\2\2\2e\u0282\3\2\2\2g\u028c\3\2"+
-		"\2\2i\u028e\3\2\2\2k\u0292\3\2\2\2m\u0296\3\2\2\2o\u029a\3\2\2\2q\u029e"+
-		"\3\2\2\2s\u02aa\3\2\2\2u\u02ac\3\2\2\2w\u02b5\3\2\2\2y\u02b7\3\2\2\2{"+
-		"\u02ba\3\2\2\2}\u02c0\3\2\2\2\177\u02c3\3\2\2\2\u0081\u02c7\3\2\2\2\u0083"+
-		"\u02cb\3\2\2\2\u0085\u02d2\3\2\2\2\u0087\u02d5\3\2\2\2\u0089\u02db\3\2"+
-		"\2\2\u008b\u02dd\3\2\2\2\u008d\u02e3\3\2\2\2\u008f\u02ea\3\2\2\2\u0091"+
-		"\u02ed\3\2\2\2\u0093\u02f3\3\2\2\2\u0095\u02f5\3\2\2\2\u0097\u02f9\3\2"+
-		"\2\2\u0099\u0300\3\2\2\2\u009b\u0303\3\2\2\2\u009d\u0309\3\2\2\2\u009f"+
-		"\u030d\3\2\2\2\u00a1\u032a\3\2\2\2\u00a3\u032c\3\2\2\2\u00a5\u032f\3\2"+
-		"\2\2\u00a7\u0332\3\2\2\2\u00a9\u0336\3\2\2\2\u00ab\u0338\3\2\2\2\u00ad"+
-		"\u033a\3\2\2\2\u00af\u034a\3\2\2\2\u00b1\u034c\3\2\2\2\u00b3\u034f\3\2"+
-		"\2\2\u00b5\u035a\3\2\2\2\u00b7\u0364\3\2\2\2\u00b9\u0366\3\2\2\2\u00bb"+
-		"\u0368\3\2\2\2\u00bd\u036f\3\2\2\2\u00bf\u0375\3\2\2\2\u00c1\u037b\3\2"+
-		"\2\2\u00c3\u0388\3\2\2\2\u00c5\u038a\3\2\2\2\u00c7\u038c\3\2\2\2\u00c9"+
-		"\u0393\3\2\2\2\u00cb\u0398\3\2\2\2\u00cd\u039a\3\2\2\2\u00cf\u039c\3\2"+
-		"\2\2\u00d1\u039e\3\2\2\2\u00d3\u03a0\3\2\2\2\u00d5\u03a2\3\2\2\2\u00d7"+
-		"\u03a4\3\2\2\2\u00d9\u03a6\3\2\2\2\u00db\u03a8\3\2\2\2\u00dd\u03aa\3\2"+
-		"\2\2\u00df\u03ac\3\2\2\2\u00e1\u03ae\3\2\2\2\u00e3\u03b0\3\2\2\2\u00e5"+
-		"\u03b2\3\2\2\2\u00e7\u03b4\3\2\2\2\u00e9\u03b6\3\2\2\2\u00eb\u03b8\3\2"+
-		"\2\2\u00ed\u03bb\3\2\2\2\u00ef\u03be\3\2\2\2\u00f1\u03c1\3\2\2\2\u00f3"+
-		"\u03c4\3\2\2\2\u00f5\u03c7\3\2\2\2\u00f7\u03ca\3\2\2\2\u00f9\u03cd\3\2"+
-		"\2\2\u00fb\u03d0\3\2\2\2\u00fd\u03d2\3\2\2\2\u00ff\u03d4\3\2\2\2\u0101"+
-		"\u03d6\3\2\2\2\u0103\u03d8\3\2\2\2\u0105\u03da\3\2\2\2\u0107\u03dc\3\2"+
-		"\2\2\u0109\u03de\3\2\2\2\u010b\u03e0\3\2\2\2\u010d\u03e3\3\2\2\2\u010f"+
-		"\u03e6\3\2\2\2\u0111\u03e9\3\2\2\2\u0113\u03ec\3\2\2\2\u0115\u03ef\3\2"+
-		"\2\2\u0117\u03f2\3\2\2\2\u0119\u03f5\3\2\2\2\u011b\u03f8\3\2\2\2\u011d"+
-		"\u03fb\3\2\2\2\u011f\u03fe\3\2\2\2\u0121\u0402\3\2\2\2\u0123\u0406\3\2"+
-		"\2\2\u0125\u040b\3\2\2\2\u0127\u0418\3\2\2\2\u0129\u0420\3\2\2\2\u012b"+
-		"\u0422\3\2\2\2\u012d\u0424\3\2\2\2\u012f\u0429\3\2\2\2\u0131\u042f\3\2"+
-		"\2\2\u0133\u043d\3\2\2\2\u0135\u0136\7c\2\2\u0136\u0137\7d\2\2\u0137\u0138"+
-		"\7u\2\2\u0138\u0139\7v\2\2\u0139\u013a\7t\2\2\u013a\u013b\7c\2\2\u013b"+
-		"\u013c\7e\2\2\u013c\u013d\7v\2\2\u013d\4\3\2\2\2\u013e\u013f\7c\2\2\u013f"+
-		"\u0140\7u\2\2\u0140\u0141\7u\2\2\u0141\u0142\7g\2\2\u0142\u0143\7t\2\2"+
-		"\u0143\u0144\7v\2\2\u0144\6\3\2\2\2\u0145\u0146\7d\2\2\u0146\u0147\7q"+
-		"\2\2\u0147\u0148\7q\2\2\u0148\u0149\7n\2\2\u0149\u014a\7g\2\2\u014a\u014b"+
-		"\7c\2\2\u014b\u014c\7p\2\2\u014c\b\3\2\2\2\u014d\u014e\7d\2\2\u014e\u014f"+
-		"\7t\2\2\u014f\u0150\7g\2\2\u0150\u0151\7c\2\2\u0151\u0152\7m\2\2\u0152"+
-		"\n\3\2\2\2\u0153\u0154\7d\2\2\u0154\u0155\7{\2\2\u0155\u0156\7v\2\2\u0156"+
-		"\u0157\7g\2\2\u0157\f\3\2\2\2\u0158\u0159\7e\2\2\u0159\u015a\7c\2\2\u015a"+
-		"\u015b\7u\2\2\u015b\u015c\7g\2\2\u015c\16\3\2\2\2\u015d\u015e\7e\2\2\u015e"+
-		"\u015f\7c\2\2\u015f\u0160\7v\2\2\u0160\u0161\7e\2\2\u0161\u0162\7j\2\2"+
-		"\u0162\20\3\2\2\2\u0163\u0164\7e\2\2\u0164\u0165\7j\2\2\u0165\u0166\7"+
-		"c\2\2\u0166\u0167\7t\2\2\u0167\22\3\2\2\2\u0168\u0169\7e\2\2\u0169\u016a"+
-		"\7n\2\2\u016a\u016b\7c\2\2\u016b\u016c\7u\2\2\u016c\u016d\7u\2\2\u016d"+
-		"\24\3\2\2\2\u016e\u016f\7e\2\2\u016f\u0170\7q\2\2\u0170\u0171\7p\2\2\u0171"+
-		"\u0172\7u\2\2\u0172\u0173\7v\2\2\u0173\26\3\2\2\2\u0174\u0175\7e\2\2\u0175"+
-		"\u0176\7q\2\2\u0176\u0177\7p\2\2\u0177\u0178\7v\2\2\u0178\u0179\7k\2\2"+
-		"\u0179\u017a\7p\2\2\u017a\u017b\7w\2\2\u017b\u017c\7g\2\2\u017c\30\3\2"+
-		"\2\2\u017d\u017e\7f\2\2\u017e\u017f\7g\2\2\u017f\u0180\7h\2\2\u0180\u0181"+
-		"\7c\2\2\u0181\u0182\7w\2\2\u0182\u0183\7n\2\2\u0183\u0184\7v\2\2\u0184"+
-		"\32\3\2\2\2\u0185\u0186\7f\2\2\u0186\u0187\7q\2\2\u0187\34\3\2\2\2\u0188"+
-		"\u0189\7f\2\2\u0189\u018a\7q\2\2\u018a\u018b\7w\2\2\u018b\u018c\7d\2\2"+
-		"\u018c\u018d\7n\2\2\u018d\u018e\7g\2\2\u018e\36\3\2\2\2\u018f\u0190\7"+
-		"g\2\2\u0190\u0191\7n\2\2\u0191\u0192\7u\2\2\u0192\u0193\7g\2\2\u0193 "+
-		"\3\2\2\2\u0194\u0195\7g\2\2\u0195\u0196\7p\2\2\u0196\u0197\7w\2\2\u0197"+
-		"\u0198\7o\2\2\u0198\"\3\2\2\2\u0199\u019a\7g\2\2\u019a\u019b\7z\2\2\u019b"+
-		"\u019c\7v\2\2\u019c\u019d\7g\2\2\u019d\u019e\7p\2\2\u019e\u019f\7f\2\2"+
-		"\u019f\u01a0\7u\2\2\u01a0$\3\2\2\2\u01a1\u01a2\7h\2\2\u01a2\u01a3\7k\2"+
-		"\2\u01a3\u01a4\7p\2\2\u01a4\u01a5\7c\2\2\u01a5\u01a6\7n\2\2\u01a6&\3\2"+
-		"\2\2\u01a7\u01a8\7h\2\2\u01a8\u01a9\7k\2\2\u01a9\u01aa\7p\2\2\u01aa\u01ab"+
-		"\7c\2\2\u01ab\u01ac\7n\2\2\u01ac\u01ad\7n\2\2\u01ad\u01ae\7{\2\2\u01ae"+
-		"(\3\2\2\2\u01af\u01b0\7h\2\2\u01b0\u01b1\7n\2\2\u01b1\u01b2\7q\2\2\u01b2"+
-		"\u01b3\7c\2\2\u01b3\u01b4\7v\2\2\u01b4*\3\2\2\2\u01b5\u01b6\7h\2\2\u01b6"+
-		"\u01b7\7q\2\2\u01b7\u01b8\7t\2\2\u01b8,\3\2\2\2\u01b9\u01ba\7k\2\2\u01ba"+
-		"\u01bb\7h\2\2\u01bb.\3\2\2\2\u01bc\u01bd\7i\2\2\u01bd\u01be\7q\2\2\u01be"+
-		"\u01bf\7v\2\2\u01bf\u01c0\7q\2\2\u01c0\60\3\2\2\2\u01c1\u01c2\7k\2\2\u01c2"+
-		"\u01c3\7o\2\2\u01c3\u01c4\7r\2\2\u01c4\u01c5\7n\2\2\u01c5\u01c6\7g\2\2"+
-		"\u01c6\u01c7\7o\2\2\u01c7\u01c8\7g\2\2\u01c8\u01c9\7p\2\2\u01c9\u01ca"+
-		"\7v\2\2\u01ca\u01cb\7u\2\2\u01cb\62\3\2\2\2\u01cc\u01cd\7k\2\2\u01cd\u01ce"+
-		"\7o\2\2\u01ce\u01cf\7r\2\2\u01cf\u01d0\7q\2\2\u01d0\u01d1\7t\2\2\u01d1"+
-		"\u01d2\7v\2\2\u01d2\64\3\2\2\2\u01d3\u01d4\7k\2\2\u01d4\u01d5\7p\2\2\u01d5"+
-		"\u01d6\7u\2\2\u01d6\u01d7\7v\2\2\u01d7\u01d8\7c\2\2\u01d8\u01d9\7p\2\2"+
-		"\u01d9\u01da\7e\2\2\u01da\u01db\7g\2\2\u01db\u01dc\7q\2\2\u01dc\u01dd"+
-		"\7h\2\2\u01dd\66\3\2\2\2\u01de\u01df\7k\2\2\u01df\u01e0\7p\2\2\u01e0\u01e1"+
-		"\7v\2\2\u01e18\3\2\2\2\u01e2\u01e3\7k\2\2\u01e3\u01e4\7p\2\2\u01e4\u01e5"+
-		"\7v\2\2\u01e5\u01e6\7g\2\2\u01e6\u01e7\7t\2\2\u01e7\u01e8\7h\2\2\u01e8"+
-		"\u01e9\7c\2\2\u01e9\u01ea\7e\2\2\u01ea\u01eb\7g\2\2\u01eb:\3\2\2\2\u01ec"+
-		"\u01ed\7n\2\2\u01ed\u01ee\7q\2\2\u01ee\u01ef\7p\2\2\u01ef\u01f0\7i\2\2"+
-		"\u01f0<\3\2\2\2\u01f1\u01f2\7p\2\2\u01f2\u01f3\7c\2\2\u01f3\u01f4\7v\2"+
-		"\2\u01f4\u01f5\7k\2\2\u01f5\u01f6\7x\2\2\u01f6\u01f7\7g\2\2\u01f7>\3\2"+
-		"\2\2\u01f8\u01f9\7p\2\2\u01f9\u01fa\7g\2\2\u01fa\u01fb\7y\2\2\u01fb@\3"+
-		"\2\2\2\u01fc\u01fd\7r\2\2\u01fd\u01fe\7c\2\2\u01fe\u01ff\7e\2\2\u01ff"+
-		"\u0200\7m\2\2\u0200\u0201\7c\2\2\u0201\u0202\7i\2\2\u0202\u0203\7g\2\2"+
-		"\u0203B\3\2\2\2\u0204\u0205\7r\2\2\u0205\u0206\7t\2\2\u0206\u0207\7k\2"+
-		"\2\u0207\u0208\7x\2\2\u0208\u0209\7c\2\2\u0209\u020a\7v\2\2\u020a\u020b"+
-		"\7g\2\2\u020bD\3\2\2\2\u020c\u020d\7r\2\2\u020d\u020e\7t\2\2\u020e\u020f"+
-		"\7q\2\2\u020f\u0210\7v\2\2\u0210\u0211\7g\2\2\u0211\u0212\7e\2\2\u0212"+
-		"\u0213\7v\2\2\u0213\u0214\7g\2\2\u0214\u0215\7f\2\2\u0215F\3\2\2\2\u0216"+
-		"\u0217\7r\2\2\u0217\u0218\7w\2\2\u0218\u0219\7d\2\2\u0219\u021a\7n\2\2"+
-		"\u021a\u021b\7k\2\2\u021b\u021c\7e\2\2\u021cH\3\2\2\2\u021d\u021e\7t\2"+
-		"\2\u021e\u021f\7g\2\2\u021f\u0220\7v\2\2\u0220\u0221\7w\2\2\u0221\u0222"+
-		"\7t\2\2\u0222\u0223\7p\2\2\u0223J\3\2\2\2\u0224\u0225\7u\2\2\u0225\u0226"+
-		"\7j\2\2\u0226\u0227\7q\2\2\u0227\u0228\7t\2\2\u0228\u0229\7v\2\2\u0229"+
-		"L\3\2\2\2\u022a\u022b\7u\2\2\u022b\u022c\7v\2\2\u022c\u022d\7c\2\2\u022d"+
-		"\u022e\7v\2\2\u022e\u022f\7k\2\2\u022f\u0230\7e\2\2\u0230N\3\2\2\2\u0231"+
-		"\u0232\7u\2\2\u0232\u0233\7v\2\2\u0233\u0234\7t\2\2\u0234\u0235\7k\2\2"+
-		"\u0235\u0236\7e\2\2\u0236\u0237\7v\2\2\u0237\u0238\7h\2\2\u0238\u0239"+
-		"\7r\2\2\u0239P\3\2\2\2\u023a\u023b\7u\2\2\u023b\u023c\7w\2\2\u023c\u023d"+
-		"\7r\2\2\u023d\u023e\7g\2\2\u023e\u023f\7t\2\2\u023fR\3\2\2\2\u0240\u0241"+
-		"\7u\2\2\u0241\u0242\7y\2\2\u0242\u0243\7k\2\2\u0243\u0244\7v\2\2\u0244"+
-		"\u0245\7e\2\2\u0245\u0246\7j\2\2\u0246T\3\2\2\2\u0247\u0248\7u\2\2\u0248"+
-		"\u0249\7{\2\2\u0249\u024a\7p\2\2\u024a\u024b\7e\2\2\u024b\u024c\7j\2\2"+
-		"\u024c\u024d\7t\2\2\u024d\u024e\7q\2\2\u024e\u024f\7p\2\2\u024f\u0250"+
-		"\7k\2\2\u0250\u0251\7|\2\2\u0251\u0252\7g\2\2\u0252\u0253\7f\2\2\u0253"+
-		"V\3\2\2\2\u0254\u0255\7v\2\2\u0255\u0256\7j\2\2\u0256\u0257\7k\2\2\u0257"+
-		"\u0258\7u\2\2\u0258X\3\2\2\2\u0259\u025a\7v\2\2\u025a\u025b\7j\2\2\u025b"+
-		"\u025c\7t\2\2\u025c\u025d\7q\2\2\u025d\u025e\7y\2\2\u025eZ\3\2\2\2\u025f"+
-		"\u0260\7v\2\2\u0260\u0261\7j\2\2\u0261\u0262\7t\2\2\u0262\u0263\7q\2\2"+
-		"\u0263\u0264\7y\2\2\u0264\u0265\7u\2\2\u0265\\\3\2\2\2\u0266\u0267\7v"+
-		"\2\2\u0267\u0268\7t\2\2\u0268\u0269\7c\2\2\u0269\u026a\7p\2\2\u026a\u026b"+
-		"\7u\2\2\u026b\u026c\7k\2\2\u026c\u026d\7g\2\2\u026d\u026e\7p\2\2\u026e"+
-		"\u026f\7v\2\2\u026f^\3\2\2\2\u0270\u0271\7v\2\2\u0271\u0272\7t\2\2\u0272"+
-		"\u0273\7{\2\2\u0273`\3\2\2\2\u0274\u0275\7x\2\2\u0275\u0276\7q\2\2\u0276"+
-		"\u0277\7k\2\2\u0277\u0278\7f\2\2\u0278b\3\2\2\2\u0279\u027a\7x\2\2\u027a"+
-		"\u027b\7q\2\2\u027b\u027c\7n\2\2\u027c\u027d\7c\2\2\u027d\u027e\7v\2\2"+
-		"\u027e\u027f\7k\2\2\u027f\u0280\7n\2\2\u0280\u0281\7g\2\2\u0281d\3\2\2"+
-		"\2\u0282\u0283\7y\2\2\u0283\u0284\7j\2\2\u0284\u0285\7k\2\2\u0285\u0286"+
-		"\7n\2\2\u0286\u0287\7g\2\2\u0287f\3\2\2\2\u0288\u028d\5i\65\2\u0289\u028d"+
-		"\5k\66\2\u028a\u028d\5m\67\2\u028b\u028d\5o8\2\u028c\u0288\3\2\2\2\u028c"+
-		"\u0289\3\2\2\2\u028c\u028a\3\2\2\2\u028c\u028b\3\2\2\2\u028dh\3\2\2\2"+
-		"\u028e\u0290\5s:\2\u028f\u0291\5q9\2\u0290\u028f\3\2\2\2\u0290\u0291\3"+
-		"\2\2\2\u0291j\3\2\2\2\u0292\u0294\5\u0081A\2\u0293\u0295\5q9\2\u0294\u0293"+
-		"\3\2\2\2\u0294\u0295\3\2\2\2\u0295l\3\2\2\2\u0296\u0298\5\u008bF\2\u0297"+
-		"\u0299\5q9\2\u0298\u0297\3\2\2\2\u0298\u0299\3\2\2\2\u0299n\3\2\2\2\u029a"+
-		"\u029c\5\u0095K\2\u029b\u029d\5q9\2\u029c\u029b\3\2\2\2\u029c\u029d\3"+
-		"\2\2\2\u029dp\3\2\2\2\u029e\u029f\t\2\2\2\u029fr\3\2\2\2\u02a0\u02ab\7"+
-		"\62\2\2\u02a1\u02a8\5y=\2\u02a2\u02a4\5u;\2\u02a3\u02a2\3\2\2\2\u02a3"+
-		"\u02a4\3\2\2\2\u02a4\u02a9\3\2\2\2\u02a5\u02a6\5\177@\2\u02a6\u02a7\5"+
-		"u;\2\u02a7\u02a9\3\2\2\2\u02a8\u02a3\3\2\2\2\u02a8\u02a5\3\2\2\2\u02a9"+
-		"\u02ab\3\2\2\2\u02aa\u02a0\3\2\2\2\u02aa\u02a1\3\2\2\2\u02abt\3\2\2\2"+
-		"\u02ac\u02b1\5w<\2\u02ad\u02af\5{>\2\u02ae\u02ad\3\2\2\2\u02ae\u02af\3"+
-		"\2\2\2\u02af\u02b0\3\2\2\2\u02b0\u02b2\5w<\2\u02b1\u02ae\3\2\2\2\u02b1"+
-		"\u02b2\3\2\2\2\u02b2v\3\2\2\2\u02b3\u02b6\7\62\2\2\u02b4\u02b6\5y=\2\u02b5"+
-		"\u02b3\3\2\2\2\u02b5\u02b4\3\2\2\2\u02b6x\3\2\2\2\u02b7\u02b8\t\3\2\2"+
-		"\u02b8z\3\2\2\2\u02b9\u02bb\5}?\2\u02ba\u02b9\3\2\2\2\u02bb\u02bc\3\2"+
-		"\2\2\u02bc\u02ba\3\2\2\2\u02bc\u02bd\3\2\2\2\u02bd|\3\2\2\2\u02be\u02c1"+
-		"\5w<\2\u02bf\u02c1\7a\2\2\u02c0\u02be\3\2\2\2\u02c0\u02bf\3\2\2\2\u02c1"+
-		"~\3\2\2\2\u02c2\u02c4\7a\2\2\u02c3\u02c2\3\2\2\2\u02c4\u02c5\3\2\2\2\u02c5"+
-		"\u02c3\3\2\2\2\u02c5\u02c6\3\2\2\2\u02c6\u0080\3\2\2\2\u02c7\u02c8\7\62"+
-		"\2\2\u02c8\u02c9\t\4\2\2\u02c9\u02ca\5\u0083B\2\u02ca\u0082\3\2\2\2\u02cb"+
-		"\u02d0\5\u0085C\2\u02cc\u02ce\5\u0087D\2\u02cd\u02cc\3\2\2\2\u02cd\u02ce"+
-		"\3\2\2\2\u02ce\u02cf\3\2\2\2\u02cf\u02d1\5\u0085C\2\u02d0\u02cd\3\2\2"+
-		"\2\u02d0\u02d1\3\2\2\2\u02d1\u0084\3\2\2\2\u02d2\u02d3\t\5\2\2\u02d3\u0086"+
-		"\3\2\2\2\u02d4\u02d6\5\u0089E\2\u02d5\u02d4\3\2\2\2\u02d6\u02d7\3\2\2"+
-		"\2\u02d7\u02d5\3\2\2\2\u02d7\u02d8\3\2\2\2\u02d8\u0088\3\2\2\2\u02d9\u02dc"+
-		"\5\u0085C\2\u02da\u02dc\7a\2\2\u02db\u02d9\3\2\2\2\u02db\u02da\3\2\2\2"+
-		"\u02dc\u008a\3\2\2\2\u02dd\u02df\7\62\2\2\u02de\u02e0\5\177@\2\u02df\u02de"+
-		"\3\2\2\2\u02df\u02e0\3\2\2\2\u02e0\u02e1\3\2\2\2\u02e1\u02e2\5\u008dG"+
-		"\2\u02e2\u008c\3\2\2\2\u02e3\u02e8\5\u008fH\2\u02e4\u02e6\5\u0091I\2\u02e5"+
-		"\u02e4\3\2\2\2\u02e5\u02e6\3\2\2\2\u02e6\u02e7\3\2\2\2\u02e7\u02e9\5\u008f"+
-		"H\2\u02e8\u02e5\3\2\2\2\u02e8\u02e9\3\2\2\2\u02e9\u008e\3\2\2\2\u02ea"+
-		"\u02eb\t\6\2\2\u02eb\u0090\3\2\2\2\u02ec\u02ee\5\u0093J\2\u02ed\u02ec"+
-		"\3\2\2\2\u02ee\u02ef\3\2\2\2\u02ef\u02ed\3\2\2\2\u02ef\u02f0\3\2\2\2\u02f0"+
-		"\u0092\3\2\2\2\u02f1\u02f4\5\u008fH\2\u02f2\u02f4\7a\2\2\u02f3\u02f1\3"+
-		"\2\2\2\u02f3\u02f2\3\2\2\2\u02f4\u0094\3\2\2\2\u02f5\u02f6\7\62\2\2\u02f6"+
-		"\u02f7\t\7\2\2\u02f7\u02f8\5\u0097L\2\u02f8\u0096\3\2\2\2\u02f9\u02fe"+
-		"\5\u0099M\2\u02fa\u02fc\5\u009bN\2\u02fb\u02fa\3\2\2\2\u02fb\u02fc\3\2"+
-		"\2\2\u02fc\u02fd\3\2\2\2\u02fd\u02ff\5\u0099M\2\u02fe\u02fb\3\2\2\2\u02fe"+
-		"\u02ff\3\2\2\2\u02ff\u0098\3\2\2\2\u0300\u0301\t\b\2\2\u0301\u009a\3\2"+
-		"\2\2\u0302\u0304\5\u009dO\2\u0303\u0302\3\2\2\2\u0304\u0305\3\2\2\2\u0305"+
-		"\u0303\3\2\2\2\u0305\u0306\3\2\2\2\u0306\u009c\3\2\2\2\u0307\u030a\5\u0099"+
-		"M\2\u0308\u030a\7a\2\2\u0309\u0307\3\2\2\2\u0309\u0308\3\2\2\2\u030a\u009e"+
-		"\3\2\2\2\u030b\u030e\5\u00a1Q\2\u030c\u030e\5\u00adW\2\u030d\u030b\3\2"+
-		"\2\2\u030d\u030c\3\2\2\2\u030e\u00a0\3\2\2\2\u030f\u0310\5u;\2\u0310\u0312"+
-		"\7\60\2\2\u0311\u0313\5u;\2\u0312\u0311\3\2\2\2\u0312\u0313\3\2\2\2\u0313"+
-		"\u0315\3\2\2\2\u0314\u0316\5\u00a3R\2\u0315\u0314\3\2\2\2\u0315\u0316"+
-		"\3\2\2\2\u0316\u0318\3\2\2\2\u0317\u0319\5\u00abV\2\u0318\u0317\3\2\2"+
-		"\2\u0318\u0319\3\2\2\2\u0319\u032b\3\2\2\2\u031a\u031b\7\60\2\2\u031b"+
-		"\u031d\5u;\2\u031c\u031e\5\u00a3R\2\u031d\u031c\3\2\2\2\u031d\u031e\3"+
-		"\2\2\2\u031e\u0320\3\2\2\2\u031f\u0321\5\u00abV\2\u0320\u031f\3\2\2\2"+
-		"\u0320\u0321\3\2\2\2\u0321\u032b\3\2\2\2\u0322\u0323\5u;\2\u0323\u0325"+
-		"\5\u00a3R\2\u0324\u0326\5\u00abV\2\u0325\u0324\3\2\2\2\u0325\u0326\3\2"+
-		"\2\2\u0326\u032b\3\2\2\2\u0327\u0328\5u;\2\u0328\u0329\5\u00abV\2\u0329"+
-		"\u032b\3\2\2\2\u032a\u030f\3\2\2\2\u032a\u031a\3\2\2\2\u032a\u0322\3\2"+
-		"\2\2\u032a\u0327\3\2\2\2\u032b\u00a2\3\2\2\2\u032c\u032d\5\u00a5S\2\u032d"+
-		"\u032e\5\u00a7T\2\u032e\u00a4\3\2\2\2\u032f\u0330\t\t\2\2\u0330\u00a6"+
-		"\3\2\2\2\u0331\u0333\5\u00a9U\2\u0332\u0331\3\2\2\2\u0332\u0333\3\2\2"+
-		"\2\u0333\u0334\3\2\2\2\u0334\u0335\5u;\2\u0335\u00a8\3\2\2\2\u0336\u0337"+
-		"\t\n\2\2\u0337\u00aa\3\2\2\2\u0338\u0339\t\13\2\2\u0339\u00ac\3\2\2\2"+
-		"\u033a\u033b\5\u00afX\2\u033b\u033d\5\u00b1Y\2\u033c\u033e\5\u00abV\2"+
-		"\u033d\u033c\3\2\2\2\u033d\u033e\3\2\2\2\u033e\u00ae\3\2\2\2\u033f\u0341"+
-		"\5\u0081A\2\u0340\u0342\7\60\2\2\u0341\u0340\3\2\2\2\u0341\u0342\3\2\2"+
-		"\2\u0342\u034b\3\2\2\2\u0343\u0344\7\62\2\2\u0344\u0346\t\4\2\2\u0345"+
-		"\u0347\5\u0083B\2\u0346\u0345\3\2\2\2\u0346\u0347\3\2\2\2\u0347\u0348"+
-		"\3\2\2\2\u0348\u0349\7\60\2\2\u0349\u034b\5\u0083B\2\u034a\u033f\3\2\2"+
-		"\2\u034a\u0343\3\2\2\2\u034b\u00b0\3\2\2\2\u034c\u034d\5\u00b3Z\2\u034d"+
-		"\u034e\5\u00a7T\2\u034e\u00b2\3\2\2\2\u034f\u0350\t\f\2\2\u0350\u00b4"+
-		"\3\2\2\2\u0351\u0352\7v\2\2\u0352\u0353\7t\2\2\u0353\u0354\7w\2\2\u0354"+
-		"\u035b\7g\2\2\u0355\u0356\7h\2\2\u0356\u0357\7c\2\2\u0357\u0358\7n\2\2"+
-		"\u0358\u0359\7u\2\2\u0359\u035b\7g\2\2\u035a\u0351\3\2\2\2\u035a\u0355"+
-		"\3\2\2\2\u035b\u00b6\3\2\2\2\u035c\u035d\7)\2\2\u035d\u035e\5\u00b9]\2"+
-		"\u035e\u035f\7)\2\2\u035f\u0365\3\2\2\2\u0360\u0361\7)\2\2\u0361\u0362"+
-		"\5\u00c1a\2\u0362\u0363\7)\2\2\u0363\u0365\3\2\2\2\u0364\u035c\3\2\2\2"+
-		"\u0364\u0360\3\2\2\2\u0365\u00b8\3\2\2\2\u0366\u0367\n\r\2\2\u0367\u00ba"+
-		"\3\2\2\2\u0368\u036a\7$\2\2\u0369\u036b\5\u00bd_\2\u036a\u0369\3\2\2\2"+
-		"\u036a\u036b\3\2\2\2\u036b\u036c\3\2\2\2\u036c\u036d\7$\2\2\u036d\u00bc"+
-		"\3\2\2\2\u036e\u0370\5\u00bf`\2\u036f\u036e\3\2\2\2\u0370\u0371\3\2\2"+
-		"\2\u0371\u036f\3\2\2\2\u0371\u0372\3\2\2\2\u0372\u00be\3\2\2\2\u0373\u0376"+
-		"\n\16\2\2\u0374\u0376\5\u00c1a\2\u0375\u0373\3\2\2\2\u0375\u0374\3\2\2"+
-		"\2\u0376\u00c0\3\2\2\2\u0377\u0378\7^\2\2\u0378\u037c\t\17\2\2\u0379\u037c"+
-		"\5\u00c3b\2\u037a\u037c\5\u00c7d\2\u037b\u0377\3\2\2\2\u037b\u0379\3\2"+
-		"\2\2\u037b\u037a\3\2\2\2\u037c\u00c2\3\2\2\2\u037d\u037e\7^\2\2\u037e"+
-		"\u0389\5\u008fH\2\u037f\u0380\7^\2\2\u0380\u0381\5\u008fH\2\u0381\u0382"+
-		"\5\u008fH\2\u0382\u0389\3\2\2\2\u0383\u0384\7^\2\2\u0384\u0385\5\u00c5"+
-		"c\2\u0385\u0386\5\u008fH\2\u0386\u0387\5\u008fH\2\u0387\u0389\3\2\2\2"+
-		"\u0388\u037d\3\2\2\2\u0388\u037f\3\2\2\2\u0388\u0383\3\2\2\2\u0389\u00c4"+
-		"\3\2\2\2\u038a\u038b\t\20\2\2\u038b\u00c6\3\2\2\2\u038c\u038d\7^\2\2\u038d"+
-		"\u038e\7w\2\2\u038e\u038f\5\u0085C\2\u038f\u0390\5\u0085C\2\u0390\u0391"+
-		"\5\u0085C\2\u0391\u0392\5\u0085C\2\u0392\u00c8\3\2\2\2\u0393\u0394\7p"+
-		"\2\2\u0394\u0395\7w\2\2\u0395\u0396\7n\2\2\u0396\u0397\7n\2\2\u0397\u00ca"+
-		"\3\2\2\2\u0398\u0399\7*\2\2\u0399\u00cc\3\2\2\2\u039a\u039b\7+\2\2\u039b"+
-		"\u00ce\3\2\2\2\u039c\u039d\7}\2\2\u039d\u00d0\3\2\2\2\u039e\u039f\7\177"+
-		"\2\2\u039f\u00d2\3\2\2\2\u03a0\u03a1\7]\2\2\u03a1\u00d4\3\2\2\2\u03a2"+
-		"\u03a3\7_\2\2\u03a3\u00d6\3\2\2\2\u03a4\u03a5\7=\2\2\u03a5\u00d8\3\2\2"+
-		"\2\u03a6\u03a7\7.\2\2\u03a7\u00da\3\2\2\2\u03a8\u03a9\7\60\2\2\u03a9\u00dc"+
-		"\3\2\2\2\u03aa\u03ab\7?\2\2\u03ab\u00de\3\2\2\2\u03ac\u03ad\7@\2\2\u03ad"+
-		"\u00e0\3\2\2\2\u03ae\u03af\7>\2\2\u03af\u00e2\3\2\2\2\u03b0\u03b1\7#\2"+
-		"\2\u03b1\u00e4\3\2\2\2\u03b2\u03b3\7\u0080\2\2\u03b3\u00e6\3\2\2\2\u03b4"+
-		"\u03b5\7A\2\2\u03b5\u00e8\3\2\2\2\u03b6\u03b7\7<\2\2\u03b7\u00ea\3\2\2"+
-		"\2\u03b8\u03b9\7?\2\2\u03b9\u03ba\7?\2\2\u03ba\u00ec\3\2\2\2\u03bb\u03bc"+
-		"\7>\2\2\u03bc\u03bd\7?\2\2\u03bd\u00ee\3\2\2\2\u03be\u03bf\7@\2\2\u03bf"+
-		"\u03c0\7?\2\2\u03c0\u00f0\3\2\2\2\u03c1\u03c2\7#\2\2\u03c2\u03c3\7?\2"+
-		"\2\u03c3\u00f2\3\2\2\2\u03c4\u03c5\7(\2\2\u03c5\u03c6\7(\2\2\u03c6\u00f4"+
-		"\3\2\2\2\u03c7\u03c8\7~\2\2\u03c8\u03c9\7~\2\2\u03c9\u00f6\3\2\2\2\u03ca"+
-		"\u03cb\7-\2\2\u03cb\u03cc\7-\2\2\u03cc\u00f8\3\2\2\2\u03cd\u03ce\7/\2"+
-		"\2\u03ce\u03cf\7/\2\2\u03cf\u00fa\3\2\2\2\u03d0\u03d1\7-\2\2\u03d1\u00fc"+
-		"\3\2\2\2\u03d2\u03d3\7/\2\2\u03d3\u00fe\3\2\2\2\u03d4\u03d5\7,\2\2\u03d5"+
-		"\u0100\3\2\2\2\u03d6\u03d7\7\61\2\2\u03d7\u0102\3\2\2\2\u03d8\u03d9\7"+
-		"(\2\2\u03d9\u0104\3\2\2\2\u03da\u03db\7~\2\2\u03db\u0106\3\2\2\2\u03dc"+
-		"\u03dd\7`\2\2\u03dd\u0108\3\2\2\2\u03de\u03df\7\'\2\2\u03df\u010a\3\2"+
-		"\2\2\u03e0\u03e1\7/\2\2\u03e1\u03e2\7@\2\2\u03e2\u010c\3\2\2\2\u03e3\u03e4"+
-		"\7<\2\2\u03e4\u03e5\7<\2\2\u03e5\u010e\3\2\2\2\u03e6\u03e7\7-\2\2\u03e7"+
-		"\u03e8\7?\2\2\u03e8\u0110\3\2\2\2\u03e9\u03ea\7/\2\2\u03ea\u03eb\7?\2"+
-		"\2\u03eb\u0112\3\2\2\2\u03ec\u03ed\7,\2\2\u03ed\u03ee\7?\2\2\u03ee\u0114"+
-		"\3\2\2\2\u03ef\u03f0\7\61\2\2\u03f0\u03f1\7?\2\2\u03f1\u0116\3\2\2\2\u03f2"+
-		"\u03f3\7(\2\2\u03f3\u03f4\7?\2\2\u03f4\u0118\3\2\2\2\u03f5\u03f6\7~\2"+
-		"\2\u03f6\u03f7\7?\2\2\u03f7\u011a\3\2\2\2\u03f8\u03f9\7`\2\2\u03f9\u03fa"+
-		"\7?\2\2\u03fa\u011c\3\2\2\2\u03fb\u03fc\7\'\2\2\u03fc\u03fd\7?\2\2\u03fd"+
-		"\u011e\3\2\2\2\u03fe\u03ff\7>\2\2\u03ff\u0400\7>\2\2\u0400\u0401\7?\2"+
-		"\2\u0401\u0120\3\2\2\2\u0402\u0403\7@\2\2\u0403\u0404\7@\2\2\u0404\u0405"+
-		"\7?\2\2\u0405\u0122\3\2\2\2\u0406\u0407\7@\2\2\u0407\u0408\7@\2\2\u0408"+
-		"\u0409\7@\2\2\u0409\u040a\7?\2\2\u040a\u0124\3\2\2\2\u040b\u040f\5\u0127"+
-		"\u0094\2\u040c\u040e\5\u0129\u0095\2\u040d\u040c\3\2\2\2\u040e\u0411\3"+
-		"\2\2\2\u040f\u040d\3\2\2\2\u040f\u0410\3\2\2\2\u0410\u0126\3\2\2\2\u0411"+
-		"\u040f\3\2\2\2\u0412\u0419\t\21\2\2\u0413\u0414\n\22\2\2\u0414\u0419\6"+
-		"\u0094\2\2\u0415\u0416\t\23\2\2\u0416\u0417\t\24\2\2\u0417\u0419\6\u0094"+
-		"\3\2\u0418\u0412\3\2\2\2\u0418\u0413\3\2\2\2\u0418\u0415\3\2\2\2\u0419"+
-		"\u0128\3\2\2\2\u041a\u0421\t\25\2\2\u041b\u041c\n\22\2\2\u041c\u0421\6"+
-		"\u0095\4\2\u041d\u041e\t\23\2\2\u041e\u041f\t\24\2\2\u041f\u0421\6\u0095"+
-		"\5\2\u0420\u041a\3\2\2\2\u0420\u041b\3\2\2\2\u0420\u041d\3\2\2\2\u0421"+
-		"\u012a\3\2\2\2\u0422\u0423\7B\2\2\u0423\u012c\3\2\2\2\u0424\u0425\7\60"+
-		"\2\2\u0425\u0426\7\60\2\2\u0426\u0427\7\60\2\2\u0427\u012e\3\2\2\2\u0428"+
-		"\u042a\t\26\2\2\u0429\u0428\3\2\2\2\u042a\u042b\3\2\2\2\u042b\u0429\3"+
-		"\2\2\2\u042b\u042c\3\2\2\2\u042c\u042d\3\2\2\2\u042d\u042e\b\u0098\2\2"+
-		"\u042e\u0130\3\2\2\2\u042f\u0430\7\61\2\2\u0430\u0431\7,\2\2\u0431\u0435"+
-		"\3\2\2\2\u0432\u0434\13\2\2\2\u0433\u0432\3\2\2\2\u0434\u0437\3\2\2\2"+
-		"\u0435\u0436\3\2\2\2\u0435\u0433\3\2\2\2\u0436\u0438\3\2\2\2\u0437\u0435"+
-		"\3\2\2\2\u0438\u0439\7,\2\2\u0439\u043a\7\61\2\2\u043a\u043b\3\2\2\2\u043b"+
-		"\u043c\b\u0099\2\2\u043c\u0132\3\2\2\2\u043d\u043e\7\61\2\2\u043e\u043f"+
-		"\7\61\2\2\u043f\u0443\3\2\2\2\u0440\u0442\n\27\2\2\u0441\u0440\3\2\2\2"+
-		"\u0442\u0445\3\2\2\2\u0443\u0441\3\2\2\2\u0443\u0444\3\2\2\2\u0444\u0446"+
-		"\3\2\2\2\u0445\u0443\3\2\2\2\u0446\u0447\b\u009a\2\2\u0447\u0134\3\2\2"+
-		"\28\2\u028c\u0290\u0294\u0298\u029c\u02a3\u02a8\u02aa\u02ae\u02b1\u02b5"+
-		"\u02bc\u02c0\u02c5\u02cd\u02d0\u02d7\u02db\u02df\u02e5\u02e8\u02ef\u02f3"+
-		"\u02fb\u02fe\u0305\u0309\u030d\u0312\u0315\u0318\u031d\u0320\u0325\u032a"+
-		"\u0332\u033d\u0341\u0346\u034a\u035a\u0364\u036a\u0371\u0375\u037b\u0388"+
-		"\u040f\u0418\u0420\u042b\u0435\u0443\3\b\2\2";
+		"\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\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\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\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\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\r\3\16\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\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\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\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\31\3\32\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\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\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\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\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\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\3\66\5\66\u0298\n\66\3\67\3\67\5\67\u029c\n\67\38\38\58\u02a0\n"+
+		"8\39\39\59\u02a4\n9\3:\3:\3;\3;\3;\5;\u02ab\n;\3;\3;\3;\5;\u02b0\n;\5"+
+		";\u02b2\n;\3<\3<\5<\u02b6\n<\3<\5<\u02b9\n<\3=\3=\5=\u02bd\n=\3>\3>\3"+
+		"?\6?\u02c2\n?\r?\16?\u02c3\3@\3@\5@\u02c8\n@\3A\6A\u02cb\nA\rA\16A\u02cc"+
+		"\3B\3B\3B\3B\3C\3C\5C\u02d5\nC\3C\5C\u02d8\nC\3D\3D\3E\6E\u02dd\nE\rE"+
+		"\16E\u02de\3F\3F\5F\u02e3\nF\3G\3G\5G\u02e7\nG\3G\3G\3H\3H\5H\u02ed\n"+
+		"H\3H\5H\u02f0\nH\3I\3I\3J\6J\u02f5\nJ\rJ\16J\u02f6\3K\3K\5K\u02fb\nK\3"+
+		"L\3L\3L\3L\3M\3M\5M\u0303\nM\3M\5M\u0306\nM\3N\3N\3O\6O\u030b\nO\rO\16"+
+		"O\u030c\3P\3P\5P\u0311\nP\3Q\3Q\5Q\u0315\nQ\3R\3R\3R\5R\u031a\nR\3R\5"+
+		"R\u031d\nR\3R\5R\u0320\nR\3R\3R\3R\5R\u0325\nR\3R\5R\u0328\nR\3R\3R\3"+
+		"R\5R\u032d\nR\3R\3R\3R\5R\u0332\nR\3S\3S\3S\3T\3T\3U\5U\u033a\nU\3U\3"+
+		"U\3V\3V\3W\3W\3X\3X\3X\5X\u0345\nX\3Y\3Y\5Y\u0349\nY\3Y\3Y\3Y\5Y\u034e"+
+		"\nY\3Y\3Y\5Y\u0352\nY\3Z\3Z\3Z\3[\3[\3\\\3\\\3\\\3\\\3\\\3\\\3\\\3\\\3"+
+		"\\\5\\\u0362\n\\\3]\3]\3]\3]\3]\3]\3]\3]\5]\u036c\n]\3^\3^\3_\3_\5_\u0372"+
+		"\n_\3_\3_\3`\6`\u0377\n`\r`\16`\u0378\3a\3a\5a\u037d\na\3b\3b\3b\3b\5"+
+		"b\u0383\nb\3c\3c\3c\3c\3c\3c\3c\3c\3c\3c\3c\5c\u0390\nc\3d\3d\3e\3e\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"+
+		"m\3n\3n\3o\3o\3p\3p\3q\3q\3r\3r\3s\3s\3t\3t\3u\3u\3v\3v\3w\3w\3w\3x\3"+
+		"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\u0080\3\u0081\3\u0081\3\u0082\3\u0082\3\u0083\3\u0083\3\u0084"+
+		"\3\u0084\3\u0085\3\u0085\3\u0086\3\u0086\3\u0087\3\u0087\3\u0087\3\u0088"+
+		"\3\u0088\3\u0088\3\u0089\3\u0089\3\u0089\3\u008a\3\u008a\3\u008a\3\u008b"+
+		"\3\u008b\3\u008b\3\u008c\3\u008c\3\u008c\3\u008d\3\u008d\3\u008d\3\u008e"+
+		"\3\u008e\3\u008e\3\u008f\3\u008f\3\u008f\3\u0090\3\u0090\3\u0090\3\u0091"+
+		"\3\u0091\3\u0091\3\u0091\3\u0092\3\u0092\3\u0092\3\u0092\3\u0093\3\u0093"+
+		"\3\u0093\3\u0093\3\u0093\3\u0094\3\u0094\7\u0094\u0415\n\u0094\f\u0094"+
+		"\16\u0094\u0418\13\u0094\3\u0095\3\u0095\3\u0095\3\u0095\3\u0095\3\u0095"+
+		"\5\u0095\u0420\n\u0095\3\u0096\3\u0096\3\u0096\3\u0096\3\u0096\3\u0096"+
+		"\5\u0096\u0428\n\u0096\3\u0097\3\u0097\3\u0098\3\u0098\3\u0098\3\u0098"+
+		"\3\u0099\6\u0099\u0431\n\u0099\r\u0099\16\u0099\u0432\3\u0099\3\u0099"+
+		"\3\u009a\3\u009a\3\u009a\3\u009a\7\u009a\u043b\n\u009a\f\u009a\16\u009a"+
+		"\u043e\13\u009a\3\u009a\3\u009a\3\u009a\3\u009a\3\u009a\3\u009b\3\u009b"+
+		"\3\u009b\3\u009b\7\u009b\u0449\n\u009b\f\u009b\16\u009b\u044c\13\u009b"+
+		"\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"+
+		"\13\25\f\27\r\31\16\33\17\35\20\37\21!\22#\23%\24\'\25)\26+\27-\30/\31"+
+		"\61\32\63\33\65\34\67\359\36;\37= ?!A\"C#E$G%I&K\'M(O)Q*S+U,W-Y.[/]\60"+
+		"_\61a\62c\63e\64g\65i\66k\2m\2o\2q\2s\2u\2w\2y\2{\2}\2\177\2\u0081\2\u0083"+
+		"\2\u0085\2\u0087\2\u0089\2\u008b\2\u008d\2\u008f\2\u0091\2\u0093\2\u0095"+
+		"\2\u0097\2\u0099\2\u009b\2\u009d\2\u009f\2\u00a1\67\u00a3\2\u00a5\2\u00a7"+
+		"\2\u00a9\2\u00ab\2\u00ad\2\u00af\2\u00b1\2\u00b3\2\u00b5\2\u00b78\u00b9"+
+		"9\u00bb\2\u00bd:\u00bf\2\u00c1\2\u00c3\2\u00c5\2\u00c7\2\u00c9\2\u00cb"+
+		";\u00cd<\u00cf=\u00d1>\u00d3?\u00d5@\u00d7A\u00d9B\u00dbC\u00ddD\u00df"+
+		"E\u00e1F\u00e3G\u00e5H\u00e7I\u00e9J\u00ebK\u00edL\u00efM\u00f1N\u00f3"+
+		"O\u00f5P\u00f7Q\u00f9R\u00fbS\u00fdT\u00ffU\u0101V\u0103W\u0105X\u0107"+
+		"Y\u0109Z\u010b[\u010d\\\u010f]\u0111^\u0113_\u0115`\u0117a\u0119b\u011b"+
+		"c\u011dd\u011fe\u0121f\u0123g\u0125h\u0127i\u0129\2\u012b\2\u012dj\u012f"+
+		"k\u0131l\u0133m\u0135n\3\2\30\4\2NNnn\3\2\63;\4\2ZZzz\5\2\62;CHch\3\2"+
+		"\629\4\2DDdd\3\2\62\63\4\2GGgg\4\2--//\6\2FFHHffhh\4\2RRrr\4\2))^^\4\2"+
+		"$$^^\n\2$$))^^ddhhppttvv\3\2\62\65\6\2&&C\\aac|\4\2\2\u0081\ud802\udc01"+
+		"\3\2\ud802\udc01\3\2\udc02\ue001\7\2&&\62;C\\aac|\5\2\13\f\16\17\"\"\4"+
+		"\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"+
+		"\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"+
+		"\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"+
+		"!\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\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"+
+		"\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"+
+		"\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"+
+		"\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_\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"+
+		"\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\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"+
+		"\2\2\u00f1\3\2\2\2\2\u00f3\3\2\2\2\2\u00f5\3\2\2\2\2\u00f7\3\2\2\2\2\u00f9"+
+		"\3\2\2\2\2\u00fb\3\2\2\2\2\u00fd\3\2\2\2\2\u00ff\3\2\2\2\2\u0101\3\2\2"+
+		"\2\2\u0103\3\2\2\2\2\u0105\3\2\2\2\2\u0107\3\2\2\2\2\u0109\3\2\2\2\2\u010b"+
+		"\3\2\2\2\2\u010d\3\2\2\2\2\u010f\3\2\2\2\2\u0111\3\2\2\2\2\u0113\3\2\2"+
+		"\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\u013c\3\2\2\2\7\u0145\3\2\2"+
+		"\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"+
+		"\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\u0184\3\2\2\2\35\u018c\3\2\2\2\37\u018f\3\2\2\2!\u0196\3\2"+
+		"\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-\u01bc\3\2\2\2/\u01c0\3\2\2\2\61\u01c3\3\2\2\2\63\u01c8\3\2\2"+
+		"\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?\u01f8\3\2\2\2A\u01ff\3\2\2\2C\u0203\3\2\2\2E\u020b\3\2\2\2G"+
+		"\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\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[\u0260\3\2\2\2]\u0266\3\2\2\2_\u026d\3\2\2\2a\u0277\3\2\2\2c"+
+		"\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\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\u02b3\3\2\2\2y\u02bc\3\2\2\2{\u02be\3\2\2\2}\u02c1\3\2\2\2\177"+
+		"\u02c7\3\2\2\2\u0081\u02ca\3\2\2\2\u0083\u02ce\3\2\2\2\u0085\u02d2\3\2"+
+		"\2\2\u0087\u02d9\3\2\2\2\u0089\u02dc\3\2\2\2\u008b\u02e2\3\2\2\2\u008d"+
+		"\u02e4\3\2\2\2\u008f\u02ea\3\2\2\2\u0091\u02f1\3\2\2\2\u0093\u02f4\3\2"+
+		"\2\2\u0095\u02fa\3\2\2\2\u0097\u02fc\3\2\2\2\u0099\u0300\3\2\2\2\u009b"+
+		"\u0307\3\2\2\2\u009d\u030a\3\2\2\2\u009f\u0310\3\2\2\2\u00a1\u0314\3\2"+
+		"\2\2\u00a3\u0331\3\2\2\2\u00a5\u0333\3\2\2\2\u00a7\u0336\3\2\2\2\u00a9"+
+		"\u0339\3\2\2\2\u00ab\u033d\3\2\2\2\u00ad\u033f\3\2\2\2\u00af\u0341\3\2"+
+		"\2\2\u00b1\u0351\3\2\2\2\u00b3\u0353\3\2\2\2\u00b5\u0356\3\2\2\2\u00b7"+
+		"\u0361\3\2\2\2\u00b9\u036b\3\2\2\2\u00bb\u036d\3\2\2\2\u00bd\u036f\3\2"+
+		"\2\2\u00bf\u0376\3\2\2\2\u00c1\u037c\3\2\2\2\u00c3\u0382\3\2\2\2\u00c5"+
+		"\u038f\3\2\2\2\u00c7\u0391\3\2\2\2\u00c9\u0393\3\2\2\2\u00cb\u039a\3\2"+
+		"\2\2\u00cd\u039f\3\2\2\2\u00cf\u03a1\3\2\2\2\u00d1\u03a3\3\2\2\2\u00d3"+
+		"\u03a5\3\2\2\2\u00d5\u03a7\3\2\2\2\u00d7\u03a9\3\2\2\2\u00d9\u03ab\3\2"+
+		"\2\2\u00db\u03ad\3\2\2\2\u00dd\u03af\3\2\2\2\u00df\u03b1\3\2\2\2\u00e1"+
+		"\u03b3\3\2\2\2\u00e3\u03b5\3\2\2\2\u00e5\u03b7\3\2\2\2\u00e7\u03b9\3\2"+
+		"\2\2\u00e9\u03bb\3\2\2\2\u00eb\u03bd\3\2\2\2\u00ed\u03bf\3\2\2\2\u00ef"+
+		"\u03c2\3\2\2\2\u00f1\u03c5\3\2\2\2\u00f3\u03c8\3\2\2\2\u00f5\u03cb\3\2"+
+		"\2\2\u00f7\u03ce\3\2\2\2\u00f9\u03d1\3\2\2\2\u00fb\u03d4\3\2\2\2\u00fd"+
+		"\u03d7\3\2\2\2\u00ff\u03d9\3\2\2\2\u0101\u03db\3\2\2\2\u0103\u03dd\3\2"+
+		"\2\2\u0105\u03df\3\2\2\2\u0107\u03e1\3\2\2\2\u0109\u03e3\3\2\2\2\u010b"+
+		"\u03e5\3\2\2\2\u010d\u03e7\3\2\2\2\u010f\u03ea\3\2\2\2\u0111\u03ed\3\2"+
+		"\2\2\u0113\u03f0\3\2\2\2\u0115\u03f3\3\2\2\2\u0117\u03f6\3\2\2\2\u0119"+
+		"\u03f9\3\2\2\2\u011b\u03fc\3\2\2\2\u011d\u03ff\3\2\2\2\u011f\u0402\3\2"+
+		"\2\2\u0121\u0405\3\2\2\2\u0123\u0409\3\2\2\2\u0125\u040d\3\2\2\2\u0127"+
+		"\u0412\3\2\2\2\u0129\u041f\3\2\2\2\u012b\u0427\3\2\2\2\u012d\u0429\3\2"+
+		"\2\2\u012f\u042b\3\2\2\2\u0131\u0430\3\2\2\2\u0133\u0436\3\2\2\2\u0135"+
+		"\u0444\3\2\2\2\u0137\u0138\7c\2\2\u0138\u0139\7w\2\2\u0139\u013a\7v\2"+
+		"\2\u013a\u013b\7q\2\2\u013b\4\3\2\2\2\u013c\u013d\7c\2\2\u013d\u013e\7"+
+		"d\2\2\u013e\u013f\7u\2\2\u013f\u0140\7v\2\2\u0140\u0141\7t\2\2\u0141\u0142"+
+		"\7c\2\2\u0142\u0143\7e\2\2\u0143\u0144\7v\2\2\u0144\6\3\2\2\2\u0145\u0146"+
+		"\7c\2\2\u0146\u0147\7u\2\2\u0147\u0148\7u\2\2\u0148\u0149\7g\2\2\u0149"+
+		"\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\7q\2\2\u014f\u0150\7n\2\2\u0150\u0151\7g\2\2"+
+		"\u0151\u0152\7c\2\2\u0152\u0153\7p\2\2\u0153\n\3\2\2\2\u0154\u0155\7d"+
+		"\2\2\u0155\u0156\7t\2\2\u0156\u0157\7g\2\2\u0157\u0158\7c\2\2\u0158\u0159"+
+		"\7m\2\2\u0159\f\3\2\2\2\u015a\u015b\7d\2\2\u015b\u015c\7{\2\2\u015c\u015d"+
+		"\7v\2\2\u015d\u015e\7g\2\2\u015e\16\3\2\2\2\u015f\u0160\7e\2\2\u0160\u0161"+
+		"\7c\2\2\u0161\u0162\7u\2\2\u0162\u0163\7g\2\2\u0163\20\3\2\2\2\u0164\u0165"+
+		"\7e\2\2\u0165\u0166\7c\2\2\u0166\u0167\7v\2\2\u0167\u0168\7e\2\2\u0168"+
+		"\u0169\7j\2\2\u0169\22\3\2\2\2\u016a\u016b\7e\2\2\u016b\u016c\7j\2\2\u016c"+
+		"\u016d\7c\2\2\u016d\u016e\7t\2\2\u016e\24\3\2\2\2\u016f\u0170\7e\2\2\u0170"+
+		"\u0171\7n\2\2\u0171\u0172\7c\2\2\u0172\u0173\7u\2\2\u0173\u0174\7u\2\2"+
+		"\u0174\26\3\2\2\2\u0175\u0176\7e\2\2\u0176\u0177\7q\2\2\u0177\u0178\7"+
+		"p\2\2\u0178\u0179\7u\2\2\u0179\u017a\7v\2\2\u017a\30\3\2\2\2\u017b\u017c"+
+		"\7e\2\2\u017c\u017d\7q\2\2\u017d\u017e\7p\2\2\u017e\u017f\7v\2\2\u017f"+
+		"\u0180\7k\2\2\u0180\u0181\7p\2\2\u0181\u0182\7w\2\2\u0182\u0183\7g\2\2"+
+		"\u0183\32\3\2\2\2\u0184\u0185\7f\2\2\u0185\u0186\7g\2\2\u0186\u0187\7"+
+		"h\2\2\u0187\u0188\7c\2\2\u0188\u0189\7w\2\2\u0189\u018a\7n\2\2\u018a\u018b"+
+		"\7v\2\2\u018b\34\3\2\2\2\u018c\u018d\7f\2\2\u018d\u018e\7q\2\2\u018e\36"+
+		"\3\2\2\2\u018f\u0190\7f\2\2\u0190\u0191\7q\2\2\u0191\u0192\7w\2\2\u0192"+
+		"\u0193\7d\2\2\u0193\u0194\7n\2\2\u0194\u0195\7g\2\2\u0195 \3\2\2\2\u0196"+
+		"\u0197\7g\2\2\u0197\u0198\7n\2\2\u0198\u0199\7u\2\2\u0199\u019a\7g\2\2"+
+		"\u019a\"\3\2\2\2\u019b\u019c\7g\2\2\u019c\u019d\7p\2\2\u019d\u019e\7w"+
+		"\2\2\u019e\u019f\7o\2\2\u019f$\3\2\2\2\u01a0\u01a1\7g\2\2\u01a1\u01a2"+
+		"\7z\2\2\u01a2\u01a3\7v\2\2\u01a3\u01a4\7g\2\2\u01a4\u01a5\7p\2\2\u01a5"+
+		"\u01a6\7f\2\2\u01a6\u01a7\7u\2\2\u01a7&\3\2\2\2\u01a8\u01a9\7h\2\2\u01a9"+
+		"\u01aa\7k\2\2\u01aa\u01ab\7p\2\2\u01ab\u01ac\7c\2\2\u01ac\u01ad\7n\2\2"+
+		"\u01ad(\3\2\2\2\u01ae\u01af\7h\2\2\u01af\u01b0\7k\2\2\u01b0\u01b1\7p\2"+
+		"\2\u01b1\u01b2\7c\2\2\u01b2\u01b3\7n\2\2\u01b3\u01b4\7n\2\2\u01b4\u01b5"+
+		"\7{\2\2\u01b5*\3\2\2\2\u01b6\u01b7\7h\2\2\u01b7\u01b8\7n\2\2\u01b8\u01b9"+
+		"\7q\2\2\u01b9\u01ba\7c\2\2\u01ba\u01bb\7v\2\2\u01bb,\3\2\2\2\u01bc\u01bd"+
+		"\7h\2\2\u01bd\u01be\7q\2\2\u01be\u01bf\7t\2\2\u01bf.\3\2\2\2\u01c0\u01c1"+
+		"\7k\2\2\u01c1\u01c2\7h\2\2\u01c2\60\3\2\2\2\u01c3\u01c4\7i\2\2\u01c4\u01c5"+
+		"\7q\2\2\u01c5\u01c6\7v\2\2\u01c6\u01c7\7q\2\2\u01c7\62\3\2\2\2\u01c8\u01c9"+
+		"\7k\2\2\u01c9\u01ca\7o\2\2\u01ca\u01cb\7r\2\2\u01cb\u01cc\7n\2\2\u01cc"+
+		"\u01cd\7g\2\2\u01cd\u01ce\7o\2\2\u01ce\u01cf\7g\2\2\u01cf\u01d0\7p\2\2"+
+		"\u01d0\u01d1\7v\2\2\u01d1\u01d2\7u\2\2\u01d2\64\3\2\2\2\u01d3\u01d4\7"+
+		"k\2\2\u01d4\u01d5\7o\2\2\u01d5\u01d6\7r\2\2\u01d6\u01d7\7q\2\2\u01d7\u01d8"+
+		"\7t\2\2\u01d8\u01d9\7v\2\2\u01d9\66\3\2\2\2\u01da\u01db\7k\2\2\u01db\u01dc"+
+		"\7p\2\2\u01dc\u01dd\7u\2\2\u01dd\u01de\7v\2\2\u01de\u01df\7c\2\2\u01df"+
+		"\u01e0\7p\2\2\u01e0\u01e1\7e\2\2\u01e1\u01e2\7g\2\2\u01e2\u01e3\7q\2\2"+
+		"\u01e3\u01e4\7h\2\2\u01e48\3\2\2\2\u01e5\u01e6\7k\2\2\u01e6\u01e7\7p\2"+
+		"\2\u01e7\u01e8\7v\2\2\u01e8:\3\2\2\2\u01e9\u01ea\7k\2\2\u01ea\u01eb\7"+
+		"p\2\2\u01eb\u01ec\7v\2\2\u01ec\u01ed\7g\2\2\u01ed\u01ee\7t\2\2\u01ee\u01ef"+
+		"\7h\2\2\u01ef\u01f0\7c\2\2\u01f0\u01f1\7e\2\2\u01f1\u01f2\7g\2\2\u01f2"+
+		"<\3\2\2\2\u01f3\u01f4\7n\2\2\u01f4\u01f5\7q\2\2\u01f5\u01f6\7p\2\2\u01f6"+
+		"\u01f7\7i\2\2\u01f7>\3\2\2\2\u01f8\u01f9\7p\2\2\u01f9\u01fa\7c\2\2\u01fa"+
+		"\u01fb\7v\2\2\u01fb\u01fc\7k\2\2\u01fc\u01fd\7x\2\2\u01fd\u01fe\7g\2\2"+
+		"\u01fe@\3\2\2\2\u01ff\u0200\7p\2\2\u0200\u0201\7g\2\2\u0201\u0202\7y\2"+
+		"\2\u0202B\3\2\2\2\u0203\u0204\7r\2\2\u0204\u0205\7c\2\2\u0205\u0206\7"+
+		"e\2\2\u0206\u0207\7m\2\2\u0207\u0208\7c\2\2\u0208\u0209\7i\2\2\u0209\u020a"+
+		"\7g\2\2\u020aD\3\2\2\2\u020b\u020c\7r\2\2\u020c\u020d\7t\2\2\u020d\u020e"+
+		"\7k\2\2\u020e\u020f\7x\2\2\u020f\u0210\7c\2\2\u0210\u0211\7v\2\2\u0211"+
+		"\u0212\7g\2\2\u0212F\3\2\2\2\u0213\u0214\7r\2\2\u0214\u0215\7t\2\2\u0215"+
+		"\u0216\7q\2\2\u0216\u0217\7v\2\2\u0217\u0218\7g\2\2\u0218\u0219\7e\2\2"+
+		"\u0219\u021a\7v\2\2\u021a\u021b\7g\2\2\u021b\u021c\7f\2\2\u021cH\3\2\2"+
+		"\2\u021d\u021e\7r\2\2\u021e\u021f\7w\2\2\u021f\u0220\7d\2\2\u0220\u0221"+
+		"\7n\2\2\u0221\u0222\7k\2\2\u0222\u0223\7e\2\2\u0223J\3\2\2\2\u0224\u0225"+
+		"\7t\2\2\u0225\u0226\7g\2\2\u0226\u0227\7v\2\2\u0227\u0228\7w\2\2\u0228"+
+		"\u0229\7t\2\2\u0229\u022a\7p\2\2\u022aL\3\2\2\2\u022b\u022c\7u\2\2\u022c"+
+		"\u022d\7j\2\2\u022d\u022e\7q\2\2\u022e\u022f\7t\2\2\u022f\u0230\7v\2\2"+
+		"\u0230N\3\2\2\2\u0231\u0232\7u\2\2\u0232\u0233\7v\2\2\u0233\u0234\7c\2"+
+		"\2\u0234\u0235\7v\2\2\u0235\u0236\7k\2\2\u0236\u0237\7e\2\2\u0237P\3\2"+
+		"\2\2\u0238\u0239\7u\2\2\u0239\u023a\7v\2\2\u023a\u023b\7t\2\2\u023b\u023c"+
+		"\7k\2\2\u023c\u023d\7e\2\2\u023d\u023e\7v\2\2\u023e\u023f\7h\2\2\u023f"+
+		"\u0240\7r\2\2\u0240R\3\2\2\2\u0241\u0242\7u\2\2\u0242\u0243\7w\2\2\u0243"+
+		"\u0244\7r\2\2\u0244\u0245\7g\2\2\u0245\u0246\7t\2\2\u0246T\3\2\2\2\u0247"+
+		"\u0248\7u\2\2\u0248\u0249\7y\2\2\u0249\u024a\7k\2\2\u024a\u024b\7v\2\2"+
+		"\u024b\u024c\7e\2\2\u024c\u024d\7j\2\2\u024dV\3\2\2\2\u024e\u024f\7u\2"+
+		"\2\u024f\u0250\7{\2\2\u0250\u0251\7p\2\2\u0251\u0252\7e\2\2\u0252\u0253"+
+		"\7j\2\2\u0253\u0254\7t\2\2\u0254\u0255\7q\2\2\u0255\u0256\7p\2\2\u0256"+
+		"\u0257\7k\2\2\u0257\u0258\7|\2\2\u0258\u0259\7g\2\2\u0259\u025a\7f\2\2"+
+		"\u025aX\3\2\2\2\u025b\u025c\7v\2\2\u025c\u025d\7j\2\2\u025d\u025e\7k\2"+
+		"\2\u025e\u025f\7u\2\2\u025fZ\3\2\2\2\u0260\u0261\7v\2\2\u0261\u0262\7"+
+		"j\2\2\u0262\u0263\7t\2\2\u0263\u0264\7q\2\2\u0264\u0265\7y\2\2\u0265\\"+
+		"\3\2\2\2\u0266\u0267\7v\2\2\u0267\u0268\7j\2\2\u0268\u0269\7t\2\2\u0269"+
+		"\u026a\7q\2\2\u026a\u026b\7y\2\2\u026b\u026c\7u\2\2\u026c^\3\2\2\2\u026d"+
+		"\u026e\7v\2\2\u026e\u026f\7t\2\2\u026f\u0270\7c\2\2\u0270\u0271\7p\2\2"+
+		"\u0271\u0272\7u\2\2\u0272\u0273\7k\2\2\u0273\u0274\7g\2\2\u0274\u0275"+
+		"\7p\2\2\u0275\u0276\7v\2\2\u0276`\3\2\2\2\u0277\u0278\7v\2\2\u0278\u0279"+
+		"\7t\2\2\u0279\u027a\7{\2\2\u027ab\3\2\2\2\u027b\u027c\7x\2\2\u027c\u027d"+
+		"\7q\2\2\u027d\u027e\7k\2\2\u027e\u027f\7f\2\2\u027fd\3\2\2\2\u0280\u0281"+
+		"\7x\2\2\u0281\u0282\7q\2\2\u0282\u0283\7n\2\2\u0283\u0284\7c\2\2\u0284"+
+		"\u0285\7v\2\2\u0285\u0286\7k\2\2\u0286\u0287\7n\2\2\u0287\u0288\7g\2\2"+
+		"\u0288f\3\2\2\2\u0289\u028a\7y\2\2\u028a\u028b\7j\2\2\u028b\u028c\7k\2"+
+		"\2\u028c\u028d\7n\2\2\u028d\u028e\7g\2\2\u028eh\3\2\2\2\u028f\u0294\5"+
+		"k\66\2\u0290\u0294\5m\67\2\u0291\u0294\5o8\2\u0292\u0294\5q9\2\u0293\u028f"+
+		"\3\2\2\2\u0293\u0290\3\2\2\2\u0293\u0291\3\2\2\2\u0293\u0292\3\2\2\2\u0294"+
+		"j\3\2\2\2\u0295\u0297\5u;\2\u0296\u0298\5s:\2\u0297\u0296\3\2\2\2\u0297"+
+		"\u0298\3\2\2\2\u0298l\3\2\2\2\u0299\u029b\5\u0083B\2\u029a\u029c\5s:\2"+
+		"\u029b\u029a\3\2\2\2\u029b\u029c\3\2\2\2\u029cn\3\2\2\2\u029d\u029f\5"+
+		"\u008dG\2\u029e\u02a0\5s:\2\u029f\u029e\3\2\2\2\u029f\u02a0\3\2\2\2\u02a0"+
+		"p\3\2\2\2\u02a1\u02a3\5\u0097L\2\u02a2\u02a4\5s:\2\u02a3\u02a2\3\2\2\2"+
+		"\u02a3\u02a4\3\2\2\2\u02a4r\3\2\2\2\u02a5\u02a6\t\2\2\2\u02a6t\3\2\2\2"+
+		"\u02a7\u02b2\7\62\2\2\u02a8\u02af\5{>\2\u02a9\u02ab\5w<\2\u02aa\u02a9"+
+		"\3\2\2\2\u02aa\u02ab\3\2\2\2\u02ab\u02b0\3\2\2\2\u02ac\u02ad\5\u0081A"+
+		"\2\u02ad\u02ae\5w<\2\u02ae\u02b0\3\2\2\2\u02af\u02aa\3\2\2\2\u02af\u02ac"+
+		"\3\2\2\2\u02b0\u02b2\3\2\2\2\u02b1\u02a7\3\2\2\2\u02b1\u02a8\3\2\2\2\u02b2"+
+		"v\3\2\2\2\u02b3\u02b8\5y=\2\u02b4\u02b6\5}?\2\u02b5\u02b4\3\2\2\2\u02b5"+
+		"\u02b6\3\2\2\2\u02b6\u02b7\3\2\2\2\u02b7\u02b9\5y=\2\u02b8\u02b5\3\2\2"+
+		"\2\u02b8\u02b9\3\2\2\2\u02b9x\3\2\2\2\u02ba\u02bd\7\62\2\2\u02bb\u02bd"+
+		"\5{>\2\u02bc\u02ba\3\2\2\2\u02bc\u02bb\3\2\2\2\u02bdz\3\2\2\2\u02be\u02bf"+
+		"\t\3\2\2\u02bf|\3\2\2\2\u02c0\u02c2\5\177@\2\u02c1\u02c0\3\2\2\2\u02c2"+
+		"\u02c3\3\2\2\2\u02c3\u02c1\3\2\2\2\u02c3\u02c4\3\2\2\2\u02c4~\3\2\2\2"+
+		"\u02c5\u02c8\5y=\2\u02c6\u02c8\7a\2\2\u02c7\u02c5\3\2\2\2\u02c7\u02c6"+
+		"\3\2\2\2\u02c8\u0080\3\2\2\2\u02c9\u02cb\7a\2\2\u02ca\u02c9\3\2\2\2\u02cb"+
+		"\u02cc\3\2\2\2\u02cc\u02ca\3\2\2\2\u02cc\u02cd\3\2\2\2\u02cd\u0082\3\2"+
+		"\2\2\u02ce\u02cf\7\62\2\2\u02cf\u02d0\t\4\2\2\u02d0\u02d1\5\u0085C\2\u02d1"+
+		"\u0084\3\2\2\2\u02d2\u02d7\5\u0087D\2\u02d3\u02d5\5\u0089E\2\u02d4\u02d3"+
+		"\3\2\2\2\u02d4\u02d5\3\2\2\2\u02d5\u02d6\3\2\2\2\u02d6\u02d8\5\u0087D"+
+		"\2\u02d7\u02d4\3\2\2\2\u02d7\u02d8\3\2\2\2\u02d8\u0086\3\2\2\2\u02d9\u02da"+
+		"\t\5\2\2\u02da\u0088\3\2\2\2\u02db\u02dd\5\u008bF\2\u02dc\u02db\3\2\2"+
+		"\2\u02dd\u02de\3\2\2\2\u02de\u02dc\3\2\2\2\u02de\u02df\3\2\2\2\u02df\u008a"+
+		"\3\2\2\2\u02e0\u02e3\5\u0087D\2\u02e1\u02e3\7a\2\2\u02e2\u02e0\3\2\2\2"+
+		"\u02e2\u02e1\3\2\2\2\u02e3\u008c\3\2\2\2\u02e4\u02e6\7\62\2\2\u02e5\u02e7"+
+		"\5\u0081A\2\u02e6\u02e5\3\2\2\2\u02e6\u02e7\3\2\2\2\u02e7\u02e8\3\2\2"+
+		"\2\u02e8\u02e9\5\u008fH\2\u02e9\u008e\3\2\2\2\u02ea\u02ef\5\u0091I\2\u02eb"+
+		"\u02ed\5\u0093J\2\u02ec\u02eb\3\2\2\2\u02ec\u02ed\3\2\2\2\u02ed\u02ee"+
+		"\3\2\2\2\u02ee\u02f0\5\u0091I\2\u02ef\u02ec\3\2\2\2\u02ef\u02f0\3\2\2"+
+		"\2\u02f0\u0090\3\2\2\2\u02f1\u02f2\t\6\2\2\u02f2\u0092\3\2\2\2\u02f3\u02f5"+
+		"\5\u0095K\2\u02f4\u02f3\3\2\2\2\u02f5\u02f6\3\2\2\2\u02f6\u02f4\3\2\2"+
+		"\2\u02f6\u02f7\3\2\2\2\u02f7\u0094\3\2\2\2\u02f8\u02fb\5\u0091I\2\u02f9"+
+		"\u02fb\7a\2\2\u02fa\u02f8\3\2\2\2\u02fa\u02f9\3\2\2\2\u02fb\u0096\3\2"+
+		"\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\u0300\u0305\5\u009bN\2\u0301\u0303\5\u009dO\2\u0302\u0301"+
+		"\3\2\2\2\u0302\u0303\3\2\2\2\u0303\u0304\3\2\2\2\u0304\u0306\5\u009bN"+
+		"\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\u0308\u009c\3\2\2\2\u0309\u030b\5\u009fP\2\u030a\u0309\3\2\2"+
+		"\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\u030e\u0311\5\u009bN\2\u030f\u0311\7a\2\2\u0310\u030e\3\2\2\2"+
+		"\u0310\u030f\3\2\2\2\u0311\u00a0\3\2\2\2\u0312\u0315\5\u00a3R\2\u0313"+
+		"\u0315\5\u00afX\2\u0314\u0312\3\2\2\2\u0314\u0313\3\2\2\2\u0315\u00a2"+
+		"\3\2\2\2\u0316\u0317\5w<\2\u0317\u0319\7\60\2\2\u0318\u031a\5w<\2\u0319"+
+		"\u0318\3\2\2\2\u0319\u031a\3\2\2\2\u031a\u031c\3\2\2\2\u031b\u031d\5\u00a5"+
+		"S\2\u031c\u031b\3\2\2\2\u031c\u031d\3\2\2\2\u031d\u031f\3\2\2\2\u031e"+
+		"\u0320\5\u00adW\2\u031f\u031e\3\2\2\2\u031f\u0320\3\2\2\2\u0320\u0332"+
+		"\3\2\2\2\u0321\u0322\7\60\2\2\u0322\u0324\5w<\2\u0323\u0325\5\u00a5S\2"+
+		"\u0324\u0323\3\2\2\2\u0324\u0325\3\2\2\2\u0325\u0327\3\2\2\2\u0326\u0328"+
+		"\5\u00adW\2\u0327\u0326\3\2\2\2\u0327\u0328\3\2\2\2\u0328\u0332\3\2\2"+
+		"\2\u0329\u032a\5w<\2\u032a\u032c\5\u00a5S\2\u032b\u032d\5\u00adW\2\u032c"+
+		"\u032b\3\2\2\2\u032c\u032d\3\2\2\2\u032d\u0332\3\2\2\2\u032e\u032f\5w"+
+		"<\2\u032f\u0330\5\u00adW\2\u0330\u0332\3\2\2\2\u0331\u0316\3\2\2\2\u0331"+
+		"\u0321\3\2\2\2\u0331\u0329\3\2\2\2\u0331\u032e\3\2\2\2\u0332\u00a4\3\2"+
+		"\2\2\u0333\u0334\5\u00a7T\2\u0334\u0335\5\u00a9U\2\u0335\u00a6\3\2\2\2"+
+		"\u0336\u0337\t\t\2\2\u0337\u00a8\3\2\2\2\u0338\u033a\5\u00abV\2\u0339"+
+		"\u0338\3\2\2\2\u0339\u033a\3\2\2\2\u033a\u033b\3\2\2\2\u033b\u033c\5w"+
+		"<\2\u033c\u00aa\3\2\2\2\u033d\u033e\t\n\2\2\u033e\u00ac\3\2\2\2\u033f"+
+		"\u0340\t\13\2\2\u0340\u00ae\3\2\2\2\u0341\u0342\5\u00b1Y\2\u0342\u0344"+
+		"\5\u00b3Z\2\u0343\u0345\5\u00adW\2\u0344\u0343\3\2\2\2\u0344\u0345\3\2"+
+		"\2\2\u0345\u00b0\3\2\2\2\u0346\u0348\5\u0083B\2\u0347\u0349\7\60\2\2\u0348"+
+		"\u0347\3\2\2\2\u0348\u0349\3\2\2\2\u0349\u0352\3\2\2\2\u034a\u034b\7\62"+
+		"\2\2\u034b\u034d\t\4\2\2\u034c\u034e\5\u0085C\2\u034d\u034c\3\2\2\2\u034d"+
+		"\u034e\3\2\2\2\u034e\u034f\3\2\2\2\u034f\u0350\7\60\2\2\u0350\u0352\5"+
+		"\u0085C\2\u0351\u0346\3\2\2\2\u0351\u034a\3\2\2\2\u0352\u00b2\3\2\2\2"+
+		"\u0353\u0354\5\u00b5[\2\u0354\u0355\5\u00a9U\2\u0355\u00b4\3\2\2\2\u0356"+
+		"\u0357\t\f\2\2\u0357\u00b6\3\2\2\2\u0358\u0359\7v\2\2\u0359\u035a\7t\2"+
+		"\2\u035a\u035b\7w\2\2\u035b\u0362\7g\2\2\u035c\u035d\7h\2\2\u035d\u035e"+
+		"\7c\2\2\u035e\u035f\7n\2\2\u035f\u0360\7u\2\2\u0360\u0362\7g\2\2\u0361"+
+		"\u0358\3\2\2\2\u0361\u035c\3\2\2\2\u0362\u00b8\3\2\2\2\u0363\u0364\7)"+
+		"\2\2\u0364\u0365\5\u00bb^\2\u0365\u0366\7)\2\2\u0366\u036c\3\2\2\2\u0367"+
+		"\u0368\7)\2\2\u0368\u0369\5\u00c3b\2\u0369\u036a\7)\2\2\u036a\u036c\3"+
+		"\2\2\2\u036b\u0363\3\2\2\2\u036b\u0367\3\2\2\2\u036c\u00ba\3\2\2\2\u036d"+
+		"\u036e\n\r\2\2\u036e\u00bc\3\2\2\2\u036f\u0371\7$\2\2\u0370\u0372\5\u00bf"+
+		"`\2\u0371\u0370\3\2\2\2\u0371\u0372\3\2\2\2\u0372\u0373\3\2\2\2\u0373"+
+		"\u0374\7$\2\2\u0374\u00be\3\2\2\2\u0375\u0377\5\u00c1a\2\u0376\u0375\3"+
+		"\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\u037a\u037d\n\16\2\2\u037b\u037d\5\u00c3b\2\u037c\u037a"+
+		"\3\2\2\2\u037c\u037b\3\2\2\2\u037d\u00c2\3\2\2\2\u037e\u037f\7^\2\2\u037f"+
+		"\u0383\t\17\2\2\u0380\u0383\5\u00c5c\2\u0381\u0383\5\u00c9e\2\u0382\u037e"+
+		"\3\2\2\2\u0382\u0380\3\2\2\2\u0382\u0381\3\2\2\2\u0383\u00c4\3\2\2\2\u0384"+
+		"\u0385\7^\2\2\u0385\u0390\5\u0091I\2\u0386\u0387\7^\2\2\u0387\u0388\5"+
+		"\u0091I\2\u0388\u0389\5\u0091I\2\u0389\u0390\3\2\2\2\u038a\u038b\7^\2"+
+		"\2\u038b\u038c\5\u00c7d\2\u038c\u038d\5\u0091I\2\u038d\u038e\5\u0091I"+
+		"\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\u0390\u00c6\3\2\2\2\u0391\u0392\t\20\2\2\u0392\u00c8\3\2\2\2"+
+		"\u0393\u0394\7^\2\2\u0394\u0395\7w\2\2\u0395\u0396\5\u0087D\2\u0396\u0397"+
+		"\5\u0087D\2\u0397\u0398\5\u0087D\2\u0398\u0399\5\u0087D\2\u0399\u00ca"+
+		"\3\2\2\2\u039a\u039b\7p\2\2\u039b\u039c\7w\2\2\u039c\u039d\7n\2\2\u039d"+
+		"\u039e\7n\2\2\u039e\u00cc\3\2\2\2\u039f\u03a0\7*\2\2\u03a0\u00ce\3\2\2"+
+		"\2\u03a1\u03a2\7+\2\2\u03a2\u00d0\3\2\2\2\u03a3\u03a4\7}\2\2\u03a4\u00d2"+
+		"\3\2\2\2\u03a5\u03a6\7\177\2\2\u03a6\u00d4\3\2\2\2\u03a7\u03a8\7]\2\2"+
+		"\u03a8\u00d6\3\2\2\2\u03a9\u03aa\7_\2\2\u03aa\u00d8\3\2\2\2\u03ab\u03ac"+
+		"\7=\2\2\u03ac\u00da\3\2\2\2\u03ad\u03ae\7.\2\2\u03ae\u00dc\3\2\2\2\u03af"+
+		"\u03b0\7\60\2\2\u03b0\u00de\3\2\2\2\u03b1\u03b2\7?\2\2\u03b2\u00e0\3\2"+
+		"\2\2\u03b3\u03b4\7@\2\2\u03b4\u00e2\3\2\2\2\u03b5\u03b6\7>\2\2\u03b6\u00e4"+
+		"\3\2\2\2\u03b7\u03b8\7#\2\2\u03b8\u00e6\3\2\2\2\u03b9\u03ba\7\u0080\2"+
+		"\2\u03ba\u00e8\3\2\2\2\u03bb\u03bc\7A\2\2\u03bc\u00ea\3\2\2\2\u03bd\u03be"+
+		"\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\u03c2\u03c3\7>\2\2\u03c3\u03c4\7?\2\2\u03c4\u00f0\3\2\2"+
+		"\2\u03c5\u03c6\7@\2\2\u03c6\u03c7\7?\2\2\u03c7\u00f2\3\2\2\2\u03c8\u03c9"+
+		"\7#\2\2\u03c9\u03ca\7?\2\2\u03ca\u00f4\3\2\2\2\u03cb\u03cc\7(\2\2\u03cc"+
+		"\u03cd\7(\2\2\u03cd\u00f6\3\2\2\2\u03ce\u03cf\7~\2\2\u03cf\u03d0\7~\2"+
+		"\2\u03d0\u00f8\3\2\2\2\u03d1\u03d2\7-\2\2\u03d2\u03d3\7-\2\2\u03d3\u00fa"+
+		"\3\2\2\2\u03d4\u03d5\7/\2\2\u03d5\u03d6\7/\2\2\u03d6\u00fc\3\2\2\2\u03d7"+
+		"\u03d8\7-\2\2\u03d8\u00fe\3\2\2\2\u03d9\u03da\7/\2\2\u03da\u0100\3\2\2"+
+		"\2\u03db\u03dc\7,\2\2\u03dc\u0102\3\2\2\2\u03dd\u03de\7\61\2\2\u03de\u0104"+
+		"\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\u03e3\u03e4\7`\2\2\u03e4\u010a\3\2\2\2\u03e5\u03e6\7\'"+
+		"\2\2\u03e6\u010c\3\2\2\2\u03e7\u03e8\7/\2\2\u03e8\u03e9\7@\2\2\u03e9\u010e"+
+		"\3\2\2\2\u03ea\u03eb\7<\2\2\u03eb\u03ec\7<\2\2\u03ec\u0110\3\2\2\2\u03ed"+
+		"\u03ee\7-\2\2\u03ee\u03ef\7?\2\2\u03ef\u0112\3\2\2\2\u03f0\u03f1\7/\2"+
+		"\2\u03f1\u03f2\7?\2\2\u03f2\u0114\3\2\2\2\u03f3\u03f4\7,\2\2\u03f4\u03f5"+
+		"\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\u03f9\u03fa\7(\2\2\u03fa\u03fb\7?\2\2\u03fb\u011a\3\2\2"+
+		"\2\u03fc\u03fd\7~\2\2\u03fd\u03fe\7?\2\2\u03fe\u011c\3\2\2\2\u03ff\u0400"+
+		"\7`\2\2\u0400\u0401\7?\2\2\u0401\u011e\3\2\2\2\u0402\u0403\7\'\2\2\u0403"+
+		"\u0404\7?\2\2\u0404\u0120\3\2\2\2\u0405\u0406\7>\2\2\u0406\u0407\7>\2"+
+		"\2\u0407\u0408\7?\2\2\u0408\u0122\3\2\2\2\u0409\u040a\7@\2\2\u040a\u040b"+
+		"\7@\2\2\u040b\u040c\7?\2\2\u040c\u0124\3\2\2\2\u040d\u040e\7@\2\2\u040e"+
+		"\u040f\7@\2\2\u040f\u0410\7@\2\2\u0410\u0411\7?\2\2\u0411\u0126\3\2\2"+
+		"\2\u0412\u0416\5\u0129\u0095\2\u0413\u0415\5\u012b\u0096\2\u0414\u0413"+
+		"\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\u0418\u0416\3\2\2\2\u0419\u0420\t\21\2\2\u041a\u041b\n"+
+		"\22\2\2\u041b\u0420\6\u0095\2\2\u041c\u041d\t\23\2\2\u041d\u041e\t\24"+
+		"\2\2\u041e\u0420\6\u0095\3\2\u041f\u0419\3\2\2\2\u041f\u041a\3\2\2\2\u041f"+
+		"\u041c\3\2\2\2\u0420\u012a\3\2\2\2\u0421\u0428\t\25\2\2\u0422\u0423\n"+
+		"\22\2\2\u0423\u0428\6\u0096\4\2\u0424\u0425\t\23\2\2\u0425\u0426\t\24"+
+		"\2\2\u0426\u0428\6\u0096\5\2\u0427\u0421\3\2\2\2\u0427\u0422\3\2\2\2\u0427"+
+		"\u0424\3\2\2\2\u0428\u012c\3\2\2\2\u0429\u042a\7B\2\2\u042a\u012e\3\2"+
+		"\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\u042f\u0431\t\26\2\2\u0430\u042f\3\2\2\2\u0431\u0432\3"+
+		"\2\2\2\u0432\u0430\3\2\2\2\u0432\u0433\3\2\2\2\u0433\u0434\3\2\2\2\u0434"+
+		"\u0435\b\u0099\2\2\u0435\u0132\3\2\2\2\u0436\u0437\7\61\2\2\u0437\u0438"+
+		"\7,\2\2\u0438\u043c\3\2\2\2\u0439\u043b\13\2\2\2\u043a\u0439\3\2\2\2\u043b"+
+		"\u043e\3\2\2\2\u043c\u043d\3\2\2\2\u043c\u043a\3\2\2\2\u043d\u043f\3\2"+
+		"\2\2\u043e\u043c\3\2\2\2\u043f\u0440\7,\2\2\u0440\u0441\7\61\2\2\u0441"+
+		"\u0442\3\2\2\2\u0442\u0443\b\u009a\2\2\u0443\u0134\3\2\2\2\u0444\u0445"+
+		"\7\61\2\2\u0445\u0446\7\61\2\2\u0446\u044a\3\2\2\2\u0447\u0449\n\27\2"+
+		"\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\u044b\u044d\3\2\2\2\u044c\u044a\3\2\2\2\u044d\u044e\b\u009b\2"+
+		"\2\u044e\u0136\3\2\2\28\2\u0293\u0297\u029b\u029f\u02a3\u02aa\u02af\u02b1"+
+		"\u02b5\u02b8\u02bc\u02c3\u02c7\u02cc\u02d4\u02d7\u02de\u02e2\u02e6\u02ec"+
+		"\u02ef\u02f6\u02fa\u0302\u0305\u030c\u0310\u0314\u0319\u031c\u031f\u0324"+
+		"\u0327\u032c\u0331\u0339\u0344\u0348\u034d\u0351\u0361\u036b\u0371\u0378"+
+		"\u037c\u0382\u038f\u0416\u041f\u0427\u0432\u043c\u044a\3\b\2\2";
 	public static final ATN _ATN =
 		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {

src/de/dhbwstuttgart/parser/antlr/Java8Lexer.tokens

@@ -1,205 +1,207 @@
-ABSTRACT=1
-ASSERT=2
-BOOLEAN=3
-BREAK=4
-BYTE=5
-CASE=6
-CATCH=7
-CHAR=8
-CLASS=9
-CONST=10
-CONTINUE=11
-DEFAULT=12
-DO=13
-DOUBLE=14
-ELSE=15
-ENUM=16
-EXTENDS=17
-FINAL=18
-FINALLY=19
-FLOAT=20
-FOR=21
-IF=22
-GOTO=23
-IMPLEMENTS=24
-IMPORT=25
-INSTANCEOF=26
-INT=27
-INTERFACE=28
-LONG=29
-NATIVE=30
-NEW=31
-PACKAGE=32
-PRIVATE=33
-PROTECTED=34
-PUBLIC=35
-RETURN=36
-SHORT=37
-STATIC=38
-STRICTFP=39
-SUPER=40
-SWITCH=41
-SYNCHRONIZED=42
-THIS=43
-THROW=44
-THROWS=45
-TRANSIENT=46
-TRY=47
-VOID=48
-VOLATILE=49
-WHILE=50
-IntegerLiteral=51
-FloatingPointLiteral=52
-BooleanLiteral=53
-CharacterLiteral=54
-StringLiteral=55
-NullLiteral=56
-LPAREN=57
-RPAREN=58
-LBRACE=59
-RBRACE=60
-LBRACK=61
-RBRACK=62
-SEMI=63
-COMMA=64
-DOT=65
-ASSIGN=66
-GT=67
-LT=68
-BANG=69
-TILDE=70
-QUESTION=71
-COLON=72
-EQUAL=73
-LE=74
-GE=75
-NOTEQUAL=76
-AND=77
-OR=78
-INC=79
-DEC=80
-ADD=81
-SUB=82
-MUL=83
-DIV=84
-BITAND=85
-BITOR=86
-CARET=87
-MOD=88
-ARROW=89
-COLONCOLON=90
-ADD_ASSIGN=91
-SUB_ASSIGN=92
-MUL_ASSIGN=93
-DIV_ASSIGN=94
-AND_ASSIGN=95
-OR_ASSIGN=96
-XOR_ASSIGN=97
-MOD_ASSIGN=98
-LSHIFT_ASSIGN=99
-RSHIFT_ASSIGN=100
-URSHIFT_ASSIGN=101
-Identifier=102
-AT=103
-ELLIPSIS=104
-WS=105
-COMMENT=106
-LINE_COMMENT=107
-'abstract'=1
-'assert'=2
-'boolean'=3
-'break'=4
-'byte'=5
-'case'=6
-'catch'=7
-'char'=8
-'class'=9
-'const'=10
-'continue'=11
-'default'=12
-'do'=13
-'double'=14
-'else'=15
-'enum'=16
-'extends'=17
-'final'=18
-'finally'=19
-'float'=20
-'for'=21
-'if'=22
-'goto'=23
-'implements'=24
-'import'=25
-'instanceof'=26
-'int'=27
-'interface'=28
-'long'=29
-'native'=30
-'new'=31
-'package'=32
-'private'=33
-'protected'=34
-'public'=35
-'return'=36
-'short'=37
-'static'=38
-'strictfp'=39
-'super'=40
-'switch'=41
-'synchronized'=42
-'this'=43
-'throw'=44
-'throws'=45
-'transient'=46
-'try'=47
-'void'=48
-'volatile'=49
-'while'=50
-'null'=56
-'('=57
-')'=58
-'{'=59
-'}'=60
-'['=61
-']'=62
-';'=63
-','=64
-'.'=65
-'='=66
-'>'=67
-'<'=68
-'!'=69
-'~'=70
-'?'=71
-':'=72
-'=='=73
-'<='=74
-'>='=75
-'!='=76
-'&&'=77
-'||'=78
-'++'=79
-'--'=80
-'+'=81
-'-'=82
-'*'=83
-'/'=84
-'&'=85
-'|'=86
-'^'=87
-'%'=88
-'->'=89
-'::'=90
-'+='=91
-'-='=92
-'*='=93
-'/='=94
-'&='=95
-'|='=96
-'^='=97
-'%='=98
-'<<='=99
-'>>='=100
-'>>>='=101
-'@'=103
-'...'=104
+T__0=1
+ABSTRACT=2
+ASSERT=3
+BOOLEAN=4
+BREAK=5
+BYTE=6
+CASE=7
+CATCH=8
+CHAR=9
+CLASS=10
+CONST=11
+CONTINUE=12
+DEFAULT=13
+DO=14
+DOUBLE=15
+ELSE=16
+ENUM=17
+EXTENDS=18
+FINAL=19
+FINALLY=20
+FLOAT=21
+FOR=22
+IF=23
+GOTO=24
+IMPLEMENTS=25
+IMPORT=26
+INSTANCEOF=27
+INT=28
+INTERFACE=29
+LONG=30
+NATIVE=31
+NEW=32
+PACKAGE=33
+PRIVATE=34
+PROTECTED=35
+PUBLIC=36
+RETURN=37
+SHORT=38
+STATIC=39
+STRICTFP=40
+SUPER=41
+SWITCH=42
+SYNCHRONIZED=43
+THIS=44
+THROW=45
+THROWS=46
+TRANSIENT=47
+TRY=48
+VOID=49
+VOLATILE=50
+WHILE=51
+IntegerLiteral=52
+FloatingPointLiteral=53
+BooleanLiteral=54
+CharacterLiteral=55
+StringLiteral=56
+NullLiteral=57
+LPAREN=58
+RPAREN=59
+LBRACE=60
+RBRACE=61
+LBRACK=62
+RBRACK=63
+SEMI=64
+COMMA=65
+DOT=66
+ASSIGN=67
+GT=68
+LT=69
+BANG=70
+TILDE=71
+QUESTION=72
+COLON=73
+EQUAL=74
+LE=75
+GE=76
+NOTEQUAL=77
+AND=78
+OR=79
+INC=80
+DEC=81
+ADD=82
+SUB=83
+MUL=84
+DIV=85
+BITAND=86
+BITOR=87
+CARET=88
+MOD=89
+ARROW=90
+COLONCOLON=91
+ADD_ASSIGN=92
+SUB_ASSIGN=93
+MUL_ASSIGN=94
+DIV_ASSIGN=95
+AND_ASSIGN=96
+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
+'auto'=1
+'abstract'=2
+'assert'=3
+'boolean'=4
+'break'=5
+'byte'=6
+'case'=7
+'catch'=8
+'char'=9
+'class'=10
+'const'=11
+'continue'=12
+'default'=13
+'do'=14
+'double'=15
+'else'=16
+'enum'=17
+'extends'=18
+'final'=19
+'finally'=20
+'float'=21
+'for'=22
+'if'=23
+'goto'=24
+'implements'=25
+'import'=26
+'instanceof'=27
+'int'=28
+'interface'=29
+'long'=30
+'native'=31
+'new'=32
+'package'=33
+'private'=34
+'protected'=35
+'public'=36
+'return'=37
+'short'=38
+'static'=39
+'strictfp'=40
+'super'=41
+'switch'=42
+'synchronized'=43
+'this'=44
+'throw'=45
+'throws'=46
+'transient'=47
+'try'=48
+'void'=49
+'volatile'=50
+'while'=51
+'null'=57
+'('=58
+')'=59
+'{'=60
+'}'=61
+'['=62
+']'=63
+';'=64
+','=65
+'.'=66
+'='=67
+'>'=68
+'<'=69
+'!'=70
+'~'=71
+'?'=72
+':'=73
+'=='=74
+'<='=75
+'>='=76
+'!='=77
+'&&'=78
+'||'=79
+'++'=80
+'--'=81
+'+'=82
+'-'=83
+'*'=84
+'/'=85
+'&'=86
+'|'=87
+'^'=88
+'%'=89
+'->'=90
+'::'=91
+'+='=92
+'-='=93
+'*='=94
+'/='=95
+'&='=96
+'|='=97
+'^='=98
+'%='=99
+'<<='=100
+'>>='=101
+'>>>='=102
+'@'=104
+'...'=105

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

src/de/dhbwstuttgart/parser/scope/GatherNames.java

@@ -1,105 +0,0 @@
-package de.dhbwstuttgart.parser.scope;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import de.dhbwstuttgart.parser.antlr.Java8BaseListener;
-import de.dhbwstuttgart.syntaxtree.AbstractASTWalker;
-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 Map<String, Integer> getNames(Java8Parser.CompilationUnitContext ctx, PackageCrawler packages) throws ClassNotFoundException{
-		  Map<String, Integer> ret = new HashMap<>();
-	    String pkgName = getPackageName(ctx);
-	    String nameString = "";
-	    for (Java8Parser.TypeDeclarationContext typeDecl : ctx.typeDeclaration()){
-	      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();
-	          }
-				int numGenerics = typeDecl.interfaceDeclaration().normalInterfaceDeclaration().typeParameters()!=null?
-						typeDecl.interfaceDeclaration().normalInterfaceDeclaration().typeParameters().typeParameterList().typeParameter().size():0;
-	          //Die Generic TypeParameter Definitionen Nicht! an die JavaClassName-Registry anfügen:
-	          /* //Diese gelängen dadurch in den globalen Scope, was sie schließlich nicht sind
-	          if(typeDecl.classDeclaration().normalClassDeclaration().typeParameters() != null){
-	            for(Java8Parser.TypeParameterContext tp : typeDecl.classDeclaration().normalClassDeclaration().typeParameters().typeParameterList().typeParameter()){
-	              //this.reg.add(tp.Identifier().toString());
-	            }
-	          }
-	          */
-	          ret.put(nameString, numGenerics);
-	        }
-	      }
-	      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());
-	            }
-	          }
-	          */
-				int numGenerics = typeDecl.classDeclaration().normalClassDeclaration().typeParameters()!=null?
-						typeDecl.classDeclaration().normalClassDeclaration().typeParameters().typeParameterList().typeParameter().size():0;
-
-				ret.put(nameString, numGenerics);
-	        }
-	      }
-	    }
-	    ret.putAll(getImports(ctx, packages));
-	    return ret;
-	  }
-	  
-
-	  public static Map<String, Integer> getImports(Java8Parser.CompilationUnitContext ctx, PackageCrawler packages) throws ClassNotFoundException {
-		  Map<String, Integer> ret = new HashMap<>();
-	    ClassLoader classLoader = ClassLoader.getSystemClassLoader();
-		  //ret.putAll(packages.getClassNames("java.lang"));
-		  for(Java8Parser.ImportDeclarationContext importDeclCtx : ctx.importDeclaration()){
-	      if(importDeclCtx.singleTypeImportDeclaration() != null){
-	    	  Class cl = classLoader.loadClass(importDeclCtx.singleTypeImportDeclaration().typeName().getText());
-			  ret.put(cl.getName(), cl.getTypeParameters().length);
-	      }
-	      else if(importDeclCtx.typeImportOnDemandDeclaration() != null){
-	    	  ret.putAll(packages.getClassNames(importDeclCtx.typeImportOnDemandDeclaration().packageOrTypeName().getText()));
-	      }
-	      else if(importDeclCtx.singleStaticImportDeclaration() != null){
-			  Class cl = classLoader.loadClass(importDeclCtx.singleStaticImportDeclaration().typeName().getText()+"."+importDeclCtx.singleStaticImportDeclaration().Identifier().getText());
-			  ret.put(cl.getName(), cl.getTypeParameters().length);
-		  }
-	      else{
-	    	  ret.putAll(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;
-	}
-}

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;
-    }
-}

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 Map<JavaClassName, Integer> existingClasses = new HashMap<>();
-
-    public JavaClassRegistry(Map<String, Integer> initialNames){
-        for(String name : initialNames.keySet()){
-            existingClasses.put(new JavaClassName(name), initialNames.get(name));
-        }
-    }
-
-    public JavaClassName getName(String className) {
-        for(JavaClassName name : existingClasses.keySet()){
-            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.keySet()){
-            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.containsKey(new JavaClassName(whole));
-    }
-
-    public int getNumberOfGenerics(String name) {
-        return existingClasses.get(new JavaClassName(name));
-    }
-}

src/de/dhbwstuttgart/sat/CNF/CNF.java

@@ -1,8 +0,0 @@
-package de.dhbwstuttgart.sat.CNF;
-
-public class CNF {
-    /*
-    Baut die CNF Datei.
-    Hier muss man überlegen, in welchem Form die Constraints gebaut werden
-     */
-}

src/de/dhbwstuttgart/sat/CNF/Writer.java

@@ -1,12 +0,0 @@
-package de.dhbwstuttgart.sat.CNF;
-
-import java.io.*;
-
-/**
- * Schreibt CNFs in eine Datei im DIMACS CNF Format
- */
-public class Writer {
-    public Writer(FileWriter output){
-
-    }
-}

src/de/dhbwstuttgart/sat/asp/ASPStringConverter.java

@@ -1,40 +0,0 @@
-package de.dhbwstuttgart.sat.asp;
-
-import de.dhbwstuttgart.parser.scope.JavaClassName;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class ASPStringConverter {
-    private static final Map<String, String> replacements = new HashMap<>();
-    static{
-        replacements.put(".", "_DOT_");
-        replacements.put("$", "_DOLLAR_");
-    }
-
-    public static String toConstant(JavaClassName name){
-        return toConstant(name.toString());
-    }
-
-    public static String toConstant(String name){
-        return "c" + replace(name);
-    }
-
-    public static String fromConstant(String s){
-        return unReplace(s).substring(1);
-    }
-
-    private static String replace(String input){
-        for(String toReplace : replacements.keySet()){
-            input = input.replace(toReplace, replacements.get(toReplace));
-        }
-        return input;
-    }
-
-    private static String unReplace(String input){
-        for(String toReplace : replacements.keySet()){
-            input = input.replace(replacements.get(toReplace), toReplace);
-        }
-        return input;
-    }
-}

src/de/dhbwstuttgart/sat/asp/Clingo.java

@@ -1,52 +0,0 @@
-package de.dhbwstuttgart.sat.asp;
-
-
-import org.apache.commons.io.IOUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class Clingo {
-    private final List<File> input;
-    private static final List<File> programFiles = new ArrayList<>();
-    static{
-        programFiles.add(new File("/home/janulrich/Sync/HiwiJob/ResearchPapers/MasterarbeitStadelmeier/asp/unifyWithoutWildcards/basis.lp"));
-        programFiles.add(new File("/home/janulrich/Sync/HiwiJob/ResearchPapers/MasterarbeitStadelmeier/asp/unifyWithoutWildcards/finiteclosure.lp"));
-        programFiles.add(new File("/home/janulrich/Sync/HiwiJob/ResearchPapers/MasterarbeitStadelmeier/asp/unifyWithoutWildcards/subst.lp"));
-        programFiles.add(new File("/home/janulrich/Sync/HiwiJob/ResearchPapers/MasterarbeitStadelmeier/asp/unifyWithoutWildcards/reduce.lp"));
-        programFiles.add(new File("/home/janulrich/Sync/HiwiJob/ResearchPapers/MasterarbeitStadelmeier/asp/unifyWithoutWildcards/unify.lp"));
-        programFiles.add(new File("/home/janulrich/Sync/HiwiJob/ResearchPapers/MasterarbeitStadelmeier/asp/unifyWithoutWildcards/adapt.lp"));
-    }
-
-    public Clingo(List<File> inputFiles){
-        this.input = inputFiles;
-    }
-
-    /*
-    TODO: Clingo per Java Wrapper https://stackoverflow.com/questions/3356200/using-java-to-wrap-over-c
-     */
-    public String runClingo() throws IOException, InterruptedException {
-        String pathToClingo =
-                "/home/janulrich/Sync/HiwiJob/ResearchPapers/MasterarbeitStadelmeier/asp/clingo-5.2.1-linux-x86_64/clingo";
-        List<String> commands = new ArrayList<>();
-        commands.add(pathToClingo);
-        //commands.add("--outf=2"); //use JSON-Output
-        commands.add("--outf=1"); //use JSON-Output
-        for(File file : input){
-            commands.add(file.getPath());
-        }
-        commands.addAll(programFiles.stream().map(f->f.getPath()).collect(Collectors.toList()));
-
-        Process clingo = new ProcessBuilder( commands.toArray(new String[0])).start();
-        InputStream output = clingo.getInputStream();
-        clingo.waitFor();
-        String result = IOUtils.toString(output, StandardCharsets.UTF_8);
-        return result;
-    }
-}

src/de/dhbwstuttgart/sat/asp/model/ASPGencayRule.java

@@ -1,26 +0,0 @@
-package de.dhbwstuttgart.sat.asp.model;
-
-public enum ASPGencayRule {
-    ASP_PAIR_EQUALS_NAME("equals"),
-    ASP_PAIR_SMALLER_NAME("sub"),
-    ASP_PAIR_SMALLER_DOT_NAME("subEq"),
-    ASP_PARAMLIST_NAME("paramEq"),
-    ASP_FC_PARAMLIST_NAME("param"),
-    ASP_PARAMLIST_END_POINTER("null"),
-    ASP_TYPE("typeEq"),
-    ASP_FCTYPE("type"),
-    ASP_TYPE_VAR("var"),
-    ASP_GENERIC_VAR("pph"),
-    ASP_PARAMLIST_ORDER("paramOrder");
-
-    private final String text;
-
-    private ASPGencayRule(final String text) {
-        this.text = text;
-    }
-
-    @Override
-    public String toString() {
-        return text;
-    }
-}

src/de/dhbwstuttgart/sat/asp/model/ASPRule.java

@@ -1,23 +0,0 @@
-package de.dhbwstuttgart.sat.asp.model;
-
-public enum ASPRule {
-    ASP_PAIR_EQUALS_NAME("equals"),
-    ASP_PAIR_SMALLER_NAME("smaller"),
-    ASP_PAIR_SMALLER_DOT_NAME("smallerDot"),
-    ASP_PARAMLIST_NAME("param"),
-    ASP_PARAMLIST_END_POINTER("null"),
-    ASP_TYPE("type"),
-    ASP_FCTYPE("typeFC"),
-    ASP_TYPE_VAR("typeVar");
-
-    private final String text;
-
-    private ASPRule(final String text) {
-        this.text = text;
-    }
-
-    @Override
-    public String toString() {
-        return text;
-    }
-}