Skip to content

Commit 772e3a4

Browse files
nicolasstuckinicolasstucki
committed
Rename TypeTree.MatchType to TypeTree.MatchTypeTree
1 parent 50ba31d commit 772e3a4

File tree

7 files changed

+40
-40
lines changed

7 files changed

+40
-40
lines changed

‎compiler/src/dotty/tools/dotc/tastyreflect/KernelImpl.scala‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -760,21 +760,21 @@ class KernelImpl(val rootContext: core.Contexts.Context, val rootPosition: util.
760760
def TypeTree_Annotated_copy(original: TypeTree_Annotated)(arg: TypeTree, annotation: Term)(implicit ctx: Context): TypeTree_Annotated =
761761
tpd.cpy.Annotated(original)(arg, annotation)
762762

763-
type TypeTree_MatchType = tpd.MatchTypeTree
763+
type TypeTree_MatchTypeTree = tpd.MatchTypeTree
764764

765-
def matchTypeTree_MatchType(tpt: Tree /*TypeTree | TypeBoundsTree*/)(implicit ctx: Context): Option[TypeTree_MatchType] = tpt match {
765+
def matchTypeTree_MatchTypeTree(tpt: Tree /*TypeTree | TypeBoundsTree*/)(implicit ctx: Context): Option[TypeTree_MatchTypeTree] = tpt match {
766766
case tpt: tpd.MatchTypeTree => Some(tpt)
767767
case _ => None
768768
}
769769

770-
def TypeTree_MatchType_bound(self: TypeTree_MatchType)(implicit ctx: Context): Option[TypeTree] = if (self.bound == tpd.EmptyTree) None else Some(self.bound)
771-
def TypeTree_MatchType_selector(self: TypeTree_MatchType)(implicit ctx: Context): TypeTree = self.selector
772-
def TypeTree_MatchType_cases(self: TypeTree_MatchType)(implicit ctx: Context): List[CaseDef] = self.cases
770+
def TypeTree_MatchTypeTree_bound(self: TypeTree_MatchTypeTree)(implicit ctx: Context): Option[TypeTree] = if (self.bound == tpd.EmptyTree) None else Some(self.bound)
771+
def TypeTree_MatchTypeTree_selector(self: TypeTree_MatchTypeTree)(implicit ctx: Context): TypeTree = self.selector
772+
def TypeTree_MatchTypeTree_cases(self: TypeTree_MatchTypeTree)(implicit ctx: Context): List[CaseDef] = self.cases
773773

774-
def TypeTree_MatchType_apply(bound: Option[TypeTree], selector: TypeTree, cases: List[TypeCaseDef])(implicit ctx: Context): TypeTree_MatchType =
774+
def TypeTree_MatchTypeTree_apply(bound: Option[TypeTree], selector: TypeTree, cases: List[TypeCaseDef])(implicit ctx: Context): TypeTree_MatchTypeTree =
775775
withDefaultPos(ctx => tpd.MatchTypeTree(bound.getOrElse(tpd.EmptyTree), selector, cases)(ctx))
776776

777-
def TypeTree_MatchType_copy(original: TypeTree_MatchType)(bound: Option[TypeTree], selector: TypeTree, cases: List[TypeCaseDef])(implicit ctx: Context): TypeTree_MatchType =
777+
def TypeTree_MatchTypeTree_copy(original: TypeTree_MatchTypeTree)(bound: Option[TypeTree], selector: TypeTree, cases: List[TypeCaseDef])(implicit ctx: Context): TypeTree_MatchTypeTree =
778778
tpd.cpy.MatchTypeTree(original)(bound.getOrElse(tpd.EmptyTree), selector, cases)
779779

780780
type TypeTree_ByName = tpd.ByNameTypeTree

‎docs/docs/reference/other-new-features/tasty-reflect.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,15 @@ TASTy Reflect provides the following types:
116116
| +- SelectOuter
117117
| +- While
118118
|
119-
+- TypeTree ----+- Synthetic
119+
+- TypeTree ----+- Inferred
120120
| +- TypeIdent
121121
| +- TypeSelect
122122
| +- Project
123123
| +- Singleton
124124
| +- Refined
125125
| +- Applied
126126
| +- Annotated
127-
| +- MatchType
127+
| +- MatchTypeTree
128128
| +- ByName
129129
| +- LambdaTypeTree
130130
| +- Bind

‎library/src/scala/tasty/reflect/Core.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ package scala.tasty.reflect
4646
* | +- Refined
4747
* | +- Applied
4848
* | +- Annotated
49-
* | +- MatchType
49+
* | +- MatchTypeTree
5050
* | +- ByName
5151
* | +- LambdaTypeTree
5252
* | +- TypeBind
@@ -271,7 +271,7 @@ trait Core {
271271
type Annotated = kernel.TypeTree_Annotated
272272

273273
/** Type tree representing a type match */
274-
type MatchType = kernel.TypeTree_MatchType
274+
type MatchTypeTree = kernel.TypeTree_MatchTypeTree
275275

276276
/** Type tree representing a by name parameter */
277277
type ByName = kernel.TypeTree_ByName

‎library/src/scala/tasty/reflect/Kernel.scala‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ package scala.tasty.reflect
4545
* | +- TypeTree_Refined
4646
* | +- TypeTree_Applied
4747
* | +- TypeTree_Annotated
48-
* | +- TypeTree_MatchType
48+
* | +- TypeTree_MatchTypeTreeTree
4949
* | +- TypeTree_ByName
5050
* | +- TypeTree_LambdaTypeTree
5151
* | +- TypeTree_TypeBind
@@ -629,16 +629,16 @@ trait Kernel {
629629
def TypeTree_Annotated_copy(original: TypeTree_Annotated)(arg: TypeTree, annotation: Term)(implicit ctx: Context): TypeTree_Annotated
630630

631631
/** Type tree representing a type match */
632-
type TypeTree_MatchType <: TypeTree
632+
type TypeTree_MatchTypeTree <: TypeTree
633633

634-
def matchTypeTree_MatchType(tree: Tree)(implicit ctx: Context): Option[TypeTree_MatchType]
634+
def matchTypeTree_MatchTypeTree(tree: Tree)(implicit ctx: Context): Option[TypeTree_MatchTypeTree]
635635

636-
def TypeTree_MatchType_bound(self: TypeTree_MatchType)(implicit ctx: Context): Option[TypeTree]
637-
def TypeTree_MatchType_selector(self: TypeTree_MatchType)(implicit ctx: Context): TypeTree
638-
def TypeTree_MatchType_cases(self: TypeTree_MatchType)(implicit ctx: Context): List[TypeCaseDef]
636+
def TypeTree_MatchTypeTree_bound(self: TypeTree_MatchTypeTree)(implicit ctx: Context): Option[TypeTree]
637+
def TypeTree_MatchTypeTree_selector(self: TypeTree_MatchTypeTree)(implicit ctx: Context): TypeTree
638+
def TypeTree_MatchTypeTree_cases(self: TypeTree_MatchTypeTree)(implicit ctx: Context): List[TypeCaseDef]
639639

640-
def TypeTree_MatchType_apply(bound: Option[TypeTree], selector: TypeTree, cases: List[TypeCaseDef])(implicit ctx: Context): TypeTree_MatchType
641-
def TypeTree_MatchType_copy(original: TypeTree_MatchType)(bound: Option[TypeTree], selector: TypeTree, cases: List[TypeCaseDef])(implicit ctx: Context): TypeTree_MatchType
640+
def TypeTree_MatchTypeTree_apply(bound: Option[TypeTree], selector: TypeTree, cases: List[TypeCaseDef])(implicit ctx: Context): TypeTree_MatchTypeTree
641+
def TypeTree_MatchTypeTree_copy(original: TypeTree_MatchTypeTree)(bound: Option[TypeTree], selector: TypeTree, cases: List[TypeCaseDef])(implicit ctx: Context): TypeTree_MatchTypeTree
642642

643643
/** Type tree representing a by name parameter */
644644
type TypeTree_ByName <: TypeTree

‎library/src/scala/tasty/reflect/Printers.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,8 @@ trait Printers
237237
this += "TypeBoundsTree(" += lo += ", " += hi += ")"
238238
case WildcardTypeTree() =>
239239
this += s"WildcardTypeTree()"
240-
case TypeTree.MatchType(bound, selector, cases) =>
241-
this += "TypeTree.MatchType(" += bound += ", " += selector += ", " ++= cases += ")"
240+
case TypeTree.MatchTypeTree(bound, selector, cases) =>
241+
this += "TypeTree.MatchTypeTree(" += bound += ", " += selector += ", " ++= cases += ")"
242242
case CaseDef(pat, guard, body) =>
243243
this += "CaseDef(" += pat += ", " += guard += ", " += body += ")"
244244
case TypeCaseDef(pat, body) =>
@@ -1188,7 +1188,7 @@ trait Printers
11881188
inSquare(printSeparated(tparams))
11891189
if (isMember) {
11901190
body match {
1191-
case TypeTree.MatchType(Some(bound), _, _) =>
1191+
case TypeTree.MatchTypeTree(Some(bound), _, _) =>
11921192
this += " <: "
11931193
printTypeTree(bound)
11941194
case _ =>
@@ -1426,7 +1426,7 @@ trait Printers
14261426
printAnnotation(annot)
14271427
}
14281428

1429-
case TypeTree.MatchType(bound, selector, cases) =>
1429+
case TypeTree.MatchTypeTree(bound, selector, cases) =>
14301430
printTypeTree(selector)
14311431
this += highlightKeyword(" match ", color)
14321432
inBlock(printTypeCases(cases, lineBreak()))

‎library/src/scala/tasty/reflect/TreeOps.scala‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -895,19 +895,19 @@ trait TreeOps extends Core {
895895
kernel.matchTypeTree_Annotated(tree).map(x => (x.arg, x.annotation))
896896
}
897897

898-
object IsMatchType {
899-
/** Matches any MatchType and returns it */
900-
def unapply(tree: Tree)(implicit ctx: Context): Option[MatchType] =
901-
kernel.matchTypeTree_MatchType(tree)
898+
object IsMatchTypeTree {
899+
/** Matches any MatchTypeTree and returns it */
900+
def unapply(tree: Tree)(implicit ctx: Context): Option[MatchTypeTree] =
901+
kernel.matchTypeTree_MatchTypeTree(tree)
902902
}
903903

904-
object MatchType {
905-
def apply(bound: Option[TypeTree], selector: TypeTree, cases: List[TypeCaseDef])(implicit ctx: Context): MatchType =
906-
kernel.TypeTree_MatchType_apply(bound, selector, cases)
907-
def copy(original: MatchType)(bound: Option[TypeTree], selector: TypeTree, cases: List[TypeCaseDef])(implicit ctx: Context): MatchType =
908-
kernel.TypeTree_MatchType_copy(original)(bound, selector, cases)
904+
object MatchTypeTree {
905+
def apply(bound: Option[TypeTree], selector: TypeTree, cases: List[TypeCaseDef])(implicit ctx: Context): MatchTypeTree =
906+
kernel.TypeTree_MatchTypeTree_apply(bound, selector, cases)
907+
def copy(original: MatchTypeTree)(bound: Option[TypeTree], selector: TypeTree, cases: List[TypeCaseDef])(implicit ctx: Context): MatchTypeTree =
908+
kernel.TypeTree_MatchTypeTree_copy(original)(bound, selector, cases)
909909
def unapply(tree: Tree)(implicit ctx: Context): Option[(Option[TypeTree], TypeTree, List[TypeCaseDef])] =
910-
kernel.matchTypeTree_MatchType(tree).map(x => (x.bound, x.selector, x.cases))
910+
kernel.matchTypeTree_MatchTypeTree(tree).map(x => (x.bound, x.selector, x.cases))
911911
}
912912

913913
object IsByName {
@@ -1003,10 +1003,10 @@ trait TreeOps extends Core {
10031003
def annotation(implicit ctx: Context): Term = kernel.TypeTree_Annotated_annotation(self)
10041004
}
10051005

1006-
implicit class TypeTree_MatchTypeAPI(self: TypeTree.MatchType) {
1007-
def bound(implicit ctx: Context): Option[TypeTree] = kernel.TypeTree_MatchType_bound(self)
1008-
def selector(implicit ctx: Context): TypeTree = kernel.TypeTree_MatchType_selector(self)
1009-
def cases(implicit ctx: Context): List[TypeCaseDef] = kernel.TypeTree_MatchType_cases(self)
1006+
implicit class TypeTree_MatchTypeTreeAPI(self: TypeTree.MatchTypeTree) {
1007+
def bound(implicit ctx: Context): Option[TypeTree] = kernel.TypeTree_MatchTypeTree_bound(self)
1008+
def selector(implicit ctx: Context): TypeTree = kernel.TypeTree_MatchTypeTree_selector(self)
1009+
def cases(implicit ctx: Context): List[TypeCaseDef] = kernel.TypeTree_MatchTypeTree_cases(self)
10101010
}
10111011

10121012
implicit class TypeTree_ByNameAPI(self: TypeTree.ByName) {

‎library/src/scala/tasty/reflect/TreeUtils.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ trait TreeUtils
8787
case TypeTree.LambdaTypeTree(typedefs, arg) => foldTree(foldTrees(x, typedefs), arg)
8888
case TypeTree.TypeBind(_, tbt) => foldTree(x, tbt)
8989
case TypeTree.TypeBlock(typedefs, tpt) => foldTree(foldTrees(x, typedefs), tpt)
90-
case TypeTree.MatchType(boundopt, selector, cases) =>
90+
case TypeTree.MatchTypeTree(boundopt, selector, cases) =>
9191
foldTrees(foldTree(boundopt.fold(x)(foldTree(x, _)), selector), cases)
9292
case WildcardTypeTree() => x
9393
case TypeBoundsTree(lo, hi) => foldTree(foldTree(x, lo), hi)
@@ -222,8 +222,8 @@ trait TreeUtils
222222
TypeTree.Refined.copy(tree)(transformTypeTree(tree.tpt), transformTrees(tree.refinements).asInstanceOf[List[Definition]])
223223
case TypeTree.IsApplied(tree) =>
224224
TypeTree.Applied.copy(tree)(transformTypeTree(tree.tpt), transformTrees(tree.args))
225-
case TypeTree.IsMatchType(tree) =>
226-
TypeTree.MatchType.copy(tree)(tree.bound.map(b => transformTypeTree(b)), transformTypeTree(tree.selector), transformTypeCaseDefs(tree.cases))
225+
case TypeTree.IsMatchTypeTree(tree) =>
226+
TypeTree.MatchTypeTree.copy(tree)(tree.bound.map(b => transformTypeTree(b)), transformTypeTree(tree.selector), transformTypeCaseDefs(tree.cases))
227227
case TypeTree.IsByName(tree) =>
228228
TypeTree.ByName.copy(tree)(transformTypeTree(tree.result))
229229
case TypeTree.IsLambdaTypeTree(tree) =>

0 commit comments

Comments
 (0)