From bff42682bc489dcdad34ec91f34e6c2c3dca7cf1 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 31 Oct 2007 17:33:02 +0000 Subject: fixed several problems with implicits. Changed ways inner types of modules print: Module.this.Type => Module.type --- test/files/neg/bug1275.check | 2 +- test/files/neg/bug452.check | 2 +- test/files/neg/bug515.check | 2 +- test/files/neg/bug545.check | 2 +- test/files/neg/bug630.check | 2 +- test/files/neg/bug696.check | 6 +++--- test/files/neg/bug876.check | 2 +- test/files/neg/bug961.check | 2 +- test/files/neg/gadts1.check | 2 +- test/files/neg/lubs.check | 12 ++++++------ test/files/neg/sabin2.check | 4 ++-- 11 files changed, 19 insertions(+), 19 deletions(-) (limited to 'test/files') diff --git a/test/files/neg/bug1275.check b/test/files/neg/bug1275.check index 6ff92a7823..9f806c0689 100644 --- a/test/files/neg/bug1275.check +++ b/test/files/neg/bug1275.check @@ -1,4 +1,4 @@ -bug1275.scala:13: error: The kind of type MyType does not conform to the expected kind of type MyType[+t] <: TestCovariance.this.Seq[t] in trait Seq. +bug1275.scala:13: error: The kind of type MyType does not conform to the expected kind of type MyType[+t] <: TestCovariance.Seq[t] in trait Seq. def span[a, s <: Seq[a] { type MyType <: s } ](xs: s): s = xs f ^ one error found diff --git a/test/files/neg/bug452.check b/test/files/neg/bug452.check index d36798ef7b..ac23ebc560 100644 --- a/test/files/neg/bug452.check +++ b/test/files/neg/bug452.check @@ -1,6 +1,6 @@ bug452.scala:3: error: type mismatch; found : Test.type (with underlying type object Test) - required: Test.this.Foo + required: Test.Foo def this() = this(this); ^ one error found diff --git a/test/files/neg/bug515.check b/test/files/neg/bug515.check index fff96a563d..a38c8b62d8 100644 --- a/test/files/neg/bug515.check +++ b/test/files/neg/bug515.check @@ -1,6 +1,6 @@ bug515.scala:7: error: type mismatch; found : java.lang.String - required: Test.this.Truc + required: Test.Truc val parent: Truc = file.getMachin ^ one error found diff --git a/test/files/neg/bug545.check b/test/files/neg/bug545.check index 892a66dfc6..d184f90e85 100644 --- a/test/files/neg/bug545.check +++ b/test/files/neg/bug545.check @@ -1,4 +1,4 @@ -bug545.scala:4: error: value blah is not a member of Test.this.Foo +bug545.scala:4: error: value blah is not a member of Test.Foo val x = foo.blah match { ^ bug545.scala:5: error: recursive value x needs type diff --git a/test/files/neg/bug630.check b/test/files/neg/bug630.check index f1ac0da57f..03113be7da 100644 --- a/test/files/neg/bug630.check +++ b/test/files/neg/bug630.check @@ -1,5 +1,5 @@ bug630.scala:20: error: error overriding value foo in trait Bar of type Req2; - object foo has incompatible type object Test.this.foo + object foo has incompatible type object Test.foo object foo extends Req1 ^ one error found diff --git a/test/files/neg/bug696.check b/test/files/neg/bug696.check index 28ce342cf1..2bc09820ed 100644 --- a/test/files/neg/bug696.check +++ b/test/files/neg/bug696.check @@ -1,9 +1,9 @@ bug696.scala:3: error: implicit method WithType is not contractive, - because the implicit parameter type TypeUtil0.this.Type[S] - is not strictly contained in the signature TypeUtil0.this.Type[S with T] + because the implicit parameter type TypeUtil0.Type[S] + is not strictly contained in the signature TypeUtil0.Type[S with T] implicit def WithType[S,T](implicit tpeS : Type[S], tpeT : Type[T]) : Type[S with T] = null ^ -bug696.scala:4: error: no implicit argument matching parameter type TypeUtil0.this.Type[Any] was found. +bug696.scala:4: error: no implicit argument matching parameter type TypeUtil0.Type[Any] was found. as[Any](null); ^ two errors found diff --git a/test/files/neg/bug876.check b/test/files/neg/bug876.check index c08d4c7de8..8ef2c031fc 100644 --- a/test/files/neg/bug876.check +++ b/test/files/neg/bug876.check @@ -1,4 +1,4 @@ -bug876.scala:25: error: wrong number of arguments for method apply: (AssertionError.this.A)manager.B in trait Map +bug876.scala:25: error: wrong number of arguments for method apply: (AssertionError.A)manager.B in trait Map assert(manager.map(A2) == List(manager.map(A2, A1))) ^ one error found diff --git a/test/files/neg/bug961.check b/test/files/neg/bug961.check index ef7e54d712..794acf5519 100644 --- a/test/files/neg/bug961.check +++ b/test/files/neg/bug961.check @@ -1,4 +1,4 @@ -bug961.scala:11: error: Temp.this.B of type object Temp.this.B does not take parameters +bug961.scala:11: error: Temp.this.B of type object Temp.B does not take parameters B() match { ^ one error found diff --git a/test/files/neg/gadts1.check b/test/files/neg/gadts1.check index b16cbaf11d..01d1412448 100644 --- a/test/files/neg/gadts1.check +++ b/test/files/neg/gadts1.check @@ -1,5 +1,5 @@ gadts1.scala:15: error: type mismatch; - found : Test.this.Double + found : Test.Double required: a case NumTerm(n) => c.x = Double(1.0) ^ diff --git a/test/files/neg/lubs.check b/test/files/neg/lubs.check index 81c280e76f..77ab20102c 100644 --- a/test/files/neg/lubs.check +++ b/test/files/neg/lubs.check @@ -1,16 +1,16 @@ lubs.scala:11: error: type mismatch; - found : test1.this.A[test1.this.A[test1.this.A[Any]]] - required: test1.this.A[test1.this.A[test1.this.A[test1.this.A[Any]]]] + found : test1.A[test1.A[test1.A[Any]]] + required: test1.A[test1.A[test1.A[test1.A[Any]]]] val x4: A[A[A[A[Any]]]] = f ^ lubs.scala:24: error: type mismatch; - found : test2.this.A{type T >: test2.this.C with test2.this.D <: test2.this.A} - required: test2.this.A{type T >: Null <: test2.this.A{type T >: Null <: test2.this.A}} + found : test2.A{type T >: test2.C with test2.D <: test2.A} + required: test2.A{type T >: Null <: test2.A{type T >: Null <: test2.A}} val x3: A { type T >: Null <: A { type T >: Null <: A } } = f ^ lubs.scala:25: error: type mismatch; - found : test2.this.A{type T >: test2.this.C with test2.this.D <: test2.this.A} - required: test2.this.A{type T >: Null <: test2.this.A{type T >: Null <: test2.this.A{type T >: Null <: test2.this.A}}} + found : test2.A{type T >: test2.C with test2.D <: test2.A} + required: test2.A{type T >: Null <: test2.A{type T >: Null <: test2.A{type T >: Null <: test2.A}}} val x4: A { type T >: Null <: A { type T >: Null <: A { type T >: Null <: A } } } = f ^ three errors found diff --git a/test/files/neg/sabin2.check b/test/files/neg/sabin2.check index cd45905df2..682c08bc62 100644 --- a/test/files/neg/sabin2.check +++ b/test/files/neg/sabin2.check @@ -1,5 +1,5 @@ -sabin2.scala:22: error: method set cannot be accessed in Test.this.Base#Inner - because its instance type (Test.this.Base#T)Unit contains a malformed type: Test.this.Base#T +sabin2.scala:22: error: method set cannot be accessed in Test.Base#Inner + because its instance type (Test.Base#T)Unit contains a malformed type: Test.Base#T a.set(b.get()) // Error ^ one error found -- cgit v1.2.3