Mercurial > hg > graal-jvmci-8

comparison graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/node/NodeParser.java @ 11482:cb364a90ef62

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Truffle-DSL: fixed wrong equals/hashCode in Template.
author Christian Humer <christian.humer@gmail.com>
date Fri, 30 Aug 2013 17:00:26 +0200
parents fce94b1d46f0
children 2aac62d79af4
comparison
equal deleted inserted replaced
11481:a317acdd5f2c 11482:cb364a90ef62
460 460
461 NodeData fieldNodeData = resolveNode(Utils.fromTypeMirror(childType)); 461 NodeData fieldNodeData = resolveNode(Utils.fromTypeMirror(childType));
462 nodeChild.setNode(fieldNodeData); 462 nodeChild.setNode(fieldNodeData);
463 if (fieldNodeData == null) { 463 if (fieldNodeData == null) {
464 nodeChild.addError("Node type '%s' is invalid or not a valid Node.", Utils.getQualifiedName(childType)); 464 nodeChild.addError("Node type '%s' is invalid or not a valid Node.", Utils.getQualifiedName(childType));
465 } else if (!fieldNodeData.getTypeSystem().equals(node.getTypeSystem())) { 465 } else if (!Utils.typeEquals(fieldNodeData.getTypeSystem().getTemplateType().asType(), (node.getTypeSystem().getTemplateType().asType()))) {
466 nodeChild.addError("The @%s of the node and the @%s of the @%s does not match. %s != %s. ", TypeSystem.class.getSimpleName(), TypeSystem.class.getSimpleName(), 466 nodeChild.addError("The @%s of the node and the @%s of the @%s does not match. %s != %s. ", TypeSystem.class.getSimpleName(), TypeSystem.class.getSimpleName(),
467 NodeChild.class.getSimpleName(), Utils.getSimpleName(node.getTypeSystem().getTemplateType()), Utils.getSimpleName(fieldNodeData.getTypeSystem().getTemplateType())); 467 NodeChild.class.getSimpleName(), Utils.getSimpleName(node.getTypeSystem().getTemplateType()), Utils.getSimpleName(fieldNodeData.getTypeSystem().getTemplateType()));
468 } 468 }
469 index++; 469 index++;
470 } 470 }