diff --git a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/AssignToLocal.java b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/AssignToLocal.java index eae9ee90..bce5b114 100644 --- a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/AssignToLocal.java +++ b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/AssignToLocal.java @@ -1,6 +1,6 @@ package de.dhbwstuttgart.parser.SyntaxTreeGenerator; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.StatementVisitor; import de.dhbwstuttgart.syntaxtree.statement.AssignLeftSide; import de.dhbwstuttgart.syntaxtree.statement.Expression; diff --git a/src/de/dhbwstuttgart/strucTypes/Construct.java b/src/de/dhbwstuttgart/strucTypes/Construct.java index ba4fa547..bbc8651b 100644 --- a/src/de/dhbwstuttgart/strucTypes/Construct.java +++ b/src/de/dhbwstuttgart/strucTypes/Construct.java @@ -14,6 +14,7 @@ import de.dhbwstuttgart.strucTypes.constraint.ConstraintsSet; import de.dhbwstuttgart.strucTypes.constraint.SubTypeConstraint; import de.dhbwstuttgart.strucTypes.exception.IllegalInterfaceTypeException; import de.dhbwstuttgart.strucTypes.exception.ImpossibleSubTypeException; +import de.dhbwstuttgart.strucTypes.visitor.DefaultASTVisitor; import de.dhbwstuttgart.syntaxtree.ClassOrInterface; import de.dhbwstuttgart.syntaxtree.Constructor; import de.dhbwstuttgart.syntaxtree.Field; diff --git a/src/de/dhbwstuttgart/strucTypes/Solve.java b/src/de/dhbwstuttgart/strucTypes/Solve.java index be5daf4f..1ccc8a2a 100644 --- a/src/de/dhbwstuttgart/strucTypes/Solve.java +++ b/src/de/dhbwstuttgart/strucTypes/Solve.java @@ -10,8 +10,11 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import de.dhbwstuttgart.parser.NullToken; +import de.dhbwstuttgart.strucTypes.classorinterface.ClassOrInterfaceWithConstraints; import de.dhbwstuttgart.strucTypes.constraint.SubTypeConstraint; import de.dhbwstuttgart.strucTypes.exception.InconsistentConstraintsException; +import de.dhbwstuttgart.strucTypes.visitor.InferTypes; +import de.dhbwstuttgart.strucTypes.visitor.TypeVar; import de.dhbwstuttgart.syntaxtree.ClassOrInterface; import de.dhbwstuttgart.syntaxtree.GenericDeclarationList; import de.dhbwstuttgart.syntaxtree.GenericTypeVar; @@ -75,7 +78,7 @@ public class Solve { if (!consistent(cs)) { throw new InconsistentConstraintsException(); } - return new ClassOrInterfaceWithConstraints(this.clsA.accept(new InferTypesVisitor(inferredTypes)), Tnew, + return new ClassOrInterfaceWithConstraints(this.clsA.accept(new InferTypes(inferredTypes)), Tnew, this.constraints); } diff --git a/src/de/dhbwstuttgart/strucTypes/StrucTYPE.java b/src/de/dhbwstuttgart/strucTypes/StrucTYPE.java index 06de9fad..fe512c21 100644 --- a/src/de/dhbwstuttgart/strucTypes/StrucTYPE.java +++ b/src/de/dhbwstuttgart/strucTypes/StrucTYPE.java @@ -1,6 +1,7 @@ package de.dhbwstuttgart.strucTypes; import de.dhbwstuttgart.strucTypes.constraint.ConstraintsSet; +import de.dhbwstuttgart.strucTypes.visitor.DefaultASTVisitor; import de.dhbwstuttgart.syntaxtree.ClassOrInterface; import de.dhbwstuttgart.syntaxtree.Method; import de.dhbwstuttgart.syntaxtree.SourceFile; diff --git a/src/de/dhbwstuttgart/strucTypes/TYPEExpr.java b/src/de/dhbwstuttgart/strucTypes/TYPEExpr.java index fad3c8e9..b1469f44 100644 --- a/src/de/dhbwstuttgart/strucTypes/TYPEExpr.java +++ b/src/de/dhbwstuttgart/strucTypes/TYPEExpr.java @@ -7,6 +7,8 @@ import de.dhbwstuttgart.strucTypes.constraint.ConstraintsSet; import de.dhbwstuttgart.strucTypes.constraint.FieldConstraint; import de.dhbwstuttgart.strucTypes.constraint.MethodConstraint; import de.dhbwstuttgart.strucTypes.constraint.SubTypeConstraint; +import de.dhbwstuttgart.strucTypes.visitor.DefaultASTVisitor; +import de.dhbwstuttgart.strucTypes.visitor.TypeExtract; import de.dhbwstuttgart.syntaxtree.ClassOrInterface; import de.dhbwstuttgart.syntaxtree.Field; import de.dhbwstuttgart.syntaxtree.FormalParameter; diff --git a/src/de/dhbwstuttgart/strucTypes/ClassOrInterfaceFactory.java b/src/de/dhbwstuttgart/strucTypes/classorinterface/ClassOrInterfaceFactory.java similarity index 90% rename from src/de/dhbwstuttgart/strucTypes/ClassOrInterfaceFactory.java rename to src/de/dhbwstuttgart/strucTypes/classorinterface/ClassOrInterfaceFactory.java index 56fb4eb2..9d6bb562 100644 --- a/src/de/dhbwstuttgart/strucTypes/ClassOrInterfaceFactory.java +++ b/src/de/dhbwstuttgart/strucTypes/classorinterface/ClassOrInterfaceFactory.java @@ -1,4 +1,4 @@ -package de.dhbwstuttgart.strucTypes; +package de.dhbwstuttgart.strucTypes.classorinterface; import java.util.Optional; diff --git a/src/de/dhbwstuttgart/strucTypes/ClassOrInterfaceWithConstraints.java b/src/de/dhbwstuttgart/strucTypes/classorinterface/ClassOrInterfaceWithConstraints.java similarity index 95% rename from src/de/dhbwstuttgart/strucTypes/ClassOrInterfaceWithConstraints.java rename to src/de/dhbwstuttgart/strucTypes/classorinterface/ClassOrInterfaceWithConstraints.java index fb875ee7..2dfb09b6 100644 --- a/src/de/dhbwstuttgart/strucTypes/ClassOrInterfaceWithConstraints.java +++ b/src/de/dhbwstuttgart/strucTypes/classorinterface/ClassOrInterfaceWithConstraints.java @@ -1,4 +1,4 @@ -package de.dhbwstuttgart.strucTypes; +package de.dhbwstuttgart.strucTypes.classorinterface; import java.util.HashSet; import java.util.List; diff --git a/src/de/dhbwstuttgart/strucTypes/ClassOrInterfaceWithConstraintsFactory.java b/src/de/dhbwstuttgart/strucTypes/classorinterface/ClassOrInterfaceWithConstraintsFactory.java similarity index 94% rename from src/de/dhbwstuttgart/strucTypes/ClassOrInterfaceWithConstraintsFactory.java rename to src/de/dhbwstuttgart/strucTypes/classorinterface/ClassOrInterfaceWithConstraintsFactory.java index e9c78348..a12c2a19 100644 --- a/src/de/dhbwstuttgart/strucTypes/ClassOrInterfaceWithConstraintsFactory.java +++ b/src/de/dhbwstuttgart/strucTypes/classorinterface/ClassOrInterfaceWithConstraintsFactory.java @@ -1,4 +1,4 @@ -package de.dhbwstuttgart.strucTypes; +package de.dhbwstuttgart.strucTypes.classorinterface; import java.lang.reflect.Modifier; import java.util.ArrayList; @@ -9,6 +9,7 @@ import org.antlr.v4.runtime.Token; import de.dhbwstuttgart.parser.NullToken; import de.dhbwstuttgart.parser.scope.JavaClassName; +import de.dhbwstuttgart.strucTypes.InferredTypes; import de.dhbwstuttgart.strucTypes.constraint.SubTypeConstraint; import de.dhbwstuttgart.syntaxtree.ClassOrInterface; import de.dhbwstuttgart.syntaxtree.Constructor; diff --git a/src/de/dhbwstuttgart/strucTypes/ASTReturnVisitor.java b/src/de/dhbwstuttgart/strucTypes/visitor/ASTReturnVisitor.java similarity index 96% rename from src/de/dhbwstuttgart/strucTypes/ASTReturnVisitor.java rename to src/de/dhbwstuttgart/strucTypes/visitor/ASTReturnVisitor.java index d097b1ff..fe4071d1 100644 --- a/src/de/dhbwstuttgart/strucTypes/ASTReturnVisitor.java +++ b/src/de/dhbwstuttgart/strucTypes/visitor/ASTReturnVisitor.java @@ -1,4 +1,4 @@ -package de.dhbwstuttgart.strucTypes; +package de.dhbwstuttgart.strucTypes.visitor; import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal; import de.dhbwstuttgart.syntaxtree.ClassOrInterface; diff --git a/src/de/dhbwstuttgart/strucTypes/DefaultASTVisitor.java b/src/de/dhbwstuttgart/strucTypes/visitor/DefaultASTVisitor.java similarity index 95% rename from src/de/dhbwstuttgart/strucTypes/DefaultASTVisitor.java rename to src/de/dhbwstuttgart/strucTypes/visitor/DefaultASTVisitor.java index 8336f2b5..39f25997 100644 --- a/src/de/dhbwstuttgart/strucTypes/DefaultASTVisitor.java +++ b/src/de/dhbwstuttgart/strucTypes/visitor/DefaultASTVisitor.java @@ -1,4 +1,4 @@ -package de.dhbwstuttgart.strucTypes; +package de.dhbwstuttgart.strucTypes.visitor; import de.dhbwstuttgart.exceptions.NotImplementedException; import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal; diff --git a/src/de/dhbwstuttgart/strucTypes/InferTypesVisitor.java b/src/de/dhbwstuttgart/strucTypes/visitor/InferTypes.java similarity index 95% rename from src/de/dhbwstuttgart/strucTypes/InferTypesVisitor.java rename to src/de/dhbwstuttgart/strucTypes/visitor/InferTypes.java index 3f57115f..2542253d 100644 --- a/src/de/dhbwstuttgart/strucTypes/InferTypesVisitor.java +++ b/src/de/dhbwstuttgart/strucTypes/visitor/InferTypes.java @@ -1,4 +1,4 @@ -package de.dhbwstuttgart.strucTypes; +package de.dhbwstuttgart.strucTypes.visitor; import java.util.ArrayList; import java.util.List; @@ -10,6 +10,7 @@ import de.dhbwstuttgart.exceptions.NotImplementedException; import de.dhbwstuttgart.parser.NullToken; import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal; import de.dhbwstuttgart.parser.scope.JavaClassName; +import de.dhbwstuttgart.strucTypes.InferredTypes; import de.dhbwstuttgart.syntaxtree.ClassOrInterface; import de.dhbwstuttgart.syntaxtree.Constructor; import de.dhbwstuttgart.syntaxtree.Field; @@ -56,11 +57,11 @@ import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric; import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType; import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder; -public class InferTypesVisitor implements ASTReturnVisitor { +public class InferTypes implements ASTReturnVisitor { private InferredTypes inferredTypes = new InferredTypes(); - public InferTypesVisitor(InferredTypes inferredTypes) { + public InferTypes(InferredTypes inferredTypes) { this.inferredTypes = inferredTypes; } diff --git a/src/de/dhbwstuttgart/strucTypes/TypeExtract.java b/src/de/dhbwstuttgart/strucTypes/visitor/TypeExtract.java similarity index 92% rename from src/de/dhbwstuttgart/strucTypes/TypeExtract.java rename to src/de/dhbwstuttgart/strucTypes/visitor/TypeExtract.java index e3d1e048..e8246644 100644 --- a/src/de/dhbwstuttgart/strucTypes/TypeExtract.java +++ b/src/de/dhbwstuttgart/strucTypes/visitor/TypeExtract.java @@ -1,10 +1,11 @@ -package de.dhbwstuttgart.strucTypes; +package de.dhbwstuttgart.strucTypes.visitor; import java.util.ArrayList; import java.util.List; import java.util.Optional; import de.dhbwstuttgart.parser.scope.JavaClassName; +import de.dhbwstuttgart.strucTypes.classorinterface.ClassOrInterfaceFactory; import de.dhbwstuttgart.syntaxtree.ClassOrInterface; import de.dhbwstuttgart.syntaxtree.Constructor; import de.dhbwstuttgart.syntaxtree.Field; diff --git a/src/de/dhbwstuttgart/strucTypes/TypeVar.java b/src/de/dhbwstuttgart/strucTypes/visitor/TypeVar.java similarity index 87% rename from src/de/dhbwstuttgart/strucTypes/TypeVar.java rename to src/de/dhbwstuttgart/strucTypes/visitor/TypeVar.java index 900e63a5..27354536 100644 --- a/src/de/dhbwstuttgart/strucTypes/TypeVar.java +++ b/src/de/dhbwstuttgart/strucTypes/visitor/TypeVar.java @@ -1,8 +1,9 @@ -package de.dhbwstuttgart.strucTypes; +package de.dhbwstuttgart.strucTypes.visitor; import java.util.HashSet; import java.util.Set; +import de.dhbwstuttgart.strucTypes.InferredTypes; import de.dhbwstuttgart.syntaxtree.AbstractASTWalker; import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric; import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder; diff --git a/src/de/dhbwstuttgart/syntaxtree/ClassOrInterface.java b/src/de/dhbwstuttgart/syntaxtree/ClassOrInterface.java index c8078774..74accd30 100644 --- a/src/de/dhbwstuttgart/syntaxtree/ClassOrInterface.java +++ b/src/de/dhbwstuttgart/syntaxtree/ClassOrInterface.java @@ -3,7 +3,7 @@ package de.dhbwstuttgart.syntaxtree; import de.dhbwstuttgart.core.IItemWithOffset; import de.dhbwstuttgart.exceptions.DebugException; import de.dhbwstuttgart.parser.scope.JavaClassName; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.type.RefType; import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder; import de.dhbwstuttgart.syntaxtree.visual.ASTPrinter; diff --git a/src/de/dhbwstuttgart/syntaxtree/Constructor.java b/src/de/dhbwstuttgart/syntaxtree/Constructor.java index 22297e5e..9ccbb12b 100644 --- a/src/de/dhbwstuttgart/syntaxtree/Constructor.java +++ b/src/de/dhbwstuttgart/syntaxtree/Constructor.java @@ -6,7 +6,7 @@ import de.dhbwstuttgart.syntaxtree.type.RefType; import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric; import org.antlr.v4.runtime.Token; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.statement.Block; import java.util.List; diff --git a/src/de/dhbwstuttgart/syntaxtree/Field.java b/src/de/dhbwstuttgart/syntaxtree/Field.java index 5fd1951d..2f996e63 100644 --- a/src/de/dhbwstuttgart/syntaxtree/Field.java +++ b/src/de/dhbwstuttgart/syntaxtree/Field.java @@ -1,6 +1,6 @@ package de.dhbwstuttgart.syntaxtree; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric; import org.antlr.v4.runtime.Token; diff --git a/src/de/dhbwstuttgart/syntaxtree/FormalParameter.java b/src/de/dhbwstuttgart/syntaxtree/FormalParameter.java index 19bb47e8..6db41fe7 100644 --- a/src/de/dhbwstuttgart/syntaxtree/FormalParameter.java +++ b/src/de/dhbwstuttgart/syntaxtree/FormalParameter.java @@ -1,6 +1,6 @@ package de.dhbwstuttgart.syntaxtree; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric; import org.antlr.v4.runtime.Token; diff --git a/src/de/dhbwstuttgart/syntaxtree/GenericDeclarationList.java b/src/de/dhbwstuttgart/syntaxtree/GenericDeclarationList.java index 8e5336ac..eb3e79d9 100644 --- a/src/de/dhbwstuttgart/syntaxtree/GenericDeclarationList.java +++ b/src/de/dhbwstuttgart/syntaxtree/GenericDeclarationList.java @@ -2,7 +2,7 @@ package de.dhbwstuttgart.syntaxtree; import org.antlr.v4.runtime.Token; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import java.util.*; diff --git a/src/de/dhbwstuttgart/syntaxtree/GenericTypeVar.java b/src/de/dhbwstuttgart/syntaxtree/GenericTypeVar.java index 4d68f7ab..fb563659 100644 --- a/src/de/dhbwstuttgart/syntaxtree/GenericTypeVar.java +++ b/src/de/dhbwstuttgart/syntaxtree/GenericTypeVar.java @@ -1,6 +1,6 @@ package de.dhbwstuttgart.syntaxtree; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric; import org.antlr.v4.runtime.Token; diff --git a/src/de/dhbwstuttgart/syntaxtree/Method.java b/src/de/dhbwstuttgart/syntaxtree/Method.java index 076cdf1d..60c7ff28 100644 --- a/src/de/dhbwstuttgart/syntaxtree/Method.java +++ b/src/de/dhbwstuttgart/syntaxtree/Method.java @@ -3,7 +3,7 @@ package de.dhbwstuttgart.syntaxtree; import java.util.ArrayList; import de.dhbwstuttgart.parser.NullToken; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric; import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation; import de.dhbwstuttgart.typeinference.constraints.ConstraintSet; diff --git a/src/de/dhbwstuttgart/syntaxtree/ParameterList.java b/src/de/dhbwstuttgart/syntaxtree/ParameterList.java index 53037f76..8cb0d9a2 100644 --- a/src/de/dhbwstuttgart/syntaxtree/ParameterList.java +++ b/src/de/dhbwstuttgart/syntaxtree/ParameterList.java @@ -4,7 +4,7 @@ package de.dhbwstuttgart.syntaxtree; import org.antlr.v4.runtime.Token; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import java.util.Iterator; import java.util.List; diff --git a/src/de/dhbwstuttgart/syntaxtree/SourceFile.java b/src/de/dhbwstuttgart/syntaxtree/SourceFile.java index 3fc9a50b..df42ca29 100644 --- a/src/de/dhbwstuttgart/syntaxtree/SourceFile.java +++ b/src/de/dhbwstuttgart/syntaxtree/SourceFile.java @@ -4,7 +4,7 @@ import java.util.*; import de.dhbwstuttgart.parser.NullToken; import de.dhbwstuttgart.parser.scope.JavaClassName; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.typeinference.constraints.ConstraintSet; import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation; //import sun.security.x509.X509CertInfo; diff --git a/src/de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.java b/src/de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.java index 10cd5b9d..8af37261 100644 --- a/src/de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.java +++ b/src/de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import de.dhbwstuttgart.core.IItemWithOffset; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation; import org.antlr.v4.runtime.Token; //import org.antlr.v4.runtime.misc.Pair; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/ArgumentList.java b/src/de/dhbwstuttgart/syntaxtree/statement/ArgumentList.java index eb1a6241..7e96a38c 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/ArgumentList.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/ArgumentList.java @@ -1,7 +1,7 @@ package de.dhbwstuttgart.syntaxtree.statement; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.ASTVisitor; import de.dhbwstuttgart.syntaxtree.StatementVisitor; import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/Assign.java b/src/de/dhbwstuttgart/syntaxtree/statement/Assign.java index dea6c809..f4cc4116 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/Assign.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/Assign.java @@ -1,7 +1,7 @@ package de.dhbwstuttgart.syntaxtree.statement; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.StatementVisitor; import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation; import de.dhbwstuttgart.typeinference.constraints.ConstraintSet; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/AssignToField.java b/src/de/dhbwstuttgart/syntaxtree/statement/AssignToField.java index c2ef8444..b0cc453c 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/AssignToField.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/AssignToField.java @@ -1,6 +1,6 @@ package de.dhbwstuttgart.syntaxtree.statement; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.StatementVisitor; public class AssignToField extends AssignLeftSide{ diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/BinaryExpr.java b/src/de/dhbwstuttgart/syntaxtree/statement/BinaryExpr.java index 97331ec0..a325a0c8 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/BinaryExpr.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/BinaryExpr.java @@ -1,7 +1,7 @@ package de.dhbwstuttgart.syntaxtree.statement; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.StatementVisitor; import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric; import org.antlr.v4.runtime.Token; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/Block.java b/src/de/dhbwstuttgart/syntaxtree/statement/Block.java index e6a619c1..1a9aa4ba 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/Block.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/Block.java @@ -1,7 +1,7 @@ package de.dhbwstuttgart.syntaxtree.statement; import java.util.*; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.StatementVisitor; import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder; import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/CastExpr.java b/src/de/dhbwstuttgart/syntaxtree/statement/CastExpr.java index 1d3c681c..f0b36bbb 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/CastExpr.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/CastExpr.java @@ -1,7 +1,7 @@ package de.dhbwstuttgart.syntaxtree.statement; import de.dhbwstuttgart.exceptions.NotImplementedException; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.StatementVisitor; import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric; import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/DoStmt.java b/src/de/dhbwstuttgart/syntaxtree/statement/DoStmt.java index ac08ce96..19e8fe9c 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/DoStmt.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/DoStmt.java @@ -1,6 +1,6 @@ package de.dhbwstuttgart.syntaxtree.statement; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.StatementVisitor; import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder; import org.antlr.v4.runtime.Token; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/EmptyStmt.java b/src/de/dhbwstuttgart/syntaxtree/statement/EmptyStmt.java index dba32f45..f6964ca6 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/EmptyStmt.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/EmptyStmt.java @@ -1,6 +1,6 @@ package de.dhbwstuttgart.syntaxtree.statement; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.StatementVisitor; import de.dhbwstuttgart.syntaxtree.type.Void; import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/ExpressionReceiver.java b/src/de/dhbwstuttgart/syntaxtree/statement/ExpressionReceiver.java index 07af8192..5b7df15c 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/ExpressionReceiver.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/ExpressionReceiver.java @@ -1,6 +1,6 @@ package de.dhbwstuttgart.syntaxtree.statement; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.StatementVisitor; import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric; import org.antlr.v4.runtime.Token; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/FieldVar.java b/src/de/dhbwstuttgart/syntaxtree/statement/FieldVar.java index 8d783cfc..d2878f3d 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/FieldVar.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/FieldVar.java @@ -1,7 +1,7 @@ package de.dhbwstuttgart.syntaxtree.statement; import de.dhbwstuttgart.exceptions.TypeinferenceException; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.StatementVisitor; import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric; import de.dhbwstuttgart.typeinference.assumptions.FieldAssumption; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/ForStmt.java b/src/de/dhbwstuttgart/syntaxtree/statement/ForStmt.java index 12bd0832..6756ca17 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/ForStmt.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/ForStmt.java @@ -2,7 +2,7 @@ package de.dhbwstuttgart.syntaxtree.statement; import de.dhbwstuttgart.exceptions.NotImplementedException; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.StatementVisitor; import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation; import de.dhbwstuttgart.typeinference.constraints.ConstraintSet; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/IfStmt.java b/src/de/dhbwstuttgart/syntaxtree/statement/IfStmt.java index 4f714ec6..43f3a0bd 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/IfStmt.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/IfStmt.java @@ -1,6 +1,6 @@ package de.dhbwstuttgart.syntaxtree.statement; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.StatementVisitor; import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric; import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.java b/src/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.java index 6909bd88..8e3a037d 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.java @@ -1,7 +1,7 @@ package de.dhbwstuttgart.syntaxtree.statement; import de.dhbwstuttgart.exceptions.NotImplementedException; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.StatementVisitor; import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/LambdaExpression.java b/src/de/dhbwstuttgart/syntaxtree/statement/LambdaExpression.java index c5d26dc1..169e6c43 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/LambdaExpression.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/LambdaExpression.java @@ -1,6 +1,6 @@ package de.dhbwstuttgart.syntaxtree.statement; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.*; import de.dhbwstuttgart.syntaxtree.type.RefType; import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/Literal.java b/src/de/dhbwstuttgart/syntaxtree/statement/Literal.java index 97fc1115..efad1c76 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/Literal.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/Literal.java @@ -1,7 +1,7 @@ package de.dhbwstuttgart.syntaxtree.statement; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.StatementVisitor; import de.dhbwstuttgart.syntaxtree.statement.Expression; import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/LocalVar.java b/src/de/dhbwstuttgart/syntaxtree/statement/LocalVar.java index 4b24d48f..f10864b8 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/LocalVar.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/LocalVar.java @@ -1,6 +1,6 @@ package de.dhbwstuttgart.syntaxtree.statement; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.StatementVisitor; import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric; import org.antlr.v4.runtime.Token; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/LocalVarDecl.java b/src/de/dhbwstuttgart/syntaxtree/statement/LocalVarDecl.java index 81c97c4b..45b0d209 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/LocalVarDecl.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/LocalVarDecl.java @@ -2,7 +2,7 @@ package de.dhbwstuttgart.syntaxtree.statement; import de.dhbwstuttgart.exceptions.NotImplementedException; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.StatementVisitor; import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric; import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/MethodCall.java b/src/de/dhbwstuttgart/syntaxtree/statement/MethodCall.java index ce848820..c2c21db8 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/MethodCall.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/MethodCall.java @@ -1,7 +1,7 @@ package de.dhbwstuttgart.syntaxtree.statement; import de.dhbwstuttgart.exceptions.TypeinferenceException; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.*; import de.dhbwstuttgart.syntaxtree.type.RefType; import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/NewArray.java b/src/de/dhbwstuttgart/syntaxtree/statement/NewArray.java index e3e79dbf..871b13b1 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/NewArray.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/NewArray.java @@ -6,7 +6,7 @@ import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric; import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation; import de.dhbwstuttgart.typeinference.constraints.ConstraintSet; import de.dhbwstuttgart.exceptions.NotImplementedException; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; public class NewArray extends Expression diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/NewClass.java b/src/de/dhbwstuttgart/syntaxtree/statement/NewClass.java index 86e234c9..8c28a8ff 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/NewClass.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/NewClass.java @@ -6,7 +6,7 @@ import java.util.Set; import de.dhbwstuttgart.exceptions.TypeinferenceException; import de.dhbwstuttgart.parser.NullToken; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.ClassOrInterface; import de.dhbwstuttgart.syntaxtree.Method; import de.dhbwstuttgart.syntaxtree.StatementVisitor; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/Return.java b/src/de/dhbwstuttgart/syntaxtree/statement/Return.java index f9d019d6..8c0e5422 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/Return.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/Return.java @@ -1,6 +1,6 @@ package de.dhbwstuttgart.syntaxtree.statement; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.StatementVisitor; import org.antlr.v4.runtime.Token; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/ReturnVoid.java b/src/de/dhbwstuttgart/syntaxtree/statement/ReturnVoid.java index 02b97331..06a8abc3 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/ReturnVoid.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/ReturnVoid.java @@ -1,6 +1,6 @@ package de.dhbwstuttgart.syntaxtree.statement; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.StatementVisitor; import org.antlr.v4.runtime.Token; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/StaticClassName.java b/src/de/dhbwstuttgart/syntaxtree/statement/StaticClassName.java index e02c4b1a..b4d78934 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/StaticClassName.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/StaticClassName.java @@ -1,7 +1,7 @@ package de.dhbwstuttgart.syntaxtree.statement; import de.dhbwstuttgart.parser.scope.JavaClassName; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.StatementVisitor; import de.dhbwstuttgart.syntaxtree.type.RefType; import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/Super.java b/src/de/dhbwstuttgart/syntaxtree/statement/Super.java index 5e943903..649888ff 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/Super.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/Super.java @@ -6,7 +6,7 @@ import de.dhbwstuttgart.typeinference.constraints.ConstraintSet; import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation; import org.antlr.v4.runtime.Token; import de.dhbwstuttgart.exceptions.NotImplementedException; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; public class Super extends Expression { diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/SuperCall.java b/src/de/dhbwstuttgart/syntaxtree/statement/SuperCall.java index 52724672..be3164f8 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/SuperCall.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/SuperCall.java @@ -1,6 +1,6 @@ package de.dhbwstuttgart.syntaxtree.statement; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.StatementVisitor; import de.dhbwstuttgart.syntaxtree.type.RefType; import de.dhbwstuttgart.syntaxtree.type.Void; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/This.java b/src/de/dhbwstuttgart/syntaxtree/statement/This.java index 73ff3b3f..ae9c2004 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/This.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/This.java @@ -5,7 +5,7 @@ import de.dhbwstuttgart.syntaxtree.type.RefType; import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder; import org.antlr.v4.runtime.Token; import de.dhbwstuttgart.exceptions.NotImplementedException; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; public class This extends Expression { diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.java b/src/de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.java index 199e7934..8ace8c93 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.java @@ -1,7 +1,7 @@ package de.dhbwstuttgart.syntaxtree.statement; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.StatementVisitor; import de.dhbwstuttgart.syntaxtree.statement.Expression; import de.dhbwstuttgart.syntaxtree.statement.JavaInternalExpression; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.java b/src/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.java index 203fc46e..9dd45dd1 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.java @@ -2,7 +2,7 @@ package de.dhbwstuttgart.syntaxtree.statement; import org.antlr.v4.runtime.Token; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.StatementVisitor; import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder; diff --git a/src/de/dhbwstuttgart/syntaxtree/type/ExtendsWildcardType.java b/src/de/dhbwstuttgart/syntaxtree/type/ExtendsWildcardType.java index cd594cd2..d0e42ee6 100644 --- a/src/de/dhbwstuttgart/syntaxtree/type/ExtendsWildcardType.java +++ b/src/de/dhbwstuttgart/syntaxtree/type/ExtendsWildcardType.java @@ -1,7 +1,7 @@ package de.dhbwstuttgart.syntaxtree.type; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.ASTVisitor; import de.dhbwstuttgart.typeinference.result.ResultSetVisitor; import org.antlr.v4.runtime.Token; diff --git a/src/de/dhbwstuttgart/syntaxtree/type/GenericRefType.java b/src/de/dhbwstuttgart/syntaxtree/type/GenericRefType.java index 1d318375..446b5b34 100644 --- a/src/de/dhbwstuttgart/syntaxtree/type/GenericRefType.java +++ b/src/de/dhbwstuttgart/syntaxtree/type/GenericRefType.java @@ -1,6 +1,6 @@ package de.dhbwstuttgart.syntaxtree.type; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.ASTVisitor; import de.dhbwstuttgart.typeinference.result.ResultSetVisitor; import org.antlr.v4.runtime.Token; diff --git a/src/de/dhbwstuttgart/syntaxtree/type/RefType.java b/src/de/dhbwstuttgart/syntaxtree/type/RefType.java index 48fdb16d..4af79edd 100644 --- a/src/de/dhbwstuttgart/syntaxtree/type/RefType.java +++ b/src/de/dhbwstuttgart/syntaxtree/type/RefType.java @@ -1,7 +1,7 @@ package de.dhbwstuttgart.syntaxtree.type; import de.dhbwstuttgart.parser.scope.JavaClassName; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.ASTVisitor; import de.dhbwstuttgart.typeinference.result.ResultSetVisitor; import org.antlr.v4.runtime.Token; diff --git a/src/de/dhbwstuttgart/syntaxtree/type/SuperWildcardType.java b/src/de/dhbwstuttgart/syntaxtree/type/SuperWildcardType.java index 77d6df27..b505aa2d 100644 --- a/src/de/dhbwstuttgart/syntaxtree/type/SuperWildcardType.java +++ b/src/de/dhbwstuttgart/syntaxtree/type/SuperWildcardType.java @@ -1,7 +1,7 @@ package de.dhbwstuttgart.syntaxtree.type; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.ASTVisitor; import de.dhbwstuttgart.typeinference.result.ResultSetVisitor; import org.antlr.v4.runtime.Token; diff --git a/src/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.java b/src/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.java index cc602c6f..47f13464 100644 --- a/src/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.java +++ b/src/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.java @@ -1,7 +1,7 @@ package de.dhbwstuttgart.syntaxtree.type; import java.util.Hashtable; -import de.dhbwstuttgart.strucTypes.ASTReturnVisitor; +import de.dhbwstuttgart.strucTypes.visitor.ASTReturnVisitor; import de.dhbwstuttgart.syntaxtree.ASTVisitor; import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode; import de.dhbwstuttgart.syntaxtree.factory.NameGenerator; diff --git a/test/strucType/TestInferTypesVisitor.java b/test/strucType/TestInferTypesVisitor.java index 8b459e9b..ff92d1d0 100644 --- a/test/strucType/TestInferTypesVisitor.java +++ b/test/strucType/TestInferTypesVisitor.java @@ -11,7 +11,6 @@ import org.junit.Test; import de.dhbwstuttgart.core.JavaTXCompiler; import de.dhbwstuttgart.strucTypes.Construct; -import de.dhbwstuttgart.strucTypes.InferTypesVisitor; import de.dhbwstuttgart.strucTypes.InferredTypes; import de.dhbwstuttgart.strucTypes.StrucTYPE; import de.dhbwstuttgart.strucTypes.constraint.ConstraintsSet; @@ -20,6 +19,7 @@ import de.dhbwstuttgart.strucTypes.exception.ImpossibleSubTypeException; import de.dhbwstuttgart.strucTypes.printutils.PrintConstraints; import de.dhbwstuttgart.strucTypes.printutils.PrintInferredTypes; import de.dhbwstuttgart.strucTypes.printutils.SyntaxTreePrinter; +import de.dhbwstuttgart.strucTypes.visitor.InferTypes; import de.dhbwstuttgart.syntaxtree.ClassOrInterface; import de.dhbwstuttgart.syntaxtree.SourceFile; @@ -45,7 +45,7 @@ public class TestInferTypesVisitor { System.out.println("Filename: " + name); SourceFile sourceFile = compiler.sourceFiles.get(f); //Print SourceFile Infos - sourceFile.accept(new InferTypesVisitor(new InferredTypes())); + sourceFile.accept(new InferTypes(new InferredTypes())); System.out.println("____________________________________________________________________________"); @@ -92,7 +92,7 @@ public class TestInferTypesVisitor { printConstraints.printSubTypeConstraints(subTypeConstraints); PrintInferredTypes.print(inferredTypesConstruct); System.out.println("\n--Inferred SysntaxTree--"); - sourceFile = sourceFile.accept(new InferTypesVisitor(inferredTypesConstruct)); + sourceFile = sourceFile.accept(new InferTypes(inferredTypesConstruct)); sourceFile.accept(syntaxTreePrinter); System.out.println("____________________________________________________________________________"); diff --git a/test/strucType/TestInterface.java b/test/strucType/TestInterface.java index dcbef4e9..5ae1325d 100644 --- a/test/strucType/TestInterface.java +++ b/test/strucType/TestInterface.java @@ -6,7 +6,7 @@ import java.io.IOException; import java.util.ArrayList; import de.dhbwstuttgart.core.JavaTXCompiler; -import de.dhbwstuttgart.strucTypes.TypeExtract; +import de.dhbwstuttgart.strucTypes.visitor.TypeExtract; public class TestInterface { public static final String rootDirectory = System.getProperty("user.dir")+"/test/strucType/javFiles/"; diff --git a/test/strucType/TestPaperExample.java b/test/strucType/TestPaperExample.java index ef503470..c6987b4a 100644 --- a/test/strucType/TestPaperExample.java +++ b/test/strucType/TestPaperExample.java @@ -7,11 +7,11 @@ import java.util.List; import java.util.Set; import de.dhbwstuttgart.core.JavaTXCompiler; -import de.dhbwstuttgart.strucTypes.ClassOrInterfaceWithConstraints; import de.dhbwstuttgart.strucTypes.Construct; import de.dhbwstuttgart.strucTypes.InferredTypes; import de.dhbwstuttgart.strucTypes.Solve; import de.dhbwstuttgart.strucTypes.StrucTYPE; +import de.dhbwstuttgart.strucTypes.classorinterface.ClassOrInterfaceWithConstraints; import de.dhbwstuttgart.strucTypes.constraint.ConstraintsSet; import de.dhbwstuttgart.strucTypes.constraint.SubTypeConstraint; import de.dhbwstuttgart.strucTypes.exception.ImpossibleSubTypeException; diff --git a/test/strucType/TestSolve.java b/test/strucType/TestSolve.java index 53813713..844a2fd3 100644 --- a/test/strucType/TestSolve.java +++ b/test/strucType/TestSolve.java @@ -7,11 +7,11 @@ import java.util.List; import java.util.Set; import de.dhbwstuttgart.core.JavaTXCompiler; -import de.dhbwstuttgart.strucTypes.ClassOrInterfaceWithConstraints; import de.dhbwstuttgart.strucTypes.Construct; import de.dhbwstuttgart.strucTypes.InferredTypes; import de.dhbwstuttgart.strucTypes.Solve; import de.dhbwstuttgart.strucTypes.StrucTYPE; +import de.dhbwstuttgart.strucTypes.classorinterface.ClassOrInterfaceWithConstraints; import de.dhbwstuttgart.strucTypes.constraint.ConstraintsSet; import de.dhbwstuttgart.strucTypes.constraint.SubTypeConstraint; import de.dhbwstuttgart.strucTypes.exception.ImpossibleSubTypeException;