diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2013-02-07 09:14:42 +0100 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2013-02-11 19:18:29 +0100 |
| commit | 07bcb6176ac7836e81ec7c849e1140126bb6b327 (patch) | |
| tree | d6c87a73514d89050f36e1d883670e35299949a8 | |
| parent | bebd62d5665b9166c1a44b3bcdc01287220a30b7 (diff) | |
| download | scala-07bcb6176ac7836e81ec7c849e1140126bb6b327.tar.gz scala-07bcb6176ac7836e81ec7c849e1140126bb6b327.tar.bz2 scala-07bcb6176ac7836e81ec7c849e1140126bb6b327.zip | |
SI-7045 reflection now auto-initializes selfType
selfType joins the happy family of flags, annotations and privateWithin,
which automatically trigger initialization, when used within runtime
reflection.
| -rw-r--r-- | src/reflect/scala/reflect/internal/Symbols.scala | 6 | ||||
| -rw-r--r-- | test/files/run/t7045.check | 2 | ||||
| -rw-r--r-- | test/files/run/t7045.scala | 12 |
3 files changed, 19 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala index 004f7d176a..df17e3b751 100644 --- a/src/reflect/scala/reflect/internal/Symbols.scala +++ b/src/reflect/scala/reflect/internal/Symbols.scala @@ -91,10 +91,14 @@ trait Symbols extends api.Symbols { self: SymbolTable => children } + def selfType = { + if (!isCompilerUniverse && needsInitialize(isFlagRelated = false, mask = 0)) initialize + typeOfThis + } + def baseClasses = info.baseClasses def module = sourceModule def thisPrefix: Type = thisType - def selfType: Type = typeOfThis def typeSignature: Type = { fullyInitializeSymbol(this); info } def typeSignatureIn(site: Type): Type = { fullyInitializeSymbol(this); site memberInfo this } diff --git a/test/files/run/t7045.check b/test/files/run/t7045.check new file mode 100644 index 0000000000..28134535c8 --- /dev/null +++ b/test/files/run/t7045.check @@ -0,0 +1,2 @@ +D with C +D with C diff --git a/test/files/run/t7045.scala b/test/files/run/t7045.scala new file mode 100644 index 0000000000..f41baca05e --- /dev/null +++ b/test/files/run/t7045.scala @@ -0,0 +1,12 @@ +import scala.reflect.runtime.universe._ +import scala.reflect.runtime.{currentMirror => cm} + +class C +class D { self: C => } + +object Test extends App { + val d = cm.staticClass("D") + println(d.selfType) + d.typeSignature + println(d.selfType) +}
\ No newline at end of file |