Skip to content

Commit 521e9f2

Browse files
committed
Rebased
1 parent 4098c43 commit 521e9f2

File tree

6 files changed

+12
-75
lines changed

6 files changed

+12
-75
lines changed

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

-70
This file was deleted.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ trait FlagsOpsImpl extends scala.tasty.reflect.FlagsOps with CoreImpl {
4040
def Contravariant: Flags = core.Flags.Contravariant
4141
def Scala2X: Flags = core.Flags.Scala2x
4242
def DefaultParameterized: Flags = core.Flags.DefaultParameterized
43-
def Stable: Flags = core.Flags.StableRealizable
43+
def StableRealizable: Flags = core.Flags.StableRealizable
4444
def Param: Flags = core.Flags.Param
4545
def ParamAccessor: Flags = core.Flags.ParamAccessor
4646
}

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

+5
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,11 @@ trait SymbolOpsImpl extends scala.tasty.reflect.SymbolOps with CoreImpl {
193193
val sym = symbol.moduleClass
194194
if (sym.exists) Some(sym.asClass) else None
195195
}
196+
197+
def companionClass(implicit ctx: Context): Option[ClassSymbol] = {
198+
val sym = symbol.companionClass
199+
if (sym.exists) Some(sym.asClass) else None
200+
}
196201
}
197202

198203
object IsBindSymbol extends IsBindSymbolModule {

library/src/scala/tasty/reflect/FlagsOps.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ trait FlagsOps extends Core {
9393
/** Is this symbol a method with default parameters */
9494
def DefaultParameterized: Flags
9595

96-
/** Is this symbol member that is assumed to be stable */
97-
def Stable: Flags
96+
/** Is this symbol member that is assumed to be stable and realizable */
97+
def StableRealizable: Flags
9898

9999
/** Is this symbol a parameter */
100100
def Param: Flags

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ trait Printers
126126
if (flags.is(Flags.Contravariant)) flagList += "Flags.Contravariant"
127127
if (flags.is(Flags.Scala2X)) flagList += "Flags.Scala2X"
128128
if (flags.is(Flags.DefaultParameterized)) flagList += "Flags.DefaultParameterized"
129-
if (flags.is(Flags.Stable)) flagList += "Flags.Stable"
129+
if (flags.is(Flags.StableRealizable)) flagList += "Flags.StableRealizable"
130130
if (flags.is(Flags.Param)) flagList += "Flags.Param"
131131
if (flags.is(Flags.ParamAccessor)) flagList += "Flags.ParamAccessor"
132132
flagList.result().mkString(" | ")
@@ -501,7 +501,7 @@ trait Printers
501501
if (flags.is(Flags.Contravariant)) flagList += "contravariant"
502502
if (flags.is(Flags.Scala2X)) flagList += "scala2x"
503503
if (flags.is(Flags.DefaultParameterized)) flagList += "defaultParameterized"
504-
if (flags.is(Flags.Stable)) flagList += "stable"
504+
if (flags.is(Flags.StableRealizable)) flagList += "stableRealizable"
505505
if (flags.is(Flags.Param)) flagList += "param"
506506
if (flags.is(Flags.ParamAccessor)) flagList += "paramAccessor"
507507
flagList.result().mkString("/*", " ", "*/")

library/src/scala/tasty/reflect/SymbolOps.scala

+2
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,8 @@ trait SymbolOps extends Core {
155155

156156
/** The class symbol of the companion module class */
157157
def moduleClass(implicit ctx: Context): Option[ClassSymbol]
158+
159+
def companionClass(implicit ctx: Context): Option[ClassSymbol]
158160
}
159161
implicit def ValSymbolDeco(symbol: ValSymbol): ValSymbolAPI
160162

0 commit comments

Comments
 (0)