wip

Author: nicolasstucki

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

@@ -78,13 +78,16 @@ class KernelImpl(val rootContext: core.Contexts.Context, val rootPosition: util.
 
   type Definition = tpd.Tree
 
-  def isDefinition (tree: Tree)(implicit ctx: Context): Option[Definition] = tree match {
+  def isDefinition(tree: Tree)(implicit ctx: Context): Option[Definition] = tree match {
     case tree: tpd.MemberDef => Some(tree)
     case tree: PackageDefinition => Some(tree)
     case _ => None
   }
 
-  def Definition_name(self: Definition)(implicit ctx: Context): String = self.symbol.name.toString
+  def Definition_name(self: Definition)(implicit ctx: Context): String = self match {
+    case self: tpd.MemberDef => self.name.toString
+    case self: PackageDefinition => self.symbol.name.toString // TODO make PackageDefinition a MemberDef or NameTree
+  }
 
   type PackageDef = PackageDefinition
 

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

@@ -60,12 +60,6 @@ trait TreeOpsImpl extends scala.tasty.reflect.TreeOps with RootPositionImpl with
 
     def copy(original: ValDef)(name: String, tpt: TypeTree, rhs: Option[Term])(implicit ctx: Context): ValDef =
       tpd.cpy.ValDef(original)(name.toTermName, tpt, rhs.getOrElse(tpd.EmptyTree))
-
-    def unapply(tree: Tree)(implicit ctx: Context): Option[(String, TypeTree, Option[Term])] = tree match {
-      case x: tpd.ValDef =>
-        Some((x.name.toString, x.tpt, optional(x.rhs)))
-      case _ => None
-    }
   }
 
 

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

@@ -124,7 +124,8 @@ trait TreeOps extends Core {
   abstract class ValDefModule {
     def apply(sym: ValSymbol, rhs: Option[Term])(implicit ctx: Context): ValDef
     def copy(original: ValDef)(name: String, tpt: TypeTree, rhs: Option[Term])(implicit ctx: Context): ValDef
-    def unapply(tree: Tree)(implicit ctx: Context): Option[(String, TypeTree, Option[Term])]
+    def unapply(tree: Tree)(implicit ctx: Context): Option[(String, TypeTree, Option[Term])] =
+      kernel.isValDef(tree).map(x => (x.name, x.tpt, x.rhs))
   }
 
   implicit class ValDefAPI(self: ValDef) {