diff options
author | Martin Odersky <odersky@gmail.com> | 2008-01-17 16:37:27 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2008-01-17 16:37:27 +0000 |
commit | 76c06b4661b70e934530a0debad34a5766ee43e9 (patch) | |
tree | 4abb85699a2d663681a9ca31fb7ccff45b80746f /test/files/neg | |
parent | e5ca1a3906ae29c1d6db5de333932bbfc189cedc (diff) | |
download | scala-76c06b4661b70e934530a0debad34a5766ee43e9.tar.gz scala-76c06b4661b70e934530a0debad34a5766ee43e9.tar.bz2 scala-76c06b4661b70e934530a0debad34a5766ee43e9.zip |
build target is now 1.5
case classes now generate objects not factory methods. some small
cleanups for type inference
Diffstat (limited to 'test/files/neg')
-rw-r--r-- | test/files/neg/bug414.check | 4 | ||||
-rw-r--r-- | test/files/neg/bug692.check | 2 | ||||
-rw-r--r-- | test/files/neg/bug692.scala | 2 | ||||
-rw-r--r-- | test/files/neg/bug783.check | 6 | ||||
-rw-r--r-- | test/files/neg/bug960.check | 5 | ||||
-rwxr-xr-x | test/files/neg/bug961.scala | 2 | ||||
-rw-r--r-- | test/files/neg/scopes.check | 7 |
7 files changed, 20 insertions, 8 deletions
diff --git a/test/files/neg/bug414.check b/test/files/neg/bug414.check index 67b467ce5d..3396a803f1 100644 --- a/test/files/neg/bug414.check +++ b/test/files/neg/bug414.check @@ -1,4 +1,6 @@ -bug414.scala:5: error: stable identifier required, but Empty found. +bug414.scala:5: error: pattern type is incompatibe with expected type; + found : object Empty + required: IntMap[a] case Empty => ^ bug414.scala:7: error: type mismatch; diff --git a/test/files/neg/bug692.check b/test/files/neg/bug692.check index 6eb9f7d8af..308048b80a 100644 --- a/test/files/neg/bug692.check +++ b/test/files/neg/bug692.check @@ -2,7 +2,7 @@ bug692.scala:3: error: not found: type T trait Type[T0] extends Type0[T]; ^ bug692.scala:10: error: class Foo takes type parameters - case class FooType extends ClassType[Foo,AnyRef](ObjectType); + case class FooType extends ClassType[Foo,AnyRef](ObjectType()); ^ bug692.scala:13: error: class Foo takes type parameters case class BarType[T3 <: Foo](tpeT : RefType[T3]) extends ClassType[Bar[T3],Foo](FooType); diff --git a/test/files/neg/bug692.scala b/test/files/neg/bug692.scala index dc5a9040a0..184a14b4b6 100644 --- a/test/files/neg/bug692.scala +++ b/test/files/neg/bug692.scala @@ -7,7 +7,7 @@ abstract class test3 { abstract class ClassType[C <: Z, Z <: AnyRef](zuper : RefType[Z]) extends RefType[C]; - case class FooType extends ClassType[Foo,AnyRef](ObjectType); + case class FooType extends ClassType[Foo,AnyRef](ObjectType()); implicit def typeOfFoo = FooType(); case class BarType[T3 <: Foo](tpeT : RefType[T3]) extends ClassType[Bar[T3],Foo](FooType); diff --git a/test/files/neg/bug783.check b/test/files/neg/bug783.check index a7f978ad06..19e3ead2a9 100644 --- a/test/files/neg/bug783.check +++ b/test/files/neg/bug783.check @@ -1,4 +1,6 @@ -bug783.scala:12: error: stable identifier required, but Contexts.this.globalInit0 found. +bug783.scala:12: error: type mismatch; + found : Contexts.this.Global#Template + required: Contexts.this.global.Template globalInit0.Template(10, 20); - ^ + ^ one error found diff --git a/test/files/neg/bug960.check b/test/files/neg/bug960.check index c947223aa3..e61394f2d0 100644 --- a/test/files/neg/bug960.check +++ b/test/files/neg/bug960.check @@ -1,4 +1,7 @@ -bug960.scala:18: error: cannot resolve overloaded unapply +bug960.scala:18: error: ambiguous reference to overloaded definition, +both method unapply in object List of type [a](List[a])Option[Null] +and method unapply in object List of type [a](List[a])Option[(a, List[a])] +match argument types (List[a]) case List(x, xs) => 7 ^ bug960.scala:12: error: method unapply is defined twice diff --git a/test/files/neg/bug961.scala b/test/files/neg/bug961.scala index eb1620abe1..15309b96b4 100755 --- a/test/files/neg/bug961.scala +++ b/test/files/neg/bug961.scala @@ -2,7 +2,7 @@ object Temp{ abstract class A object B{ private case class B_inner extends A - def apply: A = B_inner + def apply: A = B_inner() def unapply(a: A) = a match { case B_inner() => true case _ => false diff --git a/test/files/neg/scopes.check b/test/files/neg/scopes.check index 13f728b01c..bb8e15058b 100644 --- a/test/files/neg/scopes.check +++ b/test/files/neg/scopes.check @@ -22,4 +22,9 @@ scopes.scala:15: error: x is already defined as value x scopes.scala:17: error: x is already defined as value x case x::x => x ^ -8 errors found +scopes.scala:1: error: type mismatch; + found : float + required: int +case class test0(x: int, x: float) + ^ +9 errors found |