wip

Author: nicolasstucki

compiler/src/dotty/tools/dotc/tastyreflect/TreeOpsImpl.scala

@@ -49,11 +49,6 @@ trait TreeOpsImpl extends scala.tasty.reflect.TreeOps with RootPositionImpl with
     def copy(original: DefDef)(name: String, typeParams: List[TypeDef], paramss: List[List[ValDef]], tpt: TypeTree, rhs: Option[Term])(implicit ctx: Context): DefDef =
       tpd.cpy.DefDef(original)(name.toTermName, typeParams, paramss, tpt, rhs.getOrElse(tpd.EmptyTree))
 
-    def unapply(tree: Tree)(implicit ctx: Context): Option[(String, List[TypeDef],  List[List[ValDef]], TypeTree, Option[Term])] = tree match {
-      case x: tpd.DefDef =>
-        Some((x.name.toString, x.tparams, x.vparamss, x.tpt, optional(x.rhs)))
-      case _ => None
-    }
   }
 
 
@@ -80,10 +75,6 @@ trait TreeOpsImpl extends scala.tasty.reflect.TreeOps with RootPositionImpl with
     def apply(symbol: TypeSymbol)(implicit ctx: Context): TypeDef = withDefaultPos(ctx => tpd.TypeDef(symbol)(ctx))
     def copy(original: TypeDef)(name: String, rhs: TypeOrBoundsTree)(implicit ctx: Context): TypeDef =
       tpd.cpy.TypeDef(original)(name.toTypeName, rhs)
-    def unapply(tree: Tree)(implicit ctx: Context): Option[(String, TypeOrBoundsTree /* TypeTree | TypeBoundsTree */)] = tree match {
-      case x: tpd.TypeDef if !x.symbol.isClass => Some((x.name.toString, x.rhs))
-      case _ => None
-    }
   }
 
   // ----- Terms ----------------------------------------------------

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

@@ -102,13 +102,14 @@ trait TreeOps extends Core {
   abstract class DefDefModule {
     def apply(symbol: DefSymbol, rhsFn: List[Type] => List[List[Term]] => Option[Term])(implicit ctx: Context): DefDef
     def copy(original: DefDef)(name: String, typeParams: List[TypeDef], paramss: List[List[ValDef]], tpt: TypeTree, rhs: Option[Term])(implicit ctx: Context): DefDef
-    def unapply(tree: Tree)(implicit ctx: Context): Option[(String, List[TypeDef],  List[List[ValDef]], TypeTree, Option[Term])]
+    def unapply(tree: Tree)(implicit ctx: Context): Option[(String, List[TypeDef], List[List[ValDef]], TypeTree, Option[Term])] =
+      kernel.isDefDef(tree).map(x => (x.name, x.typeParams, x.paramss, x.returnTpt, x.rhs))
   }
 
   implicit class DefDefAPI(self: DefDef) {
     def typeParams(implicit ctx: Context): List[TypeDef] = kernel.DefDef_typeParams(self)
     def paramss(implicit ctx: Context): List[List[ValDef]] = kernel.DefDef_paramss(self)
-    def returnTpt(implicit ctx: Context): TypeTree = kernel.DefDef_returnTpt(self)
+    def returnTpt(implicit ctx: Context): TypeTree = kernel.DefDef_returnTpt(self) // TODO rename to tpt
     def rhs(implicit ctx: Context): Option[Term] = kernel.DefDef_rhs(self)
     def symbol(implicit ctx: Context): DefSymbol = kernel.DefDef_symbol(self)
   }
@@ -142,7 +143,8 @@ trait TreeOps extends Core {
   abstract class TypeDefModule {
     def apply(symbol: TypeSymbol)(implicit ctx: Context): TypeDef
     def copy(original: TypeDef)(name: String, rhs: TypeOrBoundsTree)(implicit ctx: Context): TypeDef
-    def unapply(tree: Tree)(implicit ctx: Context): Option[(String, TypeOrBoundsTree /* TypeTree | TypeBoundsTree */)]
+    def unapply(tree: Tree)(implicit ctx: Context): Option[(String, TypeOrBoundsTree /* TypeTree | TypeBoundsTree */)] =
+      kernel.isTypeDef(tree).map(x => (x.name, x.rhs))
   }
 
   implicit class TypeDefAPI(self: TypeDef) {
@@ -153,7 +155,8 @@ trait TreeOps extends Core {
   // PackageDef
 
   object IsPackageDef {
-    def unapply(tree: Tree)(implicit ctx: Context): Option[PackageDef] = kernel.isPackageDef(tree)
+    def unapply(tree: Tree)(implicit ctx: Context): Option[PackageDef] =
+      kernel.isPackageDef(tree)
   }
 
   implicit class PackageDefAPI(self: PackageDef) {
@@ -180,6 +183,7 @@ trait TreeOps extends Core {
     /** Matches any term */
     def unapply(tree: Tree)(implicit ctx: Context): Option[Term] =
       kernel.isTerm(tree)
+
     /** Matches any term */
     def unapply(parent: TermOrTypeTree)(implicit ctx: Context, dummy: DummyImplicit): Option[Term] =
       kernel.isTermNotTypeTree(parent)