diff options
| author | Martin Odersky <odersky@gmail.com> | 2017-03-17 14:58:27 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2017-04-06 13:15:28 +0200 |
| commit | 700e7ac6658a1d699502c94141091012d18519c4 (patch) | |
| tree | 9090f17234a618e5279c1b935072d2b2a9c05fe0 /compiler/src/dotty/tools/dotc/core/Denotations.scala | |
| parent | ec4282dd99814ceb5304c4e1bb57aa607edff8db (diff) | |
| download | dotty-700e7ac6658a1d699502c94141091012d18519c4.tar.gz dotty-700e7ac6658a1d699502c94141091012d18519c4.tar.bz2 dotty-700e7ac6658a1d699502c94141091012d18519c4.zip | |
replace derived{Method,Poly}Type with derivedLambdaType
Diffstat (limited to 'compiler/src/dotty/tools/dotc/core/Denotations.scala')
| -rw-r--r-- | compiler/src/dotty/tools/dotc/core/Denotations.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/src/dotty/tools/dotc/core/Denotations.scala b/compiler/src/dotty/tools/dotc/core/Denotations.scala index 1d7b3c94c..7e552eda9 100644 --- a/compiler/src/dotty/tools/dotc/core/Denotations.scala +++ b/compiler/src/dotty/tools/dotc/core/Denotations.scala @@ -312,7 +312,7 @@ object Denotations { tp2 match { case tp2: MethodType if ctx.typeComparer.matchingParams(tp1.paramInfos, tp2.paramInfos, tp1.isJava, tp2.isJava) && tp1.isImplicit == tp2.isImplicit => - tp1.derivedMethodType( + tp1.derivedLambdaType( mergeNames(tp1.paramNames, tp2.paramNames, nme.syntheticParamName), tp1.paramInfos, infoMeet(tp1.resultType, tp2.resultType.subst(tp2, tp1))) @@ -322,7 +322,7 @@ object Denotations { case tp1: PolyType if isTerm => tp2 match { case tp2: PolyType if ctx.typeComparer.matchingTypeParams(tp1, tp2) => - tp1.derivedPolyType( + tp1.derivedLambdaType( mergeNames(tp1.paramNames, tp2.paramNames, tpnme.syntheticTypeParamName), tp1.paramInfos, infoMeet(tp1.resultType, tp2.resultType.subst(tp2, tp1))) @@ -476,7 +476,7 @@ object Denotations { case tp2: MethodType if ctx.typeComparer.matchingParams(tp1.paramInfos, tp2.paramInfos, tp1.isJava, tp2.isJava) && tp1.isImplicit == tp2.isImplicit => - tp1.derivedMethodType( + tp1.derivedLambdaType( mergeNames(tp1.paramNames, tp2.paramNames, nme.syntheticParamName), tp1.paramInfos, tp1.resultType | tp2.resultType.subst(tp2, tp1)) case _ => @@ -485,7 +485,7 @@ object Denotations { case tp1: PolyType => tp2 match { case tp2: PolyType if ctx.typeComparer.matchingTypeParams(tp1, tp2) => - tp1.derivedPolyType( + tp1.derivedLambdaType( mergeNames(tp1.paramNames, tp2.paramNames, tpnme.syntheticTypeParamName), tp1.paramInfos, tp1.resultType | tp2.resultType.subst(tp2, tp1)) case _ => |