diff options
Diffstat (limited to 'test/pending/pos')
-rw-r--r-- | test/pending/pos/bug0305.scala | 2 | ||||
-rw-r--r-- | test/pending/pos/bug112606B.scala | 4 | ||||
-rw-r--r-- | test/pending/pos/bug1357.scala | 2 | ||||
-rw-r--r-- | test/pending/pos/bug563.scala | 2 | ||||
-rw-r--r-- | test/pending/pos/bug572.scala | 8 | ||||
-rw-r--r-- | test/pending/pos/bug573.scala | 10 | ||||
-rw-r--r-- | test/pending/pos/bug579.scala | 2 | ||||
-rw-r--r-- | test/pending/pos/bug586.scala | 10 | ||||
-rw-r--r-- | test/pending/pos/misc/B.scala | 2 | ||||
-rw-r--r-- | test/pending/pos/moors.scala | 4 | ||||
-rw-r--r-- | test/pending/pos/sig/sigs.scala | 2 | ||||
-rw-r--r-- | test/pending/pos/t0621.scala | 2 | ||||
-rw-r--r-- | test/pending/pos/t0756.scala | 2 | ||||
-rw-r--r-- | test/pending/pos/t0805.scala | 2 | ||||
-rw-r--r-- | test/pending/pos/t1004.scala | 2 | ||||
-rw-r--r-- | test/pending/pos/t1380/hallo.scala | 2 | ||||
-rw-r--r-- | test/pending/pos/t1786.scala | 4 | ||||
-rw-r--r-- | test/pending/pos/unappgadteval.scala | 12 | ||||
-rw-r--r-- | test/pending/pos/virt.scala | 4 |
19 files changed, 39 insertions, 39 deletions
diff --git a/test/pending/pos/bug0305.scala b/test/pending/pos/bug0305.scala index 433f0e72c3..1fc66788b1 100644 --- a/test/pending/pos/bug0305.scala +++ b/test/pending/pos/bug0305.scala @@ -1,5 +1,5 @@ object Test extends Application { - + def foo(is:int*) = 1; def foo(i:int) = 2; diff --git a/test/pending/pos/bug112606B.scala b/test/pending/pos/bug112606B.scala index 6dfaf4bf01..3e50949ef2 100644 --- a/test/pending/pos/bug112606B.scala +++ b/test/pending/pos/bug112606B.scala @@ -5,7 +5,7 @@ trait Test2 { def decode(tok : KeywordToken) = tok match { // constructor cannot be instantiated to expected type; // found : Test2.this.Token - // required: Test2.this.KeywordToken - case Token("final") => true; + // required: Test2.this.KeywordToken + case Token("final") => true; } } diff --git a/test/pending/pos/bug1357.scala b/test/pending/pos/bug1357.scala index fcdecb3ad3..7bc6d45034 100644 --- a/test/pending/pos/bug1357.scala +++ b/test/pending/pos/bug1357.scala @@ -6,7 +6,7 @@ object NonEmptyCons { object Main { type BT[+H, +T <: Tuple2[Tuple2[H, T], Tuple2[H, T]]] = Tuple2[H, T] - + // type T = Tuple2[String,String] type BinaryTree[+E] = BT[E, T forSome { type T <: Tuple2[BT[E, T], BT[E, T]] }] diff --git a/test/pending/pos/bug563.scala b/test/pending/pos/bug563.scala index d559226bdb..927773d1e5 100644 --- a/test/pending/pos/bug563.scala +++ b/test/pending/pos/bug563.scala @@ -1,6 +1,6 @@ object Test { def map[A,R](a : List[A], f : A => R) : List[R] = a.map(f); - + def split(sn : Iterable[List[Cell[int]]]) : unit = for (val n <- sn) map(n,ptr => new Cell(ptr.elem)); diff --git a/test/pending/pos/bug572.scala b/test/pending/pos/bug572.scala index 3a69cde4a6..31eac9370c 100644 --- a/test/pending/pos/bug572.scala +++ b/test/pending/pos/bug572.scala @@ -14,15 +14,15 @@ object DirX { import DirX._; abstract class Linked { type Node <: Node0; - + abstract class Node0 { var next : Node = _; var prev : Node = _; - + def get(dir : Dir) = if (dir == BEFORE) prev; else next; - private def set(dir : Dir, node : Node) = + private def set(dir : Dir, node : Node) = if (dir == BEFORE) prev = node; else next = node; - + def link(dir : Dir, node : Node) = { assert(get(dir) == null); assert(node.get(dir.reverse) == null); diff --git a/test/pending/pos/bug573.scala b/test/pending/pos/bug573.scala index b1b4f75098..c3d68107ff 100644 --- a/test/pending/pos/bug573.scala +++ b/test/pending/pos/bug573.scala @@ -16,15 +16,15 @@ import DirX._; abstract class Linked { type Node <: Node0; - + abstract class Node0 { var next : Node = _; var prev : Node = _; - + def self : Node; - + def get(dir : Dir) = if (dir == BEFORE) prev; else next; - private def set(dir : Dir, node : Node) = + private def set(dir : Dir, node : Node) = if (dir == BEFORE) prev = node; else next = node; def link(dir : Dir, node : Node) = { @@ -34,7 +34,7 @@ abstract class Linked { node.set(dir.reverse, self); } - + def end(dir : Dir) : Node = { if (get(dir) == null) this; else get(dir).end(dir); diff --git a/test/pending/pos/bug579.scala b/test/pending/pos/bug579.scala index a0806919e0..c42ac172fa 100644 --- a/test/pending/pos/bug579.scala +++ b/test/pending/pos/bug579.scala @@ -8,7 +8,7 @@ class MyBean { } object Test extends Application { - + val x = new MyBean; x.frombulizer = "hello" diff --git a/test/pending/pos/bug586.scala b/test/pending/pos/bug586.scala index b736e6ab43..f07d0cd2a7 100644 --- a/test/pending/pos/bug586.scala +++ b/test/pending/pos/bug586.scala @@ -2,11 +2,11 @@ import scala.collection.immutable.{Map, TreeMap, ListMap, ListSet, Set} import scala.collection.{immutable=>imm, mutable=>mut} case class HashTreeSet[A](map: imm.Map[A, Unit]) -extends Object +extends Object with imm.Set[A] { def this() = this(null) - + def size = map.size def +(elem: A) = new HashTreeSet(map + elem -> ()) def -(elem: A) = new HashTreeSet(map - elem) @@ -20,13 +20,13 @@ abstract class Goal2 { type Question val question: Question - type Answer + type Answer def initialAnswer: Answer } -abstract class AbstractRespondersGoal +abstract class AbstractRespondersGoal extends Goal2 // TYPEFIX -- comment out the extends Goal2 { } @@ -68,7 +68,7 @@ class RespondersGoalSet // case StaticMethodSelector(method: MethodRef) => case true => new SingleResponderGoal(null, null) - + // case DynamicMethodSelector(signature: MethodSignature) => { case false => { new RespondersGoal(null, null,null,null) diff --git a/test/pending/pos/misc/B.scala b/test/pending/pos/misc/B.scala index 3a080e4712..afc30944f5 100644 --- a/test/pending/pos/misc/B.scala +++ b/test/pending/pos/misc/B.scala @@ -1,7 +1,7 @@ package test class B { - + def myA = new A() } diff --git a/test/pending/pos/moors.scala b/test/pending/pos/moors.scala index 4f7346f57f..40f0e54f63 100644 --- a/test/pending/pos/moors.scala +++ b/test/pending/pos/moors.scala @@ -7,6 +7,6 @@ object Test { def testCoercionThis = baz // --> error: not found: value baz def testCoercionThis = (this: Foo).baz // --> error: value baz is not a member of Foo } - - class Bar { def baz = System.out.println("baz")} + + class Bar { def baz = System.out.println("baz")} } diff --git a/test/pending/pos/sig/sigs.scala b/test/pending/pos/sig/sigs.scala index 72a293d0e6..bdb72a09bb 100644 --- a/test/pending/pos/sig/sigs.scala +++ b/test/pending/pos/sig/sigs.scala @@ -1,5 +1,5 @@ package test -class T { +class T { def foo[T <: String](x: T): T = x def bar[T](x: T): T = x class Inner { diff --git a/test/pending/pos/t0621.scala b/test/pending/pos/t0621.scala index d178bed0fb..1d2531c4bd 100644 --- a/test/pending/pos/t0621.scala +++ b/test/pending/pos/t0621.scala @@ -1,7 +1,7 @@ object Test { val x1 : List[T] forSome { type T } = List(42) val w1 = x1 match { case y : List[u] => ((z : u) => z)(y.head) } - + val x2 : T forSome { type T } = 42 val w2 = x2 match { case y : u => ((z : u) => z)(y) } } diff --git a/test/pending/pos/t0756.scala b/test/pending/pos/t0756.scala index a778bd63d0..8011a9c526 100644 --- a/test/pending/pos/t0756.scala +++ b/test/pending/pos/t0756.scala @@ -2,7 +2,7 @@ object Test { for { n <- Some(42) - _ + _ m <- Some(24) } yield n } diff --git a/test/pending/pos/t0805.scala b/test/pending/pos/t0805.scala index 565a2a6527..c6348f45e3 100644 --- a/test/pending/pos/t0805.scala +++ b/test/pending/pos/t0805.scala @@ -3,7 +3,7 @@ object Test { def make(t: Test) : Test = TestList(t.args.toList) } case class TestList[T](elements: List[T])(implicit f: T => Test) - + class Test { val args: Array[Test] } diff --git a/test/pending/pos/t1004.scala b/test/pending/pos/t1004.scala index e86631acea..e121d13618 100644 --- a/test/pending/pos/t1004.scala +++ b/test/pending/pos/t1004.scala @@ -1,6 +1,6 @@ object A { def main(args: Array[String]) = { val x = new { def copy(a : this.type) = a }; - x.copy(x) + x.copy(x) } } diff --git a/test/pending/pos/t1380/hallo.scala b/test/pending/pos/t1380/hallo.scala index 27ecd9fb8b..bb8fff2333 100644 --- a/test/pending/pos/t1380/hallo.scala +++ b/test/pending/pos/t1380/hallo.scala @@ -1,3 +1,3 @@ object hallo { - def main(args:Array[String]) = println("hallo") + def main(args:Array[String]) = println("hallo") } diff --git a/test/pending/pos/t1786.scala b/test/pending/pos/t1786.scala index d0cf8c7bac..dca2edaab4 100644 --- a/test/pending/pos/t1786.scala +++ b/test/pending/pos/t1786.scala @@ -1,10 +1,10 @@ /** This a consequence of the current type checking algorithm, where bounds * are checked only after variables are instantiated. I believe this will change once we go to contraint-based type inference. Assigning low priority until then. - * + * * */ class SomeClass(val intValue:Int) -class MyClass[T <: SomeClass](val myValue:T) +class MyClass[T <: SomeClass](val myValue:T) object Test extends Application { def myMethod(i:MyClass[_]) { diff --git a/test/pending/pos/unappgadteval.scala b/test/pending/pos/unappgadteval.scala index 0c22c71dee..007d57d7ea 100644 --- a/test/pending/pos/unappgadteval.scala +++ b/test/pending/pos/unappgadteval.scala @@ -11,21 +11,21 @@ class App[b, c] (val f : Term[b => c], val e : Term[b]) extends Term[c] object Suc{ def unapply(a:Suc) = true } class Suc () extends Term[int => int] // Environments : -abstract class Env { +abstract class Env { def apply[a](v : Var[a]): a - def extend[a](v : Var[a], x : a) = new Env { - def apply[b](w: Var[b]): b = w match { + def extend[a](v : Var[a], x : a) = new Env { + def apply[b](w: Var[b]): b = w match { case _ : v.type => x // v eq w, hence a = b case _ => Env.this.apply(w) }} } -object empty extends Env { - def apply[a](x : Var[a]): a = throw new Error("not found : "+x.name) +object empty extends Env { + def apply[a](x : Var[a]): a = throw new Error("not found : "+x.name) } object Test { // Evaluation : -def eval[a](t : Term[a], env : Env): a = t match { +def eval[a](t : Term[a], env : Env): a = t match { case v : Var[b] => env(v) // a = b case n @ Num(value) => value // a = int case i @ Suc() => { y: int => y + 1 } // a = int=>int diff --git a/test/pending/pos/virt.scala b/test/pending/pos/virt.scala index 6fe21246b0..99dcd747b2 100644 --- a/test/pending/pos/virt.scala +++ b/test/pending/pos/virt.scala @@ -1,9 +1,9 @@ object Virt extends Application { - class Foo { + class Foo { trait Inner <: { val x : Int = 3 } } - class Bar extends Foo { + class Bar extends Foo { trait Inner <: { val y : Int = x } } } |