From 2e9f2110ccbd8d05a651a2355cc6f2fa6bf8aa01 Mon Sep 17 00:00:00 2001 From: Philipp Haller Date: Fri, 1 Feb 2008 15:27:55 +0000 Subject: Moved 'attributes' from run to pos, removed war... Moved 'attributes' from run to pos, removed warning --- test/files/pos/attributes.scala | 80 +++++++++++++++++++++++++++++++++++++++++ test/files/run/attributes.check | 7 ---- test/files/run/attributes.scala | 80 ----------------------------------------- 3 files changed, 80 insertions(+), 87 deletions(-) create mode 100644 test/files/pos/attributes.scala delete mode 100644 test/files/run/attributes.check delete mode 100644 test/files/run/attributes.scala (limited to 'test') diff --git a/test/files/pos/attributes.scala b/test/files/pos/attributes.scala new file mode 100644 index 0000000000..9bacab8816 --- /dev/null +++ b/test/files/pos/attributes.scala @@ -0,0 +1,80 @@ +/* $Id$ */ + +@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 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; +} + +abstract class A1 { + @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; +} + +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 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; +} + +object myAttrs { + class a1 extends scala.Annotation; + class a2(x: Int) extends scala.Annotation; + class a3(x: a1) extends scala.Annotation; +} +class a4(ns: Array[Int]) extends scala.Annotation; +object O7 { + class a1 extends scala.Annotation; + 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; + + @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; + @a4(Array(1,2,3)) class A5; + @a4(Array()) class A6; + + val zero = 0 : @myAttrs.a1 +} diff --git a/test/files/run/attributes.check b/test/files/run/attributes.check deleted file mode 100644 index 8b11a7018f..0000000000 --- a/test/files/run/attributes.check +++ /dev/null @@ -1,7 +0,0 @@ -attributes.scala:60: warning: implementation restriction: subclassing Classfile does not -make your annotation visible at runtime. If that is what -you want, you must write the annotation class in Java. -class a4(ns: Array[Int]) extends scala.ClassfileAnnotation; - ^ -one warning found -no such file: Test diff --git a/test/files/run/attributes.scala b/test/files/run/attributes.scala deleted file mode 100644 index ac3b83433f..0000000000 --- a/test/files/run/attributes.scala +++ /dev/null @@ -1,80 +0,0 @@ -/* $Id$ */ - -@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 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; -} - -abstract class A1 { - @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; -} - -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 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; -} - -object myAttrs { - class a1 extends scala.Annotation; - class a2(x: Int) extends scala.Annotation; - class a3(x: a1) extends scala.Annotation; -} -class a4(ns: Array[Int]) extends scala.ClassfileAnnotation; -object O7 { - class a1 extends scala.Annotation; - 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; - - @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; - @a4(Array(1,2,3)) class A5; - @a4(Array()) class A6; - - val zero = 0 : @myAttrs.a1 -} -- cgit v1.2.3