Fehlende Tests anfügen

.gitignore

@@ -15,3 +15,4 @@ bin
 .classpath
 *.iml
 .idea/
+/target/

src/de/dhbwstuttgart/bytecode/BytecodeGenLambda.java

@@ -0,0 +1,227 @@
+package de.dhbwstuttgart.bytecode;
+
+import org.objectweb.asm.MethodVisitor;
+
+import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
+import de.dhbwstuttgart.syntaxtree.StatementVisitor;
+import de.dhbwstuttgart.syntaxtree.statement.ArgumentList;
+import de.dhbwstuttgart.syntaxtree.statement.Assign;
+import de.dhbwstuttgart.syntaxtree.statement.AssignToField;
+import de.dhbwstuttgart.syntaxtree.statement.Binary;
+import de.dhbwstuttgart.syntaxtree.statement.Block;
+import de.dhbwstuttgart.syntaxtree.statement.CastExpr;
+import de.dhbwstuttgart.syntaxtree.statement.DoStmt;
+import de.dhbwstuttgart.syntaxtree.statement.EmptyStmt;
+import de.dhbwstuttgart.syntaxtree.statement.FieldVar;
+import de.dhbwstuttgart.syntaxtree.statement.ForStmt;
+import de.dhbwstuttgart.syntaxtree.statement.IfStmt;
+import de.dhbwstuttgart.syntaxtree.statement.InstanceOf;
+import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
+import de.dhbwstuttgart.syntaxtree.statement.LocalVar;
+import de.dhbwstuttgart.syntaxtree.statement.LocalVarDecl;
+import de.dhbwstuttgart.syntaxtree.statement.MethodCall;
+import de.dhbwstuttgart.syntaxtree.statement.NewArray;
+import de.dhbwstuttgart.syntaxtree.statement.NewClass;
+import de.dhbwstuttgart.syntaxtree.statement.Receiver;
+import de.dhbwstuttgart.syntaxtree.statement.Return;
+import de.dhbwstuttgart.syntaxtree.statement.ReturnVoid;
+import de.dhbwstuttgart.syntaxtree.statement.StaticClassName;
+import de.dhbwstuttgart.syntaxtree.statement.Super;
+import de.dhbwstuttgart.syntaxtree.statement.SuperCall;
+import de.dhbwstuttgart.syntaxtree.statement.This;
+import de.dhbwstuttgart.syntaxtree.statement.UnaryPlus;
+import de.dhbwstuttgart.syntaxtree.statement.WhileStmt;
+import de.dhbwstuttgart.syntaxtree.statement.literal.Literal;
+import de.dhbwstuttgart.syntaxtree.statement.literal.Null;
+
+public class BytecodeGenLambda implements StatementVisitor{
+	private LambdaExpression lambdaExpression;
+	private MethodVisitor mv;
+	
+	public BytecodeGenLambda(LambdaExpression lambdaExpression, MethodVisitor mv) {
+		this.lambdaExpression = lambdaExpression;
+		this.mv = mv;
+		
+		
+	}
+
+	@Override
+	public void visit(ArgumentList argumentList) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(LambdaExpression lambdaExpression) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(Assign assign) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(Binary binary) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(Block block) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(CastExpr castExpr) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(EmptyStmt emptyStmt) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(FieldVar fieldVar) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(ForStmt forStmt) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(IfStmt ifStmt) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(InstanceOf instanceOf) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(LocalVar localVar) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(LocalVarDecl localVarDecl) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(MethodCall methodCall) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(NewClass methodCall) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(NewArray newArray) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(Receiver receiver) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(Return aReturn) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(ReturnVoid aReturn) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(StaticClassName staticClassName) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(Super aSuper) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(This aThis) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(UnaryPlus unaryPlus) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(WhileStmt whileStmt) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(DoStmt whileStmt) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(Null aNull) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(Literal literal) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(AssignToField assignLeftSide) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(AssignToLocal assignLeftSide) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void visit(SuperCall superCall) {
+		// TODO Auto-generated method stub
+		
+	}
+}

src/de/dhbwstuttgart/bytecode/ClassFile.java

@@ -0,0 +1,14 @@
+package de.dhbwstuttgart.bytecode;
+
+public class ClassFile {
+	
+	String name;
+	byte[] bytecode;
+	
+	public ClassFile(String name, byte[] bytecode) {
+		this.name = name;
+		this.bytecode = bytecode;
+	}
+	
+
+}

src/de/dhbwstuttgart/bytecode/Test.java

@@ -20,7 +20,6 @@ import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 
-import javassist.runtime.Desc;
 
 public class Test {
 	private static final String rootDirectory = System.getProperty("user.dir") + "/bin/de/dhbwstuttgart/bytecode/";

src/de/dhbwstuttgart/bytecode/TestFields.java

@@ -0,0 +1,59 @@
+package de.dhbwstuttgart.bytecode;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+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;
+
+public class TestFields {
+	private static final String rootDirectory = System.getProperty("user.dir") + "/bin/de/dhbwstuttgart/bytecode/";
+	
+	public static void main(String[] args) {
+		// TODO Auto-generated method stub
+		ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES|ClassWriter.COMPUTE_MAXS);
+		cw.visit(Opcodes.V1_8, Opcodes.ACC_PUBLIC + Opcodes.ACC_SUPER, "TetsF", null, "java/lang/Object", null);
+		
+		cw.visitSource("TetsF.java", null);
+
+		FieldVisitor fv = cw.visitField(Opcodes.ACC_PRIVATE, "z", Type.INT_TYPE.getDescriptor(), null, null);
+		fv.visitEnd();
+		
+		FieldVisitor fvS = cw.visitField(Opcodes.ACC_PUBLIC, "s", "Ljava/lang/String;", null, null);
+		fvS.visitEnd();
+		// Create Constructor
+		MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", "()V", null, null);
+		mv.visitCode();
+		
+		mv.visitVarInsn(Opcodes.ALOAD, 0);
+		mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/Object", "<init>", "()V");
+		mv.visitVarInsn(Opcodes.ALOAD, 0);
+		mv.visitLdcInsn("");
+		mv.visitFieldInsn(Opcodes.PUTFIELD, "TetsF", "s", "Ljava/lang/String;");
+		mv.visitInsn(Opcodes.RETURN);
+		mv.visitMaxs(2, 1);
+		mv.visitEnd();
+		
+		byte[] b = cw.toByteArray();
+		
+		FileOutputStream output;
+
+		try {
+			output = new FileOutputStream(new File(System.getProperty("user.dir") + "/testBytecode/TetsF.class"));
+			output.write(b);
+			output.close();
+		} catch (FileNotFoundException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+
+}

src/de/dhbwstuttgart/bytecode/TestMeth.java

@@ -0,0 +1,18 @@
+package de.dhbwstuttgart.bytecode;
+
+public class TestMeth {
+	private int z;
+	public String s;
+	public TestMeth(int temp) {
+		this.z = temp;
+	}
+	public void m1(int a, int b) {
+		int y = m2(1,2,3,4);
+	}
+	
+	public int m2(int a, int b, int x, int y) {
+		Integer c = 55;
+		Integer g;
+		return a+b+y+c;
+	}
+}

src/de/dhbwstuttgart/bytecode/TetsF.java

@@ -0,0 +1,6 @@
+package de.dhbwstuttgart.bytecode;
+
+public class TetsF {
+	private int z;
+	public String s = "";
+}

src/de/dhbwstuttgart/core/JavaTXCompiler.java

@@ -1,11 +1,8 @@
 package de.dhbwstuttgart.core;
 
-<<<<<<< HEAD
-import de.dhbwstuttgart.bytecode.BytecodeGen;
-import de.dhbwstuttgart.exceptions.DebugException;
-=======
+
 import de.dhbwstuttgart.environment.CompilationEnvironment;
->>>>>>> 6738eecdf37ce8827512c7ac8d254341de7fbf9d
+
 import de.dhbwstuttgart.parser.JavaTXParser;
 import de.dhbwstuttgart.parser.scope.GenericsRegistry;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.SyntaxTreeGenerator;

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

@@ -21,9 +21,6 @@ public class ArgumentList extends SyntaxTreeNode
 		return expr;
 	}
 
-	public void accept(StatementVisitor visitor) {
-		visitor.visit(this);
-	}
 	
 	@Override
 	public void accept(ASTVisitor visitor) {

test/bytecode/JavaTXCompilerTest.java

@@ -2,7 +2,6 @@ package bytecode;
 
 import de.dhbwstuttgart.bytecode.BytecodeGen;
 import de.dhbwstuttgart.core.JavaTXCompiler;
-import de.dhbwstuttgart.exceptions.DebugException;
 import de.dhbwstuttgart.syntaxtree.SourceFile;
 import org.junit.Test;
 
@@ -17,7 +16,6 @@ import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Set;
 
 import static org.junit.Assert.*;
 
@@ -28,21 +26,14 @@ public class JavaTXCompilerTest  {
 
     @Test
     public void test() throws IOException, java.lang.ClassNotFoundException {
-<<<<<<< HEAD
-        filesToTest.add(new File(rootDirectory+"EmptyMethod.jav"));
-=======
+    		System.out.println(rootDirectory);
         filesToTest.add(new File(rootDirectory+"EmptyClass.jav"));
         JavaTXCompiler compiler = new JavaTXCompiler(filesToTest);
->>>>>>> 6738eecdf37ce8827512c7ac8d254341de7fbf9d
+        System.out.println("test");
         for(File f : filesToTest){
             String content = readFile(f.getPath(), StandardCharsets.UTF_8);
-<<<<<<< HEAD
-            HashMap<String,byte[]> bytecode = this.getBytecode(sf);
-            this.writeClassFile(bytecode, "EmptyMethod");
-=======
             HashMap<String,byte[]> bytecode = this.getBytecode(compiler.sourceFiles.get(f));
             this.writeClassFile(bytecode, "EmptyClass");
->>>>>>> 6738eecdf37ce8827512c7ac8d254341de7fbf9d
         }
 
     }

test/javFiles/EmptyClass.jav

@@ -0,0 +1,3 @@
+public class EmptyClass{
+	
+}

test/javFiles/EmptyMethod.jav

@@ -0,0 +1,37 @@
+public class EmptyMethod{
+	static String s1 ="";
+	String s2;
+	public void m1(){
+		//String s = "";
+		System.out.println("test");
+		//Integer ab = Math.abs(1);
+		//Math.abs(1);
+		//String lV = "local";
+		//s1 = "1";
+		//s1.concat("2");
+		s2 = s1;
+		//m2();
+		Clazz i = new Clazz();
+		Integer i = new Integer(1);
+	}
+	
+	public void m2(){}
+}
+
+class Clazz{}
+/*
+public class EmptyMethod2{
+	public static test = "5";
+	public void m1(Integer i, String j, Boolean b){
+		//String s = "";
+		EmptyMethod em = new EmptyMethod();
+		em.m1();
+		em.s1 = "";
+		//Integer ab = Math.abs(1);
+		//Math.abs(1);
+		//String lV = "local";
+		//s1 = "1";
+		//s1.concat("2");
+		//s2 = s1;
+	}
+}*/

test/javFiles/Op1.jav

@@ -0,0 +1,11 @@
+public class Op1{
+	public Op1() {
+		
+		Runnable lam = () -> {
+				String test = "";
+					String b = "b";
+					test = b;
+				System.out.println(test);};
+		//lam.run();
+	}
+}

test/javFiles/Subclass.jav

@@ -0,0 +1,6 @@
+public class Subclass extends Superclass {
+
+    	public void printMethod() {
+       	 	super.printMethod();
+	}
+}

test/javFiles/Superclass.jav

@@ -0,0 +1,6 @@
+public class Superclass {
+
+    public void printMethod() {
+        System.out.println("Printed in Superclass.");
+    }
+}

test/typeinference/JavaTXCompilerTest.java

@@ -36,10 +36,7 @@ public class JavaTXCompilerTest {
         //filesToTest.add(new File(rootDirectory+"Faculty.jav"));
         //filesToTest.add(new File(rootDirectory+"mathStruc.jav"));
         //filesToTest.add(new File(rootDirectory+"test.jav"));
-<<<<<<< HEAD
         filesToTest.add(new File(rootDirectory+"EmptyMethod.jav"));
-=======
->>>>>>> 6738eecdf37ce8827512c7ac8d254341de7fbf9d
         //filesToTest.add(new File(rootDirectory+"Lambda.jav"));
         //filesToTest.add(new File(rootDirectory+"Lambda2.jav"));
         //filesToTest.add(new File(rootDirectory+"Lambda3.jav"));

testBytecode/Field.java

@@ -0,0 +1,6 @@
+public class Field{
+	public void m(){
+		MethFieldVar mF = new MethFieldVar();
+        	mF.s1 = "Field S1";
+	}	
+}

testBytecode/Import.java

@@ -0,0 +1,8 @@
+import java.util.Vector;
+
+class Import {
+    void methode(){
+        Vector v = new Vector();
+        v.add(v);
+    }
+}

testBytecode/Lam1.java

@@ -0,0 +1,10 @@
+import java.util.function.Function;
+public class Lam1{
+	public Lam1() {
+		Function<String,String> fun = (x) -> x+"1";
+		fun.apply("2");
+
+		Runnable lam = () -> System.out.println("lambda");
+		lam.run();
+	}
+}

testBytecode/LamRun.java

@@ -0,0 +1,8 @@
+public class LamRun{
+
+	public LamRun(){
+	
+		Runnable lam = () -> System.out.println("lambda");
+		lam.run();
+	}
+}

testBytecode/MethFieldVar.java

@@ -0,0 +1,38 @@
+public class MethFieldVar{
+	String s1;// = "";
+	String s2;
+
+/*	public void meth(Integer i, String j, Boolean b){
+		//String local = "a";
+		//int localL = local.length();
+		//int l = s.length();
+		String s = null;
+		//s = "";
+		//return s.length();//l+localL;
+	}
+*/
+	public void  mm(){
+//		return "mm";
+	}
+	public void m2(){
+		System.out.println("");
+	//	Math.abs(1);
+	//	String lV = "local";
+	//	s1 = "1";
+	//	s1.concat("2");
+		s2 = s1;
+			
+		mm();
+
+		Clazz i = new Clazz();		
+		
+		Runnable lam = ()->{
+					String test = "";
+					String b = "b";
+					test = b;
+					System.out.println(test);
+				};
+	}
+}
+
+class Clazz{}

testBytecode/Subclass.java

@@ -0,0 +1,6 @@
+public class Subclass extends Superclass {
+
+    	public void printMethod() {
+       	 	super.printMethod();
+	}
+}

testBytecode/SuperTest.java

@@ -0,0 +1,14 @@
+public class Superclass {
+
+    public void printMethod() {
+        System.out.println("Printed in Superclass.");
+    }
+}
+
+public class Subclass extends Superclass {
+
+	public void printMethod() {
+        	super.printMethod();
+        
+    	}
+}

testBytecode/Superclass.java

@@ -0,0 +1,6 @@
+public class Superclass {
+
+    public void printMethod() {
+        System.out.println("Printed in Superclass.");
+    }
+}

testBytecode/TestMyTest.java

@@ -0,0 +1,10 @@
+class TestMyTest{
+public static void main(String[] a){
+	//test1
+	//new TestClass();
+	//test if statement
+	//new TestIf(new Boolean(true));
+	// test lambda
+	new TestClass();
+}
+}

testBytecode/public

@@ -0,0 +1 @@
+

testBytecode/testF.java

@@ -0,0 +1,5 @@
+public class testTets(){
+	public static void main(String[] args){
+		new tetsF();
+	}
+}

testBytecode/testTets.java

@@ -0,0 +1,5 @@
+public class testTets{
+	public static void main(String[] args){
+		new TetsF();
+	}
+}

testBytecode/testTetsF.java

@@ -0,0 +1,5 @@
+public class testTets(){
+	public static void main(String[] args){
+		new tetsF();
+	}
+}