summaryrefslogtreecommitdiff
path: root/test/files/pos/attributes.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2007-02-15 17:28:32 +0000
committerMartin Odersky <odersky@gmail.com>2007-02-15 17:28:32 +0000
commit142560739a368d569e170f581f7f730cb07bf79d (patch)
treea36928e585abd3547d1732872541e34132c5b908 /test/files/pos/attributes.scala
parentd1cc9d42c9363eb55d0487425f4ac672cfdf6a0a (diff)
downloadscala-142560739a368d569e170f581f7f730cb07bf79d.tar.gz
scala-142560739a368d569e170f581f7f730cb07bf79d.tar.bz2
scala-142560739a368d569e170f581f7f730cb07bf79d.zip
fixed tests
Diffstat (limited to 'test/files/pos/attributes.scala')
-rw-r--r--test/files/pos/attributes.scala88
1 files changed, 44 insertions, 44 deletions
diff --git a/test/files/pos/attributes.scala b/test/files/pos/attributes.scala
index 468a6e76e1..b67aff26fa 100644
--- a/test/files/pos/attributes.scala
+++ b/test/files/pos/attributes.scala
@@ -1,55 +1,55 @@
/* $Id$ */
-[serializable] class C1;
-[serializable,volatile] class C2;
-[serializable][volatile] class C3;
-[serializable][volatile,serializable] class C4;
+@serializable class C1;
+@serializable @volatile class C2;
+@serializable @volatile class C3;
+@serializable @volatile @serializable class C4;
-[serializable] trait T1;
-[serializable,volatile] trait T2;
-[serializable][volatile] trait T3;
-[serializable][volatile,serializable] trait T4;
+@serializable trait T1;
+@serializable @volatile trait T2;
+@serializable @volatile trait T3;
+@serializable @volatile @serializable trait T4;
-[serializable] object O1 extends C1;
-[serializable,volatile] object O2 extends C2;
-[serializable][volatile] object O3 extends C3;
-[serializable][volatile,serializable] object O4 extends C4;
+@serializable object O1 extends C1;
+@serializable @volatile object O2 extends C2;
+@serializable @volatile object O3 extends C3;
+@serializable @volatile @serializable object O4 extends C4;
object O5 {
final val n = 2;
- [SerialVersionUID(0)] class C1;
- [SerialVersionUID(n)] class C2;
- [SerialVersionUID(0),SerialVersionUID(n)] class C3;
- [SerialVersionUID(0)][SerialVersionUID(n)] class C4;
+ @SerialVersionUID(0) class C1;
+ @SerialVersionUID(n) class C2;
+ @SerialVersionUID(0) @SerialVersionUID(n) class C3;
+ @SerialVersionUID(0) @SerialVersionUID(n) class C4;
}
abstract class A1 {
- [serializable] var y1: C1;
- [serializable,volatile] var y2: C2;
- [serializable][volatile] var y3: C3;
- [serializable][volatile,serializable] var y4: C4;
+ @serializable var y1: C1;
+ @serializable @volatile var y2: C2;
+ @serializable @volatile var y3: C3;
+ @serializable @volatile @serializable var y4: C4;
- [serializable] def foo1: C1;
- [serializable,volatile] def foo2: C2;
- [serializable][volatile] def foo3: C3;
- [serializable][volatile,serializable] def foo4: C4;
+ @serializable def foo1: C1;
+ @serializable @volatile def foo2: C2;
+ @serializable @volatile def foo3: C3;
+ @serializable @volatile @serializable def foo4: C4;
}
object O6 {
- [serializable] val x1 = new C1;
- [serializable,volatile] val x2 = new C2;
- [serializable][volatile] val x3 = new C3;
- [serializable][volatile,serializable] val x4 = new C4;
+ @serializable val x1 = new C1;
+ @serializable @volatile val x2 = new C2;
+ @serializable @volatile val x3 = new C3;
+ @serializable @volatile @serializable val x4 = new C4;
- [serializable] var y1: C1 = _;
- [serializable,volatile] var y2: C2 = _;
- [serializable][volatile] var y3: C3 = _;
- [serializable][volatile,serializable] var y4: C4 = _;
+ @serializable var y1: C1 = _;
+ @serializable @volatile var y2: C2 = _;
+ @serializable @volatile var y3: C3 = _;
+ @serializable @volatile @serializable var y4: C4 = _;
- [serializable] private def foo1 = x1;
- [serializable,volatile] private def foo2 = x2;
- [serializable][volatile] protected def foo3 = x3;
- [serializable][volatile,serializable] protected def foo4 = x4;
+ @serializable private def foo1 = x1;
+ @serializable @volatile private def foo2 = x2;
+ @serializable @volatile protected def foo3 = x3;
+ @serializable @volatile @serializable protected def foo4 = x4;
}
object myAttrs {
@@ -62,13 +62,13 @@ object O7 {
class a2(x: Int) extends scala.Annotation;
class a3(x: a1) extends scala.Annotation;
final val x = new a1;
- [a1] class C1;
- [a1,a2(77)] class C2;
- [a1][a2(88)] class C3;
- [a1][a2(88),a3(null)] class C4;
+ @a1 class C1;
+ @a1 @a2(77) class C2;
+ @a1 @a2(88) class C3;
+ @a1 @a2(88) @a3(null) class C4;
- [myAttrs.a1] class A1;
- [myAttrs.a1,myAttrs.a2(99)] class A2;
- [myAttrs.a1][myAttrs.a2(99)] class A3;
- [myAttrs.a1][myAttrs.a2(99),myAttrs.a3(null)] class A4;
+ @myAttrs.a1 class A1;
+ @myAttrs.a1 @myAttrs.a2(99) class A2;
+ @myAttrs.a1 @myAttrs.a2(99) class A3;
+ @myAttrs.a1 @myAttrs.a2(99) @myAttrs.a3(null) class A4;
}