diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-11-02 22:22:09 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-11-02 22:22:09 +1000 |
| commit | f1fdfcc6ce03c7a14144fbd354134d55c225c409 (patch) | |
| tree | 4c85a9ac0b2a6ec02761b7dda4e442b6fabb45ad /test/files | |
| parent | bdae51d6a8f18a5456a32c350cb551d42a3cb6c6 (diff) | |
| parent | 44807a78522fdbc770ec9dbb56b6c8f7614f13b1 (diff) | |
| download | scala-f1fdfcc6ce03c7a14144fbd354134d55c225c409.tar.gz scala-f1fdfcc6ce03c7a14144fbd354134d55c225c409.tar.bz2 scala-f1fdfcc6ce03c7a14144fbd354134d55c225c409.zip | |
Merge pull request #4040 from retronym/ticket/8871
FSC / REPL Bug Bonanza
Diffstat (limited to 'test/files')
| -rw-r--r-- | test/files/res/t6613.check | 5 | ||||
| -rw-r--r-- | test/files/res/t6613.res | 3 | ||||
| -rw-r--r-- | test/files/res/t6613/Broken.scala | 1 | ||||
| -rw-r--r-- | test/files/res/t6613/Enummy.java | 1 | ||||
| -rw-r--r-- | test/files/res/t8871.check | 5 | ||||
| -rw-r--r-- | test/files/res/t8871.res | 4 | ||||
| -rw-r--r-- | test/files/res/t8871/tag.scala | 3 | ||||
| -rw-r--r-- | test/files/res/t8871/usetag.scala | 6 |
8 files changed, 28 insertions, 0 deletions
diff --git a/test/files/res/t6613.check b/test/files/res/t6613.check new file mode 100644 index 0000000000..bbd9331b16 --- /dev/null +++ b/test/files/res/t6613.check @@ -0,0 +1,5 @@ + +nsc> +nsc> +nsc> +nsc> diff --git a/test/files/res/t6613.res b/test/files/res/t6613.res new file mode 100644 index 0000000000..e3fa000fdd --- /dev/null +++ b/test/files/res/t6613.res @@ -0,0 +1,3 @@ +t6613/Enummy.java +t6613/Broken.scala +t6613/Broken.scala diff --git a/test/files/res/t6613/Broken.scala b/test/files/res/t6613/Broken.scala new file mode 100644 index 0000000000..9bcd12dbe1 --- /dev/null +++ b/test/files/res/t6613/Broken.scala @@ -0,0 +1 @@ +class Broken() { def broken() = Enummy.Broke.CHIP } diff --git a/test/files/res/t6613/Enummy.java b/test/files/res/t6613/Enummy.java new file mode 100644 index 0000000000..1863ef1297 --- /dev/null +++ b/test/files/res/t6613/Enummy.java @@ -0,0 +1 @@ +public class Enummy { public enum Broke { SHARD, CHIP } } diff --git a/test/files/res/t8871.check b/test/files/res/t8871.check new file mode 100644 index 0000000000..bbd9331b16 --- /dev/null +++ b/test/files/res/t8871.check @@ -0,0 +1,5 @@ + +nsc> +nsc> +nsc> +nsc> diff --git a/test/files/res/t8871.res b/test/files/res/t8871.res new file mode 100644 index 0000000000..9b1a5fb57f --- /dev/null +++ b/test/files/res/t8871.res @@ -0,0 +1,4 @@ +t8871/tag.scala +t8871/usetag.scala +t8871/usetag.scala + diff --git a/test/files/res/t8871/tag.scala b/test/files/res/t8871/tag.scala new file mode 100644 index 0000000000..1a1803b77d --- /dev/null +++ b/test/files/res/t8871/tag.scala @@ -0,0 +1,3 @@ +class Tag { + @inline def apply[@specialized A, T](a: A): A = a +} diff --git a/test/files/res/t8871/usetag.scala b/test/files/res/t8871/usetag.scala new file mode 100644 index 0000000000..139d768552 --- /dev/null +++ b/test/files/res/t8871/usetag.scala @@ -0,0 +1,6 @@ +trait Foo + +object Test { + val y = new Tag().apply[Double, Foo](3.3) + // under FSC, this gave t8871/usetag.scala:4: error: wrong number of type parameters for method apply$mDc$sp: [T](a: Double)Double +} |