diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2013-01-28 09:10:37 +0100 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2013-02-02 13:19:06 +0100 |
commit | fd6125428af90b02cb8969a53586f3551e275b0f (patch) | |
tree | 17acfa819519ec2d92eeac8b2e0dece89aad7b25 /test/files/run/t6259.scala | |
parent | ee24807f8706bb91b9d854eaba39f0ddd9c2a054 (diff) | |
download | scala-fd6125428af90b02cb8969a53586f3551e275b0f.tar.gz scala-fd6125428af90b02cb8969a53586f3551e275b0f.tar.bz2 scala-fd6125428af90b02cb8969a53586f3551e275b0f.zip |
SI-6666 Account for nesting in setting INCONSTRUCTOR
This flag is calcualed in Namers, and assigned to class
and module class symbols that are defined in self/super-calls,
and in early definitions.
For example, class D is INCONSTRUCTOR in each case below:
class C extends Super({class D; ()})
class C(a: Any) {
def this(a: Any) = this({class D; ()})
}
new { val x = { class D; () } with Super(())
But, the calculation of this flag failed to account for
nesting, so it was not set in cases like:
class C(a: Any) {
def this(a: Any) = this({val x = {class D; ()}; x})
}
This patch searches the enclosing context chain, rather than
just the immediate context. The search is terminated at the
first non term-owned context. In the following example, this
avoids marking `E` as INCONSTRUCTOR; only `D` should be.
class C extends Super({class D { class E }; ()})
This closes SI-6259 and SI-6506, and fixes one problem
in the recently reopened SI-6957.
Diffstat (limited to 'test/files/run/t6259.scala')
-rw-r--r-- | test/files/run/t6259.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/run/t6259.scala b/test/files/run/t6259.scala index a5a7bf9043..294c95e96b 100644 --- a/test/files/run/t6259.scala +++ b/test/files/run/t6259.scala @@ -48,7 +48,7 @@ object Test extends App { val e = new E {}; e.F val g = new G; g.H - //locally(HasX.x) TODO sort out VerifyError in HasX$InVal$2$.<init> by accounting for nesting in Namer#inConstructorFlag + locally(HasX.x) // locally(Early.x) TODO sort out VerifyError in Early$.<init> // DoubleOk TODO sort out VerifyError in DoubleOk$.<init> } |