diff options
| author | Martin Odersky <odersky@gmail.com> | 2015-05-01 18:42:11 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2015-05-01 18:42:11 +0200 |
| commit | 55c7232696040a68816f8958ddae3411faab33cb (patch) | |
| tree | e8f42c2908c0a319828ac2ca78daf2fb189b41ff /src/dotty/tools/dotc | |
| parent | d9c215757f49d7984889e8e695828f71f685f163 (diff) | |
| download | dotty-55c7232696040a68816f8958ddae3411faab33cb.tar.gz dotty-55c7232696040a68816f8958ddae3411faab33cb.tar.bz2 dotty-55c7232696040a68816f8958ddae3411faab33cb.zip | |
Get rid of NotPrivate flag.
It is now redundant.
Diffstat (limited to 'src/dotty/tools/dotc')
| -rw-r--r-- | src/dotty/tools/dotc/core/Flags.scala | 3 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/transform/Constructors.scala | 2 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/transform/LambdaLift.scala | 3 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/transform/PrivateToStatic.scala | 2 |
4 files changed, 3 insertions, 7 deletions
diff --git a/src/dotty/tools/dotc/core/Flags.scala b/src/dotty/tools/dotc/core/Flags.scala index f62c3cae8..b6f3c99e7 100644 --- a/src/dotty/tools/dotc/core/Flags.scala +++ b/src/dotty/tools/dotc/core/Flags.scala @@ -367,9 +367,6 @@ object Flags { /** Symbol is defined in a super call */ final val InSuperCall = commonFlag(46, "<in supercall>") - /** Symbol with private access is accessed outside its private scope */ - final val NotJavaPrivate = commonFlag(47, "<not-java-private>") - /** Denotation is in train of being loaded and completed, used to catch cyclic dependencies */ final val Touched = commonFlag(48, "<touched>") diff --git a/src/dotty/tools/dotc/transform/Constructors.scala b/src/dotty/tools/dotc/transform/Constructors.scala index ddd64d500..6fb67cd22 100644 --- a/src/dotty/tools/dotc/transform/Constructors.scala +++ b/src/dotty/tools/dotc/transform/Constructors.scala @@ -56,7 +56,7 @@ class Constructors extends MiniPhaseTransform with SymTransformer { thisTransfor private def mightBeDropped(sym: Symbol)(implicit ctx: Context) = sym.is(Private, butNot = KeeperFlags) && !sym.is(MutableParamAccessor) - private final val KeeperFlags = Method | Lazy | NotJavaPrivate + private final val KeeperFlags = Method | Lazy private final val MutableParamAccessor = allOf(Mutable, ParamAccessor) override def transformTemplate(tree: Template)(implicit ctx: Context, info: TransformerInfo): Tree = { diff --git a/src/dotty/tools/dotc/transform/LambdaLift.scala b/src/dotty/tools/dotc/transform/LambdaLift.scala index 1a23d887c..7be0a12ab 100644 --- a/src/dotty/tools/dotc/transform/LambdaLift.scala +++ b/src/dotty/tools/dotc/transform/LambdaLift.scala @@ -290,11 +290,10 @@ class LambdaLift extends MiniPhase with IdentityDenotTransformer { thisTransform val (newOwner, maybeStatic) = if (lOwner is Package) (local.topLevelClass, JavaStatic) else (lOwner, EmptyFlags) - val maybeNotJavaPrivate = if (calledFromInner(local)) NotJavaPrivate else EmptyFlags local.copySymDenotation( owner = newOwner, name = newName(local), - initFlags = local.flags &~ InSuperCall | Private | maybeStatic | maybeNotJavaPrivate, + initFlags = local.flags &~ InSuperCall | Private | maybeStatic, info = liftedInfo(local)).installAfter(thisTransform) if (local.isClass) for (member <- local.asClass.info.decls) diff --git a/src/dotty/tools/dotc/transform/PrivateToStatic.scala b/src/dotty/tools/dotc/transform/PrivateToStatic.scala index e38aa27f0..218839d01 100644 --- a/src/dotty/tools/dotc/transform/PrivateToStatic.scala +++ b/src/dotty/tools/dotc/transform/PrivateToStatic.scala @@ -33,7 +33,7 @@ class PrivateToStatic extends MiniPhase with SymTransformer { thisTransform => def shouldBeStatic(sd: SymDenotation)(implicit ctx: Context) = sd.current(ctx.withPhase(thisTransform)).asSymDenotation .is(PrivateMethod, butNot = Immovable) && - (sd.owner.is(Trait) || sd.is(NotJavaPrivate)) + sd.owner.is(Trait) override def transformSym(sd: SymDenotation)(implicit ctx: Context): SymDenotation = if (shouldBeStatic(sd)) { |