From c480e258054fb145a2d8a9c23015c69c0470c3da Mon Sep 17 00:00:00 2001
From: JanUlrich <andi@michlaustderaffe.de>
Date: Wed, 22 Mar 2017 16:16:38 +0100
Subject: [PATCH] Bug im convert(Feld) gefixt

---
 .../parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java   | 8 +++++++-
 .../parser/SyntaxTreeGenerator/TypeGenerator.java         | 1 +
 src/de/dhbwstuttgart/syntaxtree/statement/MethodCall.java | 2 --
 test/javFiles/Methods.jav                                 | 2 +-
 test/typeinference/JavaTXCompilerTest.java                | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java
index a11760ad..6ce63b82 100644
--- a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java
+++ b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java
@@ -10,6 +10,7 @@ import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
 import de.dhbwstuttgart.syntaxtree.statement.*;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 import de.dhbwstuttgart.typecheck.*;
 
 import java.lang.reflect.Modifier;
@@ -265,7 +266,12 @@ public class SyntaxTreeGenerator{
     for(Java8Parser.FieldModifierContext fieldModifierContext : fieldDeclarationContext.fieldModifier()){
       modifiers+=(convert(fieldModifierContext));
     }
-    RefTypeOrTPHOrWildcardOrGeneric fieldType = TypeGenerator.convert(fieldDeclarationContext.unannType(), reg, generics);
+    RefTypeOrTPHOrWildcardOrGeneric fieldType;
+    if(fieldDeclarationContext.unannType() != null){
+      fieldType = TypeGenerator.convert(fieldDeclarationContext.unannType(), reg, generics);
+    }else{
+      fieldType = TypePlaceholder.fresh(fieldDeclarationContext.getStart());
+    }
     for(Java8Parser.VariableDeclaratorContext varCtx : fieldDeclarationContext.variableDeclaratorList().variableDeclarator()){
       String fieldName = convert(varCtx.variableDeclaratorId());
       if(varCtx.variableInitializer() != null){
diff --git a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/TypeGenerator.java b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/TypeGenerator.java
index 679110e1..8c2ad269 100644
--- a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/TypeGenerator.java
+++ b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/TypeGenerator.java
@@ -10,6 +10,7 @@ import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
 import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 import de.dhbwstuttgart.typecheck.GenericTypeName;
 import de.dhbwstuttgart.typecheck.JavaClassName;
 import de.dhbwstuttgart.typecheck.JavaClassRegistry;
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/MethodCall.java b/src/de/dhbwstuttgart/syntaxtree/statement/MethodCall.java
index 96d0a48b..a84ea30d 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/MethodCall.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/MethodCall.java
@@ -1,12 +1,10 @@
 package de.dhbwstuttgart.syntaxtree.statement;
 
 import de.dhbwstuttgart.exceptions.TypeinferenceException;
-import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
 import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
 import de.dhbwstuttgart.typeinference.constraints.Constraint;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.constraints.Pair;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;
 import de.dhbwstuttgart.typeinference.assumptions.MethodAssumption;
 import org.antlr.v4.runtime.Token;
 
diff --git a/test/javFiles/Methods.jav b/test/javFiles/Methods.jav
index 9142ab5d..4a6c9d6c 100644
--- a/test/javFiles/Methods.jav
+++ b/test/javFiles/Methods.jav
@@ -10,7 +10,7 @@ class Methods {
 }
 
 class Test {
-    String f;
+    f;
     add(){}
     add(b){}
     sub(b){}
diff --git a/test/typeinference/JavaTXCompilerTest.java b/test/typeinference/JavaTXCompilerTest.java
index 8760e321..1de2cc87 100644
--- a/test/typeinference/JavaTXCompilerTest.java
+++ b/test/typeinference/JavaTXCompilerTest.java
@@ -16,7 +16,7 @@ public class JavaTXCompilerTest {
     @Test
     public void test() throws IOException, ClassNotFoundException {
         JavaTXCompiler compiler = new JavaTXCompiler();
-        //compiler.parse(new File(rootDirectory+"Methods.jav"));
+        compiler.parse(new File(rootDirectory+"Methods.jav"));
         compiler.parse(new File(rootDirectory+"Generics.jav"));
         compiler.typeInference();
     }