@@ -2465,7 +2465,7 @@ object Types {
2465
2465
extends CachedProxyType with TermType with MethodicType {
2466
2466
override def resultType (implicit ctx : Context ): Type = resType
2467
2467
override def underlying (implicit ctx : Context ): Type = resType
2468
- protected def computeSignature (implicit ctx : Context ): Signature = resultSignature
2468
+ def computeSignature (implicit ctx : Context ): Signature = resultSignature
2469
2469
def derivedExprType (resType : Type )(implicit ctx : Context ) =
2470
2470
if (resType eq this .resType) this else ExprType (resType)
2471
2471
override def computeHash = doHash(resType)
@@ -2487,7 +2487,7 @@ object Types {
2487
2487
* HKLambda | HKTermLambda | HKTypeLambda
2488
2488
* MethodOrPoly | MethodType | PolyType
2489
2489
*/
2490
- trait LambdaType extends BindingType with MethodicType { self =>
2490
+ trait LambdaType extends BindingType with TermType { self =>
2491
2491
type ThisName <: Name
2492
2492
type PInfo <: Type
2493
2493
type This <: LambdaType {type PInfo = self.PInfo }
@@ -2517,8 +2517,6 @@ object Types {
2517
2517
myParamRefs
2518
2518
}
2519
2519
2520
- protected def computeSignature (implicit ctx : Context ) = resultSignature
2521
-
2522
2520
final def instantiate (argTypes : => List [Type ])(implicit ctx : Context ): Type =
2523
2521
if (isDependent) resultType.substParams(this , argTypes)
2524
2522
else resultType
@@ -2566,7 +2564,7 @@ object Types {
2566
2564
}
2567
2565
}
2568
2566
2569
- abstract class MethodOrPoly extends CachedGroundType with LambdaType with TermType {
2567
+ abstract class MethodOrPoly extends CachedGroundType with LambdaType with MethodicType {
2570
2568
final override def computeHash = doHash(paramNames, resType, paramInfos)
2571
2569
2572
2570
// Defined here instead of in LambdaType for efficiency
@@ -2691,7 +2689,7 @@ object Types {
2691
2689
val resType = resultTypeExp(this )
2692
2690
assert(resType.exists)
2693
2691
2694
- override def computeSignature (implicit ctx : Context ): Signature =
2692
+ def computeSignature (implicit ctx : Context ): Signature =
2695
2693
resultSignature.prepend(paramInfos, isJava)
2696
2694
2697
2695
protected def prefixString = " MethodType"
@@ -2895,6 +2893,8 @@ object Types {
2895
2893
assert(resType.isInstanceOf [TermType ], this )
2896
2894
assert(paramNames.nonEmpty)
2897
2895
2896
+ def computeSignature (implicit ctx : Context ) = resultSignature
2897
+
2898
2898
/** Merge nested polytypes into one polytype. nested polytypes are normally not supported
2899
2899
* but can arise as temporary data structures.
2900
2900
*/
0 commit comments