diff options
| author | odersky <odersky@gmail.com> | 2015-06-22 12:59:08 +0200 |
|---|---|---|
| committer | odersky <odersky@gmail.com> | 2015-06-22 12:59:08 +0200 |
| commit | 7c88469bdaf212cfdccce565d6ffe638dd5c1dff (patch) | |
| tree | 5de5fc9416ed601f8bf6e1cd803c7e4ab1ab60ee /tests | |
| parent | f03f5b0bea0296564c3f41e4375ead48819254d0 (diff) | |
| parent | 8d8942a843b86e50eebea4016d65f40e94e93e9c (diff) | |
| download | dotty-7c88469bdaf212cfdccce565d6ffe638dd5c1dff.tar.gz dotty-7c88469bdaf212cfdccce565d6ffe638dd5c1dff.tar.bz2 dotty-7c88469bdaf212cfdccce565d6ffe638dd5c1dff.zip | |
Merge pull request #675 from dotty-staging/fix/#652-erase-constructors
Fix/#652 erase constructors
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/run/NestedClasses.check (renamed from tests/pending/run/NestedClasses.check) | 0 | ||||
| -rw-r--r-- | tests/run/NestedClasses.scala (renamed from tests/pending/run/NestedClasses.scala) | 0 | ||||
| -rw-r--r-- | tests/run/constructors.check (renamed from tests/pending/run/constructors.check) | 0 | ||||
| -rw-r--r-- | tests/run/constructors.scala (renamed from tests/pending/run/constructors.scala) | 3 | ||||
| -rw-r--r-- | tests/run/shortClass.check (renamed from tests/pending/run/shortClass.check) | 4 | ||||
| -rw-r--r-- | tests/run/shortClass.scala (renamed from tests/pending/run/shortClass.scala) | 6 | ||||
| -rw-r--r-- | tests/run/t8611b.flags (renamed from tests/pending/run/t8611b.flags) | 0 | ||||
| -rw-r--r-- | tests/run/t8611b.scala (renamed from tests/pending/run/t8611b.scala) | 0 |
8 files changed, 8 insertions, 5 deletions
diff --git a/tests/pending/run/NestedClasses.check b/tests/run/NestedClasses.check index a7ebc386e..a7ebc386e 100644 --- a/tests/pending/run/NestedClasses.check +++ b/tests/run/NestedClasses.check diff --git a/tests/pending/run/NestedClasses.scala b/tests/run/NestedClasses.scala index 6db713e08..6db713e08 100644 --- a/tests/pending/run/NestedClasses.scala +++ b/tests/run/NestedClasses.scala diff --git a/tests/pending/run/constructors.check b/tests/run/constructors.check index 0743b7e29..0743b7e29 100644 --- a/tests/pending/run/constructors.check +++ b/tests/run/constructors.check diff --git a/tests/pending/run/constructors.scala b/tests/run/constructors.scala index 90926431f..19afc3d67 100644 --- a/tests/pending/run/constructors.scala +++ b/tests/run/constructors.scala @@ -4,8 +4,9 @@ class A(x: Int, y: Int) { def this(x: Int) = this(x, x); def this() = this(1); override def toString() = "x=" + x + " y=" + y; - class B(a: Int, b: Int, c: String) { + class B(val a: Int, b: Int, c: String) { def this(str: String) = this(x, y, str); + val xx = a override def toString() = "x=" + x + " y=" + y + " a=" + a + " b=" + b + " c=" + c; } diff --git a/tests/pending/run/shortClass.check b/tests/run/shortClass.check index fbdb725cc..0c62fb26f 100644 --- a/tests/pending/run/shortClass.check +++ b/tests/run/shortClass.check @@ -1,8 +1,8 @@ bippity.bop.Foo bippity.bop.Foo$Bar bippity.bop.Foo$Bar$ -Test$$anon$1 -Test$$anon$2 +Test$$anon$ +Test$$anon$ Foo Bar Bar$ diff --git a/tests/pending/run/shortClass.scala b/tests/run/shortClass.scala index b7bb01689..c5c2043f4 100644 --- a/tests/pending/run/shortClass.scala +++ b/tests/run/shortClass.scala @@ -15,10 +15,12 @@ object Test { import bippity._ import bop._ + def printSanitized(x: String) = println(x.filterNot(_.isDigit)) + def main(args: Array[String]): Unit = { val f = new Foo val instances = List(f, new f.Bar, f.Bar, new Foo with DingDongBippy, new f.Bar with DingDongBippy) - instances map (_.getClass.getName) foreach println - instances map shortClassOfInstance foreach println + instances map (_.getClass.getName) foreach printSanitized + instances map shortClassOfInstance foreach printSanitized } } diff --git a/tests/pending/run/t8611b.flags b/tests/run/t8611b.flags index 85d8eb2ba..85d8eb2ba 100644 --- a/tests/pending/run/t8611b.flags +++ b/tests/run/t8611b.flags diff --git a/tests/pending/run/t8611b.scala b/tests/run/t8611b.scala index 75114c2ae..75114c2ae 100644 --- a/tests/pending/run/t8611b.scala +++ b/tests/run/t8611b.scala |