Mercurial > hg > truffle

changeset 17289:4372344cf3d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use Lambdas in CompositeValueReplacementTests.
author Josef Eisl <josef.eisl@jku.at>
date Mon, 29 Sep 2014 13:35:31 +0200
parents db0ee78b1ad5
children 6f9285d71d62
files graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest1.java graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest2.java graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest3.java graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest4.java
diffstat 4 files changed, 88 insertions(+), 214 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest1.java	Wed Oct 01 10:33:24 2014 +0200
+++ b/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest1.java	Mon Sep 29 13:35:31 2014 +0200
@@ -25,14 +25,11 @@
 import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*;
 import static org.junit.Assert.*;
 
-import java.util.*;
-
 import org.junit.*;
 
 import com.oracle.graal.api.meta.*;
 import com.oracle.graal.lir.*;
 import com.oracle.graal.lir.LIRInstruction.OperandFlag;
-import com.oracle.graal.lir.LIRInstruction.OperandMode;
 import com.oracle.graal.lir.asm.*;
 
 /**
@@ -129,35 +126,18 @@
         LIRInstruction op1 = new TestOp(compValue1);
         LIRInstruction op2 = new TestOp(compValue1);
 
-        op1.forEachInput(new InstructionValueProcedure() {
-            @Override
-            public Value doValue(LIRInstruction instruction, Value value, OperandMode mode, EnumSet<OperandFlag> flags) {
-                assertEquals(dummyValue1, value);
-                return dummyValue2;
-            }
+        op1.forEachInput((instruction, value, mode, flags) -> {
+            assertEquals(dummyValue1, value);
+            return dummyValue2;
         });
 
-        op2.forEachInput(new InstructionValueProcedure() {
-            @Override
-            public Value doValue(LIRInstruction instruction, Value value, OperandMode mode, EnumSet<OperandFlag> flags) {
-                assertEquals(dummyValue1, value);
-                return dummyValue3;
-            }
+        op2.forEachInput((instruction, value, mode, flags) -> {
+            assertEquals(dummyValue1, value);
+            return dummyValue3;
         });
 
-        op1.visitEachInput(new InstructionValueConsumer() {
-            @Override
-            public void visitValue(LIRInstruction instruction, Value value, OperandMode mode, EnumSet<OperandFlag> flags) {
-                assertEquals(dummyValue2, value);
-            }
-        });
-
-        op2.visitEachInput(new InstructionValueConsumer() {
-            @Override
-            public void visitValue(LIRInstruction instruction, Value value, OperandMode mode, EnumSet<OperandFlag> flags) {
-                assertEquals(dummyValue3, value);
-            }
-        });
+        op1.visitEachInput((instruction, value, mode, flags) -> assertEquals(dummyValue2, value));
+        op2.visitEachInput((instruction, value, mode, flags) -> assertEquals(dummyValue3, value));
     }
 
     @Test
@@ -169,34 +149,17 @@
         LIRInstruction op1 = new TestOp(compValue1);
         LIRInstruction op2 = new TestOp(compValue1);
 
-        op1.forEachInput(new InstructionValueProcedure() {
-            @Override
-            public Value doValue(LIRInstruction instruction, Value value, OperandMode mode, EnumSet<OperandFlag> flags) {
-                assertEquals(dummyValue1, value);
-                return dummyValue2;
-            }
-        });
-
-        op2.forEachInput(new InstructionValueProcedure() {
-            @Override
-            public Value doValue(LIRInstruction instruction, Value value, OperandMode mode, EnumSet<OperandFlag> flags) {
-                assertEquals(dummyValue1, value);
-                return dummyValue3;
-            }
+        op1.forEachInput((instruction, value, mode, flags) -> {
+            assertEquals(dummyValue1, value);
+            return dummyValue2;
         });
 
-        op1.visitEachInput(new InstructionValueConsumer() {
-            @Override
-            public void visitValue(LIRInstruction instruction, Value value, OperandMode mode, EnumSet<OperandFlag> flags) {
-                assertEquals(dummyValue2, value);
-            }
+        op2.forEachInput((instruction, value, mode, flags) -> {
+            assertEquals(dummyValue1, value);
+            return dummyValue3;
         });
 
-        op2.visitEachInput(new InstructionValueConsumer() {
-            @Override
-            public void visitValue(LIRInstruction instruction, Value value, OperandMode mode, EnumSet<OperandFlag> flags) {
-                assertEquals(dummyValue3, value);
-            }
-        });
+        op1.visitEachInput((instruction, value, mode, flags) -> assertEquals(dummyValue2, value));
+        op2.visitEachInput((instruction, value, mode, flags) -> assertEquals(dummyValue3, value));
     }
 }
--- a/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest2.java	Wed Oct 01 10:33:24 2014 +0200
+++ b/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest2.java	Mon Sep 29 13:35:31 2014 +0200
@@ -25,14 +25,11 @@
 import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*;
 import static org.junit.Assert.*;
 
-import java.util.*;
-
 import org.junit.*;
 
 import com.oracle.graal.api.meta.*;
 import com.oracle.graal.lir.*;
 import com.oracle.graal.lir.LIRInstruction.OperandFlag;
-import com.oracle.graal.lir.LIRInstruction.OperandMode;
 import com.oracle.graal.lir.asm.*;
 
 /**
@@ -130,35 +127,18 @@
         LIRInstruction op1 = new TestOp(compValue1);
         LIRInstruction op2 = new TestOp(compValue1);
 
-        op1.forEachInput(new InstructionValueProcedure() {
-            @Override
-            public Value doValue(LIRInstruction instruction, Value value, OperandMode mode, EnumSet<OperandFlag> flags) {
-                assertEquals(dummyValue1, value);
-                return dummyValue2;
-            }
+        op1.forEachInput((instruction, value, mode, flags) -> {
+            assertEquals(dummyValue1, value);
+            return dummyValue2;
         });
 
-        op2.forEachInput(new InstructionValueProcedure() {
-            @Override
-            public Value doValue(LIRInstruction instruction, Value value, OperandMode mode, EnumSet<OperandFlag> flags) {
-                assertEquals(dummyValue1, value);
-                return dummyValue3;
-            }
+        op2.forEachInput((instruction, value, mode, flags) -> {
+            assertEquals(dummyValue1, value);
+            return dummyValue3;
         });
 
-        op1.visitEachInput(new InstructionValueConsumer() {
-            @Override
-            public void visitValue(LIRInstruction instruction, Value value, OperandMode mode, EnumSet<OperandFlag> flags) {
-                assertEquals(dummyValue2, value);
-            }
-        });
-
-        op2.visitEachInput(new InstructionValueConsumer() {
-            @Override
-            public void visitValue(LIRInstruction instruction, Value value, OperandMode mode, EnumSet<OperandFlag> flags) {
-                assertEquals(dummyValue3, value);
-            }
-        });
+        op1.visitEachInput((instruction, value, mode, flags) -> assertEquals(dummyValue2, value));
+        op2.visitEachInput((instruction, value, mode, flags) -> assertEquals(dummyValue3, value));
     }
 
     @Test
@@ -170,34 +150,17 @@
         LIRInstruction op1 = new TestOp(compValue1);
         LIRInstruction op2 = new TestOp(compValue1);
 
-        op1.forEachInput(new InstructionValueProcedure() {
-            @Override
-            public Value doValue(LIRInstruction instruction, Value value, OperandMode mode, EnumSet<OperandFlag> flags) {
-                assertEquals(dummyValue1, value);
-                return dummyValue2;
-            }
-        });
-
-        op2.forEachInput(new InstructionValueProcedure() {
-            @Override
-            public Value doValue(LIRInstruction instruction, Value value, OperandMode mode, EnumSet<OperandFlag> flags) {
-                assertEquals(dummyValue1, value);
-                return dummyValue3;
-            }
+        op1.forEachInput((instruction, value, mode, flags) -> {
+            assertEquals(dummyValue1, value);
+            return dummyValue2;
         });
 
-        op1.visitEachInput(new InstructionValueConsumer() {
-            @Override
-            public void visitValue(LIRInstruction instruction, Value value, OperandMode mode, EnumSet<OperandFlag> flags) {
-                assertEquals(dummyValue2, value);
-            }
+        op2.forEachInput((instruction, value, mode, flags) -> {
+            assertEquals(dummyValue1, value);
+            return dummyValue3;
         });
 
-        op2.visitEachInput(new InstructionValueConsumer() {
-            @Override
-            public void visitValue(LIRInstruction instruction, Value value, OperandMode mode, EnumSet<OperandFlag> flags) {
-                assertEquals(dummyValue3, value);
-            }
-        });
+        op1.visitEachInput((instruction, value, mode, flags) -> assertEquals(dummyValue2, value));
+        op2.visitEachInput((instruction, value, mode, flags) -> assertEquals(dummyValue3, value));
     }
 }
--- a/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest3.java	Wed Oct 01 10:33:24 2014 +0200
+++ b/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest3.java	Mon Sep 29 13:35:31 2014 +0200
@@ -127,39 +127,26 @@
         LIRInstruction op1 = new TestOp(compValue1);
         LIRInstruction op2 = new TestOp(compValue1);
 
-        op1.forEachInputPos(new ValuePositionProcedure() {
-
-            @Override
-            public void doValue(LIRInstruction instruction, ValuePosition position) {
-                Value value = position.get(instruction);
-                assertEquals(dummyValue1, value);
-                position.set(instruction, dummyValue2);
-            }
+        op1.forEachInputPos((instruction, position) -> {
+            Value value = position.get(instruction);
+            assertEquals(dummyValue1, value);
+            position.set(instruction, dummyValue2);
         });
 
-        op2.forEachInputPos(new ValuePositionProcedure() {
-            @Override
-            public void doValue(LIRInstruction instruction, ValuePosition position) {
-                Value value = position.get(instruction);
-                assertEquals(dummyValue1, value);
-                position.set(instruction, dummyValue3);
-            }
+        op2.forEachInputPos((instruction, position) -> {
+            Value value = position.get(instruction);
+            assertEquals(dummyValue1, value);
+            position.set(instruction, dummyValue3);
         });
 
-        op1.forEachInputPos(new ValuePositionProcedure() {
-            @Override
-            public void doValue(LIRInstruction instruction, ValuePosition position) {
-                Value value = position.get(instruction);
-                assertEquals(dummyValue2, value);
-            }
+        op1.forEachInputPos((instruction, position) -> {
+            Value value = position.get(instruction);
+            assertEquals(dummyValue2, value);
         });
 
-        op2.forEachInputPos(new ValuePositionProcedure() {
-            @Override
-            public void doValue(LIRInstruction instruction, ValuePosition position) {
-                Value value = position.get(instruction);
-                assertEquals(dummyValue3, value);
-            }
+        op2.forEachInputPos((instruction, position) -> {
+            Value value = position.get(instruction);
+            assertEquals(dummyValue3, value);
         });
     }
 
@@ -172,39 +159,26 @@
         LIRInstruction op1 = new TestOp(compValue1);
         LIRInstruction op2 = new TestOp(compValue1);
 
-        op1.forEachInputPos(new ValuePositionProcedure() {
-
-            @Override
-            public void doValue(LIRInstruction instruction, ValuePosition position) {
-                Value value = position.get(instruction);
-                assertEquals(dummyValue1, value);
-                position.set(instruction, dummyValue2);
-            }
+        op1.forEachInputPos((instruction, position) -> {
+            Value value = position.get(instruction);
+            assertEquals(dummyValue1, value);
+            position.set(instruction, dummyValue2);
         });
 
-        op2.forEachInputPos(new ValuePositionProcedure() {
-            @Override
-            public void doValue(LIRInstruction instruction, ValuePosition position) {
-                Value value = position.get(instruction);
-                assertEquals(dummyValue1, value);
-                position.set(instruction, dummyValue3);
-            }
+        op2.forEachInputPos((instruction, position) -> {
+            Value value = position.get(instruction);
+            assertEquals(dummyValue1, value);
+            position.set(instruction, dummyValue3);
         });
 
-        op1.forEachInputPos(new ValuePositionProcedure() {
-            @Override
-            public void doValue(LIRInstruction instruction, ValuePosition position) {
-                Value value = position.get(instruction);
-                assertEquals(dummyValue2, value);
-            }
+        op1.forEachInputPos((instruction, position) -> {
+            Value value = position.get(instruction);
+            assertEquals(dummyValue2, value);
         });
 
-        op2.forEachInputPos(new ValuePositionProcedure() {
-            @Override
-            public void doValue(LIRInstruction instruction, ValuePosition position) {
-                Value value = position.get(instruction);
-                assertEquals(dummyValue3, value);
-            }
+        op2.forEachInputPos((instruction, position) -> {
+            Value value = position.get(instruction);
+            assertEquals(dummyValue3, value);
         });
     }
 }
--- a/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest4.java	Wed Oct 01 10:33:24 2014 +0200
+++ b/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest4.java	Mon Sep 29 13:35:31 2014 +0200
@@ -127,39 +127,26 @@
         LIRInstruction op1 = new TestOp(compValue1);
         LIRInstruction op2 = new TestOp(compValue1);
 
-        op1.forEachInputPos(new ValuePositionProcedure() {
-
-            @Override
-            public void doValue(LIRInstruction instruction, ValuePosition position) {
-                Value value = position.get(instruction);
-                assertEquals(dummyValue1, value);
-                position.set(instruction, dummyValue2);
-            }
+        op1.forEachInputPos((instruction, position) -> {
+            Value value = position.get(instruction);
+            assertEquals(dummyValue1, value);
+            position.set(instruction, dummyValue2);
         });
 
-        op2.forEachInputPos(new ValuePositionProcedure() {
-            @Override
-            public void doValue(LIRInstruction instruction, ValuePosition position) {
-                Value value = position.get(instruction);
-                assertEquals(dummyValue1, value);
-                position.set(instruction, dummyValue3);
-            }
+        op2.forEachInputPos((instruction, position) -> {
+            Value value = position.get(instruction);
+            assertEquals(dummyValue1, value);
+            position.set(instruction, dummyValue3);
         });
 
-        op1.forEachInputPos(new ValuePositionProcedure() {
-            @Override
-            public void doValue(LIRInstruction instruction, ValuePosition position) {
-                Value value = position.get(instruction);
-                assertEquals(dummyValue2, value);
-            }
+        op1.forEachInputPos((instruction, position) -> {
+            Value value = position.get(instruction);
+            assertEquals(dummyValue2, value);
         });
 
-        op2.forEachInputPos(new ValuePositionProcedure() {
-            @Override
-            public void doValue(LIRInstruction instruction, ValuePosition position) {
-                Value value = position.get(instruction);
-                assertEquals(dummyValue3, value);
-            }
+        op2.forEachInputPos((instruction, position) -> {
+            Value value = position.get(instruction);
+            assertEquals(dummyValue3, value);
         });
     }
 
@@ -172,39 +159,26 @@
         LIRInstruction op1 = new TestOp(compValue1);
         LIRInstruction op2 = new TestOp(compValue1);
 
-        op1.forEachInputPos(new ValuePositionProcedure() {
-
-            @Override
-            public void doValue(LIRInstruction instruction, ValuePosition position) {
-                Value value = position.get(instruction);
-                assertEquals(dummyValue1, value);
-                position.set(instruction, dummyValue2);
-            }
+        op1.forEachInputPos((instruction, position) -> {
+            Value value = position.get(instruction);
+            assertEquals(dummyValue1, value);
+            position.set(instruction, dummyValue2);
         });
 
-        op2.forEachInputPos(new ValuePositionProcedure() {
-            @Override
-            public void doValue(LIRInstruction instruction, ValuePosition position) {
-                Value value = position.get(instruction);
-                assertEquals(dummyValue1, value);
-                position.set(instruction, dummyValue3);
-            }
+        op2.forEachInputPos((instruction, position) -> {
+            Value value = position.get(instruction);
+            assertEquals(dummyValue1, value);
+            position.set(instruction, dummyValue3);
         });
 
-        op1.forEachInputPos(new ValuePositionProcedure() {
-            @Override
-            public void doValue(LIRInstruction instruction, ValuePosition position) {
-                Value value = position.get(instruction);
-                assertEquals(dummyValue2, value);
-            }
+        op1.forEachInputPos((instruction, position) -> {
+            Value value = position.get(instruction);
+            assertEquals(dummyValue2, value);
         });
 
-        op2.forEachInputPos(new ValuePositionProcedure() {
-            @Override
-            public void doValue(LIRInstruction instruction, ValuePosition position) {
-                Value value = position.get(instruction);
-                assertEquals(dummyValue3, value);
-            }
+        op2.forEachInputPos((instruction, position) -> {
+            Value value = position.get(instruction);
+            assertEquals(dummyValue3, value);
         });
     }
 }