summaryrefslogtreecommitdiff
path: root/test/files/pos/ilya2
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2009-05-15 15:44:54 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2009-05-15 15:44:54 +0000
commit10830eaae2955766378369b8d1bcc0e6963b9b7f (patch)
tree595d0d162d94eda17062d4d13710378930b7ac7f /test/files/pos/ilya2
parentfbf991833d5ec0d9890ac1e7df9f53209e313552 (diff)
downloadscala-10830eaae2955766378369b8d1bcc0e6963b9b7f.tar.gz
scala-10830eaae2955766378369b8d1bcc0e6963b9b7f.tar.bz2
scala-10830eaae2955766378369b8d1bcc0e6963b9b7f.zip
1.4-related cleanup and reorganization.
Removed a bunch of now useless 1.4 code, merged back jvm5-specific partest tests into the general jvm tests, documentation updates.
Diffstat (limited to 'test/files/pos/ilya2')
-rw-r--r--test/files/pos/ilya2/A.scala3
-rw-r--r--test/files/pos/ilya2/B.java6
-rw-r--r--test/files/pos/ilya2/Nullable.java7
3 files changed, 16 insertions, 0 deletions
diff --git a/test/files/pos/ilya2/A.scala b/test/files/pos/ilya2/A.scala
new file mode 100644
index 0000000000..923b50f04d
--- /dev/null
+++ b/test/files/pos/ilya2/A.scala
@@ -0,0 +1,3 @@
+class A {
+ def foo = new B().bar(null)
+}
diff --git a/test/files/pos/ilya2/B.java b/test/files/pos/ilya2/B.java
new file mode 100644
index 0000000000..4771493fdd
--- /dev/null
+++ b/test/files/pos/ilya2/B.java
@@ -0,0 +1,6 @@
+public class B {
+ public int bar(@Nullable final Object o) {
+ return 42;
+ }
+
+}
diff --git a/test/files/pos/ilya2/Nullable.java b/test/files/pos/ilya2/Nullable.java
new file mode 100644
index 0000000000..ebbb013d7e
--- /dev/null
+++ b/test/files/pos/ilya2/Nullable.java
@@ -0,0 +1,7 @@
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.CLASS)
+@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.LOCAL_VARIABLE})
+public @interface Nullable {
+ String value() default "";
+}