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/t5527.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/t5527.check')
-rw-r--r-- | test/files/run/t5527.check | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/files/run/t5527.check b/test/files/run/t5527.check index 4a8a9ce602..bb13928fd8 100644 --- a/test/files/run/t5527.check +++ b/test/files/run/t5527.check @@ -1,13 +1,13 @@ [[syntax trees at end of parser]]// Scala source: newSource1 package <empty> { - object UselessComments extends scala.ScalaObject { + object UselessComments extends scala.AnyRef { def <init>() = { super.<init>(); () }; var z = 0; def test1 = { - object Maybe extends scala.ScalaObject { + object Maybe extends scala.AnyRef { def <init>() = { super.<init>(); () @@ -42,13 +42,13 @@ package <empty> { } }; /** comments that we should keep */ - object UsefulComments extends scala.ScalaObject { + object UsefulComments extends scala.AnyRef { def <init>() = { super.<init>(); () }; /** class A */ - class A extends scala.ScalaObject { + class A extends scala.AnyRef { def <init>() = { super.<init>(); () @@ -61,7 +61,7 @@ package <empty> { var u = 2 }; /** trait B */ - abstract trait B extends scala.ScalaObject { + abstract trait B extends scala.AnyRef { def $init$() = { () }; @@ -75,7 +75,7 @@ package <empty> { var u = 2 }; /** object C */ - object C extends scala.ScalaObject { + object C extends scala.AnyRef { def <init>() = { super.<init>(); () @@ -88,7 +88,7 @@ package <empty> { var u = 2 }; /** class D */ - @new deprecated("use ... instead", "2.10.0") class D extends scala.ScalaObject { + @new deprecated("use ... instead", "2.10.0") class D extends scala.AnyRef { def <init>() = { super.<init>(); () |