Merge

src/de/dhbwstuttgart/parser/JavaTXParser.java

@@ -33,7 +33,11 @@ public class JavaTXParser {
         }
         //TODO: Wieso muss man das händisch anhängen?
         ret.add("java.lang.Object");
-
+        ret.add("java.lang.Long");
+        ret.add("java.lang.Integer");
+        ret.add("java.lang.Boolean");
+        ret.add("java.lang.String");
+        ret.add("java.lang.Class");
         return ret;
     }
 }

src/de/dhbwstuttgart/syntaxtree/statement/Expression.java

@@ -24,9 +24,12 @@ public abstract class Expression extends SyntaxTreeNode
     }
 
     public abstract void accept(StatementVisitor visitor);
+    
 
     @Override
     public void accept(ASTVisitor visitor) {
         this.accept((StatementVisitor)visitor);
     }
+
+    public String toString() { return this.getClass().getName() + ":" + type.toString(); }
 }

test/typeinference/JavaTXCompilerTest.java

@@ -30,8 +30,8 @@ public class JavaTXCompilerTest extends JavaTXCompiler {
 
     @Test
     public void test() throws IOException, ClassNotFoundException {
-        //filesToTest.add(new File(rootDirectory+"Faculty.jav"));
-        filesToTest.add(new File(rootDirectory+"mathStruc.jav"));
+    	filesToTest.add(new File(rootDirectory+"Faculty.jav"));
+    	//filesToTest.add(new File(rootDirectory+"mathStruc.jav"));
         //filesToTest.add(new File(rootDirectory+"Lambda.jav"));
         //filesToTest.add(new File(rootDirectory+"Lambda2.jav"));
         //filesToTest.add(new File(rootDirectory+"Lambda3.jav"));
@@ -58,4 +58,4 @@ public class JavaTXCompilerTest extends JavaTXCompiler {
         return new String(encoded, encoding);
     }
 
-}
+}