diff options
| author | Paul Phillips <paulp@improving.org> | 2012-03-14 12:27:53 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-03-14 12:27:53 -0700 |
| commit | a127aae2a5fbae146ea81e470541209436222970 (patch) | |
| tree | 75b8a7d3362896fd6562eac321b239326296b48a /test/files/pos | |
| parent | 0c9ffe55c774de261d32f36cc29b954638e86574 (diff) | |
| parent | 5b562d4e7e451156236b48b3591db980a5691f8d (diff) | |
| download | scala-a127aae2a5fbae146ea81e470541209436222970.tar.gz scala-a127aae2a5fbae146ea81e470541209436222970.tar.bz2 scala-a127aae2a5fbae146ea81e470541209436222970.zip | |
Merge branch 'merge-inline' of /scratch/trunk3 into develop
Diffstat (limited to 'test/files/pos')
| -rw-r--r-- | test/files/pos/anyval-children.flags | 1 | ||||
| -rw-r--r-- | test/files/pos/anyval-children.scala | 1 | ||||
| -rw-r--r-- | test/files/pos/t1050.scala | 2 | ||||
| -rw-r--r-- | test/files/pos/trait-parents.scala | 16 |
4 files changed, 19 insertions, 1 deletions
diff --git a/test/files/pos/anyval-children.flags b/test/files/pos/anyval-children.flags new file mode 100644 index 0000000000..80fce051e6 --- /dev/null +++ b/test/files/pos/anyval-children.flags @@ -0,0 +1 @@ +-Ystop-after:erasure
\ No newline at end of file diff --git a/test/files/pos/anyval-children.scala b/test/files/pos/anyval-children.scala new file mode 100644 index 0000000000..4ef10a094f --- /dev/null +++ b/test/files/pos/anyval-children.scala @@ -0,0 +1 @@ +@inline class Bippy extends AnyVal
\ No newline at end of file diff --git a/test/files/pos/t1050.scala b/test/files/pos/t1050.scala index e017e30713..d34b0cff16 100644 --- a/test/files/pos/t1050.scala +++ b/test/files/pos/t1050.scala @@ -1,7 +1,7 @@ package t1050 abstract class A { - type T <: scala.ScalaObject + type T <: scala.AnyRef class A { this: T => def b = 3 def c = b diff --git a/test/files/pos/trait-parents.scala b/test/files/pos/trait-parents.scala new file mode 100644 index 0000000000..f6a2688751 --- /dev/null +++ b/test/files/pos/trait-parents.scala @@ -0,0 +1,16 @@ +trait Bip extends Any +trait Foo extends Any +trait Bar extends AnyRef +trait Quux + +object Test { + def f(x: Bip) = 1 + def g1(x: Foo with Bip) = f(x) + + def main(args: Array[String]): Unit = { + f(new Bip with Foo { }) + f(new Foo with Bip { }) + g1(new Bip with Foo { }) + g1(new Foo with Bip { }) + } +} |