diff options
author | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-11-24 20:18:08 +0000 |
---|---|---|
committer | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-11-24 20:18:08 +0000 |
commit | 597acf7b0c26ca94a34f188fc2919b8482c3ab0a (patch) | |
tree | 19925504774f19edec80a3d700d0bb16f7c10507 /test/files/jvm | |
parent | 46d1d8e55aa40037a536767f0ae8d98665c73617 (diff) | |
download | scala-597acf7b0c26ca94a34f188fc2919b8482c3ab0a.tar.gz scala-597acf7b0c26ca94a34f188fc2919b8482c3ab0a.tar.bz2 scala-597acf7b0c26ca94a34f188fc2919b8482c3ab0a.zip |
Fix for #3621.
Added varargs annotation.
Review by Rytz.
Diffstat (limited to 'test/files/jvm')
-rw-r--r-- | test/files/jvm/varargs.check | 2 | ||||
-rw-r--r-- | test/files/jvm/varargs/JavaClass.java | 14 | ||||
-rw-r--r-- | test/files/jvm/varargs/VaClass.scala | 12 | ||||
-rw-r--r-- | test/files/jvm/varargs/varargs.scala | 21 |
4 files changed, 49 insertions, 0 deletions
diff --git a/test/files/jvm/varargs.check b/test/files/jvm/varargs.check new file mode 100644 index 0000000000..fef7448acb --- /dev/null +++ b/test/files/jvm/varargs.check @@ -0,0 +1,2 @@ +7 +10
\ No newline at end of file diff --git a/test/files/jvm/varargs/JavaClass.java b/test/files/jvm/varargs/JavaClass.java new file mode 100644 index 0000000000..b5158f2878 --- /dev/null +++ b/test/files/jvm/varargs/JavaClass.java @@ -0,0 +1,14 @@ + + + +public class JavaClass { + public static <T> void varargz(int i, T... v) { + } + + public static void callSomeAnnotations() { + VaClass va = new VaClass(); + va.vs(4, "", "", ""); + va.vi(1, 2, 3, 4); + varargz(5, 1.0, 2.0, 3.0); + } +}
\ No newline at end of file diff --git a/test/files/jvm/varargs/VaClass.scala b/test/files/jvm/varargs/VaClass.scala new file mode 100644 index 0000000000..ffa25027d3 --- /dev/null +++ b/test/files/jvm/varargs/VaClass.scala @@ -0,0 +1,12 @@ + + +import annotation.varargs + + + +class VaClass { + + @varargs def vs(a: Int, b: String*) = println(a + b.length) + @varargs def vi(a: Int, b: Int*) = println(a + b.sum) + +} diff --git a/test/files/jvm/varargs/varargs.scala b/test/files/jvm/varargs/varargs.scala new file mode 100644 index 0000000000..6d2e707bdf --- /dev/null +++ b/test/files/jvm/varargs/varargs.scala @@ -0,0 +1,21 @@ + + + + + + +object Test { + def main(args: Array[String]) { + JavaClass.callSomeAnnotations + } +} + + + + + + + + + + |