*** empty log message ***

8 files changed, 38 insertions, 14 deletions

diff --git a/test/files/neg/S4.check b/test/files/neg/S4.check
index 49f79ba97a..1297b6d18c 100644
--- a/test/files/neg/S4.check
+++ b/test/files/neg/S4.check
@@ -1,4 +1,4 @@
-S4.scala:4: stable identifier required, but a found.
+S4.scala:4: type a.type escapes its defining scope as part of a.Inner { def foo(a.Inner): a.Inner,  val b$: Other,  def b: Other }
 class S4(a: Other) extends a.Inner() {
-                           ^
+      ^
 one error found
diff --git a/test/files/neg/bug38.check b/test/files/neg/bug38.check
new file mode 100644
index 0000000000..0f0bea262b
--- /dev/null
+++ b/test/files/neg/bug38.check
@@ -0,0 +1,7 @@
+bug38.scala:3: * is not a member of scala.xml
+  import scala.xml.* ; // does not work
+         ^
+bug38.scala:7: not found: constructor Element
+      val foo = new Element { def getName = "hallo"; def getChildren = Nil; def getAttribs = new HashMap[String,String] };
+                    ^
+two errors found
diff --git a/test/files/neg/constrparams.check b/test/files/neg/constrparams.check
index 19eb56bf7f..a9b7c39573 100644
--- a/test/files/neg/constrparams.check
+++ b/test/files/neg/constrparams.check
@@ -1,4 +1,9 @@
-constrparams.scala:4: stable identifier required, but x found.
+constrparams.scala:4: type mismatch;
+ found   : scala.AllRef
+ required: x.t
   private val z: x.t = null; //error
-                 ^
-one error found
+                       ^
+constrparams.scala:1: type x.type escapes its defining scope as part of scala.Object { type t,  val y$: x.type,  def y: x.type,  val z$: x.t,  def z: x.t }
+abstract class C(x: C) {
+               ^
+two errors found
diff --git a/test/files/neg/vincent1.check b/test/files/neg/vincent1.check
index 32dffd2884..a9f60e9ad2 100644
--- a/test/files/neg/vincent1.check
+++ b/test/files/neg/vincent1.check
@@ -1,6 +1,6 @@
-vincent1.scala:7: stable identifier required, but x found.
+vincent1.scala:7: type x.type escapes its defining scope as part of scala.Object { type T = x.T }
   class Functor(x: A) { type T = x.T }
-                                 ^
+        ^
 vincent1.scala:9: type x.type escapes its defining scope as part of test.B { type T = x.T }
   def functor(x: A): B { type T = x.T } =
                      ^
diff --git a/test/neg/S4.check b/test/neg/S4.check
index 49f79ba97a..1297b6d18c 100644
--- a/test/neg/S4.check
+++ b/test/neg/S4.check
@@ -1,4 +1,4 @@
-S4.scala:4: stable identifier required, but a found.
+S4.scala:4: type a.type escapes its defining scope as part of a.Inner { def foo(a.Inner): a.Inner,  val b$: Other,  def b: Other }
 class S4(a: Other) extends a.Inner() {
-                           ^
+      ^
 one error found
diff --git a/test/neg/bug38.check b/test/neg/bug38.check
new file mode 100644
index 0000000000..0f0bea262b
--- /dev/null
+++ b/test/neg/bug38.check
@@ -0,0 +1,7 @@
+bug38.scala:3: * is not a member of scala.xml
+  import scala.xml.* ; // does not work
+         ^
+bug38.scala:7: not found: constructor Element
+      val foo = new Element { def getName = "hallo"; def getChildren = Nil; def getAttribs = new HashMap[String,String] };
+                    ^
+two errors found
diff --git a/test/neg/constrparams.check b/test/neg/constrparams.check
index 19eb56bf7f..a9b7c39573 100644
--- a/test/neg/constrparams.check
+++ b/test/neg/constrparams.check
@@ -1,4 +1,9 @@
-constrparams.scala:4: stable identifier required, but x found.
+constrparams.scala:4: type mismatch;
+ found   : scala.AllRef
+ required: x.t
   private val z: x.t = null; //error
-                 ^
-one error found
+                       ^
+constrparams.scala:1: type x.type escapes its defining scope as part of scala.Object { type t,  val y$: x.type,  def y: x.type,  val z$: x.t,  def z: x.t }
+abstract class C(x: C) {
+               ^
+two errors found
diff --git a/test/neg/vincent1.check b/test/neg/vincent1.check
index 32dffd2884..a9f60e9ad2 100644
--- a/test/neg/vincent1.check
+++ b/test/neg/vincent1.check
@@ -1,6 +1,6 @@
-vincent1.scala:7: stable identifier required, but x found.
+vincent1.scala:7: type x.type escapes its defining scope as part of scala.Object { type T = x.T }
   class Functor(x: A) { type T = x.T }
-                                 ^
+        ^
 vincent1.scala:9: type x.type escapes its defining scope as part of test.B { type T = x.T }
   def functor(x: A): B { type T = x.T } =
                      ^