diff options
author | Paul Phillips <paulp@improving.org> | 2012-10-07 15:20:51 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-10-07 15:20:51 -0700 |
commit | a5a1f01b7d458b94e37407681abb3334a543fb03 (patch) | |
tree | 93ddf4e9ed05e4108f1b9d82a0960c516b1c3e77 /test/pending | |
parent | 7be1652cbf1300fe5fea44681a480c33467c2296 (diff) | |
parent | 65a321c63e5ddb77fa87de098c4f7d6f9ce8baa6 (diff) | |
download | scala-a5a1f01b7d458b94e37407681abb3334a543fb03.tar.gz scala-a5a1f01b7d458b94e37407681abb3334a543fb03.tar.bz2 scala-a5a1f01b7d458b94e37407681abb3334a543fb03.zip |
Merge remote-tracking branch 'origin/2.10.0-wip' into merge-2.10
* origin/2.10.0-wip:
MethodSymbol.params => MethodSymbol.paramss
SI-6471 Update jquery from 1.4.2 to 1.8.2
undeprecates manifests for 2.10.0
SI-6451: Rename classes in `unchecked-abstract.scala` test.
Put more implementation restrictions on value classes.
Fixed problem in SI-6408
Revised restrictions for value classes and unversal traits
SI-6436 Handle ambiguous string processors
fixes a bug in a weak cache in runtime reflection
Conflicts:
test/files/neg/classmanifests_new_deprecations.check
test/files/neg/unchecked-abstract.check
Diffstat (limited to 'test/pending')
-rw-r--r-- | test/pending/run/t5882.scala | 14 | ||||
-rw-r--r-- | test/pending/run/t6408.scala | 11 |
2 files changed, 25 insertions, 0 deletions
diff --git a/test/pending/run/t5882.scala b/test/pending/run/t5882.scala new file mode 100644 index 0000000000..47996d3068 --- /dev/null +++ b/test/pending/run/t5882.scala @@ -0,0 +1,14 @@ +// SIP-15 was revised to allow nested classes in value classes. +// This test checks that their basic functionality. + +class NodeOps(val n: Any) extends AnyVal { self => + class Foo() { def show = self.show(n) } + def show(x: Any) = x.toString +} + + +object Test extends App { + + val n = new NodeOps("abc") + assert(new n.Foo().show == "abc") +} diff --git a/test/pending/run/t6408.scala b/test/pending/run/t6408.scala new file mode 100644 index 0000000000..ff17480b35 --- /dev/null +++ b/test/pending/run/t6408.scala @@ -0,0 +1,11 @@ +class X(val i: Int) extends AnyVal { + class Inner(val q: Int) { + def plus = i + q + } +} + +object Test extends App { + val x = new X(11) + val i = new x.Inner(22) + assert(i.plus == 33) +} |