summaryrefslogtreecommitdiff
path: root/sources/scalac
diff options
context:
space:
mode:
authorMatthias Zenger <mzenger@gmail.com>2003-07-09 12:47:11 +0000
committerMatthias Zenger <mzenger@gmail.com>2003-07-09 12:47:11 +0000
commit62656923def1251761b3e849e2e12c373a48be16 (patch)
treeb617afdc641493c82a9ca241aed1d8e6d618b979 /sources/scalac
parentb5f8932a9bf6314f12d11aa9cd96b3c6bfaed035 (diff)
downloadscala-62656923def1251761b3e849e2e12c373a48be16.tar.gz
scala-62656923def1251761b3e849e2e12c373a48be16.tar.bz2
scala-62656923def1251761b3e849e2e12c373a48be16.zip
*** empty log message ***
Diffstat (limited to 'sources/scalac')
-rw-r--r--sources/scalac/typechecker/Infer.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/sources/scalac/typechecker/Infer.java b/sources/scalac/typechecker/Infer.java
index 674b2cd393..2149e35e1a 100644
--- a/sources/scalac/typechecker/Infer.java
+++ b/sources/scalac/typechecker/Infer.java
@@ -262,7 +262,7 @@ public class Infer implements Modifiers, Kinds {
case CompoundType(Type[] parts, Scope members):
return variance(tparam, parts) & variance(tparam, members.elements());
default:
- throw new ApplicationError();
+ throw new ApplicationError(tp.toString());
}
}
@@ -591,6 +591,7 @@ public class Infer implements Modifiers, Kinds {
Type insttype = restype.subst(tparams, tvars);
if (isCompatible(insttype, pt)) {
try {
+ restype = normalize(restype);
for (int i = 0; i < tvars.length; i++) {
solve(tparams, false, variance(tparams, restype), tvars, i);
}