Skip to content

Commit 5dca2a0

Browse files
committed
Adapt to scala.reflect.{general => internal} change.
Some packages got reorganized, adapting jribble backend code to that changes. Signed-off-by: Grzegorz Kossakowski <[email protected]>
1 parent ed8dae3 commit 5dca2a0

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/compiler/scala/tools/nsc/backend/jribble/JribbleAnalysis.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ trait JribbleAnalysis {
8585

8686
//copied from GenJVM
8787
def isStaticModule(sym: Symbol): Boolean = {
88-
import scala.reflect.generic.Flags
88+
import scala.reflect.internal.Flags
8989
sym.isModuleClass && !sym.isImplClass && !sym.hasFlag(Flags.LIFTED)
9090
}
9191

src/compiler/scala/tools/nsc/backend/jribble/NormalizeForJribble.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ with JribbleNormalization
220220
// TODO(spoon): reuse the original tree when possible
221221
mkBlock(newBlockStats.toList, unitLiteral)
222222
case tree@ValDef(mods, name, tpt, rhs) if isLocalValDef(tree) && mods.isPrivate =>
223-
import scala.reflect.generic.Flags._
223+
import scala.reflect.internal.Flags._
224224
val newTree = treeCopy.ValDef(tree, mods &~ PRIVATE, name, tpt, rhs)
225225
newTree.symbol.flags = newTree.symbol.flags & ~ PRIVATE
226226
transform(newTree)

src/compiler/scala/tools/nsc/backend/jribble/ProtobufConverter.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ abstract class ProtobufConverter extends AnyRef with JribbleAnalysis {
3535

3636
//copied from GenJVM
3737
def moduleSuffix(sym: Symbol) = {
38-
import scala.reflect.generic.Flags
38+
import scala.reflect.internal.Flags
3939
if (sym.hasFlag(Flags.MODULE) && !sym.isMethod &&
4040
!sym.isImplClass && !sym.hasFlag(Flags.JAVA)) "$"
4141
else "";

0 commit comments

Comments
 (0)