diff options
| author | Martin Odersky <odersky@gmail.com> | 2003-12-02 10:25:23 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2003-12-02 10:25:23 +0000 |
| commit | 3a4e72367ec151c5d8379af408bf72c594f8605d (patch) | |
| tree | 4e86b89b62c4b6850ae9b0f435fa1aae1cd0b428 /sources/scalac/typechecker | |
| parent | 142bcb34f745cca56542a0f7f334cbc3b91d033d (diff) | |
| download | scala-3a4e72367ec151c5d8379af408bf72c594f8605d.tar.gz scala-3a4e72367ec151c5d8379af408bf72c594f8605d.tar.bz2 scala-3a4e72367ec151c5d8379af408bf72c594f8605d.zip | |
*** empty log message ***
Diffstat (limited to 'sources/scalac/typechecker')
| -rw-r--r-- | sources/scalac/typechecker/Infer.java | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/sources/scalac/typechecker/Infer.java b/sources/scalac/typechecker/Infer.java index b2b38ef2da..715b6d0f07 100644 --- a/sources/scalac/typechecker/Infer.java +++ b/sources/scalac/typechecker/Infer.java @@ -579,7 +579,22 @@ public class Infer implements Modifiers, Kinds { /** Is normalized type `tp' a subtype of prototype `pt'? */ public boolean isCompatible(Type tp, Type pt) { - return normalize(tp).isSubType(pt); + Type tp1 = normalize(tp); + if (tp1.isSubType(pt)) return true; + Symbol coerceMeth = tp1.lookup(Names.coerce); + if (coerceMeth.kind == NONE) return false; + switch (tp1.memberType(coerceMeth)) { + case PolyType(Symbol[] tparams, Type restype): + if (tparams.length == 0) + return restype.isSubType(pt); + } + return false; + } + + public boolean isCompatible(Type[] tps, Type[] pts) { + for (int i = 0; i < tps.length; i++) + if (!isCompatible(tps[i], pts[i])) return false; + return true; } /** Type arguments mapped to `scala.All' are taken to be uninstantiated. @@ -886,7 +901,7 @@ public class Infer implements Modifiers, Kinds { return isCompatible(restpe, pt) && formals.length == argtypes.length && - Type.isSubType(argtypes, formals); + isCompatible(argtypes, formals); case PolyType(Symbol[] tparams, MethodType(Symbol[] params, Type restpe)): try { Type[] targs = methTypeArgs( |