From c8beb9579e57f6a7a9802621d834eb20f44b2a0e Mon Sep 17 00:00:00 2001 From: JanUlrich Date: Thu, 16 Mar 2017 20:02:53 +0100 Subject: [PATCH] =?UTF-8?q?UnifyTypeFactory=20angef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dhbwstuttgart/syntaxtree/type/Void.html | 4 +- .../syntaxtree/type/class-use/RefType.html | 4 +- .../typeinference/ConstraintsSet.html | 6 +- .../de/dhbwstuttgart/typeinference/FunN.html | 4 +- .../typeinference/OderConstraint.html | 8 +- .../typeinference/Pair.PairOperator.html | 2 +- .../de/dhbwstuttgart/typeinference/Pair.html | 8 +- .../typeinference/SingleConstraint.html | 4 +- .../typeinference/UndConstraint.html | 12 +- .../class-use/EinzelElement.html | 4 +- .../class-use/KomplexeMenge.html | 4 +- .../class-use/OderConstraint.html | 6 +- .../typeinference/class-use/OderMenge.html | 4 +- .../class-use/Pair.PairOperator.html | 9 +- .../typeinference/class-use/Pair.html | 4 +- .../class-use/UndConstraint.html | 4 +- .../typeinference/class-use/UndMenge.html | 4 +- .../unify/ParallelConstraintSet.html | 4 +- src/de/dhbwstuttgart/core/JavaTXCompiler.java | 20 +- .../StatementGenerator.java | 9 +- .../SyntaxTreeGenerator.java | 13 +- .../SyntaxTreeGenerator/TypeGenerator.java | 6 +- .../syntaxtree/ClassOrInterface.java | 16 +- .../dhbwstuttgart/syntaxtree/Constructor.java | 6 +- .../syntaxtree/ExceptionList.java | 6 +- src/de/dhbwstuttgart/syntaxtree/Field.java | 10 +- .../syntaxtree/FieldDeclaration.java | 6 +- .../syntaxtree/FormalParameter.java | 8 +- .../syntaxtree/GenericTypeVar.java | 10 +- src/de/dhbwstuttgart/syntaxtree/Method.java | 11 +- .../dhbwstuttgart/syntaxtree/SourceFile.java | 2 +- .../syntaxtree/factory/ASTFactory.java | 31 ++- .../syntaxtree/factory/UnifyTypeFactory.java | 182 ++++++++++++++++++ .../syntaxtree/statement/Assign.java | 9 +- .../syntaxtree/statement/Binary.java | 5 +- .../syntaxtree/statement/Block.java | 9 +- .../syntaxtree/statement/CastExpr.java | 10 +- .../syntaxtree/statement/EmptyStmt.java | 5 +- .../syntaxtree/statement/Expression.java | 16 +- .../syntaxtree/statement/FieldVar.java | 11 +- .../syntaxtree/statement/ForStmt.java | 5 +- .../syntaxtree/statement/IfStmt.java | 5 +- .../syntaxtree/statement/InstVar.java | 5 +- .../syntaxtree/statement/InstanceOf.java | 10 +- .../statement/LambdaExpression.java | 5 +- .../syntaxtree/statement/LocalVar.java | 6 +- .../statement/LocalVarBunchDeclaration.java | 5 +- .../syntaxtree/statement/LocalVarDecl.java | 10 +- .../syntaxtree/statement/MethodCall.java | 32 +-- .../syntaxtree/statement/NewArray.java | 10 +- .../syntaxtree/statement/NewClass.java | 10 +- .../syntaxtree/statement/PostIncExpr.java | 5 +- .../syntaxtree/statement/Receiver.java | 5 +- .../syntaxtree/statement/Return.java | 7 +- .../syntaxtree/statement/Statement.java | 4 +- .../syntaxtree/statement/StaticClassName.java | 5 +- .../syntaxtree/statement/Super.java | 5 +- .../syntaxtree/statement/This.java | 5 +- .../syntaxtree/statement/UnaryPlus.java | 5 +- .../syntaxtree/statement/WhileStmt.java | 5 +- .../statement/literal/BoolLiteral.java | 5 +- .../statement/literal/CharLiteral.java | 5 +- .../syntaxtree/statement/literal/Literal.java | 10 +- .../syntaxtree/statement/literal/Null.java | 5 +- .../statement/literal/NumberLiteral.java | 5 +- .../statement/literal/StringLiteral.java | 1 - .../syntaxtree/type/ExtendsWildcardType.java | 10 + .../dhbwstuttgart/syntaxtree/type/FunN.java | 6 +- .../syntaxtree/type/FunVoidN.java | 8 +- .../syntaxtree/type/GenericRefType.java | 13 -- .../syntaxtree/type/GenericTypeVar.java | 16 ++ .../syntaxtree/type/RefType.java | 9 +- ...a => RefTypeOrTPHOrWildcardOrGeneric.java} | 4 +- .../syntaxtree/type/SuperWildcardType.java | 11 +- .../syntaxtree/type/TypePlaceholder.java | 13 +- .../syntaxtree/type/WildcardType.java | 23 +-- .../typeinference/ConstraintSet.java | 15 -- .../typeinference/EinzelElement.java | 39 ---- .../typeinference/KomplexeMenge.java | 8 - .../typeinference/OderConstraint.java | 66 ------- .../typeinference/OderMenge.java | 28 --- .../typeinference/UndConstraint.java | 51 ----- .../dhbwstuttgart/typeinference/UndMenge.java | 44 ----- .../assumptions/MethodAssumption.java | 13 +- .../TypeInferenceBlockInformation.java | 15 ++ .../assumptions/TypeInferenceInformation.java | 9 +- .../typeinference/constraints/Constraint.java | 7 + .../constraints/ConstraintSet.java | 55 ++++++ .../typeinference/{ => constraints}/Pair.java | 18 +- test/javFiles/MethodsEasy.jav | 2 +- 90 files changed, 603 insertions(+), 556 deletions(-) create mode 100644 src/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java delete mode 100755 src/de/dhbwstuttgart/syntaxtree/type/GenericRefType.java create mode 100755 src/de/dhbwstuttgart/syntaxtree/type/GenericTypeVar.java rename src/de/dhbwstuttgart/syntaxtree/type/{RefTypeOrTPH.java => RefTypeOrTPHOrWildcardOrGeneric.java} (66%) delete mode 100644 src/de/dhbwstuttgart/typeinference/ConstraintSet.java delete mode 100644 src/de/dhbwstuttgart/typeinference/EinzelElement.java delete mode 100644 src/de/dhbwstuttgart/typeinference/KomplexeMenge.java delete mode 100755 src/de/dhbwstuttgart/typeinference/OderConstraint.java delete mode 100644 src/de/dhbwstuttgart/typeinference/OderMenge.java delete mode 100755 src/de/dhbwstuttgart/typeinference/UndConstraint.java delete mode 100644 src/de/dhbwstuttgart/typeinference/UndMenge.java create mode 100644 src/de/dhbwstuttgart/typeinference/assumptions/TypeInferenceBlockInformation.java create mode 100644 src/de/dhbwstuttgart/typeinference/constraints/Constraint.java create mode 100644 src/de/dhbwstuttgart/typeinference/constraints/ConstraintSet.java rename src/de/dhbwstuttgart/typeinference/{ => constraints}/Pair.java (79%) diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/Void.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/Void.html index 2c016df1..cc512b6c 100644 --- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/Void.html +++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/Void.html @@ -109,7 +109,7 @@ var activeTableTab = "activeTableTab";
  • de.dhbwstuttgart.syntaxtree.type.ObjectType