# HG changeset patch # User Chris Seaton # Date 1428324308 -3600 # Node ID 3648df5872232497b79cfafbd94d426d59830f70 # Parent 9ca538e3e46e17ede021000cf8e54bd6165aea64 DSL: rename ElementUtils.typeCompatible to areTypesCompatible. diff -r 9ca538e3e46e -r 3648df587223 graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/expression/DSLExpressionResolver.java --- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/expression/DSLExpressionResolver.java Mon Apr 06 13:43:39 2015 +0100 +++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/expression/DSLExpressionResolver.java Mon Apr 06 13:45:08 2015 +0100 @@ -104,7 +104,7 @@ String operator = binary.getOperator(); TypeMirror leftType = binary.getLeft().getResolvedType(); TypeMirror rightType = binary.getRight().getResolvedType(); - if (!ElementUtils.typeCompatible(leftType, rightType)) { + if (!ElementUtils.areTypesCompatible(leftType, rightType)) { throw new InvalidExpressionException(String.format("Incompatible operand types %s and %s.", ElementUtils.getSimpleName(leftType), ElementUtils.getSimpleName(rightType))); } diff -r 9ca538e3e46e -r 3648df587223 graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/ElementUtils.java --- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/ElementUtils.java Mon Apr 06 13:43:39 2015 +0100 +++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/ElementUtils.java Mon Apr 06 13:45:08 2015 +0100 @@ -934,7 +934,7 @@ } } - public static boolean typeCompatible(TypeMirror type1, TypeMirror type2) { + public static boolean areTypesCompatible(TypeMirror type1, TypeMirror type2) { if (typeEquals(type1, type2)) { return true; } else if (kindIsIntegral(type1.getKind())) {