diff options
author | Antonio Cunei <antonio.cunei@epfl.ch> | 2009-05-15 15:44:54 +0000 |
---|---|---|
committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2009-05-15 15:44:54 +0000 |
commit | 10830eaae2955766378369b8d1bcc0e6963b9b7f (patch) | |
tree | 595d0d162d94eda17062d4d13710378930b7ac7f /test/pending/pos | |
parent | fbf991833d5ec0d9890ac1e7df9f53209e313552 (diff) | |
download | scala-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/pending/pos')
-rw-r--r-- | test/pending/pos/misc/A.java | 13 | ||||
-rw-r--r-- | test/pending/pos/misc/B.scala | 7 | ||||
-rw-r--r-- | test/pending/pos/misc/J.java | 4 | ||||
-rw-r--r-- | test/pending/pos/misc/S.scala | 4 | ||||
-rw-r--r-- | test/pending/pos/t1745/J.java | 10 | ||||
-rw-r--r-- | test/pending/pos/t1745/S.scala | 7 |
6 files changed, 45 insertions, 0 deletions
diff --git a/test/pending/pos/misc/A.java b/test/pending/pos/misc/A.java new file mode 100644 index 0000000000..bc8ea48dd0 --- /dev/null +++ b/test/pending/pos/misc/A.java @@ -0,0 +1,13 @@ +package test; + +import static test.A.STATE.UNDEF; + +class A { + + public STATE state = UNDEF; + + protected static enum STATE { + UNDEF + } + +}
\ No newline at end of file diff --git a/test/pending/pos/misc/B.scala b/test/pending/pos/misc/B.scala new file mode 100644 index 0000000000..a6889e3c8b --- /dev/null +++ b/test/pending/pos/misc/B.scala @@ -0,0 +1,7 @@ +package test + +class B { + + def myA = new A() + +}
\ No newline at end of file diff --git a/test/pending/pos/misc/J.java b/test/pending/pos/misc/J.java new file mode 100644 index 0000000000..4805791154 --- /dev/null +++ b/test/pending/pos/misc/J.java @@ -0,0 +1,4 @@ +class J { + void f (@Override{ name = value } int x) {} + void g (String ... x) {} +} diff --git a/test/pending/pos/misc/S.scala b/test/pending/pos/misc/S.scala new file mode 100644 index 0000000000..c5bfb26f18 --- /dev/null +++ b/test/pending/pos/misc/S.scala @@ -0,0 +1,4 @@ +object Test extends J { + def h(xs: String*) {} + g("a", "b", "c") +} diff --git a/test/pending/pos/t1745/J.java b/test/pending/pos/t1745/J.java new file mode 100644 index 0000000000..8444eabb24 --- /dev/null +++ b/test/pending/pos/t1745/J.java @@ -0,0 +1,10 @@ +class J { + S1 s1; + S2 s2; + + String s = bar(S3.foo(), S3.bar("def")); + + private String bar(String s1, String s2) { + return s1 + s2; + } +} diff --git a/test/pending/pos/t1745/S.scala b/test/pending/pos/t1745/S.scala new file mode 100644 index 0000000000..70210ba502 --- /dev/null +++ b/test/pending/pos/t1745/S.scala @@ -0,0 +1,7 @@ +case class S1(n: Int) { } +case class S2(n: Int, p: Int) { } +class S3 { } +object S3 { + def foo() = "abc" + def bar[T](x: T): T = x +}
\ No newline at end of file |