Skip to content

Commit a9cd2fe

Browse files
committed
Revert changes on FromSymbol
1 parent ed3f690 commit a9cd2fe

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package dotty.tools.dotc.tastyreflect
22

33
import dotty.tools.dotc.ast.tpd
4+
import dotty.tools.dotc.core.Contexts.Context
45
import dotty.tools.dotc.core.Flags._
56
import dotty.tools.dotc.core.StdNames._
67
import dotty.tools.dotc.core.Symbols._
78
import dotty.tools.dotc.core.Types._
89

9-
trait FromSymbol { tasty: TastyImpl =>
10+
object FromSymbol {
1011

1112
def definitionFromSym(sym: Symbol)(implicit ctx: Context): tpd.Tree = {
1213
if (sym.is(Package)) packageDefFromSym(sym)
@@ -20,7 +21,7 @@ trait FromSymbol { tasty: TastyImpl =>
2021

2122
def packageDefFromSym(sym: Symbol)(implicit ctx: Context): PackageDefinition = PackageDefinitionImpl(sym)
2223

23-
def classDef(cls: ClassSymbol)(implicit ctx: Context): ClassDef = {
24+
def classDef(cls: ClassSymbol)(implicit ctx: Context): tpd.TypeDef = {
2425
val constrSym = cls.unforcedDecls.find(_.isPrimaryConstructor).orElse(
2526
// Dummy constructor for classes such as `<refinement>`
2627
ctx.newSymbol(cls, nme.CONSTRUCTOR, EmptyFlags, NoType)

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ package dotty.tools.dotc.tastyreflect
22

33
import dotty.tools.dotc.core.Symbols._
44

5-
trait StandardDefinitions extends scala.tasty.reflect.StandardDefinitions with FromSymbol {
5+
import dotty.tools.dotc.tastyreflect.FromSymbol._
6+
7+
trait StandardDefinitions extends scala.tasty.reflect.StandardDefinitions {
68
tasty: TastyImpl =>
79

810
private implicit def ctx: Context = rootContext

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ import scala.quoted
1515
import scala.reflect.ClassTag
1616
import scala.tasty.util.{Show, ShowExtractors, ShowSourceCode}
1717

18-
class TastyImpl(val rootContext: Contexts.Context) extends scala.tasty.Tasty with FromSymbol with StandardDefinitions { self =>
18+
import dotty.tools.dotc.tastyreflect.FromSymbol._
19+
20+
class TastyImpl(val rootContext: Contexts.Context) extends scala.tasty.Tasty with StandardDefinitions { self =>
1921

2022
// ===== Quotes ===================================================
2123

0 commit comments

Comments
 (0)