comparison graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TestHelper.java @ 11191:c7d9ff67beed

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 79041ab43660
children e55e24cc3e7b
comparison
equal deleted inserted replaced
11190:4eb23800c907 11191:c7d9ff67beed
48 48
49 static <E extends ValueNode> E createNode(NodeFactory<E> factory, Object... constants) { 49 static <E extends ValueNode> E createNode(NodeFactory<E> factory, Object... constants) {
50 ArgumentNode[] argumentNodes = arguments(factory.getExecutionSignature().size()); 50 ArgumentNode[] argumentNodes = arguments(factory.getExecutionSignature().size());
51 51
52 List<Object> argumentList = new ArrayList<>(); 52 List<Object> argumentList = new ArrayList<>();
53 argumentList.addAll(Arrays.asList(constants));
54 if (ChildrenNode.class.isAssignableFrom(factory.getNodeClass()) || BuiltinNode.class.isAssignableFrom(factory.getNodeClass())) { 53 if (ChildrenNode.class.isAssignableFrom(factory.getNodeClass()) || BuiltinNode.class.isAssignableFrom(factory.getNodeClass())) {
55 argumentList.add(argumentNodes); 54 argumentList.add(argumentNodes);
56 } else { 55 } else {
57 argumentList.addAll(Arrays.asList(argumentNodes)); 56 argumentList.addAll(Arrays.asList(argumentNodes));
58 } 57 }
58 argumentList.addAll(Arrays.asList(constants));
59 return factory.createNode(argumentList.toArray(new Object[argumentList.size()])); 59 return factory.createNode(argumentList.toArray(new Object[argumentList.size()]));
60 } 60 }
61 61
62 static <E extends ValueNode> TestRootNode<E> createRoot(NodeFactory<E> factory, Object... constants) { 62 static <E extends ValueNode> TestRootNode<E> createRoot(NodeFactory<E> factory, Object... constants) {
63 return new TestRootNode<>(createNode(factory, constants)); 63 return new TestRootNode<>(createNode(factory, constants));