summaryrefslogtreecommitdiff
path: root/test/files/scalap
diff options
context:
space:
mode:
authorGilles Dubochet <gilles.dubochet@epfl.ch>2009-09-24 13:09:40 +0000
committerGilles Dubochet <gilles.dubochet@epfl.ch>2009-09-24 13:09:40 +0000
commitc1f5cbd4a070ccef03e81071041f9cfa6e49e85e (patch)
tree9a1da088713800634a70a9fe9293a04ef2a9ef49 /test/files/scalap
parent593d685e4fa50cf087bfc89a208ed2c89d2407c1 (diff)
downloadscala-c1f5cbd4a070ccef03e81071041f9cfa6e49e85e.tar.gz
scala-c1f5cbd4a070ccef03e81071041f9cfa6e49e85e.tar.bz2
scala-c1f5cbd4a070ccef03e81071041f9cfa6e49e85e.zip
[no content change] Fixed all SVN properties: m...
[no content change] Fixed all SVN properties: mimes, EOL, executable. Id expansion is consistently enabled for Scala/Java/C# sources in 'src/' and consistently disabled and removed from everywhere else: there should not be any dead Id tags anymore.
Diffstat (limited to 'test/files/scalap')
-rw-r--r--test/files/scalap/abstractClass/A.scala2
-rw-r--r--test/files/scalap/abstractClass/result.test2
-rw-r--r--test/files/scalap/abstractMethod/A.scala2
-rw-r--r--test/files/scalap/abstractMethod/result.test2
-rw-r--r--test/files/scalap/caseClass/A.scala2
-rw-r--r--test/files/scalap/caseClass/result.test2
-rw-r--r--test/files/scalap/caseObject/A.scala2
-rw-r--r--test/files/scalap/caseObject/result.test2
-rw-r--r--test/files/scalap/cbnParam/A.scala2
-rw-r--r--test/files/scalap/cbnParam/result.test2
-rw-r--r--test/files/scalap/classWithExistential/A.scala2
-rw-r--r--test/files/scalap/classWithExistential/result.test2
-rw-r--r--test/files/scalap/classWithSelfAnnotation/A.scala2
-rw-r--r--test/files/scalap/classWithSelfAnnotation/result.test2
-rw-r--r--test/files/scalap/covariantParam/A.scala2
-rw-r--r--test/files/scalap/covariantParam/result.test2
-rw-r--r--test/files/scalap/implicitParam/A.scala2
-rw-r--r--test/files/scalap/implicitParam/result.test2
-rw-r--r--test/files/scalap/packageObject/A.scala2
-rw-r--r--test/files/scalap/packageObject/result.test2
-rw-r--r--test/files/scalap/paramClauses/A.scala2
-rw-r--r--test/files/scalap/paramClauses/result.test2
-rw-r--r--test/files/scalap/paramNames/result.test2
-rw-r--r--test/files/scalap/sequenceParam/A.scala2
-rw-r--r--test/files/scalap/sequenceParam/result.test2
-rw-r--r--test/files/scalap/simpleClass/A.scala2
-rw-r--r--test/files/scalap/simpleClass/result.test2
-rw-r--r--test/files/scalap/traitObject/A.scala2
-rw-r--r--test/files/scalap/traitObject/result.test2
-rw-r--r--test/files/scalap/valAndVar/result.test2
-rw-r--r--test/files/scalap/wildcardType/A.scala2
-rw-r--r--test/files/scalap/wildcardType/result.test2
32 files changed, 32 insertions, 32 deletions
diff --git a/test/files/scalap/abstractClass/A.scala b/test/files/scalap/abstractClass/A.scala
index 31fc819ae9..19a528d5a1 100644
--- a/test/files/scalap/abstractClass/A.scala
+++ b/test/files/scalap/abstractClass/A.scala
@@ -2,4 +2,4 @@ abstract class AbstractClass {
def foo: String
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/abstractClass/result.test b/test/files/scalap/abstractClass/result.test
index 5483353339..9b8fc4dd95 100644
--- a/test/files/scalap/abstractClass/result.test
+++ b/test/files/scalap/abstractClass/result.test
@@ -1,4 +1,4 @@
abstract class AbstractClass extends java.lang.Object with scala.ScalaObject {
def this() = { /* compiled code */ }
def foo : scala.Predef.String
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/abstractMethod/A.scala b/test/files/scalap/abstractMethod/A.scala
index 419abdaa67..4bedb377b3 100644
--- a/test/files/scalap/abstractMethod/A.scala
+++ b/test/files/scalap/abstractMethod/A.scala
@@ -1,4 +1,4 @@
trait AbstractMethod {
def arity: Int
def isCool = true
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/abstractMethod/result.test b/test/files/scalap/abstractMethod/result.test
index 8668a7761e..a1bd378c87 100644
--- a/test/files/scalap/abstractMethod/result.test
+++ b/test/files/scalap/abstractMethod/result.test
@@ -2,4 +2,4 @@ trait AbstractMethod extends java.lang.Object with scala.ScalaObject {
def $init$() : scala.Unit = { /* compiled code */ }
def arity : scala.Int
def isCool : scala.Boolean = { /* compiled code */ }
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/caseClass/A.scala b/test/files/scalap/caseClass/A.scala
index 3addfbdaaa..be86714898 100644
--- a/test/files/scalap/caseClass/A.scala
+++ b/test/files/scalap/caseClass/A.scala
@@ -1,3 +1,3 @@
case class CaseClass[A <: Seq[Int]](i: A, s: String) {
def foo = 239
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/caseClass/result.test b/test/files/scalap/caseClass/result.test
index be64349cb1..9ea19f7e9d 100644
--- a/test/files/scalap/caseClass/result.test
+++ b/test/files/scalap/caseClass/result.test
@@ -12,4 +12,4 @@ case class CaseClass[A >: scala.Nothing <: scala.Seq[scala.Int]] extends java.la
override def productArity : scala.Int = { /* compiled code */ }
override def productElement(x$1 : scala.Int) : scala.Any = { /* compiled code */ }
override def canEqual(x$1 : scala.Any) : scala.Boolean = { /* compiled code */ }
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/caseObject/A.scala b/test/files/scalap/caseObject/A.scala
index 7c15416841..809341ade9 100644
--- a/test/files/scalap/caseObject/A.scala
+++ b/test/files/scalap/caseObject/A.scala
@@ -1,3 +1,3 @@
case object CaseObject {
def bar = 239
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/caseObject/result.test b/test/files/scalap/caseObject/result.test
index f81e6ce3cb..d888191919 100644
--- a/test/files/scalap/caseObject/result.test
+++ b/test/files/scalap/caseObject/result.test
@@ -6,4 +6,4 @@ case object CaseObject extends java.lang.Object with scala.ScalaObject with scal
override def productElement(x$1 : scala.Int) : scala.Any = { /* compiled code */ }
override def canEqual(x$1 : scala.Any) : scala.Boolean = { /* compiled code */ }
protected def readResolve() : java.lang.Object = { /* compiled code */ }
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/cbnParam/A.scala b/test/files/scalap/cbnParam/A.scala
index d804ba6502..978a718032 100644
--- a/test/files/scalap/cbnParam/A.scala
+++ b/test/files/scalap/cbnParam/A.scala
@@ -1 +1 @@
-class CbnParam(s: => String) \ No newline at end of file
+class CbnParam(s: => String)
diff --git a/test/files/scalap/cbnParam/result.test b/test/files/scalap/cbnParam/result.test
index 7b18228986..c6b2f4caa8 100644
--- a/test/files/scalap/cbnParam/result.test
+++ b/test/files/scalap/cbnParam/result.test
@@ -1,3 +1,3 @@
class CbnParam extends java.lang.Object with scala.ScalaObject {
def this(s : => scala.Predef.String) = { /* compiled code */ }
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/classWithExistential/A.scala b/test/files/scalap/classWithExistential/A.scala
index 2a77a842c9..4a5213f963 100644
--- a/test/files/scalap/classWithExistential/A.scala
+++ b/test/files/scalap/classWithExistential/A.scala
@@ -1,3 +1,3 @@
class ClassWithExistential {
def foo[A, B] : A=> B forSome {type A <: Seq[Int]; type B >: String} = null
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/classWithExistential/result.test b/test/files/scalap/classWithExistential/result.test
index 377edff7ef..243f51e2ad 100644
--- a/test/files/scalap/classWithExistential/result.test
+++ b/test/files/scalap/classWithExistential/result.test
@@ -1,4 +1,4 @@
class ClassWithExistential extends java.lang.Object with scala.ScalaObject {
def this() = { /* compiled code */ }
def foo[A >: scala.Nothing <: scala.Any, B >: scala.Nothing <: scala.Any] : scala.Function1[A, B forSome {type A >: scala.Nothing <: scala.Seq[scala.Int]; type B >: scala.Predef.String <: scala.Any}] = { /* compiled code */ }
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/classWithSelfAnnotation/A.scala b/test/files/scalap/classWithSelfAnnotation/A.scala
index f665630690..9e0398622a 100644
--- a/test/files/scalap/classWithSelfAnnotation/A.scala
+++ b/test/files/scalap/classWithSelfAnnotation/A.scala
@@ -1,4 +1,4 @@
class ClassWithSelfAnnotation {
this: CharSequence =>
def foo = 239
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/classWithSelfAnnotation/result.test b/test/files/scalap/classWithSelfAnnotation/result.test
index 9e20790fa2..326437c7be 100644
--- a/test/files/scalap/classWithSelfAnnotation/result.test
+++ b/test/files/scalap/classWithSelfAnnotation/result.test
@@ -2,4 +2,4 @@ class ClassWithSelfAnnotation extends java.lang.Object with scala.ScalaObject {
this : ClassWithSelfAnnotation with java.lang.CharSequence =>
def this() = { /* compiled code */ }
def foo : scala.Int = { /* compiled code */ }
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/covariantParam/A.scala b/test/files/scalap/covariantParam/A.scala
index 19fb8805b7..5b2c24d6fa 100644
--- a/test/files/scalap/covariantParam/A.scala
+++ b/test/files/scalap/covariantParam/A.scala
@@ -1,3 +1,3 @@
class CovariantParam[+A] {
def foo[A](a: A) = 42
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/covariantParam/result.test b/test/files/scalap/covariantParam/result.test
index e7c4a00bcb..ce480ee0cd 100644
--- a/test/files/scalap/covariantParam/result.test
+++ b/test/files/scalap/covariantParam/result.test
@@ -1,4 +1,4 @@
class CovariantParam[+A >: scala.Nothing <: scala.Any] extends java.lang.Object with scala.ScalaObject {
def this() = { /* compiled code */ }
def foo[A >: scala.Nothing <: scala.Any](a : A) : scala.Int = { /* compiled code */ }
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/implicitParam/A.scala b/test/files/scalap/implicitParam/A.scala
index 5a5c88bc69..80657218d9 100644
--- a/test/files/scalap/implicitParam/A.scala
+++ b/test/files/scalap/implicitParam/A.scala
@@ -1,3 +1,3 @@
class ImplicitParam {
def foo(i: Int)(implicit f: Float, d: Double) = 42
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/implicitParam/result.test b/test/files/scalap/implicitParam/result.test
index 4d2f49e803..11d678df06 100644
--- a/test/files/scalap/implicitParam/result.test
+++ b/test/files/scalap/implicitParam/result.test
@@ -1,4 +1,4 @@
class ImplicitParam extends java.lang.Object with scala.ScalaObject {
def this() = { /* compiled code */ }
def foo(i : scala.Int)(implicit f : scala.Float, d : scala.Double) : scala.Int = { /* compiled code */ }
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/packageObject/A.scala b/test/files/scalap/packageObject/A.scala
index 959517c4c4..7e429c9935 100644
--- a/test/files/scalap/packageObject/A.scala
+++ b/test/files/scalap/packageObject/A.scala
@@ -1,4 +1,4 @@
package object PackageObject {
type A = String
def foo(i: Int) = 239
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/packageObject/result.test b/test/files/scalap/packageObject/result.test
index 6a7cc16ba8..6a8d6ae1d5 100644
--- a/test/files/scalap/packageObject/result.test
+++ b/test/files/scalap/packageObject/result.test
@@ -2,4 +2,4 @@ package object PackageObject extends java.lang.Object with scala.ScalaObject {
def this() = { /* compiled code */ }
type A = scala.Predef.String
def foo(i : scala.Int) : scala.Int = { /* compiled code */ }
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/paramClauses/A.scala b/test/files/scalap/paramClauses/A.scala
index bcc76f50e3..f9d1917402 100644
--- a/test/files/scalap/paramClauses/A.scala
+++ b/test/files/scalap/paramClauses/A.scala
@@ -1,3 +1,3 @@
class ParamClauses {
def foo(i: Int)(s: String)(t: Double) = 239
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/paramClauses/result.test b/test/files/scalap/paramClauses/result.test
index 6ecbcec873..9ef93d2e76 100644
--- a/test/files/scalap/paramClauses/result.test
+++ b/test/files/scalap/paramClauses/result.test
@@ -1,4 +1,4 @@
class ParamClauses extends java.lang.Object with scala.ScalaObject {
def this() = { /* compiled code */ }
def foo(i : scala.Int)(s : scala.Predef.String)(t : scala.Double) : scala.Int = { /* compiled code */ }
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/paramNames/result.test b/test/files/scalap/paramNames/result.test
index 59565dc782..f9d98d9647 100644
--- a/test/files/scalap/paramNames/result.test
+++ b/test/files/scalap/paramNames/result.test
@@ -1,4 +1,4 @@
class ParamNames extends java.lang.Object with scala.ScalaObject {
def this() = { /* compiled code */ }
def foo(s : => scala.Seq[scala.Int], s2 : => scala.Seq[scala.Any]) : scala.Unit = { /* compiled code */ }
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/sequenceParam/A.scala b/test/files/scalap/sequenceParam/A.scala
index 98874fafb1..86e13340b9 100644
--- a/test/files/scalap/sequenceParam/A.scala
+++ b/test/files/scalap/sequenceParam/A.scala
@@ -1 +1 @@
-class SequenceParam(s: String, i: Int*) \ No newline at end of file
+class SequenceParam(s: String, i: Int*)
diff --git a/test/files/scalap/sequenceParam/result.test b/test/files/scalap/sequenceParam/result.test
index 928ab45ef1..4b9d7844ab 100644
--- a/test/files/scalap/sequenceParam/result.test
+++ b/test/files/scalap/sequenceParam/result.test
@@ -1,3 +1,3 @@
class SequenceParam extends java.lang.Object with scala.ScalaObject {
def this(s : scala.Predef.String, i : scala.Int*) = { /* compiled code */ }
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/simpleClass/A.scala b/test/files/scalap/simpleClass/A.scala
index 04a2f5ee31..fa82e62680 100644
--- a/test/files/scalap/simpleClass/A.scala
+++ b/test/files/scalap/simpleClass/A.scala
@@ -1,3 +1,3 @@
class SimpleClass {
def foo = 239
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/simpleClass/result.test b/test/files/scalap/simpleClass/result.test
index b2ed8d0b34..d10b633bce 100644
--- a/test/files/scalap/simpleClass/result.test
+++ b/test/files/scalap/simpleClass/result.test
@@ -1,4 +1,4 @@
class SimpleClass extends java.lang.Object with scala.ScalaObject {
def this() = { /* compiled code */ }
def foo : scala.Int = { /* compiled code */ }
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/traitObject/A.scala b/test/files/scalap/traitObject/A.scala
index 3ad9c4954c..d5f43181c1 100644
--- a/test/files/scalap/traitObject/A.scala
+++ b/test/files/scalap/traitObject/A.scala
@@ -4,4 +4,4 @@ trait TraitObject {
object TraitObject {
def bar = 42
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/traitObject/result.test b/test/files/scalap/traitObject/result.test
index c05a4b0968..0d7de1535d 100644
--- a/test/files/scalap/traitObject/result.test
+++ b/test/files/scalap/traitObject/result.test
@@ -5,4 +5,4 @@ trait TraitObject extends java.lang.Object with scala.ScalaObject {
object TraitObject extends java.lang.Object with scala.ScalaObject {
def this() = { /* compiled code */ }
def bar : scala.Int = { /* compiled code */ }
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/valAndVar/result.test b/test/files/scalap/valAndVar/result.test
index 011d57c64e..934ad0a086 100644
--- a/test/files/scalap/valAndVar/result.test
+++ b/test/files/scalap/valAndVar/result.test
@@ -2,4 +2,4 @@ class ValAndVar extends java.lang.Object with scala.ScalaObject {
def this() = { /* compiled code */ }
val foo : java.lang.String = { /* compiled code */ }
var bar : scala.Int = { /* compiled code */ }
-} \ No newline at end of file
+}
diff --git a/test/files/scalap/wildcardType/A.scala b/test/files/scalap/wildcardType/A.scala
index d99841cb36..4bb0d14de5 100644
--- a/test/files/scalap/wildcardType/A.scala
+++ b/test/files/scalap/wildcardType/A.scala
@@ -1 +1 @@
-class WildcardType(f: Int => _) \ No newline at end of file
+class WildcardType(f: Int => _)
diff --git a/test/files/scalap/wildcardType/result.test b/test/files/scalap/wildcardType/result.test
index 78a24ef22a..aa3d5d53bc 100644
--- a/test/files/scalap/wildcardType/result.test
+++ b/test/files/scalap/wildcardType/result.test
@@ -1,3 +1,3 @@
class WildcardType extends java.lang.Object with scala.ScalaObject {
def this(f : scala.Function1[scala.Int, _]) = { /* compiled code */ }
-} \ No newline at end of file
+}