summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
Diffstat (limited to 'test/files')
-rw-r--r--test/files/jvm/serialization.scala16
-rw-r--r--test/files/jvm5/attributes.scala11
-rw-r--r--test/files/neg/bug639.scala2
-rw-r--r--test/files/neg/scopes.check2
-rw-r--r--test/files/neg/scopes.scala2
-rw-r--r--test/files/pos/attributes.scala88
6 files changed, 61 insertions, 60 deletions
diff --git a/test/files/jvm/serialization.scala b/test/files/jvm/serialization.scala
index ed815ad2e4..4780da8c02 100644
--- a/test/files/jvm/serialization.scala
+++ b/test/files/jvm/serialization.scala
@@ -33,7 +33,7 @@ object Serialize {
//############################################################################
// Test classes in package "scala"
-[serializable]
+@serializable
object Test1_scala {
private def arrayToString[A](arr: Array[A]): String =
List.fromArray(arr).mkString("Array[",",","]");
@@ -77,7 +77,7 @@ object Test1_scala {
//############################################################################
// Test classes in package "scala.collection.immutable"
-[serializable]
+@serializable
object Test2_immutable {
import scala.collection.immutable.{BitSet,ListMap,ListSet,Queue,Stack,
TreeSet,TreeMap};
@@ -235,7 +235,7 @@ object Test4_xml {
//############################################################################
// Test user-defined classes WITHOUT nesting
-[serializable]
+@serializable
class Person(_name: String) {
private var name = _name;
override def toString() = name;
@@ -244,12 +244,12 @@ class Person(_name: String) {
(name == that.asInstanceOf[Person].name);
}
-[serializable]
+@serializable
class Employee(_name: String) {
private var name = _name;
override def toString() = name;
}
-[serializable]
+@serializable
object bob extends Employee("Bob");
object Test5 {
@@ -272,13 +272,13 @@ object Test5 {
//############################################################################
// Test user-defined classes WITH nesting
-[serializable]
+@serializable
object Test6 {
- [serializable]
+ @serializable
object bill extends Employee("Bill") {
val x = paul;
}
- [serializable]
+ @serializable
object paul extends Person("Paul") {
val x = 4; // bill; => StackOverflowException !!!
}
diff --git a/test/files/jvm5/attributes.scala b/test/files/jvm5/attributes.scala
index 1e38db22ce..59e5e4facd 100644
--- a/test/files/jvm5/attributes.scala
+++ b/test/files/jvm5/attributes.scala
@@ -2,7 +2,7 @@ import java.lang.Deprecated
object Test1 {
class Foo {
- [remote]
+ @remote
def foo: Unit = ()
}
def run: Unit = {
@@ -15,7 +15,8 @@ object Test2 {
import java.io.{BufferedReader,FileReader, IOException}
class Reader(fname: String) {
private val in = new BufferedReader(new FileReader(fname))
- [throws(classOf[IOException])]
+
+ @throws(classOf[IOException])
def read() = in.read()
}
def run: Unit = {
@@ -37,7 +38,7 @@ public class Main {
*/
object Test3 {
class Foo {
- [Deprecated]
+ @Deprecated
def foo: Unit = ()
}
def run: Unit = {
@@ -67,9 +68,9 @@ public class Main {
*/
object Test4 {
import java.lang.annotation._
- [Retention(RetentionPolicy.RUNTIME)]
+ @Retention(RetentionPolicy.RUNTIME)
class Source(url: String, mail: String) extends scala.Annotation
- [Source("http://scala.epfl.ch", "scala@lists.epfl.ch")]
+ @Source("http://scala.epfl.ch", "scala@lists.epfl.ch")
class Foo
def run: Unit = {
val clazz = classOf[Foo]
diff --git a/test/files/neg/bug639.scala b/test/files/neg/bug639.scala
index a8416b2b2c..eaeed944a4 100644
--- a/test/files/neg/bug639.scala
+++ b/test/files/neg/bug639.scala
@@ -2,5 +2,5 @@ package foo123
import a._
-[B]
+@B
class C
diff --git a/test/files/neg/scopes.check b/test/files/neg/scopes.check
index ca32035316..6e0a3c1081 100644
--- a/test/files/neg/scopes.check
+++ b/test/files/neg/scopes.check
@@ -5,7 +5,7 @@ scopes.scala:5: error: t is already defined as type t
type t = float
^
scopes.scala:7: error: x is already defined as value x
- val x: float = .0f
+ val x: float = .0f;
^
scopes.scala:10: error: y is already defined as value y
val y: float = .0f
diff --git a/test/files/neg/scopes.scala b/test/files/neg/scopes.scala
index b69714ca19..321ae223b8 100644
--- a/test/files/neg/scopes.scala
+++ b/test/files/neg/scopes.scala
@@ -4,7 +4,7 @@ object test1 {
type t = int
type t = float
val x: int = 0
- val x: float = .0f
+ val x: float = .0f;
{
val y: int = 0
val y: float = .0f
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;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-18 05:06:58 +0000