diff options
author | Sean McDirmid <sean.mcdirmid@gmail.com> | 2007-09-17 16:36:10 +0000 |
---|---|---|
committer | Sean McDirmid <sean.mcdirmid@gmail.com> | 2007-09-17 16:36:10 +0000 |
commit | a205b6b06e705711308c9ad3abac74ba66b6266f (patch) | |
tree | 49aa189b4917b20d76c2da02cbf9475af5a49662 /test/files/neg | |
parent | 3f9b82c88d74c1b03daf5131b50c172213f40a63 (diff) | |
download | scala-a205b6b06e705711308c9ad3abac74ba66b6266f.tar.gz scala-a205b6b06e705711308c9ad3abac74ba66b6266f.tar.bz2 scala-a205b6b06e705711308c9ad3abac74ba66b6266f.zip |
Massive check-in for IDE.
Diffstat (limited to 'test/files/neg')
56 files changed, 96 insertions, 102 deletions
diff --git a/test/files/neg/abstract.check b/test/files/neg/abstract.check index f67cc2bbbd..c33011bb55 100644 --- a/test/files/neg/abstract.check +++ b/test/files/neg/abstract.check @@ -1,19 +1,19 @@ abstract.scala:5: error: method bar cannot be accessed in A.this.T because its instance type ()A.this.T#T contains a malformed type: A.this.T#T def foo1: A = bar().bar(); - ^ + ^ abstract.scala:6: error: type mismatch; found : A required: A.this.T def foo2: T = bar().baz(); - ^ + ^ abstract.scala:8: error: method bar cannot be accessed in A because its instance type ()A#T contains a malformed type: A#T def foo4: A = baz().bar(); - ^ + ^ abstract.scala:9: error: type mismatch; found : A required: A.this.T def foo5: T = baz().baz(); - ^ + ^ four errors found diff --git a/test/files/neg/accesses.check b/test/files/neg/accesses.check index 2fa78ffc50..11d313e534 100644 --- a/test/files/neg/accesses.check +++ b/test/files/neg/accesses.check @@ -1,17 +1,17 @@ accesses.scala:23: error: error overriding method f2 in class A of type => unit; method f2 has weaker access privileges; it should not be private private def f2: unit = () - ^ + ^ accesses.scala:24: error: error overriding method f3 in class A of type => unit; method f3 has weaker access privileges; it should be at least protected private[p2] def f3: unit = () - ^ + ^ accesses.scala:25: error: error overriding method f4 in class A of type => unit; method f4 has weaker access privileges; it should be at least private[p1] private[p2] def f4: unit - ^ + ^ accesses.scala:26: error: error overriding method f5 in class A of type => unit; method f5 has weaker access privileges; it should be at least protected[p1] protected[p2] def f5: unit - ^ + ^ four errors found diff --git a/test/files/neg/badtok-1.check b/test/files/neg/badtok-1.check index 6523358c79..27c7587828 100644 --- a/test/files/neg/badtok-1.check +++ b/test/files/neg/badtok-1.check @@ -1,7 +1,4 @@ -badtok-1.scala:2: error: expected class or object definition +badtok-1.scala:2: error: unexpected quote after symbol '42' ^ -badtok-1.scala:2: error: unclosed character literal -'42' - ^ -two errors found +one error found diff --git a/test/files/neg/badtok-2.check b/test/files/neg/badtok-2.check index 4b142c37a1..6364b857a1 100644 --- a/test/files/neg/badtok-2.check +++ b/test/files/neg/badtok-2.check @@ -1,10 +1,7 @@ -badtok-2.scala:3: error: unclosed quoted identifier -`x - ^ -badtok-2.scala:3: error: illegal start of definition +badtok-2.scala:3: error: unterminated quoted identifier `x ^ badtok-2.scala:3: error: '}' expected but eof found. `x - ^ -three errors found + ^ +two errors found diff --git a/test/files/neg/bug1112.check b/test/files/neg/bug1112.check index 3be45a87fe..9aedff2de9 100644 --- a/test/files/neg/bug1112.check +++ b/test/files/neg/bug1112.check @@ -1,4 +1,4 @@ bug1112.scala:12: error: wrong number of arguments for method call: (int)(=> () => unit)unit call(0,() => System.out.println("here we are")) - ^ + ^ one error found diff --git a/test/files/neg/bug1183.check b/test/files/neg/bug1183.check index 50b236187e..ebbf8aca23 100644 --- a/test/files/neg/bug1183.check +++ b/test/files/neg/bug1183.check @@ -1,17 +1,17 @@ bug1183.scala:10: error: name clash: class Foo defines object Baz and its companion object Foo also defines class Baz object Baz - ^ + ^ bug1183.scala:11: error: name clash: class Foo defines class Bam and its companion object Foo also defines object Bam class Bam - ^ + ^ bug1183.scala:12: error: name clash: class Foo defines object Bar and its companion object Foo also defines class Bar object Bar - ^ + ^ bug1183.scala:13: error: name clash: class Foo defines class Bar and its companion object Foo also defines class Bar case class Bar(i:Int) - ^ + ^ four errors found diff --git a/test/files/neg/bug200.check b/test/files/neg/bug200.check index bfce301807..d3670060cd 100644 --- a/test/files/neg/bug200.check +++ b/test/files/neg/bug200.check @@ -1,4 +1,4 @@ bug200.scala:7: error: method foo is defined twice def foo: Int; - ^ + ^ one error found diff --git a/test/files/neg/bug391.check b/test/files/neg/bug391.check index 4db19a39c4..18f36a5757 100644 --- a/test/files/neg/bug391.check +++ b/test/files/neg/bug391.check @@ -1,13 +1,13 @@ bug391.scala:2: error: identifier expected but 'def' found. def fun1(def x: Int): Int = x; // the "def x" is illegal ^ -bug391.scala:3: error: ':' expected but '}' found. - def fun2(val x: Int): Int = x; // the "val x" is illegal - ^ +bug391.scala:4: error: ':' expected but '}' found. +} +^ bug391.scala:6: error: identifier expected but 'def' found. class E(def x: Int); // the "def x" is illegal ^ bug391.scala:6: error: ':' expected but eof found. class E(def x: Int); // the "def x" is illegal - ^ + ^ four errors found diff --git a/test/files/neg/bug415.check b/test/files/neg/bug415.check index c834a328eb..a1c68954cb 100644 --- a/test/files/neg/bug415.check +++ b/test/files/neg/bug415.check @@ -1,5 +1,5 @@ bug415.scala:8: error: method x cannot be accessed in A because its instance type => A#T contains a malformed type: A#T val y: String = a.x; - ^ + ^ one error found diff --git a/test/files/neg/bug515.check b/test/files/neg/bug515.check index 28cdd48927..fff96a563d 100644 --- a/test/files/neg/bug515.check +++ b/test/files/neg/bug515.check @@ -2,5 +2,5 @@ bug515.scala:7: error: type mismatch; found : java.lang.String required: Test.this.Truc val parent: Truc = file.getMachin - ^ + ^ one error found diff --git a/test/files/neg/bug520.check b/test/files/neg/bug520.check index 258f8112e3..6768ebb5fc 100644 --- a/test/files/neg/bug520.check +++ b/test/files/neg/bug520.check @@ -1,4 +1,4 @@ bug520.scala:8: error: overloaded method verifyKeyword needs result type verifyKeyword("", source, pos); - ^ + ^ one error found diff --git a/test/files/neg/bug521.check b/test/files/neg/bug521.check index 80a1931231..1b05acae18 100644 --- a/test/files/neg/bug521.check +++ b/test/files/neg/bug521.check @@ -1,15 +1,15 @@ bug521.scala:10: error: class PlainFile needs to be abstract, since method path in class AbstractFile of type => String is not defined class PlainFile(val file : File) extends AbstractFile {} -^ + ^ bug521.scala:13: error: error overriding value file in class PlainFile of type java.io.File; value file needs `override' modifier final class ZipArchive(val file : File, archive : ZipFile) extends PlainFile(file) { - ^ + ^ bug521.scala:13: error: class ZipArchive needs to be abstract, since method path in class AbstractFile of type => String is not defined final class ZipArchive(val file : File, archive : ZipFile) extends PlainFile(file) { - ^ + ^ bug521.scala:15: error: error overriding value path in class VirtualFile of type String; method path needs to be an immutable value override def path = ""; - ^ + ^ four errors found diff --git a/test/files/neg/bug545.check b/test/files/neg/bug545.check index f349c084fc..892a66dfc6 100644 --- a/test/files/neg/bug545.check +++ b/test/files/neg/bug545.check @@ -1,6 +1,6 @@ bug545.scala:4: error: value blah is not a member of Test.this.Foo val x = foo.blah match { - ^ + ^ bug545.scala:5: error: recursive value x needs type case List(x) => x ^ diff --git a/test/files/neg/bug550.check b/test/files/neg/bug550.check index 6c8580091c..8f1a5c0e5a 100644 --- a/test/files/neg/bug550.check +++ b/test/files/neg/bug550.check @@ -3,5 +3,5 @@ bug550.scala:6: error: class List takes type parameters ^ bug550.scala:8: error: no implicit argument matching parameter type Monoid[Nothing] was found. sum(List(1,2,3)) - ^ + ^ two errors found diff --git a/test/files/neg/bug558.check b/test/files/neg/bug558.check index a51856f0e6..061f64f7bb 100644 --- a/test/files/neg/bug558.check +++ b/test/files/neg/bug558.check @@ -1,4 +1,4 @@ bug558.scala:13: error: value file is not a member of NewModel.this.RootURL final val source = top.file; - ^ + ^ one error found diff --git a/test/files/neg/bug576.check b/test/files/neg/bug576.check index b496ccafd4..72d5d258d2 100644 --- a/test/files/neg/bug576.check +++ b/test/files/neg/bug576.check @@ -1,4 +1,4 @@ bug576.scala:14: error: overloaded method insert needs result type if (true) sibling.insert(node); - ^ + ^ one error found diff --git a/test/files/neg/bug585.check b/test/files/neg/bug585.check index 4e2f72a941..af66898383 100644 --- a/test/files/neg/bug585.check +++ b/test/files/neg/bug585.check @@ -1,4 +1,4 @@ -bug585.scala:1: error: unclosed comment +bug585.scala:1: error: unterminated comment /* - ^ +^ one error found diff --git a/test/files/neg/bug588.check b/test/files/neg/bug588.check index b1e5340c91..59e4229192 100644 --- a/test/files/neg/bug588.check +++ b/test/files/neg/bug588.check @@ -3,11 +3,11 @@ method visit:((int) => String)boolean and method visit:((int) => unit)boolean at line 2 have same type after erasure: (Function1)Boolean def visit(f: int => String): boolean - ^ + ^ bug588.scala:10: error: double definition: method f:(Test.this.TypeB)Unit and method f:(Test.this.TypeA)Unit at line 9 have same type after erasure: (Test#TraitA)Unit def f(brac : TypeB) : Unit; - ^ + ^ two errors found diff --git a/test/files/neg/bug591.check b/test/files/neg/bug591.check index 7a1a38f52b..2c2e08da99 100644 --- a/test/files/neg/bug591.check +++ b/test/files/neg/bug591.check @@ -1,4 +1,4 @@ bug591.scala:38: error: method input_= is defined twice def input_=(in : Input) = {} - ^ + ^ one error found diff --git a/test/files/neg/bug630.check b/test/files/neg/bug630.check index 600a999d20..f1ac0da57f 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 extends Req1 - ^ + ^ one error found diff --git a/test/files/neg/bug631.check b/test/files/neg/bug631.check index cb18e1d397..0650c701d9 100644 --- a/test/files/neg/bug631.check +++ b/test/files/neg/bug631.check @@ -1,4 +1,4 @@ bug631.scala:1: error: `implicit' modifier cannot be used for top-level objects implicit object Test { - ^ + ^ one error found diff --git a/test/files/neg/bug649.check b/test/files/neg/bug649.check index 80220e1af2..a5b97b72d1 100644 --- a/test/files/neg/bug649.check +++ b/test/files/neg/bug649.check @@ -1,4 +1,4 @@ bug649.scala:3: error: illegal cyclic reference involving method foo def foo[A] = foo[A] - ^ + ^ one error found diff --git a/test/files/neg/bug663.check b/test/files/neg/bug663.check index 55b0b8f7bb..d1ef2ae09d 100644 --- a/test/files/neg/bug663.check +++ b/test/files/neg/bug663.check @@ -3,5 +3,5 @@ method asMatch:(Test.this.Node)Any and method asMatch:(Test.this.Matchable)Any in trait MatchableImpl have same type after erasure: (test.Test#NodeImpl)java.lang.Object def asMatch(m : Node) : Any = { - ^ + ^ one error found diff --git a/test/files/neg/bug664.check b/test/files/neg/bug664.check index 176058d962..c29f9b6c7c 100644 --- a/test/files/neg/bug664.check +++ b/test/files/neg/bug664.check @@ -1,7 +1,7 @@ bug664.scala:4: error: type Foo is not a member of test.Test with ScalaObject trait Foo extends super.Foo { - ^ + ^ bug664.scala:5: error: type Bar is not a member of AnyRef with ScalaObject trait Bar extends super.Bar; - ^ + ^ two errors found diff --git a/test/files/neg/bug691.check b/test/files/neg/bug691.check index 47ac8c3888..f811fc3559 100644 --- a/test/files/neg/bug691.check +++ b/test/files/neg/bug691.check @@ -1,4 +1,4 @@ bug691.scala:27: error: ambiguous parent class qualifier trait TiC extends super[Arrow].Ti2 with super[AssignArrow].Ti1; - ^ + ^ one error found diff --git a/test/files/neg/bug696.check b/test/files/neg/bug696.check index a2f31702b7..28ce342cf1 100644 --- a/test/files/neg/bug696.check +++ b/test/files/neg/bug696.check @@ -2,8 +2,8 @@ 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] 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. as[Any](null); - ^ + ^ two errors found diff --git a/test/files/neg/bug700.check b/test/files/neg/bug700.check index 149a1564a9..33a67e5094 100644 --- a/test/files/neg/bug700.check +++ b/test/files/neg/bug700.check @@ -1,4 +1,4 @@ bug700.scala:6: error: method foobar in trait Foo is accessed from super. It may not be abstract unless it is overridden by a member declared `abstract' and `override' def foobar: unit = super.foobar - ^ + ^ one error found diff --git a/test/files/neg/bug712.check b/test/files/neg/bug712.check index 59620d59cf..532eb4aec0 100644 --- a/test/files/neg/bug712.check +++ b/test/files/neg/bug712.check @@ -1,4 +1,4 @@ bug712.scala:10: error: value self is not a member of B.this.ParentImpl implicit def coerce(p : ParentImpl) = p.self; - ^ + ^ one error found diff --git a/test/files/neg/bug715.check b/test/files/neg/bug715.check index 7029220258..8ea1ddb0eb 100644 --- a/test/files/neg/bug715.check +++ b/test/files/neg/bug715.check @@ -1,4 +1,4 @@ bug715.scala:12: error: method chilren in trait NodeImpl is accessed from super. It may not be abstract unless it is overridden by a member declared `abstract' and `override' override def children = super.chilren; - ^ + ^ one error found diff --git a/test/files/neg/bug729.check b/test/files/neg/bug729.check index ae00d309b1..0b38b9bc1d 100644 --- a/test/files/neg/bug729.check +++ b/test/files/neg/bug729.check @@ -2,5 +2,5 @@ bug729.scala:20: error: type mismatch; found : ScalaParserAutoEdit.this.NodeImpl(in trait Parser) required: ScalaParserAutoEdit.this.NodeImpl(in trait ScalaParserAutoEdit) val yyy : NodeImpl = link.from; - ^ + ^ one error found diff --git a/test/files/neg/bug779.check b/test/files/neg/bug779.check index 180fa3824e..941951900e 100644 --- a/test/files/neg/bug779.check +++ b/test/files/neg/bug779.check @@ -1,4 +1,4 @@ -bug779.scala:6: error: method method ast has return statement; needs result type +bug779.scala:6: error: method ast has return statement; needs result type override def ast = return null ^ one error found diff --git a/test/files/neg/bug836.check b/test/files/neg/bug836.check index 10a707ec93..1fcae2ecb3 100644 --- a/test/files/neg/bug836.check +++ b/test/files/neg/bug836.check @@ -1,5 +1,5 @@ bug836.scala:6: error: type S cannot be accessed in A.this.MyObj because its instance type A.this.MyObj#S is malformed type S = MyObj#S - ^ + ^ one error found diff --git a/test/files/neg/bug839.check b/test/files/neg/bug839.check index fa161de5a5..2f22e26d44 100644 --- a/test/files/neg/bug839.check +++ b/test/files/neg/bug839.check @@ -1,5 +1,5 @@ bug839.scala:25: error: method set cannot be accessed in object Test.this.FileImpl#treeBuilder because its instance type (Test.this.Global#Tree)Unit contains a malformed type: Test.this.Global#Tree file.treeBuilder.set(nsc.get); - ^ + ^ one error found diff --git a/test/files/neg/bug856.check b/test/files/neg/bug856.check index 80c4deeea2..3ab4ce6c70 100644 --- a/test/files/neg/bug856.check +++ b/test/files/neg/bug856.check @@ -1,4 +1,4 @@ bug856.scala:3: error: class ComplexRect needs to be abstract, since method _2 in trait Product2 of type => double is not defined class ComplexRect(val _1:double, _2:double) extends Complex { -^ + ^ one error found diff --git a/test/files/neg/bug876.check b/test/files/neg/bug876.check index e7d5d5d78f..c08d4c7de8 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 assert(manager.map(A2) == List(manager.map(A2, A1))) - ^ + ^ one error found diff --git a/test/files/neg/bug877.check b/test/files/neg/bug877.check index 6c262cdcb9..e71041348c 100644 --- a/test/files/neg/bug877.check +++ b/test/files/neg/bug877.check @@ -1,4 +1,7 @@ bug877.scala:3: error: parents of traits may not have parameters trait Foo extends A(22A, Bug!) {} ^ -one error found +bug877.scala:3: error: Invalid literal number +trait Foo extends A(22A, Bug!) {} + ^ +two errors found diff --git a/test/files/neg/bug960.check b/test/files/neg/bug960.check index fc944bf879..c947223aa3 100644 --- a/test/files/neg/bug960.check +++ b/test/files/neg/bug960.check @@ -3,5 +3,5 @@ bug960.scala:18: error: cannot resolve overloaded unapply ^ bug960.scala:12: error: method unapply is defined twice def unapply[a](xs: List[a]): Option[Null] = xs match { - ^ + ^ two errors found diff --git a/test/files/neg/bug961.check b/test/files/neg/bug961.check index 559dd93d6f..ef7e54d712 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 B() match { - ^ + ^ one error found diff --git a/test/files/neg/bug987.check b/test/files/neg/bug987.check index d850f39fd9..5da1e1cbe3 100644 --- a/test/files/neg/bug987.check +++ b/test/files/neg/bug987.check @@ -2,17 +2,17 @@ bug987.scala:15: error: illegal inheritance; class E inherits different type instances of trait B: B[C] and B[D] class E extends D -^ + ^ bug987.scala:20: error: illegal inheritance; class F inherits different type instances of trait B: B[C] and B[D] class F extends D -^ + ^ bug987.scala:25: error: illegal inheritance; class D inherits different type instances of trait B: B[C] and B[D] abstract class D extends C with B[D] {} - ^ + ^ bug987.scala:25: error: type arguments [D] do not conform to trait B's type parameter bounds [T <: B[T]] abstract class D extends C with B[D] {} ^ diff --git a/test/files/neg/bug997.check b/test/files/neg/bug997.check index 44e383228d..e3c86c96a4 100644 --- a/test/files/neg/bug997.check +++ b/test/files/neg/bug997.check @@ -1,12 +1,12 @@ bug997.scala:7: error: wrong number of arguments for object Foo "x" match { case Foo(a) => Console.println(a) } - ^ + ^ bug997.scala:7: error: not found: value a "x" match { case Foo(a) => Console.println(a) } ^ bug997.scala:13: error: wrong number of arguments for object Foo "x" match { case Foo(a, b, c) => Console.println((a,b,c)) } - ^ + ^ bug997.scala:13: error: not found: value a "x" match { case Foo(a, b, c) => Console.println((a,b,c)) } ^ diff --git a/test/files/neg/checksensible.check b/test/files/neg/checksensible.check index 7c0c71c803..47abfe3589 100644 --- a/test/files/neg/checksensible.check +++ b/test/files/neg/checksensible.check @@ -1,6 +1,6 @@ checksensible.scala:1: error: class Test needs to be abstract, since method isabstract is not defined class Test { -^ + ^ checksensible.scala:3: warning: comparing values of types Ordered[Unit] and Unit using `>' will always yield false println((c = 1) > 0) ^ diff --git a/test/files/neg/constrs.check b/test/files/neg/constrs.check index 3680f292b2..606565d42e 100644 --- a/test/files/neg/constrs.check +++ b/test/files/neg/constrs.check @@ -1,9 +1,9 @@ constrs.scala:6: error: type T is not a member of object test def this(y: int)(z: int)(t: this.T) = { this(this.u + y + z); Console.println(x) } - ^ + ^ constrs.scala:6: error: value u is not a member of object test def this(y: int)(z: int)(t: this.T) = { this(this.u + y + z); Console.println(x) } - ^ + ^ constrs.scala:10: error: called constructor's definition must precede calling constructor's definition def this() = this("abc") ^ diff --git a/test/files/neg/gadts1.check b/test/files/neg/gadts1.check index 151cfad712..b16cbaf11d 100644 --- a/test/files/neg/gadts1.check +++ b/test/files/neg/gadts1.check @@ -2,5 +2,5 @@ gadts1.scala:15: error: type mismatch; found : Test.this.Double required: a case NumTerm(n) => c.x = Double(1.0) - ^ + ^ one error found diff --git a/test/files/neg/overload.check b/test/files/neg/overload.check index f3d3454116..5f7644eda7 100644 --- a/test/files/neg/overload.check +++ b/test/files/neg/overload.check @@ -3,5 +3,5 @@ most specific definition is: method f in class C of type (int)Unit, yet alternative definition method f in class D of type (Any)Unit is defined in a subclass (new D).f(1) - ^ + ^ one error found diff --git a/test/files/neg/sabin2.check b/test/files/neg/sabin2.check index e127cc67a2..cd45905df2 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 a.set(b.get()) // Error - ^ + ^ one error found diff --git a/test/files/neg/scopes.check b/test/files/neg/scopes.check index b312893044..13f728b01c 100644 --- a/test/files/neg/scopes.check +++ b/test/files/neg/scopes.check @@ -18,7 +18,7 @@ scopes.scala:14: error: y is already defined as value y ^ scopes.scala:15: error: x is already defined as value x val closure = (x: int, x: float) => x - ^ + ^ scopes.scala:17: error: x is already defined as value x case x::x => x ^ diff --git a/test/files/neg/tcpoly_variance.check b/test/files/neg/tcpoly_variance.check index 61d7094437..146240ac9b 100644 --- a/test/files/neg/tcpoly_variance.check +++ b/test/files/neg/tcpoly_variance.check @@ -1,5 +1,5 @@ tcpoly_variance.scala:6: error: error overriding method str in class A of type => m[java.lang.Object]; method str has incompatible type => m[String] override def str: m[String] = error("foo") // since x in m[x] is invariant, ! m[String] <: m[Object] - ^ + ^ one error found diff --git a/test/files/neg/typeerror.check b/test/files/neg/typeerror.check index c087ba594b..3e21a79ad5 100644 --- a/test/files/neg/typeerror.check +++ b/test/files/neg/typeerror.check @@ -2,5 +2,5 @@ typeerror.scala:6: error: type mismatch; found : Long(in method add) required: Long(in package scala) else add2(x.head, y.head) :: add(x.tail, y.tail) - ^ + ^ one error found diff --git a/test/files/neg/variances.check b/test/files/neg/variances.check index 4934053706..f335035b5b 100644 --- a/test/files/neg/variances.check +++ b/test/files/neg/variances.check @@ -15,6 +15,6 @@ variances.scala:14: error: covariant type A occurs in contravariant position in ^ variances.scala:16: error: covariant type A occurs in invariant position in type test.C[A] with ScalaObject{def this(): object Foo.this.Baz} of object Baz object Baz extends C[A] - ^ + ^ three warnings found three errors found diff --git a/test/files/neg/xmlcorner.check b/test/files/neg/xmlcorner.check index 8791829e50..5d3e9288d5 100644 --- a/test/files/neg/xmlcorner.check +++ b/test/files/neg/xmlcorner.check @@ -3,5 +3,5 @@ xmlcorner.scala:2: error: illegal start of simple expression ^ xmlcorner.scala:5: error: in XML literal: name cannot end in ':' val wrong = <bla: /> - ^ + ^ two errors found diff --git a/test/files/neg/xmltruncated1.check b/test/files/neg/xmltruncated1.check index 0014ef4011..36daa342e5 100644 --- a/test/files/neg/xmltruncated1.check +++ b/test/files/neg/xmltruncated1.check @@ -1,4 +1,4 @@ -xmltruncated1.scala:3: error: input ended while parsing XML - -^ +xmltruncated1.scala:2: error: input ended while parsing XML + val stuff = <a> + ^ one error found diff --git a/test/files/neg/xmltruncated2.check b/test/files/neg/xmltruncated2.check index cb7949d25f..f1de059f84 100644 --- a/test/files/neg/xmltruncated2.check +++ b/test/files/neg/xmltruncated2.check @@ -1,4 +1,4 @@ -xmltruncated2.scala:3: error: input ended while parsing XML - -^ +xmltruncated2.scala:2: error: input ended while parsing XML + val stuff = <![CDATA[aoeu + ^ one error found diff --git a/test/files/neg/xmltruncated3.check b/test/files/neg/xmltruncated3.check index 3c7e31912f..76851bd365 100644 --- a/test/files/neg/xmltruncated3.check +++ b/test/files/neg/xmltruncated3.check @@ -1,4 +1,4 @@ -xmltruncated3.scala:3: error: input ended while parsing XML - -^ +xmltruncated3.scala:2: error: input ended while parsing XML + val stuff = <a unclosedattr="aaaa + ^ one error found diff --git a/test/files/neg/xmltruncated4.check b/test/files/neg/xmltruncated4.check index c78c222ca7..4a3265d273 100644 --- a/test/files/neg/xmltruncated4.check +++ b/test/files/neg/xmltruncated4.check @@ -1,4 +1,4 @@ -xmltruncated4.scala:3: error: input ended while parsing XML - -^ +xmltruncated4.scala:2: error: input ended while parsing XML + val stuff = <!-- comment starts but never ends... + ^ one error found diff --git a/test/files/neg/xmltruncated5.check b/test/files/neg/xmltruncated5.check index d6f5742eab..cd13200b86 100644 --- a/test/files/neg/xmltruncated5.check +++ b/test/files/neg/xmltruncated5.check @@ -1,4 +1,4 @@ -xmltruncated5.scala:4: error: input ended while parsing XML - -^ +xmltruncated5.scala:3: error: input ended while parsing XML + case <a> + ^ one error found diff --git a/test/files/neg/xmltruncated6.check b/test/files/neg/xmltruncated6.check index 82d62cae5a..f638f2f090 100644 --- a/test/files/neg/xmltruncated6.check +++ b/test/files/neg/xmltruncated6.check @@ -1,7 +1,4 @@ -xmltruncated6.scala:2: error: ';' expected but eof found. +xmltruncated6.scala:2: error: in XML literal: expected end of Scala block val stuff = <a>{ "no closing brace" ^ -xmltruncated6.scala:3: error: input ended while parsing XML - -^ -two errors found +one error found |