fixed bug756

2 files changed, 19 insertions, 4 deletions

diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
index 0f9d334862..c7e59925d5 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
@@ -535,6 +535,7 @@ trait Parsers requires SyntaxAnalyzer {
             accept(RPAREN)
             atPos(accept(ARROW)) { makeByNameFunctionTypeTree(t0, typ()) }
           } else {
+            val pos = in.currentPos
             val t0 = typ()
             if (in.token == COMMA) {
               in.nextToken()
@@ -542,7 +543,8 @@ trait Parsers requires SyntaxAnalyzer {
               accept(RPAREN)
               atPos (accept(ARROW)) { makeFunctionTypeTree(ts.toList, typ()) }
             } else {
-              accept(RPAREN); t0
+              accept(RPAREN)
+              type1rest(pos, t0, false)
             }
           }
         } else {
@@ -556,9 +558,11 @@ trait Parsers requires SyntaxAnalyzer {
     /** Type1 ::= SimpleType {with SimpleType} [Refinement]
      *  TypePattern1 ::= SimpleTypePattern [TypePatternArgs]
      */
-    def type1(isPattern: boolean): Tree = {
-      val pos = in.currentPos
-      var ts = new ListBuffer[Tree] + simpleType(isPattern)
+    def type1(isPattern: boolean): Tree =
+      type1rest(in.currentPos, simpleType(isPattern), isPattern)
+
+    def type1rest(pos: int, t: Tree, isPattern: boolean): Tree = {
+      var ts = new ListBuffer[Tree] + t
       while (in.token == WITH && !isPattern) {
         in.nextToken(); ts += simpleType(isPattern)
       }
diff --git a/test/files/pos/bug684.scala b/test/files/pos/bug684.scala
new file mode 100644
index 0000000000..fb5cac3a1a
--- /dev/null
+++ b/test/files/pos/bug684.scala
@@ -0,0 +1,11 @@
+package test;
+trait Test {
+  trait Ti;
+  class Foo;
+  def foo(t : Ti) = t match {
+  case t : Foo => true;
+  case _ => false;
+  }
+  class Bar extends Foo with Ti;
+  assert(foo(new Bar));
+}