natas_hw
/
legacy-svn-scala
mirror of https://github.com/scala/legacy-svn-scala
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

5033: align bound syms when comparing method types 

can't believe I missed that one...

closes SI-5033

more complete test case to make sure the multi-arglist case works as well

no review

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@25860 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
moors 2011-10-20 22:28:50 +00:00
parent 10058c5b6b
commit 5a04563e89
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/compiler/scala/reflect/internal/Types.scala
View File

@ -3303,7 +3303,6 @@ A type's typeSymbol should never be inspected directly.
variance = -variance
val result1 = this(result)
if ((params1 eq params) && (result1 eq result)) tp
// for new dependent types: result1.substSym(params, params1)?
else copyMethodType(tp, params1, result1.substSym(params, params1))
case PolyType(tparams, result) =>
variance = -variance
@ -4558,9 +4557,8 @@ A type's typeSymbol should never be inspected directly.
case mt1: MethodType =>
tp2 match {
case mt2: MethodType =>
// DEPMETTODO new dependent types: probably fix this, use substSym as done for PolyType
return isSameTypes(mt1.paramTypes, mt2.paramTypes) &&
mt1.resultType =:= mt2.resultType &&
mt1.resultType =:= mt2.resultType.substSym(mt2.params, mt1.params) &&
mt1.isImplicit == mt2.isImplicit
// note: no case NullaryMethodType(restpe) => return mt1.params.isEmpty && mt1.resultType =:= restpe
case _ =>
@ -4913,7 +4911,7 @@ A type's typeSymbol should never be inspected directly.
val res2 = mt2.resultType
(sameLength(params1, params2) &&
matchingParams(params1, params2, mt1.isJava, mt2.isJava) &&
(res1 <:< res2) &&
(res1 <:< res2.substSym(params2, params1)) &&
mt1.isImplicit == mt2.isImplicit)
// TODO: if mt1.params.isEmpty, consider NullaryMethodType?
case _ =>
@ -5033,9 +5031,9 @@ A type's typeSymbol should never be inspected directly.
case mt1 @ MethodType(params1, res1) =>
tp2 match {
case mt2 @ MethodType(params2, res2) =>
sameLength(params1, params2) && // useful pre-screening optimization
matchingParams(params1, params2, mt1.isJava, mt2.isJava) &&
matchesType(res1, res2, alwaysMatchSimple) &&
// sameLength(params1, params2) was used directly as pre-screening optimization (now done by matchesQuantified -- is that ok, performancewise?)
matchesQuantified(params1, params2, res1, res2) &&
matchingParams(params1, params2, mt1.isJava, mt2.isJava) &&
mt1.isImplicit == mt2.isImplicit
case NullaryMethodType(res2) =>
if (params1.isEmpty) matchesType(res1, res2, alwaysMatchSimple)

15
test/files/pos/t5033.scala Normal file
View File

@ -0,0 +1,15 @@
trait Eater {
type Food[T]
}
trait Fruit {
type Seed
}
trait PipExtractor {
def extract(a: Fruit)(b: Eater): b.Food[a.Seed]
}
trait LaserGuidedPipExtractor extends PipExtractor {
def extract(f: Fruit)(g: Eater): g.Food[f.Seed]
}