diff options
author | Paul Phillips <paulp@improving.org> | 2012-03-14 10:25:59 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-03-14 12:24:34 -0700 |
commit | 55990c9ec619cf212a31db4f818dedb5d3150157 (patch) | |
tree | 8a4247660a833881bdc9fe2e2c6f38ff3fbcb158 /test/files/run/reify_ann1b.check | |
parent | 3ab383ae01a66208df4955bf2117dd2ea8eb2afe (diff) | |
download | scala-55990c9ec619cf212a31db4f818dedb5d3150157.tar.gz scala-55990c9ec619cf212a31db4f818dedb5d3150157.tar.bz2 scala-55990c9ec619cf212a31db4f818dedb5d3150157.zip |
New starr to support new fundamental laws of reality.
And grueling recovery from branch drift.
Merges a portion (and only a portion) of topic/inline into master.
The major changes which come with this merge are:
AnyVal is unsealed, can be extended directly.
ScalaObject is no longer with us.
Diffstat (limited to 'test/files/run/reify_ann1b.check')
-rw-r--r-- | test/files/run/reify_ann1b.check | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/run/reify_ann1b.check b/test/files/run/reify_ann1b.check index e240e1e0ce..ceebc0e2ed 100644 --- a/test/files/run/reify_ann1b.check +++ b/test/files/run/reify_ann1b.check @@ -1,5 +1,5 @@ { - @new ann(bar = "1a") @new ann(bar = "1b") class C[@new ann(bar = "2a") @new ann(bar = "2b") T>: Nothing <: Any] extends Object with ScalaObject { + @new ann(bar = "1a") @new ann(bar = "1b") class C[@new ann(bar = "2a") @new ann(bar = "2b") T>: Nothing <: Any] extends scala.AnyRef { @new ann(bar = "3a") @new ann(bar = "3b") <paramaccessor> private[this] val x: T @ann(bar = "4a") @ann(bar = "4b") = _; def <init>(@new ann(bar = "3a") @new ann(bar = "3b") x: T @ann(bar = "4a") @ann(bar = "4b")) = { super.<init>(); @@ -14,7 +14,7 @@ () } { - @ann(bar = "1a") @ann(bar = "1b") class C[@ann(bar = "2a") @ann(bar = "2b") T>: Nothing <: Any] extends Object with ScalaObject { + @ann(bar = "1a") @ann(bar = "1b") class C[@ann(bar = "2a") @ann(bar = "2b") T>: Nothing <: Any] extends scala.AnyRef { @ann(bar = "3a") @ann(bar = "3b") <paramaccessor> private[this] val x: T @ann(bar = "4b") @ann(bar = "4a") = _; def <init>(@ann(bar = "3a") @ann(bar = "3b") x: T @ann(bar = "4b") @ann(bar = "4a")): C[T] = { C.super.<init>(); |