Implment QualifiedModifier unapplies

Author: nicolasstucki

compiler/src/dotty/tools/dotc/tasty/internal/Modifiers.scala

@@ -8,7 +8,7 @@ import scala.tasty.modifiers
 object Modifiers {
 
   def apply(tree: tpd.MemberDef)(implicit ctx: Context): List[modifiers.Modifier] = {
-    // TODO QualifiedModifier
+    QualifiedModifier(tree).toList :::
     tree.symbol.annotations.map(AnnotationModifier(_)) :::
     tree.rawMods.mods.map(Modifier(_))
   }

compiler/src/dotty/tools/dotc/tasty/internal/QualifiedModifier.scala

@@ -1,35 +1,41 @@
-package dotty.tools.dotc.tasty.internal
+package dotty.tools.dotc.tasty
+package internal
 
 import dotty.tools.dotc.ast.tpd
-import dotty.tools.dotc.ast.Trees
 import dotty.tools.dotc.core.Contexts.Context
-import dotty.tools.dotc.core.Decorators.sourcePos
+import dotty.tools.dotc.core.Flags
 
 import scala.tasty.modifiers
 
 object QualifiedModifier {
 
-  // TODO make sure all extractors are tested
-
-  def apply(tree: tpd.DefTree)(implicit ctx: Context): modifiers.Modifier = Impl(tree, ctx)
+  def apply(tree: tpd.DefTree)(implicit ctx: Context): Option[modifiers.Modifier] =
+    if (tree.symbol.privateWithin.exists) Some(Impl(tree, ctx)) else None
 
   def unapplyQualifiedPrivate(mod: modifiers.Modifier): Option[modifiers.QualifiedPrivate.Data] = mod match {
     case Impl(tree, ctx) =>
-      implicit val c = ctx
-      ???
+      implicit val ctx_ = ctx
+      if (tree.symbol.is(Flags.Protected)) None
+      else Some(Type(tree.symbol.privateWithin.typeRef))
     case _ => None
   }
 
   def unapplyQualifiedProtected(mod: modifiers.Modifier): Option[modifiers.QualifiedProtected.Data] = mod match {
     case Impl(tree, ctx) =>
-      ???
+      implicit val ctx_ = ctx
+      if (tree.symbol.is(Flags.Protected)) Some(Type(tree.symbol.privateWithin.typeRef))
+      else None
     case _ => None
   }
 
   private case class Impl(tree: tpd.DefTree, ctx: Context) extends modifiers.Modifier with Positioned {
 
-    override def toString: String = this match {
-      case _ => s"###"
+    override def toString: String = {
+      import Toolbox.extractor
+      this match {
+        case modifiers.QualifiedPrivate(tpe) => s"QualifiedPrivate($tpe)"
+        case modifiers.QualifiedProtected(tpe) => s"QualifiedProtected($tpe)"
+      }
     }
   }
 }

tests/run-with-compiler/tasty-extractors.check

@@ -178,6 +178,12 @@ Block(List(ClassDef(Foo, DefDef(<init>, List(), List(List()), Synthetic(), None,
 Block(List(ClassDef(Foo, DefDef(<init>, List(), List(List()), Synthetic(), None, List()), List(Apply(Select(New(Synthetic()), <init>), Nil)), None, List(DefDef(a, List(), List(), Synthetic(), Some(Literal(Int(0))), List())), List())), Literal(Unit()))
 ###
 
+Block(List(ClassDef(Foo, DefDef(<init>, List(), List(List()), Synthetic(), None, List()), List(Apply(Select(New(Synthetic()), <init>), Nil)), None, List(DefDef(a, List(), List(), Synthetic(), Some(Literal(Int(0))), List(QualifiedPrivate(###)))), List())), Literal(Unit()))
+###
+
+Block(List(ClassDef(Foo, DefDef(<init>, List(), List(List()), Synthetic(), None, List()), List(Apply(Select(New(Synthetic()), <init>), Nil)), None, List(DefDef(a, List(), List(), Synthetic(), Some(Literal(Int(0))), List(QualifiedProtected(###)))), List())), Literal(Unit()))
+###
+
 Block(List(ClassDef(Foo1, DefDef(<init>, List(), List(List(ValDef(a, Ident(Int), None, List()))), Synthetic(), None, List()), List(Apply(Select(New(Synthetic()), <init>), Nil)), None, List(ValDef(a, Synthetic(), None, List())), List())), Literal(Unit()))
 ###
 

tests/run-with-compiler/tasty-extractors.scala

@@ -85,6 +85,8 @@ object Test {
     '{ type Foo >: Null <: Object },
     '{ class Foo { @volatile var a = 0 } },
     '{ class Foo { final def a = 0 } }, // FIXME modifier not printed
+    '{ class Foo { private[Foo] def a = 0 } },
+    '{ class Foo { protected[Foo] def a = 0 } },
 //    '{ case class Foo() },
     '{ class Foo1(a: Int) },
     '{ class Foo2(val b: Int) },