Merge pull request #9 in G/truffle from ~MATTHIAS.G.GRIMMER_ORACLE.CO…

…M/truffle:master to master * commit '9817eb71bd7f41b3b3d87f9955a6848ad45bd2ec': Introduce a new version of Interop DSL - deprecate @AcceptMessage
oracle · Apr 14, 2016 · 1a94cdd · 1a94cdd
2 parents 4476ec4 + 9817eb7
commit 1a94cdd
Show file tree

Hide file tree

Showing 119 changed files with 3,416 additions and 2,847 deletions.
diff --git a/...ffle/api/dsl/test/interop/WriteNode3.java → ...i/dsl/test/interop/AcceptMessageTest.java b/...ffle/api/dsl/test/interop/WriteNode3.java → ...i/dsl/test/interop/AcceptMessageTest.java
@@ -23,10 +23,10 @@
 package com.oracle.truffle.api.dsl.test.interop;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.interop.AcceptMessage;
 
-@AcceptMessage(value = "WRITE", receiverType = ValidTruffleObject.class, language = TestTruffleLanguage.class)
-public final class WriteNode3 extends BaseWriteNode3 {
+@SuppressWarnings("deprecation")
+@com.oracle.truffle.api.interop.AcceptMessage(value = "WRITE", receiverType = ValidTruffleObject10.class, language = TestTruffleLanguage.class)
+public final class AcceptMessageTest extends AcceptMessageTestBase {
 
     @Override
     protected int access(VirtualFrame frame, Object receiver, Object name, Object value) {

diff --git a/...cle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/interop/AcceptMyMessage.java b/...cle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/interop/AcceptMyMessage.java
diff --git a/...cle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/interop/ExampleReadNode.java b/...cle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/interop/ExampleReadNode.java
diff --git a/...ruffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/interop/ExampleTruffleObject.java b/...ruffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/interop/ExampleTruffleObject.java
diff --git a/.../com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/interop/Execute.java b/.../com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/interop/Execute.java
diff --git a/...com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/interop/Execute2.java b/...com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/interop/Execute2.java
diff --git a/...com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/interop/Execute3.java b/...com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/interop/Execute3.java
diff --git a/...com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/interop/Execute4.java b/...com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/interop/Execute4.java
diff --git a/...com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/interop/Execute5.java b/...com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/interop/Execute5.java
diff --git a/...oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/interop/HasSizeNode2.java b/...oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/interop/HasSizeNode2.java
diff --git a/.../api/dsl/test/interop/UnknownMessage.java → .../test/interop/InvalidTruffleObjectMR.java b/.../api/dsl/test/interop/UnknownMessage.java → .../test/interop/InvalidTruffleObjectMR.java
@@ -23,9 +23,10 @@
 package com.oracle.truffle.api.dsl.test.interop;
 
 import com.oracle.truffle.api.dsl.test.ExpectError;
-import com.oracle.truffle.api.interop.AcceptMessage;
+import com.oracle.truffle.api.interop.MessageResolution;
+
+@ExpectError("Missing isInstance method in class com.oracle.truffle.api.dsl.test.interop.InvalidTruffleObject")
+@MessageResolution(receiverType = InvalidTruffleObject.class, language = TestTruffleLanguage.class)
+public class InvalidTruffleObjectMR {
 
-@ExpectError({"Unknown message type: unknownMsg"})
-@AcceptMessage(value = "unknownMsg", receiverType = ValidTruffleObject.class, language = TestTruffleLanguage.class)
-public final class UnknownMessage extends BaseUnknownMessage {
 }