Mercurial > hg > truffle

changeset 11191:c7d9ff67beed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Truffle-DSL: Fixed argument order problem for test cases.
author Christian Humer <christian.humer@gmail.com>
date Thu, 01 Aug 2013 20:47:57 +0200
parents 4eb23800c907
children 0460c44aef60
files graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeContainerTest.java graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TestHelper.java
diffstat 2 files changed, 3 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeContainerTest.java	Wed Jul 31 15:36:01 2013 +0200
+++ b/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeContainerTest.java	Thu Aug 01 20:47:57 2013 +0200
@@ -162,21 +162,10 @@
     }
 
     @NodeChild(value = "children", type = ValueNode[].class)
+    @NodeField(name = "context", type = Context.class)
     abstract static class BuiltinNode extends ValueNode {
 
-        protected final Context context;
-
-        public BuiltinNode(BuiltinNode node) {
-            this(node.context);
-        }
-
-        public BuiltinNode(Context context) {
-            this.context = context;
-        }
-
-        public Context getContext() {
-            return context;
-        }
+        public abstract Context getContext();
     }
 
     static class Context {
--- a/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TestHelper.java	Wed Jul 31 15:36:01 2013 +0200
+++ b/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TestHelper.java	Thu Aug 01 20:47:57 2013 +0200
@@ -50,12 +50,12 @@
         ArgumentNode[] argumentNodes = arguments(factory.getExecutionSignature().size());
 
         List<Object> argumentList = new ArrayList<>();
-        argumentList.addAll(Arrays.asList(constants));
         if (ChildrenNode.class.isAssignableFrom(factory.getNodeClass()) || BuiltinNode.class.isAssignableFrom(factory.getNodeClass())) {
             argumentList.add(argumentNodes);
         } else {
             argumentList.addAll(Arrays.asList(argumentNodes));
         }
+        argumentList.addAll(Arrays.asList(constants));
         return factory.createNode(argumentList.toArray(new Object[argumentList.size()]));
     }