Skip to content

Commit

Permalink
fix #464
Browse files Browse the repository at this point in the history
  • Loading branch information
gavinking committed Jan 7, 2013
1 parent ee0103c commit 01b5219
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
Expand Up @@ -361,13 +361,13 @@ else if (isGeneric(dec)) {
IntersectionType ut = new IntersectionType(unit);
ut.setSatisfiedTypes(list);
if (!ta.isExactly(ut.getType())) {
that.addWarning("type argument to covariant type parameter in assignability condition must be " +
that.addWarning("type argument to covariant (out) type parameter in assignability condition must be " +
ut.getType().getProducedTypeName(unit) + " (until we implement reified generics)");
}
}
else if (tp.isContravariant()) {
if (!(ta.getDeclaration() instanceof NothingType)) {
that.addWarning("type argument to contravariant type parameter in assignability condition must be Nothing (until we implement reified generics)");
that.addWarning("type argument to contravariant (in) type parameter in assignability condition must be Nothing (until we implement reified generics)");
}
}
else {
Expand Down
Expand Up @@ -108,11 +108,11 @@ private void check(ProducedType type, Node that, boolean variable) {
for (TypeParameter td: errors) {
String var; String loc;
if ( td.isContravariant() ) {
var = "contravariant";
var = "contravariant (in)";
loc = "covariant";
}
else if ( td.isCovariant() ) {
var = "covariant";
var = "covariant (out)";
loc = "contravariant";
}
else {
Expand Down

0 comments on commit 01b5219

Please sign in to comment.