erzeugt Klassendatei für FunN

src/de/dhbwstuttgart/bytecode/BytecodeGen.java

@@ -1,6 +1,5 @@
 package de.dhbwstuttgart.bytecode;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 
@@ -9,10 +8,11 @@ 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;
-import org.objectweb.asm.signature.SignatureVisitor;
-import org.objectweb.asm.signature.SignatureWriter;
 
+import de.dhbwstuttgart.bytecode.descriptor.DescriptorToString;
+import de.dhbwstuttgart.bytecode.descriptor.TypeToDescriptor;
+import de.dhbwstuttgart.bytecode.signature.Signature;
+import de.dhbwstuttgart.bytecode.signature.TypeToString;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
 import de.dhbwstuttgart.syntaxtree.*;
 import de.dhbwstuttgart.syntaxtree.statement.literal.Literal;
@@ -56,8 +56,8 @@ public class BytecodeGen implements ASTVisitor {
 	public void visit(SourceFile sourceFile) {
 		for(ClassOrInterface cl : sourceFile.getClasses()) {
 			BytecodeGen classGen = new BytecodeGen(classFiles, resultSet);
-			cl.accept(classGen);
 			System.out.println("In CLASS: "+(cl.getClassName().toString()));
+			cl.accept(classGen);
 			classGen.writeClass(cl.getClassName().toString());
 		}
 	}
@@ -83,6 +83,8 @@ public class BytecodeGen implements ASTVisitor {
 	public void visit(ClassOrInterface classOrInterface) {
 		className = classOrInterface.getClassName().toString();
 		
+		cw.visitSource(className +".jav", null);
+		
 		isInterface = (classOrInterface.getModifiers()&512)==512;
 		System.out.println("IS Interface = "+"modifiers= "+classOrInterface.getModifiers()+" ->"+(classOrInterface.getModifiers()&512) + isInterface);
 		
@@ -116,7 +118,6 @@ public class BytecodeGen implements ASTVisitor {
 		for(Method m : classOrInterface.getMethods()) {
 			m.accept(this);
 		}
-		cw.visitSource(classOrInterface.getClassName().toString()+".jav", null);
 	}
 
 	@Override
@@ -146,7 +147,7 @@ public class BytecodeGen implements ASTVisitor {
 		mv.visitCode();		
 		System.out.println("-----Constructor-----");
 		BytecodeGenMethod gen = new BytecodeGenMethod(className,resultSet,field, mv,paramsAndLocals,cw,
-				genericsAndBoundsMethod,genericsAndBounds,isInterface);
+				genericsAndBoundsMethod,genericsAndBounds,isInterface,classFiles);
 		if(!field.getParameterList().iterator().hasNext()) {
 			mv.visitInsn(Opcodes.RETURN);
 		}
@@ -196,7 +197,8 @@ public class BytecodeGen implements ASTVisitor {
 
 		mv.visitCode();		
 		
-		BytecodeGenMethod gen = new BytecodeGenMethod(className,resultSet,method, mv,paramsAndLocals,cw,genericsAndBounds,genericsAndBounds,isInterface);
+		BytecodeGenMethod gen = new BytecodeGenMethod(className,resultSet,method, mv,paramsAndLocals,cw,
+				genericsAndBounds,genericsAndBounds,isInterface,classFiles);
 		mv.visitMaxs(0, 0);
 		mv.visitEnd();
 	}

src/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java

@@ -1,5 +1,9 @@
 package de.dhbwstuttgart.bytecode;
 
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.lang.invoke.CallSite;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -14,7 +18,14 @@ import org.objectweb.asm.Handle;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
+import org.objectweb.asm.signature.SignatureVisitor;
+import org.objectweb.asm.signature.SignatureWriter;
 
+import de.dhbwstuttgart.bytecode.descriptor.DescriptorToString;
+import de.dhbwstuttgart.bytecode.descriptor.TypeToDescriptor;
+import de.dhbwstuttgart.bytecode.signature.Signature;
+import de.dhbwstuttgart.bytecode.signature.TypeToSignature;
+import de.dhbwstuttgart.bytecode.signature.TypeToString;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
 import de.dhbwstuttgart.syntaxtree.FormalParameter;
 import de.dhbwstuttgart.syntaxtree.Method;
@@ -45,12 +56,13 @@ public class BytecodeGenMethod implements StatementVisitor{
 	private String where;
 	private boolean isRightSideALambda = false;
 	private KindOfLambda kindOfLambda;
+	private HashMap<String, byte[]> classFiles;
 	
 	private ArrayList<RefTypeOrTPHOrWildcardOrGeneric> varsFunInterface;
 	
 	public BytecodeGenMethod(String className,ResultSet resultSet, Method m, MethodVisitor mv, 
-			HashMap<String, Integer> paramsAndLocals, ClassWriter cw,
+			HashMap<String, Integer> paramsAndLocals, ClassWriter cw, HashMap<String, String> genericsAndBoundsMethod, 
-			HashMap<String, String> genericsAndBoundsMethod, HashMap<String,String> genericsAndBounds, boolean isInterface) {
+			HashMap<String,String> genericsAndBounds, boolean isInterface, HashMap<String, byte[]> classFiles) {
 		
 		this.where = "<<<<<< NORMAL METHOD >>>>>>";
 		
@@ -63,6 +75,7 @@ public class BytecodeGenMethod implements StatementVisitor{
 		this.genericsAndBoundsMethod = genericsAndBoundsMethod;
 		this.genericsAndBounds = genericsAndBounds;
 		this.isInterface = isInterface;
+		this.classFiles = classFiles;
 		this.lamCounter = -1;
 		
 		this.varsFunInterface = new ArrayList<>();
@@ -79,13 +92,14 @@ public class BytecodeGenMethod implements StatementVisitor{
 	}
 	
 	public BytecodeGenMethod(LambdaExpression lambdaExpression,ResultSet resultSet ,MethodVisitor mv, 
-			 int indexOfFirstParamLam, boolean isInterface) {
+			 int indexOfFirstParamLam, boolean isInterface, HashMap<String, byte[]> classFiles) {
 		System.out.println("\t\t++++++IN LAMBDA -------");
 		
 		this.where = "<<<<<< LAMBDA METHOD >>>>>>";
 		this.resultSet = resultSet;
 		this.mv = mv;
 		this.isInterface = isInterface;
+		this.classFiles = classFiles;
 		this.lamCounter = -1;
 		this.varsFunInterface = new ArrayList<>();
 
@@ -183,6 +197,8 @@ public class BytecodeGenMethod implements StatementVisitor{
 				"metafactory", mt.toMethodDescriptorString(), false);
 		String methodName = "lambda$new$" + this.lamCounter;
 		
+		// Für die Parameter-Typen und Return-Typ braucht man die Bounds (für die Typlöschung)
+		
 		String typeErasure = "(";
 		Iterator<FormalParameter> itr = lambdaExpression.params.iterator();
 		while(itr.hasNext()) {
@@ -225,14 +241,60 @@ public class BytecodeGenMethod implements StatementVisitor{
 		MethodVisitor mvLambdaBody = cw.visitMethod(Opcodes.ACC_PRIVATE+ staticOrInstance + Opcodes.ACC_SYNTHETIC, 
 				methodName, arg3.toString(), null, null);
 
-		new BytecodeGenMethod(lambdaExpression,this.resultSet,mvLambdaBody,indexOfFirstParamLam,isInterface);
+		new BytecodeGenMethod(lambdaExpression,this.resultSet,mvLambdaBody,indexOfFirstParamLam,isInterface,
+				classFiles);
 		
 		mvLambdaBody.visitMaxs(0, 0);
 		mvLambdaBody.visitEnd();
 		cw.visitInnerClass("java/lang/invoke/MethodHandles$Lookup", "java/lang/invoke/MethodHandles", "Lookup",
 				Opcodes.ACC_PUBLIC + Opcodes.ACC_STATIC + Opcodes.ACC_FINAL);
+		
+		generateBCForFunN(lambdaExpression);
 	}
 
+	private void generateBCForFunN(LambdaExpression lambdaExpression) {
+		ClassWriter classWriter =new ClassWriter(ClassWriter.COMPUTE_FRAMES|ClassWriter.COMPUTE_MAXS);
+		
+		SignatureWriter methSig = new SignatureWriter();
+		String methDesc = "(";
+		int numberOfParams = 0;
+		SignatureVisitor paramVisitor = methSig.visitParameterType();
+		Iterator<FormalParameter> itr = lambdaExpression.params.iterator();
+		while(itr.hasNext()) {
+			numberOfParams++;
+			// getBounds
+			methDesc += "L"+Type.getInternalName(Object.class)+";";
+			paramVisitor.visitTypeVariable("T"+numberOfParams);
+			itr.next();
+		}
+		methSig.visitReturnType().visitTypeVariable("R");
+		// ")"+lam.getReturn.getBounds
+		methDesc += ")L"+Type.getInternalName(Object.class)+";";
+		Signature sig = new Signature(lambdaExpression,numberOfParams);
+		String name = "Fun"+numberOfParams;
+		classWriter.visit(Opcodes.V1_8, Opcodes.ACC_INTERFACE+Opcodes.ACC_ABSTRACT, name, 
+				sig.toString(), Type.getInternalName(Object.class), null);
+		MethodVisitor mvApply = classWriter.visitMethod(Opcodes.ACC_PUBLIC+Opcodes.ACC_ABSTRACT, "apply", methDesc, methSig.toString(), null);
+		mvApply.visitEnd();
+		writeClassFile(classWriter.toByteArray(),name);
+	}
+	
+	public void writeClassFile(byte[] bytecode, String name) {
+		FileOutputStream output;
+		try {
+			System.out.println("generating"+name+ ".class file");
+			output = new FileOutputStream(new File(System.getProperty("user.dir") + "/testBytecode/generatedBC/" +name+".class"));				
+			output.write(bytecode);
+			output.close();
+			System.out.println(name+".class file generated");
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		
+}
+
 	@Override
 	public void visit(CastExpr castExpr) {
 		// TODO Auto-generated method stub

src/de/dhbwstuttgart/bytecode/ClassFile.java

@@ -1,14 +0,0 @@
-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/Lambda.java

@@ -1,5 +1,6 @@
 package de.dhbwstuttgart.bytecode;
 
+import de.dhbwstuttgart.bytecode.descriptor.DescriptorVisitor;
 import de.dhbwstuttgart.syntaxtree.ParameterList;
 import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;

src/de/dhbwstuttgart/bytecode/MethodFromMethodCall.java

@@ -2,6 +2,7 @@ package de.dhbwstuttgart.bytecode;
 
 import java.util.HashMap;
 
+import de.dhbwstuttgart.bytecode.descriptor.DescriptorVisitor;
 import de.dhbwstuttgart.syntaxtree.statement.ArgumentList;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 

src/de/dhbwstuttgart/bytecode/NormalConstructor.java

@@ -2,6 +2,7 @@ package de.dhbwstuttgart.bytecode;
 
 import java.util.HashMap;
 
+import de.dhbwstuttgart.bytecode.descriptor.DescriptorVisitor;
 import de.dhbwstuttgart.syntaxtree.Constructor;
 import de.dhbwstuttgart.syntaxtree.ParameterList;
 

src/de/dhbwstuttgart/bytecode/NormalMethod.java

@@ -2,6 +2,7 @@ package de.dhbwstuttgart.bytecode;
 
 import java.util.HashMap;
 
+import de.dhbwstuttgart.bytecode.descriptor.DescriptorVisitor;
 import de.dhbwstuttgart.syntaxtree.Method;
 import de.dhbwstuttgart.syntaxtree.ParameterList;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;

src/de/dhbwstuttgart/bytecode/SamMethod.java

@@ -2,6 +2,7 @@ package de.dhbwstuttgart.bytecode;
 
 import java.util.List;
 
+import de.dhbwstuttgart.bytecode.descriptor.DescriptorVisitor;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 
 public class SamMethod {

src/de/dhbwstuttgart/bytecode/Test.java

@@ -1,150 +0,0 @@
-package de.dhbwstuttgart.bytecode;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.lang.invoke.CallSite;
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.Handle;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
-
-
-public class Test {
-	private static final String rootDirectory = System.getProperty("user.dir") + "/bin/de/dhbwstuttgart/bytecode/";
-
-	protected static ClassLoader getClassLoader() throws Exception {
-		File file = new File(rootDirectory);
-		URL url = file.toURI().toURL();
-		URL[] urls = new URL[] { url };
-		System.out.println(urls[0]);
-		return new URLClassLoader(urls);
-	}
-
-	public static void main(String[] args) {
-		// Test Lambda
-		ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
-		cw.visit(Opcodes.V1_8, Opcodes.ACC_PUBLIC + Opcodes.ACC_SUPER, "TestClass", null, "java/lang/Object", null);
-
-		cw.visitSource("TestClass.java", null);
-
-		// Create Constructor
-		MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", "()V", null, null);
-		mv.visitVarInsn(Opcodes.ALOAD, 0);
-
-		mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/Object", "<init>", "()V");
-
-		// mv.visitMethodInsn(INVOKEDYNAMIC, "#0", "run", "()Ljava/lang/Runnable");
-		//Call site, which, when invoked, returns an instance of the functional interface to which
-		//the lambda is being converted
-		MethodType mt = MethodType.methodType(CallSite.class, MethodHandles.Lookup.class, String.class,
-				MethodType.class, MethodType.class, MethodHandle.class, MethodType.class);
-		
-		Handle bootstrap = new Handle(Opcodes.H_INVOKESTATIC, "java/lang/invoke/LambdaMetafactory", "metafactory",
-				mt.toMethodDescriptorString());
-		Handle arg2 = new Handle(Opcodes.H_INVOKESTATIC, "TestClass", "lambda$0", "()V");
-
-		mv.visitInvokeDynamicInsn("run", "()Ljava/lang/Runnable;", bootstrap, 
-				Type.getMethodType("()V"), arg2,
-				Type.getMethodType("()V"));
-
-		mv.visitVarInsn(Opcodes.ASTORE, 1);
-		mv.visitVarInsn(Opcodes.ALOAD, 1);
-		mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/lang/Runnable", "run", "()V");
-		mv.visitInsn(Opcodes.RETURN);
-		
-		// creates bridge method, contains lambdas body
-				MethodVisitor mvl = cw.visitMethod(Opcodes.ACC_PRIVATE + Opcodes.ACC_STATIC + Opcodes.ACC_SYNTHETIC, "lambda$0",
-						"()V", null, null);
-				mvl.visitCode();
-				mvl.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/System", "out", "Ljava/io/PrintStream;");
-				mvl.visitLdcInsn("lambda");
-				mvl.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/io/PrintStream", "println", "(Ljava/lang/String;)V");
-				mvl.visitInsn(Opcodes.RETURN);
-				mvl.visitMaxs(2, 0);
-				mvl.visitEnd();
-		
-		mv.visitMaxs(1, 2);
-		mv.visitEnd();
-		
-
-		cw.visitInnerClass("java/lang/invoke/MethodHandles$Lookup", "java/lang/invoke/MethodHandles", "Lookup",
-				Opcodes.ACC_PUBLIC + Opcodes.ACC_STATIC + Opcodes.ACC_FINAL);
-		cw.visitEnd();
-
-		byte[] b = cw.toByteArray();
-
-		// Test if statement
-		/*
-		 * ClassWriter cw = new
-		 * ClassWriter(ClassWriter.COMPUTE_FRAMES|ClassWriter.COMPUTE_MAXS);
-		 * 
-		 * cw.visit(Opcodes.V1_8, Opcodes.ACC_PUBLIC+Opcodes.ACC_SUPER, "TestIf", null,
-		 * "java/lang/Object", null); MethodVisitor mv =
-		 * cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", "(Ljava/lang/Boolean;)V", null,
-		 * null); mv.visitCode();
-		 * 
-		 * // Label l0 = new Label(); // mv.visitLabel(l0);
-		 * 
-		 * mv.visitVarInsn(Opcodes.ALOAD, 0);
-		 * 
-		 * mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/Object", "<init>",
-		 * "()V");
-		 * 
-		 * // Label l1 = new Label(); // mv.visitLabel(l1);
-		 * mv.visitVarInsn(Opcodes.ALOAD, 1); mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL,
-		 * "java/lang/Boolean", "booleanValue", "()Z");
-		 * 
-		 * Label label = new Label(); mv.visitJumpInsn(Opcodes.IFEQ, label);
-		 * 
-		 * mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/System", "out",
-		 * "Ljava/io/PrintStream;"); mv.visitLdcInsn("1");
-		 * mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/io/PrintStream", "println",
-		 * "(Ljava/lang/String;)V");
-		 * 
-		 * Label endLabel = new Label(); mv.visitJumpInsn(Opcodes.GOTO, endLabel);
-		 * 
-		 * mv.visitLabel(label); mv.visitFieldInsn(Opcodes.GETSTATIC,
-		 * "java/lang/System", "out", "Ljava/io/PrintStream;"); mv.visitLdcInsn("0");
-		 * mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/io/PrintStream", "println",
-		 * "(Ljava/lang/String;)V");
-		 * 
-		 * 
-		 * 
-		 * mv.visitLabel(endLabel); mv.visitInsn(Opcodes.RETURN);
-		 * 
-		 * // Label l2 = new Label(); // mv.visitLabel(l2);
-		 * 
-		 * // mv.visitLocalVariable("this", "LTestIf;", null, l0, l2, 0); //
-		 * mv.visitLocalVariable("b", "Ljava/lang/Boolean;", null, l0, l2, 1);
-		 * mv.visitMaxs(2, 2); mv.visitEnd();
-		 * 
-		 * cw.visitEnd(); byte[] b = cw.toByteArray();
-		 */
-		FileOutputStream output;
-
-		try {
-			output = new FileOutputStream(new File(System.getProperty("user.dir") + "/testBytecode/TestClass.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/TestClass.java

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

src/de/dhbwstuttgart/bytecode/TestFields.java

@@ -1,59 +0,0 @@
-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/TestIf.java

@@ -1,11 +0,0 @@
-package de.dhbwstuttgart.bytecode;
-
-public class TestIf {
-	public TestIf(Boolean b) {
-		if(b) {
-			System.out.println("1");
-		}else {
-			System.out.println("0");
-		}
-	}
-}

src/de/dhbwstuttgart/bytecode/TestMeth.java

@@ -1,18 +0,0 @@
-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

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

src/de/dhbwstuttgart/bytecode/descriptor/DescriptorToString.java

@@ -1,7 +1,12 @@
-package de.dhbwstuttgart.bytecode;
+package de.dhbwstuttgart.bytecode.descriptor;
 
 import java.util.Iterator;
 
+import de.dhbwstuttgart.bytecode.Lambda;
+import de.dhbwstuttgart.bytecode.MethodFromMethodCall;
+import de.dhbwstuttgart.bytecode.NormalConstructor;
+import de.dhbwstuttgart.bytecode.NormalMethod;
+import de.dhbwstuttgart.bytecode.SamMethod;
 import de.dhbwstuttgart.syntaxtree.FormalParameter;
 import de.dhbwstuttgart.syntaxtree.statement.Expression;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
@@ -96,7 +101,6 @@ public class DescriptorToString implements DescriptorVisitor{
 			FormalParameter fp = itr.next();
 			desc = desc + "L"+resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor()) + ";";
 		}
-		System.out.println("LamReturnType: "+lambdaExpression.getReturnType().acceptTV(new TypeToString()));
 		desc = addReturnType(desc, lambdaExpression.getReturnType(), resultSet);
 		return desc;
 	}

src/de/dhbwstuttgart/bytecode/descriptor/DescriptorVisitor.java

@@ -1,4 +1,10 @@
-package de.dhbwstuttgart.bytecode;
+package de.dhbwstuttgart.bytecode.descriptor;
+
+import de.dhbwstuttgart.bytecode.Lambda;
+import de.dhbwstuttgart.bytecode.MethodFromMethodCall;
+import de.dhbwstuttgart.bytecode.NormalConstructor;
+import de.dhbwstuttgart.bytecode.NormalMethod;
+import de.dhbwstuttgart.bytecode.SamMethod;
 
 public interface DescriptorVisitor {
 	public String visit(NormalMethod method);

src/de/dhbwstuttgart/bytecode/descriptor/TypeToDescriptor.java

@@ -1,4 +1,4 @@
-package de.dhbwstuttgart.bytecode;
+package de.dhbwstuttgart.bytecode.descriptor;
 
 import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;

src/de/dhbwstuttgart/bytecode/signature/Signature.java

@@ -1,15 +1,19 @@
-package de.dhbwstuttgart.bytecode;
+package de.dhbwstuttgart.bytecode.signature;
 
 import java.util.HashMap;
 import java.util.Iterator;
 
+import org.objectweb.asm.Type;
 import org.objectweb.asm.signature.SignatureVisitor;
 import org.objectweb.asm.signature.SignatureWriter;
 
+import de.dhbwstuttgart.bytecode.descriptor.TypeToDescriptor;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
 import de.dhbwstuttgart.syntaxtree.Constructor;
+import de.dhbwstuttgart.syntaxtree.FormalParameter;
 import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
 import de.dhbwstuttgart.syntaxtree.Method;
+import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
 import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
@@ -50,6 +54,31 @@ public class Signature {
 		createSignatureForConsOrMethod(this.method,false);
 	}
 	
+	public Signature(LambdaExpression lambdaExpression,int numberOfParams) {
+		sw = new SignatureWriter();
+		createSignatureForFunN(lambdaExpression, numberOfParams);
+	}
+
+	private void createSignatureForFunN(LambdaExpression lambdaExpression, int numberOfParams) {
+		
+//		sw.visitReturnType().visitTypeVariable("R");
+		sw.visitFormalTypeParameter("R");
+		// getBounds vom Return-Type
+		sw.visitClassBound().visitClassType(Type.getInternalName(Object.class));
+		sw.visitClassBound().visitEnd();
+		for(int i = 0;i<numberOfParams;i++) {
+			int j = i+1;
+			sw.visitFormalTypeParameter("T"+ j);
+			// getBounds von Params
+			sw.visitClassBound().visitClassType(Type.getInternalName(Object.class));
+			sw.visitClassBound().visitEnd();
+		}
+//		sw.visitClassBound().visitEnd();
+		// TODO: prüfe ob Return-Type = void,
+		sw.visitSuperclass().visitClassType(Type.getInternalName(Object.class));;
+		sw.visitEnd();
+	}
+
 	/**
 	 * Creates signature for a method or constructor with @see {@link SignatureWriter}
 	 * Signature looks like: 
@@ -97,17 +126,17 @@ public class Signature {
 		}
 		switch (type) {
 		case "RT":
-//			sv.visitClassType(t.acceptTV(new TypeToDescriptor()));
 			sv.visitClassType(t.acceptTV(new TypeToSignature()));
 			break;
 		case "GRT":
 			GenericRefType g = (GenericRefType) t;
-//			sv.visitTypeVariable(g.getParsedName());
 			sv.visitTypeVariable(g.acceptTV(new TypeToSignature()));
 			break;
 		case "TPH":
-			RefType r = (RefType) resultSet.resolveType(t).resolvedType;
+			RefTypeOrTPHOrWildcardOrGeneric r = resultSet.resolveType(t).resolvedType;
 			sv.visitInterface().visitClassType(r.acceptTV(new TypeToSignature()));
+//			sv.visitClassType(r.acceptTV(new TypeToSignature()));
+			System.out.println(r.getClass()+" Signature TPH: "+r.acceptTV(new TypeToSignature()));
 			break;
 		default:
 			if(!isParameterType)
@@ -143,6 +172,7 @@ public class Signature {
 		while(bItr.hasNext()) {
 			RefTypeOrTPHOrWildcardOrGeneric b =bItr.next();
 			String boundDesc = b.acceptTV(new TypeToDescriptor());
+			System.out.println("GetBounds: " + boundDesc);
 			// Ensure that <...> extends java.lang.Object OR ...
 			sw.visitClassBound().visitClassType(boundDesc);
 			genAndBounds.put(g.getParsedName(), boundDesc);

src/de/dhbwstuttgart/bytecode/signature/TypeToSignature.java

@@ -1,4 +1,4 @@
-package de.dhbwstuttgart.bytecode;
+package de.dhbwstuttgart.bytecode.signature;
 
 import java.util.Iterator;
 

src/de/dhbwstuttgart/bytecode/signature/TypeToString.java

@@ -1,4 +1,4 @@
-package de.dhbwstuttgart.bytecode;
+package de.dhbwstuttgart.bytecode.signature;
 
 import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;

test/bytecode/LamAssign.jav

@@ -8,6 +8,6 @@ class LamAssign {
   }
 }
 
-interface Fun1<A,B>{
+//interface Fun1<A,B>{
-    A apply(B b);
+//    A apply(B b);
-}
+//}