# HG changeset patch # User Christian Humer # Date 1375382877 -7200 # Node ID c7d9ff67beed76d8658f8df8cb07609413cbe257 # Parent 4eb23800c9074a6b2b9ca40b0f21c7e530728330 Truffle-DSL: Fixed argument order problem for test cases. diff -r 4eb23800c907 -r c7d9ff67beed graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeContainerTest.java --- 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 { diff -r 4eb23800c907 -r c7d9ff67beed graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TestHelper.java --- 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 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()])); }