diff options
author | Martin Odersky <odersky@gmail.com> | 2014-11-09 13:21:06 +0100 |
---|---|---|
committer | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2014-11-10 13:31:00 +0100 |
commit | 540479ad682fae4278f15e9eb7d4a17f084e21b2 (patch) | |
tree | c7f331ff2764ebfdf5fe5d31f94c529eb504268f /src/dotty/tools/dotc/core/Definitions.scala | |
parent | 18cd0dde7e949d6ae20f451f98843d48f28e2e26 (diff) | |
download | dotty-540479ad682fae4278f15e9eb7d4a17f084e21b2.tar.gz dotty-540479ad682fae4278f15e9eb7d4a17f084e21b2.tar.bz2 dotty-540479ad682fae4278f15e9eb7d4a17f084e21b2.zip |
Clean up code relating to interfaces.
Previous implementation was confused about the meaning of interface (with default methods
or without?).
Now instead of Interface/JavaInterface we have
PureInterface - all members are abstract methods
NoInits - all members are methods
Diffstat (limited to 'src/dotty/tools/dotc/core/Definitions.scala')
-rw-r--r-- | src/dotty/tools/dotc/core/Definitions.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dotty/tools/dotc/core/Definitions.scala b/src/dotty/tools/dotc/core/Definitions.scala index b1c2baff6..d78e09418 100644 --- a/src/dotty/tools/dotc/core/Definitions.scala +++ b/src/dotty/tools/dotc/core/Definitions.scala @@ -191,7 +191,7 @@ class Definitions { lazy val ScalaStaticsClass = ScalaStaticsModule.moduleClass.asClass def staticsMethod(name: PreName) = ctx.requiredMethod(ScalaStaticsClass, name) - + lazy val DottyPredefModule = ctx.requiredModule("dotty.DottyPredef") lazy val NilModule = ctx.requiredModule("scala.collection.immutable.Nil") lazy val PredefConformsClass = ctx.requiredClass("scala.Predef." + tpnme.Conforms) @@ -201,7 +201,7 @@ class Definitions { // needed as a synthetic class because Scala 2.x refers to it in classfiles // but does not define it as an explicit class. newCompleteClassSymbol( - ScalaPackageClass, tpnme.Singleton, Trait | Interface | Final, + ScalaPackageClass, tpnme.Singleton, PureInterfaceCreationFlags | Final, List(AnyClass.typeRef), EmptyScope) lazy val SeqClass: ClassSymbol = ctx.requiredClass("scala.collection.Seq") lazy val Seq_apply = ctx.requiredMethod(SeqClass, nme.apply) @@ -506,7 +506,7 @@ class Definitions { val cls = newClassSymbol( ScalaPackageClass, traitName, - Trait | Interface | Synthetic, + PureInterfaceCreationFlags | Synthetic, completer) myLambdaTraits += cls cls |