Mercurial > hg > truffle

changeset 9229:76a6e7907b67

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor cleanup.
author Christian Humer <christian.humer@gmail.com>
date Mon, 22 Apr 2013 16:39:47 +0200
parents bc82cde765b9
children 7e3c7d55d538
files graal/com.oracle.truffle.api.codegen.test/src/com/oracle/truffle/api/codegen/test/BinaryNodeTest.java graal/com.oracle.truffle.api.codegen.test/src/com/oracle/truffle/api/codegen/test/ExecuteEvaluatedTest.java
diffstat 2 files changed, 7 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.truffle.api.codegen.test/src/com/oracle/truffle/api/codegen/test/BinaryNodeTest.java	Mon Apr 22 16:39:12 2013 +0200
+++ b/graal/com.oracle.truffle.api.codegen.test/src/com/oracle/truffle/api/codegen/test/BinaryNodeTest.java	Mon Apr 22 16:39:47 2013 +0200
@@ -49,9 +49,8 @@
         executeWith(node, new Object(), new Object());
     }
 
-    @NodeChildren({@NodeChild("leftNode"), @NodeChild("rightNode")})
+    @NodeChildren({@NodeChild("left"), @NodeChild("right")})
     abstract static class BinaryNode extends ValueNode {
-
     }
 
     abstract static class AddNode extends BinaryNode {
--- a/graal/com.oracle.truffle.api.codegen.test/src/com/oracle/truffle/api/codegen/test/ExecuteEvaluatedTest.java	Mon Apr 22 16:39:12 2013 +0200
+++ b/graal/com.oracle.truffle.api.codegen.test/src/com/oracle/truffle/api/codegen/test/ExecuteEvaluatedTest.java	Mon Apr 22 16:39:47 2013 +0200
@@ -26,21 +26,12 @@
 import com.oracle.truffle.api.codegen.*;
 import com.oracle.truffle.api.codegen.test.TypeSystemTest.ValueNode;
 import com.oracle.truffle.api.frame.*;
-import com.oracle.truffle.api.nodes.*;
 
 public class ExecuteEvaluatedTest {
 
-    public abstract static class ExtValueNode extends ValueNode {
-
-        public CallTarget executeCallTarget(VirtualFrame frame) throws UnexpectedResultException {
-            return SimpleTypesGen.SIMPLETYPES.expectCallTarget(execute(frame));
-        }
-
-    }
-
     /* Represents target[element] */
-    @NodeChildren({@NodeChild("targetNode"), @NodeChild("elementNode")})
-    abstract static class ReadElementNode extends ExtValueNode {
+    @NodeChildren({@NodeChild("target"), @NodeChild("element")})
+    abstract static class ReadElementNode extends ValueNode {
 
         @Specialization
         int getInt(Object[] target, int element) {
@@ -51,12 +42,12 @@
     }
 
     /* Represents target[element]() */
-    @NodeChildren({@NodeChild("targetNode"), @NodeChild(value = "elementNode", type = ReadElementNode.class, executeWith = "targetNode")})
-    abstract static class ElementCallNode extends ExtValueNode {
+    @NodeChildren({@NodeChild("target"), @NodeChild(value = "element", type = ReadElementNode.class, executeWith = "target")})
+    abstract static class ElementCallNode extends ValueNode {
 
         @Specialization
-        Object call(Object receiver, CallTarget callTarget) {
-            return callTarget.call(new TestArguments(receiver));
+        Object call(Object receiver, Object callTarget) {
+            return ((CallTarget) callTarget).call(new TestArguments(receiver));
         }
 
     }