aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Petrashko <dmitry.petrashko@gmail.com>2015-04-09 16:13:04 +0200
committerDmitry Petrashko <dmitry.petrashko@gmail.com>2015-04-09 16:13:04 +0200
commit6a5a6cca84221b90b14dbac8730cafef7f60e410 (patch)
tree26ed77e2406a698ad86e2a381589d1d7daebb5a3
parent9602523e0b6b89b73f77ac45f9a5b58060fcd6cf (diff)
downloaddotty-6a5a6cca84221b90b14dbac8730cafef7f60e410.tar.gz
dotty-6a5a6cca84221b90b14dbac8730cafef7f60e410.tar.bz2
dotty-6a5a6cca84221b90b14dbac8730cafef7f60e410.zip
Replace tabs with 4 spaces in Dotty tests.
-rw-r--r--[-rwxr-xr-x]tests/disabled/java-interop/failing/t1459/App.scala0
-rw-r--r--tests/disabled/not-representable/MailBox.scala4
-rw-r--r--tests/disabled/structural-type/pos/t3363-old.scala14
-rw-r--r--tests/neg/t1164.scala18
-rw-r--r--tests/pending/pos/lambdalift1.scala8
-rw-r--r--[-rwxr-xr-x]tests/pending/pos/t1756.scala0
-rw-r--r--[-rwxr-xr-x]tests/pending/pos/t2913.scala0
-rw-r--r--tests/pending/pos/t3480.scala2
-rw-r--r--[-rwxr-xr-x]tests/pending/pos/t3568.scala0
-rw-r--r--tests/pending/pos/t4176b.scala6
-rw-r--r--[-rwxr-xr-x]tests/pending/pos/t4553.scala0
-rw-r--r--tests/pending/pos/t4579.scala2
-rw-r--r--tests/pending/pos/t5029.scala2
-rw-r--r--tests/pending/pos/t5119.scala4
-rw-r--r--tests/pending/pos/t573.scala2
-rw-r--r--tests/pending/pos/t5967.scala8
-rw-r--r--tests/pending/pos/t6335.scala8
-rw-r--r--tests/pending/pos/t6966.scala14
-rw-r--r--tests/pending/pos/t7011.scala2
-rw-r--r--tests/pending/pos/t7022.scala8
-rw-r--r--tests/pending/pos/test5.scala22
-rw-r--r--tests/pending/pos/test5refine.scala30
-rw-r--r--tests/pos/SI-7638.scala20
-rw-r--r--tests/pos/SI-7638a.scala20
-rw-r--r--[-rwxr-xr-x]tests/pos/java-interop/t2433/Test.scala0
-rw-r--r--tests/pos/java-interop/t2940/Error.scala2
-rw-r--r--[-rwxr-xr-x]tests/pos/java-interop/t2956/t2956.scala0
-rw-r--r--tests/pos/t0031.scala12
-rw-r--r--tests/pos/t0039.scala4
-rw-r--r--tests/pos/t0061.scala2
-rw-r--r--tests/pos/t0066.scala2
-rw-r--r--tests/pos/t0770.scala8
-rw-r--r--tests/pos/t1085.scala2
-rw-r--r--[-rwxr-xr-x]tests/pos/t1722/Test.scala0
-rw-r--r--[-rwxr-xr-x]tests/pos/t1722/Top.scala0
-rw-r--r--[-rwxr-xr-x]tests/pos/t2060.scala0
-rw-r--r--[-rwxr-xr-x]tests/pos/t2082.scala2
-rw-r--r--[-rwxr-xr-x]tests/pos/t2179.scala0
-rw-r--r--tests/pos/t2208_pos.scala8
-rw-r--r--tests/pos/t2305.scala22
-rw-r--r--tests/pos/t2405.scala20
-rw-r--r--[-rwxr-xr-x]tests/pos/t2425.scala0
-rw-r--r--[-rwxr-xr-x]tests/pos/t2429.scala0
-rw-r--r--tests/pos/t2444.scala2
-rw-r--r--[-rwxr-xr-x]tests/pos/t2484.scala0
-rw-r--r--tests/pos/t2500.scala8
-rw-r--r--[-rwxr-xr-x]tests/pos/t2504.scala0
-rw-r--r--[-rwxr-xr-x]tests/pos/t2545.scala0
-rw-r--r--tests/pos/t2591.scala6
-rw-r--r--[-rwxr-xr-x]tests/pos/t2635.scala0
-rw-r--r--[-rwxr-xr-x]tests/pos/t2683.scala0
-rw-r--r--[-rwxr-xr-x]tests/pos/t3174.scala0
-rw-r--r--tests/pos/t3278.scala36
-rw-r--r--tests/untried/neg-with-implicits/implicit-shadow.scala6
-rw-r--r--tests/untried/neg-with-implicits/t2405.scala10
-rw-r--r--[-rwxr-xr-x]tests/untried/neg-with-implicits/t3006.scala0
-rw-r--r--[-rwxr-xr-x]tests/untried/neg-with-implicits/t3224.scala0
-rw-r--r--[-rwxr-xr-x]tests/untried/neg/override.scala0
-rw-r--r--tests/untried/neg/t1181.scala2
-rw-r--r--tests/untried/neg/t1432.scala2
-rw-r--r--tests/untried/neg/t2066b.scala22
-rw-r--r--tests/untried/neg/t2208.scala8
-rw-r--r--[-rwxr-xr-x]tests/untried/neg/t2336.scala0
-rw-r--r--[-rwxr-xr-x]tests/untried/neg/t2494.scala0
-rw-r--r--[-rwxr-xr-x]tests/untried/neg/t2773.scala0
-rw-r--r--[-rwxr-xr-x]tests/untried/neg/t2779.scala0
-rw-r--r--[-rwxr-xr-x]tests/untried/neg/t2870.scala0
-rw-r--r--[-rwxr-xr-x]tests/untried/neg/t2918.scala0
-rw-r--r--tests/untried/neg/t2968.scala24
-rw-r--r--tests/untried/neg/t3913.scala2
-rw-r--r--tests/untried/neg/t4460b.scala8
-rw-r--r--tests/untried/neg/t4818.scala6
-rw-r--r--tests/untried/neg/t576.scala2
-rw-r--r--tests/untried/neg/t6214.scala2
-rw-r--r--tests/untried/neg/t6258.scala8
-rw-r--r--tests/untried/neg/t6558.scala2
-rw-r--r--[-rwxr-xr-x]tests/untried/neg/t771.scala0
-rw-r--r--tests/untried/pos/ilya2/A.scala2
-rw-r--r--[-rwxr-xr-x]tests/untried/pos/lexical.scala0
-rw-r--r--[-rwxr-xr-x]tests/untried/pos/packageobjs.scala0
-rw-r--r--tests/untried/pos/pos-bug1210.scala10
-rw-r--r--tests/untried/pos/scoping2.scala4
-rw-r--r--tests/untried/pos/simple-exceptions.scala2
-rw-r--r--[-rwxr-xr-x]tests/untried/pos/spec-t6286.scala0
-rw-r--r--[-rwxr-xr-x]tests/untried/pos/t2635.scala0
-rw-r--r--[-rwxr-xr-x]tests/untried/pos/t2683.scala0
-rw-r--r--[-rwxr-xr-x]tests/untried/pos/t3174b.scala0
-rw-r--r--tests/untried/pos/t3570.scala10
-rw-r--r--tests/untried/pos/t3578.scala20
-rw-r--r--tests/untried/pos/t4220.scala2
-rw-r--r--tests/untried/pos/t443.scala14
-rw-r--r--tests/untried/pos/t4842.scala16
-rw-r--r--tests/untried/pos/t6028/t6028_1.scala2
-rw-r--r--tests/untried/pos/t6028/t6028_2.scala4
-rw-r--r--tests/untried/pos/t6601/UsePrivateValueClass_2.scala8
-rw-r--r--tests/untried/pos/t7532b/A_1.scala4
-rw-r--r--tests/untried/pos/tcpoly_infer_easy.scala6
-rw-r--r--tests/untried/pos/test4refine.scala2
-rw-r--r--tests/untried/pos/unapplyComplex.scala8
99 files changed, 274 insertions, 274 deletions
diff --git a/tests/disabled/java-interop/failing/t1459/App.scala b/tests/disabled/java-interop/failing/t1459/App.scala
index 36e5022e9..36e5022e9 100755..100644
--- a/tests/disabled/java-interop/failing/t1459/App.scala
+++ b/tests/disabled/java-interop/failing/t1459/App.scala
diff --git a/tests/disabled/not-representable/MailBox.scala b/tests/disabled/not-representable/MailBox.scala
index 8e27bd362..a2145c2c2 100644
--- a/tests/disabled/not-representable/MailBox.scala
+++ b/tests/disabled/not-representable/MailBox.scala
@@ -49,10 +49,10 @@ class MailBox {
if (s1 != null) {
s.next = s1.next; s1.elem
} else {
- val r = insert(lastReceiver, new Receiver {
+ val r = insert(lastReceiver, new Receiver {
def isDefined(msg: Any) = f.isDefinedAt(msg);
});
- lastReceiver = r;
+ lastReceiver = r;
r.elem.wait();
r.elem.msg
}
diff --git a/tests/disabled/structural-type/pos/t3363-old.scala b/tests/disabled/structural-type/pos/t3363-old.scala
index 0088eff3d..de4fcf68a 100644
--- a/tests/disabled/structural-type/pos/t3363-old.scala
+++ b/tests/disabled/structural-type/pos/t3363-old.scala
@@ -7,12 +7,12 @@ object TestCase {
//if you inherit from MapOps[T] instead of MapOps[F] then code compiles fine
implicit def map2ops[T,F](fs: Map[T,F]): TestCase.MapOps[F]{val m: Manifest[T]; def is(xs: List[T]): List[List[T]]} = new MapOps[F] {
//if you remove this line, then code compiles
- lazy val m: Manifest[T] = sys.error("just something to make it compile")
- def is(xs: List[T]) = List(xs)
- }
+ lazy val m: Manifest[T] = sys.error("just something to make it compile")
+ def is(xs: List[T]) = List(xs)
+ }
- def main(args: Array[String]): Unit = {
- println(Map(1 -> "2") is List(2))
- }
+ def main(args: Array[String]): Unit = {
+ println(Map(1 -> "2") is List(2))
+ }
- }
+ }
diff --git a/tests/neg/t1164.scala b/tests/neg/t1164.scala
index 6deedfbff..7775b5e86 100644
--- a/tests/neg/t1164.scala
+++ b/tests/neg/t1164.scala
@@ -7,23 +7,23 @@ object test {
def unapply [a](m : Foo[a]) = Some (m.arg)
}
- def matchAndGetArgFromFoo[a]( e:Foo[a]):a = {e match { case Foo(x) => x }}
+ def matchAndGetArgFromFoo[a]( e:Foo[a]):a = {e match { case Foo(x) => x }}
// Unapply node here will have type argument [a] instantiated to scala.Nothing:
// UnApply(TypeApply(Select(Ident(Foo),unapply),List(TypeTree[TypeVar(PolyParam(a) -> TypeRef(ThisType(TypeRef(NoPrefix,scala)),Nothing))])),List(),List(Bind(x,Ident(_))))
// but the type of the UnApply node itself is correct: RefinedType(TypeRef(ThisType(TypeRef(ThisType(TypeRef(NoPrefix,<empty>)),test$)),Foo), test$$Foo$$a, TypeAlias(TypeRef(NoPrefix,a)))
//
- // Try the same thing as above but use function as argument to Bar
- // constructor
+ // Try the same thing as above but use function as argument to Bar
+ // constructor
- type FunIntToA [a] = (Int) => a
+ type FunIntToA [a] = (Int) => a
class Bar[a] (var f: FunIntToA[a])
- object Bar {
- def apply[a](f: FunIntToA[a]) = new Bar[a](f)
- def unapply[a](m: Bar[a]) = Some (m.f)
- }
+ object Bar {
+ def apply[a](f: FunIntToA[a]) = new Bar[a](f)
+ def unapply[a](m: Bar[a]) = Some (m.f)
+ }
- def matchAndGetFunFromBar[a](b:Bar[a]) : FunIntToA[a] = { b match { case Bar(x) => x}}
+ def matchAndGetFunFromBar[a](b:Bar[a]) : FunIntToA[a] = { b match { case Bar(x) => x}}
}
diff --git a/tests/pending/pos/lambdalift1.scala b/tests/pending/pos/lambdalift1.scala
index 01b224c3b..7353c32c6 100644
--- a/tests/pending/pos/lambdalift1.scala
+++ b/tests/pending/pos/lambdalift1.scala
@@ -6,10 +6,10 @@ object test {
def print() = java.lang.System.out.println(x);
class A() {
def g() = {
- class B() {
- def h() = print()
- }
- new B().h()
+ class B() {
+ def h() = print()
+ }
+ new B().h()
}
}
new A().g()
diff --git a/tests/pending/pos/t1756.scala b/tests/pending/pos/t1756.scala
index 1d067c3b0..1d067c3b0 100755..100644
--- a/tests/pending/pos/t1756.scala
+++ b/tests/pending/pos/t1756.scala
diff --git a/tests/pending/pos/t2913.scala b/tests/pending/pos/t2913.scala
index 21700e71a..21700e71a 100755..100644
--- a/tests/pending/pos/t2913.scala
+++ b/tests/pending/pos/t2913.scala
diff --git a/tests/pending/pos/t3480.scala b/tests/pending/pos/t3480.scala
index f04ea2933..ba2e1a4b8 100644
--- a/tests/pending/pos/t3480.scala
+++ b/tests/pending/pos/t3480.scala
@@ -1,4 +1,4 @@
object Test {
val List(_: _*) = List(1)
- val Array( who, what : _* ) = "Eclipse plugin cannot not handle this" split (" ")
+ val Array( who, what : _* ) = "Eclipse plugin cannot not handle this" split (" ")
}
diff --git a/tests/pending/pos/t3568.scala b/tests/pending/pos/t3568.scala
index 50f0cdb2e..50f0cdb2e 100755..100644
--- a/tests/pending/pos/t3568.scala
+++ b/tests/pending/pos/t3568.scala
diff --git a/tests/pending/pos/t4176b.scala b/tests/pending/pos/t4176b.scala
index 11914c50c..f7d83365c 100644
--- a/tests/pending/pos/t4176b.scala
+++ b/tests/pending/pos/t4176b.scala
@@ -1,5 +1,5 @@
object Test {
- def foo(a: String*) = a
- val fooEta = foo _
- (foo: Seq[String] => Seq[String])
+ def foo(a: String*) = a
+ val fooEta = foo _
+ (foo: Seq[String] => Seq[String])
}
diff --git a/tests/pending/pos/t4553.scala b/tests/pending/pos/t4553.scala
index e9bef4099..e9bef4099 100755..100644
--- a/tests/pending/pos/t4553.scala
+++ b/tests/pending/pos/t4553.scala
diff --git a/tests/pending/pos/t4579.scala b/tests/pending/pos/t4579.scala
index b298ee579..0db527318 100644
--- a/tests/pending/pos/t4579.scala
+++ b/tests/pending/pos/t4579.scala
@@ -312,7 +312,7 @@ object LispAny extends Lisp {
case 'cond :: ('else :: expr :: Nil) :: rest =>
normalize(expr);
case 'cond :: (test :: expr :: Nil) :: rest =>
- normalize('if :: test :: expr :: ('cond :: rest) :: Nil)
+ normalize('if :: test :: expr :: ('cond :: rest) :: Nil)
case 'cond :: 'else :: expr :: Nil =>
normalize(expr)
case h :: t =>
diff --git a/tests/pending/pos/t5029.scala b/tests/pending/pos/t5029.scala
index b68fc0367..f32d0c650 100644
--- a/tests/pending/pos/t5029.scala
+++ b/tests/pending/pos/t5029.scala
@@ -1,3 +1,3 @@
object Test {
- (Vector(): Seq[_]) match { case List() => true; case Nil => false }
+ (Vector(): Seq[_]) match { case List() => true; case Nil => false }
}
diff --git a/tests/pending/pos/t5119.scala b/tests/pending/pos/t5119.scala
index 4a67244e5..39f626e53 100644
--- a/tests/pending/pos/t5119.scala
+++ b/tests/pending/pos/t5119.scala
@@ -4,8 +4,8 @@ object Test {
class IMap0[K[_], V[_]](backing: Map[K[_], V[_]]) {
def mapSeparate[VL[_], VR[_]](f: V[_] => ({type l[T] = Either[VL[T], VR[T]]})#l[_] ) = {
backing.view.map { case (k,v) => f(v) match {
- case Left(l) => Left((k, l))
- case Right(r) => Right((k, r))
+ case Left(l) => Left((k, l))
+ case Right(r) => Right((k, r))
}
}
}
diff --git a/tests/pending/pos/t573.scala b/tests/pending/pos/t573.scala
index 694d001e3..1aadb446c 100644
--- a/tests/pending/pos/t573.scala
+++ b/tests/pending/pos/t573.scala
@@ -20,7 +20,7 @@ abstract class Linked {
abstract class Node0 {
self: Node =>
- var next : Node = _;
+ var next : Node = _;
var prev : Node = _;
def get(dir : Dir) = if (dir == BEFORE) prev; else next;
diff --git a/tests/pending/pos/t5967.scala b/tests/pending/pos/t5967.scala
index eb9bd6dfa..cd219c031 100644
--- a/tests/pending/pos/t5967.scala
+++ b/tests/pending/pos/t5967.scala
@@ -1,6 +1,6 @@
object Test {
- def f(a: Int*) = a match {
- case 0 :: Nil => "List(0)! My favorite Seq!"
- case _ => a.toString
- }
+ def f(a: Int*) = a match {
+ case 0 :: Nil => "List(0)! My favorite Seq!"
+ case _ => a.toString
+ }
}
diff --git a/tests/pending/pos/t6335.scala b/tests/pending/pos/t6335.scala
index 50e34092d..eb052db19 100644
--- a/tests/pending/pos/t6335.scala
+++ b/tests/pending/pos/t6335.scala
@@ -12,14 +12,14 @@ object E extends Z {
}
trait Z {
- def Z = 0
+ def Z = 0
}
object Test {
- import E._
- 0.xx
+ import E._
+ 0.xx
- "".yy
+ "".yy
true.zz
}
diff --git a/tests/pending/pos/t6966.scala b/tests/pending/pos/t6966.scala
index a43d7c501..cd91221a6 100644
--- a/tests/pending/pos/t6966.scala
+++ b/tests/pending/pos/t6966.scala
@@ -2,13 +2,13 @@ import Ordering.{Byte, comparatorToOrdering}
trait Format[T]
trait InputCache[T]
object CacheIvy {
- implicit def basicInputCache[I](implicit fmt: Format[I], eqv: Equiv[I]): InputCache[I] = null
- implicit def arrEquiv[T](implicit t: Equiv[T]): Equiv[Array[T]] = null
- implicit def hNilCache: InputCache[HNil] = null
- implicit def ByteArrayFormat: Format[Array[Byte]] = null
- type :+:[H, T <: HList] = HCons[H,T]
- implicit def hConsCache[H, T <: HList](implicit head: InputCache[H], tail: InputCache[T]): InputCache[H :+: T] = null
- hConsCache[Array[Byte], HNil]
+ implicit def basicInputCache[I](implicit fmt: Format[I], eqv: Equiv[I]): InputCache[I] = null
+ implicit def arrEquiv[T](implicit t: Equiv[T]): Equiv[Array[T]] = null
+ implicit def hNilCache: InputCache[HNil] = null
+ implicit def ByteArrayFormat: Format[Array[Byte]] = null
+ type :+:[H, T <: HList] = HCons[H,T]
+ implicit def hConsCache[H, T <: HList](implicit head: InputCache[H], tail: InputCache[T]): InputCache[H :+: T] = null
+ hConsCache[Array[Byte], HNil]
}
sealed trait HList
diff --git a/tests/pending/pos/t7011.scala b/tests/pending/pos/t7011.scala
index 18d7aeee7..f1f71b9be 100644
--- a/tests/pending/pos/t7011.scala
+++ b/tests/pending/pos/t7011.scala
@@ -1,5 +1,5 @@
object bar {
- def foo: Unit = {
+ def foo: Unit = {
lazy val x = 42
{()=>x}
diff --git a/tests/pending/pos/t7022.scala b/tests/pending/pos/t7022.scala
index 0609e2d25..c86602664 100644
--- a/tests/pending/pos/t7022.scala
+++ b/tests/pending/pos/t7022.scala
@@ -1,9 +1,9 @@
class Catch[+T] {
- def either[U >: T](body: => U): Either[Throwable, U] = ???
+ def either[U >: T](body: => U): Either[Throwable, U] = ???
}
object Test {
- implicit class RichCatch[T](val c: Catch[T]) extends AnyVal {
- def validation[U >: T](u: => U): Either[Throwable, U] = c.either(u)
- }
+ implicit class RichCatch[T](val c: Catch[T]) extends AnyVal {
+ def validation[U >: T](u: => U): Either[Throwable, U] = c.either(u)
+ }
}
diff --git a/tests/pending/pos/test5.scala b/tests/pending/pos/test5.scala
index 4dbafc9ac..c19478048 100644
--- a/tests/pending/pos/test5.scala
+++ b/tests/pending/pos/test5.scala
@@ -12,12 +12,12 @@ object test {
class M[P]() {
abstract class I[X]() {
- // Methods to check the type X and P as seen from instances of I
- def chk_ix(x: X): Unit = ();
- def chk_ip(p: P): Unit;
+ // Methods to check the type X and P as seen from instances of I
+ def chk_ix(x: X): Unit = ();
+ def chk_ip(p: P): Unit;
- // Value with type X as seen from instances of I
- def val_ix: X = val_ix;
+ // Value with type X as seen from instances of I
+ def val_ix: X = val_ix;
}
val i:I[G[P]] = null;
@@ -31,13 +31,13 @@ object test {
val j:J[G[Q]] = null;
abstract class J[Y]() extends I[G[Y]]() {
- // Values with types Y and X as seen from instances of J
- def val_jy: Y = val_jy;
- def val_jx: G[Y] = g[Y](val_jy);
+ // Values with types Y and X as seen from instances of J
+ def val_jy: Y = val_jy;
+ def val_jx: G[Y] = g[Y](val_jy);
- // Check type P
- chk_ip(val_mp);
- chk_ip(val_np);
+ // Check type P
+ chk_ip(val_mp);
+ chk_ip(val_np);
}
// Values with types Q, X.P, i.X, j.Y and j.X as seen from instances of N
diff --git a/tests/pending/pos/test5refine.scala b/tests/pending/pos/test5refine.scala
index 5459b3b97..09ea179da 100644
--- a/tests/pending/pos/test5refine.scala
+++ b/tests/pending/pos/test5refine.scala
@@ -13,14 +13,14 @@ object test {
abstract class M() {
type P;
abstract class I() {
- type X;
+ type X;
- // Methods to check the type X and P as seen from instances of I
- def chk_ix(x: X): Unit = {}
- def chk_ip(p: P): Unit = {}
+ // Methods to check the type X and P as seen from instances of I
+ def chk_ix(x: X): Unit = {}
+ def chk_ip(p: P): Unit = {}
- // Value with type X as seen from instances of I
- def val_ix: X = val_ix;
+ // Value with type X as seen from instances of I
+ def val_ix: X = val_ix;
}
val i: I { type X = G { type Ig = P } } = null;
@@ -36,15 +36,15 @@ object test {
val j:J { type Y = G { type Ig = Q } } = null;
abstract class J() extends I() {
- type Y;
- type X = G { type Ig = Y; };
- // Values with types Y and X as seen from instances of J
- def val_jy: Y = val_jy;
- def val_jx: G { type Ig = Y; } = g[Y](val_jy);
-
- // Check type P
- chk_ip(val_mp);
- chk_ip(val_np);
+ type Y;
+ type X = G { type Ig = Y; };
+ // Values with types Y and X as seen from instances of J
+ def val_jy: Y = val_jy;
+ def val_jx: G { type Ig = Y; } = g[Y](val_jy);
+
+ // Check type P
+ chk_ip(val_mp);
+ chk_ip(val_np);
}
// Values with types Q, X.P, i.X, j.Y and j.X as seen from instances of N
diff --git a/tests/pos/SI-7638.scala b/tests/pos/SI-7638.scala
index ed581efe9..eea302e17 100644
--- a/tests/pos/SI-7638.scala
+++ b/tests/pos/SI-7638.scala
@@ -36,16 +36,16 @@ object vectorOrder {
* unhandled exception while transforming SI-7638.scala
* error: uncaught exception during compilation: java.lang.UnsupportedOperationException
* error: java.lang.UnsupportedOperationException: tail of empty list
- * at scala.collection.immutable.Nil$.tail(List.scala:339)
- * at scala.collection.immutable.Nil$.tail(List.scala:334)
- * at scala.tools.nsc.transform.Mixin$$anonfun$scala$tools$nsc$transform$Mixin$$rebindSuper$1.apply(Mixin.scala:123)
- * at scala.tools.nsc.transform.Mixin$$anonfun$scala$tools$nsc$transform$Mixin$$rebindSuper$1.apply(Mixin.scala:122)
- * at scala.reflect.internal.SymbolTable.atPhase(SymbolTable.scala:207)
- * at scala.reflect.internal.SymbolTable.afterPhase(SymbolTable.scala:216)
- * at scala.tools.nsc.Global.afterPickler(Global.scala:1104)
- * at scala.tools.nsc.transform.Mixin.scala$tools$nsc$transform$Mixin$$rebindSuper(Mixin.scala:122)
- * at scala.tools.nsc.transform.Mixin$$anonfun$scala$tools$nsc$transform$Mixin$$mixinTraitMembers$1$1.apply(Mixin.scala:339)
- * at scala.tools.nsc.transform.Mixin$$anonfun$scala$tools$nsc$transform$Mixin$$mixinTraitMembers$1$1.apply(Mixin.scala:292)
+ * at scala.collection.immutable.Nil$.tail(List.scala:339)
+ * at scala.collection.immutable.Nil$.tail(List.scala:334)
+ * at scala.tools.nsc.transform.Mixin$$anonfun$scala$tools$nsc$transform$Mixin$$rebindSuper$1.apply(Mixin.scala:123)
+ * at scala.tools.nsc.transform.Mixin$$anonfun$scala$tools$nsc$transform$Mixin$$rebindSuper$1.apply(Mixin.scala:122)
+ * at scala.reflect.internal.SymbolTable.atPhase(SymbolTable.scala:207)
+ * at scala.reflect.internal.SymbolTable.afterPhase(SymbolTable.scala:216)
+ * at scala.tools.nsc.Global.afterPickler(Global.scala:1104)
+ * at scala.tools.nsc.transform.Mixin.scala$tools$nsc$transform$Mixin$$rebindSuper(Mixin.scala:122)
+ * at scala.tools.nsc.transform.Mixin$$anonfun$scala$tools$nsc$transform$Mixin$$mixinTraitMembers$1$1.apply(Mixin.scala:339)
+ * at scala.tools.nsc.transform.Mixin$$anonfun$scala$tools$nsc$transform$Mixin$$mixinTraitMembers$1$1.apply(Mixin.scala:292)
*/
new ArrayVectorOrder[A] { }
}
diff --git a/tests/pos/SI-7638a.scala b/tests/pos/SI-7638a.scala
index 060bd0ffa..7a73c8ea3 100644
--- a/tests/pos/SI-7638a.scala
+++ b/tests/pos/SI-7638a.scala
@@ -37,16 +37,16 @@ object vectorOrder {
* unhandled exception while transforming SI-7638.scala
* error: uncaught exception during compilation: java.lang.UnsupportedOperationException
* error: java.lang.UnsupportedOperationException: tail of empty list
- * at scala.collection.immutable.Nil$.tail(List.scala:339)
- * at scala.collection.immutable.Nil$.tail(List.scala:334)
- * at scala.tools.nsc.transform.Mixin$$anonfun$scala$tools$nsc$transform$Mixin$$rebindSuper$1.apply(Mixin.scala:123)
- * at scala.tools.nsc.transform.Mixin$$anonfun$scala$tools$nsc$transform$Mixin$$rebindSuper$1.apply(Mixin.scala:122)
- * at scala.reflect.internal.SymbolTable.atPhase(SymbolTable.scala:207)
- * at scala.reflect.internal.SymbolTable.afterPhase(SymbolTable.scala:216)
- * at scala.tools.nsc.Global.afterPickler(Global.scala:1104)
- * at scala.tools.nsc.transform.Mixin.scala$tools$nsc$transform$Mixin$$rebindSuper(Mixin.scala:122)
- * at scala.tools.nsc.transform.Mixin$$anonfun$scala$tools$nsc$transform$Mixin$$mixinTraitMembers$1$1.apply(Mixin.scala:339)
- * at scala.tools.nsc.transform.Mixin$$anonfun$scala$tools$nsc$transform$Mixin$$mixinTraitMembers$1$1.apply(Mixin.scala:292)
+ * at scala.collection.immutable.Nil$.tail(List.scala:339)
+ * at scala.collection.immutable.Nil$.tail(List.scala:334)
+ * at scala.tools.nsc.transform.Mixin$$anonfun$scala$tools$nsc$transform$Mixin$$rebindSuper$1.apply(Mixin.scala:123)
+ * at scala.tools.nsc.transform.Mixin$$anonfun$scala$tools$nsc$transform$Mixin$$rebindSuper$1.apply(Mixin.scala:122)
+ * at scala.reflect.internal.SymbolTable.atPhase(SymbolTable.scala:207)
+ * at scala.reflect.internal.SymbolTable.afterPhase(SymbolTable.scala:216)
+ * at scala.tools.nsc.Global.afterPickler(Global.scala:1104)
+ * at scala.tools.nsc.transform.Mixin.scala$tools$nsc$transform$Mixin$$rebindSuper(Mixin.scala:122)
+ * at scala.tools.nsc.transform.Mixin$$anonfun$scala$tools$nsc$transform$Mixin$$mixinTraitMembers$1$1.apply(Mixin.scala:339)
+ * at scala.tools.nsc.transform.Mixin$$anonfun$scala$tools$nsc$transform$Mixin$$mixinTraitMembers$1$1.apply(Mixin.scala:292)
*/
new ArrayVectorOrder[A] { }
}
diff --git a/tests/pos/java-interop/t2433/Test.scala b/tests/pos/java-interop/t2433/Test.scala
index 02fd89b64..02fd89b64 100755..100644
--- a/tests/pos/java-interop/t2433/Test.scala
+++ b/tests/pos/java-interop/t2433/Test.scala
diff --git a/tests/pos/java-interop/t2940/Error.scala b/tests/pos/java-interop/t2940/Error.scala
index 92f08f580..305d8aa4c 100644
--- a/tests/pos/java-interop/t2940/Error.scala
+++ b/tests/pos/java-interop/t2940/Error.scala
@@ -1,5 +1,5 @@
abstract class Error {
- val c: Cycle[_]
+ val c: Cycle[_]
}
object Test {
diff --git a/tests/pos/java-interop/t2956/t2956.scala b/tests/pos/java-interop/t2956/t2956.scala
index 33803874b..33803874b 100755..100644
--- a/tests/pos/java-interop/t2956/t2956.scala
+++ b/tests/pos/java-interop/t2956/t2956.scala
diff --git a/tests/pos/t0031.scala b/tests/pos/t0031.scala
index d4050c818..6070a4683 100644
--- a/tests/pos/t0031.scala
+++ b/tests/pos/t0031.scala
@@ -7,12 +7,12 @@ object Main {
def require[a](precondition: => Boolean)(command: => a): Ensure[a] =
if (precondition)
new Ensure[a] {
- def ensure(postcondition: a => Boolean): a = {
- val result = command;
- if (postcondition(result)) result
- else sys.error("Assertion error")
+ def ensure(postcondition: a => Boolean): a = {
+ val result = command;
+ if (postcondition(result)) result
+ else sys.error("Assertion error")
}
- }
+ }
else
sys.error("Assertion error");
@@ -22,7 +22,7 @@ object Main {
} ensure (result => s contains result);
def main(args: Array[String]) = {
- val s = List(1, 2);
+ val s = List(1, 2);
Console.println(arb(s))
}
diff --git a/tests/pos/t0039.scala b/tests/pos/t0039.scala
index 652c606b0..7b51320e2 100644
--- a/tests/pos/t0039.scala
+++ b/tests/pos/t0039.scala
@@ -1,6 +1,6 @@
abstract class Extensible[A, This <: Extensible[A, This]](x: A, xs: This) { self: This =>
- def mkObj(x: A, xs: This): This;
+ def mkObj(x: A, xs: This): This;
}
class Fixed[A](x: A, xs: Fixed[A]) extends Extensible[A, Fixed[A]](x, xs) {
- def mkObj(x: A, xs: Fixed[A]) = new Fixed(x, xs);
+ def mkObj(x: A, xs: Fixed[A]) = new Fixed(x, xs);
}
diff --git a/tests/pos/t0061.scala b/tests/pos/t0061.scala
index 8a3aed7c6..0228413fa 100644
--- a/tests/pos/t0061.scala
+++ b/tests/pos/t0061.scala
@@ -5,6 +5,6 @@ object O {
case class testA() extends testClass ;
def ga( x:testClass ) = x match {
- case testA() => ()
+ case testA() => ()
}
}
diff --git a/tests/pos/t0066.scala b/tests/pos/t0066.scala
index 8ac328908..04bcd1f5d 100644
--- a/tests/pos/t0066.scala
+++ b/tests/pos/t0066.scala
@@ -1,7 +1,7 @@
class GBTree[A, B] {
abstract class Tree[A,B];
case class Node[A,B](key:A,value:B,smaller:Node[A,B],bigger:Node[A,B])
- extends Tree[A,B];
+ extends Tree[A,B];
case class Nil[A,B]() extends Tree[A,B];
}
diff --git a/tests/pos/t0770.scala b/tests/pos/t0770.scala
index 7a0a2bf9b..54990ec09 100644
--- a/tests/pos/t0770.scala
+++ b/tests/pos/t0770.scala
@@ -1,13 +1,13 @@
trait A
{
- private[this] val p = 5
+ private[this] val p = 5
- def f = (b: Byte) => p
+ def f = (b: Byte) => p
}
trait B
{
- def failure: Boolean
- def success = !failure
+ def failure: Boolean
+ def success = !failure
}
diff --git a/tests/pos/t1085.scala b/tests/pos/t1085.scala
index c59e657cb..62f2be0b8 100644
--- a/tests/pos/t1085.scala
+++ b/tests/pos/t1085.scala
@@ -1,5 +1,5 @@
trait Functor[a] {
- type MyType[a]
+ type MyType[a]
}
object Test {
diff --git a/tests/pos/t1722/Test.scala b/tests/pos/t1722/Test.scala
index f236d3fdc..f236d3fdc 100755..100644
--- a/tests/pos/t1722/Test.scala
+++ b/tests/pos/t1722/Test.scala
diff --git a/tests/pos/t1722/Top.scala b/tests/pos/t1722/Top.scala
index 4ac52412a..4ac52412a 100755..100644
--- a/tests/pos/t1722/Top.scala
+++ b/tests/pos/t1722/Top.scala
diff --git a/tests/pos/t2060.scala b/tests/pos/t2060.scala
index 0b9079062..0b9079062 100755..100644
--- a/tests/pos/t2060.scala
+++ b/tests/pos/t2060.scala
diff --git a/tests/pos/t2082.scala b/tests/pos/t2082.scala
index a7ee3789b..34a7c4e3a 100755..100644
--- a/tests/pos/t2082.scala
+++ b/tests/pos/t2082.scala
@@ -13,7 +13,7 @@ trait IdPK
class TestSubject extends KeyedMapper[Long, TestSubject] with IdPK
class TestRun extends KeyedMapper[Long, TestRun] with IdPK {
- object testSubject extends MappedForeignKey[Long, TestRun, TestSubject]
+ object testSubject extends MappedForeignKey[Long, TestRun, TestSubject]
}
object TestRun extends TestRun with KeyedMetaMapper[Long, TestRun]
diff --git a/tests/pos/t2179.scala b/tests/pos/t2179.scala
index 89e22b6e2..89e22b6e2 100755..100644
--- a/tests/pos/t2179.scala
+++ b/tests/pos/t2179.scala
diff --git a/tests/pos/t2208_pos.scala b/tests/pos/t2208_pos.scala
index dd6d686ba..9f8f96c7d 100644
--- a/tests/pos/t2208_pos.scala
+++ b/tests/pos/t2208_pos.scala
@@ -1,8 +1,8 @@
object Test {
- class A
+ class A
- class B[X]
- type Alias[X <: A] = B[X]
+ class B[X]
+ type Alias[X <: A] = B[X]
- val foo: B[A] = new Alias[A] // check that type aliases can be instantiated
+ val foo: B[A] = new Alias[A] // check that type aliases can be instantiated
}
diff --git a/tests/pos/t2305.scala b/tests/pos/t2305.scala
index 3338ab911..37d4ac6ca 100644
--- a/tests/pos/t2305.scala
+++ b/tests/pos/t2305.scala
@@ -5,22 +5,22 @@ trait Bind[Z[_]]
class MySerializable[X] extends java.io.Serializable
object Bind {
- implicit val JavaArrayListBind: Bind[ArrayList] = new Bind[ArrayList] {}
- implicit val MySerializableBind: Bind[MySerializable] = new Bind[MySerializable] {}
+ implicit val JavaArrayListBind: Bind[ArrayList] = new Bind[ArrayList] {}
+ implicit val MySerializableBind: Bind[MySerializable] = new Bind[MySerializable] {}
}
object works {
- // this works fine:
- def runbind(implicit bind: Bind[MySerializable]): Unit = {}
- runbind
+ // this works fine:
+ def runbind(implicit bind: Bind[MySerializable]): Unit = {}
+ runbind
}
object breaks {
- def runbind(implicit bind: Bind[ArrayList]): Unit = {}
+ def runbind(implicit bind: Bind[ArrayList]): Unit = {}
runbind
- /*java.lang.AssertionError: assertion failed: java.io.Serializable
- at scala.Predef$.assert(Predef.scala:107)
- at scala.tools.nsc.symtab.Types$TypeRef.transform(Types.scala:1417)
- at scala.tools.nsc.symtab.Types$TypeRef.baseType(Types.scala:1559)
- */
+ /*java.lang.AssertionError: assertion failed: java.io.Serializable
+ at scala.Predef$.assert(Predef.scala:107)
+ at scala.tools.nsc.symtab.Types$TypeRef.transform(Types.scala:1417)
+ at scala.tools.nsc.symtab.Types$TypeRef.baseType(Types.scala:1559)
+ */
}
diff --git a/tests/pos/t2405.scala b/tests/pos/t2405.scala
index 224b2ce83..a4ac914fb 100644
--- a/tests/pos/t2405.scala
+++ b/tests/pos/t2405.scala
@@ -2,22 +2,22 @@ object A { implicit val x: Int = 1 }
// Problem as stated in the ticket.
object Test1 {
- import A.{x => y}
- implicitly[Int]
+ import A.{x => y}
+ implicitly[Int]
}
// Testing for the absense of shadowing #1.
object Test2 {
- import A.{x => y}
- val x = 2
- implicitly[Int]
+ import A.{x => y}
+ val x = 2
+ implicitly[Int]
}
// Testing for the absense of shadowing #2.
object Test3 {
- {
- import A.{x => y}
- def x: Int = 0
- implicitly[Int]
- }
+ {
+ import A.{x => y}
+ def x: Int = 0
+ implicitly[Int]
+ }
}
diff --git a/tests/pos/t2425.scala b/tests/pos/t2425.scala
index 477d5467a..477d5467a 100755..100644
--- a/tests/pos/t2425.scala
+++ b/tests/pos/t2425.scala
diff --git a/tests/pos/t2429.scala b/tests/pos/t2429.scala
index 4cda3bde1..4cda3bde1 100755..100644
--- a/tests/pos/t2429.scala
+++ b/tests/pos/t2429.scala
diff --git a/tests/pos/t2444.scala b/tests/pos/t2444.scala
index fac1e95d0..fb93749aa 100644
--- a/tests/pos/t2444.scala
+++ b/tests/pos/t2444.scala
@@ -9,7 +9,7 @@ object Test {
def frob[P1, P2<:Foo](f:P1 => P2) = ()
def main(args:Array[String]) : Unit = {
- frob((p:Bar) => p.baz)
+ frob((p:Bar) => p.baz)
}
}
diff --git a/tests/pos/t2484.scala b/tests/pos/t2484.scala
index b822415fd..b822415fd 100755..100644
--- a/tests/pos/t2484.scala
+++ b/tests/pos/t2484.scala
diff --git a/tests/pos/t2500.scala b/tests/pos/t2500.scala
index d0ff99a93..4b02fe488 100644
--- a/tests/pos/t2500.scala
+++ b/tests/pos/t2500.scala
@@ -1,6 +1,6 @@
object Test {
- import scala.collection._
- ((Map(1 -> "a", 2 -> "b"): collection.Map[Int, String]) map identity[(Int, String)]) : scala.collection.Map[Int,String]
- ((SortedMap(1 -> "a", 2 -> "b"): collection.SortedMap[Int, String]) map identity[(Int, String)]): scala.collection.SortedMap[Int,String]
- ((SortedSet(1, 2): collection.SortedSet[Int]) map identity[Int]): scala.collection.SortedSet[Int]
+ import scala.collection._
+ ((Map(1 -> "a", 2 -> "b"): collection.Map[Int, String]) map identity[(Int, String)]) : scala.collection.Map[Int,String]
+ ((SortedMap(1 -> "a", 2 -> "b"): collection.SortedMap[Int, String]) map identity[(Int, String)]): scala.collection.SortedMap[Int,String]
+ ((SortedSet(1, 2): collection.SortedSet[Int]) map identity[Int]): scala.collection.SortedSet[Int]
}
diff --git a/tests/pos/t2504.scala b/tests/pos/t2504.scala
index 72117174c..72117174c 100755..100644
--- a/tests/pos/t2504.scala
+++ b/tests/pos/t2504.scala
diff --git a/tests/pos/t2545.scala b/tests/pos/t2545.scala
index 6ad994223..6ad994223 100755..100644
--- a/tests/pos/t2545.scala
+++ b/tests/pos/t2545.scala
diff --git a/tests/pos/t2591.scala b/tests/pos/t2591.scala
index 47ae551bf..59f7a02cc 100644
--- a/tests/pos/t2591.scala
+++ b/tests/pos/t2591.scala
@@ -7,9 +7,9 @@ object Implicits {
}
object Test {
- // should cause imp to be in scope so that the next expression type checks
- // `import Implicits._` works
- import Implicits.imp
+ // should cause imp to be in scope so that the next expression type checks
+ // `import Implicits._` works
+ import Implicits.imp
(new A) : Int
}
diff --git a/tests/pos/t2635.scala b/tests/pos/t2635.scala
index 7cd553135..7cd553135 100755..100644
--- a/tests/pos/t2635.scala
+++ b/tests/pos/t2635.scala
diff --git a/tests/pos/t2683.scala b/tests/pos/t2683.scala
index 4ba34b554..4ba34b554 100755..100644
--- a/tests/pos/t2683.scala
+++ b/tests/pos/t2683.scala
diff --git a/tests/pos/t3174.scala b/tests/pos/t3174.scala
index 8d9b2578d..8d9b2578d 100755..100644
--- a/tests/pos/t3174.scala
+++ b/tests/pos/t3174.scala
diff --git a/tests/pos/t3278.scala b/tests/pos/t3278.scala
index 05bfbc146..254f4dc79 100644
--- a/tests/pos/t3278.scala
+++ b/tests/pos/t3278.scala
@@ -1,30 +1,30 @@
class Foo
class Test {
- def update[B](x : B, b : Int): Unit = {}
- def apply[B](x : B) = 1
+ def update[B](x : B, b : Int): Unit = {}
+ def apply[B](x : B) = 1
}
class Test2 {
type B = Foo
- def update(x : B, b : Int): Unit = {}
- def apply(x : B) = 1
+ def update(x : B, b : Int): Unit = {}
+ def apply(x : B) = 1
}
object Test {
- def main(a : Array[String]): Unit = {
- val a = new Test
- val f = new Foo
- a(f) = 1 //works
- a(f) = a(f) + 1 //works
- a(f) += 1 //error: reassignment to val
- }
+ def main(a : Array[String]): Unit = {
+ val a = new Test
+ val f = new Foo
+ a(f) = 1 //works
+ a(f) = a(f) + 1 //works
+ a(f) += 1 //error: reassignment to val
+ }
}
object Test2 {
- def main(args : Array[String]): Unit = {
+ def main(args : Array[String]): Unit = {
args(0) += "a"
- val a = new Test2
- val f = new Foo
- a(f) = 1 //works
- a(f) = a(f) + 1 //works
- a(f) += 1 //error: reassignment to val
- }
+ val a = new Test2
+ val f = new Foo
+ a(f) = 1 //works
+ a(f) = a(f) + 1 //works
+ a(f) += 1 //error: reassignment to val
+ }
}
diff --git a/tests/untried/neg-with-implicits/implicit-shadow.scala b/tests/untried/neg-with-implicits/implicit-shadow.scala
index ec7f70b6d..b03d0edbd 100644
--- a/tests/untried/neg-with-implicits/implicit-shadow.scala
+++ b/tests/untried/neg-with-implicits/implicit-shadow.scala
@@ -1,11 +1,11 @@
object Test {
- import B._, C._
+ import B._, C._
- 1.isEmpty
+ 1.isEmpty
}
trait A {
- implicit def i2s(i: Int): String = ""
+ implicit def i2s(i: Int): String = ""
}
object B extends A
diff --git a/tests/untried/neg-with-implicits/t2405.scala b/tests/untried/neg-with-implicits/t2405.scala
index 6982285b9..c005e7a54 100644
--- a/tests/untried/neg-with-implicits/t2405.scala
+++ b/tests/untried/neg-with-implicits/t2405.scala
@@ -2,9 +2,9 @@ object A { implicit val x: Int = 1 }
// Expecting shadowing #1
object Test2 {
- {
- import A.{x => y}
- def y: Int = 0
- implicitly[Int]
- }
+ {
+ import A.{x => y}
+ def y: Int = 0
+ implicitly[Int]
+ }
}
diff --git a/tests/untried/neg-with-implicits/t3006.scala b/tests/untried/neg-with-implicits/t3006.scala
index a84b69c84..a84b69c84 100755..100644
--- a/tests/untried/neg-with-implicits/t3006.scala
+++ b/tests/untried/neg-with-implicits/t3006.scala
diff --git a/tests/untried/neg-with-implicits/t3224.scala b/tests/untried/neg-with-implicits/t3224.scala
index b7af8a67b..b7af8a67b 100755..100644
--- a/tests/untried/neg-with-implicits/t3224.scala
+++ b/tests/untried/neg-with-implicits/t3224.scala
diff --git a/tests/untried/neg/override.scala b/tests/untried/neg/override.scala
index 797551606..797551606 100755..100644
--- a/tests/untried/neg/override.scala
+++ b/tests/untried/neg/override.scala
diff --git a/tests/untried/neg/t1181.scala b/tests/untried/neg/t1181.scala
index 5e5fceacc..6cae8f576 100644
--- a/tests/untried/neg/t1181.scala
+++ b/tests/untried/neg/t1181.scala
@@ -3,7 +3,7 @@ package test
import scala.collection.immutable.Map
class CompilerTest(val valueList: List[Symbol]) {
- def buildMap(map: Map[Symbol, Symbol], keyList: List[Symbol], valueList: List[Symbol]): Map[Symbol, Symbol] = {
+ def buildMap(map: Map[Symbol, Symbol], keyList: List[Symbol], valueList: List[Symbol]): Map[Symbol, Symbol] = {
(keyList, valueList) match {
case (Nil, Nil) => map
_ => buildMap(map.updated(keyList.head, valueList.head), keyList.tail, valueList.tail)
diff --git a/tests/untried/neg/t1432.scala b/tests/untried/neg/t1432.scala
index bdf233128..5df20121d 100644
--- a/tests/untried/neg/t1432.scala
+++ b/tests/untried/neg/t1432.scala
@@ -7,7 +7,7 @@ object Bug_NoUnique {
type Alias2[E] = Wrap[E]
def wrap[E,A,Y](v : (A,E=>Y)) : (A,Alias2[E]=>Y) =
- throw new Error("Body here")
+ throw new Error("Body here")
def test(x : TypeCon[Wrap[Unit]]) : TypeCon[Unit] = wrap(x)
}
diff --git a/tests/untried/neg/t2066b.scala b/tests/untried/neg/t2066b.scala
index 2f8ffde14..aebf761fc 100644
--- a/tests/untried/neg/t2066b.scala
+++ b/tests/untried/neg/t2066b.scala
@@ -1,16 +1,16 @@
object Test extends App {
- trait A {
- def f[T[_]](x : T[Int]) : T[Any]
- }
+ trait A {
+ def f[T[_]](x : T[Int]) : T[Any]
+ }
- class B extends A {
- def f[T[+_]](x : T[Int]) : T[Any] = x
- }
+ class B extends A {
+ def f[T[+_]](x : T[Int]) : T[Any] = x
+ }
- class P[Y](var y : Y)
+ class P[Y](var y : Y)
- val p = new P(1)
- val palias = (new B():A).f[P](p)
- palias.y = "hello"
- val z: Int = p.y
+ val p = new P(1)
+ val palias = (new B():A).f[P](p)
+ palias.y = "hello"
+ val z: Int = p.y
}
diff --git a/tests/untried/neg/t2208.scala b/tests/untried/neg/t2208.scala
index 53165cc81..b86b1d9b3 100644
--- a/tests/untried/neg/t2208.scala
+++ b/tests/untried/neg/t2208.scala
@@ -1,8 +1,8 @@
object Test {
- class A
+ class A
- class B[X]
- type Alias[X <: A] = B[X]
+ class B[X]
+ type Alias[X <: A] = B[X]
- class C extends Alias[Any] // not ok, normalisation should check bounds before expanding Alias
+ class C extends Alias[Any] // not ok, normalisation should check bounds before expanding Alias
}
diff --git a/tests/untried/neg/t2336.scala b/tests/untried/neg/t2336.scala
index 4cea02b72..4cea02b72 100755..100644
--- a/tests/untried/neg/t2336.scala
+++ b/tests/untried/neg/t2336.scala
diff --git a/tests/untried/neg/t2494.scala b/tests/untried/neg/t2494.scala
index 71e6bc4bb..71e6bc4bb 100755..100644
--- a/tests/untried/neg/t2494.scala
+++ b/tests/untried/neg/t2494.scala
diff --git a/tests/untried/neg/t2773.scala b/tests/untried/neg/t2773.scala
index aaa6351c8..aaa6351c8 100755..100644
--- a/tests/untried/neg/t2773.scala
+++ b/tests/untried/neg/t2773.scala
diff --git a/tests/untried/neg/t2779.scala b/tests/untried/neg/t2779.scala
index d025055aa..d025055aa 100755..100644
--- a/tests/untried/neg/t2779.scala
+++ b/tests/untried/neg/t2779.scala
diff --git a/tests/untried/neg/t2870.scala b/tests/untried/neg/t2870.scala
index 4de19242e..4de19242e 100755..100644
--- a/tests/untried/neg/t2870.scala
+++ b/tests/untried/neg/t2870.scala
diff --git a/tests/untried/neg/t2918.scala b/tests/untried/neg/t2918.scala
index ff2be39ae..ff2be39ae 100755..100644
--- a/tests/untried/neg/t2918.scala
+++ b/tests/untried/neg/t2918.scala
diff --git a/tests/untried/neg/t2968.scala b/tests/untried/neg/t2968.scala
index 41c3a798a..0adad4cd5 100644
--- a/tests/untried/neg/t2968.scala
+++ b/tests/untried/neg/t2968.scala
@@ -1,26 +1,26 @@
object t1 {
- case object Const {
- }
+ case object Const {
+ }
- class Var
- {
+ class Var
+ {
} // missing brace
object t2 {
- case class Const() {
- }
+ case class Const() {
+ }
- class Var
- {
+ class Var
+ {
} // missing brace
object t3 {
- final case class Const() {
- }
+ final case class Const() {
+ }
- class Var
- {
+ class Var
+ {
} // missing brace
diff --git a/tests/untried/neg/t3913.scala b/tests/untried/neg/t3913.scala
index a5408fe02..ef8cf5591 100644
--- a/tests/untried/neg/t3913.scala
+++ b/tests/untried/neg/t3913.scala
@@ -4,5 +4,5 @@ object LimboStage extends Stage( Set( LimboStage ))
object Test {
def main( args: Array[ String ]): Unit = {
val x = LimboStage
- }
+ }
}
diff --git a/tests/untried/neg/t4460b.scala b/tests/untried/neg/t4460b.scala
index 1233017dd..d347d5c53 100644
--- a/tests/untried/neg/t4460b.scala
+++ b/tests/untried/neg/t4460b.scala
@@ -1,9 +1,9 @@
trait A
class Outer() {
- class B(val x: Int) {
- self: A =>
+ class B(val x: Int) {
+ self: A =>
- def this() = this() // was binding to Predef.<init> !!
- }
+ def this() = this() // was binding to Predef.<init> !!
+ }
}
diff --git a/tests/untried/neg/t4818.scala b/tests/untried/neg/t4818.scala
index faae22920..c04b359b4 100644
--- a/tests/untried/neg/t4818.scala
+++ b/tests/untried/neg/t4818.scala
@@ -1,7 +1,7 @@
object Test {
- case class Fn[A, B](f: A => B)
+ case class Fn[A, B](f: A => B)
- def f(x: Any) = x match { case Fn(f) => f(5) }
+ def f(x: Any) = x match { case Fn(f) => f(5) }
- Fn((x: String) => x)
+ Fn((x: String) => x)
}
diff --git a/tests/untried/neg/t576.scala b/tests/untried/neg/t576.scala
index fd83217a4..2aaa65a65 100644
--- a/tests/untried/neg/t576.scala
+++ b/tests/untried/neg/t576.scala
@@ -6,7 +6,7 @@ abstract class BaseListXXX {
}
}
trait PriorityTreeXXX extends BaseListXXX {
- type Node <: BasicTreeNode;
+ type Node <: BasicTreeNode;
trait BasicTreeNode extends BaseNode {
def sibling: Node;
diff --git a/tests/untried/neg/t6214.scala b/tests/untried/neg/t6214.scala
index 0d5ffc5de..56d5e9360 100644
--- a/tests/untried/neg/t6214.scala
+++ b/tests/untried/neg/t6214.scala
@@ -2,6 +2,6 @@ object Test {
def m(f: String => Unit) = 0
def m(f: Int => Unit) = 0
def foo: Unit = {
- m { s => case class Foo() }
+ m { s => case class Foo() }
}
}
diff --git a/tests/untried/neg/t6258.scala b/tests/untried/neg/t6258.scala
index 19794b325..58236d154 100644
--- a/tests/untried/neg/t6258.scala
+++ b/tests/untried/neg/t6258.scala
@@ -1,10 +1,10 @@
object Test {
- val f : PartialFunction[_, Int] = { case a : Int => a } // undefined param
+ val f : PartialFunction[_, Int] = { case a : Int => a } // undefined param
- def foo[A](pf: PartialFunction[A, Int]): Unit = {};
- foo { case a : Int => a } // undefined param
+ def foo[A](pf: PartialFunction[A, Int]): Unit = {};
+ foo { case a : Int => a } // undefined param
- val g : PartialFunction[Int, _] = { case a : Int => a } // okay
+ val g : PartialFunction[Int, _] = { case a : Int => a } // okay
}
diff --git a/tests/untried/neg/t6558.scala b/tests/untried/neg/t6558.scala
index b4304ff68..57f02f13f 100644
--- a/tests/untried/neg/t6558.scala
+++ b/tests/untried/neg/t6558.scala
@@ -7,6 +7,6 @@ class AnnotNotFound {
class D[@typeparam T]
class E(
- @valueparam x: Any
+ @valueparam x: Any
)
}
diff --git a/tests/untried/neg/t771.scala b/tests/untried/neg/t771.scala
index 26bf44164..26bf44164 100755..100644
--- a/tests/untried/neg/t771.scala
+++ b/tests/untried/neg/t771.scala
diff --git a/tests/untried/pos/ilya2/A.scala b/tests/untried/pos/ilya2/A.scala
index 923b50f04..e9b225be8 100644
--- a/tests/untried/pos/ilya2/A.scala
+++ b/tests/untried/pos/ilya2/A.scala
@@ -1,3 +1,3 @@
class A {
- def foo = new B().bar(null)
+ def foo = new B().bar(null)
}
diff --git a/tests/untried/pos/lexical.scala b/tests/untried/pos/lexical.scala
index 8c29513bb..8c29513bb 100755..100644
--- a/tests/untried/pos/lexical.scala
+++ b/tests/untried/pos/lexical.scala
diff --git a/tests/untried/pos/packageobjs.scala b/tests/untried/pos/packageobjs.scala
index ccab13371..ccab13371 100755..100644
--- a/tests/untried/pos/packageobjs.scala
+++ b/tests/untried/pos/packageobjs.scala
diff --git a/tests/untried/pos/pos-bug1210.scala b/tests/untried/pos/pos-bug1210.scala
index eb163a956..c19e77e80 100644
--- a/tests/untried/pos/pos-bug1210.scala
+++ b/tests/untried/pos/pos-bug1210.scala
@@ -7,21 +7,21 @@ object Test
abstract class M
{ self =>
- type Settings
- type selfType = M {type Settings = self.Settings}
+ type Settings
+ type selfType = M {type Settings = self.Settings}
val v: List[selfType] = f[selfType]((x: selfType) => x.v)
}
abstract class M2
{ self =>
- type Settings
- type selfType = M2 {type Settings = self.Settings}
+ type Settings
+ type selfType = M2 {type Settings = self.Settings}
def g: List[selfType] = Nil
{
- f[selfType](_.g)
+ f[selfType](_.g)
}
}
}
diff --git a/tests/untried/pos/scoping2.scala b/tests/untried/pos/scoping2.scala
index 39f3ef5f0..299c5e304 100644
--- a/tests/untried/pos/scoping2.scala
+++ b/tests/untried/pos/scoping2.scala
@@ -4,8 +4,8 @@ object That {
trait I {}
}
trait B {
- type T <: J;
- trait J {}
+ type T <: J;
+ trait J {}
}
trait C extends A with B {
type T <: I with J;
diff --git a/tests/untried/pos/simple-exceptions.scala b/tests/untried/pos/simple-exceptions.scala
index a9f16bf90..4572b9aa6 100644
--- a/tests/untried/pos/simple-exceptions.scala
+++ b/tests/untried/pos/simple-exceptions.scala
@@ -7,7 +7,7 @@ object Test {
def main(args: Array[String]): Unit = {
try {
try {
- Console.println("hi!")
+ Console.println("hi!")
sys.error("xx")
}
finally Console.println("ho!")
diff --git a/tests/untried/pos/spec-t6286.scala b/tests/untried/pos/spec-t6286.scala
index 4d87998ec..4d87998ec 100755..100644
--- a/tests/untried/pos/spec-t6286.scala
+++ b/tests/untried/pos/spec-t6286.scala
diff --git a/tests/untried/pos/t2635.scala b/tests/untried/pos/t2635.scala
index 7cd553135..7cd553135 100755..100644
--- a/tests/untried/pos/t2635.scala
+++ b/tests/untried/pos/t2635.scala
diff --git a/tests/untried/pos/t2683.scala b/tests/untried/pos/t2683.scala
index 4ba34b554..4ba34b554 100755..100644
--- a/tests/untried/pos/t2683.scala
+++ b/tests/untried/pos/t2683.scala
diff --git a/tests/untried/pos/t3174b.scala b/tests/untried/pos/t3174b.scala
index 4df1bfe83..4df1bfe83 100755..100644
--- a/tests/untried/pos/t3174b.scala
+++ b/tests/untried/pos/t3174b.scala
diff --git a/tests/untried/pos/t3570.scala b/tests/untried/pos/t3570.scala
index 0e20905af..237391719 100644
--- a/tests/untried/pos/t3570.scala
+++ b/tests/untried/pos/t3570.scala
@@ -1,7 +1,7 @@
class test {
- object Break extends Throwable
- def break = throw Break
- def block(x: => Unit): Unit = {
- try { x } catch { case e: Break.type => }
- }
+ object Break extends Throwable
+ def break = throw Break
+ def block(x: => Unit): Unit = {
+ try { x } catch { case e: Break.type => }
+ }
}
diff --git a/tests/untried/pos/t3578.scala b/tests/untried/pos/t3578.scala
index d98411820..2ce92a776 100644
--- a/tests/untried/pos/t3578.scala
+++ b/tests/untried/pos/t3578.scala
@@ -2,16 +2,16 @@ object Test {
sealed abstract class JValue {
def ++(other: JValue) = {
def append(value1: JValue, value2: JValue): JValue = (value1, value2) match {
- case (JNothing, x) => x
- case (x, JNothing) => x
- case (JObject(xs), x: JField) => JObject(xs ::: List(x))
- case (x: JField, JObject(xs)) => JObject(x :: xs)
- case (JArray(xs), JArray(ys)) => JArray(xs ::: ys)
- case (JArray(xs), v: JValue) => JArray(xs ::: List(v))
- case (v: JValue, JArray(xs)) => JArray(v :: xs)
- case (f1: JField, f2: JField) => JObject(f1 :: f2 :: Nil)
- case (JField(n, v1), v2: JValue) => JField(n, append(v1, v2))
- case (x, y) => JArray(x :: y :: Nil)
+ case (JNothing, x) => x
+ case (x, JNothing) => x
+ case (JObject(xs), x: JField) => JObject(xs ::: List(x))
+ case (x: JField, JObject(xs)) => JObject(x :: xs)
+ case (JArray(xs), JArray(ys)) => JArray(xs ::: ys)
+ case (JArray(xs), v: JValue) => JArray(xs ::: List(v))
+ case (v: JValue, JArray(xs)) => JArray(v :: xs)
+ case (f1: JField, f2: JField) => JObject(f1 :: f2 :: Nil)
+ case (JField(n, v1), v2: JValue) => JField(n, append(v1, v2))
+ case (x, y) => JArray(x :: y :: Nil)
}
append(this, other)
}
diff --git a/tests/untried/pos/t4220.scala b/tests/untried/pos/t4220.scala
index 98f264976..280bb6dab 100644
--- a/tests/untried/pos/t4220.scala
+++ b/tests/untried/pos/t4220.scala
@@ -3,5 +3,5 @@
class Boo(a: Int = 0)
object test {
- class Boo
+ class Boo
}
diff --git a/tests/untried/pos/t443.scala b/tests/untried/pos/t443.scala
index cdaefe9ec..f1f7ec258 100644
--- a/tests/untried/pos/t443.scala
+++ b/tests/untried/pos/t443.scala
@@ -3,12 +3,12 @@ object Test {
def lookup(): Option[Tuple2[String, String]] =
((null: Option[Tuple2[String, String]]) : @unchecked) match {
case Some((_, _)) =>
- if (true)
- Some((null, null))
- else
- lookup() match {
- case Some(_) => Some(null)
- case None => None
- }
+ if (true)
+ Some((null, null))
+ else
+ lookup() match {
+ case Some(_) => Some(null)
+ case None => None
+ }
}
}
diff --git a/tests/untried/pos/t4842.scala b/tests/untried/pos/t4842.scala
index 17ff68483..24a71294d 100644
--- a/tests/untried/pos/t4842.scala
+++ b/tests/untried/pos/t4842.scala
@@ -13,14 +13,14 @@ class Blerg (x: AnyRef) {
class Outer {
- class Inner (x: AnyRef) {
- def this() = {
- this(new { class Bar { println(Bar.this); new { println(Bar.this) } }; new Bar } ) // okay
- }
+ class Inner (x: AnyRef) {
+ def this() = {
+ this(new { class Bar { println(Bar.this); new { println(Bar.this) } }; new Bar } ) // okay
+ }
- def this(x: Boolean) = {
- this(new { println(Outer.this) } ) // okay
- }
- }
+ def this(x: Boolean) = {
+ this(new { println(Outer.this) } ) // okay
+ }
+ }
}
diff --git a/tests/untried/pos/t6028/t6028_1.scala b/tests/untried/pos/t6028/t6028_1.scala
index 6edb76069..521d2e07d 100644
--- a/tests/untried/pos/t6028/t6028_1.scala
+++ b/tests/untried/pos/t6028/t6028_1.scala
@@ -1,3 +1,3 @@
class C {
- def foo(a: Int): Unit = () => a
+ def foo(a: Int): Unit = () => a
}
diff --git a/tests/untried/pos/t6028/t6028_2.scala b/tests/untried/pos/t6028/t6028_2.scala
index f44048c0a..de053b8e6 100644
--- a/tests/untried/pos/t6028/t6028_2.scala
+++ b/tests/untried/pos/t6028/t6028_2.scala
@@ -1,4 +1,4 @@
object Test {
- // ensure that parameter names are untouched by lambdalift
- new C().foo(a = 0)
+ // ensure that parameter names are untouched by lambdalift
+ new C().foo(a = 0)
}
diff --git a/tests/untried/pos/t6601/UsePrivateValueClass_2.scala b/tests/untried/pos/t6601/UsePrivateValueClass_2.scala
index 461b8397b..ec9793751 100644
--- a/tests/untried/pos/t6601/UsePrivateValueClass_2.scala
+++ b/tests/untried/pos/t6601/UsePrivateValueClass_2.scala
@@ -1,8 +1,8 @@
object Test {
- // After the first attempt to make seprately compiled value
- // classes respect the privacy of constructors, we got:
- //
- // exception when typing v.a().==(v.a())/class scala.reflect.internal.Trees$Apply
+ // After the first attempt to make seprately compiled value
+ // classes respect the privacy of constructors, we got:
+ //
+ // exception when typing v.a().==(v.a())/class scala.reflect.internal.Trees$Apply
// constructor V in class V cannot be accessed in object Test in file test/files/pos/t6601/UsePrivateValueClass_2.scala
// scala.reflect.internal.Types$TypeError: constructor V in class V cannot be accessed in object Test
def foo(v: V) = v.a == v.a
diff --git a/tests/untried/pos/t7532b/A_1.scala b/tests/untried/pos/t7532b/A_1.scala
index 586465ee6..6d70d15ff 100644
--- a/tests/untried/pos/t7532b/A_1.scala
+++ b/tests/untried/pos/t7532b/A_1.scala
@@ -1,7 +1,7 @@
package pack
class R {
- class attr // Will have the bytecode name `R$attr`, not to be confused with `R@tr`!
- class `@`
+ class attr // Will have the bytecode name `R$attr`, not to be confused with `R@tr`!
+ class `@`
}
class `@`
diff --git a/tests/untried/pos/tcpoly_infer_easy.scala b/tests/untried/pos/tcpoly_infer_easy.scala
index 0f1929502..bfa369f4a 100644
--- a/tests/untried/pos/tcpoly_infer_easy.scala
+++ b/tests/untried/pos/tcpoly_infer_easy.scala
@@ -1,5 +1,5 @@
object Test {
- def test[CC[+X] <: Iterable[X], A](xs: CC[A]): CC[A] = xs
- val xs = test(List(1,2))
- val xs2: List[Int] = test(List(1,2))
+ def test[CC[+X] <: Iterable[X], A](xs: CC[A]): CC[A] = xs
+ val xs = test(List(1,2))
+ val xs2: List[Int] = test(List(1,2))
}
diff --git a/tests/untried/pos/test4refine.scala b/tests/untried/pos/test4refine.scala
index 671096293..abf078193 100644
--- a/tests/untried/pos/test4refine.scala
+++ b/tests/untried/pos/test4refine.scala
@@ -18,7 +18,7 @@ trait S extends o.I {
abstract class O() {
type X;
abstract trait I {
- type Y;
+ type Y;
def foo(x: X, y: Y): E = e;
}
val i:I { type Y = E } = null;
diff --git a/tests/untried/pos/unapplyComplex.scala b/tests/untried/pos/unapplyComplex.scala
index 148fcc1bb..8e0fe7821 100644
--- a/tests/untried/pos/unapplyComplex.scala
+++ b/tests/untried/pos/unapplyComplex.scala
@@ -14,26 +14,26 @@ object ComplexRect {
def unapply(z:Complex): Option[Complex] = {
if(z.isInstanceOf[ComplexRect]) Some(z) else z match {
case ComplexPolar(mod, arg) =>
- Some(new ComplexRect(mod*math.cos(arg), mod*math.sin(arg)))
+ Some(new ComplexRect(mod*math.cos(arg), mod*math.sin(arg)))
} } }
object ComplexPolar {
def unapply(z:Complex): Option[Complex] = {
if(z.isInstanceOf[ComplexPolar]) Some(z) else z match {
case ComplexRect(re,im) =>
- Some(new ComplexPolar(math.sqrt(re*re + im*im), math.atan(re/im)))
+ Some(new ComplexPolar(math.sqrt(re*re + im*im), math.atan(re/im)))
} } }
object Test {
def main(args:Array[String]) = {
new ComplexRect(1,1) match {
case ComplexPolar(mod,arg) => // z @ ???
- Console.println("mod"+mod+"arg"+arg)
+ Console.println("mod"+mod+"arg"+arg)
}
val Komplex = ComplexRect
new ComplexPolar(math.sqrt(2),math.Pi / 4.0) match {
case Komplex(re,im) => // z @ ???
- Console.println("re"+re+" im"+im)
+ Console.println("re"+re+" im"+im)
}
}
}