Skip to content

Commit dad1dda

Browse files
oderskyodersky
committed
Rename This types in compiler
1 parent a8f2787 commit dad1dda

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+174
-174
lines changed

‎compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
340340

341341
case ApplyDynamic(qual, args) => sys.error("No invokedynamic support yet.")
342342

343-
case This(qual) =>
343+
case ThisRef(qual) =>
344344
val symIsModuleClass = tree.symbol.isModuleClass
345345
assert(tree.symbol == claszSymbol || symIsModuleClass,
346346
s"Trying to access the this of another class: tree.symbol = ${tree.symbol}, class symbol = $claszSymbol compilation unit: $cunit")
@@ -409,7 +409,7 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
409409
genLoad(expr, expectedType)
410410
else genBlock(blck, expectedType)
411411

412-
case Typed(Super(_, _), _) => genLoad(This(claszSymbol), expectedType)
412+
case Typed(Super(_, _), _) => genLoad(ThisRef(claszSymbol), expectedType)
413413

414414
case Typed(expr, _) => genLoad(expr, expectedType)
415415

@@ -1027,7 +1027,7 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
10271027
assert(args.length == params.length, s"Wrong number of arguments in call to label at: $gotoPos")
10281028

10291029
def isTrivial(kv: (Tree, Symbol)) = kv match {
1030-
case (This(_), p) if p.name == nme_THIS => true
1030+
case (ThisRef(_), p) if p.name == nme_THIS => true
10311031
case (arg @ Ident(_), p) if arg.symbol == p => true
10321032
case _ => false
10331033
}

‎compiler/src/dotty/tools/backend/jvm/BackendInterface.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ abstract class BackendInterface extends BackendInterfaceDefinitions {
4040
type Typed >: Null <: Tree
4141
type ArrayValue >: Null <: Tree
4242
type Match >: Null <: Tree
43-
type This >: Null <: Tree
43+
type ThisRef >: Null <: Tree
4444
type CaseDef >: Null <: Tree
4545
type Alternative >: Null <: Tree
4646
type DefDef >: Null <: Tree
@@ -78,7 +78,7 @@ abstract class BackendInterface extends BackendInterfaceDefinitions {
7878
implicit val ArrayValueTag: ClassTag[ArrayValue]
7979
implicit val MatchTag: ClassTag[Match]
8080
implicit val CaseDefTag: ClassTag[CaseDef]
81-
implicit val ThisTag: ClassTag[This]
81+
implicit val ThisTag: ClassTag[ThisRef]
8282
implicit val AlternativeTag: ClassTag[Alternative]
8383
implicit val DefDefTag: ClassTag[DefDef]
8484
implicit val ModuleDefTag: ClassTag[ModuleDef]
@@ -201,7 +201,7 @@ abstract class BackendInterface extends BackendInterfaceDefinitions {
201201
val Throw: ThrowDeconstructor
202202
val New: NewDeconstructor
203203
val ApplyDynamic: ApplyDynamicDeconstructor
204-
val This: ThisDeconstructor
204+
val ThisRef: ThisDeconstructor
205205
val Ident: IdentDeconstructor
206206
val Try: TryDeconstructor
207207
val Labeled: LabeledDeconstructor
@@ -287,7 +287,7 @@ abstract class BackendInterface extends BackendInterfaceDefinitions {
287287
def _3: Symbol // functionalInterface
288288
}
289289

290-
abstract class ThisDeconstructor extends Deconstructor1Common[This, Name]{
290+
abstract class ThisDeconstructor extends Deconstructor1Common[ThisRef, Name]{
291291
def apply(s: Symbol): Tree
292292
}
293293

‎compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
6060
type Block = tpd.Block
6161
type Typed = tpd.Typed
6262
type Match = tpd.Match
63-
type This = tpd.This
63+
type ThisRef = tpd.ThisRef
6464
type CaseDef = tpd.CaseDef
6565
type Alternative = tpd.Alternative
6666
type DefDef = tpd.DefDef
@@ -198,7 +198,7 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
198198
implicit val ArrayValueTag: ClassTag[ArrayValue] = ClassTag[ArrayValue](classOf[ArrayValue])
199199
implicit val MatchTag: ClassTag[Match] = ClassTag[Match](classOf[Match])
200200
implicit val CaseDefTag: ClassTag[CaseDef] = ClassTag[CaseDef](classOf[CaseDef])
201-
implicit val ThisTag: ClassTag[This] = ClassTag[This](classOf[This])
201+
implicit val ThisTag: ClassTag[ThisRef] = ClassTag[ThisRef](classOf[ThisRef])
202202
implicit val AlternativeTag: ClassTag[Alternative] = ClassTag[Alternative](classOf[Alternative])
203203
implicit val DefDefTag: ClassTag[DefDef] = ClassTag[DefDef](classOf[DefDef])
204204
implicit val ModuleDefTag: ClassTag[ModuleDef] = ClassTag[ModuleDef](classOf[ModuleDef])
@@ -1053,9 +1053,9 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
10531053
def get: Type = field.tpt.tpe
10541054
}
10551055

1056-
object This extends ThisDeconstructor {
1056+
object ThisRef extends ThisDeconstructor {
10571057
def get: Name = field.qual.name
1058-
def apply(s: Symbol): This = tpd.This(s.asClass)
1058+
def apply(s: Symbol): ThisRef = tpd.ThisRef(s.asClass)
10591059
}
10601060

10611061
object Labeled extends LabeledDeconstructor {

‎compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,7 @@ class JSCodeGen()(implicit ctx: Context) {
784784
implicit def pos: SourcePosition = tree.sourcePos
785785

786786
tree match {
787-
case _: This =>
787+
case _: ThisRef =>
788788
val sym = tree.symbol
789789
if (sym != currentClassSym.get && sym.is(Module))
790790
genLoadModuleOrGlobalScope(sym)
@@ -882,7 +882,7 @@ class JSCodeGen()(implicit ctx: Context) {
882882
/*case app: ApplyDynamic =>
883883
genApplyDynamic(app)*/
884884

885-
case tree: This =>
885+
case tree: ThisRef =>
886886
val currentClass = currentClassSym.get
887887
val symIsModuleClass = tree.symbol.is(ModuleClass)
888888
assert(tree.symbol == currentClass || symIsModuleClass,
@@ -988,7 +988,7 @@ class JSCodeGen()(implicit ctx: Context) {
988988
def ctorAssignment = (
989989
currentMethodSym.get.name == nme.CONSTRUCTOR &&
990990
currentMethodSym.get.owner == qualifier.symbol &&
991-
qualifier.isInstanceOf[This]
991+
qualifier.isInstanceOf[ThisRef]
992992
)
993993
// TODO This fails for OFFSET$x fields. Re-enable when we can.
994994
/*if (!sym.is(Mutable) && !ctorAssignment)
@@ -1042,7 +1042,7 @@ class JSCodeGen()(implicit ctx: Context) {
10421042
case fun: Ident =>
10431043
fun.tpe match {
10441044
case TermRef(prefix: TermRef, _) => tpd.ref(prefix)
1045-
case TermRef(prefix: ThisType, _) => tpd.This(prefix.cls)
1045+
case TermRef(prefix: ThisType, _) => tpd.ThisRef(prefix.cls)
10461046
}
10471047
case Select(qualifier, _) =>
10481048
qualifier
@@ -2141,7 +2141,7 @@ class JSCodeGen()(implicit ctx: Context) {
21412141
implicit val pos = value.span
21422142
val formalIdent = value match {
21432143
case Ident(name) => freshLocalIdent(name.toString)
2144-
case This(_) => freshLocalIdent("this")
2144+
case ThisRef(_) => freshLocalIdent("this")
21452145
case _ => freshLocalIdent()
21462146
}
21472147
val formalCapture =

‎compiler/src/dotty/tools/backend/sjs/JUnitBootstrappers.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ class JUnitBootstrappers extends MiniPhase {
181181
val sym = ctx.newDefaultConstructor(owner).entered
182182
DefDef(sym, {
183183
Block(
184-
Super(This(owner), nme.EMPTY.toTypeName, inConstrCall = true).select(defn.ObjectClass.primaryConstructor).appliedToNone :: Nil,
184+
Super(ThisRef(owner), nme.EMPTY.toTypeName, inConstrCall = true).select(defn.ObjectClass.primaryConstructor).appliedToNone :: Nil,
185185
unitLiteral
186186
)
187187
})

‎compiler/src/dotty/tools/dotc/ast/Desugar.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ object desugar {
597597
val caseParams = derivedVparamss.head.toArray
598598
for (i <- List.range(0, arity) if nme.selectorName(i) `ne` caseParams(i).name)
599599
yield syntheticProperty(nme.selectorName(i), caseParams(i).tpt,
600-
Select(This(EmptyTypeIdent), caseParams(i).name))
600+
Select(ThisRef(EmptyTypeIdent), caseParams(i).name))
601601
}
602602
def ordinalMeths = if (isEnumCase) ordinalMethLit(nextOrdinal(CaseKind.Class)._1) :: Nil else Nil
603603
def copyMeths = {

‎compiler/src/dotty/tools/dotc/ast/DesugarEnums.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ object DesugarEnums {
7979

8080
private def registerCall(implicit ctx: Context): List[Tree] =
8181
if (enumClass.typeParams.nonEmpty) Nil
82-
else Apply(valuesDot("register"), This(EmptyTypeIdent) :: Nil) :: Nil
82+
else Apply(valuesDot("register"), ThisRef(EmptyTypeIdent) :: Nil) :: Nil
8383

8484
/** The following lists of definitions for an enum type E:
8585
*

‎compiler/src/dotty/tools/dotc/ast/TreeInfo.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ trait TreeInfo[T >: Untyped <: Type] { self: Trees.Instance[T] =>
109109

110110
/** Is tree a path? */
111111
def isPath(tree: Tree): Boolean = unsplice(tree) match {
112-
case Ident(_) | This(_) | Super(_, _) => true
112+
case Ident(_) | ThisRef(_) | Super(_, _) => true
113113
case Select(qual, _) => isPath(qual)
114114
case _ => false
115115
}
@@ -118,7 +118,7 @@ trait TreeInfo[T >: Untyped <: Type] { self: Trees.Instance[T] =>
118118
* same object?
119119
*/
120120
def isSelfConstrCall(tree: Tree): Boolean = methPart(tree) match {
121-
case Ident(nme.CONSTRUCTOR) | Select(This(_), nme.CONSTRUCTOR) => true
121+
case Ident(nme.CONSTRUCTOR) | Select(ThisRef(_), nme.CONSTRUCTOR) => true
122122
case _ => false
123123
}
124124

@@ -136,7 +136,7 @@ trait TreeInfo[T >: Untyped <: Type] { self: Trees.Instance[T] =>
136136

137137
def isSelfOrSuperConstrCall(tree: Tree): Boolean = methPart(tree) match {
138138
case Ident(nme.CONSTRUCTOR)
139-
| Select(This(_), nme.CONSTRUCTOR)
139+
| Select(ThisRef(_), nme.CONSTRUCTOR)
140140
| Select(Super(_, _), nme.CONSTRUCTOR) => true
141141
case _ => false
142142
}
@@ -381,7 +381,7 @@ trait TypedTreeInfo extends TreeInfo[Type] { self: Trees.Instance[Type] =>
381381
*/
382382
def exprPurity(tree: Tree)(implicit ctx: Context): PurityLevel = unsplice(tree) match {
383383
case EmptyTree
384-
| This(_)
384+
| ThisRef(_)
385385
| Super(_, _)
386386
| Literal(_) =>
387387
PurePath
@@ -557,7 +557,7 @@ trait TypedTreeInfo extends TreeInfo[Type] { self: Trees.Instance[Type] =>
557557

558558
/** Is tree a `this` node which belongs to `enclClass`? */
559559
def isSelf(tree: Tree, enclClass: Symbol)(implicit ctx: Context): Boolean = unsplice(tree) match {
560-
case This(_) => tree.symbol == enclClass
560+
case ThisRef(_) => tree.symbol == enclClass
561561
case _ => false
562562
}
563563

@@ -770,7 +770,7 @@ trait TypedTreeInfo extends TreeInfo[Type] { self: Trees.Instance[Type] =>
770770
def qualifier(tree: Tree)(implicit ctx: Context): Tree = tree match {
771771
case Select(qual, _) => qual
772772
case tree: Ident => desugarIdentPrefix(tree)
773-
case _ => This(ctx.owner.enclosingClass.asClass)
773+
case _ => ThisRef(ctx.owner.enclosingClass.asClass)
774774
}
775775

776776
/** Is this a (potentially applied) selection of a member of a structural type

‎compiler/src/dotty/tools/dotc/ast/Trees.scala

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -415,10 +415,10 @@ object Trees {
415415
}
416416

417417
/** qual.this */
418-
case class This[-T >: Untyped] private[ast] (qual: untpd.Ident)(implicit @constructorOnly src: SourceFile)
418+
case class ThisRef[-T >: Untyped] private[ast] (qual: untpd.Ident)(implicit @constructorOnly src: SourceFile)
419419
extends DenotingTree[T] with TermTree[T] {
420-
type ThisTree[-T >: Untyped] = This[T]
421-
// Denotation of a This tree is always the underlying class; needs correction for modules.
420+
type ThisTree[-T >: Untyped] = ThisRef[T]
421+
// Denotation of a ThisRef tree is always the underlying class; needs correction for modules.
422422
override def denot(implicit ctx: Context): Denotation =
423423
typeOpt match {
424424
case tpe @ TermRef(pre, _) if tpe.symbol.is(Module) =>
@@ -949,7 +949,7 @@ object Trees {
949949
type SearchFailureIdent = Trees.SearchFailureIdent[T]
950950
type Select = Trees.Select[T]
951951
type SelectWithSig = Trees.SelectWithSig[T]
952-
type This = Trees.This[T]
952+
type ThisRef = Trees.ThisRef[T]
953953
type Super = Trees.Super[T]
954954
type Apply = Trees.Apply[T]
955955
type TypeApply = Trees.TypeApply[T]
@@ -1046,9 +1046,9 @@ object Trees {
10461046
case Ident(_) => Ident(tree)(name)
10471047
case Select(qual, _) => Select(tree)(qual, name)
10481048
}
1049-
def This(tree: Tree)(qual: untpd.Ident)(implicit ctx: Context): This = tree match {
1050-
case tree: This if (qual eq tree.qual) => tree
1051-
case _ => finalize(tree, untpd.This(qual)(sourceFile(tree)))
1049+
def ThisRef(tree: Tree)(qual: untpd.Ident)(implicit ctx: Context): ThisRef = tree match {
1050+
case tree: ThisRef if (qual eq tree.qual) => tree
1051+
case _ => finalize(tree, untpd.ThisRef(qual)(sourceFile(tree)))
10521052
}
10531053
def Super(tree: Tree)(qual: Tree, mix: untpd.Ident)(implicit ctx: Context): Super = tree match {
10541054
case tree: Super if (qual eq tree.qual) && (mix eq tree.mix) => tree
@@ -1254,7 +1254,7 @@ object Trees {
12541254
tree
12551255
case Select(qualifier, name) =>
12561256
cpy.Select(tree)(transform(qualifier), name)
1257-
case This(qual) =>
1257+
case ThisRef(qual) =>
12581258
tree
12591259
case Super(qual, mix) =>
12601260
cpy.Super(tree)(transform(qual), mix)
@@ -1378,7 +1378,7 @@ object Trees {
13781378
x
13791379
case Select(qualifier, name) =>
13801380
this(x, qualifier)
1381-
case This(qual) =>
1381+
case ThisRef(qual) =>
13821382
x
13831383
case Super(qual, mix) =>
13841384
this(x, qual)

‎compiler/src/dotty/tools/dotc/ast/tpd.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
3232
def Select(qualifier: Tree, tp: NamedType)(implicit ctx: Context): Select =
3333
untpd.Select(qualifier, tp.name).withType(tp)
3434

35-
def This(cls: ClassSymbol)(implicit ctx: Context): This =
36-
untpd.This(untpd.Ident(cls.name)).withType(cls.thisType)
35+
def ThisRef(cls: ClassSymbol)(implicit ctx: Context): ThisRef =
36+
untpd.ThisRef(untpd.Ident(cls.name)).withType(cls.thisType)
3737

3838
def Super(qual: Tree, mix: untpd.Ident, inConstrCall: Boolean, mixinClass: Symbol)(implicit ctx: Context): Super =
3939
ta.assignType(untpd.Super(qual, mix), qual, inConstrCall, mixinClass)
@@ -376,7 +376,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
376376
if (tp.isType) TypeTree(tp)
377377
else if (prefixIsElidable(tp)) Ident(tp)
378378
else if (tp.symbol.is(Module) && ctx.owner.isContainedIn(tp.symbol.moduleClass))
379-
followOuterLinks(This(tp.symbol.moduleClass.asClass))
379+
followOuterLinks(ThisRef(tp.symbol.moduleClass.asClass))
380380
else if (tp.symbol hasAnnotation defn.ScalaStaticAnnot)
381381
Ident(tp)
382382
else {
@@ -389,7 +389,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
389389
ref(NamedType(sym.owner.thisType, sym.name, sym.denot))
390390

391391
private def followOuterLinks(t: Tree)(implicit ctx: Context) = t match {
392-
case t: This if ctx.erasedTypes && !(t.symbol == ctx.owner.enclosingClass || t.symbol.isStaticOwner) =>
392+
case t: ThisRef if ctx.erasedTypes && !(t.symbol == ctx.owner.enclosingClass || t.symbol.isStaticOwner) =>
393393
// after erasure outer paths should be respected
394394
ExplicitOuter.OuterOps(ctx).path(toCls = t.tpe.widen.classSymbol)
395395
case t =>
@@ -398,7 +398,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
398398

399399
def singleton(tp: Type)(implicit ctx: Context): Tree = tp match {
400400
case tp: TermRef => ref(tp)
401-
case tp: ThisType => This(tp.cls)
401+
case tp: ThisType => ThisRef(tp.cls)
402402
case tp: SkolemType => singleton(tp.narrow)
403403
case SuperType(qual, _) => singleton(qual)
404404
case ConstantType(value) => Literal(value)
@@ -1260,7 +1260,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
12601260
case TermRef(prefix: TermRef, _) =>
12611261
ref(prefix)
12621262
case TermRef(prefix: ThisType, _) =>
1263-
This(prefix.cls)
1263+
ThisRef(prefix.cls)
12641264
case _ =>
12651265
EmptyTree
12661266
}

‎compiler/src/dotty/tools/dotc/ast/untpd.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ object untpd extends Trees.Instance[Untyped] with UntypedTreeInfo {
322322
def SearchFailureIdent(name: Name)(implicit src: SourceFile): SearchFailureIdent = new SearchFailureIdent(name)
323323
def Select(qualifier: Tree, name: Name)(implicit src: SourceFile): Select = new Select(qualifier, name)
324324
def SelectWithSig(qualifier: Tree, name: Name, sig: Signature)(implicit src: SourceFile): Select = new SelectWithSig(qualifier, name, sig)
325-
def This(qual: Ident)(implicit src: SourceFile): This = new This(qual)
325+
def ThisRef(qual: Ident)(implicit src: SourceFile): ThisRef = new ThisRef(qual)
326326
def Super(qual: Tree, mix: Ident)(implicit src: SourceFile): Super = new Super(qual, mix)
327327
def Apply(fun: Tree, args: List[Tree])(implicit src: SourceFile): Apply = new Apply(fun, args)
328328
def TypeApply(fun: Tree, args: List[Tree])(implicit src: SourceFile): TypeApply = new TypeApply(fun, args)

‎compiler/src/dotty/tools/dotc/core/Constraint.scala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import printing.Showable
1515
*/
1616
abstract class Constraint extends Showable {
1717

18-
type This <: Constraint
18+
type ThisConstraint <: Constraint
1919

2020
/** Does the constraint's domain contain the type parameters of `tl`? */
2121
def contains(tl: TypeLambda): Boolean
@@ -77,7 +77,7 @@ abstract class Constraint extends Showable {
7777
* satisfiability but will solved to give instances of
7878
* type variables.
7979
*/
80-
def add(poly: TypeLambda, tvars: List[TypeVar])(implicit ctx: Context): This
80+
def add(poly: TypeLambda, tvars: List[TypeVar])(implicit ctx: Context): ThisConstraint
8181

8282
/** A new constraint which is derived from this constraint by updating
8383
* the entry for parameter `param` to `tp`.
@@ -88,26 +88,26 @@ abstract class Constraint extends Showable {
8888
*
8989
* @pre `this contains param`.
9090
*/
91-
def updateEntry(param: TypeParamRef, tp: Type)(implicit ctx: Context): This
91+
def updateEntry(param: TypeParamRef, tp: Type)(implicit ctx: Context): ThisConstraint
9292

9393
/** A constraint that includes the relationship `p1 <: p2`.
9494
* `<:` relationships between parameters ("edges") are propagated, but
9595
* non-parameter bounds are left alone.
9696
*/
97-
def addLess(p1: TypeParamRef, p2: TypeParamRef)(implicit ctx: Context): This
97+
def addLess(p1: TypeParamRef, p2: TypeParamRef)(implicit ctx: Context): ThisConstraint
9898

9999
/** A constraint resulting from adding p2 = p1 to this constraint, and at the same
100100
* time transferring all bounds of p2 to p1
101101
*/
102-
def unify(p1: TypeParamRef, p2: TypeParamRef)(implicit ctx: Context): This
102+
def unify(p1: TypeParamRef, p2: TypeParamRef)(implicit ctx: Context): ThisConstraint
103103

104104
/** A new constraint which is derived from this constraint by removing
105105
* the type parameter `param` from the domain and replacing all top-level occurrences
106106
* of the parameter elsewhere in the constraint by type `tp`, or a conservative
107107
* approximation of it if that is needed to avoid cycles.
108108
* Occurrences nested inside a refinement or prefix are not affected.
109109
*/
110-
def replace(param: TypeParamRef, tp: Type)(implicit ctx: Context): This
110+
def replace(param: TypeParamRef, tp: Type)(implicit ctx: Context): ThisConstraint
111111

112112
/** Is entry associated with `tl` removable? This is the case if
113113
* all type parameters of the entry are associated with type variables
@@ -116,10 +116,10 @@ abstract class Constraint extends Showable {
116116
def isRemovable(tl: TypeLambda): Boolean
117117

118118
/** A new constraint with all entries coming from `tl` removed. */
119-
def remove(tl: TypeLambda)(implicit ctx: Context): This
119+
def remove(tl: TypeLambda)(implicit ctx: Context): ThisConstraint
120120

121121
/** A new constraint with entry `tl` renamed to a fresh type lambda */
122-
def rename(tl: TypeLambda)(implicit ctx: Context): This
122+
def rename(tl: TypeLambda)(implicit ctx: Context): ThisConstraint
123123

124124
/** The given `tl` in case it is not contained in this constraint,
125125
* a fresh copy of `tl` otherwise.

0 commit comments

Comments
 (0)