@@ -142,7 +142,7 @@ trait FullParameterization {
142
142
* followed by the class parameters of its enclosing class.
143
143
*/
144
144
private def allInstanceTypeParams (originalDef : DefDef )(implicit ctx : Context ): List [Symbol ] =
145
- originalDef.tparams.map(_.symbol) ::: originalDef.symbol.owner .typeParams
145
+ originalDef.tparams.map(_.symbol) ::: originalDef.symbol.enclosingClass .typeParams
146
146
147
147
/** Given an instance method definition `originalDef`, return a
148
148
* fully parameterized method definition derived from `originalDef`, which
@@ -152,7 +152,7 @@ trait FullParameterization {
152
152
def fullyParameterizedDef (derived : TermSymbol , originalDef : DefDef )(implicit ctx : Context ): Tree =
153
153
polyDefDef(derived, trefs => vrefss => {
154
154
val origMeth = originalDef.symbol
155
- val origClass = origMeth.owner .asClass
155
+ val origClass = origMeth.enclosingClass .asClass
156
156
val origTParams = allInstanceTypeParams(originalDef)
157
157
val origVParams = originalDef.vparamss.flatten map (_.symbol)
158
158
val thisRef :: argRefs = vrefss.flatten
@@ -219,7 +219,7 @@ trait FullParameterization {
219
219
def forwarder (derived : TermSymbol , originalDef : DefDef )(implicit ctx : Context ): Tree =
220
220
ref(derived.termRef)
221
221
.appliedToTypes(allInstanceTypeParams(originalDef).map(_.typeRef))
222
- .appliedTo(This (originalDef.symbol.owner .asClass))
222
+ .appliedTo(This (originalDef.symbol.enclosingClass .asClass))
223
223
.appliedToArgss(originalDef.vparamss.nestedMap(vparam => ref(vparam.symbol)))
224
224
.withPos(originalDef.rhs.pos)
225
225
}
0 commit comments