diff options
| author | Martin Odersky <odersky@gmail.com> | 2013-12-06 14:39:02 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2013-12-06 14:39:02 +0100 |
| commit | 554ac428ede1c7a337b507a2e8b29c1671c7d2ee (patch) | |
| tree | 716da768e1553e15e1c2556384a84aa7d2c14bc6 /src/dotty/tools/dotc | |
| parent | e3aa7d4042496a0e44f2086943ad3c29a7b8c8b8 (diff) | |
| download | dotty-554ac428ede1c7a337b507a2e8b29c1671c7d2ee.tar.gz dotty-554ac428ede1c7a337b507a2e8b29c1671c7d2ee.tar.bz2 dotty-554ac428ede1c7a337b507a2e8b29c1671c7d2ee.zip | |
Dropping TRAIT_CONSTRUCTOR name.
Trait constructors are now also called <init>. When expanding traits we might want to use IMPLCLASS_CONSTRUCTOR.
Diffstat (limited to 'src/dotty/tools/dotc')
| -rw-r--r-- | src/dotty/tools/dotc/core/NameOps.scala | 2 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/core/StdNames.scala | 3 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/core/SymDenotations.scala | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/dotty/tools/dotc/core/NameOps.scala b/src/dotty/tools/dotc/core/NameOps.scala index 41384e346..6eee1f203 100644 --- a/src/dotty/tools/dotc/core/NameOps.scala +++ b/src/dotty/tools/dotc/core/NameOps.scala @@ -50,7 +50,7 @@ object NameOps { implicit class NameDecorator[N <: Name](val name: N) extends AnyVal { import nme._ - def isConstructorName = name == CONSTRUCTOR || name == TRAIT_CONSTRUCTOR + def isConstructorName = name == CONSTRUCTOR || name == IMPLCLASS_CONSTRUCTOR def isExceptionResultName = name startsWith EXCEPTION_RESULT_PREFIX def isImplClassName = name endsWith IMPL_CLASS_SUFFIX def isLocalDummyName = name startsWith LOCALDUMMY_PREFIX diff --git a/src/dotty/tools/dotc/core/StdNames.scala b/src/dotty/tools/dotc/core/StdNames.scala index e10758810..50e5b518b 100644 --- a/src/dotty/tools/dotc/core/StdNames.scala +++ b/src/dotty/tools/dotc/core/StdNames.scala @@ -218,7 +218,7 @@ object StdNames { val DEFAULT_CASE: N = "defaultCase$" val EQEQ_LOCAL_VAR: N = "eqEqTemp$" val FAKE_LOCAL_THIS: N = "this$" - val INITIALIZER: N = CONSTRUCTOR // Is this buying us something? + val IMPLCLASS_CONSTRUCTOR: N = "$init$" val LAZY_LOCAL: N = "$lzy" val LAZY_SLOW_SUFFIX: N = "$lzycompute" val LOCAL_SUFFIX: N = " " @@ -233,7 +233,6 @@ object StdNames { val REIFY_FREE_THIS_SUFFIX: N = "$this" val REIFY_FREE_VALUE_SUFFIX: N = "$value" val REIFY_SYMDEF_PREFIX: N = "symdef$" - val TRAIT_CONSTRUCTOR: N = "$init$" val MODULE_INSTANCE_FIELD: N = NameTransformer.MODULE_INSTANCE_NAME // "MODULE$" val OUTER: N = "$outer" val OUTER_LOCAL: N = "$outer " diff --git a/src/dotty/tools/dotc/core/SymDenotations.scala b/src/dotty/tools/dotc/core/SymDenotations.scala index f0ba4ad12..3c6a32707 100644 --- a/src/dotty/tools/dotc/core/SymDenotations.scala +++ b/src/dotty/tools/dotc/core/SymDenotations.scala @@ -343,7 +343,7 @@ object SymDenotations { final def isClassConstructor = name == nme.CONSTRUCTOR /** Is this the constructor of a trait? */ - final def isTraitConstructor = name == nme.TRAIT_CONSTRUCTOR + final def isImplClassConstructor = name == nme.IMPLCLASS_CONSTRUCTOR /** Is this the constructor of a trait or a class */ final def isConstructor = name.isConstructorName @@ -1065,7 +1065,7 @@ object SymDenotations { override def fullName(implicit ctx: Context): Name = super.fullName override def primaryConstructor(implicit ctx: Context): Symbol = { - val cname = if (this is Trait | ImplClass) nme.TRAIT_CONSTRUCTOR else nme.CONSTRUCTOR + val cname = if (this is ImplClass) nme.IMPLCLASS_CONSTRUCTOR else nme.CONSTRUCTOR decls.denotsNamed(cname).first.symbol } } |