diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/LambdaExpression.java b/src/de/dhbwstuttgart/syntaxtree/statement/LambdaExpression.java index fddcbed8..1b4f4241 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/LambdaExpression.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/LambdaExpression.java @@ -2,7 +2,11 @@ package de.dhbwstuttgart.syntaxtree.statement; import java.util.Hashtable; +import org.apache.bcel.generic.BIPUSH; import org.apache.bcel.generic.ClassGen; +import org.apache.bcel.generic.InstructionFactory; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.INVOKEDYNAMIC; import de.dhbwstuttgart.typeinference.Menge; import de.dhbwstuttgart.myexception.CTypeReconstructionException; @@ -208,9 +212,18 @@ public class LambdaExpression extends Expr{ } @Override - public void genByteCode(ClassGen _cg) { - // TODO Auto-generated method stub - + public InstructionList genByteCode(ClassGen cg) { + //InstructionFactory _factory = new InstructionFactory(cg, cg.getConstantPool()); + InstructionList il = new InstructionList(); + short opcode = 186;//opcode - was genau ist das? + /* + * Bytecode: + * 0: invokedynamic #2, 0 //#2 führt zu einem InvokeDynamic im KP - wildes Referenzieren + * 5: astore_1 //Speichert wahrscheinlich den String meiner TestEXPR + * 6: return + */ + il.append(new INVOKEDYNAMIC(opcode, 0));//Invokedynamic lässt sich bei mir weder automatisch noch manuell importieren + return il; } } diff --git a/test/bytecode/LambdaExpr.jav b/test/bytecode/LambdaExpr.jav new file mode 100644 index 00000000..853da920 --- /dev/null +++ b/test/bytecode/LambdaExpr.jav @@ -0,0 +1,7 @@ +class LambdaExpr { + + void method() { + + Runnable r1 = () -> System.out.println("Hello world two!"); + } +} \ No newline at end of file diff --git a/test/bytecode/LambdaExpr.java b/test/bytecode/LambdaExpr.java new file mode 100644 index 00000000..e0d40b6b --- /dev/null +++ b/test/bytecode/LambdaExpr.java @@ -0,0 +1,45 @@ +package bytecode; + +import static org.junit.Assert.*; + +import java.io.File; +import java.io.IOException; + +import junit.framework.TestCase; + +import org.junit.Test; + +import plugindevelopment.TypeInsertTester; +import de.dhbwstuttgart.core.MyCompiler; +import de.dhbwstuttgart.core.MyCompilerAPI; +import de.dhbwstuttgart.logger.LoggerConfiguration; +import de.dhbwstuttgart.logger.Section; +import de.dhbwstuttgart.parser.JavaParser.yyException; +import de.dhbwstuttgart.typeinference.ByteCodeResult; +import de.dhbwstuttgart.typeinference.Menge; +import de.dhbwstuttgart.typeinference.TypeinferenceResultSet; +import de.dhbwstuttgart.typeinference.typedeployment.TypeInsertSet; + +public class LambdaExpr { + + public final static String rootDirectory = System.getProperty("user.dir")+"/test/bytecode/"; + public final static String testFile = "LambdaExpr.jav"; + public final static String outputFile = "LambdaExpr.class"; + + @Test + public void test() { + LoggerConfiguration logConfig = new LoggerConfiguration().setOutput(Section.PARSER, System.out); + MyCompilerAPI compiler = MyCompiler.getAPI(logConfig); + try { + compiler.parse(new File(rootDirectory + testFile)); + compiler.typeReconstruction(); + ByteCodeResult bytecode = compiler.generateBytecode(); + System.out.println(bytecode); + bytecode.getByteCode().getJavaClass().dump(new File(rootDirectory + outputFile)); + } catch (IOException | yyException e) { + e.printStackTrace(); + TestCase.fail(); + } + } + +} diff --git a/test/bytecode/NewArray.jav b/test/bytecode/NewArray.jav index 0b80f746..ff311c25 100644 --- a/test/bytecode/NewArray.jav +++ b/test/bytecode/NewArray.jav @@ -1,8 +1,9 @@ class NewArray{ void method() { -zahl; -zahl = new Integer[2]; +a; +a = new Integer[2]; +a = {1,2}; }