more on Xkilloption, and a PM fix

2 files changed, 32 insertions, 4 deletions

diff --git a/test/files/run/patmatnew.scala b/test/files/run/patmatnew.scala
index d7cb9aec6f..377e89a267 100644
--- a/test/files/run/patmatnew.scala
+++ b/test/files/run/patmatnew.scala
@@ -20,7 +20,7 @@ object Test {
     val tr = new TestResult
     new TestSuite(
 
-      new Test01
+      new Test717
 
     ).run(tr)
 
@@ -31,7 +31,7 @@ object Test {
   class Foo(j:Int) {
     case class Bar(i:Int)
   }
-  class Test01 extends TestCase("bir (#717 test path of case classes)") {
+  class Test717 extends TestCase("#717 test path of case classes") {
     val foo1 = new Foo(1)
     val foo2 = new Foo(2)
 
@@ -43,4 +43,26 @@ object Test {
       assertTrue("ok", res);
     }
   }
+
+  class Test806_818 { // #806, #811 compile only -- type of bind
+    // bug811
+    trait Core {
+      trait NodeImpl;
+      trait OtherImpl extends NodeImpl;
+      trait DoubleQuoteImpl extends NodeImpl;
+      def asDQ(node : OtherImpl) = node match {
+	case dq : DoubleQuoteImpl => dq;
+      }
+    }
+
+    trait IfElseMatcher {
+      type Node <: NodeImpl;
+      trait NodeImpl;
+      trait IfImpl;
+      private def coerceIf(node : Node) = node match {
+	case node : IfImpl => node; // var node is of type Node with IfImpl!
+	case _ => null;
+      }
+    }
+  }
 }
diff --git a/test/files/run/unittest_xml.scala b/test/files/run/unittest_xml.scala
index 5f7c523996..99284f144e 100644
--- a/test/files/run/unittest_xml.scala
+++ b/test/files/run/unittest_xml.scala
@@ -2,9 +2,14 @@
 object Test {
 
   import scala.testing.SUnit._
-  import scala.xml.{MetaData, Null, PrefixedAttribute, UnprefixedAttribute }
+  import scala.xml.{MetaData, Null, Parsing, PrefixedAttribute, UnprefixedAttribute }
 
-  class MetaDataTest extends TestCase("collection.mutable.ArrayBuffer") with Assert {
+  class ParsingTest extends TestCase("scala.xml.Parsing") with Assert {
+    override def runTest = {
+      assertTrue(Parsing.isNameStart('b'))
+    }
+  }
+  class MetaDataTest extends TestCase("scala.xml.MetaData") with Assert {
 
     import scala.xml.{TopScope, NamespaceBinding, Atom, Text }
 
@@ -44,6 +49,7 @@ object Test {
 
   def main(args:Array[String]) = {
     val ts = new TestSuite(
+      new ParsingTest,
       new MetaDataTest //,
     )
     val tr = new TestResult()