diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/BoolLiteral.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/BoolLiteral.html
index 35ca0132..be892a1e 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/BoolLiteral.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/BoolLiteral.html
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
de.dhbwstuttgart.syntaxtree.statement.Expr
-- de.dhbwstuttgart.syntaxtree.statement.literal.Literal
+- de.dhbwstuttgart.syntaxtree.statement.Literal
-
- de.dhbwstuttgart.syntaxtree.statement.literal.BoolLiteral
@@ -253,7 +253,7 @@ extends
--
+
-
Methods inherited from class de.dhbwstuttgart.syntaxtree.statement.Literal
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/CharLiteral.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/CharLiteral.html
index b13baef9..7d0bcafb 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/CharLiteral.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/CharLiteral.html
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
- de.dhbwstuttgart.syntaxtree.statement.Expr
-
-- de.dhbwstuttgart.syntaxtree.statement.literal.Literal
+- de.dhbwstuttgart.syntaxtree.statement.Literal
-
- de.dhbwstuttgart.syntaxtree.statement.literal.CharLiteral
@@ -253,7 +253,7 @@ extends
--
+
-
Methods inherited from class de.dhbwstuttgart.syntaxtree.statement.Literal
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.html
index 3f3f7c69..d367cd8a 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.html
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
- de.dhbwstuttgart.syntaxtree.statement.Expr
-
-- de.dhbwstuttgart.syntaxtree.statement.literal.Literal
+- de.dhbwstuttgart.syntaxtree.statement.Literal
-
- de.dhbwstuttgart.syntaxtree.statement.literal.DoubleLiteral
@@ -263,7 +263,7 @@ extends
--
+
-
Methods inherited from class de.dhbwstuttgart.syntaxtree.statement.Literal
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/FloatLiteral.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/FloatLiteral.html
index 4491e9b7..2c88f19d 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/FloatLiteral.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/FloatLiteral.html
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
- de.dhbwstuttgart.syntaxtree.statement.Expr
-
-- de.dhbwstuttgart.syntaxtree.statement.literal.Literal
+- de.dhbwstuttgart.syntaxtree.statement.Literal
-
- de.dhbwstuttgart.syntaxtree.statement.literal.FloatLiteral
@@ -263,7 +263,7 @@ extends
--
+
-
Methods inherited from class de.dhbwstuttgart.syntaxtree.statement.Literal
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/IntLiteral.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/IntLiteral.html
index 664dd208..7d7ef3eb 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/IntLiteral.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/IntLiteral.html
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
- de.dhbwstuttgart.syntaxtree.statement.Expr
-
-- de.dhbwstuttgart.syntaxtree.statement.literal.Literal
+- de.dhbwstuttgart.syntaxtree.statement.Literal
-
- de.dhbwstuttgart.syntaxtree.statement.literal.NumberLiteral
@@ -263,7 +263,7 @@ extends
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/LongLiteral.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/LongLiteral.html
index 9604e4c8..ba044487 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/LongLiteral.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/LongLiteral.html
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
- de.dhbwstuttgart.syntaxtree.statement.Expr
-
-- de.dhbwstuttgart.syntaxtree.statement.literal.Literal
+- de.dhbwstuttgart.syntaxtree.statement.Literal
-
- de.dhbwstuttgart.syntaxtree.statement.LongLiteral
@@ -263,7 +263,7 @@ extends
--
+
-
Methods inherited from class de.dhbwstuttgart.syntaxtree.statement.Literal
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Null.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Null.html
index d7812a4f..23f741de 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Null.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Null.html
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
- de.dhbwstuttgart.syntaxtree.statement.Expr
-
-- de.dhbwstuttgart.syntaxtree.statement.literal.Literal
+- de.dhbwstuttgart.syntaxtree.statement.Literal
-
- de.dhbwstuttgart.syntaxtree.statement.literal.Null
@@ -245,7 +245,7 @@ extends
--
+
-
Methods inherited from class de.dhbwstuttgart.syntaxtree.statement.Literal
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/StringLiteral.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/StringLiteral.html
index 4d1c4988..89acbb3b 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/StringLiteral.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/StringLiteral.html
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
- de.dhbwstuttgart.syntaxtree.statement.Expr
-
-- de.dhbwstuttgart.syntaxtree.statement.literal.Literal
+- de.dhbwstuttgart.syntaxtree.statement.Literal
-
- de.dhbwstuttgart.syntaxtree.statement.literal.StringLiteral
@@ -253,7 +253,7 @@ extends
--
+
-
Methods inherited from class de.dhbwstuttgart.syntaxtree.statement.Literal
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Literal.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Literal.html
index 5c5ba6a3..33eabfbd 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Literal.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Literal.html
@@ -3,7 +3,7 @@
-Uses of Class de.dhbwstuttgart.syntaxtree.statement.literal.Literal
+Uses of Class de.dhbwstuttgart.syntaxtree.statement.Literal
@@ -70,7 +70,7 @@
diff --git a/src/de/dhbwstuttgart/bytecode/BytecodeGen.java b/src/de/dhbwstuttgart/bytecode/BytecodeGen.java
index 6fff6729..2c68ad43 100644
--- a/src/de/dhbwstuttgart/bytecode/BytecodeGen.java
+++ b/src/de/dhbwstuttgart/bytecode/BytecodeGen.java
@@ -1,6 +1,5 @@
package de.dhbwstuttgart.bytecode;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -10,14 +9,10 @@ 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 org.objectweb.asm.signature.SignatureVisitor;
-import org.objectweb.asm.signature.SignatureWriter;
import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
import de.dhbwstuttgart.syntaxtree.*;
-import de.dhbwstuttgart.syntaxtree.statement.literal.Literal;
-import de.dhbwstuttgart.syntaxtree.statement.literal.Null;
+import de.dhbwstuttgart.syntaxtree.statement.Literal;
import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
import de.dhbwstuttgart.syntaxtree.type.RefType;
@@ -282,9 +277,8 @@ public class BytecodeGen implements ASTVisitor {
}
@Override
- public void visit(Binary binary) {
- // TODO Auto-generated method stub
-
+ public void visit(BinaryExpr binary) {
+
}
@Override
@@ -395,11 +389,6 @@ public class BytecodeGen implements ASTVisitor {
}
- @Override
- public void visit(Null aNull) {
- // TODO Auto-generated method stub
-
- }
// ???
@Override
public void visit(Literal literal) {
diff --git a/src/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java b/src/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
index 0d0f8cea..8cbb64fa 100644
--- a/src/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
+++ b/src/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
@@ -20,9 +20,7 @@ import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
import de.dhbwstuttgart.syntaxtree.FormalParameter;
import de.dhbwstuttgart.syntaxtree.Method;
import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.statement.literal.Literal;
-import de.dhbwstuttgart.syntaxtree.statement.literal.Null;
-import de.dhbwstuttgart.syntaxtree.type.FunN;
+import de.dhbwstuttgart.syntaxtree.statement.Literal;
import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
import de.dhbwstuttgart.typeinference.result.ResultSet;
@@ -161,7 +159,7 @@ public class BytecodeGenMethod implements StatementVisitor{
}
@Override
- public void visit(Binary binary) {
+ public void visit(BinaryExpr binary) {
System.out.println("\t++ In Binary: ");
}
@@ -385,11 +383,6 @@ public class BytecodeGenMethod implements StatementVisitor{
}
- @Override
- public void visit(Null aNull) {
- mv.visitInsn(Opcodes.ACONST_NULL);
- }
-
@Override
public void visit(Literal literal) {
// value?
diff --git a/src/de/dhbwstuttgart/bytecode/KindOfLambda.java b/src/de/dhbwstuttgart/bytecode/KindOfLambda.java
index 5264888c..1cc8e386 100644
--- a/src/de/dhbwstuttgart/bytecode/KindOfLambda.java
+++ b/src/de/dhbwstuttgart/bytecode/KindOfLambda.java
@@ -8,8 +8,7 @@ import java.util.List;
import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.statement.literal.Literal;
-import de.dhbwstuttgart.syntaxtree.statement.literal.Null;
+import de.dhbwstuttgart.syntaxtree.statement.Literal;
import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
public class KindOfLambda implements StatementVisitor{
@@ -46,7 +45,7 @@ public class KindOfLambda implements StatementVisitor{
}
@Override
- public void visit(Binary binary) {
+ public void visit(BinaryExpr binary) {
// TODO Auto-generated method stub
}
@@ -173,12 +172,6 @@ public class KindOfLambda implements StatementVisitor{
}
- @Override
- public void visit(Null aNull) {
- // TODO Auto-generated method stub
-
- }
-
@Override
public void visit(Literal literal) {
// TODO Auto-generated method stub
diff --git a/src/de/dhbwstuttgart/environment/CompilationEnvironment.java b/src/de/dhbwstuttgart/environment/CompilationEnvironment.java
index 7044da6b..eca8c9c2 100644
--- a/src/de/dhbwstuttgart/environment/CompilationEnvironment.java
+++ b/src/de/dhbwstuttgart/environment/CompilationEnvironment.java
@@ -41,14 +41,16 @@ public class CompilationEnvironment {
*/
public CompilationEnvironment(List sourceFiles) {
String bootClassPath = System.getProperty("sun.boot.class.path");
- librarys = new ArrayList<>();
- for(String path : bootClassPath.split(File.pathSeparator)) {
- try {
- librarys.add(new URL("file:"+path));
- } catch (MalformedURLException e) {
- new DebugException("Fehler im Classpath auf diesem System");
+ librarys = new ArrayList<>();
+ if(bootClassPath != null){
+ for(String path : bootClassPath.split(File.pathSeparator)) {
+ try {
+ librarys.add(new URL("file:"+path));
+ } catch (MalformedURLException e) {
+ new DebugException("Fehler im Classpath auf diesem System");
+ }
}
- }
+ }
this.sourceFiles = sourceFiles;
this.packageCrawler = new PackageCrawler(librarys);
}
diff --git a/src/de/dhbwstuttgart/parser/JavaTXParser.java b/src/de/dhbwstuttgart/parser/JavaTXParser.java
index c860a6a7..aad0a575 100644
--- a/src/de/dhbwstuttgart/parser/JavaTXParser.java
+++ b/src/de/dhbwstuttgart/parser/JavaTXParser.java
@@ -29,7 +29,7 @@ public class JavaTXParser {
*/
}
- /* Für das Typsystem ist es notwendig, dass sich der Source in einer Datei befindet:
+ /* Für das Typsystem ist es notwendig, dass sich der Source in einer Datei befindet:
public SourceFile parse(String fileContent) throws IOException, java.lang.ClassNotFoundException {
return this.parse(new ByteArrayInputStream(fileContent.getBytes(StandardCharsets.UTF_8)));
}
diff --git a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java
index 069f49dc..1586ba3f 100644
--- a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java
+++ b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java
@@ -7,7 +7,6 @@ import de.dhbwstuttgart.parser.scope.GenericsRegistry;
import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
import de.dhbwstuttgart.syntaxtree.*;
import de.dhbwstuttgart.syntaxtree.statement.*;
-import de.dhbwstuttgart.syntaxtree.statement.literal.*;
import de.dhbwstuttgart.syntaxtree.type.RefType;
import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
@@ -16,7 +15,6 @@ import de.dhbwstuttgart.syntaxtree.type.Void;
import org.antlr.v4.runtime.Token;
import org.antlr.v4.runtime.tree.TerminalNode;
-import java.lang.reflect.Type;
import java.util.*;
public class StatementGenerator {
@@ -544,8 +542,7 @@ public class StatementGenerator {
if(expression.conditionalOrExpression() == null){
return convert(expression.conditionalAndExpression());
}else{
- return new Binary(convert(expression.conditionalOrExpression()),
- convert(expression.conditionalAndExpression()), Binary.Operator.OR);
+ throw new NotImplementedException();
}
}
@@ -553,8 +550,7 @@ public class StatementGenerator {
if(expression.conditionalAndExpression() == null){
return convert(expression.inclusiveOrExpression());
}else{
- return new Binary(convert(expression.conditionalAndExpression()),
- convert(expression.inclusiveOrExpression()), Binary.Operator.AND);
+ throw new NotImplementedException();
}
}
@@ -591,11 +587,20 @@ public class StatementGenerator {
}
private Expression convert(Java8Parser.RelationalExpressionContext expression) {
- if(expression.relationalExpression() == null){
+ if(expression.relationalExpression() == null) {
return convert(expression.shiftExpression());
- }else{
- return convert(expression.relationalExpression());
+ }else {
+ String operator = expression.getChild(1).getText();
+ return new BinaryExpr(convertBinaryOperator(operator), TypePlaceholder.fresh(expression.getStart()),
+ convert(expression.relationalExpression()),
+ convert(expression.shiftExpression()), expression.getStart());
}
+ //}else throw new NotImplementedException();
+ }
+
+ private BinaryExpr.Operator convertBinaryOperator(String operator) {
+
+ return null;
}
private Expression convert(Java8Parser.ShiftExpressionContext expression) {
@@ -778,25 +783,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 NumberLiteral(TypePlaceholder.fresh(literal.getStart()),
+ return new Literal(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 BoolLiteral(type,
+ return new Literal(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 CharLiteral(type,
+ return new Literal(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 StringLiteral(type,
+ return new Literal(type,
literal.StringLiteral().getText(),
literal.getStart());
}else if(literal.NullLiteral() != null){
- return new Null(TypePlaceholder.fresh(literal.getStart()),
+ return new Literal(TypePlaceholder.fresh(literal.getStart()), null,
literal.getStart());
}else {
throw new NotImplementedException();
diff --git a/src/de/dhbwstuttgart/syntaxtree/ASTVisitor.java b/src/de/dhbwstuttgart/syntaxtree/ASTVisitor.java
index cecbc6cb..5f77601d 100644
--- a/src/de/dhbwstuttgart/syntaxtree/ASTVisitor.java
+++ b/src/de/dhbwstuttgart/syntaxtree/ASTVisitor.java
@@ -1,12 +1,6 @@
package de.dhbwstuttgart.syntaxtree;
-import de.dhbwstuttgart.syntaxtree.statement.*;
-import de.dhbwstuttgart.syntaxtree.statement.literal.Literal;
-import de.dhbwstuttgart.syntaxtree.statement.literal.Null;
import de.dhbwstuttgart.syntaxtree.type.*;
-import de.dhbwstuttgart.typeinference.constraints.Constraint;
-
-import java.lang.reflect.Type;
public interface ASTVisitor extends StatementVisitor{
diff --git a/src/de/dhbwstuttgart/syntaxtree/AbstractASTWalker.java b/src/de/dhbwstuttgart/syntaxtree/AbstractASTWalker.java
index dfb8438c..4168b587 100644
--- a/src/de/dhbwstuttgart/syntaxtree/AbstractASTWalker.java
+++ b/src/de/dhbwstuttgart/syntaxtree/AbstractASTWalker.java
@@ -1,14 +1,10 @@
package de.dhbwstuttgart.syntaxtree;
-import de.dhbwstuttgart.exceptions.NotImplementedException;
import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
import de.dhbwstuttgart.syntaxtree.statement.*;
-import de.dhbwstuttgart.syntaxtree.statement.literal.Literal;
-import de.dhbwstuttgart.syntaxtree.statement.literal.Null;
+import de.dhbwstuttgart.syntaxtree.statement.Literal;
import de.dhbwstuttgart.syntaxtree.type.*;
-import javax.management.Notification;
-import java.lang.reflect.Modifier;
import java.util.Iterator;
public abstract class AbstractASTWalker implements ASTVisitor{
@@ -130,7 +126,7 @@ public abstract class AbstractASTWalker implements ASTVisitor{
}
@Override
- public void visit(Binary binary) {
+ public void visit(BinaryExpr binary) {
}
@@ -244,11 +240,6 @@ public abstract class AbstractASTWalker implements ASTVisitor{
whileStmt.loopBlock.accept(this);
}
- @Override
- public void visit(Null aNull) {
-
- }
-
@Override
public void visit(Literal literal) {
diff --git a/src/de/dhbwstuttgart/syntaxtree/StatementVisitor.java b/src/de/dhbwstuttgart/syntaxtree/StatementVisitor.java
index 1c4e149c..d6e0d1d5 100644
--- a/src/de/dhbwstuttgart/syntaxtree/StatementVisitor.java
+++ b/src/de/dhbwstuttgart/syntaxtree/StatementVisitor.java
@@ -2,9 +2,6 @@ package de.dhbwstuttgart.syntaxtree;
import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
import de.dhbwstuttgart.syntaxtree.statement.*;
-import de.dhbwstuttgart.syntaxtree.statement.literal.Literal;
-import de.dhbwstuttgart.syntaxtree.statement.literal.Null;
-import de.dhbwstuttgart.syntaxtree.statement.literal.StringLiteral;
public interface StatementVisitor {
@@ -14,7 +11,7 @@ public interface StatementVisitor {
void visit(Assign assign);
- void visit(Binary binary);
+ void visit(BinaryExpr binary);
void visit(Block block);
@@ -54,10 +51,6 @@ public interface StatementVisitor {
void visit(DoStmt whileStmt);
- void visit(Null aNull);
-
- void visit(Literal literal);
-
void visit(AssignToField assignLeftSide);
void visit(AssignToLocal assignLeftSide);
@@ -67,4 +60,6 @@ public interface StatementVisitor {
void visit(ExpressionReceiver expressionReceiver);
void visit(UnaryExpr unaryExpr);
+
+ void visit(Literal literal);
}
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/Binary.java b/src/de/dhbwstuttgart/syntaxtree/statement/Binary.java
deleted file mode 100644
index 8a0a0b35..00000000
--- a/src/de/dhbwstuttgart/syntaxtree/statement/Binary.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.exceptions.NotImplementedException;
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;
-
-
-// neu von Felix
-public class Binary extends Expression
-{
- public enum Operator{
- ADD,
- SUB,
- MUL,
- AND, OR, DIV
- }
- public Binary(Expression expr1, Expression expr2, Operator op){
- super(null, null);
- }
-
- @Override
- public void accept(StatementVisitor visitor) {
- visitor.visit(this);
- }
-}
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/BinaryExpr.java b/src/de/dhbwstuttgart/syntaxtree/statement/BinaryExpr.java
index 7d9270e0..f7db0481 100644
--- a/src/de/dhbwstuttgart/syntaxtree/statement/BinaryExpr.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/BinaryExpr.java
@@ -1,14 +1,41 @@
package de.dhbwstuttgart.syntaxtree.statement;
+import de.dhbwstuttgart.syntaxtree.StatementVisitor;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
import org.antlr.v4.runtime.Token;
-public abstract class BinaryExpr extends Expression
+public class BinaryExpr extends Expression
{
+ @Override
+ public void accept(StatementVisitor visitor) {
+ visitor.visit(this);
+ }
- public BinaryExpr(Token offset)
+ public enum Operator{
+ ADD,
+ SUB,
+ MUL,
+ AND,
+ OR,
+ DIV,
+ LESSTHAN,
+ BIGGERTHAN,
+ LESSEQUAL,
+ BIGGEREQUAL
+ }
+
+ public final Operator operation;
+ public final Expression lexpr;
+ public final Expression rexpr;
+
+ public BinaryExpr(Operator operation, RefTypeOrTPHOrWildcardOrGeneric type, Expression lexpr, Expression rexpr, Token offset)
{
- super(null,null);
+ super(type,offset);
+
+ this.operation = operation;
+ this.lexpr = lexpr;
+ this.rexpr = rexpr;
}
}
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.java b/src/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.java
index 154b5980..02fd667b 100644
--- a/src/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.java
@@ -3,8 +3,6 @@ package de.dhbwstuttgart.syntaxtree.statement;
import de.dhbwstuttgart.exceptions.NotImplementedException;
import de.dhbwstuttgart.syntaxtree.StatementVisitor;
import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
public class InstanceOf extends BinaryExpr
@@ -14,7 +12,8 @@ public class InstanceOf extends BinaryExpr
public InstanceOf(int offset,int variableLength)
{
- super(null);
+ super(null, null, null, null, null);
+ throw new NotImplementedException();
// #JB# 20.04.2005
}
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/literal/Literal.java b/src/de/dhbwstuttgart/syntaxtree/statement/Literal.java
similarity index 52%
rename from src/de/dhbwstuttgart/syntaxtree/statement/literal/Literal.java
rename to src/de/dhbwstuttgart/syntaxtree/statement/Literal.java
index 7c48c3ae..b6ad9e96 100644
--- a/src/de/dhbwstuttgart/syntaxtree/statement/literal/Literal.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/Literal.java
@@ -1,19 +1,21 @@
-package de.dhbwstuttgart.syntaxtree.statement.literal;
+package de.dhbwstuttgart.syntaxtree.statement;
+import de.dhbwstuttgart.syntaxtree.StatementVisitor;
import de.dhbwstuttgart.syntaxtree.statement.Expression;
import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
import org.antlr.v4.runtime.Token;
-public abstract class Literal extends Expression
+public class Literal extends Expression
{
- public Literal(RefTypeOrTPHOrWildcardOrGeneric type, Token offset) {
+ public Literal(RefTypeOrTPHOrWildcardOrGeneric type, Object value, Token offset) {
super(type, offset);
}
- public ConstraintSet getConstraints(TypeInferenceBlockInformation info){
- return new ConstraintSet();
+ @Override
+ public void accept(StatementVisitor visitor) {
+ visitor.visit(this);
}
}
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/MethodCall.java b/src/de/dhbwstuttgart/syntaxtree/statement/MethodCall.java
index 435b1b65..f6307f1e 100644
--- a/src/de/dhbwstuttgart/syntaxtree/statement/MethodCall.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/MethodCall.java
@@ -2,7 +2,6 @@ package de.dhbwstuttgart.syntaxtree.statement;
import de.dhbwstuttgart.exceptions.TypeinferenceException;
import de.dhbwstuttgart.syntaxtree.*;
-import de.dhbwstuttgart.syntaxtree.statement.literal.Null;
import de.dhbwstuttgart.syntaxtree.type.RefType;
import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/literal/BoolLiteral.java b/src/de/dhbwstuttgart/syntaxtree/statement/literal/BoolLiteral.java
deleted file mode 100644
index 29bdb47d..00000000
--- a/src/de/dhbwstuttgart/syntaxtree/statement/literal/BoolLiteral.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement.literal;
-
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import org.antlr.v4.runtime.Token;
-
-
-public class BoolLiteral extends Literal
-{
-
- private boolean value;
-
- public BoolLiteral(RefTypeOrTPHOrWildcardOrGeneric type, boolean value, Token offset)
- {
- super(type,offset);
- this.value = value;
- }
-
-
- @Override
- public void accept(StatementVisitor visitor) {
- visitor.visit(this);
- }
-
-
-}
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/literal/CharLiteral.java b/src/de/dhbwstuttgart/syntaxtree/statement/literal/CharLiteral.java
deleted file mode 100644
index 7e379690..00000000
--- a/src/de/dhbwstuttgart/syntaxtree/statement/literal/CharLiteral.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement.literal;
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import org.antlr.v4.runtime.Token;
-
-
-public class CharLiteral extends Literal
-{
- private char value;
-
- public CharLiteral(RefTypeOrTPHOrWildcardOrGeneric type, char value, Token offset)
- {
- super(type,offset);
- this.value = value;
- }
-
- @Override
- public void accept(StatementVisitor visitor) {
- visitor.visit(this);
- }
-}
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/literal/Null.java b/src/de/dhbwstuttgart/syntaxtree/statement/literal/Null.java
deleted file mode 100644
index 254408e8..00000000
--- a/src/de/dhbwstuttgart/syntaxtree/statement/literal/Null.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement.literal;
-
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import org.antlr.v4.runtime.Token;
-
-
-public class Null extends Literal
-{
-
- public Null(RefTypeOrTPHOrWildcardOrGeneric type, Token offset)
- {
- super(type,offset);
- }
-
- @Override
- public void accept(StatementVisitor visitor) {
- visitor.visit(this);
- }
-
-}
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/literal/NumberLiteral.java b/src/de/dhbwstuttgart/syntaxtree/statement/literal/NumberLiteral.java
deleted file mode 100644
index 2c90f413..00000000
--- a/src/de/dhbwstuttgart/syntaxtree/statement/literal/NumberLiteral.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement.literal;
-
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import org.antlr.v4.runtime.Token;
-
-
-public class NumberLiteral extends Literal
-{
- private Number value;
-
- public NumberLiteral(RefTypeOrTPHOrWildcardOrGeneric type, Number value, Token offset)
- {
- super(type,offset);
- this.value = value;
- }
-
- @Override
- public void accept(StatementVisitor visitor) {
- visitor.visit(this);
- }
-}
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/literal/StringLiteral.java b/src/de/dhbwstuttgart/syntaxtree/statement/literal/StringLiteral.java
deleted file mode 100644
index d6ab9808..00000000
--- a/src/de/dhbwstuttgart/syntaxtree/statement/literal/StringLiteral.java
+++ /dev/null
@@ -1,23 +0,0 @@
-
-package de.dhbwstuttgart.syntaxtree.statement.literal;
-
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import org.antlr.v4.runtime.Token;
-
-
-public class StringLiteral extends Literal
-{
- private String value;
-
- public StringLiteral(RefType type, String value, Token offset)
- {
- super(type,offset);
- this.value = value;
- }
-
- @Override
- public void accept(StatementVisitor visitor) {
- visitor.visit(this);
- }
-}
diff --git a/src/de/dhbwstuttgart/syntaxtree/visual/ASTTypePrinter.java b/src/de/dhbwstuttgart/syntaxtree/visual/ASTTypePrinter.java
index 2dc7ae54..cbfc1a19 100644
--- a/src/de/dhbwstuttgart/syntaxtree/visual/ASTTypePrinter.java
+++ b/src/de/dhbwstuttgart/syntaxtree/visual/ASTTypePrinter.java
@@ -1,13 +1,6 @@
package de.dhbwstuttgart.syntaxtree.visual;
import de.dhbwstuttgart.syntaxtree.*;
-import de.dhbwstuttgart.syntaxtree.statement.*;
-import de.dhbwstuttgart.syntaxtree.statement.literal.Literal;
-import de.dhbwstuttgart.syntaxtree.statement.literal.Null;
-import de.dhbwstuttgart.syntaxtree.type.*;
-
-import java.lang.reflect.Modifier;
-import java.util.Iterator;
public class ASTTypePrinter extends ASTPrinter{
diff --git a/src/de/dhbwstuttgart/syntaxtree/visual/OutputGenerator.java b/src/de/dhbwstuttgart/syntaxtree/visual/OutputGenerator.java
index 879a4ba2..7d97d4b7 100644
--- a/src/de/dhbwstuttgart/syntaxtree/visual/OutputGenerator.java
+++ b/src/de/dhbwstuttgart/syntaxtree/visual/OutputGenerator.java
@@ -4,8 +4,6 @@ import de.dhbwstuttgart.exceptions.NotImplementedException;
import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
import de.dhbwstuttgart.syntaxtree.*;
import de.dhbwstuttgart.syntaxtree.statement.*;
-import de.dhbwstuttgart.syntaxtree.statement.literal.Literal;
-import de.dhbwstuttgart.syntaxtree.statement.literal.Null;
import de.dhbwstuttgart.syntaxtree.type.*;
import java.lang.reflect.Modifier;
@@ -191,8 +189,10 @@ public class OutputGenerator implements ASTVisitor{
}
@Override
- public void visit(Binary binary) {
-
+ public void visit(BinaryExpr binary) {
+ binary.lexpr.accept(this);
+ out.append(" op ");
+ binary.rexpr.accept(this);
}
@Override
@@ -313,16 +313,6 @@ public class OutputGenerator implements ASTVisitor{
out.append(");");
}
- @Override
- public void visit(Null aNull) {
-
- }
-
- @Override
- public void visit(Literal literal) {
-
- }
-
@Override
public void visit(AssignToField assignLeftSide) {
assignLeftSide.field.accept(this);
@@ -367,4 +357,9 @@ public class OutputGenerator implements ASTVisitor{
out.append("++");
}
}
+
+ @Override
+ public void visit(de.dhbwstuttgart.syntaxtree.statement.Literal literal) {
+ throw new NotImplementedException();
+ }
}
\ No newline at end of file
diff --git a/src/de/dhbwstuttgart/syntaxtree/visual/TypeOutputGenerator.java b/src/de/dhbwstuttgart/syntaxtree/visual/TypeOutputGenerator.java
index 6f90051a..8a210db1 100644
--- a/src/de/dhbwstuttgart/syntaxtree/visual/TypeOutputGenerator.java
+++ b/src/de/dhbwstuttgart/syntaxtree/visual/TypeOutputGenerator.java
@@ -2,13 +2,9 @@ package de.dhbwstuttgart.syntaxtree.visual;
import de.dhbwstuttgart.syntaxtree.*;
import de.dhbwstuttgart.syntaxtree.statement.*;
-import de.dhbwstuttgart.syntaxtree.statement.literal.Literal;
-import de.dhbwstuttgart.syntaxtree.statement.literal.Null;
+import de.dhbwstuttgart.syntaxtree.statement.Literal;
import de.dhbwstuttgart.syntaxtree.type.*;
-import java.lang.reflect.Modifier;
-import java.util.Iterator;
-
public class TypeOutputGenerator extends OutputGenerator {
TypeOutputGenerator(StringBuilder out){
@@ -100,8 +96,10 @@ public class TypeOutputGenerator extends OutputGenerator {
}
@Override
- public void visit(Binary binary) {
- super.visit(binary);
+ public void visit(BinaryExpr binary) {
+ binary.lexpr.accept(this);
+ out.append(" | ");
+ binary.rexpr.accept(this);
}
@Override
@@ -219,11 +217,6 @@ public class TypeOutputGenerator extends OutputGenerator {
super.visit(whileStmt);
}
- @Override
- public void visit(Null aNull) {
- super.visit(aNull);
- }
-
@Override
public void visit(Literal literal) {
super.visit(literal);
diff --git a/src/de/dhbwstuttgart/typeinference/assumptions/FunNClass.java b/src/de/dhbwstuttgart/typeinference/assumptions/FunNClass.java
index 0eba225d..a04ce9bb 100644
--- a/src/de/dhbwstuttgart/typeinference/assumptions/FunNClass.java
+++ b/src/de/dhbwstuttgart/typeinference/assumptions/FunNClass.java
@@ -1,6 +1,5 @@
package de.dhbwstuttgart.typeinference.assumptions;
-import com.sun.org.apache.regexp.internal.RE;
import de.dhbwstuttgart.parser.NullToken;
import de.dhbwstuttgart.parser.SyntaxTreeGenerator.GenericContext;
import de.dhbwstuttgart.parser.scope.GenericTypeName;
diff --git a/src/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java b/src/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
index ed5837ad..423a4f65 100644
--- a/src/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
+++ b/src/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
@@ -1,8 +1,5 @@
package de.dhbwstuttgart.typeinference.typeAlgo;
-//import com.sun.org.apache.xpath.internal.Arg;
-
-import com.sun.org.apache.xpath.internal.operations.Bool;
import de.dhbwstuttgart.exceptions.NotImplementedException;
import de.dhbwstuttgart.exceptions.TypeinferenceException;
import de.dhbwstuttgart.parser.NullToken;
@@ -11,8 +8,6 @@ import de.dhbwstuttgart.parser.antlr.Java8Parser;
import de.dhbwstuttgart.syntaxtree.*;
import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
import de.dhbwstuttgart.syntaxtree.statement.*;
-import de.dhbwstuttgart.syntaxtree.statement.literal.Literal;
-import de.dhbwstuttgart.syntaxtree.statement.literal.Null;
import de.dhbwstuttgart.syntaxtree.type.*;
import de.dhbwstuttgart.typeinference.assumptions.FieldAssumption;
import de.dhbwstuttgart.typeinference.assumptions.FunNClass;
@@ -87,7 +82,7 @@ public class TYPEStmt implements StatementVisitor{
}
@Override
- public void visit(Binary binary) {
+ public void visit(BinaryExpr binary) {
throw new NotImplementedException();
}
@@ -212,6 +207,11 @@ public class TYPEStmt implements StatementVisitor{
}
}
+ @Override
+ public void visit(Literal literal) {
+ throw new NotImplementedException();
+ }
+
@Override
public void visit(Return returnExpr) {
returnExpr.retexpr.accept(this);
@@ -263,7 +263,11 @@ public class TYPEStmt implements StatementVisitor{
@Override
public void visit(WhileStmt whileStmt) {
RefType booleanType = new RefType(ASTFactory.createClass(java.lang.Boolean.class).getClassName(), new NullToken());
+ //Expression inferieren:
+ whileStmt.expr.accept(this);
+ //Expression muss boolean sein:
constraintsSet.addUndConstraint(new Pair(whileStmt.expr.getType(), booleanType, PairOperator.EQUALSDOT));
+ //LoopBlock inferieren:
whileStmt.loopBlock.accept(this);
}
@@ -272,17 +276,6 @@ public class TYPEStmt implements StatementVisitor{
throw new NotImplementedException();
}
- @Override
- public void visit(Null aNull) {
- throw new NotImplementedException();
- }
-
- @Override
- public void visit(Literal literal) {
- //Hier gibt es nichts zu tun
- //throw new NotImplementedException();
- }
-
@Override
public void visit(AssignToField assignLeftSide) {
//Hier ist kein Code nötig. Es werden keine extra Constraints generiert