diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/BasicAssumptionClass.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/BasicAssumptionClass.html
index ffe47a09..960cbae1 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/BasicAssumptionClass.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/BasicAssumptionClass.html
@@ -69,9 +69,9 @@
- Detail:
@@ -100,7 +100,7 @@
- de.dhbwstuttgart.syntaxtree.GTVDeclarationContext
-
-- de.dhbwstuttgart.syntaxtree.Class
+- de.dhbwstuttgart.syntaxtree.ClassOrInterface
-
- Detail:
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/Class.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/Class.html
index 0512f0ca..1c088344 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/Class.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/Class.html
@@ -106,7 +106,7 @@ var activeTableTab = "activeTableTab";
- de.dhbwstuttgart.syntaxtree.GTVDeclarationContext
-
-- de.dhbwstuttgart.syntaxtree.Class
+- de.dhbwstuttgart.syntaxtree.ClassOrInterface
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/Interface.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/Interface.html
index 4604aaee..766f9971 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/Interface.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/Interface.html
@@ -75,7 +75,7 @@ var activeTableTab = "activeTableTab";
@@ -106,7 +106,7 @@ var activeTableTab = "activeTableTab";
- de.dhbwstuttgart.syntaxtree.GTVDeclarationContext
-
-- de.dhbwstuttgart.syntaxtree.Class
+- de.dhbwstuttgart.syntaxtree.ClassOrInterface
-
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/class-use/Class.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/class-use/Class.html
index 293eb433..45b76ba0 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/class-use/Class.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/class-use/Class.html
@@ -3,7 +3,7 @@
-Uses of Class de.dhbwstuttgart.syntaxtree.Class
+Uses of Class de.dhbwstuttgart.syntaxtree.ClassOrInterface
@@ -70,7 +70,7 @@
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/typeinference/FunNInterface.html b/doc/LambdaJavadoc/de/dhbwstuttgart/typeinference/FunNInterface.html
index 68f124cd..1789347d 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/typeinference/FunNInterface.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/typeinference/FunNInterface.html
@@ -75,7 +75,7 @@ var activeTableTab = "activeTableTab";
@@ -106,7 +106,7 @@ var activeTableTab = "activeTableTab";
- de.dhbwstuttgart.syntaxtree.GTVDeclarationContext
-
-- de.dhbwstuttgart.syntaxtree.Class
+- de.dhbwstuttgart.syntaxtree.ClassOrInterface
-
diff --git a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator.java b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator.java
index 78694e38..676f1f71 100644
--- a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator.java
+++ b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator.java
@@ -1,7 +1,7 @@
package de.dhbwstuttgart.parser;
import de.dhbwstuttgart.syntaxtree.SourceFile;
-import de.dhbwstuttgart.syntaxtree.Class;
+import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
import de.dhbwstuttgart.typecheck.JavaClassRegistry;
import java.util.ArrayList;
@@ -14,15 +14,15 @@ public class SyntaxTreeGenerator {
}
public SourceFile convert(Java8Parser.CompilationUnitContext ctx){
- List classes = new ArrayList<>();
+ List classes = new ArrayList<>();
for(Java8Parser.TypeDeclarationContext typeDecl : ctx.typeDeclaration()){
- Class newClass = convert(typeDecl.classDeclaration());
+ ClassOrInterface newClass = convert(typeDecl.classDeclaration());
classes.add(newClass);
}
return new SourceFile(classes);
}
- private Class convert(Java8Parser.ClassDeclarationContext ctx) {
+ private ClassOrInterface convert(Java8Parser.ClassDeclarationContext ctx) {
//TODO: Implement
return null;
}
diff --git a/src/de/dhbwstuttgart/syntaxtree/Class.java b/src/de/dhbwstuttgart/syntaxtree/ClassOrInterface.java
similarity index 89%
rename from src/de/dhbwstuttgart/syntaxtree/Class.java
rename to src/de/dhbwstuttgart/syntaxtree/ClassOrInterface.java
index 9680fc7d..2d1af147 100755
--- a/src/de/dhbwstuttgart/syntaxtree/Class.java
+++ b/src/de/dhbwstuttgart/syntaxtree/ClassOrInterface.java
@@ -13,7 +13,7 @@ import java.util.List;
/**
* Stellt jede Art von Klasse dar. Auch abstrakte Klassen und Interfaces
*/
-public class Class extends GTVDeclarationContext implements IItemWithOffset, Generic
+public class ClassOrInterface extends GTVDeclarationContext implements IItemWithOffset, Generic
{
protected Modifiers modifiers;
diff --git a/src/de/dhbwstuttgart/syntaxtree/SourceFile.java b/src/de/dhbwstuttgart/syntaxtree/SourceFile.java
index 83b70d4f..8259f41a 100755
--- a/src/de/dhbwstuttgart/syntaxtree/SourceFile.java
+++ b/src/de/dhbwstuttgart/syntaxtree/SourceFile.java
@@ -2,9 +2,6 @@ package de.dhbwstuttgart.syntaxtree;
import java.util.*;
-import java.util.stream.Stream;
-
-import de.dhbwstuttgart.core.MyCompiler;
import de.dhbwstuttgart.typecheck.JavaClassName;
@@ -14,14 +11,14 @@ public class SourceFile extends SyntaxTreeNode
private String pkgName;
- public List KlassenVektor = new ArrayList<>();
+ public List KlassenVektor = new ArrayList<>();
private List imports;
/**
* Die SourceFile repräsntiert eine zu einem Syntaxbaum eingelesene Java-Datei.
* SourceFile stellt dabei den Wurzelknoten des Syntaxbaumes dar.
*/
- public SourceFile(List classDefinitions) {
+ public SourceFile(List classDefinitions) {
this.KlassenVektor = classDefinitions;
}
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/ForStmt.java b/src/de/dhbwstuttgart/syntaxtree/statement/ForStmt.java
index 3378b31b..9f9c1f95 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/ForStmt.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/ForStmt.java
@@ -1,19 +1,9 @@
package de.dhbwstuttgart.syntaxtree.statement;
-import java.util.Enumeration;
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.List;
-import org.apache.bcel.generic.BranchInstruction;
-import org.apache.bcel.generic.ClassGen;
-import org.apache.bcel.generic.GOTO;
-import org.apache.bcel.generic.IF_ICMPGE;
-import org.apache.bcel.generic.InstructionHandle;
-import org.apache.bcel.generic.InstructionList;
-import org.apache.bcel.generic.NOP;
-
-import de.dhbwstuttgart.syntaxtree.Class;
+import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
public class ForStmt extends Statement
{
@@ -31,7 +21,7 @@ public class ForStmt extends Statement
super(null,variableLength);
}
- void sc_check(List classname, Hashtable ch, Hashtable bh, boolean ext, Hashtable parach, Hashtable parabh)
+ void sc_check(List classname, Hashtable ch, Hashtable bh, boolean ext, Hashtable parach, Hashtable parabh)
{
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/LocalVarDecl.java b/src/de/dhbwstuttgart/syntaxtree/statement/LocalVarDecl.java
index 4cbc3cab..aca6870a 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/LocalVarDecl.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/LocalVarDecl.java
@@ -1,18 +1,7 @@
// ino.module.LocalVarDecl.8638.package
package de.dhbwstuttgart.syntaxtree.statement;
// ino.end
-// ino.module.LocalVarDecl.8638.import
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.apache.bcel.generic.ClassGen;
-import org.apache.bcel.generic.InstructionList;
-
-import de.dhbwstuttgart.core.MyCompiler;
-import de.dhbwstuttgart.syntaxtree.Class;
-import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+// ino.module.LocalVarDecl.8638.import
// ino.class.LocalVarDecl.25540.declaration
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/NotExpr.java b/src/de/dhbwstuttgart/syntaxtree/statement/NotExpr.java
index 13aec388..09e65ce8 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/NotExpr.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/NotExpr.java
@@ -1,21 +1,10 @@
// ino.module.NotExpr.8643.package
package de.dhbwstuttgart.syntaxtree.statement;
// ino.end
-// ino.module.NotExpr.8643.import
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.apache.bcel.generic.ClassGen;
-import org.apache.bcel.generic.InstructionList;
-
-import de.dhbwstuttgart.syntaxtree.Class;
-import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
+// ino.module.NotExpr.8643.import
-
-
-// ino.class.NotExpr.25873.declaration
+// ino.class.NotExpr.25873.declaration
public class NotExpr extends UnaryExpr
// ino.end
// ino.class.NotExpr.25873.body
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/PositivExpr.java b/src/de/dhbwstuttgart/syntaxtree/statement/PositivExpr.java
index 3bd48280..171e2c30 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/PositivExpr.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/PositivExpr.java
@@ -1,19 +1,10 @@
// ino.module.PositivExpr.8645.package
package de.dhbwstuttgart.syntaxtree.statement;
// ino.end
-// ino.module.PositivExpr.8645.import
-import java.util.Hashtable;
-
-import org.apache.bcel.generic.ClassGen;
-import org.apache.bcel.generic.InstructionList;
-
-import de.dhbwstuttgart.syntaxtree.Class;
-import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
+// ino.module.PositivExpr.8645.import
-
-
-// ino.class.PositivExpr.25947.declaration
+// ino.class.PositivExpr.25947.declaration
public class PositivExpr extends UnaryExpr
// ino.end
// ino.class.PositivExpr.25947.body
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/PreIncExpr.java b/src/de/dhbwstuttgart/syntaxtree/statement/PreIncExpr.java
index e1f1bdf7..4233681d 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/PreIncExpr.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/PreIncExpr.java
@@ -1,20 +1,10 @@
// ino.module.PreIncExpr.8649.package
package de.dhbwstuttgart.syntaxtree.statement;
// ino.end
-// ino.module.PreIncExpr.8649.import
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.apache.bcel.generic.ClassGen;
-import org.apache.bcel.generic.InstructionList;
-
-import de.dhbwstuttgart.syntaxtree.Class;
-import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
+// ino.module.PreIncExpr.8649.import
-
-
-// ino.class.PreIncExpr.26089.declaration
+// ino.class.PreIncExpr.26089.declaration
public class PreIncExpr extends UnaryExpr
// ino.end
// ino.class.PreIncExpr.26089.body
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/Receiver.java b/src/de/dhbwstuttgart/syntaxtree/statement/Receiver.java
index 95610c87..65702ca4 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/Receiver.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/Receiver.java
@@ -1,16 +1,10 @@
// ino.module.Receiver.8650.package
package de.dhbwstuttgart.syntaxtree.statement;
// ino.end
-// ino.module.Receiver.8650.import
-import java.util.Hashtable;
-import de.dhbwstuttgart.syntaxtree.Class;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+// ino.module.Receiver.8650.import
-
-
-// ino.class.Receiver.26123.declaration
+// ino.class.Receiver.26123.declaration
public class Receiver
// ino.end
// ino.class.Receiver.26123.body
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/This.java b/src/de/dhbwstuttgart/syntaxtree/statement/This.java
index 482aa4bb..fafce91e 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/This.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/This.java
@@ -1,18 +1,8 @@
// ino.module.This.8654.package
package de.dhbwstuttgart.syntaxtree.statement;
// ino.end
-// ino.module.This.8654.import
-import java.util.Hashtable;
+// ino.module.This.8654.import
-import org.apache.bcel.generic.ClassGen;
-import org.apache.bcel.generic.InstructionFactory;
-import org.apache.bcel.generic.InstructionHandle;
-import org.apache.bcel.generic.InstructionList;
-import org.apache.bcel.generic.MethodGen;
-import org.apache.bcel.generic.ObjectType;
-
-import de.dhbwstuttgart.syntaxtree.Class;
-import de.dhbwstuttgart.syntaxtree.Constructor;
import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
// ino.class.This.26261.declaration
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.java b/src/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.java
index 7e806e04..6ce1dcf7 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.java
@@ -1,30 +1,10 @@
// ino.module.WhileStmt.8659.package
package de.dhbwstuttgart.syntaxtree.statement;
// ino.end
-// ino.module.WhileStmt.8659.import
-import java.sql.ResultSet;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.bcel.generic.BranchInstruction;
-import org.apache.bcel.generic.ClassGen;
-import org.apache.bcel.generic.DUP;
-import org.apache.bcel.generic.GOTO;
-import org.apache.bcel.generic.IFEQ;
-import org.apache.bcel.generic.InstructionList;
-import de.dhbwstuttgart.syntaxtree.Class;
-import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
-import de.dhbwstuttgart.syntaxtree.operator.LogOp;
-import de.dhbwstuttgart.syntaxtree.operator.Operator;
-import de.dhbwstuttgart.syntaxtree.operator.RelOp;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
+// ino.module.WhileStmt.8659.import
-
-
-// ino.class.WhileStmt.26326.declaration
+// ino.class.WhileStmt.26326.declaration
public class WhileStmt extends Statement
// ino.end
// ino.class.WhileStmt.26326.body
diff --git a/src/de/dhbwstuttgart/syntaxtree/type/RefType.java b/src/de/dhbwstuttgart/syntaxtree/type/RefType.java
index a16a1802..b6d5af47 100755
--- a/src/de/dhbwstuttgart/syntaxtree/type/RefType.java
+++ b/src/de/dhbwstuttgart/syntaxtree/type/RefType.java
@@ -1,11 +1,8 @@
package de.dhbwstuttgart.syntaxtree.type;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import de.dhbwstuttgart.typecheck.JavaClassName;
-import de.dhbwstuttgart.syntaxtree.Class;
-import de.dhbwstuttgart.syntaxtree.SourceFile;
import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;